yosh
/
hikari
1
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Change init sequence to handle premature input 

Initialize the current workspace with the `noop` workspace right away, that way
we can prevent hitting a NULL pointer when typing during startup.
This commit is contained in:
raichoo 2021-07-20 18:25:46 +00:00
parent d5088ad9fa
commit 4d354adbf9
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/output.c
View File

@ -289,6 +289,7 @@ hikari_output_init(struct hikari_output *output, struct wlr_output *wlr_output)
if (first) {
hikari_workspace_merge(
hikari_server.noop_output->workspace, output->workspace);
hikari_workspace_focus_view(output->workspace, NULL);
}
}
}

18
src/server.c
View File

@ -214,13 +214,7 @@ new_output_handler(struct wl_listener *listener, void *data)
struct hikari_output *output = hikari_malloc(sizeof(struct hikari_output));
hikari_output_init(output, wlr_output);
if (hikari_server.workspace == NULL) {
hikari_server.workspace = output->workspace;
hikari_cursor_activate(&hikari_server.cursor);
hikari_server.mode = (struct hikari_mode *)&hikari_server.normal_mode;
} else {
hikari_cursor_reset_image(&server->cursor);
}
hikari_cursor_reset_image(&server->cursor);
}
static bool
@ -775,9 +769,15 @@ init_noop_output(struct hikari_server *server)
server->noop_backend = wlr_noop_backend_create(server->display);
struct wlr_output *wlr_output = wlr_noop_add_output(server->noop_backend);
struct hikari_output *noop_output =
hikari_malloc(sizeof(struct hikari_output));
server->noop_output = hikari_malloc(sizeof(struct hikari_output));
hikari_output_init(server->noop_output, wlr_output);
server->noop_output = noop_output;
hikari_output_init(noop_output, wlr_output);
hikari_server.workspace = noop_output->workspace;
hikari_cursor_activate(&hikari_server.cursor);
hikari_server.mode = (struct hikari_mode *)&hikari_server.normal_mode;
}
static void