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

input: remove GetKeyboardValuatorEvents, this is now unnecessary. 

GetKeyboardValuatorEvents handles NULL valuator masks already, so the
GetKeyboardEvents wrapper is not needed. Rename GKVE to GKE.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Peter Hutterer 2011-04-11 15:22:52 +10:00
parent 91a735328c
commit 071a6ac4d0
11 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Xext/xtest.c
View File

@ -423,7 +423,7 @@ ProcXTestFakeInput(ClientPtr client)
break; break;
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
nevents = GetKeyboardEvents(xtest_evlist, dev, type, ev->u.u.detail); nevents = GetKeyboardEvents(xtest_evlist, dev, type, ev->u.u.detail, NULL);
break; break;
} }

2
dix/devices.c
View File

@ -2392,7 +2392,7 @@ ReleaseButtonsAndKeys(DeviceIntPtr dev)
{ {
if (BitIsOn(k->down, i)) if (BitIsOn(k->down, i))
{ {
nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i); nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i, NULL);
for (j = 0; j < nevents; j++) for (j = 0; j < nevents; j++)
mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL); mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);
} }

19
dix/getevents.c
View File

@ -616,8 +616,8 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, ValuatorMask *mask,
/** /**
* Returns the maximum number of events GetKeyboardEvents, * Returns the maximum number of events GetKeyboardEvents
* GetKeyboardValuatorEvents, and GetPointerEvents will ever return. * and GetPointerEvents will ever return.
* *
* This MUST be absolutely constant, from init until exit. * This MUST be absolutely constant, from init until exit.
*/ */
@ -925,19 +925,6 @@ updateHistory(DeviceIntPtr dev, ValuatorMask *mask, CARD32 ms)
} }
} }
/**
* Convenience wrapper around GetKeyboardValuatorEvents, that takes no
* valuators.
*/
int
GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code) {
ValuatorMask mask;
valuator_mask_zero(&mask);
return GetKeyboardValuatorEvents(events, pDev, type, key_code, &mask);
}
/** /**
* Returns a set of InternalEvents for KeyPress/KeyRelease, optionally * Returns a set of InternalEvents for KeyPress/KeyRelease, optionally
* also with valuator events. * also with valuator events.
@ -947,7 +934,7 @@ GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type, int key_code)
* place via GetMaximumEventsNum(), and for freeing it. * place via GetMaximumEventsNum(), and for freeing it.
*/ */
int int
GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type, GetKeyboardEvents(EventList *events, DeviceIntPtr pDev, int type,
int key_code, const ValuatorMask *mask_in) { int key_code, const ValuatorMask *mask_in) {
int num_events = 0; int num_events = 0;
CARD32 ms = 0; CARD32 ms = 0;

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

@ -453,7 +453,7 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
if (block) if (block)
dmxSigioBlock(); dmxSigioBlock();
GetEventList(&events); GetEventList(&events);
nevents = GetKeyboardValuatorEvents(events, pDevice, event, nevents = GetKeyboardEvents(events, pDevice, event,
ke->keycode, &mask); ke->keycode, &mask);
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(pDevice, (InternalEvent*)(events + i)->event); mieqEnqueue(pDevice, (InternalEvent*)(events + i)->event);
@ -685,7 +685,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
GetEventList(&events); GetEventList(&events);
/*ErrorF("KEY %d sym %d\n", detail, (int) keySym);*/ /*ErrorF("KEY %d sym %d\n", detail, (int) keySym);*/
nevents = GetKeyboardEvents(events, p, type, detail); nevents = GetKeyboardEvents(events, p, type, detail, NULL);
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(p, (InternalEvent*)(events + i)->event); mieqEnqueue(p, (InternalEvent*)(events + i)->event);
return; return;

4
hw/kdrive/src/kinput.c
View File

@ -1804,7 +1804,7 @@ KdReleaseAllKeys (void)
if (key_is_down(ki->dixdev, key, KEY_POSTED | KEY_PROCESSED)) { if (key_is_down(ki->dixdev, key, KEY_POSTED | KEY_PROCESSED)) {
KdHandleKeyboardEvent(ki, KeyRelease, key); KdHandleKeyboardEvent(ki, KeyRelease, key);
GetEventList(&kdEvents); GetEventList(&kdEvents);
nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key); nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key, NULL);
for (i = 0; i < nEvents; i++) for (i = 0; i < nEvents; i++)
KdQueueEvent (ki->dixdev, (kdEvents + i)->event); KdQueueEvent (ki->dixdev, (kdEvents + i)->event);
} }
@ -1864,7 +1864,7 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo *ki,
GetEventList(&kdEvents); GetEventList(&kdEvents);
nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code); nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code, NULL);
for (i = 0; i < nEvents; i++) for (i = 0; i < nEvents; i++)
KdQueueEvent(ki->dixdev, (InternalEvent *)((kdEvents + i)->event)); KdQueueEvent(ki->dixdev, (InternalEvent *)((kdEvents + i)->event));
} }

