X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.c;h=186cc133c9c6af2b056cf6fbf78532d9f0fa9719;hb=cadab91e522c6426cc79df4f06e7c05232cb0a64;hp=f3afc6faa66af667abd7f55b6a35ac9677c76e72;hpb=7837faa3402faf2eff48adc5024509deb2be98ac;p=chaz%2Fopenbox

diff --git a/openbox/prop.c b/openbox/prop.c
index f3afc6fa..186cc133 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -16,6 +16,8 @@ void prop_startup()
     CREATE(atom, "ATOM");
     CREATE(string, "STRING");
     CREATE(utf8, "UTF8_STRING");
+
+    CREATE(manager, "MANAGER");
      
     CREATE(wm_colormap_windows, "WM_COLORMAP_WINDOWS");
     CREATE(wm_protocols, "WM_PROTOCOLS");
@@ -29,6 +31,8 @@ void prop_startup()
     CREATE(wm_window_role, "WM_WINDOW_ROLE");
     CREATE(motif_wm_hints, "_MOTIF_WM_HINTS");
 
+    CREATE(sm_client_id, "SM_CLIENT_ID");
+
     CREATE(net_supported, "_NET_SUPPORTED");
     CREATE(net_client_list, "_NET_CLIENT_LIST");
     CREATE(net_client_list_stacking, "_NET_CLIENT_LIST_STACKING");
@@ -55,6 +59,7 @@ void prop_startup()
     CREATE(net_wm_window_type, "_NET_WM_WINDOW_TYPE");
     CREATE(net_wm_state, "_NET_WM_STATE");
     CREATE(net_wm_strut, "_NET_WM_STRUT");
+    CREATE(net_wm_strut_partial, "_NET_WM_STRUT_PARTIAL");
     CREATE(net_wm_icon, "_NET_WM_ICON");
 /*   CREATE(net_wm_pid, "_NET_WM_PID"); */
     CREATE(net_wm_allowed_actions, "_NET_WM_ALLOWED_ACTIONS");
@@ -282,7 +287,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
     char *raw, *p;
     guint num, i, count = 0;
 
-    if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
+    if (get_all(win, prop, prop_atoms.string, 8, (guchar**)&raw, &num)) {
 
         p = raw;
         while (p < raw + num - 1) {
@@ -294,7 +299,7 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
         *ret = g_new0(char*, count + 1);
         (*ret)[count] = NULL; /* null terminated list */
 
-        for (it = strs; it; it = g_slist_next(it)) {
+        for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) {
             (*ret)[i] = g_convert(it->data, -1, "UTF-8", "ISO-8859-1",
                                   NULL, NULL, NULL);
             /* make sure translation did not fail */
@@ -343,7 +348,7 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret)
 
         *ret = g_new0(char*, count + 1);
 
-        for (it = strs; it; it = g_slist_next(it)) {
+        for (i = 0, it = strs; it; ++i, it = g_slist_next(it)) {
             if (g_utf8_validate(it->data, -1, NULL))
                 (*ret)[i] = g_strdup(it->data);
             else
@@ -395,7 +400,7 @@ void prop_erase(Window win, Atom prop)
 }
 
 void prop_message(Window about, Atom messagetype, long data0, long data1,
-		  long data2, long data3)
+		  long data2, long data3, long mask)
 {
     XEvent ce;
     ce.xclient.type = ClientMessage;
@@ -407,6 +412,6 @@ void prop_message(Window about, Atom messagetype, long data0, long data1,
     ce.xclient.data.l[1] = data1;
     ce.xclient.data.l[2] = data2;
     ce.xclient.data.l[3] = data3;
-    XSendEvent(ob_display, ob_root, FALSE,
-	       SubstructureNotifyMask | SubstructureRedirectMask, &ce);
+    XSendEvent(ob_display, RootWindow(ob_display, ob_screen), FALSE,
+	       mask, &ce);
 }