diff options
Diffstat (limited to 'dwl.c')
| -rw-r--r-- | dwl.c | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -1286,7 +1286,7 @@ keypress(struct wl_listener *listener, void *data) wlr_idle_notify_activity(idle, seat); /* On _press_, attempt to process a compositor keybinding. */ - if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) + if (event->state == WLR_KEY_PRESSED) for (i = 0; i < nsyms; i++) handled = keybinding(mods, syms[i]) || handled; @@ -2024,7 +2024,7 @@ setup(void) * backend uses the renderer, for example, to fall back to software cursors * if the backend does not support hardware cursors (some older GPUs * don't). */ - if (!(backend = wlr_backend_autocreate(dpy))) + if (!(backend = wlr_backend_autocreate(dpy, NULL))) BARF("couldn't create backend"); /* If we don't provide a renderer, autocreate makes a GLES2 renderer for us. @@ -2168,6 +2168,11 @@ setup(void) void sigchld(int unused) { + /* We should be able to remove this function in favor of a simple + * signal(SIGCHLD, SIG_IGN); + * but the Xwayland implementation in wlroots currently prevents us from + * setting our own disposition for SIGCHLD. + */ if (signal(SIGCHLD, sigchld) == SIG_ERR) EBARF("can't install SIGCHLD handler"); while (0 < waitpid(-1, NULL, WNOHANG)) @@ -2445,11 +2450,11 @@ zoom(const Arg *arg) void activatex11(struct wl_listener *listener, void *data) { - Client *c = wl_container_of(listener, c, activate); + Client *c = wl_container_of(listener, c, activate); - /* Only "managed" windows can be activated */ - if (c->type == X11Managed) - wlr_xwayland_surface_activate(c->surface.xwayland, 1); + /* Only "managed" windows can be activated */ + if (c->type == X11Managed) + wlr_xwayland_surface_activate(c->surface.xwayland, 1); } void |