Fix wrong pointer being passed to clientUpdateAllFrames(), add support to COMPOSITING_MANAGER as discussed on xdg list, rename gnome_win as xfwm4_win since it's really an internal window that has not much to do with gnome support

(Old svn revision: 17669)

1 files changed, 30 insertions, 30 deletions

diff --git a/src/settings.c b/src/settings.c
index 49dd64dd7..6e9fce87c 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -1170,36 +1170,36 @@ loadKeyBindings (ScreenInfo *screen_info, Settings *rc)
     parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_LEFT_WORKSPACE], getValue ("move_window_left_workspace_key", rc));
     parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_RIGHT_WORKSPACE], getValue ("move_window_right_workspace_key", rc));
 
-    ungrabKeys (dpy, screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_CYCLE_WINDOWS], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_NEXT_WORKSPACE], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_PREV_WORKSPACE], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_ADD_WORKSPACE], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_DEL_WORKSPACE], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_1], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_2], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_3], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_4], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_5], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_6], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_7], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_8], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_9], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_1], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_2], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_3], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_4], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_5], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_6], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_7], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_8], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_9], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_10], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_UP_WORKSPACE], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_DOWN_WORKSPACE], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_LEFT_WORKSPACE], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_RIGHT_WORKSPACE], screen_info->gnome_win);
-    grabKey (dpy, &screen_info->params->keys[KEY_SHOW_DESKTOP], screen_info->gnome_win);
+    ungrabKeys (dpy, screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_CYCLE_WINDOWS], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_NEXT_WORKSPACE], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_PREV_WORKSPACE], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_ADD_WORKSPACE], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_DEL_WORKSPACE], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_1], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_2], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_3], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_4], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_5], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_6], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_7], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_8], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_9], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_1], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_2], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_3], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_4], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_5], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_6], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_7], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_8], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_9], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHORTCUT_10], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_UP_WORKSPACE], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_DOWN_WORKSPACE], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_LEFT_WORKSPACE], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_RIGHT_WORKSPACE], screen_info->xfwm4_win);
+    grabKey (dpy, &screen_info->params->keys[KEY_SHOW_DESKTOP], screen_info->xfwm4_win);
 
     return TRUE;
 }