chore(wayland): remove layer shell remnants

jtheoof · Dec 29, 2019 · e8d377f · e8d377f
1 parent 7f0a524
commit e8d377f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 318 deletions.
diff --git a/include/swappy.h b/include/swappy.h
@@ -7,7 +7,6 @@
 #include <stdlib.h>
 #include <wayland-client.h>
 
-#include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "wlr-screencopy-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
 
@@ -112,7 +111,6 @@ struct swappy_state {
   struct wl_registry *registry;
   struct wl_compositor *compositor;
   struct wl_shm *shm;
-  struct zwlr_layer_shell_v1 *layer_shell;
   struct zxdg_output_manager_v1 *xdg_output_manager;
   struct zwlr_screencopy_manager_v1 *zwlr_screencopy_manager;
   struct wl_list outputs;  // mako_output::link

diff --git a/protocol/meson.build b/protocol/meson.build
@@ -24,7 +24,6 @@ wayland_scanner_client = generator(
 client_protocols = [
 	[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
 	[wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
-	['wlr-layer-shell-unstable-v1.xml'],
 	['wlr-screencopy-unstable-v1.xml'],
 ]
 

diff --git a/protocol/wlr-layer-shell-unstable-v1.xml b/protocol/wlr-layer-shell-unstable-v1.xml
diff --git a/src/application.c b/src/application.c
@@ -1,6 +1,5 @@
 #include <gdk/gdk.h>
 #include <glib-2.0/glib.h>
-#include <gtk-layer-shell/gtk-layer-shell.h>
 #include <gtk/gtk.h>
 #include <time.h>
 

diff --git a/src/wayland.c b/src/wayland.c
@@ -6,7 +6,6 @@
 
 #include "screencopy.h"
 #include "swappy.h"
-#include "wlr-layer-shell-unstable-v1-client-protocol.h"
 #include "wlr-screencopy-unstable-v1-client-protocol.h"
 #include "xdg-output-unstable-v1-client-protocol.h"
 
@@ -136,10 +135,6 @@ static void global_registry_handler(void *data, struct wl_registry *registry,
     wl_output_add_listener(output->wl_output, &output_listener, output);
     wl_list_insert(&state->outputs, &output->link);
     bound = true;
-  } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
-    state->layer_shell = wl_registry_bind(
-        registry, name, &zwlr_layer_shell_v1_interface, version);
-    bound = true;
   } else if (strcmp(interface, zxdg_output_manager_v1_interface.name) == 0) {
     state->xdg_output_manager = wl_registry_bind(
         registry, name, &zxdg_output_manager_v1_interface, version);
@@ -216,10 +211,6 @@ bool wayland_init(struct swappy_state *state) {
       return false;
     }
   }
-  if (state->layer_shell == NULL) {
-    g_warning("compositor doesn't support zwlr_layer_shell_v1");
-    return false;
-  }
 
   if (state->zwlr_screencopy_manager == NULL) {
     g_warning("compositor does not support zwlr_screencopy_v1");
@@ -250,10 +241,6 @@ void wayland_finish(struct swappy_state *state) {
     wl_compositor_destroy(state->compositor);
   }
 
-  if (state->layer_shell != NULL) {
-    zwlr_layer_shell_v1_destroy(state->layer_shell);
-  }
-
   if (state->zwlr_screencopy_manager != NULL) {
     zwlr_screencopy_manager_v1_destroy(state->zwlr_screencopy_manager);
   }