Merge lp:~3v1n0/nux/xinputwindow-cache-atoms into lp:nux

[Marco Trevisan (Treviño)]

XinputWindow: cache the X Atoms we use for all the nux windows

This reduces the time to create a window, as we call XInternAtom just once

For each atom we use in Nux XInputWindow we always call the slow XInternAtom, while we can safely cache these values for all the windows we create reducing the initialization time.

[lp:~3v1n0/nux/xinputwindow-cache-atoms]

800. By Marco Trevisan (Treviño) on 2013-06-17

XInputWindow: cache missing WM_STRUT_PARTIAL, some code cleanup

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'NuxGraphics/XInputWindow.cpp'
--- NuxGraphics/XInputWindow.cpp	2013-03-21 21:19:38 +0000
+++ NuxGraphics/XInputWindow.cpp	2013-06-17 16:05:31 +0000
@@ -24,14 +24,42 @@
 #include "GLThread.h"
 #include "XIMController.h"
 
-
-// Jay, what is this for?  It isn't referenced anywhere.
-#define xdnd_version 5
-
 namespace nux
 {
   std::vector<Window> XInputWindow::native_windows_;
 
+  namespace atom
+  {
+    Atom WM_WINDOW_TYPE = 0;
+    Atom WM_WINDOW_TYPE_DOCK = 0;
+    Atom WM_STATE = 0;
+    Atom WM_TAKE_FOCUS = 0;
+    Atom WM_STRUT_PARTIAL = 0;
+    Atom X_DND_AWARE = 0;
+    Atom OVERLAY_STRUT = 0;
+
+    const unsigned STRUTS_SIZE = 12;
+    const int X_DND_VERSION = 5;
+
+    std::vector<Atom> WM_STATES;
+
+    void initialize(Display *dpy)
+    {
+      if (WM_WINDOW_TYPE)
+        return;
+
+      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_TAKE_FOCUS = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
+      X_DND_AWARE = XInternAtom(dpy, "XdndAware", False);
+
+      WM_STATES.push_back(XInternAtom(dpy, "_NET_WM_STATE_STICKY", False));
+      WM_STATES.push_back(XInternAtom(dpy, "_NET_WM_STATE_SKIP_TASKBAR", False));
+      WM_STATES.push_back(XInternAtom(dpy, "_NET_WM_STATE_SKIP_PAGER", False));
+    }
+  }
+
   XInputWindow::XInputWindow(const char* title,
                              bool        take_focus,
                              int         override_redirect)
@@ -41,7 +69,6 @@
     , geometry_(0, 0, 1, 1)
     , shown_(false)
     , mapped_(false)
-    , overlay_strut_atom_(0)
   {
     XSetWindowAttributes attrib;
 
@@ -66,23 +93,13 @@
 
     native_windows_.push_back(window_);
 
-    Atom data[32];
-    int     i = 0;
-    data[i++] = XInternAtom(display_, "_NET_WM_STATE_STICKY", 0);
-    data[i++] = XInternAtom(display_, "_NET_WM_STATE_SKIP_TASKBAR", 0);
-    data[i++] = XInternAtom(display_, "_NET_WM_STATE_SKIP_PAGER", 0);
-
-    XChangeProperty(display_, window_,
-                    XInternAtom(display_, "_NET_WM_STATE", 0),
-                    XA_ATOM, 32, PropModeReplace,
-                    (unsigned char *) data, i);
-
-    Atom type[1];
-    type[0] = XInternAtom(display_, "_NET_WM_WINDOW_TYPE_DOCK", 0);
-    XChangeProperty(display_, window_,
-                    XInternAtom(display_, "_NET_WM_WINDOW_TYPE", 0),
-                    XA_ATOM, 32, PropModeReplace,
-                    (unsigned char *) type, 1);
+    atom::initialize(display_);
+
+    XChangeProperty(display_, window_, atom::WM_STATE, XA_ATOM, 32, PropModeReplace,
+                    (unsigned char *) atom::WM_STATES.data(), atom::WM_STATES.size());
+
+    XChangeProperty(display_, window_, atom::WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace,
+                    (unsigned char *) &atom::WM_WINDOW_TYPE_DOCK, 1);
 
     XStoreName(display_, window_, title);
     EnsureInputs();
@@ -117,7 +134,7 @@
     XRectangle         tmp_rect;
     int largestWidth = 0, largestHeight = 0;
     int screenWidth, screenHeight;
-    std::vector<long int> data(12, 0);
+    std::vector<long int> data(atom::STRUTS_SIZE, 0);
 
     /* Find the screen that this region intersects */
     tmp_rect.x = geometry_.x;
@@ -219,32 +236,28 @@
 
   void XInputWindow::SetStruts()
   {
-    std::vector<long int> data(GetStrutsData());
+    std::vector<long int> const& struts = GetStrutsData();
 
-    XChangeProperty(display_, window_,
-                    XInternAtom(display_, "_NET_WM_STRUT_PARTIAL", 0),
-                    XA_CARDINAL, 32, PropModeReplace,
-                    (unsigned char*) &data[0], 12);
+    XChangeProperty(display_, window_, atom::WM_STRUT_PARTIAL, XA_CARDINAL, 32,
+                    PropModeReplace, (unsigned char*) struts.data(), struts.size());
   }
 
   void XInputWindow::UnsetStruts()
   {
-    XDeleteProperty(display_, window_,
-                    XInternAtom(display_, "_NET_WM_STRUT_PARTIAL", 0));
+    XDeleteProperty(display_, window_, atom::WM_STRUT_PARTIAL);
   }
 
   void XInputWindow::SetOverlayStruts()
   {
-    std::vector<long int> data(GetStrutsData());
+    std::vector<long int> const& struts = GetStrutsData();
 
-    XChangeProperty(display_, window_, overlay_strut_atom_,
-                    XA_CARDINAL, 32, PropModeReplace,
-                    (unsigned char*) &data[0], 12);
+    XChangeProperty(display_, window_, atom::OVERLAY_STRUT, XA_CARDINAL, 32,
+                    PropModeReplace, (unsigned char*) struts.data(), struts.size());
   }
 
   void XInputWindow::UnsetOverlayStruts()
   {
-    XDeleteProperty(display_, window_, overlay_strut_atom_);
+    XDeleteProperty(display_, window_, atom::OVERLAY_STRUT);
   }
 
   void XInputWindow::EnableStruts(bool enable)
@@ -252,6 +265,9 @@
     if (strutsEnabled_ == enable)
       return;
 
+    if (!atom::WM_STRUT_PARTIAL)
+      atom::WM_STRUT_PARTIAL = XInternAtom(display_, "_NET_WM_STRUT_PARTIAL", False);
+
     strutsEnabled_ = enable;
     if (enable)
       SetStruts();
@@ -269,8 +285,8 @@
     if (overlayStrutsEnabled_ == enable)
       return;
 
-    if (!overlay_strut_atom_)
-      overlay_strut_atom_ = XInternAtom(display_, "_COMPIZ_NET_OVERLAY_STRUT", 0);
+    if (!atom::OVERLAY_STRUT)
+      atom::OVERLAY_STRUT = XInternAtom(display_, "_COMPIZ_NET_OVERLAY_STRUT", False);
 
     overlayStrutsEnabled_ = enable;
     if (enable)
@@ -302,30 +318,22 @@
 
   void XInputWindow::EnableTakeFocus()
   {
-    Atom wmTakeFocus = XInternAtom(display_, "WM_TAKE_FOCUS", False);
-    XWMHints* wmHints = NULL;
-
-    wmHints = (XWMHints*) calloc(1, sizeof(XWMHints));
-    wmHints->flags |= InputHint;
-    wmHints->input = False;
-    XSetWMHints(display_, window_, wmHints);
-    free(wmHints);
-    XSetWMProtocols(display_, window_, &wmTakeFocus, 1);
+    XWMHints wmHints;
+    wmHints.flags = InputHint;
+    wmHints.input = False;
+    XSetWMHints(display_, window_, &wmHints);
+    XSetWMProtocols(display_, window_, &atom::WM_TAKE_FOCUS, 1);
   }
 
   void XInputWindow::EnableDnd()
   {
-    int version = 5;
-    XChangeProperty(display_, window_,
-                    XInternAtom(display_, "XdndAware", false),
-                    XA_ATOM, 32, PropModeReplace,
-                    (unsigned char *) &version, 1);
+    XChangeProperty(display_, window_, atom::X_DND_AWARE, XA_ATOM, 32,
+                    PropModeReplace, (unsigned char *) &atom::X_DND_VERSION, 1);
   }
 
   void XInputWindow::DisableDnd()
   {
-    XDeleteProperty(display_, window_,
-                    XInternAtom(display_, "XdndAware", false));
+    XDeleteProperty(display_, window_, atom::X_DND_AWARE);
   }
 
   //! Set the position and size of the window

=== modified file 'NuxGraphics/XInputWindow.h'
--- NuxGraphics/XInputWindow.h	2012-08-30 22:56:57 +0000
+++ NuxGraphics/XInputWindow.h	2013-06-17 16:05:31 +0000
@@ -98,7 +98,6 @@
     Rect geometry_;
     bool shown_;
     bool mapped_;
-    Atom overlay_strut_atom_;
   };
 }