X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fprop.c;h=7117a91c95b7b4393921881b3d1aba904d253c94;hb=12d4c8666c9475f254783fd33d1eb2b47f32e030;hp=27941ac32c3e19b6d0fadc31c290f7051d3d8bcb;hpb=d4b20aef313238e65d176822d44ee259b72e4f95;p=chaz%2Fopenbox

diff --git a/openbox/prop.c b/openbox/prop.c
index 27941ac3..7117a91c 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");
@@ -303,7 +307,7 @@ gboolean prop_get_string_utf8(Window win, Atom prop, char **ret)
     guint num;
      
     if (get_all(win, prop, prop_atoms.utf8, 8, (guchar**)&raw, &num)) {
-	*ret = g_strdup(raw); /* grab the first string from the list */
+	*ret = g_strndup(raw, num); /* grab the first string from the list */
 	g_free(raw);
 	return TRUE;
     }
@@ -352,11 +356,11 @@ void prop_set_string_utf8(Window win, Atom prop, char *val)
 void prop_set_strings_utf8(Window win, Atom prop, char **strs)
 {
     GString *str;
-    guint i;
+    char **s;
 
     str = g_string_sized_new(0);
-    for (i = 0; strs[i]; ++i) {
-        str = g_string_append(str, strs[i]);
+    for (s = strs; *s; ++s) {
+        str = g_string_append(str, *s);
         str = g_string_append_c(str, '\0');
     }
     XChangeProperty(ob_display, win, prop, prop_atoms.utf8, 8,