add actions for key/mouse bindings etc

[chaz/openbox] / otk / property.hh

diff --git a/otk/property.hh b/otk/property.hh
index 1dc089376de31d8608b2bd661e0316529017e451..1376269233d5dafd835cfc934d6585f3a9e2f933 100644 (file)
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -11,11 +11,10 @@
 
 extern "C" {
 #include <X11/Xlib.h>
-
-#include <assert.h>
 }
 
 #include <vector>
+#include <cassert>
 
 namespace otk {
 
@@ -61,6 +60,8 @@ struct Atoms {
   Atom net_workarea;
   Atom net_supporting_wm_check;
 //  Atom net_virtual_roots;
+  Atom net_desktop_layout;
+  Atom net_showing_desktop;
   // root window messages
   Atom net_close_window;
   Atom net_wm_moveresize;
@@ -75,7 +76,7 @@ struct Atoms {
   Atom net_wm_state;
   Atom net_wm_strut;
 //  Atom net_wm_icon_geometry;
-//  Atom net_wm_icon;
+  Atom net_wm_icon;
 //  Atom net_wm_pid;
 //  Atom net_wm_handled_icons;
   Atom net_wm_allowed_actions;
@@ -120,12 +121,22 @@ struct Atoms {
   Atom net_wm_state_above;
   Atom net_wm_state_below;
 
+  Atom net_wm_state_add;
+  Atom net_wm_state_remove;
+  Atom net_wm_state_toggle;
+
   Atom kde_net_system_tray_windows;
   Atom kde_net_wm_system_tray_window_for;
   Atom kde_net_wm_window_type_override;
 
+  Atom kwm_win_icon;
+
+  Atom rootpmapid;
+  Atom esetrootid;
+
   Atom openbox_premax;
   Atom openbox_active_window;
+  Atom openbox_restack_window;
 };
 
 
@@ -219,10 +230,7 @@ public:
                 struct returned by Property::atoms.
     @param type The Atom value of the property type. This can be found in the
                 struct returned by Property::atoms.
-    @param nelements The maximum number of elements to retrieve from the
-                     property (assuming it has more than 1 value in it). To
-                     retrieve all possible elements, use "(unsigned) -1".<br>
-                     When the function returns, if it returns true, this will
+    @param nelements When the function returns, if it returns true, this will
                      contain the actual number of elements retrieved.<br>
     @param value If the function returns true, then this contains an array of
                  retrieved values for the property.<br>
@@ -271,10 +279,7 @@ public:
                 struct returned by Property::atoms.
     @param type A member of the Property::StringType enum that specifies the
                 type of the string property to retrieve
-    @param nelements The maximum number of strings to retrieve from the
-                     property (assuming it has more than 1 string in it). To
-                     retrieve all possible strings, use "(unsigned) -1".<br>
-                     When the function returns, if it returns true, this will
+    @param nelements When the function returns, if it returns true, this will
                      contain the actual number of strings retrieved.<br>
     @param strings If the function returns true, then this contains all of the
                    strings retrieved from the property's value.