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

Experiment catching client-side native clicks

This commit is contained in:
Andrew Nelless 2017-05-16 14:15:58 +01:00
parent 9551329392
commit 0ac42d4d05
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,8 +216,7 @@ XWindowsScreen::~XWindowsScreen()
if (m_im != NULL) { if (m_im != NULL) {
XCloseIM(m_im); XCloseIM(m_im);
} }
XDestroyWindow(m_display, m_window); XDestroyWindow(m_display, m_window); XCloseDisplay(m_display);
XCloseDisplay(m_display);
} }
XSetIOErrorHandler(NULL); XSetIOErrorHandler(NULL);
@ -344,7 +343,7 @@ XWindowsScreen::leave()
XMapRaised(m_display, m_window); XMapRaised(m_display, m_window);
// grab the mouse and keyboard, if primary and possible // grab the mouse and keyboard, if primary and possible
if (m_isPrimary && !grabMouseAndKeyboard()) { if (!grabMouseAndKeyboard()) {
XUnmapWindow(m_display, m_window); XUnmapWindow(m_display, m_window);
return false; return false;
} }
@ -353,7 +352,7 @@ XWindowsScreen::leave()
XGetInputFocus(m_display, &m_lastFocus, &m_lastFocusRevert); XGetInputFocus(m_display, &m_lastFocus, &m_lastFocusRevert);
// take focus // take focus
if (m_isPrimary || !m_preserveFocus) { if (!m_preserveFocus) {
XSetInputFocus(m_display, m_window, RevertToPointerRoot, CurrentTime); XSetInputFocus(m_display, m_window, RevertToPointerRoot, CurrentTime);
} }
@ -1044,7 +1043,7 @@ XWindowsScreen::openWindow() const
// moved. we'll reposition the window as necessary so its // moved. we'll reposition the window as necessary so its
// position here doesn't matter. it only needs to be 1x1 because // position here doesn't matter. it only needs to be 1x1 because
// it only needs to contain the cursor's hotspot. // it only needs to contain the cursor's hotspot.
attr.event_mask = LeaveWindowMask; attr.event_mask = LeaveWindowMask | ButtonPressMask;
x = 0; x = 0;
y = 0; y = 0;
w = 1; w = 1;
@ -1369,6 +1368,7 @@ XWindowsScreen::handleSystemEvent(const Event& event, void*)
return; return;
case ButtonPress: case ButtonPress:
LOG ((CLOG_DEBUG "Yay, you clicked something!"));
if (m_isPrimary) { if (m_isPrimary) {
onMousePress(xevent->xbutton); onMousePress(xevent->xbutton);
} }