Mercurial > emacs
changeset 111439:8426207480fa
* src/xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE.
| author | Jan D <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 07 Nov 2010 12:25:55 +0100 |
| parents | 381161c05d64 |
| children | b72ff43b041f |
| files | src/ChangeLog src/xfns.c |
| diffstat | 2 files changed, 5 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 07 12:16:54 2010 +0100 +++ b/src/ChangeLog Sun Nov 07 12:25:55 2010 +0100 @@ -1,5 +1,7 @@ 2010-11-07 Jan Djärv <jan.h.d@swipnet.se> + * xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE. + * xdisp.c (note_mode_line_or_margin_highlight): Initialize Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also.
--- a/src/xfns.c Sun Nov 07 12:16:54 2010 +0100 +++ b/src/xfns.c Sun Nov 07 12:25:55 2010 +0100 @@ -3078,25 +3078,11 @@ static void set_machine_and_pid_properties (struct frame *f) { - /* See the above comment "Note: Encoding strategy". */ - XTextProperty text; - int bytes, stringp; - int do_free_text_value = 0; long pid = (long) getpid (); - text.value = x_encode_text (Vsystem_name, - Qcompound_text, 0, &bytes, &stringp, - &do_free_text_value); - text.encoding = (stringp ? XA_STRING - : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT); - text.format = 8; - text.nitems = bytes; - XSetWMClientMachine (FRAME_X_DISPLAY (f), - FRAME_OUTER_WINDOW (f), - &text); - if (do_free_text_value) - xfree (text.value); - + /* This will set WM_CLIENT_MACHINE and WM_LOCALE_NAME. */ + XSetWMProperties (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), NULL, NULL, + NULL, 0, NULL, NULL, NULL); XChangeProperty (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), XInternAtom (FRAME_X_DISPLAY (f),