From b7927078e9b2dec995eaec8240a87b683349aefb Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 28 Sep 2017 23:26:31 +0200 Subject: x11 -> xwayland, window -> surface, fix some calloc sizes and wrong types --- include/rootston/view.h | 6 +++--- include/wlr/xwayland.h | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/rootston/view.h b/include/rootston/view.h index 8d4d69c5..9cc2fe04 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -27,7 +27,7 @@ struct roots_xdg_surface_v6 { struct wl_listener request_show_window_menu; }; -struct roots_x11_surface { +struct roots_xwayland_surface { struct roots_view *view; // TODO: Maybe destroy listener should go in roots_view struct wl_listener destroy; @@ -48,12 +48,12 @@ struct roots_view { union { struct wlr_wl_shell_surface *wl_shell_surface; struct wlr_xdg_surface_v6 *xdg_surface_v6; - struct wlr_x11_window *x11_window; + struct wlr_xwayland_surface *xwayland_surface; }; union { struct roots_wl_shell_surface *roots_wl_shell_surface; struct roots_xdg_surface_v6 *roots_xdg_surface_v6; - struct roots_x11_surface *roots_x11_surface; + struct roots_xwayland_surface *roots_xwayland_surface; }; struct wlr_surface *wlr_surface; struct wl_list link; diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h index 3c893c72..2b9d4e81 100644 --- a/include/wlr/xwayland.h +++ b/include/wlr/xwayland.h @@ -20,7 +20,7 @@ struct wlr_xwayland { struct wl_event_source *sigusr1_source; struct wl_listener destroy_listener; struct wlr_xwm *xwm; - struct wl_list displayable_windows; + struct wl_list displayable_surfaces; struct { struct wl_signal new_surface; @@ -29,7 +29,7 @@ struct wlr_xwayland { void *data; }; -struct wlr_x11_window { +struct wlr_xwayland_surface { xcb_window_t window_id; uint32_t surface_id; struct wl_list link; @@ -49,8 +49,8 @@ struct wlr_x11_window { void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland); struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display, - struct wlr_compositor *compositor); -void wlr_x11_window_activate(struct wlr_xwayland *wlr_xwayland, - struct wlr_x11_window *window); + struct wlr_compositor *compositor); +void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland, + struct wlr_xwayland_surface *surface); #endif -- cgit v1.2.3 From 10240af6ea2e3cef474c2e79e9ca220f028cce2d Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 28 Sep 2017 19:05:38 -0400 Subject: Handle input device removal --- include/rootston/input.h | 2 ++ rootston/input.c | 4 ++-- rootston/keyboard.c | 9 +++++++++ rootston/pointer.c | 8 ++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/rootston/input.h b/include/rootston/input.h index b3ce84d7..0ace6cd1 100644 --- a/include/rootston/input.h +++ b/include/rootston/input.h @@ -97,7 +97,9 @@ struct roots_input *input_create(struct roots_server *server, void input_destroy(struct roots_input *input); void pointer_add(struct wlr_input_device *device, struct roots_input *input); +void pointer_remove(struct wlr_input_device *device, struct roots_input *input); void keyboard_add(struct wlr_input_device *device, struct roots_input *input); +void keyboard_remove(struct wlr_input_device *device, struct roots_input *input); void cursor_initialize(struct roots_input *input); void cursor_load_config(struct roots_config *config, diff --git a/rootston/input.c b/rootston/input.c index ac8e7396..b4427212 100644 --- a/rootston/input.c +++ b/rootston/input.c @@ -52,10 +52,10 @@ static void input_remove_notify(struct wl_listener *listener, void *data) { struct roots_input *input = wl_container_of(listener, input, input_remove); switch (device->type) { case WLR_INPUT_DEVICE_KEYBOARD: - //keyboard_remove(device, input); + keyboard_remove(device, input); break; case WLR_INPUT_DEVICE_POINTER: - //pointer_remove(device, input); + pointer_remove(device, input); break; case WLR_INPUT_DEVICE_TOUCH: //touch_remove(device, input); diff --git a/rootston/keyboard.c b/rootston/keyboard.c index 57e0d14e..c4c98c91 100644 --- a/rootston/keyboard.c +++ b/rootston/keyboard.c @@ -42,6 +42,7 @@ static void keyboard_key_notify(struct wl_listener *listener, void *data) { void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { struct roots_keyboard *keyboard = calloc(sizeof(struct roots_keyboard), 1); + device->data = keyboard; keyboard->device = device; keyboard->input = input; wl_list_init(&keyboard->key.link); @@ -64,3 +65,11 @@ void keyboard_add(struct wlr_input_device *device, struct roots_input *input) { xkb_context_unref(context); wlr_seat_attach_keyboard(input->wl_seat, device); } + +void keyboard_remove(struct wlr_input_device *device, struct roots_input *input) { + struct roots_keyboard *keyboard = device->data; + wlr_seat_detach_keyboard(input->wl_seat, device->keyboard); + wl_list_remove(&keyboard->key.link); + wl_list_remove(&keyboard->link); + free(keyboard); +} diff --git a/rootston/pointer.c b/rootston/pointer.c index 1693893e..299ecdfc 100644 --- a/rootston/pointer.c +++ b/rootston/pointer.c @@ -6,6 +6,7 @@ void pointer_add(struct wlr_input_device *device, struct roots_input *input) { struct roots_pointer *pointer = calloc(sizeof(struct roots_pointer), 1); + device->data = pointer; pointer->device = device; pointer->input = input; wl_list_insert(&input->pointers, &pointer->link); @@ -13,3 +14,10 @@ void pointer_add(struct wlr_input_device *device, struct roots_input *input) { cursor_load_config(input->server->config, input->cursor, input, input->server->desktop); } + +void pointer_remove(struct wlr_input_device *device, struct roots_input *input) { + struct roots_pointer *pointer = device->data; + wlr_cursor_detach_input_device(input->cursor, device); + wl_list_remove(&pointer->link); + free(pointer); +} -- cgit v1.2.3