diff options
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/config.c | 2 | ||||
| -rw-r--r-- | rootston/cursor.c | 4 | ||||
| -rw-r--r-- | rootston/desktop.c | 4 | ||||
| -rw-r--r-- | rootston/output.c | 8 | ||||
| -rw-r--r-- | rootston/rootston.ini.example | 2 | ||||
| -rw-r--r-- | rootston/wl_shell.c | 4 | ||||
| -rw-r--r-- | rootston/xdg_shell_v6.c | 2 | ||||
| -rw-r--r-- | rootston/xwayland.c | 2 |
8 files changed, 15 insertions, 13 deletions
diff --git a/rootston/config.c b/rootston/config.c index 71a4731b..c9c892f9 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -306,7 +306,7 @@ struct roots_config *parse_args(int argc, char *argv[]) { if (result == -1) { wlr_log(L_DEBUG, "No config file found. Using sensible defaults."); config->keyboard.meta_key = WLR_MODIFIER_LOGO; - add_binding_config(&config->bindings, "Logo+Shift+e", "exit"); + add_binding_config(&config->bindings, "Logo+Shift+E", "exit"); add_binding_config(&config->bindings, "Ctrl+q", "close"); add_binding_config(&config->bindings, "Alt+Tab", "next_window"); } else if (result == -2) { diff --git a/rootston/cursor.c b/rootston/cursor.c index 200a6d37..b55eab3f 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -185,8 +185,8 @@ void set_view_focus(struct roots_input *input, struct roots_desktop *desktop, } view_activate(view, true); // TODO: list_swap - list_del(desktop->views, index); - list_add(desktop->views, view); + wlr_list_del(desktop->views, index); + wlr_list_add(desktop->views, view); } static void handle_cursor_motion(struct wl_listener *listener, void *data) { diff --git a/rootston/desktop.c b/rootston/desktop.c index 70767f92..40d088b8 100644 --- a/rootston/desktop.c +++ b/rootston/desktop.c @@ -29,7 +29,7 @@ void view_destroy(struct roots_view *view) { for (size_t i = 0; i < desktop->views->length; ++i) { struct roots_view *_view = desktop->views->items[i]; if (view == _view) { - list_del(desktop->views, i); + wlr_list_del(desktop->views, i); break; } } @@ -209,7 +209,7 @@ struct roots_desktop *desktop_create(struct roots_server *server, return NULL; } - desktop->views = list_create(); + desktop->views = wlr_list_create(); if (desktop->views == NULL) { free(desktop); return NULL; diff --git a/rootston/output.c b/rootston/output.c index f560061d..89e1475b 100644 --- a/rootston/output.c +++ b/rootston/output.c @@ -175,9 +175,11 @@ void output_add_notify(struct wl_listener *listener, void *data) { wlr_log(L_DEBUG, "%s %s %"PRId32"mm x %"PRId32"mm", wlr_output->make, wlr_output->model, wlr_output->phys_width, wlr_output->phys_height); - if (wlr_output->modes->length > 0) { - wlr_output_set_mode(wlr_output, wlr_output->modes->items[0]); - } + if (wl_list_length(&wlr_output->modes) > 0) { + struct wlr_output_mode *mode = NULL; + mode = wl_container_of((&wlr_output->modes)->prev, mode, link); + wlr_output_set_mode(wlr_output, mode); + } struct roots_output *output = calloc(1, sizeof(struct roots_output)); clock_gettime(CLOCK_MONOTONIC, &output->last_frame); diff --git a/rootston/rootston.ini.example b/rootston/rootston.ini.example index c33b0f04..433dc78f 100644 --- a/rootston/rootston.ini.example +++ b/rootston/rootston.ini.example @@ -40,6 +40,6 @@ meta-key = Logo # - "close" to close the current view # - "next_window" to cycle through windows [bindings] -Logo+Shift+e = exit +Logo+Shift+E = exit Logo+q = close Alt+Tab = next_window diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index 248514f0..88397af8 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -110,12 +110,12 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { view->close = close; view->desktop = desktop; roots_surface->view = view; - list_add(desktop->views, view); + wlr_list_add(desktop->views, view); view_initialize(view); if (surface->state == WLR_WL_SHELL_SURFACE_STATE_TRANSIENT) { // we need to map it relative to the parent - int i = list_seq_find(desktop->views, shell_surface_compare_equals, + int i = wlr_list_seq_find(desktop->views, shell_surface_compare_equals, surface->parent); if (i != -1) { struct roots_view *parent = desktop->views->items[i]; diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c index 028545df..95b20a8b 100644 --- a/rootston/xdg_shell_v6.c +++ b/rootston/xdg_shell_v6.c @@ -124,7 +124,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { view->close = close; view->desktop = desktop; roots_surface->view = view; - list_add(desktop->views, view); + wlr_list_add(desktop->views, view); view_initialize(view); } diff --git a/rootston/xwayland.c b/rootston/xwayland.c index 6ef33403..1149b966 100644 --- a/rootston/xwayland.c +++ b/rootston/xwayland.c @@ -98,7 +98,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { view->set_position = set_position; view->close = close; roots_surface->view = view; - list_add(desktop->views, view); + wlr_list_add(desktop->views, view); if (!surface->override_redirect) { view_initialize(view); |