X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.c;h=c53f250321a627a4021bd3c4af185a05d00c27e9;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=bce0426b0fe373bf3a06828bcf2649a94535d32f;hpb=e6d1ab217f53fcafe418a75ce184463c6e36e31b;p=chaz%2Fopenbox

diff --git a/openbox/prop.c b/openbox/prop.c
index bce0426b..c53f2503 100644
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -45,6 +45,7 @@ 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_wm_name, "_NET_WM_NAME");
     CREATE(net_wm_visible_name, "_NET_WM_VISIBLE_NAME");
@@ -69,15 +70,18 @@ void prop_startup()
     CREATE(net_wm_window_type_dialog, "_NET_WM_WINDOW_TYPE_DIALOG");
     CREATE(net_wm_window_type_normal, "_NET_WM_WINDOW_TYPE_NORMAL");
 
-    CREATE(net_wm_moveresize_size_topleft, "_NET_WM_MOVERESIZE_SIZE_TOPLEFT");
-    CREATE(net_wm_moveresize_size_topright,
-	   "_NET_WM_MOVERESIZE_SIZE_TOPRIGHT");
-    CREATE(net_wm_moveresize_size_bottomleft,
-	   "_NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT");
-    CREATE(net_wm_moveresize_size_bottomright,
-	   "_NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT");
-    CREATE(net_wm_moveresize_move, "_NET_WM_MOVERESIZE_MOVE");
- 
+    prop_atoms.net_wm_moveresize_size_topleft = 0;
+    prop_atoms.net_wm_moveresize_size_top = 1;
+    prop_atoms.net_wm_moveresize_size_topright = 2;
+    prop_atoms.net_wm_moveresize_size_right = 3;
+    prop_atoms.net_wm_moveresize_size_bottomright = 4;
+    prop_atoms.net_wm_moveresize_size_bottom = 5;
+    prop_atoms.net_wm_moveresize_size_bottomleft = 6;
+    prop_atoms.net_wm_moveresize_size_left = 7;
+    prop_atoms.net_wm_moveresize_move = 8;
+    prop_atoms.net_wm_moveresize_size_keyboard = 9;
+    prop_atoms.net_wm_moveresize_move_keyboard = 10;
+
     CREATE(net_wm_action_move, "_NET_WM_ACTION_MOVE");
     CREATE(net_wm_action_resize, "_NET_WM_ACTION_RESIZE");
     CREATE(net_wm_action_minimize, "_NET_WM_ACTION_MINIMIZE");
@@ -182,7 +186,7 @@ static gboolean get_prealloc(Window win, Atom prop, Atom type, int size,
 		    ((guint16*)data)[i] = ((guint16*)xdata)[i];
 		    break;
 		case 32:
-		    ((guint32*)data)[i] = ((guint32*)xdata)[i];
+		    ((guint32*)data)[i] = ((gulong*)xdata)[i];
 		    break;
 		default:
 		    g_assert_not_reached(); /* unhandled size */
@@ -221,7 +225,7 @@ static gboolean get_all(Window win, Atom prop, Atom type, int size,
 		    ((guint16*)*data)[i] = ((guint16*)xdata)[i];
 		    break;
 		case 32:
-		    ((guint32*)*data)[i] = ((guint32*)xdata)[i];
+		    ((guint32*)*data)[i] = ((gulong*)xdata)[i];
 		    break;
 		default:
 		    g_assert_not_reached(); /* unhandled size */
@@ -264,9 +268,10 @@ gboolean prop_get_string_locale(Window win, Atom prop, char **ret)
     int nstr;
 
     if (get_stringlist(win, prop, &list, &nstr) && nstr) {
-        *ret = g_locale_to_utf8(list[0], -1, NULL, NULL, NULL);
+        *ret = g_convert(list[0], strlen(list[0]), "UTF-8", "ISO-8859-1",
+                         NULL, NULL, NULL);
         XFreeStringList(list);
-        if (ret) return TRUE;
+        if (*ret) return TRUE;
     }
     return FALSE;
 }
@@ -282,13 +287,14 @@ gboolean prop_get_strings_locale(Window win, Atom prop, char ***ret)
 
         p = raw;
         for (i = 0; i < num; ++i) {
-            (*ret)[i] = g_locale_to_utf8(p, -1, NULL, NULL, NULL);
+            (*ret)[i] = g_convert(p, strlen(p), "UTF-8", "ISO-8859-1",
+                                  NULL, NULL, NULL);
             /* make sure translation did not fail */
             if (!(*ret)[i]) {
                 g_strfreev(*ret); /* free what we did so far */
                 break; /* the force is not strong with us */
             }
-            p = strchr(p, '\0');
+            p += strlen(p) + 1;
         }
 	g_free(raw);
         if (i == num)
@@ -322,7 +328,7 @@ gboolean prop_get_strings_utf8(Window win, Atom prop, char ***ret)
         p = raw;
         for (i = 0; i < num; ++i) {
             (*ret)[i] = g_strdup(p);
-            p = strchr(p, '\0');
+            p += strlen(p) + 1;
         }
 	g_free(raw);
 	return TRUE;