dont add sticky windows to the stacking list more than once

[chaz/openbox] / src / XAtom.cc

diff --git a/src/XAtom.cc b/src/XAtom.cc
index abd68f183c4224dbdc5670d0ae2db62ee32a9a69..27912abdeee02145bfedcdee907410695862d415 100644 (file)
--- a/src/XAtom.cc
+++ b/src/XAtom.cc
@@ -77,6 +77,9 @@ XAtom::XAtom(Display *d) {
     create("_BLACKBOX_CHANGE_WINDOW_FOCUS");
   _atoms[blackbox_cycle_window_focus] = create("_BLACKBOX_CYCLE_WINDOW_FOCUS");
 
+  _atoms[openbox_show_root_menu] = create("_OPENBOX_SHOW_ROOT_MENU");
+  _atoms[openbox_show_workspace_menu] = create("_OPENBOX_SHOW_WORKSPACE_MENU");
+
   _atoms[net_supported] = create("_NET_SUPPORTED");
   _atoms[net_client_list] = create("_NET_CLIENT_LIST");
   _atoms[net_client_list_stacking] = create("_NET_CLIENT_LIST_STACKING");
@@ -356,7 +359,7 @@ bool XAtom::getValue(Window win, Atom atom, Atom type,
   assert(win != None); assert(atom != None); assert(type != None);
   assert(size == 8 || size == 16 || size == 32);
   assert(nelements > 0);
-  unsigned char *c_val = 0;        // value alloc'd with c malloc
+  unsigned char *c_val = 0;        // value alloc'd in Xlib, must be XFree()d
   Atom ret_type;
   int ret_size;
   unsigned long ret_bytes;
@@ -497,7 +500,7 @@ void XAtom::eraseValue(Window win, Atoms atom) const {
 
 void XAtom::sendClientMessage(Window target, Atoms type, Window about,
                               long data, long data1, long data2,
-                              long data3) const {
+                              long data3, long data4) const {
   assert(atom >= 0 && atom < NUM_ATOMS);
   assert(target != None);
 
@@ -510,6 +513,7 @@ void XAtom::sendClientMessage(Window target, Atoms type, Window about,
   e.xclient.data.l[1] = data1;
   e.xclient.data.l[2] = data2;
   e.xclient.data.l[3] = data3;
+  e.xclient.data.l[4] = data4;
 
   XSendEvent(_display, target, False,
              SubstructureRedirectMask | SubstructureNotifyMask,