summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Workspace.cc4
-rw-r--r--src/fluxbox.cc10
2 files changed, 7 insertions, 7 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index f7bcb83..e0d23b6 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Workspace.cc,v 1.59 2003/05/07 16:21:26 rathnor Exp $ 25// $Id: Workspace.cc,v 1.60 2003/05/10 23:07:04 fluxgen Exp $
26 26
27#include "Workspace.hh" 27#include "Workspace.hh"
28 28
@@ -514,7 +514,7 @@ void Workspace::placeWindow(FluxboxWindow &win) {
514 Window ignore_w; 514 Window ignore_w;
515 515
516 XQueryPointer(FbTk::App::instance()->display(), 516 XQueryPointer(FbTk::App::instance()->display(),
517 screen.getRootWindow(), &ignore_w, 517 screen.rootWindow().window(), &ignore_w,
518 &ignore_w, &root_x, &root_y, 518 &ignore_w, &root_x, &root_y,
519 &ignore_i, &ignore_i, &ignore_ui); 519 &ignore_i, &ignore_i, &ignore_ui);
520 520
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 98ecbbe..482df5c 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.133 2003/05/10 15:22:28 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.134 2003/05/10 23:07:42 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -1631,7 +1631,7 @@ BScreen *Fluxbox::searchScreen(Window window) {
1631 1631
1632 for (; it != it_end; ++it) { 1632 for (; it != it_end; ++it) {
1633 if (*it) { 1633 if (*it) {
1634 if ((*it)->getRootWindow() == window) { 1634 if ((*it)->rootWindow() == window) {
1635 screen = (*it); 1635 screen = (*it);
1636 return screen; 1636 return screen;
1637 } 1637 }
@@ -2375,7 +2375,7 @@ void Fluxbox::revertFocus(BScreen *screen) {
2375 int ignored; 2375 int ignored;
2376 BScreen *tempscr = m_screen_list.front(); 2376 BScreen *tempscr = m_screen_list.front();
2377 XQueryPointer(FbTk::App::instance()->display(), 2377 XQueryPointer(FbTk::App::instance()->display(),
2378 tempscr->getRootWindow(), &root, &ignorew, &ignored, 2378 tempscr->rootWindow().window(), &root, &ignorew, &ignored,
2379 &ignored, &ignored, &ignored, (unsigned int *)&ignored); 2379 &ignored, &ignored, &ignored, (unsigned int *)&ignored);
2380 screen = searchScreen(root); 2380 screen = searchScreen(root);
2381 if (screen == 0) { 2381 if (screen == 0) {
@@ -2402,7 +2402,7 @@ void Fluxbox::revertFocus(BScreen *screen) {
2402 break; 2402 break;
2403 case CLICKTOFOCUS: 2403 case CLICKTOFOCUS:
2404 XSetInputFocus(FbTk::App::instance()->display(), 2404 XSetInputFocus(FbTk::App::instance()->display(),
2405 screen->getRootWindow(), 2405 screen->rootWindow().window(),
2406 RevertToPointerRoot, CurrentTime); 2406 RevertToPointerRoot, CurrentTime);
2407 break; 2407 break;
2408 } 2408 }
@@ -2419,6 +2419,6 @@ void Fluxbox::watchKeyRelease(BScreen &screen, unsigned int mods) {
2419 m_watching_screen = &screen; 2419 m_watching_screen = &screen;
2420 m_watch_keyrelease = mods; 2420 m_watch_keyrelease = mods;
2421 XGrabKeyboard(FbTk::App::instance()->display(), 2421 XGrabKeyboard(FbTk::App::instance()->display(),
2422 screen.getRootWindow(), True, 2422 screen.rootWindow().window(), True,
2423 GrabModeAsync, GrabModeAsync, CurrentTime); 2423 GrabModeAsync, GrabModeAsync, CurrentTime);
2424} 2424}