backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-06-16 15:17:32 +08:00
Code Issues Projects Releases Wiki Activity

Drop C prefix on Linux

Browse Source
This commit is contained in:
Xinyu Hou
2014-11-12 11:28:41 +00:00
parent 67377109f3
commit e5e0a3b653
28 changed files with 421 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,11 +74,11 @@
static int xi_opcode;
//
// CXWindowsScreen
// XWindowsScreen
//
// NOTE -- the X display is shared among several objects but is owned
// by the CXWindowsScreen. Xlib is not reentrant so we must ensure
// by the XWindowsScreen. Xlib is not reentrant so we must ensure
// that no two objects can simultaneously call Xlib with the display.
// this is easy since we only make X11 calls from the main thread.
// we must also ensure that these objects do not use the display in
@@ -88,9 +88,9 @@ static int xi_opcode;
// display and the X11 event queue buffer, ignore any calls that try
// to use the display, and wait to be destroyed.
CXWindowsScreen* CXWindowsScreen::s_screen = NULL;
XWindowsScreen* XWindowsScreen::s_screen = NULL;
CXWindowsScreen::CXWindowsScreen(
XWindowsScreen::XWindowsScreen(
const char* displayName,
bool isPrimary,
bool disableXInitThreads,
@@ -137,16 +137,16 @@ CXWindowsScreen::CXWindowsScreen(
}
// set the X I/O error handler so we catch the display disconnecting
XSetIOErrorHandler(&CXWindowsScreen::ioErrorHandler);
XSetIOErrorHandler(&XWindowsScreen::ioErrorHandler);
try {
m_display = openDisplay(displayName);
m_root = DefaultRootWindow(m_display);
saveShape();
m_window = openWindow();
m_screensaver = new CXWindowsScreenSaver(m_display,
m_screensaver = new XWindowsScreenSaver(m_display,
m_window, getEventTarget(), events);
m_keyState = new CXWindowsKeyState(m_display, m_xkb, events, m_keyMap);
m_keyState = new XWindowsKeyState(m_display, m_xkb, events, m_keyMap);
LOG((CLOG_DEBUG "screen shape: %d,%d %dx%d %s", m_x, m_y, m_w, m_h, m_xinerama ? "(xinerama)" : ""));
LOG((CLOG_DEBUG "window is 0x%08x", m_window));
}
@@ -183,20 +183,20 @@ CXWindowsScreen::CXWindowsScreen(
// initialize the clipboards
for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
m_clipboard[id] = new CXWindowsClipboard(m_display, m_window, id);
m_clipboard[id] = new XWindowsClipboard(m_display, m_window, id);
}
// install event handlers
m_events->adoptHandler(Event::kSystem, m_events->getSystemTarget(),
new TMethodEventJob<CXWindowsScreen>(this,
&CXWindowsScreen::handleSystemEvent));
new TMethodEventJob<XWindowsScreen>(this,
&XWindowsScreen::handleSystemEvent));
// install the platform event queue
m_events->adoptBuffer(new CXWindowsEventQueueBuffer(
m_events->adoptBuffer(new XWindowsEventQueueBuffer(
m_display, m_window, m_events));
}
CXWindowsScreen::~CXWindowsScreen()
XWindowsScreen::~XWindowsScreen()
{
assert(s_screen != NULL);
assert(m_display != NULL);
@@ -227,7 +227,7 @@ CXWindowsScreen::~CXWindowsScreen()
}
void
CXWindowsScreen::enable()
XWindowsScreen::enable()
{
if (!m_isPrimary) {
// get the keyboard control state
@@ -249,7 +249,7 @@ CXWindowsScreen::enable()
}
void
CXWindowsScreen::disable()
XWindowsScreen::disable()
{
// release input context focus
if (m_ic != NULL) {
@@ -267,7 +267,7 @@ CXWindowsScreen::disable()
}
void
CXWindowsScreen::enter()
XWindowsScreen::enter()
{
screensaver(false);
@@ -279,7 +279,7 @@ CXWindowsScreen::enter()
// set the input focus to what it had been when we took it
if (m_lastFocus != None) {
// the window may not exist anymore so ignore errors
CXWindowsUtil::ErrorLock lock(m_display);
XWindowsUtil::ErrorLock lock(m_display);
XSetInputFocus(m_display, m_lastFocus, m_lastFocusRevert, CurrentTime);
}
@@ -326,7 +326,7 @@ CXWindowsScreen::enter()
}
bool
CXWindowsScreen::leave()
XWindowsScreen::leave()
{
if (!m_isPrimary) {
// restore the previous keyboard auto-repeat state. if the user
@@ -383,7 +383,7 @@ CXWindowsScreen::leave()
}
bool
CXWindowsScreen::setClipboard(ClipboardID id, const IClipboard* clipboard)
XWindowsScreen::setClipboard(ClipboardID id, const IClipboard* clipboard)
{
// fail if we don't have the requested clipboard
if (m_clipboard[id] == NULL) {
@@ -391,7 +391,7 @@ CXWindowsScreen::setClipboard(ClipboardID id, const IClipboard* clipboard)
}
// get the actual time. ICCCM does not allow CurrentTime.
Time timestamp = CXWindowsUtil::getCurrentTime(
Time timestamp = XWindowsUtil::getCurrentTime(
m_display, m_clipboard[id]->getWindow());
if (clipboard != NULL) {
@@ -410,13 +410,13 @@ CXWindowsScreen::setClipboard(ClipboardID id, const IClipboard* clipboard)
}
void
CXWindowsScreen::checkClipboards()
XWindowsScreen::checkClipboards()
{
// do nothing, we're always up to date
}
void
CXWindowsScreen::openScreensaver(bool notify)
XWindowsScreen::openScreensaver(bool notify)
{
m_screensaverNotify = notify;
if (!m_screensaverNotify) {
@@ -425,7 +425,7 @@ CXWindowsScreen::openScreensaver(bool notify)
}
void
CXWindowsScreen::closeScreensaver()
XWindowsScreen::closeScreensaver()
{
if (!m_screensaverNotify) {
m_screensaver->enable();
@@ -433,7 +433,7 @@ CXWindowsScreen::closeScreensaver()
}
void
CXWindowsScreen::screensaver(bool activate)
XWindowsScreen::screensaver(bool activate)
{
if (activate) {
m_screensaver->activate();
@@ -444,14 +444,14 @@ CXWindowsScreen::screensaver(bool activate)
}
void
CXWindowsScreen::resetOptions()
XWindowsScreen::resetOptions()
{
m_xtestIsXineramaUnaware = true;
m_preserveFocus = false;
}
void
CXWindowsScreen::setOptions(const OptionsList& options)
XWindowsScreen::setOptions(const OptionsList& options)
{
for (UInt32 i = 0, n = options.size(); i < n; i += 2) {
if (options[i] == kOptionXTestXineramaUnaware) {
@@ -466,25 +466,25 @@ CXWindowsScreen::setOptions(const OptionsList& options)
}
void
CXWindowsScreen::setSequenceNumber(UInt32 seqNum)
XWindowsScreen::setSequenceNumber(UInt32 seqNum)
{
m_sequenceNumber = seqNum;
}
bool
CXWindowsScreen::isPrimary() const
XWindowsScreen::isPrimary() const
{
return m_isPrimary;
}
void*
CXWindowsScreen::getEventTarget() const
XWindowsScreen::getEventTarget() const
{
return const_cast<CXWindowsScreen*>(this);
return const_cast<XWindowsScreen*>(this);
}
bool
CXWindowsScreen::getClipboard(ClipboardID id, IClipboard* clipboard) const
XWindowsScreen::getClipboard(ClipboardID id, IClipboard* clipboard) const
{
assert(clipboard != NULL);
@@ -494,7 +494,7 @@ CXWindowsScreen::getClipboard(ClipboardID id, IClipboard* clipboard) const
}
// get the actual time. ICCCM does not allow CurrentTime.
Time timestamp = CXWindowsUtil::getCurrentTime(
Time timestamp = XWindowsUtil::getCurrentTime(
m_display, m_clipboard[id]->getWindow());
// copy the clipboard
@@ -502,7 +502,7 @@ CXWindowsScreen::getClipboard(ClipboardID id, IClipboard* clipboard) const
}
void
CXWindowsScreen::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const
XWindowsScreen::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const
{
x = m_x;
y = m_y;
@@ -511,7 +511,7 @@ CXWindowsScreen::getShape(SInt32& x, SInt32& y, SInt32& w, SInt32& h) const
}
void
CXWindowsScreen::getCursorPos(SInt32& x, SInt32& y) const
XWindowsScreen::getCursorPos(SInt32& x, SInt32& y) const
{
Window root, window;
int mx, my, xWindow, yWindow;
@@ -528,13 +528,13 @@ CXWindowsScreen::getCursorPos(SInt32& x, SInt32& y) const
}
void
CXWindowsScreen::reconfigure(UInt32)
XWindowsScreen::reconfigure(UInt32)
{
// do nothing
}
void
CXWindowsScreen::warpCursor(SInt32 x, SInt32 y)
XWindowsScreen::warpCursor(SInt32 x, SInt32 y)
{
// warp mouse
warpCursorNoFlush(x, y);
@@ -555,7 +555,7 @@ CXWindowsScreen::warpCursor(SInt32 x, SInt32 y)
}
UInt32
CXWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
XWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
{
// only allow certain modifiers
if ((mask & ~(KeyModifierShift | KeyModifierControl |
@@ -576,7 +576,7 @@ CXWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
LOG((CLOG_DEBUG "could not map hotkey id=%04x mask=%04x", key, mask));
return 0;
}
CXWindowsKeyState::KeycodeList keycodes;
XWindowsKeyState::KeycodeList keycodes;
m_keyState->mapKeyToKeycodes(key, keycodes);
if (key != kKeyNone && keycodes.empty()) {
// can't map key
@@ -600,7 +600,7 @@ CXWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
// requested modifiers.
bool err = false;
{
CXWindowsUtil::ErrorLock lock(m_display, &err);
XWindowsUtil::ErrorLock lock(m_display, &err);
if (key == kKeyNone) {
static const KeyModifierMask s_hotKeyModifiers[] = {
KeyModifierShift,
@@ -704,7 +704,7 @@ CXWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
}
for (CXWindowsKeyState::KeycodeList::iterator j = keycodes.begin();
for (XWindowsKeyState::KeycodeList::iterator j = keycodes.begin();
j != keycodes.end() && !err; ++j) {
for (size_t i = 0; i < (1u << numToggleModifiers); ++i) {
// add toggle modifiers for index i
@@ -750,7 +750,7 @@ CXWindowsScreen::registerHotKey(KeyID key, KeyModifierMask mask)
}
void
CXWindowsScreen::unregisterHotKey(UInt32 id)
XWindowsScreen::unregisterHotKey(UInt32 id)
{
// look up hotkey
HotKeyMap::iterator i = m_hotKeys.find(id);
@@ -761,7 +761,7 @@ CXWindowsScreen::unregisterHotKey(UInt32 id)
// unregister with OS
bool err = false;
{
CXWindowsUtil::ErrorLock lock(m_display, &err);
XWindowsUtil::ErrorLock lock(m_display, &err);
HotKeyList& hotKeys = i->second;
for (HotKeyList::iterator j = hotKeys.begin();
j != hotKeys.end(); ++j) {
@@ -782,25 +782,25 @@ CXWindowsScreen::unregisterHotKey(UInt32 id)
}
void
CXWindowsScreen::fakeInputBegin()
XWindowsScreen::fakeInputBegin()
{
// FIXME -- not implemented
}
void
CXWindowsScreen::fakeInputEnd()
XWindowsScreen::fakeInputEnd()
{
// FIXME -- not implemented
}
SInt32
CXWindowsScreen::getJumpZoneSize() const
XWindowsScreen::getJumpZoneSize() const
{
return 1;
}
bool
CXWindowsScreen::isAnyMouseButtonDown(UInt32& buttonID) const
XWindowsScreen::isAnyMouseButtonDown(UInt32& buttonID) const
{
// query the pointer to get the button state
Window root, window;
@@ -816,14 +816,14 @@ CXWindowsScreen::isAnyMouseButtonDown(UInt32& buttonID) const
}
void
CXWindowsScreen::getCursorCenter(SInt32& x, SInt32& y) const
XWindowsScreen::getCursorCenter(SInt32& x, SInt32& y) const
{
x = m_xCenter;
y = m_yCenter;
}
void
CXWindowsScreen::fakeMouseButton(ButtonID button, bool press)
XWindowsScreen::fakeMouseButton(ButtonID button, bool press)
{
const unsigned int xButton = mapButtonToX(button);
if (xButton != 0) {
@@ -834,7 +834,7 @@ CXWindowsScreen::fakeMouseButton(ButtonID button, bool press)
}
void
CXWindowsScreen::fakeMouseMove(SInt32 x, SInt32 y)
XWindowsScreen::fakeMouseMove(SInt32 x, SInt32 y)
{
if (m_xinerama && m_xtestIsXineramaUnaware) {
XWarpPointer(m_display, None, m_root, 0, 0, 0, 0, x, y);
@@ -847,7 +847,7 @@ CXWindowsScreen::fakeMouseMove(SInt32 x, SInt32 y)
}
void
CXWindowsScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const
XWindowsScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const
{
// FIXME -- ignore xinerama for now
if (false && m_xinerama && m_xtestIsXineramaUnaware) {
@@ -860,7 +860,7 @@ CXWindowsScreen::fakeMouseRelativeMove(SInt32 dx, SInt32 dy) const
}
void
CXWindowsScreen::fakeMouseWheel(SInt32, SInt32 yDelta) const
XWindowsScreen::fakeMouseWheel(SInt32, SInt32 yDelta) const
{
// XXX -- support x-axis scrolling
if (yDelta == 0) {
@@ -906,7 +906,7 @@ CXWindowsScreen::fakeMouseWheel(SInt32, SInt32 yDelta) const
}
Display*
CXWindowsScreen::openDisplay(const char* displayName)
XWindowsScreen::openDisplay(const char* displayName)
{
// get the DISPLAY
if (displayName == NULL) {
@@ -967,7 +967,7 @@ CXWindowsScreen::openDisplay(const char* displayName)
}
void
CXWindowsScreen::saveShape()
XWindowsScreen::saveShape()
{
// get shape of default screen
m_x = 0;
@@ -1030,7 +1030,7 @@ CXWindowsScreen::saveShape()
}
Window
CXWindowsScreen::openWindow() const
XWindowsScreen::openWindow() const
{
// default window attributes. we don't want the window manager
// messing with our window and we don't want the cursor to be
@@ -1082,7 +1082,7 @@ CXWindowsScreen::openWindow() const
}
void
CXWindowsScreen::openIM()
XWindowsScreen::openIM()
{
// open the input methods
XIM im = XOpenIM(m_display, NULL, NULL, NULL);
@@ -1145,13 +1145,13 @@ CXWindowsScreen::openIM()
}
void
CXWindowsScreen::sendEvent(Event::Type type, void* data)
XWindowsScreen::sendEvent(Event::Type type, void* data)
{
m_events->addEvent(Event(type, getEventTarget(), data));
}
void
CXWindowsScreen::sendClipboardEvent(Event::Type type, ClipboardID id)
XWindowsScreen::sendClipboardEvent(Event::Type type, ClipboardID id)
{
ClipboardInfo* info = (ClipboardInfo*)malloc(sizeof(ClipboardInfo));
info->m_id = id;
@@ -1160,13 +1160,13 @@ CXWindowsScreen::sendClipboardEvent(Event::Type type, ClipboardID id)
}
IKeyState*
CXWindowsScreen::getKeyState() const
XWindowsScreen::getKeyState() const
{
return m_keyState;
}
Bool
CXWindowsScreen::findKeyEvent(Display*, XEvent* xevent, XPointer arg)
XWindowsScreen::findKeyEvent(Display*, XEvent* xevent, XPointer arg)
{
KeyEventFilter* filter = reinterpret_cast<KeyEventFilter*>(arg);
return (xevent->type == filter->m_event &&
@@ -1176,7 +1176,7 @@ CXWindowsScreen::findKeyEvent(Display*, XEvent* xevent, XPointer arg)
}
void
CXWindowsScreen::handleSystemEvent(const Event& event, void*)
XWindowsScreen::handleSystemEvent(const Event& event, void*)
{
XEvent* xevent = reinterpret_cast<XEvent*>(event.getData());
assert(xevent != NULL);
@@ -1196,7 +1196,7 @@ CXWindowsScreen::handleSystemEvent(const Event& event, void*)
filter.m_keycode = xevent->xkey.keycode;
XEvent xevent2;
isRepeat = (XCheckIfEvent(m_display, &xevent2,
&CXWindowsScreen::findKeyEvent,
&XWindowsScreen::findKeyEvent,
(XPointer)&filter) == True);
}
@@ -1451,7 +1451,7 @@ CXWindowsScreen::handleSystemEvent(const Event& event, void*)
}
void
CXWindowsScreen::onKeyPress(XKeyEvent& xkey)
XWindowsScreen::onKeyPress(XKeyEvent& xkey)
{
LOG((CLOG_DEBUG1 "event: KeyPress code=%d, state=0x%04x", xkey.keycode, xkey.state));
const KeyModifierMask mask = m_keyState->mapModifiersFromX(xkey.state);
@@ -1492,7 +1492,7 @@ CXWindowsScreen::onKeyPress(XKeyEvent& xkey)
}
void
CXWindowsScreen::onKeyRelease(XKeyEvent& xkey, bool isRepeat)
XWindowsScreen::onKeyRelease(XKeyEvent& xkey, bool isRepeat)
{
const KeyModifierMask mask = m_keyState->mapModifiersFromX(xkey.state);
KeyID key = mapKeyFromX(&xkey);
@@ -1527,7 +1527,7 @@ CXWindowsScreen::onKeyRelease(XKeyEvent& xkey, bool isRepeat)
}
bool
CXWindowsScreen::onHotKey(XKeyEvent& xkey, bool isRepeat)
XWindowsScreen::onHotKey(XKeyEvent& xkey, bool isRepeat)
{
// find the hot key id
HotKeyToIDMap::const_iterator i =
@@ -1557,7 +1557,7 @@ CXWindowsScreen::onHotKey(XKeyEvent& xkey, bool isRepeat)
}
void
CXWindowsScreen::onMousePress(const XButtonEvent& xbutton)
XWindowsScreen::onMousePress(const XButtonEvent& xbutton)
{
LOG((CLOG_DEBUG1 "event: ButtonPress button=%d", xbutton.button));
ButtonID button = mapButtonFromX(&xbutton);
@@ -1568,7 +1568,7 @@ CXWindowsScreen::onMousePress(const XButtonEvent& xbutton)
}
void
CXWindowsScreen::onMouseRelease(const XButtonEvent& xbutton)
XWindowsScreen::onMouseRelease(const XButtonEvent& xbutton)
{
LOG((CLOG_DEBUG1 "event: ButtonRelease button=%d", xbutton.button));
ButtonID button = mapButtonFromX(&xbutton);
@@ -1588,7 +1588,7 @@ CXWindowsScreen::onMouseRelease(const XButtonEvent& xbutton)
}
void
CXWindowsScreen::onMouseMove(const XMotionEvent& xmotion)
XWindowsScreen::onMouseMove(const XMotionEvent& xmotion)
{
LOG((CLOG_DEBUG2 "event: MotionNotify %d,%d", xmotion.x_root, xmotion.y_root));
@@ -1657,7 +1657,7 @@ CXWindowsScreen::onMouseMove(const XMotionEvent& xmotion)
}
Cursor
CXWindowsScreen::createBlankCursor() const
XWindowsScreen::createBlankCursor() const
{
// this seems just a bit more complicated than really necessary
@@ -1693,7 +1693,7 @@ CXWindowsScreen::createBlankCursor() const
}
ClipboardID
CXWindowsScreen::getClipboardID(Atom selection) const
XWindowsScreen::getClipboardID(Atom selection) const
{
for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
if (m_clipboard[id] != NULL &&
@@ -1705,7 +1705,7 @@ CXWindowsScreen::getClipboardID(Atom selection) const
}
void
CXWindowsScreen::processClipboardRequest(Window requestor,
XWindowsScreen::processClipboardRequest(Window requestor,
Time time, Atom property)
{
// check every clipboard until one returns success
@@ -1718,7 +1718,7 @@ CXWindowsScreen::processClipboardRequest(Window requestor,
}
void
CXWindowsScreen::destroyClipboardRequest(Window requestor)
XWindowsScreen::destroyClipboardRequest(Window requestor)
{
// check every clipboard until one returns success
for (ClipboardID id = 0; id < kClipboardEnd; ++id) {
@@ -1730,7 +1730,7 @@ CXWindowsScreen::destroyClipboardRequest(Window requestor)
}
void
CXWindowsScreen::onError()
XWindowsScreen::onError()
{
// prevent further access to the X display
m_events->adoptBuffer(NULL);
@@ -1752,7 +1752,7 @@ CXWindowsScreen::onError()
}
int
CXWindowsScreen::ioErrorHandler(Display*)
XWindowsScreen::ioErrorHandler(Display*)
{
// the display has disconnected, probably because X is shutting
// down. X forces us to exit at this point which is annoying.
@@ -1764,19 +1764,19 @@ CXWindowsScreen::ioErrorHandler(Display*)
}
void
CXWindowsScreen::selectEvents(Window w) const
XWindowsScreen::selectEvents(Window w) const
{
// ignore errors while we adjust event masks. windows could be
// destroyed at any time after the XQueryTree() in doSelectEvents()
// so we must ignore BadWindow errors.
CXWindowsUtil::ErrorLock lock(m_display);
XWindowsUtil::ErrorLock lock(m_display);
// adjust event masks
doSelectEvents(w);
}
void
CXWindowsScreen::doSelectEvents(Window w) const
XWindowsScreen::doSelectEvents(Window w) const
{
// we want to track the mouse everywhere on the display. to achieve
// that we select PointerMotionMask on every window. we also select
@@ -1821,7 +1821,7 @@ CXWindowsScreen::doSelectEvents(Window w) const
}
KeyID
CXWindowsScreen::mapKeyFromX(XKeyEvent* event) const
XWindowsScreen::mapKeyFromX(XKeyEvent* event) const
{
// convert to a keysym
KeySym keysym;
@@ -1861,11 +1861,11 @@ CXWindowsScreen::mapKeyFromX(XKeyEvent* event) const
}
// convert key
return CXWindowsUtil::mapKeySymToKeyID(keysym);
return XWindowsUtil::mapKeySymToKeyID(keysym);
}
ButtonID
CXWindowsScreen::mapButtonFromX(const XButtonEvent* event) const
XWindowsScreen::mapButtonFromX(const XButtonEvent* event) const
{
unsigned int button = event->button;
@@ -1887,7 +1887,7 @@ CXWindowsScreen::mapButtonFromX(const XButtonEvent* event) const
}
unsigned int
CXWindowsScreen::mapButtonToX(ButtonID id) const
XWindowsScreen::mapButtonToX(ButtonID id) const
{
// map button -1 to button 4 (+wheel)
if (id == static_cast<ButtonID>(-1)) {
@@ -1916,7 +1916,7 @@ CXWindowsScreen::mapButtonToX(ButtonID id) const
}
void
CXWindowsScreen::warpCursorNoFlush(SInt32 x, SInt32 y)
XWindowsScreen::warpCursorNoFlush(SInt32 x, SInt32 y)
{
assert(m_window != None);
@@ -1949,7 +1949,7 @@ CXWindowsScreen::warpCursorNoFlush(SInt32 x, SInt32 y)
}
void
CXWindowsScreen::updateButtons()
XWindowsScreen::updateButtons()
{
// query the button mapping
UInt32 numButtons = XGetPointerMapping(m_display, NULL, 0);
@@ -1981,7 +1981,7 @@ CXWindowsScreen::updateButtons()
}
bool
CXWindowsScreen::grabMouseAndKeyboard()
XWindowsScreen::grabMouseAndKeyboard()
{
unsigned int event_mask = ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask;
@@ -2030,7 +2030,7 @@ CXWindowsScreen::grabMouseAndKeyboard()
}
void
CXWindowsScreen::refreshKeyboard(XEvent* event)
XWindowsScreen::refreshKeyboard(XEvent* event)
{
if (XPending(m_display) > 0) {
XEvent tmpEvent;
@@ -2059,10 +2059,10 @@ CXWindowsScreen::refreshKeyboard(XEvent* event)
//
// CXWindowsScreen::HotKeyItem
// XWindowsScreen::HotKeyItem
//
CXWindowsScreen::HotKeyItem::HotKeyItem(int keycode, unsigned int mask) :
XWindowsScreen::HotKeyItem::HotKeyItem(int keycode, unsigned int mask) :
m_keycode(keycode),
m_mask(mask)
{
@@ -2070,14 +2070,14 @@ CXWindowsScreen::HotKeyItem::HotKeyItem(int keycode, unsigned int mask) :
}
bool
CXWindowsScreen::HotKeyItem::operator<(const HotKeyItem& x) const
XWindowsScreen::HotKeyItem::operator<(const HotKeyItem& x) const
{
return (m_keycode < x.m_keycode ||
(m_keycode == x.m_keycode && m_mask < x.m_mask));
}
bool
CXWindowsScreen::detectXI2()
XWindowsScreen::detectXI2()
{
int event, error;
return XQueryExtension(m_display,
@@ -2086,7 +2086,7 @@ CXWindowsScreen::detectXI2()
#ifdef HAVE_XI2
void
CXWindowsScreen::selectXIRawMotion()
XWindowsScreen::selectXIRawMotion()
{
XIEventMask mask;