Author: olivier
Date: 2008-06-02 20:22:45 +0000 (Mon, 02 Jun 2008)
New Revision: 27008
Modified:
xfwm4/trunk/mcs-plugin/Makefile.am
xfwm4/trunk/mcs-plugin/workspaces.c
xfwm4/trunk/mcs-plugin/workspaces_plugin.c
xfwm4/trunk/mcs-plugin/xfwm4_plugin.h
xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c
xfwm4/trunk/src/events.c
xfwm4/trunk/src/moveresize.c
xfwm4/trunk/src/screen.c
xfwm4/trunk/src/settings.c
xfwm4/trunk/src/settings.h
Log:
Change shortcuts to use the new move/resize system
Modified: xfwm4/trunk/mcs-plugin/Makefile.am
===================================================================
--- xfwm4/trunk/mcs-plugin/Makefile.am 2008-06-01 21:24:07 UTC (rev 27007)
+++ xfwm4/trunk/mcs-plugin/Makefile.am 2008-06-02 20:22:45 UTC (rev 27008)
@@ -70,6 +70,8 @@
$(LIBXFCE4MCS_MANAGER_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
$(XFCE_MCS_MANAGER_CFLAGS) \
+ $(LIBWNCK_CFLAGS) \
+ -DWNCK_I_KNOW_THIS_IS_UNSTABLE \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
@@ -78,6 +80,7 @@
workspaces_plugin_la_LIBADD = \
$(LIBXFCEGUI4_LIBS) \
$(LIBXFCE4MCS_MANAGER_LIBS) \
+ $(LIBWNCK_LIBS) \
$(LIBS)
if HAVE_CYGWIN
Modified: xfwm4/trunk/mcs-plugin/workspaces.c
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces.c 2008-06-01 21:24:07 UTC (rev 27007)
+++ xfwm4/trunk/mcs-plugin/workspaces.c 2008-06-02 20:22:45 UTC (rev 27008)
@@ -38,6 +38,7 @@
#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
+#include <libwnck/libwnck.h>
#include <libxfce4mcs/mcs-manager.h>
#include <xfce-mcs-manager/manager-plugin.h>
@@ -50,7 +51,7 @@
#define WS_SEP_S ";"
static McsManager *mcs_manager;
-static NetkScreen *netk_screen = NULL;
+static WnckScreen *wnck_screen = NULL;
static gulong ws_created_id = 0;
static gulong ws_destroyed_id = 0;
@@ -105,11 +106,11 @@
else
{
const char *name = NULL;
- NetkWorkspace *ws = netk_screen_get_workspace (netk_screen, i);
+ WnckWorkspace *ws = wnck_screen_get_workspace (wnck_screen, i);
if (ws)
{
- name = netk_workspace_get_name (ws);
+ name = wnck_workspace_get_name (ws);
}
if (name && strlen (name))
{
@@ -140,8 +141,8 @@
mcs_manager = mcs_plugin->manager;
- netk_screen = netk_screen_get_default ();
- netk_screen_force_update (netk_screen);
+ wnck_screen = wnck_screen_get_default ();
+ wnck_screen_force_update (wnck_screen);
ws_create_channel (mcs_manager, CHANNEL1, RCFILE1);
@@ -154,7 +155,7 @@
}
/* ws count */
- ws_count = netk_screen_get_workspace_count (netk_screen);
+ ws_count = wnck_screen_get_workspace_count (wnck_screen);
setting = mcs_manager_setting_lookup (mcs_manager, "Xfwm/WorkspaceCount",
CHANNEL1);
@@ -535,9 +536,9 @@
/* watch for changes by other programs */
static void
-update_channel (NetkScreen * screen, NetkWorkspace * ws, McsManager * manager)
+update_channel (WnckScreen * screen, WnckWorkspace * ws, McsManager * manager)
{
- ws_count = netk_screen_get_workspace_count (screen);
+ ws_count = wnck_screen_get_workspace_count (screen);
set_workspace_count (manager, ws_count, TRUE);
}
@@ -545,10 +546,10 @@
static void
watch_workspaces_hint (McsManager * manager)
{
- ws_created_id = g_signal_connect (netk_screen, "workspace-created",
+ ws_created_id = g_signal_connect (wnck_screen, "workspace-created",
G_CALLBACK (update_channel), manager);
- ws_destroyed_id = g_signal_connect (netk_screen, "workspace-destroyed",
+ ws_destroyed_id = g_signal_connect (wnck_screen, "workspace-destroyed",
G_CALLBACK (update_channel), manager);
}
@@ -557,8 +558,8 @@
{
DBG ("Disconecting workspace signal handlers");
- g_signal_handler_disconnect (netk_screen, ws_created_id);
- g_signal_handler_disconnect (netk_screen, ws_destroyed_id);
+ g_signal_handler_disconnect (wnck_screen, ws_created_id);
+ g_signal_handler_disconnect (wnck_screen, ws_destroyed_id);
- g_object_unref (netk_screen);
+ g_object_unref (wnck_screen);
}
Modified: xfwm4/trunk/mcs-plugin/workspaces_plugin.c
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces_plugin.c 2008-06-01 21:24:07 UTC (rev
27007)
+++ xfwm4/trunk/mcs-plugin/workspaces_plugin.c 2008-06-02 20:22:45 UTC (rev
27008)
@@ -35,6 +35,7 @@
#include <gtk/gtk.h>
#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
#include <libxfce4util/libxfce4util.h>
#include <xfce-mcs-manager/manager-plugin.h>
Modified: xfwm4/trunk/mcs-plugin/xfwm4_plugin.h
===================================================================
--- xfwm4/trunk/mcs-plugin/xfwm4_plugin.h 2008-06-01 21:24:07 UTC (rev
27007)
+++ xfwm4/trunk/mcs-plugin/xfwm4_plugin.h 2008-06-02 20:22:45 UTC (rev
27008)
@@ -35,7 +35,7 @@
#define DEFAULT_THEME "Default"
#define DEFAULT_KEY_THEME "Default"
-#define DEFAULT_LAYOUT "O|HMC"
+#define DEFAULT_LAYOUT "OT|SHMC"
#define DEFAULT_ACTION "maximize"
#define DEFAULT_ALIGN "center"
#define DEFAULT_FONT "Sans Bold 9"
Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c
===================================================================
--- xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2008-06-01 21:24:07 UTC
(rev 27007)
+++ xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c 2008-06-02 20:22:45 UTC
(rev 27008)
@@ -26,6 +26,7 @@
#include <errno.h>
#include <gdk/gdkkeysyms.h>
+#include <gdk/gdkx.h>
#include <libxfcegui4/libxfcegui4.h>
#include <xfce-mcs-manager/manager-plugin.h>
@@ -310,92 +311,86 @@
loadtheme_in_treeview (ThemeInfo * ti, gpointer data)
{
const gchar *shortcut_options_list[] = {
+ "popup_menu_key",
+ "up_key",
+ "down_key",
+ "left_key",
+ "right_key",
+ "cancel_key",
+ "cycle_windows_key",
"close_window_key",
- "maximize_window_key",
- "maximize_vert_key",
"maximize_horiz_key",
- "fill_horiz_key",
- "fill_vert_key",
- "fill_window_key",
+ "maximize_vert_key",
+ "maximize_window_key",
"hide_window_key",
+ "move_window_key",
+ "resize_window_key",
"shade_window_key",
"stick_window_key",
- "cycle_windows_key",
- "move_window_up_key",
- "move_window_down_key",
- "move_window_left_key",
- "move_window_right_key",
- "resize_window_up_key",
- "resize_window_down_key",
- "resize_window_left_key",
- "resize_window_right_key",
- "move_resize_cancel_key",
"raise_window_key",
"lower_window_key",
+ "fill_window_key",
+ "fill_horiz_key",
+ "fill_vert_key",
"above_key",
"fullscreen_key",
+ "move_window_up_workspace_key",
+ "move_window_down_workspace_key",
+ "move_window_left_workspace_key",
+ "move_window_right_workspace_key",
+ "move_window_prev_workspace_key",
+ "move_window_next_workspace_key",
+ "show_desktop_key",
"up_workspace_key",
"down_workspace_key",
"left_workspace_key",
"right_workspace_key",
- "next_workspace_key",
"prev_workspace_key",
+ "next_workspace_key",
"add_workspace_key",
"del_workspace_key",
- "move_window_next_workspace_key",
- "move_window_prev_workspace_key",
- "move_window_up_workspace_key",
- "move_window_down_workspace_key",
- "move_window_left_workspace_key",
- "move_window_right_workspace_key",
- "show_desktop_key",
- "cancel_key",
- "popup_menu_key",
NULL
};
const gchar *shortcut_name_list[] = {
+ N_("Window operations menu"),
+ N_("Up"),
+ N_("Down"),
+ N_("Left"),
+ N_("Right"),
+ N_("Cancel"),
+ N_("Cycle windows"),
N_("Close window"),
- N_("Maximize window"),
- N_("Maximize window vertically"),
N_("Maximize window horizontally"),
- N_("Fill window horizontally"),
- N_("Fill window vertically"),
- N_("Fill window"),
+ N_("Maximize window vertically"),
+ N_("Maximize window"),
N_("Hide window"),
+ N_("Move window"),
+ N_("Resize window"),
N_("Shade window"),
N_("Stick window"),
- N_("Cycle windows"),
- N_("Move window up"),
- N_("Move window down"),
- N_("Move window left"),
- N_("Move window right"),
- N_("Resize window up"),
- N_("Resize window down"),
- N_("Resize window left"),
- N_("Resize window right"),
- N_("Cancel move/resize window"),
N_("Raise window"),
N_("Lower window"),
+ N_("Fill window"),
+ N_("Fill window horizontally"),
+ N_("Fill window vertically"),
N_("Toggle above"),
N_("Toggle fullscreen"),
+ N_("Move window to upper workspace"),
+ N_("Move window to bottom workspace"),
+ N_("Move window to left workspace"),
+ N_("Move window to right workspace"),
+ N_("Move window to previous workspace"),
+ N_("Move window to next workspace"),
+ N_("Show desktop"),
N_("Upper workspace"),
N_("Bottom workspace"),
N_("Left workspace"),
N_("Right workspace"),
- N_("Next workspace"),
N_("Previous workspace"),
+ N_("Next workspace"),
N_("Add workspace"),
N_("Delete workspace"),
- N_("Move window to next workspace"),
- N_("Move window to previous workspace"),
- N_("Move window to upper workspace"),
- N_("Move window to bottom workspace"),
- N_("Move window to left workspace"),
- N_("Move window to right workspace"),
- N_("Show desktop"),
- N_("Cancel window action"),
- N_("Window operations menu"),
NULL
};
@@ -771,7 +766,7 @@
/* Apply change */
gtk_tree_selection_get_selected (selection, &model, &iter);
- /* check if shorcut already exists */
+ /* check if shortcut already exists */
stfs.shortcut = shortcut_string;
stfs.found = FALSE;
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2008-06-01 21:24:07 UTC (rev 27007)
+++ xfwm4/trunk/src/events.c 2008-06-02 20:22:45 UTC (rev 27008)
@@ -365,16 +365,10 @@
switch (key)
{
- case KEY_MOVE_UP:
- case KEY_MOVE_DOWN:
- case KEY_MOVE_LEFT:
- case KEY_MOVE_RIGHT:
+ case KEY_MOVE:
moveRequest (c, (XEvent *) ev);
break;
- case KEY_RESIZE_UP:
- case KEY_RESIZE_DOWN:
- case KEY_RESIZE_LEFT:
- case KEY_RESIZE_RIGHT:
+ case KEY_RESIZE:
if (FLAG_TEST_ALL (c->xfwm_flags, XFWM_FLAG_HAS_RESIZE |
XFWM_FLAG_IS_RESIZABLE))
{
clientResize (c, CORNER_BOTTOM_RIGHT, (XEvent *) ev);
Modified: xfwm4/trunk/src/moveresize.c
===================================================================
--- xfwm4/trunk/src/moveresize.c 2008-06-01 21:24:07 UTC (rev 27007)
+++ xfwm4/trunk/src/moveresize.c 2008-06-02 20:22:45 UTC (rev 27008)
@@ -574,19 +574,19 @@
{
key_move = MAX (key_move, screen_info->params->snap_width + 1);
}
- if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_LEFT].keycode)
+ if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_LEFT].keycode)
{
clientMovePointer (display_info, -1, 0, key_move);
}
- else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_RIGHT].keycode)
+ else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_RIGHT].keycode)
{
clientMovePointer (display_info, 1, 0, key_move);
}
- else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_UP].keycode)
+ else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_UP].keycode)
{
clientMovePointer (display_info, 0, -1, key_move);
}
- else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_DOWN].keycode)
+ else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_DOWN].keycode)
{
clientMovePointer (display_info, 0, 1, key_move);
}
@@ -1182,7 +1182,7 @@
key_height_inc = ((int) (10 / key_height_inc)) * key_height_inc;
}
- if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_UP].keycode)
+ if (xevent->xkey.keycode == screen_info->params->keys[KEY_UP].keycode)
{
if ((passdata->handle == CORNER_COUNT + SIDE_BOTTOM) ||
(passdata->handle == CORNER_COUNT + SIDE_TOP))
@@ -1194,7 +1194,7 @@
clientChangeHandle (passdata, CORNER_COUNT + SIDE_TOP);
}
}
- else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_DOWN].keycode)
+ else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_DOWN].keycode)
{
if ((passdata->handle == CORNER_COUNT + SIDE_BOTTOM) ||
(passdata->handle == CORNER_COUNT + SIDE_TOP))
@@ -1206,7 +1206,7 @@
clientChangeHandle (passdata, CORNER_COUNT + SIDE_BOTTOM);
}
}
- else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_LEFT].keycode)
+ else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_LEFT].keycode)
{
if ((passdata->handle == CORNER_COUNT + SIDE_LEFT) ||
(passdata->handle == CORNER_COUNT + SIDE_RIGHT))
@@ -1218,7 +1218,7 @@
clientChangeHandle (passdata, CORNER_COUNT + SIDE_LEFT);
}
}
- else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_MOVE_RIGHT].keycode)
+ else if (xevent->xkey.keycode ==
screen_info->params->keys[KEY_RIGHT].keycode)
{
if ((passdata->handle == CORNER_COUNT + SIDE_LEFT) ||
(passdata->handle == CORNER_COUNT + SIDE_RIGHT))
Modified: xfwm4/trunk/src/screen.c
===================================================================
--- xfwm4/trunk/src/screen.c 2008-06-01 21:24:07 UTC (rev 27007)
+++ xfwm4/trunk/src/screen.c 2008-06-02 20:22:45 UTC (rev 27008)
@@ -507,16 +507,6 @@
dpy = myScreenGetXDisplay (screen_info);
- /*
- Ugly hack: KEY_CANCEL is used just for cancelling window ops
- it should not be grabbed all the time (especially when you
- realize that it's mapped to Esc by default, damn, I can't
- switch back to command mode in vi anymore, I'm stuck in
- edition mode ;)
-
- That's why we start at FIRST_KEY which is defined after
- KEY_CANCEL...
- */
for (i = FIRST_KEY; i < KEY_COUNT; i++)
{
grabKey (dpy, &screen_info->params->keys[i], screen_info->xroot);
Modified: xfwm4/trunk/src/settings.c
===================================================================
--- xfwm4/trunk/src/settings.c 2008-06-01 21:24:07 UTC (rev 27007)
+++ xfwm4/trunk/src/settings.c 2008-06-02 20:22:45 UTC (rev 27008)
@@ -1260,9 +1260,13 @@
}
}
+ parseKeyString (dpy, &screen_info->params->keys[KEY_CANCEL], getValue
("cancel_key", rc));
+ parseKeyString (dpy, &screen_info->params->keys[KEY_DOWN], getValue
("down_key", rc));
+ parseKeyString (dpy, &screen_info->params->keys[KEY_LEFT], getValue
("left_key", rc));
+ parseKeyString (dpy, &screen_info->params->keys[KEY_RIGHT], getValue
("right_key", rc));
+ parseKeyString (dpy, &screen_info->params->keys[KEY_UP], getValue
("up_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_ADD_WORKSPACE],
getValue ("add_workspace_key", rc));
parseKeyString (dpy,
&screen_info->params->keys[KEY_ADD_ADJACENT_WORKSPACE], getValue
("add_adjacent_workspace_key", rc));
- parseKeyString (dpy, &screen_info->params->keys[KEY_CANCEL], getValue
("cancel_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_CLOSE_WINDOW],
getValue ("close_window_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_CYCLE_WINDOWS],
getValue ("cycle_windows_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_DEL_WORKSPACE],
getValue ("del_workspace_key", rc));
@@ -1274,27 +1278,21 @@
parseKeyString (dpy, &screen_info->params->keys[KEY_HIDE_WINDOW], getValue
("hide_window_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_LEFT_WORKSPACE],
getValue ("left_workspace_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_LOWER_WINDOW],
getValue ("lower_window_key", rc));
+ parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE], getValue
("move_window_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_MAXIMIZE_HORIZ],
getValue ("maximize_horiz_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_MAXIMIZE_VERT],
getValue ("maximize_vert_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_MAXIMIZE_WINDOW],
getValue ("maximize_window_key", rc));
- parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_DOWN], getValue
("move_window_down_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_DOWN_WORKSPACE],
getValue ("move_window_down_workspace_key", rc));
- parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_LEFT], getValue
("move_window_left_key", 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_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_RIGHT], getValue
("move_window_right_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_RIGHT_WORKSPACE],
getValue ("move_window_right_workspace_key", rc));
- parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_UP], getValue
("move_window_up_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_MOVE_UP_WORKSPACE],
getValue ("move_window_up_workspace_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_NEXT_WORKSPACE],
getValue ("next_workspace_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_POPUP_MENU], getValue
("popup_menu_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_PREV_WORKSPACE],
getValue ("prev_workspace_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_RAISE_WINDOW],
getValue ("raise_window_key", rc));
- parseKeyString (dpy, &screen_info->params->keys[KEY_RESIZE_DOWN], getValue
("resize_window_down_key", rc));
- parseKeyString (dpy, &screen_info->params->keys[KEY_RESIZE_LEFT], getValue
("resize_window_left_key", rc));
- parseKeyString (dpy, &screen_info->params->keys[KEY_RESIZE_RIGHT],
getValue ("resize_window_right_key", rc));
- parseKeyString (dpy, &screen_info->params->keys[KEY_RESIZE_UP], getValue
("resize_window_up_key", rc));
+ parseKeyString (dpy, &screen_info->params->keys[KEY_RESIZE], getValue
("resize_window_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_RIGHT_WORKSPACE],
getValue ("right_workspace_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_SHADE_WINDOW],
getValue ("shade_window_key", rc));
parseKeyString (dpy, &screen_info->params->keys[KEY_SHOW_DESKTOP],
getValue("show_desktop_key", rc));
@@ -1416,31 +1414,32 @@
{"wrap_workspaces", NULL, TRUE},
/* Keys */
{"above_key", NULL, TRUE},
- {"add_workspace_key", NULL, TRUE},
{"add_adjacent_workspace_key", NULL, TRUE},
+ {"add_workspace_key", NULL, TRUE},
{"cancel_key", NULL, TRUE},
{"close_window_key", NULL, TRUE},
{"cycle_windows_key", NULL, TRUE},
- {"del_workspace_key", NULL, TRUE},
{"del_active_workspace_key", NULL, TRUE},
+ {"del_workspace_key", NULL, TRUE},
+ {"down_key", NULL, TRUE},
{"down_workspace_key", NULL, TRUE},
+ {"fill_horiz_key", NULL, TRUE},
+ {"fill_vert_key", NULL, TRUE},
+ {"fill_window_key", NULL, TRUE},
{"fullscreen_key", NULL, TRUE},
{"hide_window_key", NULL, TRUE},
+ {"left_key", NULL, TRUE},
{"left_workspace_key", NULL, TRUE},
{"lower_window_key", NULL, TRUE},
{"maximize_horiz_key", NULL, TRUE},
{"maximize_vert_key", NULL, TRUE},
{"maximize_window_key", NULL, TRUE},
- {"move_window_down_key", NULL, TRUE},
{"move_window_down_workspace_key", NULL, TRUE},
- {"move_window_left_key", NULL, TRUE},
{"move_window_left_workspace_key", NULL, TRUE},
{"move_window_next_workspace_key", NULL, TRUE},
+ {"move_window_key", NULL, TRUE},
{"move_window_prev_workspace_key", NULL, TRUE},
- {"popup_menu_key", NULL, TRUE},
- {"move_window_right_key", NULL, TRUE},
{"move_window_right_workspace_key", NULL, TRUE},
- {"move_window_up_key", NULL, TRUE},
{"move_window_up_workspace_key", NULL, TRUE},
{"move_window_workspace_1_key", NULL, TRUE},
{"move_window_workspace_2_key", NULL, TRUE},
@@ -1455,16 +1454,16 @@
{"move_window_workspace_11_key", NULL, TRUE},
{"move_window_workspace_12_key", NULL, TRUE},
{"next_workspace_key", NULL, TRUE},
+ {"popup_menu_key", NULL, TRUE},
{"prev_workspace_key", NULL, TRUE},
{"raise_window_key", NULL, TRUE},
- {"resize_window_down_key", NULL, TRUE},
- {"resize_window_left_key", NULL, TRUE},
- {"resize_window_right_key", NULL, TRUE},
- {"resize_window_up_key", NULL, TRUE},
+ {"resize_window_key", NULL, TRUE},
+ {"right_key", NULL, TRUE},
{"right_workspace_key", NULL, TRUE},
{"shade_window_key", NULL, TRUE},
{"show_desktop_key", NULL, FALSE},
{"stick_window_key", NULL, TRUE},
+ {"up_key", NULL, TRUE},
{"up_workspace_key", NULL, TRUE},
{"workspace_1_key", NULL, TRUE},
{"workspace_2_key", NULL, TRUE},
@@ -1478,9 +1477,6 @@
{"workspace_10_key", NULL, TRUE},
{"workspace_11_key", NULL, TRUE},
{"workspace_12_key", NULL, TRUE},
- {"fill_horiz_key", NULL, TRUE},
- {"fill_vert_key", NULL, TRUE},
- {"fill_window_key", NULL, TRUE},
{NULL, NULL, FALSE}
};
Modified: xfwm4/trunk/src/settings.h
===================================================================
--- xfwm4/trunk/src/settings.h 2008-06-01 21:24:07 UTC (rev 27007)
+++ xfwm4/trunk/src/settings.h 2008-06-02 20:22:45 UTC (rev 27008)
@@ -42,10 +42,16 @@
TITLE_SHADOW_FRAME = 2
};
+/** All key definition prior to FIRST_KEY are not grabbed continuously */
#define FIRST_KEY KEY_ADD_ADJACENT_WORKSPACE
enum
{
KEY_CANCEL = 0,
+ KEY_DOWN,
+ KEY_LEFT,
+ KEY_RIGHT,
+ KEY_UP,
+ /* FIRST_KEY starts here */
KEY_ADD_ADJACENT_WORKSPACE,
KEY_ADD_WORKSPACE,
KEY_CLOSE_WINDOW,
@@ -62,15 +68,12 @@
KEY_MAXIMIZE_HORIZ,
KEY_MAXIMIZE_VERT,
KEY_MAXIMIZE_WINDOW,
- KEY_MOVE_DOWN,
+ KEY_MOVE,
KEY_MOVE_DOWN_WORKSPACE,
- KEY_MOVE_LEFT,
KEY_MOVE_LEFT_WORKSPACE,
KEY_MOVE_NEXT_WORKSPACE,
KEY_MOVE_PREV_WORKSPACE,
- KEY_MOVE_RIGHT,
KEY_MOVE_RIGHT_WORKSPACE,
- KEY_MOVE_UP,
KEY_MOVE_UP_WORKSPACE,
KEY_MOVE_WORKSPACE_1,
KEY_MOVE_WORKSPACE_10,
@@ -88,10 +91,7 @@
KEY_POPUP_MENU,
KEY_PREV_WORKSPACE,
KEY_RAISE_WINDOW,
- KEY_RESIZE_DOWN,
- KEY_RESIZE_LEFT,
- KEY_RESIZE_RIGHT,
- KEY_RESIZE_UP,
+ KEY_RESIZE,
KEY_RIGHT_WORKSPACE,
KEY_SHADE_WINDOW,
KEY_SHOW_DESKTOP,
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
