From 3d9abbe6ff39f1c614971471ff3a65435b40b713 Mon Sep 17 00:00:00 2001
From: Alex Richardson <arichardson.kde@gmail.com>
Date: Fri, 28 Mar 2014 09:41:48 +0100
Subject: [PATCH] Don't include xkbcommon/xkbcommon.h in input.h,
 forward-declare instead

Some systems (e.g. openSuSE) don't install the xkbcommon header into
/usr/include/xkbcommon/xkbcommon.h (which is always in the include path),
but instead into a subdirectory, which is in the openSuSE case
/usr/include/pkg/libxkbcommon/xkbcommon/xkbcommon.h. This means that e.g.
kcm_kwinrules will not compile there since it includes input.h

REVIEW: 117069
---
 input.cpp | 3 +++
 input.h   | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/input.cpp b/input.cpp
index 6a05f17602..bcdc7c9dc4 100644
--- a/input.cpp
+++ b/input.cpp
@@ -30,6 +30,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <kkeyserver.h>
 // TODO: remove xtest
 #include <xcb/xtest.h>
+#if HAVE_XKB
+#include <xkbcommon/xkbcommon.h>
+#endif
 // system
 #include <linux/input.h>
 #include <sys/mman.h>
diff --git a/input.h b/input.h
index ca30a06640..bd8c6acb91 100644
--- a/input.h
+++ b/input.h
@@ -26,13 +26,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QEvent>
 #include <QWeakPointer>
 #include <config-kwin.h>
-#if HAVE_XKB
-#include <xkbcommon/xkbcommon.h>
-#endif
 
 class QAction;
 class QKeySequence;
 
+struct xkb_context;
+struct xkb_keymap;
+struct xkb_state;
+typedef uint32_t xkb_mod_index_t;
+typedef uint32_t xkb_keysym_t;
+
 namespace KWin
 {
 class GlobalShortcutsManager;