mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xfreerdp: fix RemoteApp after addition of cliprdr

This commit is contained in:
Marc-André Moreau 2011-09-23 10:49:59 -04:00
parent d60adb8325
commit 5c5d8a11e8
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
client/X11/xf_event.c
View File

@ -353,7 +353,8 @@ boolean xf_event_FocusIn(xfInfo* xfi, XEvent* event, boolean app)
xf_rail_send_activate(xfi, event->xany.window, True);
xf_kbd_focus_in(xfi);
xf_cliprdr_check_owner(xfi);
if (xfi->remote_app != True)
xf_cliprdr_check_owner(xfi);
return True;
}
@ -492,32 +493,44 @@ boolean xf_event_MapNotify(xfInfo* xfi, XEvent* event, boolean app)
boolean xf_event_SelectionNotify(xfInfo* xfi, XEvent* event, boolean app)
{
if (xf_cliprdr_process_selection_notify(xfi, event))
return True;
if (xfi->remote_app != True)
{
if (xf_cliprdr_process_selection_notify(xfi, event))
return True;
}
return True;
}
boolean xf_event_SelectionRequest(xfInfo* xfi, XEvent* event, boolean app)
{
if (xf_cliprdr_process_selection_request(xfi, event))
return True;
if (xfi->remote_app != True)
{
if (xf_cliprdr_process_selection_request(xfi, event))
return True;
}
return True;
}
boolean xf_event_SelectionClear(xfInfo* xfi, XEvent* event, boolean app)
{
if (xf_cliprdr_process_selection_clear(xfi, event))
return True;
if (xfi->remote_app != True)
{
if (xf_cliprdr_process_selection_clear(xfi, event))
return True;
}
return True;
}
boolean xf_event_PropertyNotify(xfInfo* xfi, XEvent* event, boolean app)
{
if (xf_cliprdr_process_property_notify(xfi, event))
return True;
if (xfi->remote_app != True)
{
if (xf_cliprdr_process_property_notify(xfi, event))
return True;
}
return True;
}

4
client/X11/xfreerdp.c
View File

@ -547,7 +547,9 @@ boolean xf_post_connect(freerdp* instance)
freerdp_chanman_post_connect(GET_CHANMAN(instance), instance);
xf_tsmf_init(xfi, xv_port);
xf_cliprdr_init(xfi, GET_CHANMAN(instance));
if (xfi->remote_app != True)
xf_cliprdr_init(xfi, GET_CHANMAN(instance));
return True;
}

2
libfreerdp-cache/glyph.c
View File

@ -98,7 +98,7 @@ rdpGlyph* glyph_new(rdpSettings* settings)
glyph->settings = settings;
settings->glyphSupportLevel = GLYPH_SUPPORT_FULL;
//settings->glyphSupportLevel = GLYPH_SUPPORT_FULL;
for (i = 0; i < 10; i++)
{