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

libfreerdp-core: fix input callback registration for slow-path input

Browse Source
This commit is contained in:
Marc-André Moreau 2011-12-20 14:51:44 -05:00
parent 216947a330
commit 77bbd18d5c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/X11/xf_event.c
View File

@ -338,7 +338,9 @@ boolean xf_event_FocusIn(xfInfo* xfi, XEvent* event, boolean app)
if (xfi->mouse_active && (app != true))
XGrabKeyboard(xfi->display, xfi->window->handle, true, GrabModeAsync, GrabModeAsync, CurrentTime);
if (app)
xf_rail_send_activate(xfi, event->xany.window, true);
xf_kbd_focus_in(xfi);
if (app != true)
@ -357,6 +359,7 @@ boolean xf_event_FocusOut(xfInfo* xfi, XEvent* event, boolean app)
if (event->xfocus.mode == NotifyWhileGrabbed)
XUngrabKeyboard(xfi->display, CurrentTime);
if (app)
xf_rail_send_activate(xfi, event->xany.window, false);
return true;
@ -453,11 +456,14 @@ boolean xf_event_ConfigureNotify(xfInfo* xfi, XEvent* event, boolean app)
if (window != NULL)
{
xfWindow* xfw;
Window childWindow;
xfw = (xfWindow*) window->extra;
// ConfigureNotify coordinates are expressed relative to the window parent.
// Translate these to root window coordinates.
Window childWindow;
/*
* ConfigureNotify coordinates are expressed relative to the window parent.
* Translate these to root window coordinates.
*/
XTranslateCoordinates(xfi->display, xfw->handle,
RootWindowOfScreen(xfi->screen),
0, 0, &xfw->left, &xfw->top, &childWindow);
@ -468,8 +474,7 @@ boolean xf_event_ConfigureNotify(xfInfo* xfi, XEvent* event, boolean app)
xfw->bottom = xfw->top + xfw->height - 1;
DEBUG_X11_LMS("window=0x%X rc={l=%d t=%d r=%d b=%d} w=%u h=%u send_event=%d",
(uint32) xfw->handle,
xfw->left, xfw->top, xfw->right, xfw->bottom,
(uint32) xfw->handle, xfw->left, xfw->top, xfw->right, xfw->bottom,
xfw->width, xfw->height, event->xconfigure.send_event);
if (app && ! event->xconfigure.send_event)

3
libfreerdp-core/freerdp.c
View File

@ -58,6 +58,8 @@ boolean freerdp_connect(freerdp* instance)
extension_post_connect(rdp->extension);
input_register_client_callbacks(rdp->input);
IFCALLRET(instance->PostConnect, status, instance);
if (status != true)
@ -168,7 +170,6 @@ void freerdp_context_new(freerdp* instance)
instance->update->altsec->context = instance->context;
instance->input->context = instance->context;
input_register_client_callbacks(rdp->input);
IFCALL(instance->ContextNew, instance, instance->context);
}