aboutsummaryrefslogtreecommitdiff
path: root/rootston/input.c
diff options
context:
space:
mode:
Diffstat (limited to 'rootston/input.c')
-rw-r--r--rootston/input.c62
1 files changed, 11 insertions, 51 deletions
diff --git a/rootston/input.c b/rootston/input.c
index 4a567763..8e45d6d3 100644
--- a/rootston/input.c
+++ b/rootston/input.c
@@ -84,43 +84,6 @@ struct roots_input *input_create(struct roots_server *server,
input->config = config;
input->server = server;
- input->xcursor_theme = wlr_xcursor_theme_load("default", 16);
- if (input->xcursor_theme == NULL) {
- wlr_log(L_ERROR, "Cannot load xcursor theme");
- free(input);
- return NULL;
- }
-
- struct wlr_xcursor *xcursor = get_default_xcursor(input->xcursor_theme);
- if (xcursor == NULL) {
- wlr_log(L_ERROR, "Cannot load xcursor from theme");
- wlr_xcursor_theme_destroy(input->xcursor_theme);
- free(input);
- return NULL;
- }
-
- if (server->desktop->xwayland != NULL) {
- struct wlr_xcursor_image *xcursor_image = xcursor->images[0];
- wlr_xwayland_set_cursor(server->desktop->xwayland,
- xcursor_image->buffer, xcursor_image->width, xcursor_image->width,
- xcursor_image->height, xcursor_image->hotspot_x,
- xcursor_image->hotspot_y);
- }
-
- input->wl_seat = wlr_seat_create(server->wl_display, "seat0");
- if (input->wl_seat == NULL) {
- wlr_log(L_ERROR, "Cannot create seat");
- wlr_xcursor_theme_destroy(input->xcursor_theme);
- free(input);
- return NULL;
- }
- wlr_seat_set_capabilities(input->wl_seat, WL_SEAT_CAPABILITY_KEYBOARD
- | WL_SEAT_CAPABILITY_POINTER | WL_SEAT_CAPABILITY_TOUCH);
-
- wl_list_init(&input->keyboards);
- wl_list_init(&input->pointers);
- wl_list_init(&input->touch);
- wl_list_init(&input->tablet_tools);
wl_list_init(&input->seats);
input->input_add.notify = input_add_notify;
@@ -128,23 +91,20 @@ struct roots_input *input_create(struct roots_server *server,
input->input_remove.notify = input_remove_notify;
wl_signal_add(&server->backend->events.input_remove, &input->input_remove);
- input->cursor = wlr_cursor_create();
- cursor_initialize(input);
-
- struct wlr_xcursor_image *image = xcursor->images[0];
- wlr_cursor_set_image(input->cursor, image->buffer, image->width,
- image->width, image->height, image->hotspot_x, image->hotspot_y);
-
- wlr_cursor_attach_output_layout(input->cursor, server->desktop->layout);
- wlr_cursor_map_to_region(input->cursor, config->cursor.mapped_box);
- cursor_load_config(config, input->cursor,
- input, server->desktop);
-
- wl_list_init(&input->drag_icons);
-
return input;
}
void input_destroy(struct roots_input *input) {
// TODO
}
+
+struct roots_seat *input_seat_from_wlr_seat(struct roots_input *input,
+ struct wlr_seat *wlr_seat) {
+ struct roots_seat *seat = NULL;
+ wl_list_for_each(seat, &input->seats, link) {
+ if (seat->seat == wlr_seat) {
+ return seat;
+ }
+ }
+ return seat;
+}