frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mi: split move to new screen logic to a helper function 

No functional changes.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-12-15 07:57:47 +10:00
parent 3b1e2035cc
commit 48547068b1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mi/mieq.c
View File

@ -471,6 +471,19 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
} }
static void
mieqMoveToNewScreen(DeviceIntPtr dev, ScreenPtr screen, DeviceEvent *event)
{
if (dev && screen && screen != DequeueScreen(dev))
{
int x = 0, y = 0;
DequeueScreen(dev) = screen;
x = event->root_x;
y = event->root_y;
NewCurrentScreen (dev, DequeueScreen(dev), x, y);
}
}
/** /**
* Post the given @event through the device hierarchy, as appropriate. * Post the given @event through the device hierarchy, as appropriate.
* Use this function if an event must be posted for a given device during the * Use this function if an event must be posted for a given device during the
@ -482,7 +495,6 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
ScreenPtr screen) ScreenPtr screen)
{ {
mieqHandler handler; mieqHandler handler;
int x = 0, y = 0;
DeviceIntPtr master; DeviceIntPtr master;
InternalEvent mevent; /* master event */ InternalEvent mevent; /* master event */
@ -499,12 +511,8 @@ mieqProcessDeviceEvent(DeviceIntPtr dev,
case ET_KeyRelease: case ET_KeyRelease:
case ET_ButtonPress: case ET_ButtonPress:
case ET_ButtonRelease: case ET_ButtonRelease:
if (dev && screen && screen != DequeueScreen(dev) && !handler) { if (!handler)
DequeueScreen(dev) = screen; mieqMoveToNewScreen(dev, screen, &event->device_event);
x = event->device_event.root_x;
y = event->device_event.root_y;
NewCurrentScreen (dev, DequeueScreen(dev), x, y);
}
break; break;
default: default:
break; break;