diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-03 23:58:37 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-03 23:58:37 +0000 |
| commit | e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c (patch) | |
| tree | a022bd82c4c7b10cd396a463dd491d2897f70abe /kwin/workspace.cpp | |
| parent | c3e2931a5bb4c067b0983cf23d064264d1d6b175 (diff) | |
| download | tdebase-e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c.tar.gz tdebase-e057cf9e08ab13e3f6ed139f6b0be3a06c2ec20c.zip | |
Wean kdebase off of hacky static qt_x_*_tim variables
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1227011 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kwin/workspace.cpp')
| -rw-r--r-- | kwin/workspace.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index ac4fcdc3f..48c8494bd 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -45,8 +45,6 @@ License. See the file "COPYING" for the exact licensing terms. #include <X11/keysymdef.h> #include <X11/cursorfont.h> -extern Time qt_x_time; - namespace KWinInternal { @@ -153,8 +151,8 @@ Workspace::Workspace( bool restore ) delayFocusTimer = 0; - electric_time_first = qt_x_time; - electric_time_last = qt_x_time; + electric_time_first = GET_QT_X_TIME(); + electric_time_last = GET_QT_X_TIME(); if ( restore ) loadSessionInfo(); @@ -1855,7 +1853,7 @@ void Workspace::slotMouseEmulation() if ( mouse_emulation ) { - XUngrabKeyboard(qt_xdisplay(), qt_x_time); + XUngrabKeyboard(qt_xdisplay(), GET_QT_X_TIME()); mouse_emulation = FALSE; return; } @@ -1863,7 +1861,7 @@ void Workspace::slotMouseEmulation() if ( XGrabKeyboard(qt_xdisplay(), root, FALSE, GrabModeAsync, GrabModeAsync, - qt_x_time) == GrabSuccess ) + GET_QT_X_TIME()) == GrabSuccess ) { mouse_emulation = TRUE; mouse_emulation_state = 0; @@ -1919,7 +1917,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation e.xmotion.window = w; e.xmotion.root = qt_xrootwin(); e.xmotion.subwindow = w; - e.xmotion.time = qt_x_time; + e.xmotion.time = GET_QT_X_TIME(); e.xmotion.x = x; e.xmotion.y = y; e.xmotion.x_root = pos.x(); @@ -1935,7 +1933,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation e.xbutton.window = w; e.xbutton.root = qt_xrootwin(); e.xbutton.subwindow = w; - e.xbutton.time = qt_x_time; + e.xbutton.time = GET_QT_X_TIME(); e.xbutton.x = x; e.xbutton.y = y; e.xbutton.x_root = pos.x(); @@ -2061,7 +2059,7 @@ bool Workspace::keyPressMouseEmulation( XKeyEvent& ev ) } // fall through case XK_Escape: - XUngrabKeyboard(qt_xdisplay(), qt_x_time); + XUngrabKeyboard(qt_xdisplay(), GET_QT_X_TIME()); mouse_emulation = FALSE; return TRUE; default: @@ -2356,7 +2354,7 @@ bool Workspace::electricBorder(XEvent *e) || e->xclient.window == electric_right_border )) { updateXTime(); - clientMoved( TQPoint( e->xclient.data.l[2]>>16, e->xclient.data.l[2]&0xffff), qt_x_time ); + clientMoved( TQPoint( e->xclient.data.l[2]>>16, e->xclient.data.l[2]&0xffff), GET_QT_X_TIME() ); return true; } } @@ -2492,7 +2490,7 @@ bool Workspace::checkStartupNotification( Window w, KStartupInfoId& id, KStartup */ void Workspace::focusToNull() { - XSetInputFocus(qt_xdisplay(), null_focus_window, RevertToPointerRoot, qt_x_time ); + XSetInputFocus(qt_xdisplay(), null_focus_window, RevertToPointerRoot, GET_QT_X_TIME() ); } void Workspace::helperDialog( const TQString& message, const Client* c ) |