diff options
| author | Jim Grandy <jgrandy@authentic8.com> | 2013-06-30 16:05:23 -0700 |
|---|---|---|
| committer | Jim Grandy <jgrandy@authentic8.com> | 2013-08-22 12:49:40 -0700 |
| commit | 53311f2b2542dc9ada5a26f1dc3feae7ece4435f (patch) | |
| tree | 15fc3f4e5e1123894a1a4d869559ac4080c76619 /xorg/X11R7.6 | |
| parent | 3fdd9bc3789cc745df8b86492ddf72b72f9d9dd2 (diff) | |
| download | xrdp-proprietary-53311f2b2542dc9ada5a26f1dc3feae7ece4435f.tar.gz xrdp-proprietary-53311f2b2542dc9ada5a26f1dc3feae7ece4435f.zip | |
Hand-apply patches (rail improvements) from Authentic8 branch: 6e15b4a 2c99e69 3f30429 aad2aaa 4f8481e 5117ac2 f3dcf1a
Diffstat (limited to 'xorg/X11R7.6')
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpdraw.c | 6 | ||||
| -rw-r--r-- | xorg/X11R7.6/rdp/rdpup.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/xorg/X11R7.6/rdp/rdpdraw.c b/xorg/X11R7.6/rdp/rdpdraw.c index 45148d6d..72624c09 100644 --- a/xorg/X11R7.6/rdp/rdpdraw.c +++ b/xorg/X11R7.6/rdp/rdpdraw.c @@ -852,8 +852,10 @@ rdpDestroyWindow(WindowPtr pWindow) if (g_use_rail) { +#ifdef XRDP_WM_RDPUP LLOGLN(10, (" rdpup_delete_window")); rdpup_delete_window(pWindow, priv); +#endif } return rv; @@ -915,7 +917,9 @@ rdpRealizeWindow(WindowPtr pWindow) pWindow->drawable.x, pWindow->drawable.y, pWindow->drawable.width, pWindow->drawable.height)); priv->status = 1; +#ifdef XRDP_WM_RDPUP rdpup_create_window(pWindow, priv); +#endif } } } @@ -945,6 +949,7 @@ rdpUnrealizeWindow(WindowPtr pWindow) LLOGLN(10, ("rdpUnrealizeWindow:")); priv->status = 0; if (pWindow->overrideRedirect) { +#ifdef XRDP_WM_RDPUP /* * Popups are unmapped by X server, so probably * they will be mapped again. Thereby we should @@ -953,6 +958,7 @@ rdpUnrealizeWindow(WindowPtr pWindow) */ LLOGLN(10, (" rdpup_show_window")); rdpup_show_window(pWindow, priv, 0x0); /* 0x0 - do not show the window */ +#endif } } } diff --git a/xorg/X11R7.6/rdp/rdpup.c b/xorg/X11R7.6/rdp/rdpup.c index dc59e26d..606d81f3 100644 --- a/xorg/X11R7.6/rdp/rdpup.c +++ b/xorg/X11R7.6/rdp/rdpup.c @@ -760,7 +760,9 @@ rdpup_process_msg(struct stream *s) if (g_rdpScreen.client_info.rail_support_level > 0) { g_use_rail = 1; +#ifdef XRDP_WM_RDPUP rdpup_send_rail(); +#endif } if (g_rdpScreen.client_info.offscreen_cache_entries == 2000) { |