Use XShape... again

Author: lenemter

lib/Utils.vala

@@ -404,7 +404,7 @@ namespace Gala {
             return texture;
         }
 
-        private static HashTable<Meta.Window, X.XserverRegion?> regions = new HashTable<Meta.Window, X.XserverRegion?> (null, null);
+        private static HashTable<Meta.Window, X.Rectangle?> regions = new HashTable<Meta.Window, X.Rectangle?> (null, null);
 
         public static void x11_set_window_pass_through (Meta.Window window) {
             unowned var x11_display = window.display.get_x11_display ();
@@ -416,7 +416,8 @@ namespace Gala {
 #endif
             unowned var xdisplay = x11_display.get_xdisplay ();
 
-            regions[window] = X.Fixes.create_region_from_window (xdisplay, x_window, 0);
+            int count, ordering;
+            regions[window] = X.Shape.get_rectangles (xdisplay, x_window, 2, out count, out ordering)[0];
 
             X.Xrectangle rect = {};
             var region = X.Fixes.create_region (xdisplay, {rect});
@@ -443,7 +444,7 @@ namespace Gala {
                     return;
                 }
 
-                X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, region);
+                X.Shape.combine_rectangles (xdisplay, x_window, 2, 0, 0, { region }, 0, 3);
             } else {
                 X.Fixes.set_window_shape_region (xdisplay, x_window, 2, 0, 0, (X.XserverRegion) 0);
             }

meson.build

@@ -94,6 +94,7 @@ gnome_desktop_dep = dependency('gnome-desktop-3.0')
 m_dep = cc.find_library('m', required: false)
 posix_dep = vala.find_library('posix', required: false)
 sqlite3_dep = dependency('sqlite3')
+xext_dep = cc.find_library('Xext', required: true)
 if get_option('systemd')
     systemd_dep = dependency('libsystemd')
 endif
@@ -149,7 +150,7 @@ endif
 add_project_arguments(vala_flags, language: 'vala')
 add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c')
 
-gala_base_dep = [atk_bridge_dep, canberra_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, config_dep]
+gala_base_dep = [atk_bridge_dep, canberra_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep, config_dep]
 
 if get_option('systemd')
     gala_base_dep += systemd_dep

vapi/xfixes-4.0.vapi

@@ -12,6 +12,12 @@ namespace X {
 		public static void destroy_region (X.Display display, X.XserverRegion region);
 		[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XFixesSetWindowShapeRegion")]
         public static void set_window_shape_region (X.Display display, X.Window win, int shape_kind, int x_off, int y_off, XserverRegion region);
+	}
+		namespace Shape {
+		[CCode (cheader_filename = "X11/extensions/shape.h", cname = "XShapeGetRectangles")]
+		public static X.Rectangle* get_rectangles (X.Display display, X.Window win, int kind, out int count, out int ordering);
+		[CCode (cheader_filename = "X11/extensions/shape.h", cname = "XShapeCombineRectangles")]
+		public static void combine_rectangles (X.Display display, X.Window win, int kind, int x, int y, [CCode (array_length_cname = "count", type = "XRectangle*")] X.Rectangle[] rectangles, int op, int ordering);
 	}
 	[SimpleType]
 	[CCode (cheader_filename = "X11/extensions/Xfixes.h", cname = "XserverRegion", has_type_id = false)]