From fbc6bd0c0882c5c60232fe68e315799566adb476 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Wed, 16 Dec 2020 11:47:32 +0100
Subject: [PATCH] Update wlroots and libliftoff

---
 src/wlserver.cpp       | 6 ++++--
 subprojects/libliftoff | 2 +-
 subprojects/wlroots    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/wlserver.cpp b/src/wlserver.cpp
index 7830b7a..85869b8 100644
--- a/src/wlserver.cpp
+++ b/src/wlserver.cpp
@@ -23,8 +23,10 @@ extern "C" {
 #include <wlr/backend/headless.h>
 #include <wlr/backend/multi.h>
 #include <wlr/backend/libinput.h>
-#include <wlr/interfaces/wlr_pointer.h>
 #include <wlr/render/wlr_renderer.h>
+#include <wlr/types/wlr_keyboard.h>
+#include <wlr/types/wlr_pointer.h>
+#include <wlr/types/wlr_touch.h>
 #include <wlr/xwayland.h>
 #include <wlr/util/log.h>
 #undef static
@@ -135,7 +137,7 @@ static void wlserver_handle_key(struct wl_listener *listener, void *data)
 	xkb_keycode_t keycode = event->keycode + 8;
 	xkb_keysym_t keysym = xkb_state_key_get_one_sym(keyboard->device->keyboard->xkb_state, keycode);
 
-	if (wlserver.wlr.session && event->state == WLR_KEY_PRESSED && keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) {
+	if (wlserver.wlr.session && event->state == WL_KEYBOARD_KEY_STATE_PRESSED && keysym >= XKB_KEY_XF86Switch_VT_1 && keysym <= XKB_KEY_XF86Switch_VT_12) {
 		unsigned vt = keysym - XKB_KEY_XF86Switch_VT_1 + 1;
 		wlr_session_change_vt(wlserver.wlr.session, vt);
 		return;
diff --git a/subprojects/libliftoff b/subprojects/libliftoff
index 24abeb9..c9e42e3 160000
--- a/subprojects/libliftoff
+++ b/subprojects/libliftoff
@@ -1 +1 @@
-Subproject commit 24abeb923f52176808461e664776b56d52960d3e
+Subproject commit c9e42e3c149fa8db94c12f285ebf67c68e45549d
diff --git a/subprojects/wlroots b/subprojects/wlroots
index 238d1c0..da2a216 160000
--- a/subprojects/wlroots
+++ b/subprojects/wlroots
@@ -1 +1 @@
-Subproject commit 238d1c078fb03338e9f271d98f7bf6b1fc399285
+Subproject commit da2a2169344ef2dbe0dc31fd013caf30880d6aff