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

xfreerdp-client: integrated changes from awakecoding

Browse Source
This commit is contained in:
C-o-r-E 2013-05-05 18:20:44 -04:00
parent 4cdc276e25
commit 84f285401a
3 changed files with 9 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/X11/xf_input.h
View File

@ -21,6 +21,7 @@
#define __XF_INPUT_H
#include "xf_interface.h"
#include "xfreerdp.h"
#ifdef WITH_XI
#include <X11/extensions/XInput2.h>

67
client/X11/xf_window.c
View File

@ -325,73 +325,6 @@ static void xf_SetWindowPID(xfInfo* xfi, xfWindow* window, pid_t pid)
32, PropModeReplace, (unsigned char *)&pid, 1);
}
int xf_input_init(xfInfo* xfi, Window window)
{
int i, j;
int ndevices;
int major = 2;
int minor = 2;
Status xstatus;
XIEventMask evmask;
XIDeviceInfo* info;
int opcode, event, error;
XIGrabModifiers mods = { 1 };
unsigned char mask[XIMaskLen(XI_LASTEVENT)];
if (!XQueryExtension(xfi->display, "XInputExtension", &opcode, &event, &error))
{
printf("XInput extension not available.\n");
return -1;
}
XIQueryVersion(xfi->display, &major, &minor);
if (major * 1000 + minor < 2002)
{
printf("Server does not support XI 2.2\n");
return -1;
}
info = XIQueryDevice(xfi->display, XIAllDevices, &ndevices);
for (i = 0; i < ndevices; i++)
{
XIDeviceInfo* dev = &info[i];
for (j = 0; j < dev->num_classes; j++)
{
XIAnyClassInfo* class = dev->classes[j];
XITouchClassInfo* t = (XITouchClassInfo*) class;
if (class->type != XITouchClass)
continue;
printf("%s %s touch device, supporting %d touches.\n",
dev->name, (t->mode == XIDirectTouch) ? "direct" : "dependent", t->num_touches);
}
}
evmask.mask = mask;
evmask.mask_len = sizeof(mask);
ZeroMemory(mask, sizeof(mask));
evmask.deviceid = XIAllDevices;
XISetMask(mask, XI_TouchBegin);
XISetMask(mask, XI_TouchUpdate);
XISetMask(mask, XI_TouchEnd);
xstatus = XISelectEvents(xfi->display, window, &evmask, 1);
//XIClearMask(mask, XI_TouchOwnership);
mods.modifiers = XIAnyModifier;
//XIGrabTouchBegin(xfi->display, XIAllMasterDevices, window, XINoOwnerEvents, &evmask, 1, &mods);
XSync(xfi->display, False);
return -1;
}
xfWindow* xf_CreateDesktopWindow(xfInfo* xfi, char* name, int width, int height, BOOL decorations)
{
xfWindow* window;

8
client/X11/xfreerdp.h
View File

@ -105,6 +105,14 @@ struct xf_info
HANDLE thread;
BOOL UseXThreads;
int XInputOpcode;
int orig_width;
int orig_height;
int cur_width;
int cur_height;
double scale;
HGDI_DC hdc;
BYTE* primary_buffer;