summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakir <akir>2004-10-10 16:06:24 (GMT)
committerakir <akir>2004-10-10 16:06:24 (GMT)
commitd30e16f159efa7bde19dd01e560794b43dea6620 (patch)
tree902cdbfb27279ccb8c196611e344697c06cabd9d
parent876a70fce2d3c5d36172c74728d0d961af7ca9a5 (diff)
downloadfluxbox_lack-d30e16f159efa7bde19dd01e560794b43dea6620.zip
fluxbox_lack-d30e16f159efa7bde19dd01e560794b43dea6620.tar.bz2
added session.tabPadding and session.focusTabMinWidth
-rw-r--r--src/fluxbox.cc5
-rw-r--r--src/fluxbox.hh8
2 files changed, 10 insertions, 3 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 24f2556..3563c8c 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.257 2004/09/12 14:56:19 rathnor Exp $ 25// $Id: fluxbox.cc,v 1.258 2004/10/10 16:06:23 akir Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -203,6 +203,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
203 // TODO: shouldn't need a separate one for screen 203 // TODO: shouldn't need a separate one for screen
204 m_screen_rm(m_resourcemanager), 204 m_screen_rm(m_resourcemanager),
205 m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"), 205 m_rc_tabs(m_resourcemanager, true, "session.tabs", "Session.Tabs"),
206 m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"),
207 m_rc_focused_tab_min_width(m_resourcemanager, 0, "session.focusTabMinWidth",
208 "Session.FocusTabMinWidth"),
206 m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"), 209 m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"),
207 m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"), 210 m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"),
208 m_rc_colors_per_channel(m_resourcemanager, 4, 211 m_rc_colors_per_channel(m_resourcemanager, 4,
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 6258651..0b67b44 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.hh,v 1.91 2004/09/12 14:56:19 rathnor Exp $ 25// $Id: fluxbox.hh,v 1.92 2004/10/10 16:06:24 akir Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -126,6 +126,8 @@ public:
126 inline const std::string &getSlitlistFilename() const { return *m_rc_slitlistfile; } 126 inline const std::string &getSlitlistFilename() const { return *m_rc_slitlistfile; }
127 inline int colorsPerChannel() const { return *m_rc_colors_per_channel; } 127 inline int colorsPerChannel() const { return *m_rc_colors_per_channel; }
128 inline int getNumberOfLayers() const { return *m_rc_numlayers; } 128 inline int getNumberOfLayers() const { return *m_rc_numlayers; }
129 inline int getTabsPadding() const { return *m_rc_tabs_padding; }
130 inline int getFocusedTabMinWidth() const { return *m_rc_focused_tab_min_width; }
129 131
130 // class to store layer numbers (special Resource type) 132 // class to store layer numbers (special Resource type)
131 // we have a special resource type because we need to be able to name certain layers 133 // we have a special resource type because we need to be able to name certain layers
@@ -253,7 +255,9 @@ private:
253 FbTk::Resource<bool> m_rc_tabs, m_rc_ignoreborder; 255 FbTk::Resource<bool> m_rc_tabs, m_rc_ignoreborder;
254 FbTk::Resource<bool> m_rc_pseudotrans; 256 FbTk::Resource<bool> m_rc_pseudotrans;
255 FbTk::Resource<int> m_rc_colors_per_channel, m_rc_numlayers, 257 FbTk::Resource<int> m_rc_colors_per_channel, m_rc_numlayers,
256 m_rc_double_click_interval, m_rc_update_delay_time; 258 m_rc_double_click_interval, m_rc_update_delay_time,
259 m_rc_tabs_padding,
260 m_rc_focused_tab_min_width;
257 FbTk::Resource<std::string> m_rc_stylefile, 261 FbTk::Resource<std::string> m_rc_stylefile,
258 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile, 262 m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
259 m_rc_groupfile; 263 m_rc_groupfile;