diff options
| author | Keith Packard <keithp@keithp.com> | 2011-12-14 11:40:10 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-12-14 11:40:10 -0800 |
| commit | 7da7aa96a0acb895e1fe57a9d3f2d093479cf2a2 (patch) | |
| tree | fc9aa833defaa1b8f95a56755be52afff281ca03 /hw | |
| parent | b79de3f42ff8412dcabf2f2a805cbcbd1c6907c3 (diff) | |
| parent | 7528a6b88eb32098af4369a8bd9d70a808fa6f1c (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xfree86/common/xf86DGA.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 46e3005fa..0c958cdf3 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1037,7 +1037,7 @@ DGAProcessKeyboardEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr keybd) if (pScreenPriv->client) { dgaEvent de; - de.u.u.type = *XDGAEventBase + GetCoreType((InternalEvent*)&ev); + de.u.u.type = *XDGAEventBase + GetCoreType(ev.type); de.u.u.detail = event->detail; de.u.event.time = event->time; de.u.event.dx = event->dx; @@ -1091,7 +1091,7 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse) dgaEvent de; int coreEquiv; - coreEquiv = GetCoreType((InternalEvent*)&ev); + coreEquiv = GetCoreType(ev.type); de.u.u.type = *XDGAEventBase + coreEquiv; de.u.u.detail = event->detail; |