aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/FbRootWindow.cc2
-rw-r--r--src/FbTk/FbWindow.cc1
-rw-r--r--src/Keys.cc1
-rw-r--r--src/Remember.cc15
-rw-r--r--src/RowSmartPlacement.cc8
-rw-r--r--src/SystemTray.cc11
-rw-r--r--src/Window.cc11
7 files changed, 21 insertions, 28 deletions
diff --git a/src/FbRootWindow.cc b/src/FbRootWindow.cc
index e329719..0cd730e 100644
--- a/src/FbRootWindow.cc
+++ b/src/FbRootWindow.cc
@@ -55,7 +55,7 @@ FbRootWindow::FbRootWindow(int screen_num):
55 55
56 for (int i = 0; i < vinfo_nitems; i++) { 56 for (int i = 0; i < vinfo_nitems; i++) {
57 if ((DefaultDepth(disp, screen_num) < vinfo_return[i].depth) 57 if ((DefaultDepth(disp, screen_num) < vinfo_return[i].depth)
58 && (depth() < vinfo_return[i].depth)){ 58 && (static_cast<int>(depth()) < vinfo_return[i].depth)){
59 m_visual = vinfo_return[i].visual; 59 m_visual = vinfo_return[i].visual;
60 setDepth(vinfo_return[i].depth); 60 setDepth(vinfo_return[i].depth);
61 } 61 }
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 4582574..fb1c7af 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -495,7 +495,6 @@ long FbWindow::cardinalProperty(Atom prop,bool*exists) const {
495 Atom type; 495 Atom type;
496 int format; 496 int format;
497 unsigned long nitems, bytes_after; 497 unsigned long nitems, bytes_after;
498 int result;
499 long* num; 498 long* num;
500 long ret=0; 499 long ret=0;
501 if (exists) *exists=false; 500 if (exists) *exists=false;
diff --git a/src/Keys.cc b/src/Keys.cc
index 6222ac2..19689f7 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -490,7 +490,6 @@ bool Keys::addBinding(const string &linebuffer) {
490 } 490 }
491 mod = 0; 491 mod = 0;
492 key = 0; 492 key = 0;
493 type = 0;
494 context = 0; 493 context = 0;
495 isdouble = false; 494 isdouble = false;
496 } 495 }
diff --git a/src/Remember.cc b/src/Remember.cc
index 3ca8fcf..3557439 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -453,12 +453,9 @@ int parseApp(ifstream &file, Application &app, string *first_line = 0) {
453 } 453 }
454 if (err > 0 ) { 454 if (err > 0 ) {
455 parse_pos += err; 455 parse_pos += err;
456 err = FbTk::StringUtil::getStringBetween(str_label, 456 FbTk::StringUtil::getStringBetween(str_label,
457 line.c_str() + parse_pos, 457 line.c_str() + parse_pos,
458 '{', '}'); 458 '{', '}');
459 if (err>0) {
460 parse_pos += err;
461 }
462 } else 459 } else
463 continue; //read next line 460 continue; //read next line
464 461
@@ -1131,7 +1128,7 @@ void Remember::rememberAttrib(WinClient &winclient, Attribute attrib) {
1131 app = add(winclient); 1128 app = add(winclient);
1132 if (!app) return; 1129 if (!app) return;
1133 } 1130 }
1134 int head, head_x, head_y, win_w, win_h, percx, percy; 1131 int head, percx, percy;
1135 switch (attrib) { 1132 switch (attrib) {
1136 case REM_WORKSPACE: 1133 case REM_WORKSPACE:
1137 app->rememberWorkspace(win->workspaceNumber()); 1134 app->rememberWorkspace(win->workspaceNumber());
@@ -1141,15 +1138,15 @@ void Remember::rememberAttrib(WinClient &winclient, Attribute attrib) {
1141 break; 1138 break;
1142 case REM_DIMENSIONS: { 1139 case REM_DIMENSIONS: {
1143 head = win->screen().getHead(win->fbWindow()); 1140 head = win->screen().getHead(win->fbWindow());
1144 int percx = win->screen().calRelativeDimensionWidth(head, win->normalWidth()); 1141 percx = win->screen().calRelativeDimensionWidth(head, win->normalWidth());
1145 int percy = win->screen().calRelativeDimensionHeight(head, win->normalHeight()); 1142 percy = win->screen().calRelativeDimensionHeight(head, win->normalHeight());
1146 app->rememberDimensions(percx, percy, true); 1143 app->rememberDimensions(percx, percy, true);
1147 break; 1144 break;
1148 } 1145 }
1149 case REM_POSITION: { 1146 case REM_POSITION: {
1150 head = win->screen().getHead(win->fbWindow()); 1147 head = win->screen().getHead(win->fbWindow());
1151 int percx = win->screen().calRelativePositionWidth(head, win->normalX()); 1148 percx = win->screen().calRelativePositionWidth(head, win->normalX());
1152 int percy = win->screen().calRelativePositionHeight(head, win->normalY()); 1149 percy = win->screen().calRelativePositionHeight(head, win->normalY());
1153 app->rememberPosition(percx, percy, true); 1150 app->rememberPosition(percx, percy, true);
1154 break; 1151 break;
1155 } 1152 }
diff --git a/src/RowSmartPlacement.cc b/src/RowSmartPlacement.cc
index 79b42bb..eca867f 100644
--- a/src/RowSmartPlacement.cc
+++ b/src/RowSmartPlacement.cc
@@ -59,10 +59,12 @@ bool RowSmartPlacement::placeWindow(const FluxboxWindow &win, int head,
59 bool left_right = 59 bool left_right =
60 screen_placement.rowDirection() == ScreenPlacement::LEFTRIGHT; 60 screen_placement.rowDirection() == ScreenPlacement::LEFTRIGHT;
61 61
62 int change_x = 1, change_y = 1; 62 int change_x = 1;
63 63
64 if (screen_placement.colDirection() == ScreenPlacement::BOTTOMTOP) 64// unused code:
65 change_y = -1; 65// int change_y = 1;
66// if (screen_placement.colDirection() == ScreenPlacement::BOTTOMTOP)
67// change_y = -1;
66 68
67 if (screen_placement.rowDirection() == ScreenPlacement::RIGHTLEFT) 69 if (screen_placement.rowDirection() == ScreenPlacement::RIGHTLEFT)
68 change_x = -1; 70 change_x = -1;
diff --git a/src/SystemTray.cc b/src/SystemTray.cc
index 846181f..9811508 100644
--- a/src/SystemTray.cc
+++ b/src/SystemTray.cc
@@ -75,18 +75,15 @@ public:
75 int actual_format; 75 int actual_format;
76 unsigned long nitems, bytes_after; 76 unsigned long nitems, bytes_after;
77 unsigned long *prop; 77 unsigned long *prop;
78 bool mapped = false;
79 Atom embed_info = SystemTray::getXEmbedInfoAtom(); 78 Atom embed_info = SystemTray::getXEmbedInfoAtom();
80 if (property(embed_info, 0l, 2l, false, embed_info, 79 if (property(embed_info, 0l, 2l, false, embed_info,
81 &actual_type, &actual_format, &nitems, &bytes_after, 80 &actual_type, &actual_format, &nitems, &bytes_after,
82 (unsigned char **) &prop) && prop != 0) { 81 (unsigned char **) &prop) && prop != 0) {
83 mapped = (bool)(static_cast<unsigned long>(prop[1]) & XEMBED_MAPPED);
84 XFree(static_cast<void *>(prop));
85
86
87 fbdbg<<"(SystemTray::TrayWindow::getMappedDefault(): XEMBED_MAPPED = "<<mapped<<endl;
88
89 82
83 XFree(static_cast<void *>(prop));
84 fbdbg << "(SystemTray::TrayWindow::getMappedDefault(): XEMBED_MAPPED = "
85 << (bool)(static_cast<unsigned long>(prop[1]) & XEMBED_MAPPED)
86 << endl;
90 } 87 }
91 return true; 88 return true;
92 } 89 }
diff --git a/src/Window.cc b/src/Window.cc
index 2b997a7..cb0689e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -332,12 +332,11 @@ FluxboxWindow::~FluxboxWindow() {
332 unregisterWindow(frame().window().window()); 332 unregisterWindow(frame().window().window());
333 } 333 }
334 334
335 335 fbdbg << "starting ~FluxboxWindow(" << this << ","
336 const char* title = m_client ? m_client->title().logical().c_str() : "" ; 336 << (m_client ? m_client->title().logical().c_str() : "") << ")" << endl
337 fbdbg<<"starting ~FluxboxWindow("<<this<<","<<title<<")"<<endl; 337 << "num clients = " << numClients() << endl
338 fbdbg<<"num clients = "<<numClients()<<endl; 338 << "curr client = "<< m_client << endl
339 fbdbg<<"curr client = "<<m_client<<endl; 339 << "m_labelbuttons.size = " << m_labelbuttons.size() << endl;
340 fbdbg<<"m_labelbuttons.size = "<<m_labelbuttons.size()<<endl;
341 340
342 if (moving) 341 if (moving)
343 stopMoving(true); 342 stopMoving(true);