* src/xfns.c (set_machine_and_pid_properties): Let X set WM_CLIENT_MACHINE.

This commit is contained in:
Jan D 2010-11-07 12:25:55 +01:00
parent 27f92be77d
commit 66b167670d
2 changed files with 5 additions and 17 deletions

View file

@ -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.

View file

@ -3078,25 +3078,11 @@ If FRAME is nil, use the selected frame. */)
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),