prefix and capitalize some more constants/enums in client.h (Function -> ObFunctions...

[chaz/openbox] / openbox / prop.h

diff --git a/openbox/prop.h b/openbox/prop.h
index e7c861c55f37522f21835f6df32d0fc573d2ee7f..06ad14370075e75c75eebc990b11bc55e1d89582 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -49,6 +49,7 @@ typedef struct Atoms {
     /* root window messages */
     Atom net_close_window;
     Atom net_wm_moveresize;
+    Atom net_moveresize_window;
     /* application window properties */
     Atom net_wm_name;
     Atom net_wm_visible_name;
@@ -73,11 +74,17 @@ typedef struct Atoms {
     Atom net_wm_window_type_dialog;
     Atom net_wm_window_type_normal;
 
-    Atom net_wm_moveresize_size_topleft;
+    Atom net_wm_moveresize_size_topleft; 
+    Atom net_wm_moveresize_size_top;
     Atom net_wm_moveresize_size_topright;
-    Atom net_wm_moveresize_size_bottomleft;
+    Atom net_wm_moveresize_size_right;
     Atom net_wm_moveresize_size_bottomright;
+    Atom net_wm_moveresize_size_bottom;
+    Atom net_wm_moveresize_size_bottomleft;
+    Atom net_wm_moveresize_size_left;
     Atom net_wm_moveresize_move;
+    Atom net_wm_moveresize_size_keyboard;
+    Atom net_wm_moveresize_move_keyboard;
 
     Atom net_wm_action_move;
     Atom net_wm_action_resize;
@@ -153,9 +160,9 @@ void prop_message(Window about, Atom messagetype, long data0, long data1,
                  long data2, long data3);
 
 #define PROP_GET32(win, prop, type, ret) \
-    (prop_get32(win, prop_atoms.prop, prop_atoms.type, (guint32*)ret))
+    (prop_get32(win, prop_atoms.prop, prop_atoms.type, ret))
 #define PROP_GETA32(win, prop, type, ret, nret) \
-    (prop_get_array32(win, prop_atoms.prop, prop_atoms.type, (guint32**)ret, \
+    (prop_get_array32(win, prop_atoms.prop, prop_atoms.type, ret, \
                       nret))
 #define PROP_GETS(win, prop, type, ret) \
     (prop_get_string_##type(win, prop_atoms.prop, ret))
@@ -165,7 +172,7 @@ void prop_message(Window about, Atom messagetype, long data0, long data1,
 #define PROP_SET32(win, prop, type, val) \
     prop_set32(win, prop_atoms.prop, prop_atoms.type, val)
 #define PROP_SETA32(win, prop, type, val, num) \
-    prop_set_array32(win, prop_atoms.prop, prop_atoms.type, (guint32*)val, num)
+    prop_set_array32(win, prop_atoms.prop, prop_atoms.type, val, num)
 #define PROP_SETS(win, prop, val) \
     prop_set_string_utf8(win, prop_atoms.prop, val)
 #define PROP_SETSS(win, prop, strs) \