diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 05b4ec2..fbcaa34 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.239 2004/04/19 22:45:44 fluxgen Exp $ | 25 | // $Id: fluxbox.cc,v 1.240 2004/04/22 21:07:57 fluxgen Exp $ |
26 | 26 | ||
27 | #include "fluxbox.hh" | 27 | #include "fluxbox.hh" |
28 | 28 | ||
@@ -193,6 +193,15 @@ setFromString(char const *strval) { | |||
193 | } | 193 | } |
194 | 194 | ||
195 | template<> | 195 | template<> |
196 | void FbTk::Resource<Fluxbox::TabsAttachArea>:: | ||
197 | setFromString(char const *strval) { | ||
198 | if (strcasecmp(strval, "Titlebar")==0) | ||
199 | m_value= Fluxbox::ATTACH_AREA_TITLEBAR; | ||
200 | else | ||
201 | m_value= Fluxbox::ATTACH_AREA_WINDOW; | ||
202 | } | ||
203 | |||
204 | template<> | ||
196 | void FbTk::Resource<unsigned int>:: | 205 | void FbTk::Resource<unsigned int>:: |
197 | setFromString(const char *strval) { | 206 | setFromString(const char *strval) { |
198 | if (sscanf(strval, "%ul", &m_value) != 1) | 207 | if (sscanf(strval, "%ul", &m_value) != 1) |
@@ -256,6 +265,15 @@ getString() { | |||
256 | } | 265 | } |
257 | 266 | ||
258 | template<> | 267 | template<> |
268 | std::string FbTk::Resource<Fluxbox::TabsAttachArea>:: | ||
269 | getString() { | ||
270 | if (m_value == Fluxbox::ATTACH_AREA_TITLEBAR) | ||
271 | return "Titlebar"; | ||
272 | else | ||
273 | return "Window"; | ||
274 | } | ||
275 | |||
276 | template<> | ||
259 | string FbTk::Resource<unsigned int>:: | 277 | string FbTk::Resource<unsigned int>:: |
260 | getString() { | 278 | getString() { |
261 | char tmpstr[128]; | 279 | char tmpstr[128]; |
@@ -394,6 +412,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
394 | m_rc_titlebar_right(m_resourcemanager, | 412 | m_rc_titlebar_right(m_resourcemanager, |
395 | TitlebarList(&s_titlebar_right[0], &s_titlebar_right[3]), | 413 | TitlebarList(&s_titlebar_right[0], &s_titlebar_right[3]), |
396 | "session.titlebar.right", "Session.Titlebar.Right"), | 414 | "session.titlebar.right", "Session.Titlebar.Right"), |
415 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "session.tabsAttachArea", "Session.TabsAttachArea"), | ||
397 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), | 416 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), |
398 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), | 417 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), |
399 | m_rc_auto_raise_delay(m_resourcemanager, 250, "session.autoRaiseDelay", "Session.AutoRaiseDelay"), | 418 | m_rc_auto_raise_delay(m_resourcemanager, 250, "session.autoRaiseDelay", "Session.AutoRaiseDelay"), |