diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-10-08 12:51:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 12:51:42 -0400 |
| commit | 8dcf3bfdf786ceb2614d4cf572ef6747cd4bb94c (patch) | |
| tree | 762bde8fa6fca8e1faa342b7965ba7e44b61ab99 /rootston/xdg_shell_v6.c | |
| parent | 9e1ff2dce9eded87673c8cd7eeb7e31a421f7a22 (diff) | |
| parent | b72da6cc44cf19688686383065557425d55ae9ed (diff) | |
Merge pull request #239 from emersion/center-views
Center views in rootston
Diffstat (limited to 'rootston/xdg_shell_v6.c')
| -rw-r--r-- | rootston/xdg_shell_v6.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c index c0124d60..9b8d8882 100644 --- a/rootston/xdg_shell_v6.c +++ b/rootston/xdg_shell_v6.c @@ -67,6 +67,17 @@ static void handle_request_resize(struct wl_listener *listener, void *data) { view_begin_resize(input, event->cursor, view, e->edges); } +static void handle_commit(struct wl_listener *listener, void *data) { + struct roots_xdg_surface_v6 *roots_xdg_surface = + wl_container_of(listener, roots_xdg_surface, commit); + struct roots_view *view = roots_xdg_surface->view; + + if (view->xdg_surface_v6->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL && + !roots_xdg_surface->initialized) { + roots_xdg_surface->initialized = view_initialize(view); + } +} + static void handle_destroy(struct wl_listener *listener, void *data) { struct roots_xdg_surface_v6 *roots_xdg_surface = wl_container_of(listener, roots_xdg_surface, destroy); @@ -98,7 +109,12 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { struct roots_xdg_surface_v6 *roots_surface = calloc(1, sizeof(struct roots_xdg_surface_v6)); - // TODO: all of the trimmings + if (!roots_surface) { + return; + } + wl_list_init(&roots_surface->commit.link); + roots_surface->commit.notify = handle_commit; + wl_signal_add(&surface->events.commit, &roots_surface->commit); wl_list_init(&roots_surface->destroy.link); roots_surface->destroy.notify = handle_destroy; wl_signal_add(&surface->events.destroy, &roots_surface->destroy); @@ -115,7 +131,6 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) { struct roots_view *view = calloc(1, sizeof(struct roots_view)); view->type = ROOTS_XDG_SHELL_V6_VIEW; - view->x = view->y = 200; view->xdg_surface_v6 = surface; view->roots_xdg_surface_v6 = roots_surface; view->wlr_surface = surface->surface; |