diff options
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/desktop.c | 8 | ||||
| -rw-r--r-- | rootston/input.c | 106 | ||||
| -rw-r--r-- | rootston/main.c | 1 | ||||
| -rw-r--r-- | rootston/meson.build | 1 |
4 files changed, 114 insertions, 2 deletions
diff --git a/rootston/desktop.c b/rootston/desktop.c index 551d289a..86d128ef 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -1,11 +1,12 @@ #define _POSIX_C_SOURCE 199309L #include <time.h> #include <stdlib.h> -#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_compositor.h> +#include <wlr/types/wlr_cursor.h> +#include <wlr/types/wlr_gamma_control.h> +#include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_wl_shell.h> #include <wlr/types/wlr_xdg_shell_v6.h> -#include <wlr/types/wlr_gamma_control.h> #include <wlr/util/log.h> #include "rootston/desktop.h" #include "rootston/server.h" @@ -43,6 +44,9 @@ struct roots_desktop *desktop_create(struct roots_server *server, server->wl_display, server->renderer); desktop->wl_shell = wlr_wl_shell_create(server->wl_display); + wlr_cursor_attach_output_layout(server->input->cursor, desktop->layout); + wlr_cursor_map_to_region(server->input->cursor, config->cursor.mapped_box); + desktop->xdg_shell_v6 = wlr_xdg_shell_v6_create(server->wl_display); wl_signal_add(&desktop->xdg_shell_v6->events.new_surface, &desktop->xdg_shell_v6_surface); diff --git a/rootston/input.c b/rootston/input.c new file mode 100644 index 00000000..8764e9b0 --- /dev/null +++ b/rootston/input.c @@ -0,0 +1,106 @@ +#include <assert.h> +#include <stdlib.h> +#include <wayland-server.h> +#include <wlr/types/wlr_cursor.h> +#include <wlr/util/log.h> +#include <wlr/xcursor.h> +#include "rootston/server.h" +#include "rootston/config.h" +#include "rootston/input.h" + +static const char *device_type(enum wlr_input_device_type type) { + switch (type) { + case WLR_INPUT_DEVICE_KEYBOARD: + return "keyboard"; + case WLR_INPUT_DEVICE_POINTER: + return "pointer"; + case WLR_INPUT_DEVICE_TOUCH: + return "touch"; + case WLR_INPUT_DEVICE_TABLET_TOOL: + return "tablet tool"; + case WLR_INPUT_DEVICE_TABLET_PAD: + return "tablet pad"; + } + return NULL; +} + +static void input_add_notify(struct wl_listener *listener, void *data) { + struct wlr_input_device *device = data; + struct roots_input *input = wl_container_of(listener, input, input_add); + wlr_log(L_DEBUG, "New input device: %s (%d:%d) %s", device->name, + device->vendor, device->product, device_type(device->type)); + switch (device->type) { + case WLR_INPUT_DEVICE_KEYBOARD: + //keyboard_add(device, state); + break; + case WLR_INPUT_DEVICE_POINTER: + //pointer_add(device, state); + break; + case WLR_INPUT_DEVICE_TOUCH: + //touch_add(device, state); + break; + case WLR_INPUT_DEVICE_TABLET_TOOL: + //tablet_tool_add(device, state); + break; + default: + break; + } +} + +static void input_remove_notify(struct wl_listener *listener, void *data) { + struct wlr_input_device *device = data; + struct roots_input *input = wl_container_of(listener, input, input_remove); + switch (device->type) { + case WLR_INPUT_DEVICE_KEYBOARD: + //keyboard_remove(device, state); + break; + case WLR_INPUT_DEVICE_POINTER: + //pointer_remove(device, state); + break; + case WLR_INPUT_DEVICE_TOUCH: + //touch_remove(device, state); + break; + case WLR_INPUT_DEVICE_TABLET_TOOL: + //tablet_tool_remove(device, state); + break; + default: + break; + } +} + +struct roots_input *input_create(struct roots_server *server, + struct roots_config *config) { + wlr_log(L_DEBUG, "Initializing roots input"); + struct roots_input *input = calloc(1, sizeof(struct roots_input)); + assert(input); + + input->config = config; + input->cursor = wlr_cursor_create(); + + struct wlr_xcursor_theme *theme; + assert(theme = wlr_xcursor_theme_load("default", 16)); + assert(input->xcursor = wlr_xcursor_theme_get_cursor(theme, "left_ptr")); + wlr_cursor_set_xcursor(input->cursor, input->xcursor); + assert(input->wl_seat = wlr_seat_create(server->wl_display, "seat0")); + + 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->input_add.link); + input->input_add.notify = input_add_notify; + wl_list_init(&input->input_remove.link); + input->input_remove.notify = input_remove_notify; + + wl_signal_add(&server->backend->events.input_add, + &input->input_add); + wl_signal_add(&server->backend->events.input_remove, + &input->input_remove); + + return input; +} + +void input_destroy(struct roots_input *input) { + // TODO +} diff --git a/rootston/main.c b/rootston/main.c index b95840a9..c8ec1249 100644 --- a/rootston/main.c +++ b/rootston/main.c @@ -20,6 +20,7 @@ int main(int argc, char **argv) { assert(server.renderer = wlr_gles2_renderer_create(server.backend)); wl_display_init_shm(server.wl_display); + server.input = input_create(&server, server.config); server.desktop = desktop_create(&server, server.config); server.data_device_manager = wlr_data_device_manager_create( server.wl_display); diff --git a/rootston/meson.build b/rootston/meson.build index 9342d19c..ba1fb1c0 100644 --- a/rootston/meson.build +++ b/rootston/meson.build @@ -3,6 +3,7 @@ executable( 'config.c', 'desktop.c', 'ini.c', + 'input.c', 'main.c', 'output.c', ], dependencies: wlroots |