mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #533 from atong/master

Browse Source 
xfreerdp: send extended mouse events, using common button values for now
This commit is contained in:
Marc-André Moreau 2012-04-06 12:35:50 -07:00
commit b56148f0e6
1 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
client/X11/xf_event.c
View File

@ -156,6 +156,7 @@ boolean xf_event_ButtonPress(xfInfo* xfi, XEvent* event, boolean app)
uint16 x, y; uint16 x, y;
uint16 flags; uint16 flags;
boolean wheel; boolean wheel;
boolean extended;
rdpInput* input; rdpInput* input;
input = xfi->instance->input; input = xfi->instance->input;
@ -164,6 +165,7 @@ boolean xf_event_ButtonPress(xfInfo* xfi, XEvent* event, boolean app)
y = 0; y = 0;
flags = 0; flags = 0;
wheel = false; wheel = false;
extended = false;
switch (event->xbutton.button) switch (event->xbutton.button)
{ {
@ -195,6 +197,24 @@ boolean xf_event_ButtonPress(xfInfo* xfi, XEvent* event, boolean app)
flags = PTR_FLAGS_WHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0088; flags = PTR_FLAGS_WHEEL | PTR_FLAGS_WHEEL_NEGATIVE | 0x0088;
break; break;
case 6: // wheel left or back
case 8: // back
case 97: // Xming
extended = true;
x = event->xbutton.x;
y = event->xbutton.y;
flags = PTR_XFLAGS_DOWN | PTR_XFLAGS_BUTTON1;
break;
case 7: // wheel right or forward
case 9: // forward
case 112: // Xming
extended = true;
x = event->xbutton.x;
y = event->xbutton.y;
flags = PTR_XFLAGS_DOWN | PTR_XFLAGS_BUTTON2;
break;
default: default:
x = 0; x = 0;
y = 0; y = 0;
@ -224,7 +244,10 @@ boolean xf_event_ButtonPress(xfInfo* xfi, XEvent* event, boolean app)
} }
} }
input->MouseEvent(input, flags, x, y); if (extended)
input->ExtendedMouseEvent(input, flags, x, y);
else
input->MouseEvent(input, flags, x, y);
} }
} }
@ -235,6 +258,7 @@ boolean xf_event_ButtonRelease(xfInfo* xfi, XEvent* event, boolean app)
{ {
uint16 x, y; uint16 x, y;
uint16 flags; uint16 flags;
boolean extended;
rdpInput* input; rdpInput* input;
input = xfi->instance->input; input = xfi->instance->input;
@ -242,6 +266,7 @@ boolean xf_event_ButtonRelease(xfInfo* xfi, XEvent* event, boolean app)
x = 0; x = 0;
y = 0; y = 0;
flags = 0; flags = 0;
extended = false;
switch (event->xbutton.button) switch (event->xbutton.button)
{ {
@ -263,6 +288,24 @@ boolean xf_event_ButtonRelease(xfInfo* xfi, XEvent* event, boolean app)
flags = PTR_FLAGS_BUTTON2; flags = PTR_FLAGS_BUTTON2;
break; break;
case 6:
case 8:
case 97:
extended = true;
x = event->xbutton.x;
y = event->xbutton.y;
flags = PTR_XFLAGS_BUTTON1;
break;
case 7:
case 9:
case 112:
extended = true;
x = event->xbutton.x;
y = event->xbutton.y;
flags = PTR_XFLAGS_BUTTON2;
break;
default: default:
flags = 0; flags = 0;
break; break;
@ -284,7 +327,10 @@ boolean xf_event_ButtonRelease(xfInfo* xfi, XEvent* event, boolean app)
} }
} }
input->MouseEvent(input, flags, x, y); if (extended)
input->ExtendedMouseEvent(input, flags, x, y);
else
input->MouseEvent(input, flags, x, y);
} }
return true; return true;