From c64c3c69dfed2d5d2af7b72b0489f52b28f854a8 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 30 May 2017 20:48:09 +0200
Subject: qxt-mini: fix numpad handling

---
 qxt-mini/x11-keymap.hpp | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'qxt-mini/x11-keymap.hpp')

diff --git a/qxt-mini/x11-keymap.hpp b/qxt-mini/x11-keymap.hpp
index 2c737c77..52e2ebea 100644
--- a/qxt-mini/x11-keymap.hpp
+++ b/qxt-mini/x11-keymap.hpp
@@ -10,6 +10,8 @@
 #include <QHash>
 #include <QPair>
 
+#include "qxtglobal.h"
+
 #include <vector>
 #include <tuple>
 
@@ -17,17 +19,24 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
-QXT_GUI_EXPORT
-std::vector<quint32> qt_key_to_x11(Display* disp, Qt::Key k, Qt::KeyboardModifiers m);
+QXT_EXPORT
+std::vector<quint32> qt_key_to_x11(Display* disp,
+                                   Qt::Key k, Qt::KeyboardModifiers m);
 
-QXT_GUI_EXPORT
-std::tuple<Qt::Key, Qt::KeyboardModifiers> x11_key_to_qt(Display* disp, quint32 keycode, quint32 mods);
+QXT_EXPORT
+std::tuple<Qt::Key, Qt::KeyboardModifiers> x11_key_to_qt(Display* disp,
+                                                         quint32 keycode, quint32 mods);
+
+QXT_EXPORT QPair<KeySym, KeySym> keycode_to_keysym(Display* disp,
+                                                   quint32 keycode, quint32 keystate,
+                                                   xcb_key_press_event_t const* kev);
+
+QXT_EXPORT quint32 qt_mods_to_x11(Qt::KeyboardModifiers modifiers);
 
 QXT_GUI_EXPORT
-QPair<KeySym, KeySym> keycode_to_keysym(Display* disp, quint32 keycode, quint32 keystate,
-                                        xcb_key_press_event_t const* kev);
+Qt::KeyboardModifiers x11_mods_to_qt(quint32 mods);
 
 QXT_GUI_EXPORT
-quint32 qt_mods_to_x11(Qt::KeyboardModifiers modifiers);
+quint32 xcb_mods_to_x11(quint32 mods);
 
 #endif
-- 
cgit v1.2.3