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

checkpoint: more clean-up

This commit is contained in:
Brian 2007-04-02 15:38:15 -06:00
parent 76a7a5ca1f
commit 3e482de7b1
1 changed files with 39 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
hw/dmx/input/dmxevents.c
View File

@ -662,70 +662,56 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
{ {
GETDMXINPUTFROMPDEV; GETDMXINPUTFROMPDEV;
xEvent xE; xEvent xE;
DeviceIntPtr p = dmxLocal->pDevice;
int i, nevents, valuators[3];
xEvent *events;
DMXDBG2("dmxEnqueue: Enqueuing type=%d detail=0x%0x\n", type, detail); DMXDBG2("dmxEnqueue: Enqueuing type=%d detail=0x%0x\n", type, detail);
switch (type) { switch (type) {
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
if (!keySym) keySym = dmxKeyCodeToKeySym(dmxLocal, detail); if (!keySym)
keySym = dmxKeyCodeToKeySym(dmxLocal, detail);
if (dmxCheckFunctionKeys(dmxLocal, type, keySym)) if (dmxCheckFunctionKeys(dmxLocal, type, keySym))
return; return;
if (dmxLocal->sendsCore && dmxLocal != dmxLocalCoreKeyboard) if (dmxLocal->sendsCore && dmxLocal != dmxLocalCoreKeyboard)
xE.u.u.detail = dmxFixup(pDev, detail, keySym); xE.u.u.detail = dmxFixup(pDev, detail, keySym);
{
DeviceIntPtr p = dmxLocal->pDevice; events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum());
int i, nevents; ErrorF("KEY %d\n", detail);
xEvent *events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum()); nevents = GetKeyboardEvents(events, p, type, detail);
ErrorF("KEY %d\n", detail); for (i = 0; i < nevents; i++)
nevents = GetKeyboardEvents(events, p, type, detail); mieqEnqueue(p, events + i);
for (i = 0; i < nevents; i++) xfree(events);
mieqEnqueue(p, events + i); return;
xfree(events);
return;
}
break;
case ButtonPress: case ButtonPress:
case ButtonRelease: case ButtonRelease:
detail = dmxGetButtonMapping(dmxLocal, detail); detail = dmxGetButtonMapping(dmxLocal, detail);
{ events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum());
DeviceIntPtr p = dmxLocal->pDevice; nevents = GetPointerEvents(events, p, type, detail,
int i, nevents, valuators[3]; POINTER_ABSOLUTE,
xEvent *events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum()); 0, /* first_valuator = 0 */
valuators[2] = e->xbutton.button; 0, /* num_valuators = 0 */
nevents = GetPointerEvents(events, p, type, detail, valuators);
POINTER_ABSOLUTE, for (i = 0; i < nevents; i++)
0, /* first_valuator = 0 */ mieqEnqueue(p, events + i);
0, /* num_valuators = 0 */ xfree(events);
valuators); return;
ErrorF("BUTTON %d, %d %d n=%d\n",
valuators[0], valuators[1], valuators[2], nevents);
for (i = 0; i < nevents; i++)
mieqEnqueue(p, events + i);
xfree(events);
return;
}
break;
case MotionNotify: case MotionNotify:
{ events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum());
DeviceIntPtr p = dmxLocal->pDevice; valuators[0] = e->xmotion.x;
int i, nevents, valuators[3]; valuators[1] = e->xmotion.y;
xEvent *events = Xcalloc(sizeof(xEvent), GetMaximumEventsNum()); valuators[2] = e->xmotion.state;
valuators[0] = e->xmotion.x; nevents = GetPointerEvents(events, p, type, detail,
valuators[1] = e->xmotion.y; POINTER_ABSOLUTE, 0, 3, valuators);
valuators[2] = e->xmotion.state; for (i = 0; i < nevents; i++)
nevents = GetPointerEvents(events, p, type, detail, mieqEnqueue(p, events + i);
POINTER_ABSOLUTE, 0, 3, valuators); xfree(events);
ErrorF("MOTION %d, %d n = %d\n", valuators[0], valuators[1], nevents); return;
for (i = 0; i < nevents; i++)
mieqEnqueue(p, events + i);
xfree(events);
return;
}
break;
/* Always ignore these events */
case EnterNotify: case EnterNotify:
case LeaveNotify: case LeaveNotify:
case KeymapNotify: case KeymapNotify:
@ -754,25 +740,19 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
return; return;
} }
#if 00 /* dead code? */
memset(&xE, 0, sizeof(xE)); memset(&xE, 0, sizeof(xE));
xE.u.u.type = type; xE.u.u.type = type;
xE.u.u.detail = detail; xE.u.u.detail = detail;
xE.u.keyButtonPointer.time = GetTimeInMillis(); xE.u.keyButtonPointer.time = GetTimeInMillis();
#ifdef XINPUT #ifdef XINPUT
if (!dmxLocal->sendsCore) dmxEnqueueExtEvent(dmxLocal, &xE, block); if (!dmxLocal->sendsCore)
dmxEnqueueExtEvent(dmxLocal, &xE, block);
else else
#endif #endif
#if 00 /*BP*/
dmxeqEnqueue(&xE); dmxeqEnqueue(&xE);
#else #endif /*00*/
/* never get here! */
if (0) {
DeviceIntPtr p = dmxLocal->pDevice;
ErrorF("enque %d\n", type);
mieqEnqueue(p, &xE);
}
#endif
} }
/** A pointer to this routine is passed to low-level input drivers so /** A pointer to this routine is passed to low-level input drivers so