saberbud/zeal
1
0
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2026-08-29 16:40:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor improvement in XCB related code

Browse Source
This commit is contained in:
Oleg Shparber
2015-05-12 11:21:51 -07:00
parent fad2324e4a
commit 3f9e81a231
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/3rdparty/qxtglobalshortcut/qxtglobalshortcut_x11.cpp
Vendored
+5 -6
View File
@@ -54,13 +54,13 @@ bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray &eventType,
if ((event->response_type & ~0x80) != XCB_KEY_PRESS)
return false;
xcb_key_press_event_t *keyPressEvent = reinterpret_cast<xcb_key_press_event_t *>(event);
// Avoid keyboard freeze
xcb_connection_t *xcbConnection = QX11Info::connection();
xcb_ungrab_keyboard(xcbConnection, XCB_TIME_CURRENT_TIME);
xcb_allow_events(xcbConnection, XCB_ALLOW_REPLAY_KEYBOARD, keyPressEvent->time);
xcb_flush(xcbConnection);
xcb_key_press_event_t *keyPressEvent = reinterpret_cast<xcb_key_press_event_t *>(event);
unsigned int keycode = keyPressEvent->detail;
unsigned int keystate = 0;
if(keyPressEvent->state & XCB_MOD_MASK_1)
@@ -72,9 +72,8 @@ bool QxtGlobalShortcutPrivate::nativeEventFilter(const QByteArray &eventType,
if(keyPressEvent->state & XCB_MOD_MASK_SHIFT)
keystate |= ShiftMask;
return activateShortcut(keycode,
// Mod1Mask == Alt, Mod4Mask == Meta
keystate & (ShiftMask | ControlMask | Mod1Mask | Mod4Mask));
// Mod1Mask == Alt, Mod4Mask == Meta
return activateShortcut(keycode, keystate & (ShiftMask | ControlMask | Mod1Mask | Mod4Mask));
}
quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers)