xfreerdp: fix RemoteApp after addition of cliprdr

diff --git a/client/X11/xf_event.c b/client/X11/xf_event.c
index d0d4b87..5ab2f40 100644 (file)
--- a/client/X11/xf_event.c
+++ b/client/X11/xf_event.c
@@ -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;
 }

diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c
index b3254b3..0b1ea99 100644 (file)
--- a/client/X11/xfreerdp.c
+++ b/client/X11/xfreerdp.c
@@ -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;
 }

diff --git a/libfreerdp-cache/glyph.c b/libfreerdp-cache/glyph.c
index 1607404..3cfce03 100644 (file)
--- a/libfreerdp-cache/glyph.c
+++ b/libfreerdp-cache/glyph.c
@@ -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++)
                {