diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-01-13 08:48:03 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-01-13 08:48:03 +0000 |
| commit | c97915f445017d36667a6ad32767fa41d14d23b1 (patch) | |
| tree | 66ea465799a6b00ef1361a44774d4610ca6ca814 /otk/eventdispatcher.cc | |
| parent | 9e77a88d269bfafb78e56a646bfacebdd6ff4c5a (diff) | |
un-static otk::Display. add an operator* to it. make a global ob::display var.
Diffstat (limited to 'otk/eventdispatcher.cc')
| -rw-r--r-- | otk/eventdispatcher.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/otk/eventdispatcher.cc b/otk/eventdispatcher.cc index ff3b8b64..c5cefe2c 100644 --- a/otk/eventdispatcher.cc +++ b/otk/eventdispatcher.cc @@ -38,8 +38,8 @@ void EventDispatcher::dispatchEvents(void) { XEvent e; - while (XPending(Display::display)) { - XNextEvent(Display::display, &e); + while (XPending(**display)) { + XNextEvent(**display, &e); #if 0//defined(DEBUG) printf("Event %d window %lx\n", e.type, e.xany.window); @@ -71,17 +71,17 @@ void EventDispatcher::dispatchEvents(void) case ButtonPress: case ButtonRelease: _lasttime = e.xbutton.time; - e.xbutton.state &= ~(LockMask | Display::numLockMask() | - Display::scrollLockMask()); + e.xbutton.state &= ~(LockMask | display->numLockMask() | + display->scrollLockMask()); break; case KeyPress: - e.xkey.state &= ~(LockMask | Display::numLockMask() | - Display::scrollLockMask()); + e.xkey.state &= ~(LockMask | display->numLockMask() | + display->scrollLockMask()); break; case MotionNotify: _lasttime = e.xmotion.time; - e.xmotion.state &= ~(LockMask | Display::numLockMask() | - Display::scrollLockMask()); + e.xmotion.state &= ~(LockMask | display->numLockMask() | + display->scrollLockMask()); break; case PropertyNotify: _lasttime = e.xproperty.time; @@ -116,7 +116,7 @@ void EventDispatcher::dispatchFocus(const XEvent &e) // FocusOut events just make us look for FocusIn events. They are ignored // otherwise. XEvent fi; - if (XCheckTypedEvent(Display::display, FocusIn, &fi)) { + if (XCheckTypedEvent(**display, FocusIn, &fi)) { //printf("Found FocusIn\n"); dispatchFocus(fi); // dont unfocus the window we just focused! @@ -157,7 +157,7 @@ void EventDispatcher::dispatch(Window win, const XEvent &e) xwc.sibling = e.xconfigurerequest.above; xwc.stack_mode = e.xconfigurerequest.detail; - XConfigureWindow(otk::Display::display, e.xconfigurerequest.window, + XConfigureWindow(**display, e.xconfigurerequest.window, e.xconfigurerequest.value_mask, &xwc); } else { // grab a falback if it exists |