Merge lp:~muktupavels/compiz/lp1530277 into lp:compiz/0.9.13

[Alberts Muktupāvels]

Ensure that surfaces used by metacity theme have device scale set to 1 (LP: #1530277).

Font size with current metacity versions will be still incorrect, but that can be "fixed" by using GDK_DPI_SCALE. At least now decorations are drawn correctly.

Full fix will require libmetacity 3.26 were new API has been added to control scale and font size.

[Marco Trevisan (Treviño) (3v1n0)]

Since we verified this doesn't break GDK_SCALE, we're ok.

review: Approve

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2016-09-01 17:48:01 +0000
+++ gtk/window-decorator/decorator.c	2017-04-02 17:51:16 +0000
@@ -27,6 +27,10 @@
 #include "gwd-settings.h"
 #include "gwd-theme-cairo.h"
 
+#ifdef USE_METACITY
+#include "gwd-theme-metacity.h"
+#endif
+
 static void
 draw_window_decoration (decor_t *decor)
 {
@@ -543,6 +547,12 @@
 
     buffer_surface = create_surface (d->width, d->height, style_window);
 
+#ifdef USE_METACITY
+    if (GWD_IS_THEME_METACITY (gwd_theme)) {
+      cairo_surface_set_device_scale (buffer_surface, 1, 1);
+    }
+#endif
+
     gdk_flush ();
 
     /* Handle failure */
 
=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-10-26 18:31:22 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2017-04-02 17:51:16 +0000
@@ -879,6 +879,7 @@
     cairo_destroy (cr);
 
     surface = create_surface (fgeom.width, fgeom.height, style_window);
+    cairo_surface_set_device_scale (surface, 1, 1);
     cr = cairo_create (surface);
 
     src = XRenderCreatePicture (xdisplay, cairo_xlib_surface_get_drawable (surface),