removed session.numLayers resource, as it was useless and caused segfaults
markt markt
5 files changed,
6 insertions(+),
14 deletions(-)
M
doc/asciidoc/fluxbox.txt
→
doc/asciidoc/fluxbox.txt
@@ -1020,9 +1020,6 @@ session.ignoreBorder: <boolean>
This configures the ability to move windows by dragging the border. Default: False -session.numLayers: <integer> - This controls how many layers fluxbox should have. Default: 13 - session.tabPadding: <integer> This specifies the spacing between tabs. Default: 0
M
src/Layer.hh
→
src/Layer.hh
@@ -37,7 +37,8 @@ DOCK = 4,
TOP = 6, NORMAL = 8, BOTTOM = 10, - DESKTOP = 12 + DESKTOP = 12, + NUM_LAYERS = 13 }; explicit Layer(int i) : m_num(i) {};
M
src/Window.cc
→
src/Window.cc
@@ -1922,8 +1922,8 @@
// don't let it set its layer into menu area if (layernum <= ::Layer::MENU) layernum = ::Layer::MENU + 1; - else if (layernum >= Fluxbox::instance()->getNumberOfLayers()) - layernum = Fluxbox::instance()->getNumberOfLayers()-1; + else if (layernum >= ::Layer::NUM_LAYERS) + layernum = ::Layer::NUM_LAYERS - 1; if (!m_initialized) m_layernum = layernum;
M
src/fluxbox.cc
→
src/fluxbox.cc
@@ -211,7 +211,6 @@ m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"),
m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"), m_rc_colors_per_channel(m_resourcemanager, 4, "session.colorsPerChannel", "Session.ColorsPerChannel"), - m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"), m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"),@@ -378,7 +377,7 @@ sprintf(scrname, "session.screen%d", screens[s]);
sprintf(altscrname, "session.Screen%d", screens[s]); BScreen *screen = new BScreen(m_screen_rm.lock(), scrname, altscrname, - screens[s], getNumberOfLayers()); + screens[s], ::Layer::NUM_LAYERS); // already handled if (! screen->isScreenManaged()) {
M
src/fluxbox.hh
→
src/fluxbox.hh
@@ -126,12 +126,7 @@ const std::string &getMenuFilename() const { return *m_rc_menufile; }
const std::string &getSlitlistFilename() const { return *m_rc_slitlistfile; } const std::string &getAppsFilename() const { return *m_rc_appsfile; } int colorsPerChannel() const { return *m_rc_colors_per_channel; } - int getNumberOfLayers() const { return *m_rc_numlayers; } int getTabsPadding() const { return *m_rc_tabs_padding; } - - // class to store layer numbers (special Resource type) - // we have a special resource type because we need to be able to name certain layers - // a Resource<int> wouldn't allow this time_t getAutoRaiseDelay() const { return *m_rc_auto_raise_delay; }@@ -246,7 +241,7 @@ //--- Resources
FbTk::Resource<bool> m_rc_ignoreborder; FbTk::Resource<bool> m_rc_pseudotrans; - FbTk::Resource<int> m_rc_colors_per_channel, m_rc_numlayers, + FbTk::Resource<int> m_rc_colors_per_channel, m_rc_double_click_interval, m_rc_tabs_padding; FbTk::Resource<std::string> m_rc_stylefile,