kranewl

commit f7db92ed55bed702d48c7df4dc1794e1c91f8ad3
parent 5d91c4024cb5761513d932ea01befdd608eff97d
Author: deurzen <max@deurzen.net>
Date:   Wed,  1 Jun 2022 10:37:11 +0200

removes unsupported (for now) protocol remnants

Diffstat:
M
include/kranewl/input/cursor.hh
 | 
8
+-------
M
include/kranewl/input/seat.hh
 | 
7
+------
M
src/kranewl/input/cursor.cc
 | 
8
+-------
M
src/kranewl/input/seat.cc
 | 
14
+++-----------
M
src/kranewl/server.cc
 | 
16
+---------------

5 files changed, 7 insertions(+), 46 deletions(-)
diff --git a/include/kranewl/input/cursor.hh b/include/kranewl/input/cursor.hh
@@ -54,10 +54,7 @@ typedef struct Cursor {
         Server_ptr,
         Model_ptr,
         Seat_ptr,
-        struct wlr_cursor*,
-        struct wlr_pointer_constraints_v1*,
-        struct wlr_relative_pointer_manager_v1*,
-        struct wlr_virtual_pointer_manager_v1*
+        struct wlr_cursor*
     );
 
     ~Cursor();
@@ -87,9 +84,6 @@ typedef struct Cursor {
 
     struct wlr_cursor* mp_wlr_cursor;
     struct wlr_xcursor_manager* mp_cursor_manager;
-    struct wlr_pointer_constraints_v1* mp_pointer_constraints;
-    struct wlr_relative_pointer_manager_v1* mp_relative_pointer_manager;
-    struct wlr_virtual_pointer_manager_v1* mp_virtual_pointer_manager;
 
     Mode m_cursor_mode;
     struct {
diff --git a/include/kranewl/input/seat.hh b/include/kranewl/input/seat.hh
@@ -25,11 +25,7 @@ public:
         struct wlr_cursor*,
         struct wlr_input_inhibit_manager*,
         struct wlr_idle_inhibit_manager_v1*,
-        struct wlr_pointer_constraints_v1*,
-        struct wlr_relative_pointer_manager_v1*,
-        struct wlr_virtual_pointer_manager_v1*,
-        struct wlr_virtual_keyboard_manager_v1*,
-        struct wlr_keyboard_shortcuts_inhibit_manager_v1*
+        struct wlr_virtual_keyboard_manager_v1*
     );
     ~Seat();
 
@@ -54,7 +50,6 @@ public:
     struct wlr_input_inhibit_manager* mp_input_inhibit_manager;
     struct wlr_idle_inhibit_manager_v1* mp_idle_inhibit_manager;
     struct wlr_virtual_keyboard_manager_v1* mp_virtual_keyboard_manager;
-    struct wlr_keyboard_shortcuts_inhibit_manager_v1* mp_keyboard_shortcuts_inhibit_manager;
 
     Cursor_ptr mp_cursor;
     std::vector<Keyboard_ptr> m_keyboards;
diff --git a/src/kranewl/input/cursor.cc b/src/kranewl/input/cursor.cc
@@ -33,19 +33,13 @@ Cursor::Cursor(
     Server_ptr server,
     Model_ptr model,
     Seat_ptr seat,
-    struct wlr_cursor* cursor,
-    struct wlr_pointer_constraints_v1* pointer_constraints,
-    struct wlr_relative_pointer_manager_v1* relative_pointer_manager,
-    struct wlr_virtual_pointer_manager_v1* virtual_pointer_manager
+    struct wlr_cursor* cursor
 )
     : mp_server(server),
       mp_model(model),
       mp_seat(seat),
       mp_wlr_cursor(cursor),
       mp_cursor_manager(wlr_xcursor_manager_create(nullptr, 24)),
-      mp_pointer_constraints(pointer_constraints),
-      mp_relative_pointer_manager(relative_pointer_manager),
-      mp_virtual_pointer_manager(virtual_pointer_manager),
       ml_cursor_motion({ .notify = Cursor::handle_cursor_motion }),
       ml_cursor_motion_absolute({ .notify = Cursor::handle_cursor_motion_absolute }),
       ml_cursor_button({ .notify = Cursor::handle_cursor_button }),
diff --git a/src/kranewl/input/seat.cc b/src/kranewl/input/seat.cc
@@ -25,11 +25,7 @@ Seat::Seat(
     struct wlr_cursor* cursor,
     struct wlr_input_inhibit_manager* input_inhibit_manager,
     struct wlr_idle_inhibit_manager_v1* idle_inhibit_manager,
-    struct wlr_pointer_constraints_v1* pointer_constraints,
-    struct wlr_relative_pointer_manager_v1* relative_pointer_manager,
-    struct wlr_virtual_pointer_manager_v1* virtual_pointer_manager,
-    struct wlr_virtual_keyboard_manager_v1* virtual_keyboard_manager,
-    struct wlr_keyboard_shortcuts_inhibit_manager_v1* keyboard_shortcuts_inhibit_manager
+    struct wlr_virtual_keyboard_manager_v1* virtual_keyboard_manager
 )
     : mp_server(server),
       mp_model(model),
@@ -38,15 +34,11 @@ Seat::Seat(
       mp_input_inhibit_manager(input_inhibit_manager),
       mp_idle_inhibit_manager(idle_inhibit_manager),
       mp_virtual_keyboard_manager(virtual_keyboard_manager),
-      mp_keyboard_shortcuts_inhibit_manager(keyboard_shortcuts_inhibit_manager),
       mp_cursor(new Cursor(
           server,
           model,
           this,
-          cursor,
-          pointer_constraints,
-          relative_pointer_manager,
-          virtual_pointer_manager
+          cursor
       )),
       m_keyboards(),
       ml_destroy({ .notify = Seat::handle_destroy }),
@@ -157,7 +149,7 @@ Seat::handle_idle_destroy_inhibitor(struct wl_listener* listener, void*)
 
     Seat_ptr seat = wl_container_of(listener, seat, ml_idle_destroy_inhibitor);
 
-	wlr_idle_set_enabled(
+    wlr_idle_set_enabled(
         seat->mp_idle,
         seat->mp_wlr_seat,
         wl_list_length(&seat->mp_idle_inhibit_manager->inhibitors) <= 1
diff --git a/src/kranewl/server.cc b/src/kranewl/server.cc
@@ -38,23 +38,19 @@ extern "C" {
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/types/wlr_input_inhibitor.h>
 #include <wlr/types/wlr_keyboard.h>
-#include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_output_management_v1.h>
 #include <wlr/types/wlr_pointer.h>
-#include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_presentation_time.h>
 #include <wlr/types/wlr_primary_selection.h>
 #include <wlr/types/wlr_primary_selection_v1.h>
-#include <wlr/types/wlr_relative_pointer_v1.h>
 #include <wlr/types/wlr_scene.h>
 #include <wlr/types/wlr_screencopy_v1.h>
 #include <wlr/types/wlr_seat.h>
 #include <wlr/types/wlr_server_decoration.h>
 #include <wlr/types/wlr_virtual_keyboard_v1.h>
-#include <wlr/types/wlr_virtual_pointer_v1.h>
 #include <wlr/types/wlr_xdg_activation_v1.h>
 #include <wlr/types/wlr_xdg_decoration_v1.h>
 #include <wlr/types/wlr_xdg_output_v1.h>
@@ -121,11 +117,7 @@ Server::Server(Model_ptr model)
               cursor,
               wlr_input_inhibit_manager_create(mp_display),
               wlr_idle_inhibit_v1_create(mp_display),
-              wlr_pointer_constraints_v1_create(mp_display),
-              wlr_relative_pointer_manager_v1_create(mp_display),
-              wlr_virtual_pointer_manager_v1_create(mp_display),
-              wlr_virtual_keyboard_manager_v1_create(mp_display),
-              wlr_keyboard_shortcuts_inhibit_v1_create(mp_display)
+              wlr_virtual_keyboard_manager_v1_create(mp_display)
           };
       }()),
 #ifdef XWAYLAND
@@ -182,12 +174,6 @@ Server::Server(Model_ptr model)
     wl_signal_add(&mp_output_manager->events.test, &ml_output_manager_test);
     wl_signal_add(&mp_virtual_keyboard_manager->events.new_virtual_keyboard, &ml_new_virtual_keyboard);
 
-    // TODO: mp_keyboard_shortcuts_inhibit_manager signals
-    // TODO: mp_pointer_constraints signals
-    // TODO: mp_relative_pointer_manager signals
-    // TODO: mp_virtual_pointer_manager signals
-    // TODO: mp_virtual_keyboard_manager signals
-
     if (!wlr_backend_start(mp_backend)) {
         wlr_backend_destroy(mp_backend);
         wl_display_destroy(mp_display);