diff options
| author | Marc-André Moreau <marcandre.moreau@gmail.com> | 2011-06-28 18:02:41 +0400 |
|---|---|---|
| committer | Marc-André Moreau <marcandre.moreau@gmail.com> | 2011-06-28 18:02:41 +0400 |
| commit | c78f823e681a9e53cb8f89d78ab9bdf65405656c (patch) | |
| tree | 1cb041464c1eec9acbee74c1b0e1d0b8ffab659b | |
| parent | 1f201c04f8189b3d353c0e5b9586a2e36853375b (diff) | |
| parent | c64c24ae7bd16607b3e56e50b7ade4efea0f0d1a (diff) | |
Merge branch 'master' of github.com:FreeRDP/FreeRDP into remotefxremotefx
| -rw-r--r-- | X11/xf_win.c | 8 | ||||
| -rw-r--r-- | libfreerdp-core/capabilities.c | 1 | ||||
| -rw-r--r-- | libfreerdp-gdi/gdi.c | 2 |
3 files changed, 11 insertions, 0 deletions
diff --git a/X11/xf_win.c b/X11/xf_win.c index 712a755..3f6accf 100644 --- a/X11/xf_win.c +++ b/X11/xf_win.c @@ -787,6 +787,14 @@ l_ui_reset_clip(struct rdp_inst * inst) static void l_ui_resize_window(struct rdp_inst * inst) { + xfInfo * xfi = GET_XFI(inst); + + if (xfi->settings->software_gdi == 1) + { + gdi_free(inst); + gdi_init(inst, CLRCONV_ALPHA | CLRBUF_32BPP); + } + printf("ui_resize_window:\n"); } diff --git a/libfreerdp-core/capabilities.c b/libfreerdp-core/capabilities.c index 22d236e..cbbd6cd 100644 --- a/libfreerdp-core/capabilities.c +++ b/libfreerdp-core/capabilities.c @@ -168,6 +168,7 @@ void rdp_process_bitmap_capset(rdpRdp * rdp, STREAM s) ui_warning(rdp->inst, "Remote desktop does not support color depth %d; falling back to %d\n", rdp->settings->server_depth, preferredBitsPerPixel); rdp->settings->server_depth = preferredBitsPerPixel; + ui_resize_window(rdp->inst); } if (rdp->settings->width != desktopWidth || rdp->settings->height != desktopHeight) { diff --git a/libfreerdp-gdi/gdi.c b/libfreerdp-gdi/gdi.c index 2e59596..ab25825 100644 --- a/libfreerdp-gdi/gdi.c +++ b/libfreerdp-gdi/gdi.c @@ -1197,4 +1197,6 @@ void gdi_free(rdpInst* inst) free(gdi->clrconv); free(gdi); } + + SET_GDI(inst, NULL); } |