aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/rootston/cursor.h35
-rw-r--r--include/rootston/input.h54
-rw-r--r--include/rootston/keyboard.h1
-rw-r--r--include/rootston/seat.h30
-rw-r--r--include/wlr/types/wlr_wl_shell.h4
-rw-r--r--include/wlr/types/wlr_xdg_shell_v6.h6
6 files changed, 75 insertions, 55 deletions
diff --git a/include/rootston/cursor.h b/include/rootston/cursor.h
index 8a8d33f2..18d5f720 100644
--- a/include/rootston/cursor.h
+++ b/include/rootston/cursor.h
@@ -3,10 +3,45 @@
#include "rootston/seat.h"
+enum roots_cursor_mode {
+ ROOTS_CURSOR_PASSTHROUGH = 0,
+ ROOTS_CURSOR_MOVE = 1,
+ ROOTS_CURSOR_RESIZE = 2,
+ ROOTS_CURSOR_ROTATE = 3,
+};
+
+enum roots_cursor_resize_edge {
+ ROOTS_CURSOR_RESIZE_EDGE_TOP = 1,
+ ROOTS_CURSOR_RESIZE_EDGE_BOTTOM = 2,
+ ROOTS_CURSOR_RESIZE_EDGE_LEFT = 4,
+ ROOTS_CURSOR_RESIZE_EDGE_RIGHT = 8,
+};
+
+struct roots_input_event {
+ uint32_t serial;
+ struct wlr_cursor *cursor;
+ struct wlr_input_device *device;
+};
+
struct roots_cursor {
struct roots_seat *seat;
struct wlr_cursor *cursor;
+ enum roots_cursor_mode mode;
+
+ // state from input (review if this is necessary)
+ struct wlr_xcursor_theme *xcursor_theme;
+ struct wlr_seat *wl_seat;
+ struct wl_client *cursor_client;
+ int offs_x, offs_y;
+ int view_x, view_y, view_width, view_height;
+ float view_rotation;
+ uint32_t resize_edges;
+ // Ring buffer of input events that could trigger move/resize/rotate
+ int input_events_idx;
+ struct wl_list touch_points;
+ struct roots_input_event input_events[16];
+
struct wl_listener motion;
struct wl_listener motion_absolute;
struct wl_listener button;
diff --git a/include/rootston/input.h b/include/rootston/input.h
index 7b1358f8..7463ba3a 100644
--- a/include/rootston/input.h
+++ b/include/rootston/input.h
@@ -5,64 +5,15 @@
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/xcursor.h>
+#include "rootston/cursor.h"
#include "rootston/config.h"
#include "rootston/view.h"
#include "rootston/server.h"
-enum roots_cursor_mode {
- ROOTS_CURSOR_PASSTHROUGH = 0,
- ROOTS_CURSOR_MOVE = 1,
- ROOTS_CURSOR_RESIZE = 2,
- ROOTS_CURSOR_ROTATE = 3,
-};
-
-enum roots_cursor_resize_edge {
- ROOTS_CURSOR_RESIZE_EDGE_TOP = 1,
- ROOTS_CURSOR_RESIZE_EDGE_BOTTOM = 2,
- ROOTS_CURSOR_RESIZE_EDGE_LEFT = 4,
- ROOTS_CURSOR_RESIZE_EDGE_RIGHT = 8,
-};
-
-struct roots_input_event {
- uint32_t serial;
- struct wlr_cursor *cursor;
- struct wlr_input_device *device;
-};
-
-struct roots_drag_icon {
- struct wlr_surface *surface;
- struct wl_list link; // roots_input::drag_icons
- bool mapped;
-
- int32_t sx;
- int32_t sy;
-
- struct wl_listener surface_destroy;
- struct wl_listener surface_commit;
-};
-
struct roots_input {
struct roots_config *config;
struct roots_server *server;
- // TODO: multiseat, multicursor
- struct wlr_cursor *cursor;
- struct wlr_xcursor_theme *xcursor_theme;
- struct wlr_seat *wl_seat;
- struct wl_list drag_icons;
- struct wl_client *cursor_client;
-
- enum roots_cursor_mode mode;
- struct roots_view *active_view;
- int offs_x, offs_y;
- int view_x, view_y, view_width, view_height;
- float view_rotation;
- uint32_t resize_edges;
-
- // Ring buffer of input events that could trigger move/resize/rotate
- int input_events_idx;
- struct roots_input_event input_events[16];
-
struct wl_list keyboards;
struct wl_list pointers;
struct wl_list touch;
@@ -117,4 +68,7 @@ struct wlr_xcursor *get_rotate_xcursor(struct wlr_xcursor_theme *theme);
void set_view_focus(struct roots_input *input, struct roots_desktop *desktop,
struct roots_view *view);
+struct roots_seat *input_seat_from_wlr_seat(struct roots_input *input,
+ struct wlr_seat *seat);
+
#endif
diff --git a/include/rootston/keyboard.h b/include/rootston/keyboard.h
index cb639ba1..e3caf8fb 100644
--- a/include/rootston/keyboard.h
+++ b/include/rootston/keyboard.h
@@ -10,6 +10,7 @@ struct roots_keyboard {
struct roots_input *input;
struct roots_seat *seat;
struct wlr_input_device *device;
+ struct keyboard_config *config;
struct wl_list seat_link;
// XXX temporary
struct wl_list link;
diff --git a/include/rootston/seat.h b/include/rootston/seat.h
index b7c8b477..b5593651 100644
--- a/include/rootston/seat.h
+++ b/include/rootston/seat.h
@@ -6,11 +6,26 @@
#include "rootston/input.h"
#include "rootston/keyboard.h"
+struct roots_drag_icon {
+ struct wlr_surface *surface;
+ struct wl_list link; // roots_seat::drag_icons
+ bool mapped;
+
+ int32_t sx;
+ int32_t sy;
+
+ struct wl_listener surface_destroy;
+ struct wl_listener surface_commit;
+};
+
struct roots_seat {
struct roots_input *input;
struct wlr_seat *seat;
struct roots_cursor *cursor;
struct wl_list link;
+ struct wl_list drag_icons;
+
+ struct roots_view *focus;
struct wl_list keyboards;
struct wl_list pointers;
@@ -57,4 +72,19 @@ void roots_seat_add_device(struct roots_seat *seat,
void roots_seat_remove_device(struct roots_seat *seat,
struct wlr_input_device *device);
+void roots_seat_configure_cursor(struct roots_seat *seat);
+
+void roots_seat_configure_xcursor(struct roots_seat *seat);
+
+bool roots_seat_has_meta_pressed(struct roots_seat *seat);
+
+void roots_seat_focus_view(struct roots_seat *seat, struct roots_view *view);
+
+void roots_seat_begin_move(struct roots_seat *seat, struct roots_view *view);
+
+void roots_seat_begin_resize(struct roots_seat *seat, struct roots_view *view,
+ uint32_t edges);
+
+void roots_seat_begin_rotate(struct roots_seat *seat, struct roots_view *view);
+
#endif
diff --git a/include/wlr/types/wlr_wl_shell.h b/include/wlr/types/wlr_wl_shell.h
index 4e814817..ab3b4b10 100644
--- a/include/wlr/types/wlr_wl_shell.h
+++ b/include/wlr/types/wlr_wl_shell.h
@@ -93,14 +93,14 @@ struct wlr_wl_shell_surface {
struct wlr_wl_shell_surface_move_event {
struct wl_client *client;
struct wlr_wl_shell_surface *surface;
- struct wlr_seat_handle *seat_handle;
+ struct wlr_seat_client *seat;
uint32_t serial;
};
struct wlr_wl_shell_surface_resize_event {
struct wl_client *client;
struct wlr_wl_shell_surface *surface;
- struct wlr_seat_handle *seat_handle;
+ struct wlr_seat_client *seat;
uint32_t serial;
enum wl_shell_surface_resize edges;
};
diff --git a/include/wlr/types/wlr_xdg_shell_v6.h b/include/wlr/types/wlr_xdg_shell_v6.h
index b0de41e2..e17393f6 100644
--- a/include/wlr/types/wlr_xdg_shell_v6.h
+++ b/include/wlr/types/wlr_xdg_shell_v6.h
@@ -138,14 +138,14 @@ struct wlr_xdg_surface_v6 {
struct wlr_xdg_toplevel_v6_move_event {
struct wl_client *client;
struct wlr_xdg_surface_v6 *surface;
- struct wlr_seat_handle *seat_handle;
+ struct wlr_seat_client *seat;
uint32_t serial;
};
struct wlr_xdg_toplevel_v6_resize_event {
struct wl_client *client;
struct wlr_xdg_surface_v6 *surface;
- struct wlr_seat_handle *seat_handle;
+ struct wlr_seat_client *seat;
uint32_t serial;
uint32_t edges;
};
@@ -153,7 +153,7 @@ struct wlr_xdg_toplevel_v6_resize_event {
struct wlr_xdg_toplevel_v6_show_window_menu_event {
struct wl_client *client;
struct wlr_xdg_surface_v6 *surface;
- struct wlr_seat_handle *seat_handle;
+ struct wlr_seat_client *seat;
uint32_t serial;
uint32_t x;
uint32_t y;
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 07:11:29 +0000