diff options
Diffstat (limited to 'qxt-mini')
| -rw-r--r-- | qxt-mini/x11-keymap.cpp | 11 | ||||
| -rw-r--r-- | qxt-mini/x11-keymap.hpp | 22 |
2 files changed, 12 insertions, 21 deletions
diff --git a/qxt-mini/x11-keymap.cpp b/qxt-mini/x11-keymap.cpp index a42752b3..4b7f56f5 100644 --- a/qxt-mini/x11-keymap.cpp +++ b/qxt-mini/x11-keymap.cpp @@ -174,7 +174,6 @@ static tt numpad_keymap[] = { { Qt::Key_ScrollLock, XK_Scroll_Lock }, }; -QXT_GUI_EXPORT quint32 qt_mods_to_x11(Qt::KeyboardModifiers modifiers) { quint32 mods = 0; @@ -193,7 +192,6 @@ quint32 qt_mods_to_x11(Qt::KeyboardModifiers modifiers) return mods; } -QXT_GUI_EXPORT std::vector<quint32> qt_key_to_x11(Display*, Qt::Key k, Qt::KeyboardModifiers) { std::vector<quint32> ret; @@ -212,10 +210,10 @@ std::vector<quint32> qt_key_to_x11(Display*, Qt::Key k, Qt::KeyboardModifiers) return ret; } -QXT_GUI_EXPORT + Qt::KeyboardModifiers x11_mods_to_qt(quint32 mods) { - Qt::KeyboardModifiers ret(0); + Qt::KeyboardModifiers ret{0}; if (mods & Mod1Mask) ret |= Qt::AltModifier; @@ -229,7 +227,6 @@ Qt::KeyboardModifiers x11_mods_to_qt(quint32 mods) return ret; } -QXT_GUI_EXPORT std::tuple<Qt::Key, Qt::KeyboardModifiers> x11_key_to_qt(Display* disp, quint32 keycode, quint32 mods) { (void)disp; @@ -247,7 +244,6 @@ std::tuple<Qt::Key, Qt::KeyboardModifiers> x11_key_to_qt(Display* disp, quint32 } -QXT_GUI_EXPORT QPair<KeySym, KeySym> keycode_to_keysym(Display* disp, quint32 keycode, quint32 keystate, xcb_key_press_event_t const* kev) @@ -298,10 +294,9 @@ QPair<KeySym, KeySym> keycode_to_keysym(Display* disp, return ret; } -QXT_GUI_EXPORT quint32 xcb_mods_to_x11(quint32 mods) { - unsigned int keystate = 0; + unsigned keystate = 0; if(mods & XCB_MOD_MASK_1) // alt keystate |= Mod1Mask; diff --git a/qxt-mini/x11-keymap.hpp b/qxt-mini/x11-keymap.hpp index 52e2ebea..a6f2a061 100644 --- a/qxt-mini/x11-keymap.hpp +++ b/qxt-mini/x11-keymap.hpp @@ -19,24 +19,20 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -QXT_EXPORT -std::vector<quint32> qt_key_to_x11(Display* disp, - Qt::Key k, Qt::KeyboardModifiers m); +std::vector<quint32> +qt_key_to_x11(Display* disp, Qt::Key k, Qt::KeyboardModifiers m); -QXT_EXPORT -std::tuple<Qt::Key, Qt::KeyboardModifiers> x11_key_to_qt(Display* disp, - quint32 keycode, quint32 mods); +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); +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); +quint32 qt_mods_to_x11(Qt::KeyboardModifiers modifiers); -QXT_GUI_EXPORT Qt::KeyboardModifiers x11_mods_to_qt(quint32 mods); - -QXT_GUI_EXPORT quint32 xcb_mods_to_x11(quint32 mods); #endif |