--- xfce4-cvs/xfwm4/src/client.c 2005-01-23 16:59:32.526321368 +0200 +++ xfce4/xfwm4/src/client.c 2005-01-23 17:11:37.778066344 +0200 @@ -308,6 +308,9 @@ grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_MOVE_WORKSPACE_7], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_MOVE_WORKSPACE_8], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_MOVE_WORKSPACE_9], c->window); + grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_MOVE_WORKSPACE_10], c->window); + grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_MOVE_WORKSPACE_11], c->window); + grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_MOVE_WORKSPACE_12], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_NEXT_WORKSPACE], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_PREV_WORKSPACE], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_RAISE_WINDOW], c->window); @@ -337,6 +340,9 @@ grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_WORKSPACE_7], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_WORKSPACE_8], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_WORKSPACE_9], c->window); + grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_WORKSPACE_10], c->window); + grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_WORKSPACE_11], c->window); + grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_WORKSPACE_12], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_UP_WORKSPACE], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_DOWN_WORKSPACE], c->window); grabKey (clientGetXDisplay (c), &screen_info->params->keys[KEY_LEFT_WORKSPACE], c->window); --- xfce4-cvs/xfwm4/src/events.c 2005-01-23 16:59:32.522321976 +0200 +++ xfce4/xfwm4/src/events.c 2005-01-23 17:13:17.216949336 +0200 @@ -542,6 +542,9 @@ case KEY_MOVE_WORKSPACE_7: case KEY_MOVE_WORKSPACE_8: case KEY_MOVE_WORKSPACE_9: + case KEY_MOVE_WORKSPACE_10: + case KEY_MOVE_WORKSPACE_11: + case KEY_MOVE_WORKSPACE_12: clientRaise (c); workspaceSwitch (screen_info, key - KEY_MOVE_WORKSPACE_1, c); break; @@ -609,6 +612,9 @@ case KEY_WORKSPACE_7: case KEY_WORKSPACE_8: case KEY_WORKSPACE_9: + case KEY_WORKSPACE_10: + case KEY_WORKSPACE_11: + case KEY_WORKSPACE_12: workspaceSwitch (screen_info, key - KEY_WORKSPACE_1, NULL); break; case KEY_SHORTCUT_1: --- xfce4-cvs/xfwm4/src/settings.c 2005-01-23 16:59:32.520322280 +0200 +++ xfce4/xfwm4/src/settings.c 2005-01-23 17:07:32.739317896 +0200 @@ -1003,6 +1003,9 @@ parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_7], getValue ("workspace_7_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_8], getValue ("workspace_8_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_9], getValue ("workspace_9_key", rc)); + parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_10], getValue ("workspace_10_key", rc)); + parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_11], getValue ("workspace_11_key", rc)); + parseKeyString (dpy, &screen_info->params->keys[KEY_WORKSPACE_12], getValue ("workspace_12_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_NEXT_WORKSPACE], getValue ("move_window_next_workspace_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_PREV_WORKSPACE], getValue ("move_window_prev_workspace_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_WORKSPACE_1], getValue ("move_window_workspace_1_key", rc)); @@ -1014,6 +1017,9 @@ parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_WORKSPACE_7], getValue ("move_window_workspace_7_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_WORKSPACE_8], getValue ("move_window_workspace_8_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_WORKSPACE_9], getValue ("move_window_workspace_9_key", rc)); + parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_WORKSPACE_10], getValue ("move_window_workspace_10_key", rc)); + parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_WORKSPACE_11], getValue ("move_window_workspace_11_key", rc)); + parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_WORKSPACE_12], getValue ("move_window_workspace_12_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_SHORTCUT_1], getValue ("shortcut_1_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_SHORTCUT_2], getValue ("shortcut_2_key", rc)); parseKeyString (dpy, &screen_info->params->keys[KEY_SHORTCUT_3], getValue ("shortcut_3_key", rc)); @@ -1051,6 +1057,9 @@ 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_WORKSPACE_10], screen_info->gnome_win); + grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_11], screen_info->gnome_win); + grabKey (dpy, &screen_info->params->keys[KEY_WORKSPACE_12], 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); @@ -1170,6 +1179,9 @@ {"move_window_workspace_7_key", NULL, TRUE}, {"move_window_workspace_8_key", NULL, TRUE}, {"move_window_workspace_9_key", NULL, TRUE}, + {"move_window_workspace_10_key", NULL, TRUE}, + {"move_window_workspace_11_key", NULL, TRUE}, + {"move_window_workspace_12_key", NULL, TRUE}, {"next_workspace_key", NULL, TRUE}, {"prev_workspace_key", NULL, TRUE}, {"resize_window_down_key", NULL, TRUE}, @@ -1187,6 +1199,9 @@ {"workspace_7_key", NULL, TRUE}, {"workspace_8_key", NULL, TRUE}, {"workspace_9_key", NULL, TRUE}, + {"workspace_10_key", NULL, TRUE}, + {"workspace_11_key", NULL, TRUE}, + {"workspace_12_key", NULL, TRUE}, {"shortcut_1_key", NULL, TRUE}, {"shortcut_2_key", NULL, TRUE}, {"shortcut_3_key", NULL, TRUE}, --- xfce4-cvs/xfwm4/src/settings.h 2005-01-23 16:59:32.520322280 +0200 +++ xfce4/xfwm4/src/settings.h 2005-01-23 17:02:32.589947536 +0200 @@ -84,39 +84,45 @@ #define KEY_WORKSPACE_7 26 #define KEY_WORKSPACE_8 27 #define KEY_WORKSPACE_9 28 -#define KEY_MOVE_NEXT_WORKSPACE 29 -#define KEY_MOVE_PREV_WORKSPACE 30 -#define KEY_MOVE_WORKSPACE_1 31 -#define KEY_MOVE_WORKSPACE_2 32 -#define KEY_MOVE_WORKSPACE_3 33 -#define KEY_MOVE_WORKSPACE_4 34 -#define KEY_MOVE_WORKSPACE_5 35 -#define KEY_MOVE_WORKSPACE_6 36 -#define KEY_MOVE_WORKSPACE_7 37 -#define KEY_MOVE_WORKSPACE_8 38 -#define KEY_MOVE_WORKSPACE_9 39 -#define KEY_SHORTCUT_1 40 -#define KEY_SHORTCUT_2 41 -#define KEY_SHORTCUT_3 42 -#define KEY_SHORTCUT_4 43 -#define KEY_SHORTCUT_5 44 -#define KEY_SHORTCUT_6 45 -#define KEY_SHORTCUT_7 46 -#define KEY_SHORTCUT_8 47 -#define KEY_SHORTCUT_9 48 -#define KEY_SHORTCUT_10 49 -#define KEY_LOWER_WINDOW 50 -#define KEY_RAISE_WINDOW 51 -#define KEY_TOGGLE_FULLSCREEN 52 -#define KEY_UP_WORKSPACE 53 -#define KEY_DOWN_WORKSPACE 54 -#define KEY_LEFT_WORKSPACE 55 -#define KEY_RIGHT_WORKSPACE 56 -#define KEY_MOVE_UP_WORKSPACE 57 -#define KEY_MOVE_DOWN_WORKSPACE 58 -#define KEY_MOVE_LEFT_WORKSPACE 59 -#define KEY_MOVE_RIGHT_WORKSPACE 60 -#define KEY_COUNT 61 +#define KEY_WORKSPACE_10 29 +#define KEY_WORKSPACE_11 30 +#define KEY_WORKSPACE_12 31 +#define KEY_MOVE_NEXT_WORKSPACE 32 +#define KEY_MOVE_PREV_WORKSPACE 33 +#define KEY_MOVE_WORKSPACE_1 34 +#define KEY_MOVE_WORKSPACE_2 35 +#define KEY_MOVE_WORKSPACE_3 36 +#define KEY_MOVE_WORKSPACE_4 37 +#define KEY_MOVE_WORKSPACE_5 38 +#define KEY_MOVE_WORKSPACE_6 39 +#define KEY_MOVE_WORKSPACE_7 40 +#define KEY_MOVE_WORKSPACE_8 41 +#define KEY_MOVE_WORKSPACE_9 42 +#define KEY_MOVE_WORKSPACE_10 43 +#define KEY_MOVE_WORKSPACE_11 44 +#define KEY_MOVE_WORKSPACE_12 45 +#define KEY_SHORTCUT_1 46 +#define KEY_SHORTCUT_2 47 +#define KEY_SHORTCUT_3 48 +#define KEY_SHORTCUT_4 49 +#define KEY_SHORTCUT_5 50 +#define KEY_SHORTCUT_6 51 +#define KEY_SHORTCUT_7 52 +#define KEY_SHORTCUT_8 53 +#define KEY_SHORTCUT_9 54 +#define KEY_SHORTCUT_10 55 +#define KEY_LOWER_WINDOW 56 +#define KEY_RAISE_WINDOW 57 +#define KEY_TOGGLE_FULLSCREEN 58 +#define KEY_UP_WORKSPACE 59 +#define KEY_DOWN_WORKSPACE 60 +#define KEY_LEFT_WORKSPACE 61 +#define KEY_RIGHT_WORKSPACE 62 +#define KEY_MOVE_UP_WORKSPACE 63 +#define KEY_MOVE_DOWN_WORKSPACE 64 +#define KEY_MOVE_LEFT_WORKSPACE 65 +#define KEY_MOVE_RIGHT_WORKSPACE 66 +#define KEY_COUNT 67 #define NB_KEY_SHORTCUTS 10 #define ALIGN_LEFT 0 --- xfce4-cvs/xfwm4/themes/default.keys/keythemerc 2005-01-23 16:59:32.597310576 +0200 +++ xfce4/xfwm4/themes/default.keys/keythemerc 2005-01-23 17:22:45.006632184 +0200 @@ -31,6 +31,9 @@ move_window_workspace_7_key=Alt+Control+KP_7 move_window_workspace_8_key=Alt+Control+KP_8 move_window_workspace_9_key=Alt+Control+KP_9 +move_window_workspace_10_key=Alt+Shift+Control+KP_0 +move_window_workspace_11_key=Alt+Shift+Control+KP_1 +move_window_workspace_12_key=Alt+Shift+Control+KP_2 fullscreen_key=Alt+F11 up_workspace_key=Control+Alt+Up down_workspace_key=Control+Alt+Page_Down @@ -49,6 +52,9 @@ workspace_7_key=Control+F7 workspace_8_key=Control+F8 workspace_9_key=Control+F9 +workspace_10_key=Control+F10 +workspace_11_key=Control+F11 +workspace_12_key=Control+F12 shortcut_1_key=Alt+F1 shortcut_1_exec=xfhelp4 shortcut_2_key=Alt+F2 --- xfce4-cvs/xfwm4/mcs-plugin/xfwm4_shortcuteditor.c 2005-01-23 16:59:32.694295832 +0200 +++ xfce4/xfwm4/mcs-plugin/xfwm4_shortcuteditor.c 2005-01-23 18:06:29.833597832 +0200 @@ -568,10 +568,37 @@ text = g_strdup_printf (_("Workspace %d"), 9); gtk_list_store_append (GTK_LIST_STORE (model3), &iter); gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); g_free (text); } + else if (g_ascii_strcasecmp (*shortcut, "workspace_10_key") == 0) + { + gchar *text; + + text = g_strdup_printf (_("Workspace %d"), 10); + gtk_list_store_append (GTK_LIST_STORE (model3), &iter); + gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); + g_free (text); + } + else if (g_ascii_strcasecmp (*shortcut, "workspace_11_key") == 0) + { + gchar *text; + + text = g_strdup_printf (_("Workspace %d"), 11); + gtk_list_store_append (GTK_LIST_STORE (model3), &iter); + gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); + g_free (text); + } + else if (g_ascii_strcasecmp (*shortcut, "workspace_12_key") == 0) + { + gchar *text; + + text = g_strdup_printf (_("Workspace %d"), 12); + gtk_list_store_append (GTK_LIST_STORE (model3), &iter); + gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, text, COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); + g_free (text); + } else if (g_ascii_strcasecmp (*shortcut, "move_window_next_workspace_key") == 0) { gtk_list_store_append (GTK_LIST_STORE (model3), &iter); gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Move window to next workspace"), COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); } @@ -643,10 +670,25 @@ else if (g_ascii_strcasecmp (*shortcut, "move_window_workspace_9_key") == 0) { gtk_list_store_append (GTK_LIST_STORE (model3), &iter); gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Move window to workspace 9"), COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); } + else if (g_ascii_strcasecmp (*shortcut, "move_window_workspace_10_key") == 0) + { + gtk_list_store_append (GTK_LIST_STORE (model3), &iter); + gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Move window to workspace 10"), COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); + } + else if (g_ascii_strcasecmp (*shortcut, "move_window_workspace_11_key") == 0) + { + gtk_list_store_append (GTK_LIST_STORE (model3), &iter); + gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Move window to workspace 11"), COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); + } + else if (g_ascii_strcasecmp (*shortcut, "move_window_workspace_12_key") == 0) + { + gtk_list_store_append (GTK_LIST_STORE (model3), &iter); + gtk_list_store_set (GTK_LIST_STORE (model3), &iter, COLUMN_COMMAND, _("Move window to workspace 12"), COLUMN_SHORTCUT, entry_value, COLUMN_NAME, *shortcut, -1); + } else if (g_ascii_strcasecmp (*shortcut, "shortcut_1_key") == 0) { const gchar *fallback_value2; const gchar *entry_value2;