backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-05-05 21:02:39 +08:00
Code Issues Projects Releases Wiki Activity

removed getEventMask() from primary screen. added a class to

Browse Source 
CXWindowsUtil that installs/uninstalls an X error hander.
using that in primary screen, clipboard, and util to ensure
that certain errors don't kill the app.
This commit is contained in:
crs
2002-05-27 18:30:13 +00:00
parent 7cf20d9ad0
commit 189537b8b9
6 changed files with 133 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/CXWindowsPrimaryScreen.cpp
View File

@@ -440,6 +440,7 @@ void CXWindowsPrimaryScreen::onOpenDisplay()
CWDontPropagate | CWEventMask |
CWOverrideRedirect | CWCursor,
&attr);
log((CLOG_DEBUG "window is 0x%08x", m_window));
// start watching for events on other windows
selectEvents(display, getRoot());
@@ -469,18 +470,17 @@ void CXWindowsPrimaryScreen::onLostClipboard(
m_server->grabClipboard(id);
}
long CXWindowsPrimaryScreen::getEventMask(Window w) const
void CXWindowsPrimaryScreen::selectEvents(
Display* display, Window w) const
{
if (w == m_window)
return PointerMotionMask |// PointerMotionHintMask |
ButtonPressMask | ButtonReleaseMask |
KeyPressMask | KeyReleaseMask |
KeymapStateMask;
else
return PointerMotionMask | SubstructureNotifyMask;
// ignore errors while we adjust event masks
CXWindowsUtil::CErrorLock lock;
// adjust event masks
doSelectEvents(display, w);
}
void CXWindowsPrimaryScreen::selectEvents(
void CXWindowsPrimaryScreen::doSelectEvents(
Display* display, Window w) const
{
// we want to track the mouse everywhere on the display. to achieve
@@ -500,7 +500,7 @@ void CXWindowsPrimaryScreen::selectEvents(
unsigned int nc;
if (XQueryTree(display, w, &rw, &pw, &cw, &nc)) {
for (unsigned int i = 0; i < nc; ++i)
selectEvents(display, cw[i]);
doSelectEvents(display, cw[i]);
XFree(cw);
}
}

2
server/CXWindowsPrimaryScreen.h
View File

@@ -34,10 +34,10 @@ protected:
createClipboard(ClipboardID);
virtual void onCloseDisplay();
virtual void onLostClipboard(ClipboardID);
virtual long getEventMask(Window) const;
private:
void selectEvents(Display*, Window) const;
void doSelectEvents(Display*, Window) const;
void warpCursorNoLock(Display*,
SInt32 xAbsolute, SInt32 yAbsolute);