Merge pull request #331 from acrisci/feature/xwm-rewrite

xwayland window manager fixes

include/rootston/view.h

@@ -34,6 +34,10 @@ struct roots_xwayland_surface {
 	// TODO: Maybe destroy listener should go in roots_view
 	struct wl_listener destroy;
 	struct wl_listener request_configure;
+	struct wl_listener request_move;
+	struct wl_listener request_resize;
+	struct wl_listener map_notify;
+	struct wl_listener unmap_notify;
 };
 
 enum roots_view_type {

include/wlr/xwayland.h

@@ -25,7 +25,6 @@ struct wlr_xwayland {
 	struct wl_event_source *sigusr1_source;
 	struct wl_listener destroy_listener;
 	struct wlr_xwm *xwm;
-	struct wl_list displayable_surfaces;
 
 	struct {
 		struct wl_signal new_surface;
@@ -66,14 +65,19 @@ struct wlr_xwayland_surface_size_hints {
 
 struct wlr_xwayland_surface {
 	xcb_window_t window_id;
+	struct wlr_xwm *xwm;
 	uint32_t surface_id;
+
 	struct wl_list link;
+	struct wl_list unpaired_link;
 
 	struct wlr_surface *surface;
-	struct wl_listener surface_destroy_listener;
 	int16_t x, y;
 	uint16_t width, height;
+	uint16_t saved_width, saved_height;
 	bool override_redirect;
+	bool mapped;
+	bool added;
 
 	char *title;
 	char *class;
@@ -93,19 +97,33 @@ struct wlr_xwayland_surface {
 	uint32_t hints_urgency;
 	struct wlr_xwayland_surface_size_hints *size_hints;
 
+	// _NET_WM_STATE
+	bool fullscreen;
+	bool maximized_vert;
+	bool maximized_horz;
+
+	bool has_alpha;
+
 	struct {
 		struct wl_signal destroy;
-
 		struct wl_signal request_configure;
+		struct wl_signal request_move;
+		struct wl_signal request_resize;
+		struct wl_signal request_maximize;
+		struct wl_signal request_fullscreen;
 
+		struct wl_signal map_notify;
+		struct wl_signal unmap_notify;
 		struct wl_signal set_title;
 		struct wl_signal set_class;
 		struct wl_signal set_parent;
-		struct wl_signal set_state;
 		struct wl_signal set_pid;
 		struct wl_signal set_window_type;
 	} events;
 
+	struct wl_listener surface_destroy;
+	struct wl_listener surface_commit;
+
 	void *data;
 };
 
@@ -115,15 +133,35 @@ struct wlr_xwayland_surface_configure_event {
 	uint16_t width, height;
 };
 
-void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland);
+// TODO: maybe add a seat to these
+struct wlr_xwayland_move_event {
+	struct wlr_xwayland_surface *surface;
+};
+
+struct wlr_xwayland_resize_event {
+	struct wlr_xwayland_surface *surface;
+	uint32_t edges;
+};
+
 struct wlr_xwayland *wlr_xwayland_create(struct wl_display *wl_display,
 	struct wlr_compositor *compositor);
+
+void wlr_xwayland_destroy(struct wlr_xwayland *wlr_xwayland);
+
 void wlr_xwayland_surface_activate(struct wlr_xwayland *wlr_xwayland,
-	struct wlr_xwayland_surface *surface);
+	struct wlr_xwayland_surface *surface, bool activated);
+
 void wlr_xwayland_surface_configure(struct wlr_xwayland *wlr_xwayland,
 	struct wlr_xwayland_surface *surface, int16_t x, int16_t y,
 	uint16_t width, uint16_t height);
+
 void wlr_xwayland_surface_close(struct wlr_xwayland *wlr_xwayland,
 	struct wlr_xwayland_surface *surface);
 
+void wlr_xwayland_surface_set_maximized(struct wlr_xwayland *wlr_xwayland,
+	struct wlr_xwayland_surface *surface, bool maximized);
+
+void wlr_xwayland_surface_set_fullscreen(struct wlr_xwayland *wlr_xwayland,
+	struct wlr_xwayland_surface *surface, bool fullscreen);
+
 #endif

rootston/cursor.c

@@ -204,6 +204,11 @@ void set_view_focus(struct roots_input *input, struct roots_desktop *desktop,
 		return;
 	}
 
+	if (view->type == ROOTS_XWAYLAND_VIEW &&
+			view->xwayland_surface->override_redirect) {
+		return;
+	}
+
 	size_t index = 0;
 	for (size_t i = 0; i < desktop->views->length; ++i) {
 		struct roots_view *_view = desktop->views->items[i];
@@ -217,6 +222,7 @@ void set_view_focus(struct roots_input *input, struct roots_desktop *desktop,
 	// TODO: list_swap
 	wlr_list_del(desktop->views, index);
 	wlr_list_add(desktop->views, view);
+	wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);
 }
 
 static void handle_cursor_motion(struct wl_listener *listener, void *data) {
@@ -325,9 +331,6 @@ static void do_cursor_button_press(struct roots_input *input,
 		input->input_events_idx = (i + 1)
 			% (sizeof(input->input_events) / sizeof(input->input_events[0]));
 		set_view_focus(input, desktop, view);
-		if (view) {
-			wlr_seat_keyboard_notify_enter(input->wl_seat, surface);
-		}
 		break;
 	}
 }

rootston/desktop.c

@@ -98,10 +98,10 @@ bool view_center(struct roots_view *view) {
 	int width, height;
 	wlr_output_effective_resolution(output, &width, &height);
 
-	view->x = (double)(width - size.width) / 2
-		+ l_output->x;
-	view->y = (double)(height - size.height) / 2
-		+ l_output->y;
+	double view_x = (double)(width - size.width) / 2 + l_output->x;
+	double view_y = (double)(height - size.height) / 2 + l_output->y;
+
+	view_set_position(view, view_x, view_y);
 
 	return true;
 }
@@ -111,7 +111,6 @@ void view_setup(struct roots_view *view) {
 
 	struct roots_input *input = view->desktop->server->input;
 	set_view_focus(input, view->desktop, view);
-	wlr_seat_keyboard_notify_enter(input->wl_seat, view->wlr_surface);
 }
 
 void view_teardown(struct roots_view *view) {

rootston/keyboard.c

@@ -38,8 +38,6 @@ static void keyboard_binding_execute(struct roots_keyboard *keyboard,
 		if (server->desktop->views->length > 0) {
 			struct roots_view *view = server->desktop->views->items[0];
 			set_view_focus(keyboard->input, server->desktop, view);
-			wlr_seat_keyboard_notify_enter(keyboard->input->wl_seat,
-				view->wlr_surface);
 		}
 	} else if (strncmp(exec_prefix, command, strlen(exec_prefix)) == 0) {
 		const char *shell_cmd = command + strlen(exec_prefix);

rootston/xwayland.c

@@ -11,12 +11,8 @@
 
 static void activate(struct roots_view *view, bool active) {
 	assert(view->type == ROOTS_XWAYLAND_VIEW);
-	if (active) {
-		wlr_xwayland_surface_activate(view->desktop->xwayland,
-			view->xwayland_surface);
-	} else {
-		wlr_xwayland_surface_activate(view->desktop->xwayland, NULL);
-	}
+	struct wlr_xwayland *xwayland = view->desktop->xwayland;
+	wlr_xwayland_surface_activate(xwayland, view->xwayland_surface, active);
 }
 
 static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
@@ -63,6 +59,8 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 		wl_container_of(listener, roots_surface, destroy);
 	view_teardown(roots_surface->view);
 	wl_list_remove(&roots_surface->destroy.link);
+	wl_list_remove(&roots_surface->map_notify.link);
+	wl_list_remove(&roots_surface->unmap_notify.link);
 	view_destroy(roots_surface->view);
 	free(roots_surface);
 }
@@ -81,6 +79,85 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
 		xwayland_surface, event->x, event->y, event->width, event->height);
 }
 
+// XXX Needs deep refactoring to get this better. We need to select the correct
+// seat based on seat pointer focus, but interactive moving and resizing is not
+// yet seat aware. Even then, we can only guess because X11 events don't give us
+// enough wayland info to know for sure.
+static struct wlr_cursor *guess_cursor_for_view(struct roots_view *view) {
+	struct roots_input *input = view->desktop->server->input;
+	size_t len = sizeof(input->input_events) / sizeof(*input->input_events);
+	for (size_t i = 0; i < len; i++) {
+		struct wlr_cursor *cursor = input->input_events[i].cursor;
+		if (cursor) {
+			int width = view->xwayland_surface->surface->current->width;
+			int height = view->xwayland_surface->surface->current->height;
+			if (cursor->x > view->x && cursor->y > view->y &&
+					cursor->x < view->x + width &&
+					cursor->y < view->y + height) {
+				return cursor;
+			}
+		}
+	}
+
+	return NULL;
+}
+
+static void handle_request_move(struct wl_listener *listener, void *data) {
+	struct roots_xwayland_surface *roots_surface =
+		wl_container_of(listener, roots_surface, request_move);
+	struct roots_view *view = roots_surface->view;
+	struct roots_input *input = view->desktop->server->input;
+	struct wlr_cursor *cursor = guess_cursor_for_view(view);
+
+	if (!cursor || input->mode != ROOTS_CURSOR_PASSTHROUGH) {
+		return;
+	}
+
+	view_begin_move(input, cursor, view);
+}
+
+static void handle_request_resize(struct wl_listener *listener, void *data) {
+	struct roots_xwayland_surface *roots_surface =
+		wl_container_of(listener, roots_surface, request_resize);
+	struct roots_view *view = roots_surface->view;
+	struct roots_input *input = view->desktop->server->input;
+	struct wlr_cursor *cursor = guess_cursor_for_view(view);
+	struct wlr_xwayland_resize_event *e = data;
+
+	if (!cursor || input->mode != ROOTS_CURSOR_PASSTHROUGH) {
+		return;
+	}
+	view_begin_resize(input, cursor, view, e->edges);
+}
+
+static void handle_map_notify(struct wl_listener *listener, void *data) {
+	struct roots_xwayland_surface *roots_surface =
+		wl_container_of(listener, roots_surface, map_notify);
+	struct roots_view *view = roots_surface->view;
+	struct wlr_xwayland_surface *xsurface = view->xwayland_surface;
+	struct roots_desktop *desktop = view->desktop;
+
+	view->wlr_surface = xsurface->surface;
+	view->x = (double)xsurface->x;
+	view->y = (double)xsurface->y;
+
+	wlr_list_push(desktop->views, roots_surface->view);
+}
+
+static void handle_unmap_notify(struct wl_listener *listener, void *data) {
+	struct roots_xwayland_surface *roots_surface =
+		wl_container_of(listener, roots_surface, unmap_notify);
+	struct roots_desktop *desktop = roots_surface->view->desktop;
+	roots_surface->view->wlr_surface = NULL;
+
+	for (size_t i = 0; i < desktop->views->length; i++) {
+		if (desktop->views->items[i] == roots_surface->view) {
+			wlr_list_del(desktop->views, i);
+			break;
+		}
+	}
+}
+
 void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	struct roots_desktop *desktop =
 		wl_container_of(listener, desktop, xwayland_surface);
@@ -96,10 +173,23 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 	}
 	roots_surface->destroy.notify = handle_destroy;
 	wl_signal_add(&surface->events.destroy, &roots_surface->destroy);
+
 	roots_surface->request_configure.notify = handle_request_configure;
 	wl_signal_add(&surface->events.request_configure,
 		&roots_surface->request_configure);
 
+	roots_surface->map_notify.notify = handle_map_notify;
+	wl_signal_add(&surface->events.map_notify, &roots_surface->map_notify);
+
+	roots_surface->unmap_notify.notify = handle_unmap_notify;
+	wl_signal_add(&surface->events.unmap_notify, &roots_surface->unmap_notify);
+
+	roots_surface->request_move.notify = handle_request_move;
+	wl_signal_add(&surface->events.request_move, &roots_surface->request_move);
+
+	roots_surface->request_resize.notify = handle_request_resize;
+	wl_signal_add(&surface->events.request_resize, &roots_surface->request_resize);
+
 	struct roots_view *view = calloc(1, sizeof(struct roots_view));
 	if (view == NULL) {
 		free(roots_surface);

xwayland/xwayland.c

@@ -205,7 +205,6 @@ static bool wlr_xwayland_init(struct wlr_xwayland *wlr_xwayland,
 	wlr_xwayland->x_fd[0] = wlr_xwayland->x_fd[1] = -1;
 	wlr_xwayland->wl_fd[0] = wlr_xwayland->wl_fd[1] = -1;
 	wlr_xwayland->wm_fd[0] = wlr_xwayland->wm_fd[1] = -1;
-	wl_list_init(&wlr_xwayland->displayable_surfaces);
 	wl_signal_init(&wlr_xwayland->events.new_surface);
 
 	wlr_xwayland->display = open_display_sockets(wlr_xwayland->x_fd);

xwayland/xwm.h

@@ -3,48 +3,6 @@
 #include <wayland-server-core.h>
 #include <wlr/xwayland.h>
 
-/* wlc's atom list:
-   WL_SURFACE_ID,
-   WM_DELETE_WINDOW,
-   WM_TAKE_FOCUS,
-   WM_PROTOCOLS,
-   WM_NORMAL_HINTS,
-   MOTIF_WM_HINTS,
-   TEXT,
-   UTF8_STRING,
-   CLIPBOARD,
-   CLIPBOARD_MANAGER,
-   TARGETS,
-   PRIMARY,
-   WM_S0,
-   STRING,
-   WLC_SELECTION,
-   NET_WM_S0,
-   NET_WM_PID,
-   NET_WM_NAME,
-   NET_WM_STATE,
-   NET_WM_STATE_FULLSCREEN,
-   NET_WM_STATE_MODAL,
-   NET_WM_STATE_ABOVE,
-   NET_SUPPORTED,
-   NET_SUPPORTING_WM_CHECK,
-   NET_WM_WINDOW_TYPE,
-   NET_WM_WINDOW_TYPE_DESKTOP,
-   NET_WM_WINDOW_TYPE_DOCK,
-   NET_WM_WINDOW_TYPE_TOOLBAR,
-   NET_WM_WINDOW_TYPE_MENU,
-   NET_WM_WINDOW_TYPE_UTILITY,
-   NET_WM_WINDOW_TYPE_SPLASH,
-   NET_WM_WINDOW_TYPE_DIALOG,
-   NET_WM_WINDOW_TYPE_DROPDOWN_MENU,
-   NET_WM_WINDOW_TYPE_POPUP_MENU,
-   NET_WM_WINDOW_TYPE_TOOLTIP,
-   NET_WM_WINDOW_TYPE_NOTIFICATION,
-   NET_WM_WINDOW_TYPE_COMBO,
-   NET_WM_WINDOW_TYPE_DND,
-   NET_WM_WINDOW_TYPE_NORMAL,
- */
-
 enum atom_name {
 	WL_SURFACE_ID,
 	WM_DELETE_WINDOW,
@@ -62,6 +20,14 @@ enum atom_name {
 	NET_WM_STATE,
 	NET_WM_WINDOW_TYPE,
 	WM_TAKE_FOCUS,
+	WINDOW,
+	_NET_ACTIVE_WINDOW,
+	_NET_WM_MOVERESIZE,
+	_NET_WM_NAME,
+	_NET_SUPPORTING_WM_CHECK,
+	_NET_WM_STATE_FULLSCREEN,
+	_NET_WM_STATE_MAXIMIZED_VERT,
+	_NET_WM_STATE_MAXIMIZED_HORZ,
 	ATOM_LAST,
 };
 
@@ -69,27 +35,33 @@ extern const char *atom_map[ATOM_LAST];
 
 enum net_wm_state_action {
 	NET_WM_STATE_REMOVE = 0,
-	NET_WM_STATE_ADD    = 1,
+	NET_WM_STATE_ADD = 1,
 	NET_WM_STATE_TOGGLE = 2,
 };
 
 struct wlr_xwm {
 	struct wlr_xwayland *xwayland;
 	struct wl_event_source *event_source;
-	struct wl_listener surface_create_listener;
 
 	xcb_atom_t atoms[ATOM_LAST];
 	xcb_connection_t *xcb_conn;
 	xcb_screen_t *screen;
 	xcb_window_t window;
+	xcb_visualid_t visual_id;
+	xcb_colormap_t colormap;
 
-	struct wl_list new_surfaces;
-	struct wl_list unpaired_surfaces;
+	struct wlr_xwayland_surface *focus_surface;
+
+	struct wl_list surfaces; // wlr_xwayland_surface::link
+	struct wl_list unpaired_surfaces; // wlr_xwayland_surface::unpaired_link
 
 	const xcb_query_extension_reply_t *xfixes;
+
+	struct wl_listener compositor_surface_create;
 };
 
 void xwm_destroy(struct wlr_xwm *xwm);
+
 struct wlr_xwm *xwm_create(struct wlr_xwayland *wlr_xwayland);
 
 #endif