From 1540a61a8ba40d87c63d1a33959940a312e0673d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 7 Feb 2008 14:08:56 +0000 Subject: [PATCH] (USAGE3): Add --parent-id (standard_args): Ditto. --- src/ChangeLog | 30 ++++++++++++++++++++++++++++++ src/emacs.c | 2 ++ 2 files changed, 32 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 6a8c03e80da..56d9913aed5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,33 @@ +2008-02-07 Timo Savola + + * xterm.c (x_detect_focus_change): Handle embed client message. + (handle_one_xevent): Ditto. + (handle_one_xevent): If embedded and we get a button press/release, + request focus. + (xembed_set_info, xembed_send_message): New functions. + (x_make_frame_visible): Call xembed_set_info if embedded. + (x_make_frame_invisible): Call xembed_set_info if embedded. + (x_term_init): Initialize Xatom_XEMBED. + (x_make_frame_visible): Check for FRAME_X_EMBEDDED_P also. + (x_iconify_frame): Ditto. + + * xterm.h (struct x_display_info): Add AtomXatom_XEMBED. + (enum xembed_info, enum xerm srmbed_message, enum xembed_focus) + (enum xembed_modifier, enum xembed_accelerator): New. + (xembed_set_info, xembed_send_message): Declare. + (FRAME_X_EMBEDDED_P): New. + + * gtkutil.c (xg_create_frame_widgets): If frame is embedded, call + gtk_plug_new. + + * xfns.c (Fx_create_frame): Do not override the explicitly set parent + window ID of a frame. + (x_window): Reparent frame if embedded. + (Fx_create_frame): Don't set border width if embedded. + + * emacs.c (USAGE3): Add --parent-id + (standard_args): Ditto. + 2008-02-07 Jan Dj,Ad(Brv * coding.c (DECODE_EMACS_MULE_COMPOSITION_CHAR): Use "do...while (0)". diff --git a/src/emacs.c b/src/emacs.c index 50230b653d2..6a2479fc37a 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -326,6 +326,7 @@ Display options:\n\ --title, -T TITLE title for initial Emacs frame\n\ --vertical-scroll-bars, -vb enable vertical scroll bars\n\ --xrm XRESOURCES set additional X resources\n\ +--parent-id XID set parent window\n\ --help display this help and exit\n\ --version output version information and exit\n\ \n" @@ -1867,6 +1868,7 @@ struct standard_args standard_args[] = { "-title", 0, 10, 1 }, { "-name", "--name", 10, 1 }, { "-xrm", "--xrm", 10, 1 }, + { "-parent-id", "--parent-id", 10, 1 }, { "-r", "--reverse-video", 5, 0 }, { "-rv", 0, 5, 0 }, { "-reverse", 0, 5, 0 }, -- 2.39.5