aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2017-08-19 18:06:58 +0200
committerDominique Martinet <asmadeus@codewreck.org>2017-08-23 22:03:49 +0200
commit60451521bd6bd7d03255a206e35b0f88d5328311 (patch)
tree2942c24d60d74f118be96d9ebc3962178ec5ee06
parent49a823d4c6b41723a9978c19d426e8ca4f5418d7 (diff)
start xwayland in example compositor
-rw-r--r--examples/compositor.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/examples/compositor.c b/examples/compositor.c
index fb00032a..be9fc5ca 100644
--- a/examples/compositor.c
+++ b/examples/compositor.c
@@ -19,6 +19,7 @@
#include <wlr/types/wlr_seat.h>
#include <wlr/types/wlr_data_device_manager.h>
#include "wlr/types/wlr_compositor.h"
+#include <wlr/xwayland.h>
#include <xkbcommon/xkbcommon.h>
#include <wlr/util/log.h>
#include "shared.h"
@@ -35,6 +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;
int keymap_fd;
size_t keymap_size;
uint32_t serial;
@@ -176,11 +178,13 @@ int main() {
free(keymap);
break;
}
+ wlr_xwayland_init(&state.wlr_xwayland, compositor.display);
compositor.keyboard_key_cb = handle_keyboard_key;
wl_display_run(compositor.display);
+ wlr_xwayland_finish(&state.wlr_xwayland);
close(state.keymap_fd);
wlr_seat_destroy(state.wl_seat);
wlr_data_device_manager_destroy(state.data_device_manager);