Merge remote-tracking branch 'origin/wlroots-next' into basic_damage_tracking

This commit is contained in:
Stivvo 2021-03-16 10:25:47 +01:00
commit 9585a0dba4
2 changed files with 3 additions and 3 deletions

View File

@ -37,7 +37,7 @@ Feature *non-goals* include:
## Building dwl
dwl has only two dependencies: wlroots 0.12 and wayland-protocols. Simply install these and run `make`. If you wish to build against a Git version of wlroots, check out the [wlroots-next branch](https://github.com/djpohly/dwl/tree/wlroots-next).
dwl has only two dependencies: wlroots-git and wayland-protocols. Simply install these and run `make`.
To enable XWayland, you should also install xorg-xwayland and uncomment its flag in `config.mk`.

4
dwl.c
View File

@ -1337,7 +1337,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 == WLR_KEY_PRESSED)
if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
for (i = 0; i < nsyms; i++)
handled = keybinding(mods, syms[i]) || handled;
@ -2082,7 +2082,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, NULL)))
if (!(backend = wlr_backend_autocreate(dpy)))
BARF("couldn't create backend");
/* If we don't provide a renderer, autocreate makes a GLES2 renderer for us.