Make 8bpp and 32bpp works. Fixes #329

Ignore alpha channel coming from FreeRDP when updating screen area, restored also previously removed OrderSupport flags
FreeRDP · Sep 19, 2014 · f7bc065 · f7bc065
1 parent 7ddc860
commit f7bc065
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/remmina-plugins/rdp/rdp_event.c b/remmina-plugins/rdp/rdp_event.c
@@ -308,6 +308,7 @@ static gboolean remmina_rdp_event_on_draw(GtkWidget* widget, cairo_t* context, R
 	cairo_fill(context);
 	cairo_destroy(context);
 #else
+	cairo_set_operator (context, CAIRO_OPERATOR_SOURCE);	// Ignore alpha channel from FreeRDP
 	cairo_paint(context);
 #endif
 

diff --git a/remmina-plugins/rdp/rdp_plugin.c b/remmina-plugins/rdp/rdp_plugin.c
@@ -225,26 +225,26 @@ static BOOL remmina_rdp_pre_connect(freerdp* instance)
 	settings->BitmapCacheEnabled = True;
 	settings->OffscreenSupportLevel = True;
 
-	settings->OrderSupport[NEG_DSTBLT_INDEX] = False;
-	settings->OrderSupport[NEG_PATBLT_INDEX] = False;
-	settings->OrderSupport[NEG_SCRBLT_INDEX] = False;
-	settings->OrderSupport[NEG_OPAQUE_RECT_INDEX] = False;
+	settings->OrderSupport[NEG_DSTBLT_INDEX] = True;
+	settings->OrderSupport[NEG_PATBLT_INDEX] = True;
+	settings->OrderSupport[NEG_SCRBLT_INDEX] = True;
+	settings->OrderSupport[NEG_OPAQUE_RECT_INDEX] = True;
 	settings->OrderSupport[NEG_DRAWNINEGRID_INDEX] = False;
 	settings->OrderSupport[NEG_MULTIDSTBLT_INDEX] = False;
 	settings->OrderSupport[NEG_MULTIPATBLT_INDEX] = False;
 	settings->OrderSupport[NEG_MULTISCRBLT_INDEX] = False;
-	settings->OrderSupport[NEG_MULTIOPAQUERECT_INDEX] = False;
+	settings->OrderSupport[NEG_MULTIOPAQUERECT_INDEX] = True;
 	settings->OrderSupport[NEG_MULTI_DRAWNINEGRID_INDEX] = False;
-	settings->OrderSupport[NEG_LINETO_INDEX] = False;
-	settings->OrderSupport[NEG_POLYLINE_INDEX] = False;
-	settings->OrderSupport[NEG_MEMBLT_INDEX] = False;
-	settings->OrderSupport[NEG_MEM3BLT_INDEX] = False;
-	settings->OrderSupport[NEG_MEMBLT_V2_INDEX] = False;
+	settings->OrderSupport[NEG_LINETO_INDEX] = True;
+	settings->OrderSupport[NEG_POLYLINE_INDEX] = True;
+	settings->OrderSupport[NEG_MEMBLT_INDEX] = settings->BitmapCacheEnabled;
+	settings->OrderSupport[NEG_MEM3BLT_INDEX] = True;
+	settings->OrderSupport[NEG_MEMBLT_V2_INDEX] = settings->BitmapCacheEnabled;
 	settings->OrderSupport[NEG_MEM3BLT_V2_INDEX] = False;
 	settings->OrderSupport[NEG_SAVEBITMAP_INDEX] = False;
-	settings->OrderSupport[NEG_GLYPH_INDEX_INDEX] = False;
-	settings->OrderSupport[NEG_FAST_INDEX_INDEX] = False;
-	settings->OrderSupport[NEG_FAST_GLYPH_INDEX] = False;
+	settings->OrderSupport[NEG_GLYPH_INDEX_INDEX] = True;
+	settings->OrderSupport[NEG_FAST_INDEX_INDEX] = True;
+	settings->OrderSupport[NEG_FAST_GLYPH_INDEX] = True;
 	settings->OrderSupport[NEG_POLYGON_SC_INDEX] = False;
 	settings->OrderSupport[NEG_POLYGON_CB_INDEX] = False;
 	settings->OrderSupport[NEG_ELLIPSE_SC_INDEX] = False;