Implement gtk-layer-shell.

- Relies on layer-shell for scale changes and resizing to workarea,
  ignores Cinnamon proxy in Wayland mode.
- If layer-shell is not supported by the compositor, resorts to x11
  backend. (This is checked directly using wl_display, before
  gtk_init() runs)
- nemo-icon-info: Add widget scale factor as part of the cache key.
  It's possible for nemo-desktop-windows to have different scale
  factors, and icon sizing if affected in these situations.

Tested in: Cinnamon, labwc.

Author: mtwebster

config.h.meson.in

@@ -19,6 +19,8 @@
 #mesondefine HAVE_SELINUX
 // Define to enable pango-1.44 fixes
 #mesondefine HAVE_PANGO_144
+// Define to use gtk-layer-shell
+#mesondefine HAVE_GTK_LAYER_SHELL
 
 
 

debian/control

@@ -21,12 +21,14 @@ Build-Depends:
  libgsf-1-dev,
  libgtk-3-dev (>= 3.10),
  libgtk-3-doc,
+ libgtk-layer-shell-dev,
  libjson-glib-dev (>= 1.6),
  libpango1.0-dev,
  libx11-dev,
  libxapp-dev (>= 2.0.0),
  libxext-dev,
  libxrender-dev,
+ libwayland-dev,
  meson,
  python3,
  python3-gi,

debian/rules

@@ -8,6 +8,7 @@ CONFIGURE_EXTRA_FLAGS = \
 	--buildtype=debugoptimized \
 	-D deprecated_warnings=false \
 	-D gtk_doc=true \
+	-D gtk_layer_shell=true \
 	-D selinux=false
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed

eel/eel-gtk-extensions.c

@@ -251,6 +251,9 @@ eel_gtk_window_set_initial_geometry_from_string (GtkWindow *window,
 	eel_gtk_window_set_initial_geometry (window, geometry_flags, left, top, width, height);
 }
 
