Merge branch 'tintou/mutter-47' into danirabbit/fedora-ci

Author: danirabbit

lib/App.vala

@@ -158,8 +158,8 @@ public class Gala.App : GLib.Object {
         return windows.data;
     }
 
-    public GLib.SList<Posix.pid_t?> get_pids () {
-        var results = new GLib.SList<Posix.pid_t?> ();
+    public GLib.SList<pid_t?> get_pids () {
+        var results = new GLib.SList<pid_t?> ();
         foreach (unowned var window in windows) {
             var pid = window.get_pid ();
             if (pid < 1) {

meson.build

@@ -158,6 +158,17 @@ if mutter46_dep.found()
 	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46']
 endif
 
+mutter47_dep = dependency('libmutter-15', version: ['>= 47', '< 48'], required: false)
+if mutter47_dep.found()
+	libmutter_dep = dependency('libmutter-15', version: '>= 47')
+	mutter_dep = [
+		libmutter_dep,
+		dependency('mutter-mtk-15'), dependency('mutter-cogl-15'),
+		dependency('mutter-cogl-pango-15'), dependency('mutter-clutter-15')
+	]
+	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47']
+endif
+
 if mutter_dep.length() == 0
     error ('No supported mutter library found!')
 endif

src/Background/Background.vala

@@ -108,15 +108,38 @@ namespace Gala {
             var settings = background_source.gnome_background_settings;
 
             color_string = settings.get_string ("primary-color");
+#if HAS_MUTTER47
+            var color = Cogl.Color.from_string (color_string);
+#else
             var color = Clutter.Color.from_string (color_string);
+#endif
+            if (color == null) {
+#if HAS_MUTTER47
+                color = Cogl.Color.from_string ("black");
+#else
+                color = Clutter.Color.from_string ("black");
+#endif
+            }
 
             var shading_type = settings.get_enum ("color-shading-type");
 
             if (shading_type == GDesktop.BackgroundShading.SOLID) {
                 background.set_color (color);
             } else {
                 color_string = settings.get_string ("secondary-color");
+#if HAS_MUTTER47
+                var second_color = Cogl.Color.from_string (color_string);
+#else
                 var second_color = Clutter.Color.from_string (color_string);
+#endif
+                if (second_color == null) {
+#if HAS_MUTTER47
+                    second_color = Cogl.Color.from_string ("black");
+#else
+                    second_color = Clutter.Color.from_string ("black");
+#endif
+                }
+
                 background.set_gradient ((GDesktop.BackgroundShading) shading_type, color, second_color);
             }
         }

src/Background/BackgroundContainer.vala

@@ -49,7 +49,11 @@ namespace Gala {
         }
 
         public void set_black_background (bool black) {
+#if HAS_MUTTER47
+            set_background_color (black ? Cogl.Color.from_string ("Black") : null);
+#else
             set_background_color (black ? Clutter.Color.from_string ("Black") : null);
+#endif
         }
 
         private void update () {

src/InternalUtils.vala

@@ -71,8 +71,12 @@ namespace Gala {
             }
 
             unowned Meta.X11Display x11display = display.get_x11_display ();
+#if HAS_MUTTER47
+            x11display.set_stage_input_region (rects);
+#else
             var xregion = X.Fixes.create_region (x11display.get_xdisplay (), rects);
             x11display.set_stage_input_region (xregion);
+#endif
         }
 
         /**

src/ScreenshotManager.vala

@@ -65,7 +65,9 @@ namespace Gala {
             var flash_actor = new Clutter.Actor ();
             flash_actor.set_size (width, height);
             flash_actor.set_position (x, y);
-#if HAS_MUTTER46
+#if HAS_MUTTER47
+            flash_actor.set_background_color (Cogl.Color.from_string ("white"));
+#elif HAS_MUTTER46
             flash_actor.set_background_color (Clutter.Color.from_pixel (0xffffffffu));
 #else
             flash_actor.set_background_color (Clutter.Color.get_static (Clutter.StaticColor.WHITE));
@@ -151,8 +153,12 @@ namespace Gala {
             window_actor.get_position (out actor_x, out actor_y);
 
             var rect = window.get_frame_rect ();
+#if HAS_MUTTER45
+            if (!include_frame) {
+#if else
             if ((include_frame && window.is_client_decorated ()) ||
                 (!include_frame && !window.is_client_decorated ())) {
+#endif
                 rect = window.frame_rect_to_client_rect (rect);
             }
 

src/Widgets/IconGroup.vala

@@ -114,6 +114,9 @@ namespace Gala {
             var height = InternalUtils.scale_to_int (WorkspaceClone.BOTTOM_OFFSET, scale_factor);
             var backdrop_opacity_int = (uint8) (BACKDROP_ABSOLUTE_OPACITY * backdrop_opacity);
 
+#if HAS_MUTTER47
+//FIXME: TODO!
+#else
             Cogl.VertexP2T2C4 vertices[4];
             vertices[0] = { x, y + height, 0, 1, backdrop_opacity_int, backdrop_opacity_int, backdrop_opacity_int, backdrop_opacity_int };
             vertices[1] = { x, y, 0, 0, 0, 0, 0, 0 };
@@ -123,6 +126,7 @@ namespace Gala {
             var primitive = new Cogl.Primitive.p2t2c4 (context.get_framebuffer ().get_context (), Cogl.VerticesMode.TRIANGLE_STRIP, vertices);
             var pipeline = new Cogl.Pipeline (context.get_framebuffer ().get_context ());
             primitive.draw (context.get_framebuffer (), pipeline);
+#endif
             base.paint (context);
         }
 

src/Widgets/ScreenShield.vala

@@ -133,7 +133,11 @@ namespace Gala {
                 return Clutter.EVENT_STOP;
             });
 
+#if HAS_MUTTER47
+            background_color = Cogl.Color.from_string ("black");
+#else
             background_color = Clutter.Color.from_string ("black");
+#endif
 
             expand_to_screen_size ();
 

src/Widgets/Tooltip.vala

@@ -22,7 +22,11 @@ public class Gala.Tooltip : CanvasActor {
     construct {
         max_width = 200;
 
+#if HAS_MUTTER47
+        Cogl.Color text_color = {
+#else
         Clutter.Color text_color = {
+#endif
             (uint8) Drawing.Color.TOOLTIP_TEXT_COLOR.red * uint8.MAX,
             (uint8) Drawing.Color.TOOLTIP_TEXT_COLOR.green * uint8.MAX,
             (uint8) Drawing.Color.TOOLTIP_TEXT_COLOR.blue * uint8.MAX,

src/Widgets/WindowSwitcher/WindowSwitcher.vala

@@ -161,7 +161,11 @@ public class Gala.WindowSwitcher : CanvasActor {
 
         var stroke_width = scaling_factor;
 
+#if HAS_MUTTER47
+        caption.color = Cogl.Color.from_string (caption_color);
+#else
         caption.color = Clutter.Color.from_string (caption_color);
+#endif
 
         ctx.save ();
         ctx.set_operator (Cairo.Operator.CLEAR);