diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-11 15:11:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-11 15:11:55 +0000 |
| commit | 820f57fadfe7d14e01e0284ff8a23298a0f59b20 (patch) | |
| tree | 14b8a09656a95a710b976895d89f02e79ad30298 /xorg-server/hw | |
| parent | 20a84cc5bb91a8708cd9e9ebcd1715ceeab8dae2 (diff) | |
| download | vcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.tar.gz vcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.tar.bz2 vcxsrv-820f57fadfe7d14e01e0284ff8a23298a0f59b20.zip | |
svn merge -r581:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/dmx/dmxextension.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86DGA.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xorg-server/hw/dmx/dmxextension.c b/xorg-server/hw/dmx/dmxextension.c index 4e555330e..c8e8dae65 100644 --- a/xorg-server/hw/dmx/dmxextension.c +++ b/xorg-server/hw/dmx/dmxextension.c @@ -1155,7 +1155,7 @@ static void dmxBERestoreRenderGlyph(pointer value, XID id, pointer n) len_images); /* Clean up */ - free(len_images); + free(images); free(gids); free(glyphs); } 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); |