aboutsummaryrefslogtreecommitdiff
path: root/src/Remember.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-15 11:17:29 (GMT)
committerfluxgen <fluxgen>2003-05-15 11:17:29 (GMT)
commitcbce8634dde14fd7000fde92e86f4bd4bf3525c2 (patch)
treeb3be6c129906ecb67114616d761184cf3375c891 /src/Remember.cc
parent93220b5f1abee3057b292abb958a437ebbc707b4 (diff)
downloadfluxbox_pavel-cbce8634dde14fd7000fde92e86f4bd4bf3525c2.zip
fluxbox_pavel-cbce8634dde14fd7000fde92e86f4bd4bf3525c2.tar.bz2
cleaning in FluxboxWindow interface
Diffstat (limited to 'src/Remember.cc')
-rw-r--r--src/Remember.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Remember.cc b/src/Remember.cc
index e82c1aa..8a20e8e 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -21,7 +21,7 @@
21// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 21// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
22// DEALINGS IN THE SOFTWARE. 22// DEALINGS IN THE SOFTWARE.
23 23
24// $Id: Remember.cc,v 1.13 2003/05/11 13:36:10 fluxgen Exp $ 24// $Id: Remember.cc,v 1.14 2003/05/15 11:17:27 fluxgen Exp $
25 25
26#include "Remember.hh" 26#include "Remember.hh"
27#include "StringUtil.hh" 27#include "StringUtil.hh"
@@ -462,19 +462,19 @@ void Remember::rememberAttrib(WinClient &winclient, Attribute attrib) {
462 } 462 }
463 switch (attrib) { 463 switch (attrib) {
464 case REM_WORKSPACE: 464 case REM_WORKSPACE:
465 app->rememberWorkspace(win->getWorkspaceNumber()); 465 app->rememberWorkspace(win->workspaceNumber());
466 break; 466 break;
467 case REM_DIMENSIONS: 467 case REM_DIMENSIONS:
468 app->rememberDimensions(win->width(), win->height()); 468 app->rememberDimensions(win->width(), win->height());
469 break; 469 break;
470 case REM_POSITION: 470 case REM_POSITION:
471 app->rememberPosition(win->getXFrame(), win->getYFrame()); 471 app->rememberPosition(win->x(), win->y());
472 break; 472 break;
473 case REM_STUCKSTATE: 473 case REM_STUCKSTATE:
474 app->rememberShadedstate(win->isShaded()); 474 app->rememberShadedstate(win->isShaded());
475 break; 475 break;
476 case REM_DECOSTATE: 476 case REM_DECOSTATE:
477 app->rememberDecostate(win->getDecorationMask()); 477 app->rememberDecostate(win->decorationMask());
478 break; 478 break;
479 case REM_SHADEDSTATE: 479 case REM_SHADEDSTATE:
480 app->rememberStuckstate(win->isStuck()); 480 app->rememberStuckstate(win->isStuck());
@@ -485,7 +485,7 @@ void Remember::rememberAttrib(WinClient &winclient, Attribute attrib) {
485 app->rememberJumpworkspace(true); 485 app->rememberJumpworkspace(true);
486 break; 486 break;
487 case REM_LAYER: 487 case REM_LAYER:
488 app->rememberLayer(win->getLayerNum()); 488 app->rememberLayer(win->layerNum());
489 break; 489 break;
490 case REM_SAVEONCLOSE: 490 case REM_SAVEONCLOSE:
491 app->rememberSaveOnClose(true); 491 app->rememberSaveOnClose(true);
@@ -547,7 +547,7 @@ void Remember::setupWindow(FluxboxWindow &win) {
547 547
548 // we don't touch the window if it is a transient 548 // we don't touch the window if it is a transient
549 // of something else 549 // of something else
550 int menupos = win.getWindowmenu().numberOfItems()-2; 550 int menupos = win.menu().numberOfItems()-2;
551 if (menupos < -1) 551 if (menupos < -1)
552 menupos = -1; 552 menupos = -1;
553 553
@@ -556,18 +556,18 @@ void Remember::setupWindow(FluxboxWindow &win) {
556 // so, we add a disabled item... 556 // so, we add a disabled item...
557 FbTk::MenuItem *item = new FbTk::MenuItem("Remember..."); 557 FbTk::MenuItem *item = new FbTk::MenuItem("Remember...");
558 item->setEnabled(false); 558 item->setEnabled(false);
559 win.getWindowmenu().insert(item, menupos); 559 win.menu().insert(item, menupos);
560 win.getWindowmenu().update(); 560 win.menu().update();
561 return; 561 return;
562 } 562 }
563 563
564 // add the menu, this -2 is somewhat dodgy... :-/ 564 // add the menu, this -2 is somewhat dodgy... :-/
565 // All windows get the remember menu. 565 // All windows get the remember menu.
566 // TODO: nls 566 // TODO: nls
567 win.getWindowmenu().insert("Remember...", 567 win.menu().insert("Remember...",
568 createRememberMenu(*this, win), 568 createRememberMenu(*this, win),
569 menupos); 569 menupos);
570 win.getWindowmenu().reconfigure(); 570 win.menu().reconfigure();
571 571
572 Application *app = find(winclient); 572 Application *app = find(winclient);
573 if (app == 0) 573 if (app == 0)
@@ -629,17 +629,17 @@ void Remember::updateWindowClose(FluxboxWindow &win) {
629 } 629 }
630/* 630/*
631 if (app->workspace_remember) 631 if (app->workspace_remember)
632 app->rememberWorkspace(win.getWorkspaceNumber()); 632 app->rememberWorkspace(win.workspaceNumber());
633 if (app->dimensions_remember) 633 if (app->dimensions_remember)
634 app->rememberDimensions(win.width(), win.height()); 634 app->rememberDimensions(win.width(), win.height());
635 if (app->position_remember) 635 if (app->position_remember)
636 app->rememberPosition(win.getXFrame(), win.getYFrame()); 636 app->rememberPosition(win.x(), win.y());
637 if (app->shadedstate_remember) 637 if (app->shadedstate_remember)
638 app->rememberShadedstate(win.isShaded()); 638 app->rememberShadedstate(win.isShaded());
639 // external tabs off atm 639 // external tabs off atm
640 //if (app->tabstate_remember) ... 640 //if (app->tabstate_remember) ...
641 if (app->decostate_remember) 641 if (app->decostate_remember)
642 app->rememberDecostate(win.getDecorationMask()); 642 app->rememberDecostate(win.decorationMask());
643 if (app->stuckstate_remember) 643 if (app->stuckstate_remember)
644 app->rememberStuckstate(win.isStuck()); 644 app->rememberStuckstate(win.isStuck());
645 if (app->jumpworkspace_remember) 645 if (app->jumpworkspace_remember)