2
hw/xfree86/common/xf86Events.c
View File

@ -399,7 +399,7 @@ xf86ReleaseKeys(DeviceIntPtr pDev)
i++) { i++) {
if (key_is_down(pDev, i, KEY_POSTED)) { if (key_is_down(pDev, i, KEY_POSTED)) {
sigstate = xf86BlockSIGIO (); sigstate = xf86BlockSIGIO ();
nevents = GetKeyboardEvents(xf86Events, pDev, KeyRelease, i); nevents = GetKeyboardEvents(xf86Events, pDev, KeyRelease, i, NULL);
for (j = 0; j < nevents; j++) for (j = 0; j < nevents; j++)
mieqEnqueue(pDev, (InternalEvent*)(xf86Events + j)->event); mieqEnqueue(pDev, (InternalEvent*)(xf86Events + j)->event);
xf86UnblockSIGIO(sigstate); xf86UnblockSIGIO(sigstate);

9
hw/xfree86/common/xf86Xinput.c
View File

@ -1252,16 +1252,9 @@ xf86PostKeyEventM(DeviceIntPtr device,
} }
#endif #endif
if (is_absolute) {
nevents = GetKeyboardValuatorEvents(xf86Events, device,
is_down ? KeyPress : KeyRelease,
key_code, mask);
}
else {
nevents = GetKeyboardEvents(xf86Events, device, nevents = GetKeyboardEvents(xf86Events, device,
is_down ? KeyPress : KeyRelease, is_down ? KeyPress : KeyRelease,
key_code); key_code, mask);
}
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event)); mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

2
hw/xnest/Events.c
View File

@ -108,7 +108,7 @@ xnestQueueKeyEvent(int type, unsigned int keycode)
GetEventList(&xnestEvents); GetEventList(&xnestEvents);
lastEventTime = GetTimeInMillis(); lastEventTime = GetTimeInMillis();
n = GetKeyboardEvents(xnestEvents, xnestKeyboardDevice, type, keycode); n = GetKeyboardEvents(xnestEvents, xnestKeyboardDevice, type, keycode, NULL);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
mieqEnqueue(xnestKeyboardDevice, (InternalEvent*)(xnestEvents + i)->event); mieqEnqueue(xnestKeyboardDevice, (InternalEvent*)(xnestEvents + i)->event);
} }

2
hw/xquartz/darwinEvents.c
View File

@ -482,7 +482,7 @@ void DarwinSendKeyboardEvents(int ev_type, int keycode) {
} }
darwinEvents_lock(); { darwinEvents_lock(); {
num_events = GetKeyboardEvents(darwinEvents, darwinKeyboard, ev_type, keycode + MIN_KEYCODE); num_events = GetKeyboardEvents(darwinEvents, darwinKeyboard, ev_type, keycode + MIN_KEYCODE, NULL);
for(i=0; i<num_events; i++) mieqEnqueue(darwinKeyboard, (InternalEvent*)darwinEvents[i].event); for(i=0; i<num_events; i++) mieqEnqueue(darwinKeyboard, (InternalEvent*)darwinEvents[i].event);
if(num_events > 0) DarwinPokeEQ(); if(num_events > 0) DarwinPokeEQ();
} darwinEvents_unlock(); } darwinEvents_unlock();

2
hw/xwin/winkeybd.c
View File

@ -485,7 +485,7 @@ winSendKeyEvent (DWORD dwKey, Bool fDown)
g_winKeyState[dwKey] = fDown; g_winKeyState[dwKey] = fDown;
GetEventList(&events); GetEventList(&events);
nevents = GetKeyboardEvents(events, g_pwinKeyboard, fDown ? KeyPress : KeyRelease, dwKey + MIN_KEYCODE); nevents = GetKeyboardEvents(events, g_pwinKeyboard, fDown ? KeyPress : KeyRelease, dwKey + MIN_KEYCODE, NULL);
for (i = 0; i < nevents; i++) for (i = 0; i < nevents; i++)
mieqEnqueue(g_pwinKeyboard, (InternalEvent*)events[i].event); mieqEnqueue(g_pwinKeyboard, (InternalEvent*)events[i].event);

6
include/input.h
View File

@ -462,12 +462,6 @@ extern _X_EXPORT int GetPointerEvents(
const ValuatorMask *mask); const ValuatorMask *mask);
extern _X_EXPORT int GetKeyboardEvents( extern _X_EXPORT int GetKeyboardEvents(
EventListPtr events,
DeviceIntPtr pDev,
int type,
int key_code);
extern int GetKeyboardValuatorEvents(
EventListPtr events, EventListPtr events,
DeviceIntPtr pDev, DeviceIntPtr pDev,
int type, int type,