diff options
author | Tony Crisci <tony@dubstepdish.com> | 2017-12-16 07:33:23 -0500 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-16 07:33:23 -0500 |
commit | 9fa70ce426a78921fa61f25f8b30a73a2a7d9ad7 (patch) | |
tree | 823cce0da3f7e0dc21c26bef7e639e8370e29b3d /sway/desktop/xwayland.c | |
parent | keyboard cleanup (diff) | |
parent | Merge pull request #1503 from emersion/output-config (diff) | |
download | sway-9fa70ce426a78921fa61f25f8b30a73a2a7d9ad7.tar.gz sway-9fa70ce426a78921fa61f25f8b30a73a2a7d9ad7.tar.zst sway-9fa70ce426a78921fa61f25f8b30a73a2a7d9ad7.zip |
Merge branch 'wlroots' into feature/input
Diffstat (limited to 'sway/desktop/xwayland.c')
-rw-r--r-- | sway/desktop/xwayland.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index a7e84aa1..29bed955 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c | |||
@@ -57,7 +57,7 @@ static void set_position(struct sway_view *view, double ox, double oy) { | |||
57 | if (!sway_assert(root, "output must be within tree to set position")) { | 57 | if (!sway_assert(root, "output must be within tree to set position")) { |
58 | return; | 58 | return; |
59 | } | 59 | } |
60 | struct wlr_output_layout *layout = root->output_layout; | 60 | struct wlr_output_layout *layout = root->sway_root->output_layout; |
61 | struct wlr_output_layout_output *loutput = | 61 | struct wlr_output_layout_output *loutput = |
62 | wlr_output_layout_get(layout, output->sway_output->wlr_output); | 62 | wlr_output_layout_get(layout, output->sway_output->wlr_output); |
63 | if (!sway_assert(loutput, "output must be within layout to set position")) { | 63 | if (!sway_assert(loutput, "output must be within layout to set position")) { |
@@ -149,14 +149,14 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) { | |||
149 | // TODO remove from the tree when the surface goes away (unmapped) | 149 | // TODO remove from the tree when the surface goes away (unmapped) |
150 | sway_view->surface = xsurface->surface; | 150 | sway_view->surface = xsurface->surface; |
151 | sway_surface->view = sway_view; | 151 | sway_surface->view = sway_view; |
152 | 152 | ||
153 | // TODO: | 153 | // TODO: |
154 | // - Wire up listeners | 154 | // - Wire up listeners |
155 | // - Handle popups | 155 | // - Handle popups |
156 | // - Look up pid and open on appropriate workspace | 156 | // - Look up pid and open on appropriate workspace |
157 | // - Set new view to maximized so it behaves nicely | 157 | // - Set new view to maximized so it behaves nicely |
158 | // - Criteria | 158 | // - Criteria |
159 | 159 | ||
160 | sway_surface->commit.notify = handle_commit; | 160 | sway_surface->commit.notify = handle_commit; |
161 | wl_signal_add(&xsurface->surface->events.commit, &sway_surface->commit); | 161 | wl_signal_add(&xsurface->surface->events.commit, &sway_surface->commit); |
162 | sway_surface->destroy.notify = handle_destroy; | 162 | sway_surface->destroy.notify = handle_destroy; |