Merge pull request #176 from acrisci/bug/init-desktop-before-input

rootston: create desktop before input

1 files changed, 7 insertions, 0 deletions

diff --git a/rootston/input.c b/rootston/input.c
index b4427212..9157ecc7 100644
--- a/rootston/input.c
+++ b/rootston/input.c
@@ -71,6 +71,8 @@ static void input_remove_notify(struct wl_listener *listener, void *data) {
 struct roots_input *input_create(struct roots_server *server,
 		struct roots_config *config) {
 	wlr_log(L_DEBUG, "Initializing roots input");
+	assert(server->desktop);
+
 	struct roots_input *input = calloc(1, sizeof(struct roots_input));
 	assert(input);
 
@@ -104,6 +106,11 @@ struct roots_input *input_create(struct roots_server *server,
 	cursor_initialize(input);
 	wlr_cursor_set_xcursor(input->cursor, input->xcursor);
 
+	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);
+
 	return input;
 }