Merge lp:~3v1n0/nux/xinputwindow-wm-pid into lp:nux

[Marco Trevisan (Treviño)]

XInputWindow: define _NET_WM_PID and WM_CLIENT_MACHINE for nux windows

This makes them to be matched properly

Register the process pid that launched every nux input window, in this way BAMF can handle the unity windows as windows of the same application (that won't be shown anyway), instead of creating a new application for each window.
This reduces the usage of some resources both in bamf and in unity (that now will create only one hidden ApplicationLauncherIcon, instead of 5, in case of single monitor).

[Andrea Azzarone (azzar1)]

+ hostname[sizeof(hostname)-1] = '\0';

gethostname returns a null-terminated string. Do you really need that?

review: Needs Information

[Marco Trevisan (Treviño) (3v1n0)]

> + hostname[sizeof(hostname)-1] = '\0';
>
> gethostname returns a null-terminated string. Do you really need that?

Probably no, but just to be safer...

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:801
http://jenkins.qa.ubuntu.com/job/nux-ci/53/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/53/rebuild

review: Approve (continuous-integration)

=== modified file 'NuxGraphics/XInputWindow.cpp'
--- NuxGraphics/XInputWindow.cpp	2013-06-17 16:57:39 +0000
+++ NuxGraphics/XInputWindow.cpp	2013-06-17 16:57:39 +0000
@@ -33,6 +33,8 @@
     Atom WM_WINDOW_TYPE = 0;
     Atom WM_WINDOW_TYPE_DOCK = 0;
     Atom WM_STATE = 0;
+    Atom WM_PID;
+    Atom WM_CLIENT_MACHINE;
     Atom WM_TAKE_FOCUS = 0;
     Atom WM_STRUT_PARTIAL = 0;
     Atom X_DND_AWARE = 0;
@@ -51,6 +53,8 @@
       WM_WINDOW_TYPE = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
       WM_WINDOW_TYPE_DOCK = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DOCK", False);
       WM_STATE = XInternAtom(dpy, "_NET_WM_STATE", False);
+      WM_PID = XInternAtom(dpy, "_NET_WM_PID", False);
+      WM_CLIENT_MACHINE = XInternAtom(dpy, "WM_CLIENT_MACHINE", False);
       WM_TAKE_FOCUS = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
       X_DND_AWARE = XInternAtom(dpy, "XdndAware", False);
 
@@ -71,6 +75,7 @@
     , mapped_(false)
   {
     XSetWindowAttributes attrib;
+    char hostname[256];
 
     attrib.override_redirect = override_redirect;
     attrib.event_mask = KeyPressMask        |
@@ -101,6 +106,17 @@
     XChangeProperty(display_, window_, atom::WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace,
                     (unsigned char *) &atom::WM_WINDOW_TYPE_DOCK, 1);
 
+    if (gethostname(hostname, sizeof(hostname)) > -1)
+    {
+      hostname[sizeof(hostname)-1] = '\0';
+      XChangeProperty(display_, window_, atom::WM_CLIENT_MACHINE, XA_STRING, 8,
+                      PropModeReplace, (unsigned char *) hostname, strlen(hostname));
+
+      pid_t pid = getpid();
+      XChangeProperty(display_, window_, atom::WM_PID, XA_CARDINAL, 32,
+                      PropModeReplace, (unsigned char *) &pid, 1);
+    }
+
     XStoreName(display_, window_, title);
     EnsureInputs();