aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2017-08-20 14:18:29 +0200
committerDominique Martinet <asmadeus@codewreck.org>2017-08-23 22:03:49 +0200
commit1458a95e65248fede646051d2607c4553e8dcb0c (patch)
tree2905b0e6b183fec41e9ada40d78bebdf9c679776 /examples
parentf912316d9b1ed39352efb07e773128b6e4f554aa (diff)
example compositor: loop through xwayland surfaces
Diffstat (limited to 'examples')
-rw-r--r--examples/compositor.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/examples/compositor.c b/examples/compositor.c
index e0bafe60..024324cd 100644
--- a/examples/compositor.c
+++ b/examples/compositor.c
@@ -36,7 +36,7 @@ struct sample_state {
struct wlr_data_device_manager *data_device_manager;
struct wl_resource *focus;
struct wl_listener keyboard_bound;
- struct wlr_xwayland *wlr_xwayland;
+ struct wlr_xwayland *xwayland;
int keymap_fd;
size_t keymap_size;
uint32_t serial;
@@ -85,6 +85,10 @@ static void handle_output_frame(struct output_state *output, struct timespec *ts
wl_list_for_each(xdg_surface, &sample->xdg_shell->surfaces, link) {
output_frame_handle_surface(sample, wlr_output, ts, xdg_surface->surface);
}
+ struct wlr_x11_window *x11_window;
+ wl_list_for_each(x11_window, &sample->xwayland->displayable_windows, link) {
+ output_frame_handle_surface(sample, wlr_output, ts, x11_window->surface);
+ }
wlr_renderer_end(sample->renderer);
wlr_output_swap_buffers(wlr_output);
@@ -178,13 +182,13 @@ int main() {
free(keymap);
break;
}
- state.wlr_xwayland = wlr_xwayland_create(compositor.display, state.wlr_compositor);
+ state.xwayland = wlr_xwayland_create(compositor.display, state.wlr_compositor);
compositor.keyboard_key_cb = handle_keyboard_key;
wl_display_run(compositor.display);
- wlr_xwayland_destroy(state.wlr_xwayland);
+ wlr_xwayland_destroy(state.xwayland);
close(state.keymap_fd);
wlr_seat_destroy(state.wl_seat);
wlr_data_device_manager_destroy(state.data_device_manager);