aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc44
1 files changed, 22 insertions, 22 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index ecec988..c67daf5 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.147 2003/05/14 14:37:06 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.148 2003/05/15 11:17:27 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -718,7 +718,7 @@ void Fluxbox::handleEvent(XEvent * const e) {
718 m_masked_window->motionNotifyEvent(e->xmotion); 718 m_masked_window->motionNotifyEvent(e->xmotion);
719 return; 719 return;
720 } else if (e->type == ButtonRelease) { 720 } else if (e->type == ButtonRelease) {
721 e->xbutton.window = m_masked_window->getFbWindow().window(); 721 e->xbutton.window = m_masked_window->fbWindow().window();
722 } 722 }
723 723
724 } 724 }
@@ -1199,7 +1199,7 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1199 case Keys::KILLWINDOW: //kill the current window 1199 case Keys::KILLWINDOW: //kill the current window
1200 if (m_focused_window) { 1200 if (m_focused_window) {
1201 XKillClient(FbTk::App::instance()->display(), 1201 XKillClient(FbTk::App::instance()->display(),
1202 m_focused_window->getClientWindow()); 1202 m_focused_window->clientWindow());
1203 } 1203 }
1204 break; 1204 break;
1205 case Keys::NEXTWINDOW: { //activate next window 1205 case Keys::NEXTWINDOW: { //activate next window
@@ -1282,7 +1282,7 @@ void Fluxbox::handleKeyEvent(XKeyEvent &ke) {
1282 BScreen::FocusedWindows::iterator it = fwins.begin(); 1282 BScreen::FocusedWindows::iterator it = fwins.begin();
1283 for (; it != fwins.end(); ++it) { 1283 for (; it != fwins.end(); ++it) {
1284 if ((*it)->fbwindow() != m_focused_window && 1284 if ((*it)->fbwindow() != m_focused_window &&
1285 (*it)->fbwindow()->getWorkspaceNumber() == 1285 (*it)->fbwindow()->workspaceNumber() ==
1286 keyscreen->getCurrentWorkspaceID()) { 1286 keyscreen->getCurrentWorkspaceID()) {
1287 m_focused_window->attachClient(**it); 1287 m_focused_window->attachClient(**it);
1288 break; 1288 break;
@@ -1417,64 +1417,64 @@ void Fluxbox::doWindowAction(int action, const int param) {
1417 break; 1417 break;
1418 case Keys::NUDGERIGHT: 1418 case Keys::NUDGERIGHT:
1419 m_focused_window->moveResize( 1419 m_focused_window->moveResize(
1420 m_focused_window->getXFrame()+param, m_focused_window->getYFrame(), 1420 m_focused_window->x() + param, m_focused_window->y(),
1421 m_focused_window->width(), m_focused_window->height()); 1421 m_focused_window->width(), m_focused_window->height());
1422 break; 1422 break;
1423 case Keys::NUDGELEFT: 1423 case Keys::NUDGELEFT:
1424 m_focused_window->moveResize( 1424 m_focused_window->moveResize(
1425 m_focused_window->getXFrame()-param, m_focused_window->getYFrame(), 1425 m_focused_window->x() - param, m_focused_window->y(),
1426 m_focused_window->width(), m_focused_window->height()); 1426 m_focused_window->width(), m_focused_window->height());
1427 break; 1427 break;
1428 case Keys::NUDGEUP: 1428 case Keys::NUDGEUP:
1429 m_focused_window->moveResize( 1429 m_focused_window->moveResize(
1430 m_focused_window->getXFrame(), m_focused_window->getYFrame()-param, 1430 m_focused_window->x(), m_focused_window->y() - param,
1431 m_focused_window->width(), m_focused_window->height()); 1431 m_focused_window->width(), m_focused_window->height());
1432 break; 1432 break;
1433 case Keys::NUDGEDOWN: 1433 case Keys::NUDGEDOWN:
1434 m_focused_window->moveResize( 1434 m_focused_window->moveResize(
1435 m_focused_window->getXFrame(), m_focused_window->getYFrame()+param, 1435 m_focused_window->x(), m_focused_window->y() + param,
1436 m_focused_window->width(), m_focused_window->height()); 1436 m_focused_window->width(), m_focused_window->height());
1437 break; 1437 break;
1438 // NOTE !!! BIGNUDGExxxx is not needed, just use 10 as a parameter 1438 // NOTE !!! BIGNUDGExxxx is not needed, just use 10 as a parameter
1439 case Keys::BIGNUDGERIGHT: 1439 case Keys::BIGNUDGERIGHT:
1440 m_focused_window->moveResize( 1440 m_focused_window->moveResize(
1441 m_focused_window->getXFrame()+10, m_focused_window->getYFrame(), 1441 m_focused_window->x() + 10, m_focused_window->y(),
1442 m_focused_window->width(), m_focused_window->height()); 1442 m_focused_window->width(), m_focused_window->height());
1443 break; 1443 break;
1444 case Keys::BIGNUDGELEFT: 1444 case Keys::BIGNUDGELEFT:
1445 m_focused_window->moveResize( 1445 m_focused_window->moveResize(
1446 m_focused_window->getXFrame()-10, m_focused_window->getYFrame(), 1446 m_focused_window->x() - 10, m_focused_window->y(),
1447 m_focused_window->width(), m_focused_window->height()); 1447 m_focused_window->width(), m_focused_window->height());
1448 break; 1448 break;
1449 case Keys::BIGNUDGEUP: 1449 case Keys::BIGNUDGEUP:
1450 m_focused_window->moveResize( 1450 m_focused_window->moveResize(
1451 m_focused_window->getXFrame(), m_focused_window->getYFrame()-10, 1451 m_focused_window->x(), m_focused_window->y()-10,
1452 m_focused_window->width(), m_focused_window->height()); 1452 m_focused_window->width(), m_focused_window->height());
1453 break; 1453 break;
1454 case Keys::BIGNUDGEDOWN: 1454 case Keys::BIGNUDGEDOWN:
1455 m_focused_window->moveResize( 1455 m_focused_window->moveResize(
1456 m_focused_window->getXFrame(), m_focused_window->getYFrame()+10, 1456 m_focused_window->x(), m_focused_window->y()+10,
1457 m_focused_window->width(), m_focused_window->height()); 1457 m_focused_window->width(), m_focused_window->height());
1458 break; 1458 break;
1459 case Keys::HORIZINC: 1459 case Keys::HORIZINC:
1460 m_focused_window->moveResize( 1460 m_focused_window->moveResize(
1461 m_focused_window->getXFrame(), m_focused_window->getYFrame(), 1461 m_focused_window->x(), m_focused_window->y(),
1462 m_focused_window->width() + 10, m_focused_window->height()); 1462 m_focused_window->width() + 10, m_focused_window->height());
1463 1463
1464 break; 1464 break;
1465 case Keys::VERTINC: 1465 case Keys::VERTINC:
1466 m_focused_window->moveResize( 1466 m_focused_window->moveResize(
1467 m_focused_window->getXFrame(), m_focused_window->getYFrame(), 1467 m_focused_window->x(), m_focused_window->y(),
1468 m_focused_window->width(), m_focused_window->height()+10); 1468 m_focused_window->width(), m_focused_window->height()+10);
1469 break; 1469 break;
1470 case Keys::HORIZDEC: 1470 case Keys::HORIZDEC:
1471 m_focused_window->moveResize( 1471 m_focused_window->moveResize(
1472 m_focused_window->getXFrame(), m_focused_window->getYFrame(), 1472 m_focused_window->x(), m_focused_window->y(),
1473 m_focused_window->width() - 10, m_focused_window->height()); 1473 m_focused_window->width() - 10, m_focused_window->height());
1474 break; 1474 break;
1475 case Keys::VERTDEC: 1475 case Keys::VERTDEC:
1476 m_focused_window->moveResize( 1476 m_focused_window->moveResize(
1477 m_focused_window->getXFrame(), m_focused_window->getYFrame(), 1477 m_focused_window->x(), m_focused_window->y(),
1478 m_focused_window->width(), m_focused_window->height()-10); 1478 m_focused_window->width(), m_focused_window->height()-10);
1479 1479
1480 break; 1480 break;
@@ -1561,7 +1561,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1561 // if window changed to iconic state 1561 // if window changed to iconic state
1562 // add to icon list 1562 // add to icon list
1563 if (win.isIconic()) { 1563 if (win.isIconic()) {
1564 Workspace *space = win.screen().getWorkspace(win.getWorkspaceNumber()); 1564 Workspace *space = win.screen().getWorkspace(win.workspaceNumber());
1565 if (space != 0) 1565 if (space != 0)
1566 space->removeWindow(&win); 1566 space->removeWindow(&win);
1567 win.screen().addIcon(&win); 1567 win.screen().addIcon(&win);
@@ -1571,7 +1571,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1571 // if we're sticky then reassociate window 1571 // if we're sticky then reassociate window
1572 // to all workspaces 1572 // to all workspaces
1573 BScreen &scr = win.screen(); 1573 BScreen &scr = win.screen();
1574 if (scr.getCurrentWorkspaceID() != win.getWorkspaceNumber()) { 1574 if (scr.getCurrentWorkspaceID() != win.workspaceNumber()) {
1575 scr.reassociateWindow(&win, 1575 scr.reassociateWindow(&win,
1576 scr.getCurrentWorkspaceID(), 1576 scr.getCurrentWorkspaceID(),
1577 true); 1577 true);
@@ -2369,10 +2369,10 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2369 old_screen = &old_win->screen(); 2369 old_screen = &old_win->screen();
2370 2370
2371 old_tbar = old_screen->getToolbar(); 2371 old_tbar = old_screen->getToolbar();
2372 old_wkspc = old_screen->getWorkspace(old_win->getWorkspaceNumber()); 2372 old_wkspc = old_screen->getWorkspace(old_win->workspaceNumber());
2373 2373
2374 old_win->setFocusFlag(false); 2374 old_win->setFocusFlag(false);
2375 old_wkspc->menu().setItemSelected(old_win->getWindowNumber(), false); 2375 old_wkspc->menu().setItemSelected(old_win->windowNumber(), false);
2376 } 2376 }
2377 } 2377 }
2378 2378
@@ -2386,12 +2386,12 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2386 } else { 2386 } else {
2387 screen = *winscreen; 2387 screen = *winscreen;
2388 tbar = screen->getToolbar(); 2388 tbar = screen->getToolbar();
2389 wkspc = screen->getWorkspace(win->getWorkspaceNumber()); 2389 wkspc = screen->getWorkspace(win->workspaceNumber());
2390 m_focused_window = win; // update focused window 2390 m_focused_window = win; // update focused window
2391 win->setFocusFlag(true); // set focus flag 2391 win->setFocusFlag(true); // set focus flag
2392 // select this window in workspace menu 2392 // select this window in workspace menu
2393 if (wkspc != 0) 2393 if (wkspc != 0)
2394 wkspc->menu().setItemSelected(win->getWindowNumber(), true); 2394 wkspc->menu().setItemSelected(win->windowNumber(), true);
2395 } 2395 }
2396 } else 2396 } else
2397 m_focused_window = 0; 2397 m_focused_window = 0;