Author: olivier
Date: 2007-01-12 17:43:36 +0000 (Fri, 12 Jan 2007)
New Revision: 24373
Modified:
xfwm4/trunk/src/events.c
xfwm4/trunk/themes/daloa/Makefile.in
xfwm4/trunk/themes/mopti/Makefile.in
Log:
Use screen from xevent instead of client for keypress (Bug #2749)
Modified: xfwm4/trunk/src/events.c
===================================================================
--- xfwm4/trunk/src/events.c 2007-01-12 16:25:27 UTC (rev 24372)
+++ xfwm4/trunk/src/events.c 2007-01-12 17:43:36 UTC (rev 24373)
@@ -375,11 +375,18 @@
handleKeyPress (DisplayInfo *display_info, XKeyEvent * ev)
{
ScreenInfo *screen_info;
+ ScreenInfo *ev_screen_info;
Client *c;
int key;
TRACE ("entering handleKeyEvent");
+ ev_screen_info = myDisplayGetScreenFromRoot (display_info, ev->root);
+ if (!ev_screen_info)
+ {
+ return;
+ }
+
c = clientGetFocus ();
if (c)
{
@@ -498,19 +505,13 @@
}
else
{
- screen_info = myDisplayGetScreenFromRoot (display_info, ev->root);
- if (!screen_info)
- {
- return;
- }
-
- key = getKeyPressed (screen_info, ev);
+ key = getKeyPressed (ev_screen_info, ev);
switch (key)
{
case KEY_CYCLE_WINDOWS:
- if (screen_info->clients)
+ if (ev_screen_info->clients)
{
- clientCycle (screen_info->clients->prev, (XEvent *) ev);
+ clientCycle (ev_screen_info->clients->prev, (XEvent *) ev);
}
break;
case KEY_CLOSE_WINDOW:
@@ -523,35 +524,32 @@
break;
}
}
- /*
- Here we know that "screen_info" is defined, otherwise, we would
- already have returned...
- */
+
switch (key)
{
case KEY_NEXT_WORKSPACE:
- workspaceSwitch (screen_info, screen_info->current_ws + 1, NULL,
TRUE, ev->time);
+ workspaceSwitch (ev_screen_info, ev_screen_info->current_ws + 1,
NULL, TRUE, ev->time);
break;
case KEY_PREV_WORKSPACE:
- workspaceSwitch (screen_info, screen_info->current_ws - 1, NULL,
TRUE, ev->time);
+ workspaceSwitch (ev_screen_info, ev_screen_info->current_ws - 1,
NULL, TRUE, ev->time);
break;
case KEY_UP_WORKSPACE:
- workspaceMove(screen_info, -1, 0, NULL, ev->time);
+ workspaceMove(ev_screen_info, -1, 0, NULL, ev->time);
break;
case KEY_DOWN_WORKSPACE:
- workspaceMove(screen_info, 1, 0, NULL, ev->time);
+ workspaceMove(ev_screen_info, 1, 0, NULL, ev->time);
break;
case KEY_LEFT_WORKSPACE:
- workspaceMove(screen_info, 0, -1, NULL, ev->time);
+ workspaceMove(ev_screen_info, 0, -1, NULL, ev->time);
break;
case KEY_RIGHT_WORKSPACE:
- workspaceMove(screen_info, 0, 1, NULL, ev->time);
+ workspaceMove(ev_screen_info, 0, 1, NULL, ev->time);
break;
case KEY_ADD_WORKSPACE:
- workspaceSetCount (screen_info, screen_info->workspace_count + 1);
+ workspaceSetCount (ev_screen_info, ev_screen_info->workspace_count
+ 1);
break;
case KEY_DEL_WORKSPACE:
- workspaceSetCount (screen_info, screen_info->workspace_count - 1);
+ workspaceSetCount (ev_screen_info, ev_screen_info->workspace_count
- 1);
break;
case KEY_WORKSPACE_1:
case KEY_WORKSPACE_2:
@@ -565,13 +563,13 @@
case KEY_WORKSPACE_10:
case KEY_WORKSPACE_11:
case KEY_WORKSPACE_12:
- if (key - KEY_WORKSPACE_1 < screen_info->workspace_count)
+ if (key - KEY_WORKSPACE_1 < ev_screen_info->workspace_count)
{
- workspaceSwitch (screen_info, key - KEY_WORKSPACE_1, NULL,
TRUE, ev->time);
+ workspaceSwitch (ev_screen_info, key - KEY_WORKSPACE_1, NULL,
TRUE, ev->time);
}
break;
case KEY_SHOW_DESKTOP:
- toggle_show_desktop (screen_info);
+ toggle_show_desktop (ev_screen_info);
break;
default:
break;
Modified: xfwm4/trunk/themes/daloa/Makefile.in
===================================================================
--- xfwm4/trunk/themes/daloa/Makefile.in 2007-01-12 16:25:27 UTC (rev
24372)
+++ xfwm4/trunk/themes/daloa/Makefile.in 2007-01-12 17:43:36 UTC (rev
24373)
@@ -97,7 +97,6 @@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
-GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -206,15 +205,18 @@
XFCE_MCS_MANAGER_VERSION = @XFCE_MCS_MANAGER_VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_ARGS = @XGETTEXT_ARGS@
-XMKMF = @XMKMF@
XSYNC_LIBS = @XSYNC_LIBS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -231,16 +233,12 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
@@ -251,10 +249,8 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
-psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
Modified: xfwm4/trunk/themes/mopti/Makefile.in
===================================================================
--- xfwm4/trunk/themes/mopti/Makefile.in 2007-01-12 16:25:27 UTC (rev
24372)
+++ xfwm4/trunk/themes/mopti/Makefile.in 2007-01-12 17:43:36 UTC (rev
24373)
@@ -97,7 +97,6 @@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
-GREP = @GREP@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
@@ -206,15 +205,18 @@
XFCE_MCS_MANAGER_VERSION = @XFCE_MCS_MANAGER_VERSION@
XGETTEXT = @XGETTEXT@
XGETTEXT_ARGS = @XGETTEXT_ARGS@
-XMKMF = @XMKMF@
XSYNC_LIBS = @XSYNC_LIBS@
X_CFLAGS = @X_CFLAGS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@@ -231,16 +233,12 @@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
-htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
@@ -251,10 +249,8 @@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
-psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
