diff options
| -rw-r--r-- | include/rootston/view.h | 4 | ||||
| -rw-r--r-- | rootston/wl_shell.c | 24 |
2 files changed, 26 insertions, 2 deletions
diff --git a/include/rootston/view.h b/include/rootston/view.h index 85a6c1e7..f8a828cd 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -15,6 +15,10 @@ struct roots_wl_shell_surface { struct wl_listener request_resize; struct wl_listener request_set_fullscreen; struct wl_listener request_set_maximized; + + struct wl_listener surface_commit; + + bool initialized; }; struct roots_xdg_surface_v6 { diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index 55ffd2eb..2df36dc3 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -49,6 +49,19 @@ static void handle_request_resize(struct wl_listener *listener, void *data) { view_begin_resize(input, event->cursor, view, e->edges); } +static void handle_surface_commit(struct wl_listener *listener, void *data) { + struct roots_wl_shell_surface *roots_surface = + wl_container_of(listener, roots_surface, surface_commit); + struct roots_view *view = roots_surface->view; + + if (!roots_surface->initialized) { + bool centered = view_center(view); + if (centered) { + roots_surface->initialized = true; + } + } +} + static void handle_destroy(struct wl_listener *listener, void *data) { struct roots_wl_shell_surface *roots_surface = wl_container_of(listener, roots_surface, destroy); @@ -73,7 +86,9 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { struct roots_wl_shell_surface *roots_surface = calloc(1, sizeof(struct roots_wl_shell_surface)); - // TODO: all of the trimmings + if (!roots_surface) { + return; + } wl_list_init(&roots_surface->destroy.link); roots_surface->destroy.notify = handle_destroy; wl_signal_add(&surface->events.destroy, &roots_surface->destroy); @@ -83,9 +98,14 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { wl_signal_add(&surface->events.request_move, &roots_surface->request_move); wl_list_init(&roots_surface->request_resize.link); roots_surface->request_resize.notify = handle_request_resize; - wl_signal_add(&surface->events.request_resize, &roots_surface->request_resize); + wl_signal_add(&surface->events.request_resize, + &roots_surface->request_resize); wl_list_init(&roots_surface->request_set_fullscreen.link); wl_list_init(&roots_surface->request_set_maximized.link); + wl_list_init(&roots_surface->surface_commit.link); + roots_surface->surface_commit.notify = handle_surface_commit; + wl_signal_add(&surface->surface->signals.commit, + &roots_surface->surface_commit); struct roots_view *view = calloc(1, sizeof(struct roots_view)); view->type = ROOTS_WL_SHELL_VIEW; |