aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/common
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-11 14:23:54 +0000
committermarha <marha@users.sourceforge.net>2010-05-11 14:23:54 +0000
commit9dea871b28ba9a8ef5374b6420aa5dafcd2610e1 (patch)
tree10e52cc929bf31f630adc11e729f185cf6e60099 /xorg-server/hw/xfree86/common
parent49c7992dfc9c6b8a60baf1afbede4616e0265e7f (diff)
downloadvcxsrv-9dea871b28ba9a8ef5374b6420aa5dafcd2610e1.tar.gz
vcxsrv-9dea871b28ba9a8ef5374b6420aa5dafcd2610e1.tar.bz2
vcxsrv-9dea871b28ba9a8ef5374b6420aa5dafcd2610e1.zip
xserver git update 11/5/2010
Diffstat (limited to 'xorg-server/hw/xfree86/common')
-rw-r--r--xorg-server/hw/xfree86/common/xf86DGA.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86DGA.c b/xorg-server/hw/xfree86/common/xf86DGA.c
index 1a1032786..794a13171 100644
--- a/xorg-server/hw/xfree86/common/xf86DGA.c
+++ b/xorg-server/hw/xfree86/common/xf86DGA.c
@@ -1088,13 +1088,15 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
ButtonClassPtr butc = mouse->button;
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
DeviceEvent ev;
+ DeviceIntPtr master = GetMaster(mouse, MASTER_KEYBOARD);
memset(&ev, 0, sizeof(ev));
ev.header = ET_Internal;
ev.length = sizeof(ev);
ev.type = event->subtype;
ev.corestate = butc->state;
- ev.corestate |= XkbStateFieldFromRec(&GetPairedDevice(mouse)->key->xkbInfo->state);
+ if (master && master->key)
+ ev.corestate |= XkbStateFieldFromRec(&master->key->xkbInfo->state);
UpdateDeviceState(mouse, &ev);