s/ob_display/obt_display/ and remove ob_display

[chaz/openbox] / openbox / prop.c

diff --git a/openbox/prop.c b/openbox/prop.c
index 0485045e344459938fb4f92d5fa132fe038f2c39..3f58db14069808039eb32dd2b59f794e015b214d 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -25,9 +25,9 @@
 Atoms prop_atoms;
 
 #define CREATE(var, name) (prop_atoms.var = \
-                           XInternAtom(ob_display, name, FALSE))
+                           XInternAtom(obt_display, name, FALSE))
 
-void prop_startup()
+void prop_startup(void)
 {
     CREATE(cardinal, "CARDINAL");
     CREATE(window, "WINDOW");
@@ -37,7 +37,7 @@ void prop_startup()
     CREATE(utf8, "UTF8_STRING");
 
     CREATE(manager, "MANAGER");
-     
+
     CREATE(wm_colormap_windows, "WM_COLORMAP_WINDOWS");
     CREATE(wm_protocols, "WM_PROTOCOLS");
     CREATE(wm_state, "WM_STATE");
@@ -75,6 +75,8 @@ void prop_startup()
     CREATE(net_close_window, "_NET_CLOSE_WINDOW");
     CREATE(net_wm_moveresize, "_NET_WM_MOVERESIZE");
     CREATE(net_moveresize_window, "_NET_MOVERESIZE_WINDOW");
+    CREATE(net_request_frame_extents, "_NET_REQUEST_FRAME_EXTENTS");
+    CREATE(net_restack_window, "_NET_RESTACK_WINDOW");
 
     CREATE(net_startup_id, "_NET_STARTUP_ID");
 
@@ -89,13 +91,14 @@ void prop_startup()
     CREATE(net_wm_strut_partial, "_NET_WM_STRUT_PARTIAL");
     CREATE(net_wm_icon, "_NET_WM_ICON");
     CREATE(net_wm_icon_geometry, "_NET_WM_ICON_GEOMETRY");
-/*   CREATE(net_wm_pid, "_NET_WM_PID"); */
+    CREATE(net_wm_pid, "_NET_WM_PID");
     CREATE(net_wm_allowed_actions, "_NET_WM_ALLOWED_ACTIONS");
     CREATE(net_wm_user_time, "_NET_WM_USER_TIME");
+/*    CREATE(net_wm_user_time_window, "_NET_WM_USER_TIME_WINDOW"); */
     CREATE(kde_net_wm_frame_strut, "_KDE_NET_WM_FRAME_STRUT");
     CREATE(net_frame_extents, "_NET_FRAME_EXTENTS");
 
-/*   CREATE(net_wm_ping, "_NET_WM_PING"); */
+    CREATE(net_wm_ping, "_NET_WM_PING");
 #ifdef SYNC
     CREATE(net_wm_sync_request, "_NET_WM_SYNC_REQUEST");
     CREATE(net_wm_sync_request_counter, "_NET_WM_SYNC_REQUEST_COUNTER");
@@ -132,6 +135,9 @@ void prop_startup()
     CREATE(net_wm_action_fullscreen, "_NET_WM_ACTION_FULLSCREEN");
     CREATE(net_wm_action_change_desktop, "_NET_WM_ACTION_CHANGE_DESKTOP");
     CREATE(net_wm_action_close, "_NET_WM_ACTION_CLOSE");
+    CREATE(net_wm_action_above, "_NET_WM_ACTION_ABOVE");
+    CREATE(net_wm_action_below, "_NET_WM_ACTION_BELOW");
+
     CREATE(net_wm_state_modal, "_NET_WM_STATE_MODAL");
 /*    CREATE(net_wm_state_sticky, "_NET_WM_STATE_STICKY");*/
     CREATE(net_wm_state_maximized_vert, "_NET_WM_STATE_MAXIMIZED_VERT");
@@ -144,7 +150,7 @@ void prop_startup()
     CREATE(net_wm_state_above, "_NET_WM_STATE_ABOVE");
     CREATE(net_wm_state_below, "_NET_WM_STATE_BELOW");
     CREATE(net_wm_state_demands_attention, "_NET_WM_STATE_DEMANDS_ATTENTION");
-  
+
     prop_atoms.net_wm_state_add = 1;
     prop_atoms.net_wm_state_remove = 0;
     prop_atoms.net_wm_state_toggle = 2;
@@ -165,9 +171,10 @@ void prop_startup()
 */
 
     CREATE(openbox_pid, "_OPENBOX_PID");
-    CREATE(openbox_config, "_OPENBOX_CONFIG");
-    CREATE(openbox_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
-    CREATE(openbox_control, "_OB_CONTROL");
+    CREATE(ob_theme, "_OB_THEME");
+    CREATE(ob_wm_action_undecorate, "_OB_WM_ACTION_UNDECORATE");
+    CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED");
+    CREATE(ob_control, "_OB_CONTROL");
 }
 
 #include <X11/Xutil.h>
@@ -211,7 +218,7 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, gint size,
     gulong ret_items, bytes_left;
     glong num32 = 32 / size * num; /* num in 32-bit elements */
 
-    res = XGetWindowProperty(ob_display, win, prop, 0l, num32,
+    res = XGetWindowProperty(obt_display, win, prop, 0l, num32,
                              FALSE, type, &ret_type, &ret_size,
                              &ret_items, &bytes_left, &xdata);
     if (res == Success && ret_items && xdata) {
@@ -248,7 +255,7 @@ static gboolean get_all(Window win, Atom prop, Atom type, gint size,
     gint ret_size;
     gulong ret_items, bytes_left;
 
-    res = XGetWindowProperty(ob_display, win, prop, 0l, G_MAXLONG,
+    res = XGetWindowProperty(obt_display, win, prop, 0l, G_MAXLONG,
                              FALSE, type, &ret_type, &ret_size,
                              &ret_items, &bytes_left, &xdata);
     if (res == Success) {
@@ -283,7 +290,7 @@ static gboolean get_stringlist(Window win, Atom prop, gchar ***list, gint *nstr)
     XTextProperty tprop;
     gboolean ret = FALSE;
 
-    if (XGetTextProperty(ob_display, win, &tprop, prop) && tprop.nitems) {
+    if (XGetTextProperty(obt_display, win, &tprop, prop) && tprop.nitems) {
         if (XTextPropertyToStringList(&tprop, list, nstr))
             ret = TRUE;
         XFree(tprop.value);
@@ -355,7 +362,7 @@ gboolean prop_get_string_utf8(Window win, Atom prop, gchar **ret)
     gchar *raw;
     gchar *str;
     guint num;
-     
+
     if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
         str = g_strndup(raw, num); /* grab the first string from the list */
         g_free(raw);
@@ -400,20 +407,20 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret)
 
 void prop_set32(Window win, Atom prop, Atom type, gulong val)
 {
-    XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace,
+    XChangeProperty(obt_display, win, prop, type, 32, PropModeReplace,
                     (guchar*)&val, 1);
 }
 
 void prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
                       guint num)
 {
-    XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace,
+    XChangeProperty(obt_display, win, prop, type, 32, PropModeReplace,
                     (guchar*)val, num);
 }
 
 void prop_set_string_utf8(Window win, Atom prop, const gchar *val)
 {
-    XChangeProperty(ob_display, win, prop, prop_atoms.utf8, 8,
+    XChangeProperty(obt_display, win, prop, prop_atoms.utf8, 8,
                     PropModeReplace, (const guchar*)val, strlen(val));
 }
 
@@ -427,30 +434,37 @@ void prop_set_strings_utf8(Window win, Atom prop, gchar **strs)
         str = g_string_append(str, *s);
         str = g_string_append_c(str, '\0');
     }
-    XChangeProperty(ob_display, win, prop, prop_atoms.utf8, 8,
+    XChangeProperty(obt_display, win, prop, prop_atoms.utf8, 8,
                     PropModeReplace, (guchar*)str->str, str->len);
     g_string_free(str, TRUE);
 }
 
 void prop_erase(Window win, Atom prop)
 {
-    XDeleteProperty(ob_display, win, prop);
+    XDeleteProperty(obt_display, win, prop);
 }
 
 void prop_message(Window about, Atom messagetype, glong data0, glong data1,
                   glong data2, glong data3, glong mask)
+{
+    prop_message_to(RootWindow(obt_display, ob_screen), about, messagetype,
+                    data0, data1, data2, data3, 0, mask);
+}
+
+void prop_message_to(Window to, Window about, Atom messagetype,
+                     glong data0, glong data1, glong data2,
+                     glong data3, glong data4, glong mask)
 {
     XEvent ce;
     ce.xclient.type = ClientMessage;
     ce.xclient.message_type = messagetype;
-    ce.xclient.display = ob_display;
+    ce.xclient.display = obt_display;
     ce.xclient.window = about;
     ce.xclient.format = 32;
     ce.xclient.data.l[0] = data0;
     ce.xclient.data.l[1] = data1;
     ce.xclient.data.l[2] = data2;
     ce.xclient.data.l[3] = data3;
-    ce.xclient.data.l[4] = 0;
-    XSendEvent(ob_display, RootWindow(ob_display, ob_screen), FALSE,
-               mask, &ce);
+    ce.xclient.data.l[4] = data4;
+    XSendEvent(obt_display, to, FALSE, mask, &ce);
 }