Merge branch 'master' of github.com:FreeRDP/FreeRDP into remotefx

ahmad805-max · Jun 28, 2011 · c78f823 · c78f823
2 parents 1f201c0 + c64c24a
commit c78f823
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git 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
@@ -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
@@ -1197,4 +1197,6 @@ void gdi_free(rdpInst* inst)
 		free(gdi->clrconv);
 		free(gdi);
 	}
+
+	SET_GDI(inst, NULL);
 }