nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed session.numLayers resource, as it was useless and caused segfaults

Browse source
This commit is contained in:
markt 2007-03-03 23:27:16 +00:00
parent d03f39f836
commit 9477af82a5
5 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/asciidoc/fluxbox.txt
View file

@ -1020,9 +1020,6 @@ session.ignoreBorder: <boolean>
This configures the ability to move windows by dragging the border. This configures the ability to move windows by dragging the border.
Default: False Default: False
session.numLayers: <integer>
This controls how many layers fluxbox should have. Default: 13
session.tabPadding: <integer> session.tabPadding: <integer>
This specifies the spacing between tabs. Default: 0 This specifies the spacing between tabs. Default: 0

3
src/Layer.hh
View file

@ -37,7 +37,8 @@ public:
TOP = 6, TOP = 6,
NORMAL = 8, NORMAL = 8,
BOTTOM = 10, BOTTOM = 10,
DESKTOP = 12 DESKTOP = 12,
NUM_LAYERS = 13
}; };
explicit Layer(int i) : m_num(i) {}; explicit Layer(int i) : m_num(i) {};

4
src/Window.cc
View file

@ -1922,8 +1922,8 @@ void FluxboxWindow::moveToLayer(int layernum, bool force) {
// don't let it set its layer into menu area // don't let it set its layer into menu area
if (layernum <= ::Layer::MENU) if (layernum <= ::Layer::MENU)
layernum = ::Layer::MENU + 1; layernum = ::Layer::MENU + 1;
else if (layernum >= Fluxbox::instance()->getNumberOfLayers()) else if (layernum >= ::Layer::NUM_LAYERS)
layernum = Fluxbox::instance()->getNumberOfLayers()-1; layernum = ::Layer::NUM_LAYERS - 1;
if (!m_initialized) if (!m_initialized)
m_layernum = layernum; m_layernum = layernum;

3
src/fluxbox.cc
View file

@ -211,7 +211,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"), m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"),
m_rc_colors_per_channel(m_resourcemanager, 4, m_rc_colors_per_channel(m_resourcemanager, 4,
"session.colorsPerChannel", "Session.ColorsPerChannel"), "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_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"),
m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"), m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"),
m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"),
@ -378,7 +377,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
sprintf(altscrname, "session.Screen%d", screens[s]); sprintf(altscrname, "session.Screen%d", screens[s]);
BScreen *screen = new BScreen(m_screen_rm.lock(), BScreen *screen = new BScreen(m_screen_rm.lock(),
scrname, altscrname, scrname, altscrname,
screens[s], getNumberOfLayers()); screens[s], ::Layer::NUM_LAYERS);
// already handled // already handled
if (! screen->isScreenManaged()) { if (! screen->isScreenManaged()) {

7
src/fluxbox.hh
View file

@ -126,13 +126,8 @@ public:
const std::string &getSlitlistFilename() const { return *m_rc_slitlistfile; } const std::string &getSlitlistFilename() const { return *m_rc_slitlistfile; }
const std::string &getAppsFilename() const { return *m_rc_appsfile; } const std::string &getAppsFilename() const { return *m_rc_appsfile; }
int colorsPerChannel() const { return *m_rc_colors_per_channel; } int colorsPerChannel() const { return *m_rc_colors_per_channel; }
int getNumberOfLayers() const { return *m_rc_numlayers; }
int getTabsPadding() const { return *m_rc_tabs_padding; } 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; } time_t getAutoRaiseDelay() const { return *m_rc_auto_raise_delay; }
@ -246,7 +241,7 @@ private:
FbTk::Resource<bool> m_rc_ignoreborder; FbTk::Resource<bool> m_rc_ignoreborder;
FbTk::Resource<bool> m_rc_pseudotrans; 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_double_click_interval,
m_rc_tabs_padding; m_rc_tabs_padding;
FbTk::Resource<std::string> m_rc_stylefile, FbTk::Resource<std::string> m_rc_stylefile,