mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
input: replace EventListPtr with InternalEvent array
EventListPtr is a relic from pre-1.6, when we had protocol events in the event queue and thus events of varying size. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
@@ -177,7 +177,7 @@ static void enqueueMotion(DevicePtr pDev, int x, int y)
|
||||
GETDMXLOCALFROMPDEV;
|
||||
DeviceIntPtr p = dmxLocal->pDevice;
|
||||
int valuators[3];
|
||||
EventListPtr events;
|
||||
InternalEvent* events;
|
||||
int detail = 0; /* XXX should this be mask of pressed buttons? */
|
||||
ValuatorMask mask;
|
||||
valuators[0] = x;
|
||||
@@ -290,7 +290,7 @@ static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
|
||||
int thisX = 0;
|
||||
int thisY = 0;
|
||||
int count;
|
||||
EventListPtr events;
|
||||
InternalEvent* events;
|
||||
ValuatorMask mask;
|
||||
|
||||
memset(xE, 0, sizeof(xE));
|
||||
@@ -389,7 +389,7 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
|
||||
XDeviceMotionEvent *me = (XDeviceMotionEvent *)e;
|
||||
DeviceIntPtr pDevice = dmxLocal->pDevice;
|
||||
int valuators[MAX_VALUATORS];
|
||||
EventListPtr events;
|
||||
InternalEvent* events;
|
||||
ValuatorMask mask;
|
||||
|
||||
if (!e)
|
||||
@@ -652,7 +652,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
|
||||
xEvent xE;
|
||||
DeviceIntPtr p = dmxLocal->pDevice;
|
||||
int valuators[3];
|
||||
EventListPtr events;
|
||||
InternalEvent* events;
|
||||
ValuatorMask mask;
|
||||
|
||||
DMXDBG2("dmxEnqueue: Enqueuing type=%d detail=0x%0x\n", type, detail);
|
||||
|
||||
@@ -66,7 +66,7 @@ static struct KdConfigDevice *kdConfigPointers = NULL;
|
||||
static KdKeyboardDriver *kdKeyboardDrivers = NULL;
|
||||
static KdPointerDriver *kdPointerDrivers = NULL;
|
||||
|
||||
static EventListPtr kdEvents = NULL;
|
||||
static InternalEvent* kdEvents = NULL;
|
||||
|
||||
static Bool kdInputEnabled;
|
||||
static Bool kdOffScreen;
|
||||
|
||||
@@ -149,7 +149,7 @@ extern _X_EXPORT int xf86SetLogVerbosity(int verb);
|
||||
extern _X_EXPORT Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only );
|
||||
|
||||
/* xf86Xinput.c */
|
||||
extern _X_EXPORT EventList *xf86Events;
|
||||
extern _X_EXPORT InternalEvent *xf86Events;
|
||||
|
||||
#endif /* _NO_XF86_PROTOTYPES */
|
||||
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
return; \
|
||||
}
|
||||
|
||||
EventListPtr xf86Events = NULL;
|
||||
InternalEvent* xf86Events = NULL;
|
||||
|
||||
static int
|
||||
xf86InputDevicePostInit(DeviceIntPtr dev);
|
||||
|
||||
@@ -43,7 +43,7 @@ is" without express or implied warranty.
|
||||
|
||||
CARD32 lastEventTime = 0;
|
||||
|
||||
extern EventList *xnestEvents;
|
||||
extern InternalEvent *xnestEvents;
|
||||
|
||||
void
|
||||
ProcessInputEvents(void)
|
||||
|
||||
@@ -45,7 +45,7 @@ is" without express or implied warranty.
|
||||
|
||||
Bool xnestDoFullGeneration = True;
|
||||
|
||||
EventList *xnestEvents = NULL;
|
||||
InternalEvent *xnestEvents = NULL;
|
||||
|
||||
void
|
||||
InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
|
||||
|
||||
@@ -88,7 +88,7 @@ static pthread_mutex_t fd_add_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||
static pthread_cond_t fd_add_ready_cond = PTHREAD_COND_INITIALIZER;
|
||||
static pthread_t fd_add_tid = NULL;
|
||||
|
||||
static EventListPtr darwinEvents = NULL;
|
||||
static InternalEvent* darwinEvents = NULL;
|
||||
|
||||
static pthread_mutex_t mieq_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||
static pthread_cond_t mieq_ready_cond = PTHREAD_COND_INITIALIZER;
|
||||
|
||||
@@ -472,7 +472,7 @@ winKeybdReleaseKeys (void)
|
||||
void
|
||||
winSendKeyEvent (DWORD dwKey, Bool fDown)
|
||||
{
|
||||
EventListPtr events;
|
||||
InternalEvent* events;
|
||||
|
||||
/*
|
||||
* When alt-tabing between screens we can get phantom key up messages
|
||||
|
||||
@@ -234,7 +234,7 @@ winMouseWheel (ScreenPtr pScreen, int iDeltaZ)
|
||||
void
|
||||
winMouseButtonsSendEvent (int iEventType, int iButton)
|
||||
{
|
||||
EventListPtr events;
|
||||
InternalEvent* events;
|
||||
ValuatorMask mask;
|
||||
|
||||
if (g_winMouseButtonMap)
|
||||
@@ -365,7 +365,7 @@ void winEnqueueMotion(int x, int y)
|
||||
{
|
||||
int valuators[2];
|
||||
ValuatorMask mask;
|
||||
EventListPtr events;
|
||||
InternalEvent* events;
|
||||
|
||||
miPointerSetPosition(g_pwinPointer, POINTER_RELATIVE, &x, &y);
|
||||
valuators[0] = x;
|
||||
|
||||
Reference in New Issue
Block a user