aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xnest/Events.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xnest/Events.c')
-rw-r--r--xorg-server/hw/xnest/Events.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/xorg-server/hw/xnest/Events.c b/xorg-server/hw/xnest/Events.c
index 35ba43269..277718ba3 100644
--- a/xorg-server/hw/xnest/Events.c
+++ b/xorg-server/hw/xnest/Events.c
@@ -17,7 +17,6 @@ is" without express or implied warranty.
#endif
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "screenint.h"
#include "input.h"
@@ -46,7 +45,7 @@ CARD32 lastEventTime = 0;
extern EventList *xnestEvents;
void
-ProcessInputEvents()
+ProcessInputEvents(void)
{
mieqProcessInputEvents();
}
@@ -110,7 +109,7 @@ xnestQueueKeyEvent(int type, unsigned int keycode)
lastEventTime = GetTimeInMillis();
n = GetKeyboardEvents(xnestEvents, xnestKeyboardDevice, type, keycode);
for (i = 0; i < n; i++)
- mieqEnqueue(xnestKeyboardDevice, (xnestEvents + i)->event);
+ mieqEnqueue(xnestKeyboardDevice, (InternalEvent*)(xnestEvents + i)->event);
}
void
@@ -139,7 +138,7 @@ xnestCollectEvents(void)
n = GetPointerEvents(xnestEvents, xnestPointerDevice, ButtonPress,
X.xbutton.button, POINTER_RELATIVE, 0, 0, NULL);
for (i = 0; i < n; i++)
- mieqEnqueue(xnestPointerDevice, (xnestEvents + i)->event);
+ mieqEnqueue(xnestPointerDevice, (InternalEvent*)(xnestEvents + i)->event);
break;
case ButtonRelease:
@@ -148,7 +147,7 @@ xnestCollectEvents(void)
n = GetPointerEvents(xnestEvents, xnestPointerDevice, ButtonRelease,
X.xbutton.button, POINTER_RELATIVE, 0, 0, NULL);
for (i = 0; i < n; i++)
- mieqEnqueue(xnestPointerDevice, (xnestEvents + i)->event);
+ mieqEnqueue(xnestPointerDevice, (InternalEvent*)(xnestEvents + i)->event);
break;
case MotionNotify:
@@ -158,7 +157,7 @@ xnestCollectEvents(void)
n = GetPointerEvents(xnestEvents, xnestPointerDevice, MotionNotify,
0, POINTER_ABSOLUTE, 0, 2, valuators);
for (i = 0; i < n; i++)
- mieqEnqueue(xnestPointerDevice, (xnestEvents + i)->event);
+ mieqEnqueue(xnestPointerDevice, (InternalEvent*)(xnestEvents + i)->event);
break;
case FocusIn:
@@ -191,7 +190,7 @@ xnestCollectEvents(void)
n = GetPointerEvents(xnestEvents, xnestPointerDevice, MotionNotify,
0, POINTER_ABSOLUTE, 0, 2, valuators);
for (i = 0; i < n; i++)
- mieqEnqueue(xnestPointerDevice, (xnestEvents + i)->event);
+ mieqEnqueue(xnestPointerDevice, (InternalEvent*)(xnestEvents + i)->event);
xnestDirectInstallColormaps(pScreen);
}
}