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

xfree86: xf86DGA: some cleanup to use the correct devices instead of VCP/VCK.

This commit is contained in:
Peter Hutterer 2007-10-02 10:50:59 +09:30
parent 54ce7436b2
commit 122ae65ed9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/common/xf86DGA.c
View File

@ -1144,15 +1144,15 @@ DGAProcessPointerEvent (ScreenPtr pScreen, dgaEvent *de, DeviceIntPtr mouse)
* Fill in remaining event state * Fill in remaining event state
*/ */
de->u.event.screen = pScreen->myNum; de->u.event.screen = pScreen->myNum;
de->u.event.state = butc->state | inputInfo.keyboard->key->state; de->u.event.state = butc->state | GetPairedKeyboard(mouse)->key->state;
/* /*
* Keep the core state in sync by duplicating what * Keep the core state in sync by duplicating what
* CoreProcessPointerEvent does * CoreProcessPointerEvent does
*/ */
if (coreEquiv != MotionNotify) if (coreEquiv != MotionNotify)
{ {
register int key; int key;
register BYTE *kptr; BYTE *kptr;
int bit; int bit;
key = de->u.u.detail; key = de->u.u.detail;
@ -1295,10 +1295,10 @@ DGAHandleEvent(int screen_num, xEvent *event, DeviceIntPtr device, int nevents)
switch (coreEquiv) { switch (coreEquiv) {
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
DGAProcessKeyboardEvent (pScreen, de, inputInfo.keyboard); DGAProcessKeyboardEvent (pScreen, de, device);
break; break;
default: default:
DGAProcessPointerEvent (pScreen, de, inputInfo.pointer); DGAProcessPointerEvent (pScreen, de, device);
break; break;
} }
} }