aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 3964c9a..1c5f7d4 100644
--- a/src/Screen.cc
+++ b/src/Screen.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: Screen.cc,v 1.153 2003/05/11 11:47:19 rathnor Exp $ 25// $Id: Screen.cc,v 1.154 2003/05/11 13:36:10 fluxgen Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -981,7 +981,7 @@ void BScreen::removeClient(WinClient &client) {
981 if (client.transientFor() && client.transientFor()->fbwindow()) 981 if (client.transientFor() && client.transientFor()->fbwindow())
982 client.transientFor()->fbwindow()->setInputFocus(); 982 client.transientFor()->fbwindow()->setInputFocus();
983 else 983 else
984 Fluxbox::instance()->revertFocus(&focused->getScreen()); 984 Fluxbox::instance()->revertFocus(&focused->screen());
985 } 985 }
986} 986}
987 987
@@ -1112,7 +1112,7 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
1112 if (id != current_workspace->workspaceID()) { 1112 if (id != current_workspace->workspaceID()) {
1113 XSync(FbTk::App::instance()->display(), True); 1113 XSync(FbTk::App::instance()->display(), True);
1114 1114
1115 if (win && &win->getScreen() == this && 1115 if (win && &win->screen() == this &&
1116 (! win->isStuck())) { 1116 (! win->isStuck())) {
1117 1117
1118 if (win->isIconic()) { 1118 if (win->isIconic()) {
@@ -1478,7 +1478,7 @@ void BScreen::nextFocus(int opts) {
1478 const int num_windows = getCurrentWorkspace()->getCount(); 1478 const int num_windows = getCurrentWorkspace()->getCount();
1479 1479
1480 if (focused != 0) { 1480 if (focused != 0) {
1481 if (focused->getScreen().getScreenNumber() == 1481 if (focused->screen().getScreenNumber() ==
1482 getScreenNumber()) { 1482 getScreenNumber()) {
1483 have_focused = true; 1483 have_focused = true;
1484 focused_window_number = focused->getWindowNumber(); 1484 focused_window_number = focused->getWindowNumber();
@@ -1568,7 +1568,7 @@ void BScreen::prevFocus(int opts) {
1568 int num_windows = getCurrentWorkspace()->getCount(); 1568 int num_windows = getCurrentWorkspace()->getCount();
1569 1569
1570 if ((focused = Fluxbox::instance()->getFocusedWindow())) { 1570 if ((focused = Fluxbox::instance()->getFocusedWindow())) {
1571 if (focused->getScreen().getScreenNumber() == 1571 if (focused->screen().getScreenNumber() ==
1572 getScreenNumber()) { 1572 getScreenNumber()) {
1573 have_focused = true; 1573 have_focused = true;
1574 focused_window_number = focused->getWindowNumber(); 1574 focused_window_number = focused->getWindowNumber();
@@ -1660,7 +1660,7 @@ void BScreen::raiseFocus() {
1660 Fluxbox * const fb = Fluxbox::instance(); 1660 Fluxbox * const fb = Fluxbox::instance();
1661 1661
1662 if (fb->getFocusedWindow()) 1662 if (fb->getFocusedWindow())
1663 if (fb->getFocusedWindow()->getScreen().getScreenNumber() == 1663 if (fb->getFocusedWindow()->screen().getScreenNumber() ==
1664 getScreenNumber()) { 1664 getScreenNumber()) {
1665 have_focused = true; 1665 have_focused = true;
1666 focused_window_number = fb->getFocusedWindow()->getWindowNumber(); 1666 focused_window_number = fb->getFocusedWindow()->getWindowNumber();
@@ -1689,9 +1689,9 @@ void BScreen::dirFocus(FluxboxWindow &win, FocusDir dir) {
1689 int weight = 999999, exposure = 0; // extreme values 1689 int weight = 999999, exposure = 0; // extreme values
1690 int borderW = m_root_theme->borderWidth(), 1690 int borderW = m_root_theme->borderWidth(),
1691 top = win.getYFrame(), 1691 top = win.getYFrame(),
1692 bottom = win.getYFrame() + win.getHeight() + 2*borderW, 1692 bottom = win.getYFrame() + win.height() + 2*borderW,
1693 left = win.getXFrame(), 1693 left = win.getXFrame(),
1694 right = win.getXFrame() + win.getWidth() + 2*borderW; 1694 right = win.getXFrame() + win.width() + 2*borderW;
1695 1695
1696 Workspace::Windows &wins = getCurrentWorkspace()->getWindowList(); 1696 Workspace::Windows &wins = getCurrentWorkspace()->getWindowList();
1697 Workspace::Windows::iterator it = wins.begin(); 1697 Workspace::Windows::iterator it = wins.begin();
@@ -1702,9 +1702,9 @@ void BScreen::dirFocus(FluxboxWindow &win, FocusDir dir) {
1702 int edge=0, upper=0, lower=0, oedge=0, oupper=0, olower=0; 1702 int edge=0, upper=0, lower=0, oedge=0, oupper=0, olower=0;
1703 1703
1704 int otop = (*it)->getYFrame(), 1704 int otop = (*it)->getYFrame(),
1705 obottom = (*it)->getYFrame() + (*it)->getHeight() + 2*borderW, 1705 obottom = (*it)->getYFrame() + (*it)->height() + 2*borderW,
1706 oleft = (*it)->getXFrame(), 1706 oleft = (*it)->getXFrame(),
1707 oright = (*it)->getXFrame() + (*it)->getWidth() + 2*borderW; 1707 oright = (*it)->getXFrame() + (*it)->width() + 2*borderW;
1708 // check if they intersect 1708 // check if they intersect
1709 switch (dir) { 1709 switch (dir) {
1710 case FOCUSUP: 1710 case FOCUSUP: