aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-07-20 12:18:59 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:57:23 (GMT)
commit87fa1eaf5724a90a1a623302884c55cb6a3f474d (patch)
tree8e4669a0fc8d9f53b9503d5493dcd10404e2b865
parent99af325d43a73c08d484f122498ac1ef5ea50101 (diff)
downloadfluxbox_paul-87fa1eaf5724a90a1a623302884c55cb6a3f474d.zip
fluxbox_paul-87fa1eaf5724a90a1a623302884c55cb6a3f474d.tar.bz2
Attach modifiedSig handlers to the session.screenX.tabs.intitlebar resource
-rw-r--r--src/FbWinFrame.cc4
-rw-r--r--src/Screen.cc2
-rw-r--r--src/Screen.hh2
-rw-r--r--src/Window.cc3
4 files changed, 7 insertions, 4 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 53cecf7..04e7944 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -100,7 +100,7 @@ FbWinFrame::FbWinFrame(BScreen &screen, unsigned int client_depth,
100 m_use_handle(true), 100 m_use_handle(true),
101 m_visible(false), 101 m_visible(false),
102 m_button_pm(0), 102 m_button_pm(0),
103 m_tabmode(screen.getDefaultInternalTabs()?INTERNAL:EXTERNAL), 103 m_tabmode(*screen.getDefaultInternalTabsResource()?INTERNAL:EXTERNAL),
104 m_active_orig_client_bw(0), 104 m_active_orig_client_bw(0),
105 m_need_render(true), 105 m_need_render(true),
106 m_button_size(1), 106 m_button_size(1),
@@ -1464,7 +1464,7 @@ void FbWinFrame::applyDecorations(bool do_move) {
1464 // we rely on frame not doing anything if it is already shown/hidden 1464 // we rely on frame not doing anything if it is already shown/hidden
1465 if (m_state.useTitlebar()) { 1465 if (m_state.useTitlebar()) {
1466 client_move |= showTitlebar(); 1466 client_move |= showTitlebar();
1467 if (m_screen.getDefaultInternalTabs()) 1467 if (*m_screen.getDefaultInternalTabsResource())
1468 client_move |= setTabMode(INTERNAL); 1468 client_move |= setTabMode(INTERNAL);
1469 else 1469 else
1470 client_move |= setTabMode(EXTERNAL); 1470 client_move |= setTabMode(EXTERNAL);
diff --git a/src/Screen.cc b/src/Screen.cc
index d34990a..d8ec167 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1555,7 +1555,7 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1555 1555
1556 _BOOLITEM(*tab_menu,Configmenu, TabsInTitlebar, 1556 _BOOLITEM(*tab_menu,Configmenu, TabsInTitlebar,
1557 "Tabs in Titlebar", "Tabs in Titlebar", 1557 "Tabs in Titlebar", "Tabs in Titlebar",
1558 resource.default_internal_tabs, save_and_reconftabs); 1558 resource.default_internal_tabs, saverc_cmd);
1559 tab_menu->insert(new FbTk::BoolMenuItem(_FB_XTEXT(Common, MaximizeOver, 1559 tab_menu->insert(new FbTk::BoolMenuItem(_FB_XTEXT(Common, MaximizeOver,
1560 "Maximize Over", "Maximize over this thing when maximizing"), 1560 "Maximize Over", "Maximize over this thing when maximizing"),
1561 resource.max_over_tabs, save_and_reconfigure)); 1561 resource.max_over_tabs, save_and_reconfigure));
diff --git a/src/Screen.hh b/src/Screen.hh
index 0321940..c524a91 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -124,7 +124,7 @@ public:
124 unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; } 124 unsigned int noFocusWhileTypingDelay() const { return *resource.typing_delay; }
125 const bool allowRemoteActions() const { return *resource.allow_remote_actions; } 125 const bool allowRemoteActions() const { return *resource.allow_remote_actions; }
126 const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; } 126 const bool clientMenuUsePixmap() const { return *resource.clientmenu_use_pixmap; }
127 const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; } 127 FbTk::BoolResource &getDefaultInternalTabsResource() { return resource.default_internal_tabs; }
128 FbTk::BoolResource &getTabsUsePixmapResource() { return resource.tabs_use_pixmap; } 128 FbTk::BoolResource &getTabsUsePixmapResource() { return resource.tabs_use_pixmap; }
129 const bool getMaxOverTabs() const { return *resource.max_over_tabs; } 129 const bool getMaxOverTabs() const { return *resource.max_over_tabs; }
130 130
diff --git a/src/Window.cc b/src/Window.cc
index d381e17..d82a0b1 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -429,6 +429,9 @@ void FluxboxWindow::init() {
429 m_timer.setCommand(raise_cmd); 429 m_timer.setCommand(raise_cmd);
430 m_timer.fireOnce(true); 430 m_timer.fireOnce(true);
431 431
432 join(screen().getDefaultInternalTabsResource().modifiedSig(),
433 FbTk::MemFunIgnoreArgs(*this, &FluxboxWindow::applyDecorations));
434
432 /**************************************************/ 435 /**************************************************/
433 /* Read state above here, apply state below here. */ 436 /* Read state above here, apply state below here. */
434 /**************************************************/ 437 /**************************************************/