+/* nemo-desktop only runs on Wayland when gtk-layer-shell is available
+ * (checked in nemo-desktop-main.c before gtk_init), so a TRUE return
+ * here also implies layer-shell support. */
 gboolean
 eel_check_is_wayland (void)
 {

libnemo-private/meson.build

@@ -98,6 +98,10 @@ if libselinux_enabled
   nemo_private_deps += libselinux
 endif
 
+if gtk_layer_shell_enabled
+  nemo_private_deps += gtk_layer_shell
+endif
+
 nemo_private_lib = static_library('nemo-private',
   nemo_private_sources,
   dependencies: nemo_private_deps,

libnemo-private/nemo-desktop-utils.c

@@ -19,8 +19,15 @@
  *
  */
 
+#include <config.h>
 #include "nemo-desktop-utils.h"
 
+#include <eel/eel-gtk-extensions.h>
+
+#ifdef HAVE_GTK_LAYER_SHELL
+#include <gtk-layer-shell/gtk-layer-shell.h>
+#endif
+
 static GdkScreen *default_screen = NULL;
 
 static void
@@ -181,3 +188,33 @@ nemo_desktop_utils_get_scale_factor (void)
     return (gint) scale;
 }
 
+gboolean
+nemo_desktop_utils_configure_layer_shell (GtkWindow *window,
+                                          gint       monitor_num,
+                                          gboolean   keyboard_on_demand)
+{
+    if (eel_check_is_wayland ()) {
+#ifdef HAVE_GTK_LAYER_SHELL
+        GdkDisplay *display = gdk_display_get_default ();
+        GdkMonitor *monitor = gdk_display_get_monitor (display, monitor_num);
+
+        gtk_layer_set_layer (window, GTK_LAYER_SHELL_LAYER_BOTTOM);
+        gtk_layer_set_namespace (window, "nemo-desktop");
+        gtk_layer_set_keyboard_mode (window,
+                                     keyboard_on_demand ? GTK_LAYER_SHELL_KEYBOARD_MODE_ON_DEMAND
+                                                        : GTK_LAYER_SHELL_KEYBOARD_MODE_NONE);
+        gtk_layer_set_exclusive_zone (window, 0);
+        gtk_layer_set_anchor (window, GTK_LAYER_SHELL_EDGE_TOP, TRUE);
+        gtk_layer_set_anchor (window, GTK_LAYER_SHELL_EDGE_BOTTOM, TRUE);
+        gtk_layer_set_anchor (window, GTK_LAYER_SHELL_EDGE_LEFT, TRUE);
+        gtk_layer_set_anchor (window, GTK_LAYER_SHELL_EDGE_RIGHT, TRUE);
+
+        if (monitor) {
+            gtk_layer_set_monitor (window, monitor);
+        }
+#endif
+        return TRUE;
+    }
+
+    return FALSE;
+}

libnemo-private/nemo-desktop-utils.h

@@ -35,6 +35,10 @@ gint nemo_desktop_utils_get_num_monitors (void);
 gboolean nemo_desktop_utils_get_monitor_cloned (gint monitor, gint x_primary);
 gint nemo_desktop_utils_get_scale_factor (void);
 
+gboolean nemo_desktop_utils_configure_layer_shell (GtkWindow *window,
+                                                   gint       monitor_num,
+                                                   gboolean   keyboard_on_demand);
+
 G_END_DECLS
 
 #endif

libnemo-private/nemo-icon-container.c

@@ -3620,6 +3620,28 @@ nemo_icon_container_search_position_func (NemoIconContainer *container,
     if (nemo_icon_container_get_is_desktop (container)) {
         x = cont_x + cont_width - requisition.width;
         y = cont_y + cont_height - requisition.height;
+
+        if (eel_check_is_wayland ()) {
+            GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container));
+            GdkWindow *parent_window = gtk_widget_get_window (toplevel);
+            gint parent_x, parent_y;
+
+            gdk_window_get_origin (parent_window, &parent_x, &parent_y);
+
+            GdkRectangle anchor_rect = {
+                x - parent_x,
+                y - parent_y,
+                1, 1
+            };
+
+            gdk_window_move_to_rect (gtk_widget_get_window (search_dialog),
+                                     &anchor_rect,
+                                     GDK_GRAVITY_NORTH_WEST,
+                                     GDK_GRAVITY_NORTH_WEST,
+                                     0,
+                                     0, 0);
+            return;
+        }
     } else {
         if (cont_x + cont_width > monitor.x + monitor.width) {
             x = monitor.x + monitor.width - requisition.width;
@@ -4082,6 +4104,17 @@ nemo_icon_container_ensure_interactive_directory (NemoIconContainer *container)
 	gtk_container_add (GTK_CONTAINER (vbox), container->details->search_entry);
 
 	gtk_widget_realize (container->details->search_entry);
+
+    if (eel_check_is_wayland () && nemo_icon_container_get_is_desktop (container)) {
+        GdkRectangle anchor_rect = { 0, 0, 1, 1 };
+
+        gdk_window_move_to_rect (gtk_widget_get_window (container->details->search_window),
+                                 &anchor_rect,
+                                 GDK_GRAVITY_NORTH_WEST,
+                                 GDK_GRAVITY_NORTH_WEST,
+                                 0,
+                                 0, 0);
+    }
 }
 
 /* Pops up the interactive search entry.  If keybinding is TRUE then the user

libnemo-private/nemo-icon-info.c

@@ -168,6 +168,7 @@ nemo_icon_info_new_for_icon_info (GtkIconInfo *icon_info,
 typedef struct  {
 	GIcon *icon;
 	int size;
+	int scale;
 } IconKey;
 
 static GHashTable *loadable_icon_cache = NULL;
@@ -253,25 +254,27 @@ nemo_icon_info_clear_caches (void)
 static guint
 icon_key_hash (IconKey *key)
 {
-	return g_icon_hash (key->icon) ^ key->size;
+	return g_icon_hash (key->icon) ^ key->size ^ key->scale;
 }
 
 static gboolean
 icon_key_equal (const IconKey *a,
                 const IconKey *b)
 {
 	return a->size == b->size &&
+		a->scale == b->scale &&
 		g_icon_equal (a->icon, b->icon);
 }
 
 static IconKey *
-icon_key_new (GIcon *icon, int size)
+icon_key_new (GIcon *icon, int size, int scale)
 {
 	IconKey *key;
 
 	key = g_new0 (IconKey, 1);
 	key->icon = g_object_ref (icon);
 	key->size = size;
+	key->scale = scale;
 
 	return key;
 }
@@ -311,6 +314,7 @@ nemo_icon_info_lookup (GIcon *icon,
 
         lookup_key.icon = icon;
         lookup_key.size = size;
+        lookup_key.scale = scale;
 
         icon_info = g_hash_table_lookup (loadable_icon_cache, &lookup_key);
         if (icon_info) {
@@ -344,7 +348,7 @@ nemo_icon_info_lookup (GIcon *icon,
 
         icon_info = nemo_icon_info_new_for_pixbuf (pixbuf, scale);
 
-        key = icon_key_new (icon, size);
+        key = icon_key_new (icon, size, scale);
         g_hash_table_insert (loadable_icon_cache, key, icon_info);
 
         g_clear_object (&pixbuf);
@@ -363,6 +367,7 @@ nemo_icon_info_lookup (GIcon *icon,
 
         lookup_key.icon = icon;
         lookup_key.size = size;
+        lookup_key.scale = scale;
 
         icon_info = g_hash_table_lookup (themed_icon_cache, &lookup_key);
         if (icon_info) {
@@ -388,7 +393,7 @@ nemo_icon_info_lookup (GIcon *icon,
         icon_info = nemo_icon_info_new_for_icon_info (gtkicon_info, scale);
         g_object_unref (gtkicon_info);
 
-        key = icon_key_new (icon, size);
+        key = icon_key_new (icon, size, scale);
         g_hash_table_insert (themed_icon_cache, key, icon_info);
 
         return nemo_icon_info_ref (icon_info);

meson.build

@@ -133,6 +133,13 @@ if libselinux_enabled
 endif
 conf.set('HAVE_SELINUX', libselinux_enabled)
 
+gtk_layer_shell_enabled = get_option('gtk_layer_shell')
+if gtk_layer_shell_enabled
+  gtk_layer_shell = dependency('gtk-layer-shell-0', version: '>=0.8', required: true)
+  wayland_client = dependency('wayland-client', required: true)
+  conf.set('HAVE_GTK_LAYER_SHELL', gtk_layer_shell.found())
+endif
+
 # make sure pango development files are installed
 pango = dependency('pango', version: '>=1.40.0')
 # check for newer pango for necessary workarounds
@@ -201,6 +208,7 @@ message('\n'.join(['',
 '    exempi  support:        @0@'.format(exempi_enabled),
 '    Tracker support:        @0@'.format(tracker_enabled),
 '    Wayland support:        @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)),
+'    gtk-layer-shell:        @0@'.format(gtk_layer_shell_enabled),
 '',
 '    nemo-extension documentation: @0@'.format(gtkdoc_enabled),
 '    nemo-extension introspection: @0@'.format(true),