[Bf-blender-cvs] [5ed2cc8] master: Fix T43652: X11 "_NET_WM_PID" not set by Ghost

[Campbell Barton]

Commit: 5ed2cc80708b5a9b5c5185ffb50b9d214ba5d0a2
Author: Campbell Barton
Date:   Thu Feb 19 09:19:12 2015 +1100
Branches: master
https://developer.blender.org/rB5ed2cc80708b5a9b5c5185ffb50b9d214ba5d0a2

Fix T43652:  X11 "_NET_WM_PID" not set by Ghost

D1107 by @kevindietrich

===================================================================

M       intern/ghost/intern/GHOST_WindowX11.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp 
b/intern/ghost/intern/GHOST_WindowX11.cpp
index f4b9b84..613b4df 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -56,6 +56,9 @@
 #include <cstring>
 #include <cstdio>
 
+/* gethostname */
+#include <unistd.h>
+
 #include <algorithm>
 #include <string>
 
@@ -71,6 +74,9 @@ typedef struct {
 
 #define MWM_HINTS_DECORATIONS         (1L << 1)
 
+#ifndef HOST_NAME_MAX
+#  define HOST_NAME_MAX 64
+#endif
 
 // #define GHOST_X11_GRAB
 
@@ -504,6 +510,30 @@ GHOST_WindowX11(
                                BLENDER_ICON_48x48x32[0] * 
BLENDER_ICON_48x48x32[1] + 2);
        }
 
+       /* set the process ID (_NET_WM_PID) */
+       {
+               Atom _NET_WM_PID = XInternAtom(m_display, "_NET_WM_PID", False);
+               pid_t pid = getpid();
+               XChangeProperty(m_display, m_window, _NET_WM_PID, XA_CARDINAL,
+                               32, PropModeReplace, (unsigned char *)&pid, 1);
+       }
+
+
+       /* set the hostname (WM_CLIENT_MACHINE) */
+       {
+               char  hostname[HOST_NAME_MAX];
+               char *text_array[1];
+               XTextProperty text_prop;
+
+               gethostname(hostname, sizeof(hostname));
+               hostname[sizeof(hostname) - 1] = '\0';
+               text_array[0] = hostname;
+
+               XStringListToTextProperty(text_array, 1, &text_prop);
+               XSetWMClientMachine(m_display, m_window, &text_prop);
+               XFree(text_prop.value);
+       }
+
 #ifdef WITH_X11_XINPUT
        initXInputDevices();

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs