Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "fix bug in Xinerama when mouse is not in the same screen that mouse" 

This reverts commit 845984fed0.
This commit is contained in:
Julien Danjou 2007-10-01 12:43:05 +02:00
parent 845984fed0
commit 47ec01e571
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
event.c
View File

@ -342,7 +342,7 @@ handle_event_expose(XEvent * e, awesome_config *awesomeconf)
void void
handle_event_keypress(XEvent * e, awesome_config *awesomeconf) handle_event_keypress(XEvent * e, awesome_config *awesomeconf)
{ {
int i, screen = 0, x, y, d; int i, screen, x, y, d;
unsigned int m; unsigned int m;
KeySym keysym; KeySym keysym;
XKeyEvent *ev = &e->xkey; XKeyEvent *ev = &e->xkey;
@ -351,20 +351,17 @@ handle_event_keypress(XEvent * e, awesome_config *awesomeconf)
keysym = XKeycodeToKeysym(e->xany.display, (KeyCode) ev->keycode, 0); keysym = XKeycodeToKeysym(e->xany.display, (KeyCode) ev->keycode, 0);
/* find the right screen for this event */ /* find the right screen for this event */
if(sel) for(screen = 0; screen < ScreenCount(e->xany.display); screen++)
screen = sel->screen; if(XQueryPointer(e->xany.display, RootWindow(e->xany.display, screen), &dummy, &dummy, &x, &y, &d, &d, &m))
else {
for(screen = 0; screen < ScreenCount(e->xany.display); screen++) /* if screen is 0, we are on first Zaphod screen or on the
if(XQueryPointer(e->xany.display, RootWindow(e->xany.display, screen), &dummy, &dummy, &x, &y, &d, &d, &m)) * only screen in Xinerama, so we can ask for a better screen
{ * number with get_screen_bycoord: we'll get 0 in Zaphod mode
/* if screen is 0, we are on first Zaphod screen or on the * so it's the same, or maybe the real Xinerama screen */
* only screen in Xinerama, so we can ask for a better screen if(screen == 0)
* number with get_screen_bycoord: we'll get 0 in Zaphod mode screen = get_screen_bycoord(e->xany.display, x, y);
* so it's the same, or maybe the real Xinerama screen */ break;
if(screen == 0) }
screen = get_screen_bycoord(e->xany.display, x, y);
break;
}
for(i = 0; i < awesomeconf[screen].nkeys; i++) for(i = 0; i < awesomeconf[screen].nkeys; i++)
if(keysym == awesomeconf[screen].keys[i].keysym if(keysym == awesomeconf[screen].keys[i].keysym