aboutsummaryrefslogtreecommitdiff
path: root/src/Remember.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-08-22 12:52:23 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-08-22 12:52:23 (GMT)
commit0ae3ca9e8a2a3398cf07789e0d141887d40dcb6f (patch)
tree4e4d66fc15fea3956106affb772ea28f3bc909dd /src/Remember.cc
parent8681220f5361fef500d7eda28d9f22bbf0a006e4 (diff)
downloadfluxbox_pavel-0ae3ca9e8a2a3398cf07789e0d141887d40dcb6f.zip
fluxbox_pavel-0ae3ca9e8a2a3398cf07789e0d141887d40dcb6f.tar.bz2
move fullscreen and maximization handling to FbWinFrame
Diffstat (limited to 'src/Remember.cc')
-rw-r--r--src/Remember.cc22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/Remember.cc b/src/Remember.cc
index a1f5d62..1df5045 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -535,13 +535,13 @@ int parseApp(ifstream &file, Application &app, string *first_line = 0) {
535 app.rememberMinimizedstate((strcasecmp(str_label.c_str(), "yes") == 0)); 535 app.rememberMinimizedstate((strcasecmp(str_label.c_str(), "yes") == 0));
536 } else if (str_key == "maximized") { 536 } else if (str_key == "maximized") {
537 if (strcasecmp(str_label.c_str(), "yes") == 0) 537 if (strcasecmp(str_label.c_str(), "yes") == 0)
538 app.rememberMaximizedstate(FluxboxWindow::MAX_FULL); 538 app.rememberMaximizedstate(FbWinFrame::MAX_FULL);
539 else if (strcasecmp(str_label.c_str(), "horz") == 0) 539 else if (strcasecmp(str_label.c_str(), "horz") == 0)
540 app.rememberMaximizedstate(FluxboxWindow::MAX_HORZ); 540 app.rememberMaximizedstate(FbWinFrame::MAX_HORZ);
541 else if (strcasecmp(str_label.c_str(), "vert") == 0) 541 else if (strcasecmp(str_label.c_str(), "vert") == 0)
542 app.rememberMaximizedstate(FluxboxWindow::MAX_VERT); 542 app.rememberMaximizedstate(FbWinFrame::MAX_VERT);
543 else 543 else
544 app.rememberMaximizedstate(FluxboxWindow::MAX_NONE); 544 app.rememberMaximizedstate(FbWinFrame::MAX_NONE);
545 } else if (str_key == "fullscreen") { 545 } else if (str_key == "fullscreen") {
546 app.rememberFullscreenstate((strcasecmp(str_label.c_str(), "yes") == 0)); 546 app.rememberFullscreenstate((strcasecmp(str_label.c_str(), "yes") == 0));
547 } else if (str_key == "jump") { 547 } else if (str_key == "jump") {
@@ -999,16 +999,16 @@ void Remember::save() {
999 if (a.maximizedstate_remember) { 999 if (a.maximizedstate_remember) {
1000 apps_file << " [Maximized]\t{"; 1000 apps_file << " [Maximized]\t{";
1001 switch (a.maximizedstate) { 1001 switch (a.maximizedstate) {
1002 case FluxboxWindow::MAX_FULL: 1002 case FbWinFrame::MAX_FULL:
1003 apps_file << "yes" << "}" << endl; 1003 apps_file << "yes" << "}" << endl;
1004 break; 1004 break;
1005 case FluxboxWindow::MAX_HORZ: 1005 case FbWinFrame::MAX_HORZ:
1006 apps_file << "horz" << "}" << endl; 1006 apps_file << "horz" << "}" << endl;
1007 break; 1007 break;
1008 case FluxboxWindow::MAX_VERT: 1008 case FbWinFrame::MAX_VERT:
1009 apps_file << "vert" << "}" << endl; 1009 apps_file << "vert" << "}" << endl;
1010 break; 1010 break;
1011 case FluxboxWindow::MAX_NONE: 1011 case FbWinFrame::MAX_NONE:
1012 default: 1012 default:
1013 apps_file << "no" << "}" << endl; 1013 apps_file << "no" << "}" << endl;
1014 break; 1014 break;
@@ -1115,13 +1115,15 @@ void Remember::rememberAttrib(WinClient &winclient, Attribute attrib) {
1115 app->rememberHead(win->screen().getHead(win->fbWindow())); 1115 app->rememberHead(win->screen().getHead(win->fbWindow()));
1116 break; 1116 break;
1117 case REM_DIMENSIONS: 1117 case REM_DIMENSIONS:
1118 app->rememberDimensions(win->normalWidth(), win->normalHeight()); 1118 app->rememberDimensions(win->frame().normalWidth(),
1119 win->frame().normalHeight());
1119 break; 1120 break;
1120 case REM_POSITION: { 1121 case REM_POSITION: {
1121 int head = win->screen().getHead(win->fbWindow()); 1122 int head = win->screen().getHead(win->fbWindow());
1122 int head_x = win->screen().maxLeft(head); 1123 int head_x = win->screen().maxLeft(head);
1123 int head_y = win->screen().maxTop(head); 1124 int head_y = win->screen().maxTop(head);
1124 app->rememberPosition(win->normalX() - head_x, win->normalY() - head_y); 1125 app->rememberPosition(win->frame().normalX() - head_x,
1126 win->frame().normalY() - head_y);
1125 break; 1127 break;
1126 } 1128 }
1127 case REM_FOCUSHIDDENSTATE: 1129 case REM_FOCUSHIDDENSTATE: