aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-11 13:36:12 (GMT)
committerfluxgen <fluxgen>2003-05-11 13:36:12 (GMT)
commitaa72e23c8e1f6decf0bb78f8bd909e3e67b3a9da (patch)
tree9e8f1c81637c6e000127ed32f794e166eb4ac6a3 /src/fluxbox.cc
parent816190411a9e5bd6cdfaa9d579f84be348a2f1bc (diff)
downloadfluxbox-aa72e23c8e1f6decf0bb78f8bd909e3e67b3a9da.zip
fluxbox-aa72e23c8e1f6decf0bb78f8bd909e3e67b3a9da.tar.bz2
minor cleaning
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 482df5c..64be2e8 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.134 2003/05/10 23:07:42 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.135 2003/05/11 13:36:12 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -964,7 +964,7 @@ void Fluxbox::handleUnmapNotify(XUnmapEvent &ue) {
964 client = 0; // it's invalid now when win destroyed the client 964 client = 0; // it's invalid now when win destroyed the client
965 965
966 if (win == m_focused_window) 966 if (win == m_focused_window)
967 revertFocus(&win->getScreen()); 967 revertFocus(&win->screen());
968 968
969 // finaly destroy window if empty 969 // finaly destroy window if empty
970 if (win->numClients() == 0) { 970 if (win->numClients() == 0) {
@@ -1383,64 +1383,64 @@ void Fluxbox::doWindowAction(int action, const int param) {
1383 case Keys::NUDGERIGHT: 1383 case Keys::NUDGERIGHT:
1384 m_focused_window->moveResize( 1384 m_focused_window->moveResize(
1385 m_focused_window->getXFrame()+param, m_focused_window->getYFrame(), 1385 m_focused_window->getXFrame()+param, m_focused_window->getYFrame(),
1386 m_focused_window->getWidth(), m_focused_window->getHeight()); 1386 m_focused_window->width(), m_focused_window->height());
1387 break; 1387 break;
1388 case Keys::NUDGELEFT: 1388 case Keys::NUDGELEFT:
1389 m_focused_window->moveResize( 1389 m_focused_window->moveResize(
1390 m_focused_window->getXFrame()-param, m_focused_window->getYFrame(), 1390 m_focused_window->getXFrame()-param, m_focused_window->getYFrame(),
1391 m_focused_window->getWidth(), m_focused_window->getHeight()); 1391 m_focused_window->width(), m_focused_window->height());
1392 break; 1392 break;
1393 case Keys::NUDGEUP: 1393 case Keys::NUDGEUP:
1394 m_focused_window->moveResize( 1394 m_focused_window->moveResize(
1395 m_focused_window->getXFrame(), m_focused_window->getYFrame()-param, 1395 m_focused_window->getXFrame(), m_focused_window->getYFrame()-param,
1396 m_focused_window->getWidth(), m_focused_window->getHeight()); 1396 m_focused_window->width(), m_focused_window->height());
1397 break; 1397 break;
1398 case Keys::NUDGEDOWN: 1398 case Keys::NUDGEDOWN:
1399 m_focused_window->moveResize( 1399 m_focused_window->moveResize(
1400 m_focused_window->getXFrame(), m_focused_window->getYFrame()+param, 1400 m_focused_window->getXFrame(), m_focused_window->getYFrame()+param,
1401 m_focused_window->getWidth(), m_focused_window->getHeight()); 1401 m_focused_window->width(), m_focused_window->height());
1402 break; 1402 break;
1403 // NOTE !!! BIGNUDGExxxx is not needed, just use 10 as a parameter 1403 // NOTE !!! BIGNUDGExxxx is not needed, just use 10 as a parameter
1404 case Keys::BIGNUDGERIGHT: 1404 case Keys::BIGNUDGERIGHT:
1405 m_focused_window->moveResize( 1405 m_focused_window->moveResize(
1406 m_focused_window->getXFrame()+10, m_focused_window->getYFrame(), 1406 m_focused_window->getXFrame()+10, m_focused_window->getYFrame(),
1407 m_focused_window->getWidth(), m_focused_window->getHeight()); 1407 m_focused_window->width(), m_focused_window->height());
1408 break; 1408 break;
1409 case Keys::BIGNUDGELEFT: 1409 case Keys::BIGNUDGELEFT:
1410 m_focused_window->moveResize( 1410 m_focused_window->moveResize(
1411 m_focused_window->getXFrame()-10, m_focused_window->getYFrame(), 1411 m_focused_window->getXFrame()-10, m_focused_window->getYFrame(),
1412 m_focused_window->getWidth(), m_focused_window->getHeight()); 1412 m_focused_window->width(), m_focused_window->height());
1413 break; 1413 break;
1414 case Keys::BIGNUDGEUP: 1414 case Keys::BIGNUDGEUP:
1415 m_focused_window->moveResize( 1415 m_focused_window->moveResize(
1416 m_focused_window->getXFrame(), m_focused_window->getYFrame()-10, 1416 m_focused_window->getXFrame(), m_focused_window->getYFrame()-10,
1417 m_focused_window->getWidth(), m_focused_window->getHeight()); 1417 m_focused_window->width(), m_focused_window->height());
1418 break; 1418 break;
1419 case Keys::BIGNUDGEDOWN: 1419 case Keys::BIGNUDGEDOWN:
1420 m_focused_window->moveResize( 1420 m_focused_window->moveResize(
1421 m_focused_window->getXFrame(), m_focused_window->getYFrame()+10, 1421 m_focused_window->getXFrame(), m_focused_window->getYFrame()+10,
1422 m_focused_window->getWidth(), m_focused_window->getHeight()); 1422 m_focused_window->width(), m_focused_window->height());
1423 break; 1423 break;
1424 case Keys::HORIZINC: 1424 case Keys::HORIZINC:
1425 m_focused_window->moveResize( 1425 m_focused_window->moveResize(
1426 m_focused_window->getXFrame(), m_focused_window->getYFrame(), 1426 m_focused_window->getXFrame(), m_focused_window->getYFrame(),
1427 m_focused_window->getWidth()+10, m_focused_window->getHeight()); 1427 m_focused_window->width() + 10, m_focused_window->height());
1428 1428
1429 break; 1429 break;
1430 case Keys::VERTINC: 1430 case Keys::VERTINC:
1431 m_focused_window->moveResize( 1431 m_focused_window->moveResize(
1432 m_focused_window->getXFrame(), m_focused_window->getYFrame(), 1432 m_focused_window->getXFrame(), m_focused_window->getYFrame(),
1433 m_focused_window->getWidth(), m_focused_window->getHeight()+10); 1433 m_focused_window->width(), m_focused_window->height()+10);
1434 break; 1434 break;
1435 case Keys::HORIZDEC: 1435 case Keys::HORIZDEC:
1436 m_focused_window->moveResize( 1436 m_focused_window->moveResize(
1437 m_focused_window->getXFrame(), m_focused_window->getYFrame(), 1437 m_focused_window->getXFrame(), m_focused_window->getYFrame(),
1438 m_focused_window->getWidth()-10, m_focused_window->getHeight()); 1438 m_focused_window->width() - 10, m_focused_window->height());
1439 break; 1439 break;
1440 case Keys::VERTDEC: 1440 case Keys::VERTDEC:
1441 m_focused_window->moveResize( 1441 m_focused_window->moveResize(
1442 m_focused_window->getXFrame(), m_focused_window->getYFrame(), 1442 m_focused_window->getXFrame(), m_focused_window->getYFrame(),
1443 m_focused_window->getWidth(), m_focused_window->getHeight()-10); 1443 m_focused_window->width(), m_focused_window->height()-10);
1444 1444
1445 break; 1445 break;
1446 case Keys::TOGGLEDECOR: 1446 case Keys::TOGGLEDECOR:
@@ -1526,16 +1526,16 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1526 // if window changed to iconic state 1526 // if window changed to iconic state
1527 // add to icon list 1527 // add to icon list
1528 if (win.isIconic()) { 1528 if (win.isIconic()) {
1529 Workspace *space = win.getScreen().getWorkspace(win.getWorkspaceNumber()); 1529 Workspace *space = win.screen().getWorkspace(win.getWorkspaceNumber());
1530 if (space != 0) 1530 if (space != 0)
1531 space->removeWindow(&win); 1531 space->removeWindow(&win);
1532 win.getScreen().addIcon(&win); 1532 win.screen().addIcon(&win);
1533 } 1533 }
1534 1534
1535 if (win.isStuck()) { 1535 if (win.isStuck()) {
1536 // if we're sticky then reassociate window 1536 // if we're sticky then reassociate window
1537 // to all workspaces 1537 // to all workspaces
1538 BScreen &scr = win.getScreen(); 1538 BScreen &scr = win.screen();
1539 if (scr.getCurrentWorkspaceID() != win.getWorkspaceNumber()) { 1539 if (scr.getCurrentWorkspaceID() != win.getWorkspaceNumber()) {
1540 scr.reassociateWindow(&win, 1540 scr.reassociateWindow(&win,
1541 scr.getCurrentWorkspaceID(), 1541 scr.getCurrentWorkspaceID(),
@@ -1554,7 +1554,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1554 m_atomhandler[i]->updateWindowClose(win); 1554 m_atomhandler[i]->updateWindowClose(win);
1555 } 1555 }
1556 // make sure each workspace get this 1556 // make sure each workspace get this
1557 BScreen &scr = win.getScreen(); 1557 BScreen &scr = win.screen();
1558 scr.removeWindow(&win); 1558 scr.removeWindow(&win);
1559 if (m_focused_window == &win) 1559 if (m_focused_window == &win)
1560 revertFocus(&scr); 1560 revertFocus(&scr);
@@ -1599,7 +1599,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1599 WinClient &client = subj->winClient(); 1599 WinClient &client = subj->winClient();
1600 1600
1601 if (client.fbwindow()) { 1601 if (client.fbwindow()) {
1602 BScreen &screen = client.fbwindow()->getScreen(); 1602 BScreen &screen = client.fbwindow()->screen();
1603 screen.updateNetizenWindowDel(client.window()); 1603 screen.updateNetizenWindowDel(client.window());
1604 screen.removeClient(client); 1604 screen.removeClient(client);
1605 } 1605 }
@@ -2315,7 +2315,7 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2315 m_focused_window = 0; 2315 m_focused_window = 0;
2316 } else { 2316 } else {
2317 old_win = m_focused_window; 2317 old_win = m_focused_window;
2318 old_screen = &old_win->getScreen(); 2318 old_screen = &old_win->screen();
2319 2319
2320 old_tbar = old_screen->getToolbar(); 2320 old_tbar = old_screen->getToolbar();
2321 old_wkspc = old_screen->getWorkspace(old_win->getWorkspaceNumber()); 2321 old_wkspc = old_screen->getWorkspace(old_win->getWorkspaceNumber());
@@ -2329,7 +2329,7 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2329 // make sure we have a valid win pointer with a valid screen 2329 // make sure we have a valid win pointer with a valid screen
2330 ScreenList::iterator winscreen = 2330 ScreenList::iterator winscreen =
2331 std::find(m_screen_list.begin(), m_screen_list.end(), 2331 std::find(m_screen_list.begin(), m_screen_list.end(),
2332 &win->getScreen()); 2332 &win->screen());
2333 if (winscreen == m_screen_list.end()) { 2333 if (winscreen == m_screen_list.end()) {
2334 m_focused_window = 0; // the window pointer wasn't valid, mark no window focused 2334 m_focused_window = 0; // the window pointer wasn't valid, mark no window focused
2335 } else { 2335 } else {