diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-01-15 20:53:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 20:53:13 -0500 |
| commit | b331c5c2c5cbb94df66789e52ab87598647e0056 (patch) | |
| tree | 24be1a00880947a25b9f9f8a12129bbb371b1643 /backend/x11/backend.c | |
| parent | c690420501a35ee83bf6afeb52139b3da2c455c2 (diff) | |
| parent | 0eebaf98d0550a9ea7adb743a5b85634f1d76b73 (diff) | |
Merge pull request #549 from emersion/output-enabled
Add wlr_output::enabled
Diffstat (limited to 'backend/x11/backend.c')
| -rw-r--r-- | backend/x11/backend.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/backend/x11/backend.c b/backend/x11/backend.c index d2690342..e1622d06 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -181,7 +181,8 @@ static int signal_frame(void *data) { static void init_atom(struct wlr_x11_backend *x11, struct wlr_x11_atom *atom, uint8_t only_if_exists, const char *name) { - atom->cookie = xcb_intern_atom(x11->xcb_conn, only_if_exists, strlen(name), name); + atom->cookie = xcb_intern_atom(x11->xcb_conn, only_if_exists, strlen(name), + name); atom->reply = xcb_intern_atom_reply(x11->xcb_conn, atom->cookie, NULL); } @@ -201,7 +202,8 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { output->x11 = x11; - wlr_output_init(&output->wlr_output, &x11->backend, &output_impl); + wlr_output_init(&output->wlr_output, &x11->backend, &output_impl, + x11->wl_display); snprintf(output->wlr_output.name, sizeof(output->wlr_output.name), "X11-1"); output->win = xcb_generate_id(x11->xcb_conn); @@ -224,7 +226,7 @@ static bool wlr_x11_backend_start(struct wlr_backend *backend) { xcb_map_window(x11->xcb_conn, output->win); xcb_flush(x11->xcb_conn); - wlr_output_create_global(&output->wlr_output, x11->wl_display); + wlr_output_update_enabled(&output->wlr_output, true); wl_signal_emit(&x11->backend.events.output_add, output); wl_signal_emit(&x11->backend.events.input_add, &x11->keyboard_dev); |