rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#3197 Disable regular motion events when using XInput 2

This commit is contained in:
Andreas Eriksson 2015-05-18 22:37:32 +02:00 committed by Andrew Nelless
parent 8e6bf53233
commit ba55369d42
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/platform/XWindowsScreen.cpp
View File

@ -160,15 +160,12 @@ XWindowsScreen::XWindowsScreen(
// primary/secondary screen only initialization // primary/secondary screen only initialization
if (m_isPrimary) { if (m_isPrimary) {
// start watching for events on other windows
selectEvents(m_root);
m_xi2detected = detectXI2();
if (m_xi2detected) {
#ifdef HAVE_XI2 #ifdef HAVE_XI2
m_xi2detected = detectXI2();
if (m_xi2detected) {
selectXIRawMotion(); selectXIRawMotion();
#endif
} else } else
#endif
{ {
// start watching for events on other windows // start watching for events on other windows
selectEvents(m_root); selectEvents(m_root);
@ -745,7 +742,7 @@ XWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask)); LOG((CLOG_WARN "failed to register hotkey %s (id=%04x mask=%04x)", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask));
return 0; return 0;
} }
LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id)); LOG((CLOG_DEBUG "registered hotkey %s (id=%04x mask=%04x) as id=%d", synergy::KeyMap::formatKey(key, mask).c_str(), key, mask, id));
return id; return id;
} }
@ -1300,7 +1297,7 @@ XWindowsScreen::handleSystemEvent(const Event& event, void*)
// handle the event ourself // handle the event ourself
switch (xevent->type) { switch (xevent->type) {
case CreateNotify: case CreateNotify:
if (m_isPrimary) { if (m_isPrimary && !m_xi2detected) {
// select events on new window // select events on new window
selectEvents(xevent->xcreatewindow.window); selectEvents(xevent->xcreatewindow.window);
} }