diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-10-22 10:56:40 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-10-22 10:56:40 -0400 |
| commit | c5fff08f8a63b37ceb42e15641a14384efd163d2 (patch) | |
| tree | 313922081c22766308d29dab4c0e32843459a648 /rootston | |
| parent | 799f8b95b72d8ea57386edf5e5e2deb59d06984c (diff) | |
Forgot to rename these
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/cursor.c | 4 | ||||
| -rw-r--r-- | rootston/desktop.c | 4 | ||||
| -rw-r--r-- | rootston/wl_shell.c | 4 | ||||
| -rw-r--r-- | rootston/xdg_shell_v6.c | 2 | ||||
| -rw-r--r-- | rootston/xwayland.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/rootston/cursor.c b/rootston/cursor.c index 3be4c2a6..2a3a7c25 100644 --- a/rootston/cursor.c +++ b/rootston/cursor.c @@ -183,8 +183,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/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); |