summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2013-07-31 01:23:55 -0700
committerJay Sorg <jay.sorg@gmail.com>2013-07-31 01:23:55 -0700
commit635e2dba387b64a947a21b6334ab0a50e94e7407 (patch)
treecb3ebcc3d083ee7bb37ffd6a464b1f08c6f1ab92
parent61d51cea601e9c0daf74f404d939aeeaf678c1b1 (diff)
downloadxrdp-proprietary-635e2dba387b64a947a21b6334ab0a50e94e7407.tar.gz
xrdp-proprietary-635e2dba387b64a947a21b6334ab0a50e94e7407.zip
xorg driver, mouse fix for newer xorg
-rw-r--r--xorg/server/xrdpmouse/rdpMouse.c31
1 files changed, 2 insertions, 29 deletions
diff --git a/xorg/server/xrdpmouse/rdpMouse.c b/xorg/server/xrdpmouse/rdpMouse.c
index acd7fe3e..296c6428 100644
--- a/xorg/server/xrdpmouse/rdpMouse.c
+++ b/xorg/server/xrdpmouse/rdpMouse.c
@@ -114,45 +114,18 @@ l_bound_by(int val, int low, int high)
static void
rdpEnqueueMotion(int x, int y)
{
- int i;
- int n;
int valuators[2];
- EventListPtr rdp_events;
- xEvent *pev;
- miPointerSetPosition(g_pointer, &x, &y);
valuators[0] = x;
valuators[1] = y;
-
- GetEventList(&rdp_events);
- n = GetPointerEvents(rdp_events, g_pointer, MotionNotify, 0,
- POINTER_ABSOLUTE | POINTER_SCREEN,
- 0, 2, valuators);
-
- for (i = 0; i < n; i++)
- {
- pev = (rdp_events + i)->event;
- mieqEnqueue(g_pointer, (InternalEvent *)pev);
- }
+ xf86PostMotionEvent(g_pointer, TRUE, 0, 2, valuators);
}
/******************************************************************************/
static void
rdpEnqueueButton(int type, int buttons)
{
- int i;
- int n;
- EventListPtr rdp_events;
- xEvent *pev;
-
- i = GetEventList(&rdp_events);
- n = GetPointerEvents(rdp_events, g_pointer, type, buttons, 0, 0, 0, 0);
-
- for (i = 0; i < n; i++)
- {
- pev = (rdp_events + i)->event;
- mieqEnqueue(g_pointer, (InternalEvent *)pev);
- }
+ xf86PostButtonEvent(g_pointer, FALSE, buttons, type, 0, 0);
}
/******************************************************************************/