Add support for Mutter 51

lib/Effects/BoxBlurManager.vala

@@ -35,21 +35,30 @@ public class Gala.BoxBlurManager : Object {
 
         private const float[] HORIZONTAL_PASS_DATA = { 1.0f, 0.0f };
         private const float[] VERTICAL_PASS_DATA = { 0.0f, 1.0f };
+#if HAS_MUTTER51
+        private string shader;
+#endif
 
         public int radius { set { set_uniform_value ("RADIUS", value); } }
 
         public BoxBlurEffect (PassDirection direction) {
             Object (
+#if !HAS_MUTTER51
 #if HAS_MUTTER48
                 shader_type: Cogl.ShaderType.FRAGMENT
 #else
                 shader_type: Clutter.ShaderType.FRAGMENT_SHADER
+#endif
 #endif
             );
 
             try {
                 var bytes = GLib.resources_lookup_data ("/io/elementary/desktop/gala/shaders/box-blur.frag", NONE);
+#if HAS_MUTTER51
+                shader = (string) bytes.get_data ();
+#else
                 set_shader_source ((string) bytes.get_data ());
+#endif
             } catch (Error e) {
                 critical ("Unable to load box-blur.frag: %s", e.message);
             }
@@ -63,6 +72,13 @@ public class Gala.BoxBlurManager : Object {
             set_uniform_value ("DIRECTION", direction_value);
         }
 
+#if HAS_MUTTER51
+        public override Cogl.Snippet get_static_snippet () {
+            // TODO: split declarations from shader code and put it here
+            return new Cogl.Snippet (Cogl.SnippetHook.FRAGMENT, null, shader);
+        }
+#endif
+
         public override void set_actor (Clutter.Actor? new_actor) {
             if (actor != null) {
                 actor.notify["width"].disconnect (update_pixel_step);

lib/Effects/RoundedCornersEffect.vala

@@ -33,12 +33,18 @@ public class Gala.RoundedCornersEffect : Clutter.ShaderEffect {
         }
     }
 
+#if HAS_MUTTER51
+    private string shader;
+#endif
+
     public RoundedCornersEffect (int clip_radius, float monitor_scale) {
         Object (
+#if !HAS_MUTTER51
 #if HAS_MUTTER48
             shader_type: Cogl.ShaderType.FRAGMENT,
 #else
             shader_type: Clutter.ShaderType.FRAGMENT_SHADER,
+#endif
 #endif
             clip_radius: clip_radius,
             monitor_scale: monitor_scale
@@ -48,12 +54,23 @@ public class Gala.RoundedCornersEffect : Clutter.ShaderEffect {
     construct {
         try {
             var bytes = GLib.resources_lookup_data ("/io/elementary/desktop/gala/shaders/rounded-corners.frag", NONE);
+#if HAS_MUTTER51
+            shader = (string) bytes.get_data ();
+#else
             set_shader_source ((string) bytes.get_data ());
+#endif
         } catch (Error e) {
             critical ("Unable to load rounded-corners.frag: %s", e.message);
         }
     }
 
+#if HAS_MUTTER51
+    public override Cogl.Snippet get_static_snippet () {
+        // TODO: split declarations from shader code and put it here
+        return new Cogl.Snippet (Cogl.SnippetHook.FRAGMENT, null, shader);
+    }
+#endif
+
     public override void set_actor (Clutter.Actor? new_actor) {
         if (actor != null) {
             actor.notify["width"].disconnect (update_actor_size);

meson.build

@@ -140,6 +140,17 @@ if mutter50_dep.found()
 	vala_flags = ['--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49', '--define', 'HAS_MUTTER50']
 endif
 
+mutter51_dep = dependency('libmutter-51', version: ['>= 51', '< 52'], required: false)
+if mutter51_dep.found()
+	libmutter_dep = dependency('libmutter-51', version: '>= 51')
+	mutter_dep = [
+		libmutter_dep,
+		dependency('mutter-mtk-51'), dependency('mutter-cogl-51'),
+		dependency('mutter-clutter-51')
+	]
+	vala_flags = ['--define', 'HAS_MUTTER43', '--define', 'HAS_MUTTER44', '--define', 'HAS_MUTTER45', '--define', 'HAS_MUTTER46', '--define', 'HAS_MUTTER47', '--define', 'HAS_MUTTER48', '--define', 'HAS_MUTTER49', '--define', 'HAS_MUTTER50', '--define', 'HAS_MUTTER51']
+endif
+
 if mutter_dep.length() == 0
     error ('No supported mutter library found!')
 endif

src/ColorFilters/ColorblindnessCorrectionEffect.vala

@@ -29,6 +29,9 @@ public class Gala.ColorblindnessCorrectionEffect : Clutter.ShaderEffect {
             queue_repaint ();
         }
     }
+#if HAS_MUTTER51
+    private string shader;
+#endif
 
     /*
      * Used for fading in and out the effect, since you can't add transitions to effects.
@@ -37,22 +40,35 @@ public class Gala.ColorblindnessCorrectionEffect : Clutter.ShaderEffect {
 
     public ColorblindnessCorrectionEffect (int mode, double strength) {
         Object (
+#if !HAS_MUTTER51
 #if HAS_MUTTER48
             shader_type: Cogl.ShaderType.FRAGMENT,
 #else
             shader_type: Clutter.ShaderType.FRAGMENT_SHADER,
+#endif
 #endif
             mode: mode,
             strength: strength
         );
 
         try {
             var bytes = GLib.resources_lookup_data ("/io/elementary/desktop/gala/shaders/colorblindness-correction.frag", GLib.ResourceLookupFlags.NONE);
+#if HAS_MUTTER51
+            shader = (string) bytes.get_data ();
+#else
             set_shader_source ((string) bytes.get_data ());
+#endif
         } catch (Error e) {
             critical ("Unable to load colorblindness-correction.frag: %s", e.message);
         }
 
         pause_for_screenshot = false;
     }
+
+#if HAS_MUTTER51
+    public override Cogl.Snippet get_static_snippet () {
+        // TODO: split declarations from shader code and put it here
+        return new Cogl.Snippet (Cogl.SnippetHook.FRAGMENT, null, shader);
+    }
+#endif
 }

src/ColorFilters/MonochromeEffect.vala

@@ -21,6 +21,9 @@ public class Gala.MonochromeEffect : Clutter.ShaderEffect {
             queue_repaint ();
         }
     }
+#if HAS_MUTTER51
+    private string shader;
+#endif
 
     /*
      * Used for fading in and out the effect, since you can't add transitions to effects.
@@ -29,21 +32,33 @@ public class Gala.MonochromeEffect : Clutter.ShaderEffect {
 
     public MonochromeEffect (double strength) {
         Object (
+#if !HAS_MUTTER51
 #if HAS_MUTTER48
             shader_type: Cogl.ShaderType.FRAGMENT,
 #else
             shader_type: Clutter.ShaderType.FRAGMENT_SHADER,
+#endif
 #endif
             strength: strength
         );
 
         try {
             var bytes = GLib.resources_lookup_data ("/io/elementary/desktop/gala/shaders/monochrome.frag", GLib.ResourceLookupFlags.NONE);
+#if HAS_MUTTER51
+            shader = (string) bytes.get_data ();
+#else
             set_shader_source ((string) bytes.get_data ());
+#endif
         } catch (Error e) {
             critical ("Unable to load monochrome.frag: %s", e.message);
         }
 
         pause_for_screenshot = false;
     }
+#if HAS_MUTTER51
+    public override Cogl.Snippet get_static_snippet () {
+        // TODO: split declarations from shader code and put it here
+        return new Cogl.Snippet (Cogl.SnippetHook.FRAGMENT, null, shader);
+    }
+#endif
 }

vapi/Clutter-51.metadata

@@ -0,0 +1,146 @@
+// Non mini-object
+ActorBox struct
+Margin struct
+PaintVolume struct
+Perspective struct
+
+*.ref unowned
+* cheader_filename="clutter/clutter.h"
+
+// Fix the few clutter-pango headers
+Text cheader_filename="clutter/clutter-pango.h"
+TextBuffer cheader_filename="clutter/clutter-pango.h"
+TextNode cheader_filename="clutter/clutter-pango.h"
+Actor
+	.get_pango_context cheader_filename="clutter/clutter-pango.h"
+	.create_pango_context cheader_filename="clutter/clutter-pango.h"
+	.create_pango_layout cheader_filename="clutter/clutter-pango.h"
+
+
+Actor
+	.apply_transform.matrix ref
+	.get_abs_allocation_vertices.verts out=false
+Event.type#method name="get_type"
+
+// ???
+Actor.has_pointer#method name="get_has_pointer"
+
+// Not all backing symbols are deprecated
+Actor.pick deprecated=false
+
+// Nullable return values
+Actor
+	.get_parent nullable
+
+// The original CType has been overridden by the annotations
+Actor
+	.allocate.box ctype="const ClutterActorBox *"
+	.get_stage ctype="ClutterActor *"
+Action.handle_event.event ctype="const ClutterEvent *"
+
+// method/virtual-method/signal don't match
+Actor
+	.event#method name="emit_event"
+	.get_paint_volume#virtual_method name="get_paint_volume_vfunc"
+	.get_paint_volume#virtual_method.volume out
+Text
+	.activate#method name="try_activate"
+	.insert_text#signal skip
+TextBuffer.get_text#virtual_method name="get_text_with_length"
+
+// Default values
+Stage.read_pixels
+	.width default=-1
+	.height default=-1
+Stage.paint_to_buffer
+    .data type="uint8[]"
+Text
+	.position_to_coords.line_height default=null
+
+// Skipped by g-i for unknown reasons
+LayoutManager
+	.create_child_meta skip=false
+
+// We can use static strings
+PaintNode
+	.set_static_name skip=false
+
+// Variadic arguments
+Backend
+	.get_cogl_context skip=false
+Interval
+	.new skip=false
+	.get_interval skip=false
+	.set_final skip=false
+	.set_initial skip=false
+	.set_interval skip=false
+LayoutManager
+	.child_get skip=false
+	.child_set skip=false
+
+// Skipped upstream for unknown reasons
+Interval.register_progress_func skip=false
+
+// struct/class confusion
+ActorBox
+	.new skip
+	.from_vertices skip
+Margin
+	.new skip
+
+// Upstream
+Event
+	.get_position.position out
+
+FrameListenerIface skip
+FrameClock.new skip
+
+// Remove for clutter-2.0
+/////////////////////////
+
+StageView.layout skip
+
+Stage
+	.paint_view.redraw_clip type="Cairo.Region"
+
+// *Event should be compact classes derived from Clutter.Event
+Event.type skip=false
+AnyEvent struct=false base_type="Clutter.Event"
+ButtonEvent struct=false base_type="Clutter.Event"
+CrossingEvent struct=false base_type="Clutter.Event"
+DeviceEvent struct=false base_type="Clutter.Event"
+IMEvent struct=false base_type="Clutter.Event"
+KeyEvent struct=false base_type="Clutter.Event"
+MotionEvent struct=false base_type="Clutter.Event"
+PadButtonEvent struct=false base_type="Clutter.Event"
+PadDialEvent struct=false base_type="Clutter.Event"
+PadRingEvent struct=false base_type="Clutter.Event"
+PadStripEvent struct=false base_type="Clutter.Event"
+ProximityEvent struct=false base_type="Clutter.Event"
+ScrollEvent struct=false base_type="Clutter.Event"
+TouchEvent struct=false base_type="Clutter.Event"
+TouchpadHoldEvent struct=false base_type="Clutter.Event"
+TouchpadPinchEvent struct=false base_type="Clutter.Event"
+TouchpadSwipeEvent struct=false base_type="Clutter.Event"
+
+// Keysyms used to be CLUTTER_X instead of CLUTTER_KEY_X
+*#constant skip
+CURRENT_TIME skip=false
+PRIORITY_REDRAW skip=false
+
+// Clutter devs don't like us creating nested namespaces
+value_* name="value_(.+)" parent="Clutter.Value"
+threads_* name="threads_(.+)" parent="Clutter.Threads"
+
+// There is no way to know sealed classes before GLib 2.70
+ColorState sealed
+FrameClock sealed
+TextureContent sealed
+
+TextureContent.new_from_texture symbol_type="constructor"
+
+// Possibly keep
+KEY_* skip=false name="KEY_(.+)" type="uint" parent="Clutter.Key"
+BUTTON_* skip=false name="BUTTON_(.+)" type="uint32" parent="Clutter.Button"
+EVENT_STOP skip=false type="bool"
+EVENT_PROPAGATE skip=false type="bool"