Use layer shell

eek/layersurface.c

@@ -0,0 +1,374 @@
+/*
+ * Copyright (C) 2018 Purism SPC
+ * SPDX-License-Identifier: GPL-3.0+
+ * Author: Guido Günther <agx@sigxcpu.org>
+ */
+
+
+/*
+
+WARNING: this file is taken directly from phosh, with no modificaions apart from this message. Please update phosh instead of changing this file. Please copy the file back here afterwards, with the same notice.
+
+*/
+
+
+#define G_LOG_DOMAIN "phosh-layer-surface"
+
+#include "config.h"
+#include "layersurface.h"
+
+#include <gdk/gdkwayland.h>
+
+enum {
+  PHOSH_LAYER_SURFACE_PROP_0,
+  PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL,
+  PHOSH_LAYER_SURFACE_PROP_WL_OUTPUT,
+  PHOSH_LAYER_SURFACE_PROP_ANCHOR,
+  PHOSH_LAYER_SURFACE_PROP_LAYER,
+  PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY,
+  PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE,
+  PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH,
+  PHOSH_LAYER_SURFACE_PROP_LAYER_HEIGHT,
+  PHOSH_LAYER_SURFACE_PROP_NAMESPACE,
+  PHOSH_LAYER_SURFACE_PROP_LAST_PROP
+};
+static GParamSpec *props[PHOSH_LAYER_SURFACE_PROP_LAST_PROP];
+
+enum {
+  CONFIGURED,
+  N_SIGNALS
+};
+static guint signals [N_SIGNALS];
+
+
+typedef struct {
+  struct wl_surface *wl_surface;
+  struct zwlr_layer_surface_v1 *layer_surface;
+
+  /* Properties */
+  guint anchor;
+  guint layer;
+  gboolean kbd_interactivity;
+  gint exclusive_zone;
+  gint width, height;
+  gchar *namespace;
+  struct zwlr_layer_shell_v1 *layer_shell;
+  struct wl_output *wl_output;
+} PhoshLayerSurfacePrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (PhoshLayerSurface, phosh_layer_surface, GTK_TYPE_WINDOW)
+
+static void layer_surface_configure(void                         *data,
+                                    struct zwlr_layer_surface_v1 *surface,
+                                    uint32_t                      serial,
+                                    uint32_t                      width,
+                                    uint32_t                      height)
+{
+  PhoshLayerSurface *self = data;
+  gtk_window_resize (GTK_WINDOW (self), width, height);
+  zwlr_layer_surface_v1_ack_configure(surface, serial);
+  gtk_widget_show_all (GTK_WIDGET (self));
+
+  g_signal_emit (self, signals[CONFIGURED], 0);
+}
+
+
+static void layer_surface_closed (void                         *data,
+                                  struct zwlr_layer_surface_v1 *surface)
+{
+  PhoshLayerSurface *self = data;
+  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
+
+  g_return_if_fail (priv->layer_surface == surface);
+  zwlr_layer_surface_v1_destroy(priv->layer_surface);
+  priv->layer_surface = NULL;
+  gtk_widget_destroy (GTK_WIDGET (self));
+}
+
+static struct zwlr_layer_surface_v1_listener layer_surface_listener = {
+	.configure = layer_surface_configure,
+	.closed = layer_surface_closed,
+};
+
+static void
+phosh_layer_surface_set_property (GObject      *object,
+                                  guint         property_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
+  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
+
+  switch (property_id) {
+  case PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL:
+    priv->layer_shell = g_value_get_pointer (value);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_WL_OUTPUT:
+    priv->wl_output = g_value_get_pointer (value);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_ANCHOR:
+    priv->anchor = g_value_get_uint (value);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_LAYER:
+    priv->layer = g_value_get_uint (value);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY:
+    priv->kbd_interactivity = g_value_get_boolean (value);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE:
+    priv->exclusive_zone = g_value_get_int (value);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH:
+    priv->width = g_value_get_uint (value);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_LAYER_HEIGHT:
+    priv->height = g_value_get_uint (value);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_NAMESPACE:
+    g_free (priv->namespace);
+    priv->namespace = g_value_dup_string (value);
+    break;
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    break;
+  }
+}
+
+
+static void
+phosh_layer_surface_get_property (GObject    *object,
+                                  guint       property_id,
+                                  GValue     *value,
+                                  GParamSpec *pspec)
+{
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
+  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
+
+  switch (property_id) {
+  case PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL:
+    g_value_set_pointer (value, priv->layer_shell);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_WL_OUTPUT:
+    g_value_set_pointer (value, priv->wl_output);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_ANCHOR:
+    g_value_set_uint (value, priv->anchor);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_LAYER:
+    g_value_set_uint (value, priv->layer);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY:
+    g_value_set_boolean (value, priv->kbd_interactivity);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE:
+    g_value_set_boolean (value, priv->exclusive_zone);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH:
+    g_value_set_uint (value, priv->width);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_LAYER_HEIGHT:
+    g_value_set_uint (value, priv->height);
+    break;
+  case PHOSH_LAYER_SURFACE_PROP_NAMESPACE:
+    g_value_set_string (value, priv->namespace);
+    break;
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+    break;
+  }
+}
+
+
+static void
+phosh_layer_surface_constructed (GObject *object)
+{
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
+  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
+  GdkWindow *gdk_window;
+
+  G_OBJECT_CLASS (phosh_layer_surface_parent_class)->constructed (object);
+
+  gtk_window_set_decorated (GTK_WINDOW (self), FALSE);
+  /* Realize the window so we can get the GDK window */
+  gtk_widget_realize(GTK_WIDGET (self));
+
+  gdk_window = gtk_widget_get_window (GTK_WIDGET (self));
+  gdk_wayland_window_set_use_custom_surface (gdk_window);
+  priv->wl_surface = gdk_wayland_window_get_wl_surface (gdk_window);
+
+  priv->layer_surface = zwlr_layer_shell_v1_get_layer_surface(priv->layer_shell,
+                                                              priv->wl_surface,
+                                                              priv->wl_output,
+                                                              priv->layer,
+                                                              priv->namespace);
+  zwlr_layer_surface_v1_set_exclusive_zone(priv->layer_surface, priv->exclusive_zone);
+  zwlr_layer_surface_v1_set_size(priv->layer_surface, priv->width, priv->height);
+  zwlr_layer_surface_v1_set_anchor(priv->layer_surface, priv->anchor);
+  zwlr_layer_surface_v1_set_keyboard_interactivity(priv->layer_surface, priv->kbd_interactivity);
+  zwlr_layer_surface_v1_add_listener(priv->layer_surface,
+                                     &layer_surface_listener,
+                                     self);
+  wl_surface_commit(priv->wl_surface);
+}
+
+static void
+phosh_layer_surface_dispose (GObject *object)
+{
+  PhoshLayerSurface *self = PHOSH_LAYER_SURFACE (object);
+  PhoshLayerSurfacePrivate *priv = phosh_layer_surface_get_instance_private (self);
+
+  if (priv->layer_surface) {
+    zwlr_layer_surface_v1_destroy(priv->layer_surface);
+    priv->layer_surface = NULL;
+  }
+  g_clear_pointer (&priv->namespace, g_free);
+
+  G_OBJECT_CLASS (phosh_layer_surface_parent_class)->dispose (object);
+}
+
+
+static void
+phosh_layer_surface_class_init (PhoshLayerSurfaceClass *klass)
+{
+  GObjectClass *object_class = (GObjectClass *)klass;
+
+  object_class->constructed = phosh_layer_surface_constructed;
+  object_class->dispose = phosh_layer_surface_dispose;
+
+  object_class->set_property = phosh_layer_surface_set_property;
+  object_class->get_property = phosh_layer_surface_get_property;
+
+  props[PHOSH_LAYER_SURFACE_PROP_LAYER_SHELL] =
+    g_param_spec_pointer (
+      "layer-shell",
+      "Wayland Layer Shell Global",
+      "The layer shell wayland global",
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  props[PHOSH_LAYER_SURFACE_PROP_WL_OUTPUT] =
+    g_param_spec_pointer (
+      "wl-output",
+      "Wayland Output",
+      "The wl_output associated with this surface",
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  props[PHOSH_LAYER_SURFACE_PROP_ANCHOR] =
+    g_param_spec_uint (
+      "anchor",
+      "Anchor edges",
+      "The edges to anchor the surface to",
+      0,
+      G_MAXUINT,
+      0,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  props[PHOSH_LAYER_SURFACE_PROP_LAYER] =
+    g_param_spec_uint (
+      "layer",
+      "Layer",
+      "The layer the surface should be attached to",
+      0,
+      G_MAXUINT,
+      0,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  props[PHOSH_LAYER_SURFACE_PROP_KBD_INTERACTIVITY] =
+    g_param_spec_boolean (
+      "kbd-interactivity",
+      "Keyboard interactivity",
+      "Whether the surface interacts with the keyboard",
+      FALSE,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  props[PHOSH_LAYER_SURFACE_PROP_EXCLUSIVE_ZONE] =
+    g_param_spec_int (
+      "exclusive-zone",
+      "Exclusive Zone",
+      "Set area that is not occluded with other surfaces",
+      -1,
+      G_MAXINT,
+      0,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  props[PHOSH_LAYER_SURFACE_PROP_LAYER_WIDTH] =
+    g_param_spec_uint (
+      "width",
+      "Width",
+      "The width of the layer surface",
+      0,
+      G_MAXUINT,
+      0,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  props[PHOSH_LAYER_SURFACE_PROP_LAYER_HEIGHT] =
+    g_param_spec_uint (
+      "height",
+      "Height",
+      "The height of the layer surface",
+      0,
+      G_MAXUINT,
+      0,
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  props[PHOSH_LAYER_SURFACE_PROP_NAMESPACE] =
+    g_param_spec_string (
+      "namespace",
+      "Namespace",
+      "Namespace of the layer surface",
+      "",
+      G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+  g_object_class_install_properties (object_class, PHOSH_LAYER_SURFACE_PROP_LAST_PROP, props);
+
+  /**
+   * PhoshLayersurface::configured
+   * @self: The #PhoshLayersurface instance.
+   *
+   * This signal is emitted once we received the configure event from the
+   * compositor.
+   */
+  signals[CONFIGURED] =
+    g_signal_new ("configured",
+                  G_TYPE_FROM_CLASS (klass),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (PhoshLayerSurfaceClass, configured),
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+}
+
+
+static void
+phosh_layer_surface_init (PhoshLayerSurface *self)
+{
+}
+
+
+GtkWidget *
+phosh_layer_surface_new (gpointer layer_shell,
+                         gpointer wl_output)
+{
+  return g_object_new (PHOSH_TYPE_LAYER_SURFACE,
+                       "layer-shell", layer_shell,
+                       "wl-output", wl_output);
+}
+
+struct zwlr_layer_surface_v1 *
+phosh_layer_surface_get_layer_surface(PhoshLayerSurface *self)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_val_if_fail (PHOSH_IS_LAYER_SURFACE (self), NULL);
+  priv = phosh_layer_surface_get_instance_private (self);
+  return priv->layer_surface;
+}
+
+
+struct wl_surface *
+phosh_layer_surface_get_wl_surface(PhoshLayerSurface *self)
+{
+  PhoshLayerSurfacePrivate *priv;
+
+  g_return_val_if_fail (PHOSH_IS_LAYER_SURFACE (self), NULL);
+  priv = phosh_layer_surface_get_instance_private (self);
+  return priv->wl_surface;
+}

eek/layersurface.h

@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2018 Purism SPC
+ *
+ * SPDX-License-Identifier: GPL-3.0+
+ */
+
+
+/*
+
+WARNING: this file is taken directly from phosh, with no modificaions apart from this message. Please update phosh instead of changing this file. Please copy the file back here afterwards, with the same notice.
+
+*/
+
+
+#pragma once
+
+#include <gtk/gtk.h>
+/* TODO: We use the enum constants from here, use glib-mkenums */
+#include "wlr-layer-shell-unstable-v1-client-protocol.h"
+
+#define PHOSH_TYPE_LAYER_SURFACE                 (phosh_layer_surface_get_type ())
+
+G_DECLARE_DERIVABLE_TYPE (PhoshLayerSurface, phosh_layer_surface, PHOSH, LAYER_SURFACE, GtkWindow)
+
+/**
+ * PhoshLayerSurfaceClass
+ * @parent_class: The parent class
+ */
+struct _PhoshLayerSurfaceClass
+{
+  GtkWindowClass parent_class;
+
+  /* Signals
+   */
+  void (*configured)   (PhoshLayerSurface    *self);
+};
+
+GtkWidget *phosh_layer_surface_new (gpointer layer_shell,
+                                    gpointer wl_output);
+struct     zwlr_layer_surface_v1 *phosh_layer_surface_get_layer_surface(PhoshLayerSurface *self);
+struct     wl_surface            *phosh_layer_surface_get_wl_surface(PhoshLayerSurface *self);

meson.build

@@ -13,5 +13,6 @@ pkgdatadir = join_paths(datadir, meson.project_name())
 dbusdir = join_paths(datadir, 'dbus-1/interfaces')
 
 subdir('data')
+subdir('protocols')
 subdir('eek')
 subdir('src')

protocols/meson.build

@@ -0,0 +1,20 @@
+wayland_protos = dependency('wayland-protocols', version: '>=1.12')
+wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
+
+wl_scanner = find_program('wayland-scanner')
+gen_scanner_client_header = generator(wl_scanner,
+    output: '@BASENAME@-client-protocol.h',
+    arguments: ['client-header', '@INPUT@', '@OUTPUT@'])
+gen_scanner_client_code = generator(wl_scanner,
+    output: '@BASENAME@-protocol.c',
+    arguments: ['code', '@INPUT@', '@OUTPUT@'])
+
+wl_protos = [
+  wl_protocol_dir + '/stable/xdg-shell/xdg-shell.xml',
+  'wlr-layer-shell-unstable-v1.xml',
+]
+wl_proto_sources = []
+foreach proto: wl_protos
+  wl_proto_sources += gen_scanner_client_header.process(proto)
+  wl_proto_sources += gen_scanner_client_code.process(proto)
+endforeach

protocols/wlr-layer-shell-unstable-v1.xml

@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="wlr_layer_shell_unstable_v1">
+  <copyright>
+    Copyright © 2017 Drew DeVault
+
+    Permission to use, copy, modify, distribute, and sell this
+    software and its documentation for any purpose is hereby granted
+    without fee, provided that the above copyright notice appear in
+    all copies and that both that copyright notice and this permission
+    notice appear in supporting documentation, and that the name of
+    the copyright holders not be used in advertising or publicity
+    pertaining to distribution of the software without specific,
+    written prior permission.  The copyright holders make no
+    representations about the suitability of this software for any
+    purpose.  It is provided "as is" without express or implied
+    warranty.
+
+    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+    THIS SOFTWARE.
+  </copyright>
+
+  <interface name="zwlr_layer_shell_v1" version="1">
+    <description summary="create surfaces that are layers of the desktop">
+      Clients can use this interface to assign the surface_layer role to
+      wl_surfaces. Such surfaces are assigned to a "layer" of the output and
+      rendered with a defined z-depth respective to each other. They may also be
+      anchored to the edges and corners of a screen and specify input handling
+      semantics. This interface should be suitable for the implementation of
+      many desktop shell components, and a broad number of other applications
+      that interact with the desktop.
+    </description>
+
+    <request name="get_layer_surface">
+      <description summary="create a layer_surface from a surface">
+        Create a layer surface for an existing surface. This assigns the role of
+        layer_surface, or raises a protocol error if another role is already
+        assigned.
+
+        Creating a layer surface from a wl_surface which has a buffer attached
+        or committed is a client error, and any attempts by a client to attach
+        or manipulate a buffer prior to the first layer_surface.configure call
+        must also be treated as errors.
+
+        You may pass NULL for output to allow the compositor to decide which
+        output to use. Generally this will be the one that the user most
+        recently interacted with.
+
+        Clients can specify a namespace that defines the purpose of the layer
+        surface.
+      </description>
+      <arg name="id" type="new_id" interface="zwlr_layer_surface_v1"/>
+      <arg name="surface" type="object" interface="wl_surface"/>
+      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
+      <arg name="layer" type="uint" enum="layer" summary="layer to add this surface to"/>
+      <arg name="namespace" type="string" summary="namespace for the layer surface"/>
+    </request>
+
+    <enum name="error">
+      <entry name="role" value="0" summary="wl_surface has another role"/>
+      <entry name="invalid_layer" value="1" summary="layer value is invalid"/>
+      <entry name="already_constructed" value="2" summary="wl_surface has a buffer attached or committed"/>
+    </enum>
+
+    <enum name="layer">
+      <description summary="available layers for surfaces">
+        These values indicate which layers a surface can be rendered in. They
+        are ordered by z depth, bottom-most first. Traditional shell surfaces
+        will typically be rendered between the bottom and top layers.
+        Fullscreen shell surfaces are typically rendered at the top layer.
+        Multiple surfaces can share a single layer, and ordering within a
+        single layer is undefined.
+      </description>
+
+      <entry name="background" value="0"/>
+      <entry name="bottom" value="1"/>
+      <entry name="top" value="2"/>
+      <entry name="overlay" value="3"/>
+    </enum>
+  </interface>
+
+  <interface name="zwlr_layer_surface_v1" version="1">
+    <description summary="layer metadata interface">
+      An interface that may be implemented by a wl_surface, for surfaces that
+      are designed to be rendered as a layer of a stacked desktop-like
+      environment.
+
+      Layer surface state (size, anchor, exclusive zone, margin, interactivity)
+      is double-buffered, and will be applied at the time wl_surface.commit of
+      the corresponding wl_surface is called.
+    </description>
+
+    <request name="set_size">
+      <description summary="sets the size of the surface">
+        Sets the size of the surface in surface-local coordinates. The
+        compositor will display the surface centered with respect to its
+        anchors.
+
+        If you pass 0 for either value, the compositor will assign it and
+        inform you of the assignment in the configure event. You must set your
+        anchor to opposite edges in the dimensions you omit; not doing so is a
+        protocol error. Both values are 0 by default.
+
+        Size is double-buffered, see wl_surface.commit.
+      </description>
+      <arg name="width" type="uint"/>
+      <arg name="height" type="uint"/>
+    </request>
+
+    <request name="set_anchor">
+      <description summary="configures the anchor point of the surface">
+        Requests that the compositor anchor the surface to the specified edges
+        and corners. If two orthogonal edges are specified (e.g. 'top' and
+        'left'), then the anchor point will be the intersection of the edges
+        (e.g. the top left corner of the output); otherwise the anchor point
+        will be centered on that edge, or in the center if none is specified.
+
+        Anchor is double-buffered, see wl_surface.commit.
+      </description>
+      <arg name="anchor" type="uint" enum="anchor"/>
+    </request>
+
+    <request name="set_exclusive_zone">
+      <description summary="configures the exclusive geometry of this surface">
+        Requests that the compositor avoids occluding an area of the surface
+        with other surfaces. The compositor's use of this information is
+        implementation-dependent - do not assume that this region will not
+        actually be occluded.
+
+        A positive value is only meaningful if the surface is anchored to an
+        edge, rather than a corner. The zone is the number of surface-local
+        coordinates from the edge that is considered exclusive.
+
+        Surfaces that do not wish to have an exclusive zone may instead specify
+        how they should interact with surfaces that do. If set to zero, the
+        surface indicates that it would like to be moved to avoid occluding
+        surfaces with a positive exclusive zone. If set to -1, the surface
+        indicates that it would not like to be moved to accommodate for other
+        surfaces, and the compositor should extend it all the way to the edges
+        it is anchored to.
+
+        For example, a panel might set its exclusive zone to 10, so that
+        maximized shell surfaces are not shown on top of it. A notification
+        might set its exclusive zone to 0, so that it is moved to avoid
+        occluding the panel, but shell surfaces are shown underneath it. A
+        wallpaper or lock screen might set their exclusive zone to -1, so that
+        they stretch below or over the panel.
+
+        The default value is 0.
+
+        Exclusive zone is double-buffered, see wl_surface.commit.
+      </description>
+      <arg name="zone" type="int"/>
+    </request>
+
+    <request name="set_margin">
+      <description summary="sets a margin from the anchor point">
+        Requests that the surface be placed some distance away from the anchor
+        point on the output, in surface-local coordinates. Setting this value
+        for edges you are not anchored to has no effect.
+
+        The exclusive zone includes the margin.
+
+        Margin is double-buffered, see wl_surface.commit.
+      </description>
+      <arg name="top" type="int"/>
+      <arg name="right" type="int"/>
+      <arg name="bottom" type="int"/>
+      <arg name="left" type="int"/>
+    </request>
+
+    <request name="set_keyboard_interactivity">
+      <description summary="requests keyboard events">
+        Set to 1 to request that the seat send keyboard events to this layer
+        surface. For layers below the shell surface layer, the seat will use
+        normal focus semantics. For layers above the shell surface layers, the
+        seat will always give exclusive keyboard focus to the top-most layer
+        which has keyboard interactivity set to true.
+
+        Layer surfaces receive pointer, touch, and tablet events normally. If
+        you do not want to receive them, set the input region on your surface
+        to an empty region.
+
+        Events is double-buffered, see wl_surface.commit.
+      </description>
+      <arg name="keyboard_interactivity" type="uint"/>
+    </request>
+
+    <request name="get_popup">
+      <description summary="assign this layer_surface as an xdg_popup parent">
+        This assigns an xdg_popup's parent to this layer_surface.  This popup
+        should have been created via xdg_surface::get_popup with the parent set
+        to NULL, and this request must be invoked before committing the popup's
+        initial state.
+
+        See the documentation of xdg_popup for more details about what an
+        xdg_popup is and how it is used.
+      </description>
+      <arg name="popup" type="object" interface="xdg_popup"/>
+    </request>
+
+    <request name="ack_configure">
+      <description summary="ack a configure event">
+        When a configure event is received, if a client commits the
+        surface in response to the configure event, then the client
+        must make an ack_configure request sometime before the commit
+        request, passing along the serial of the configure event.
+
+        If the client receives multiple configure events before it
+        can respond to one, it only has to ack the last configure event.
+
+        A client is not required to commit immediately after sending
+        an ack_configure request - it may even ack_configure several times
+        before its next surface commit.
+
+        A client may send multiple ack_configure requests before committing, but
+        only the last request sent before a commit indicates which configure
+        event the client really is responding to.
+      </description>
+      <arg name="serial" type="uint" summary="the serial from the configure event"/>
+    </request>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the layer_surface">
+        This request destroys the layer surface.
+      </description>
+    </request>
+
+    <event name="configure">
+      <description summary="suggest a surface change">
+        The configure event asks the client to resize its surface.
+
+        Clients should arrange their surface for the new states, and then send
+        an ack_configure request with the serial sent in this configure event at
+        some point before committing the new surface.
+
+        The client is free to dismiss all but the last configure event it
+        received.
+
+        The width and height arguments specify the size of the window in
+        surface-local coordinates.
+
+        The size is a hint, in the sense that the client is free to ignore it if
+        it doesn't resize, pick a smaller size (to satisfy aspect ratio or
+        resize in steps of NxM pixels). If the client picks a smaller size and
+        is anchored to two opposite anchors (e.g. 'top' and 'bottom'), the
+        surface will be centered on this axis.
+
+        If the width or height arguments are zero, it means the client should
+        decide its own window dimension.
+      </description>
+      <arg name="serial" type="uint"/>
+      <arg name="width" type="uint"/>
+      <arg name="height" type="uint"/>
+    </event>
+
+    <event name="closed">
+      <description summary="surface should be closed">
+        The closed event is sent by the compositor when the surface will no
+        longer be shown. The output may have been destroyed or the user may
+        have asked for it to be removed. Further changes to the surface will be
+        ignored. The client should destroy the resource after receiving this
+        event, and create a new surface if they so choose.
+      </description>
+    </event>
+
+    <enum name="error">
+      <entry name="invalid_surface_state" value="0" summary="provided surface state is invalid"/>
+      <entry name="invalid_size" value="1" summary="size is invalid"/>
+      <entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
+    </enum>
+
+    <enum name="anchor" bitfield="true">
+      <entry name="top" value="1" summary="the top edge of the anchor rectangle"/>
+      <entry name="bottom" value="2" summary="the bottom edge of the anchor rectangle"/>
+      <entry name="left" value="4" summary="the left edge of the anchor rectangle"/>
+      <entry name="right" value="8" summary="the right edge of the anchor rectangle"/>
+    </enum>
+  </interface>
+</protocol>

src/meson.build

@@ -8,6 +8,7 @@ sources = [
   'server-service.c',
   'server-context-service.c',
   'server-main.c',
+  'wayland.c',
   '../eek/eek.c',
   '../eek/eek-container.c',
   '../eek/eek-element.c',
@@ -29,6 +30,7 @@ sources = [
   '../eek/eek-theme-node.c',
   '../eek/eek-types.c',
   '../eek/eek-xml-layout.c',
+  '../eek/layersurface.c',
   dbus_src,
   enums,
   keysym_entries,
@@ -38,6 +40,7 @@ sources = [
   '../eekboard/eekboard-context.c',
   '../eekboard/eekboard-service.c',
 #  '../eekboard/eekboard-xklutil.c',
+  wl_proto_sources,
 ]
 
 cc = meson.get_compiler('c')
@@ -48,6 +51,7 @@ deps = [
   dependency('gio-2.0', version: '>=2.26.0'),
   dependency('gtk+-3.0', version: '>=3.0'),
   dependency('libcroco-0.6'),
+  dependency('wayland-client', version: '>=1.14'),
   cc.find_library('m'),
 #  dependency('libxklavier'), # FIXME remove
 ]

src/server-context-service.c

@@ -26,6 +26,8 @@
 #include <gdk/gdkx.h>
 
 #include "eek/eek-gtk.h"
+#include "eek/layersurface.h"
+#include "wayland.h"
 
 #include "server-context-service.h"
 
@@ -298,7 +300,20 @@ update_widget (ServerContextService *context)
     gtk_widget_set_has_tooltip (context->widget, TRUE);
 
     if (!context->window) {
-        context->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        context->window = GTK_WIDGET(g_object_new (
+            PHOSH_TYPE_LAYER_SURFACE,
+            "layer-shell", squeak_wayland->layer_shell,
+            "wl-output", g_ptr_array_index(squeak_wayland->outputs, 0), // TODO: select output as needed,
+            "height", 200,
+            "anchor", ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM
+                      | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
+                      | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
+            "layer", ZWLR_LAYER_SHELL_V1_LAYER_TOP,
+            "kbd-interactivity", FALSE,
+            "exclusive-zone", 200,
+            //"namespace", "phosh home",
+            NULL
+        ));
         g_signal_connect (context->window, "destroy",
                           G_CALLBACK(on_destroy), context);
         context->notify_visible_handler =

src/server-main.c

@@ -1,6 +1,9 @@
 /* 
  * Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
  * Copyright (C) 2010-2011 Red Hat, Inc.
+ * Copyright (C) 2018-2019 Purism SPC
+ * SPDX-License-Identifier: GPL-3.0+
+ * Author: Guido Günther <agx@sigxcpu.org>
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,20 +33,14 @@
 
 #include "server-service.h"
 #include "eek/eek.h"
+#include "wayland.h"
+
+#include <gdk/gdkwayland.h>
 
 static gboolean opt_system = FALSE;
-static gboolean opt_session = FALSE;
 static gchar *opt_address = NULL;
 
-static const GOptionEntry options[] = {
+// D-Bus
-    {"system", 'y', 0, G_OPTION_ARG_NONE, &opt_system,
-     N_("Connect to the system bus")},
-    {"session", 'e', 0, G_OPTION_ARG_NONE, &opt_session,
-     N_("Connect to the session bus")},
-    {"address", 'a', 0, G_OPTION_ARG_STRING, &opt_address,
-     N_("Connect to the given D-Bus address")},
-    {NULL}
-};
 
 static void
 on_name_acquired (GDBusConnection *connection,
@@ -69,6 +66,44 @@ on_destroyed (ServerService *service,
     g_main_loop_quit (loop);
 }
 
+// Wayland
+
+static void
+registry_handle_global (void *data,
+                        struct wl_registry *registry,
+                        uint32_t name,
+                        const char *interface,
+                        uint32_t version)
+{
+    struct squeak_wayland *wayland = data;
+
+    if (!strcmp (interface, zwlr_layer_shell_v1_interface.name)) {
+        wayland->layer_shell = wl_registry_bind (registry, name,
+            &zwlr_layer_shell_v1_interface, 1);
+    } else if (!strcmp (interface, "wl_output")) {
+        struct wl_output *output = wl_registry_bind (registry, name,
+            &wl_output_interface, 2);
+        g_ptr_array_add (wayland->outputs, output);
+    } else if (!strcmp(interface, "wl_seat")) {
+        wayland->seat = wl_registry_bind(registry, name,
+            &wl_seat_interface, 1);
+    }
+}
+
+
+static void
+registry_handle_global_remove (void *data,
+                               struct wl_registry *registry,
+                               uint32_t name)
+{
+  // TODO
+}
+
+static const struct wl_registry_listener registry_listener = {
+  registry_handle_global,
+  registry_handle_global_remove
+};
+
 int
 main (int argc, char **argv)
 {
@@ -131,6 +166,20 @@ main (int argc, char **argv)
         break;
     }
 
+    // Set up Wayland
+    gdk_set_allowed_backends ("wayland");
+    GdkDisplay *gdk_display = gdk_display_get_default ();
+    struct wl_display *display = gdk_wayland_display_get_wl_display (gdk_display);
+
+    if (display == NULL) {
+        g_error ("Failed to get display: %m\n");
+    }
+
+    struct squeak_wayland wayland;
+    squeak_wayland_init (&wayland);
+    struct wl_registry *registry = wl_display_get_registry (display);
+    wl_registry_add_listener (registry, &registry_listener, &wayland);
+    squeak_wayland_set_global(&wayland);
     service = server_service_new (EEKBOARD_SERVICE_PATH, connection);
 
     if (service == NULL) {
@@ -161,5 +210,6 @@ main (int argc, char **argv)
     g_object_unref (connection);
     g_main_loop_unref (loop);
 
+    squeak_wayland_deinit (&wayland);
     return 0;
 }

src/wayland.c

@@ -0,0 +1,3 @@
+#include "wayland.h"
+
+struct squeak_wayland *squeak_wayland = NULL;

src/wayland.h

@@ -0,0 +1,31 @@
+#ifndef WAYLAND_H
+#define WAYLAND_H
+
+#include "wlr-layer-shell-unstable-v1-client-protocol.h"
+
+#include <gmodule.h>
+
+
+struct squeak_wayland {
+    struct zwlr_layer_shell_v1 *layer_shell;
+    GPtrArray *outputs; // *wl_output
+    struct wl_seat *seat;
+};
+
+
+extern struct squeak_wayland *squeak_wayland;
+
+
+static inline void squeak_wayland_init(struct squeak_wayland *wayland) {
+    wayland->outputs = g_ptr_array_new();
+}
+
+static inline void squeak_wayland_set_global(struct squeak_wayland *wayland) {
+    squeak_wayland = wayland;
+}
+
+static inline void squeak_wayland_deinit(struct squeak_wayland *wayland) {
+    g_ptr_array_free(wayland->outputs, TRUE);
+}
+
+#endif // WAYLAND_H