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

dix: change GetEventList to return length of list and set parameter in place. 

Changing DDXs to use new prototype too.
This commit is contained in:
Peter Hutterer 2008-02-03 10:15:40 +10:30
parent 77dba004a9
commit 74628d6397
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/getevents.c
View File

@ -77,10 +77,11 @@ extern Bool XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies);
EventListPtr InputEventList = NULL; EventListPtr InputEventList = NULL;
int InputEventListLen = 0; int InputEventListLen = 0;
_X_EXPORT EventListPtr _X_EXPORT int
GetEventList() GetEventList(EventListPtr* list)
{ {
return InputEventList; *list = InputEventList;
return InputEventListLen;
} }
/** /**

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

@ -65,7 +65,7 @@ static struct KdConfigDevice *kdConfigPointers = NULL;
static KdKeyboardDriver *kdKeyboardDrivers = NULL; static KdKeyboardDriver *kdKeyboardDrivers = NULL;
static KdPointerDriver *kdPointerDrivers = NULL; static KdPointerDriver *kdPointerDrivers = NULL;
static EventListPtr *kdEvents = NULL; static EventListPtr kdEvents = NULL;
static Bool kdInputEnabled; static Bool kdInputEnabled;
static Bool kdOffScreen; static Bool kdOffScreen;
@ -1979,7 +1979,7 @@ KdReleaseAllKeys (void)
key++) { key++) {
if (IsKeyDown(ki, key)) { if (IsKeyDown(ki, key)) {
KdHandleKeyboardEvent(ki, KeyRelease, key); KdHandleKeyboardEvent(ki, KeyRelease, key);
kdEvents = GetEventList(); GetEventList(&kdEvents);
nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key); nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key);
for (i = 0; i < nEvents; i++) for (i = 0; i < nEvents; i++)
KdQueueEvent (ki->dixdev, kdEvents + i); KdQueueEvent (ki->dixdev, kdEvents + i);
@ -2044,7 +2044,7 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo *ki,
KdHandleKeyboardEvent(ki, type, key_code); KdHandleKeyboardEvent(ki, type, key_code);
} }
kdEvents = GetEventList(); GetEventList(&kdEvents);
nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code); nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code);
for (i = 0; i < nEvents; i++) for (i = 0; i < nEvents; i++)
KdQueueEvent(ki->dixdev, kdEvents); KdQueueEvent(ki->dixdev, kdEvents);
@ -2145,7 +2145,7 @@ _KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
if (!force && KdHandlePointerEvent(pi, type, x, y, z, b, absrel)) if (!force && KdHandlePointerEvent(pi, type, x, y, z, b, absrel))
return; return;
kdEvents = GetEventList(); GetEventList(&kdEvents);
nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel, nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel,
0, 3, valuators); 0, 3, valuators);
for (i = 0; i < nEvents; i++) for (i = 0; i < nEvents; i++)

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

@ -569,7 +569,7 @@ xf86PostMotionEventP(DeviceIntPtr device,
} }
#endif #endif
xf86Events = GetEventList(); GetEventList(&xf86Events);
nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0, nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0,
flags, first_valuator, num_valuators, flags, first_valuator, num_valuators,
valuators); valuators);
@ -601,7 +601,7 @@ xf86PostProximityEvent(DeviceIntPtr device,
valuators[i] = va_arg(var, int); valuators[i] = va_arg(var, int);
va_end(var); va_end(var);
xf86Events = GetEventList(); GetEventList(&xf86Events);
nevents = GetProximityEvents(xf86Events, device, nevents = GetProximityEvents(xf86Events, device,
is_in ? ProximityIn : ProximityOut, is_in ? ProximityIn : ProximityOut,
first_valuator, num_valuators, valuators); first_valuator, num_valuators, valuators);
@ -639,7 +639,7 @@ xf86PostButtonEvent(DeviceIntPtr device,
valuators[i] = va_arg(var, int); valuators[i] = va_arg(var, int);
va_end(var); va_end(var);
xf86Events = GetEventList(); GetEventList(&xf86Events);
nevents = GetPointerEvents(xf86Events, device, nevents = GetPointerEvents(xf86Events, device,
is_down ? ButtonPress : ButtonRelease, button, is_down ? ButtonPress : ButtonRelease, button,
(is_absolute) ? POINTER_ABSOLUTE : POINTER_RELATIVE, (is_absolute) ? POINTER_ABSOLUTE : POINTER_RELATIVE,
@ -675,7 +675,7 @@ xf86PostKeyEvent(DeviceIntPtr device,
valuators[i] = va_arg(var, int); valuators[i] = va_arg(var, int);
va_end(var); va_end(var);
xf86Events = GetEventList(); GetEventList(&xf86Events);
nevents = GetKeyboardValuatorEvents(xf86Events, device, nevents = GetKeyboardValuatorEvents(xf86Events, device,
is_down ? KeyPress : KeyRelease, is_down ? KeyPress : KeyRelease,
key_code, first_valuator, key_code, first_valuator,
@ -710,7 +710,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device,
} }
#endif #endif
xf86Events = GetEventList(); GetEventList(&xf86Events);
nevents = GetKeyboardEvents(xf86Events, device, nevents = GetKeyboardEvents(xf86Events, device,
is_down ? KeyPress : KeyRelease, key_code); is_down ? KeyPress : KeyRelease, key_code);

2
include/input.h
View File

@ -399,7 +399,7 @@ extern void InitInput(
extern int GetMaximumEventsNum(void); extern int GetMaximumEventsNum(void);
extern EventListPtr GetEventList(); extern int GetEventList(EventListPtr* list);
extern EventListPtr InitEventList(int num_events); extern EventListPtr InitEventList(int num_events);
extern void SetMinimumEventSize(EventListPtr list, extern void SetMinimumEventSize(EventListPtr list,
int num_events, int num_events,