aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Gumz <akira@fluxbox.org>2015-01-23 14:17:02 (GMT)
committerMathias Gumz <akira@fluxbox.org>2015-01-23 14:17:02 (GMT)
commit0d8a3dfb6b47753577881b11f25b2a95163ce158 (patch)
treea04644198da4c68266bd12b7994b22f70922536e
parent73858632f31afbd2218e378945f596b248164767 (diff)
downloadfluxbox-0d8a3dfb6b47753577881b11f25b2a95163ce158.zip
fluxbox-0d8a3dfb6b47753577881b11f25b2a95163ce158.tar.bz2
Cosmetic
-rw-r--r--src/IconbarTheme.cc6
-rw-r--r--src/WindowState.cc9
-rw-r--r--src/fluxbox.cc2
3 files changed, 5 insertions, 12 deletions
diff --git a/src/IconbarTheme.cc b/src/IconbarTheme.cc
index 0be9cd1..cead9c8 100644
--- a/src/IconbarTheme.cc
+++ b/src/IconbarTheme.cc
@@ -64,15 +64,13 @@ bool IconbarTheme::fallback(FbTk::ThemeItem_base &item) {
64 || tm.loadItem(item, "toolbar", "toolbar")); 64 || tm.loadItem(item, "toolbar", "toolbar"));
65 } else if (item.name() == m_name + ".borderWidth") 65 } else if (item.name() == m_name + ".borderWidth")
66 // don't fallback for base border, for theme backwards compatibility 66 // don't fallback for base border, for theme backwards compatibility
67 return (tm.loadItem(item, base + ".borderWidth", 67 return (tm.loadItem(item, base + ".borderWidth", altbase + ".BorderWidth") ||
68 altbase + ".BorderWidth") ||
69 tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") || 68 tm.loadItem(item, "window.borderWidth", "Window.BorderWidth") ||
70 tm.loadItem(item, "borderWidth", "BorderWidth")); 69 tm.loadItem(item, "borderWidth", "BorderWidth"));
71 70
72 else if (item.name() == m_name + ".borderColor") 71 else if (item.name() == m_name + ".borderColor")
73 72
74 return (tm.loadItem(item, base + ".borderColor", 73 return (tm.loadItem(item, base + ".borderColor", altbase + ".BorderColor") ||
75 altbase + ".BorderColor") ||
76 tm.loadItem(item, "window.borderColor", "Window.BorderColor") || 74 tm.loadItem(item, "window.borderColor", "Window.BorderColor") ||
77 tm.loadItem(item, "borderColor", "BorderColor")); 75 tm.loadItem(item, "borderColor", "BorderColor"));
78 76
diff --git a/src/WindowState.cc b/src/WindowState.cc
index 2f1ee0e..e684992 100644
--- a/src/WindowState.cc
+++ b/src/WindowState.cc
@@ -23,13 +23,8 @@
23 23
24#include "FbTk/StringUtil.hh" 24#include "FbTk/StringUtil.hh"
25 25
26#ifdef HAVE_CSTDLIB 26#include <cstdlib>
27 #include <cstdlib> 27#include <cerrno>
28#else
29 #include <stdlib.h>
30#endif
31
32#include <errno.h>
33 28
34bool WindowState::useBorder() const { 29bool WindowState::useBorder() const {
35 return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER; 30 return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index c5d85a6..87c4c46 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -239,7 +239,7 @@ bool Fluxbox::haveShape() const { return s_have_shape; }
239int Fluxbox::shapeEventbase() const { return s_shape_eventbase; } 239int Fluxbox::shapeEventbase() const { return s_shape_eventbase; }
240Fluxbox* Fluxbox::instance() { return s_singleton; } 240Fluxbox* Fluxbox::instance() { return s_singleton; }
241 241
242Fluxbox::Config::Config(FbTk::ResourceManager& rm, const std::string& path) : 242Fluxbox::Config::Config(FbTk::ResourceManager& rm, const std::string& path) :
243 ignore_border(rm, false, "session.ignoreBorder", "Session.IgnoreBorder"), 243 ignore_border(rm, false, "session.ignoreBorder", "Session.IgnoreBorder"),
244 pseudotrans(rm, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"), 244 pseudotrans(rm, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"),
245 colors_per_channel(rm, 4, "session.colorsPerChannel", "Session.ColorsPerChannel"), 245 colors_per_channel(rm, 4, "session.colorsPerChannel", "Session.ColorsPerChannel"),