]> git.mdlowis.com Git - proto/labwc.git/commitdiff
Use enum wl_keyboard_key_state
authorJohan Malm <jgm323@gmail.com>
Tue, 1 Dec 2020 17:14:59 +0000 (17:14 +0000)
committerJohan Malm <jgm323@gmail.com>
Tue, 1 Dec 2020 17:14:59 +0000 (17:14 +0000)
In support of wlroots commit 7693f61d (which is after v0.12)

s/WLR_KEY_RELEASED/WL_KEYBOARD_KEY_STATE_RELEASED/
s/WLR_KEY_PRESSED/WL_KEYBOARD_KEY_STATE_PRESSED/

This change is backwards compatible, albeit with some compiler warnings

src/keyboard.c

index 6d6263d6a25058ca0c647458e282900a71db21dc..267d7fca5a5a3f4b10d26587ddf19a4a33e4863c 100644 (file)
@@ -50,11 +50,11 @@ keyboard_key_notify(struct wl_listener *listener, void *data)
 
        if (server->cycle_view) {
                if ((syms[0] == XKB_KEY_Alt_L) &&
-                   event->state == WLR_KEY_RELEASED) {
+                   event->state == WL_KEYBOARD_KEY_STATE_RELEASED) {
                        /* end cycle */
                        desktop_focus_view(&server->seat, server->cycle_view);
                        server->cycle_view = NULL;
-               } else if (event->state == WLR_KEY_PRESSED) {
+               } else if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
                        /* cycle to next */
                        server->cycle_view =
                                desktop_cycle_view(server, server->cycle_view);
@@ -63,7 +63,7 @@ keyboard_key_notify(struct wl_listener *listener, void *data)
        }
 
        /* Handle compositor key bindings */
-       if (event->state == WLR_KEY_PRESSED) {
+       if (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) {
                for (int i = 0; i < nsyms; i++) {
                        handled = handle_keybinding(server, modifiers, syms[i]);
                }