Merge pull request #167 from emersion/xwayland

[WIP] Improve xwayland

4 files changed, 27 insertions, 9 deletions

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);
+}
diff --git a/rootston/xwayland.c b/rootston/xwayland.c
index f9ad2a22..88965f0d 100644
--- a/rootston/xwayland.c
+++ b/rootston/xwayland.c
@@ -10,7 +10,7 @@
 #include "rootston/server.h"
 
 static void handle_destroy(struct wl_listener *listener, void *data) {
-	struct roots_wl_shell_surface *roots_surface =
+	struct roots_xwayland_surface *roots_surface =
 		wl_container_of(listener, roots_surface, destroy);
 	wl_list_remove(&roots_surface->destroy.link);
 	view_destroy(roots_surface->view);
@@ -18,19 +18,20 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 }
 
 static void x11_activate(struct roots_view *view, bool active) {
-	wlr_x11_window_activate(view->desktop->xwayland, view->x11_window);
+	wlr_xwayland_surface_activate(view->desktop->xwayland,
+		view->xwayland_surface);
 }
 
 void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	struct roots_desktop *desktop =
 		wl_container_of(listener, desktop, xwayland_surface);
 
-	struct wlr_x11_window *surface = data;
+	struct wlr_xwayland_surface *surface = data;
 	// TODO: get and log title, class, etc
 	wlr_log(L_DEBUG, "new xwayland surface");
 
-	struct roots_x11_surface *roots_surface =
-		calloc(1, sizeof(struct roots_wl_shell_surface));
+	struct roots_xwayland_surface *roots_surface =
+		calloc(1, sizeof(struct roots_xwayland_surface));
 	wl_list_init(&roots_surface->destroy.link);
 	roots_surface->destroy.notify = handle_destroy;
 	wl_signal_add(&surface->events.destroy, &roots_surface->destroy);
@@ -38,8 +39,8 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	struct roots_view *view = calloc(1, sizeof(struct roots_view));
 	view->type = ROOTS_XWAYLAND_VIEW;
 	view->x = view->y = 200;
-	view->x11_window = surface;
-	view->roots_x11_surface = roots_surface;
+	view->xwayland_surface = surface;
+	view->roots_xwayland_surface = roots_surface;
 	view->wlr_surface = surface->surface;
 	view->desktop = desktop;
 	view->activate = x11_activate;