diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-15 09:03:52 +0100 |
| commit | 4d64875593956234795d9947ac1d225e5b110f0f (patch) | |
| tree | 5cc58965cdfe27a50f86f0d8872a7da80cc7248d /xorg-server/hw/kdrive/ephyr/ephyr.c | |
| parent | 9837797b353b2e24e7ac96d3a74159497410c21a (diff) | |
| parent | aa095d69b3874eb179cb77f033109a7f8f351041 (diff) | |
| download | vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.gz vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.tar.bz2 vcxsrv-4d64875593956234795d9947ac1d225e5b110f0f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xcb-proto mesa xserver git update 15 nov 2013
Conflicts:
xorg-server/mi/mieq.c
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyr.c')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyr.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c index 08ec5d751..a10f47286 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.c +++ b/xorg-server/hw/kdrive/ephyr/ephyr.c @@ -970,7 +970,14 @@ ephyrProcessMouseMotion(xcb_generic_event_t *xev) } EPHYR_LOG("final (x,y):(%d,%d)\n", x, y); #endif - KdEnqueuePointerEvent(ephyrMouse, mouseState, x, y, 0); + + /* convert coords into desktop-wide coordinates. + * fill_pointer_events will convert that back to + * per-screen coordinates where needed */ + x += screen->pScreen->x; + y += screen->pScreen->y; + + KdEnqueuePointerEvent(ephyrMouse, mouseState | KD_POINTER_DESKTOP, x, y, 0); } } |