aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorsimonb <simonb>2006-03-22 12:23:17 (GMT)
committersimonb <simonb>2006-03-22 12:23:17 (GMT)
commitfe4a7db228d69bc9a66ed948f218ef489b2cedaf (patch)
tree5ee59c4862b04871dbd6f5112278682e4b005e47 /src/Screen.hh
parentda365bb4c99edf1a18e1f8db285f8c2dcee2c5e3 (diff)
downloadfluxbox_pavel-fe4a7db228d69bc9a66ed948f218ef489b2cedaf.zip
fluxbox_pavel-fe4a7db228d69bc9a66ed948f218ef489b2cedaf.tar.bz2
external tabs features and bugfixes
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 9fcff11..738fe1a 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -27,7 +27,7 @@
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
29 29
30 30#include "FbWinFrame.hh"
31#include "FbRootWindow.hh" 31#include "FbRootWindow.hh"
32#include "MenuTheme.hh" 32#include "MenuTheme.hh"
33#include "PlacementStrategy.hh" 33#include "PlacementStrategy.hh"
@@ -132,13 +132,15 @@ public:
132 ExtraMenus &extraWindowMenus() { return m_extramenus; } 132 ExtraMenus &extraWindowMenus() { return m_extramenus; }
133 const ExtraMenus &extraWindowMenus() const { return m_extramenus; } 133 const ExtraMenus &extraWindowMenus() const { return m_extramenus; }
134 134
135 FbWinFrame::TabPlacement getTabPlacement() const { return *resource.tab_placement; }
136
135 ResizeModel getResizeModel() const { return *resource.resize_model; } 137 ResizeModel getResizeModel() const { return *resource.resize_model; }
136 138
137 inline FollowModel getFollowModel() const { return *resource.follow_model; } 139 inline FollowModel getFollowModel() const { return *resource.follow_model; }
138 140
139 inline const std::string &getScrollAction() const { return *resource.scroll_action; } 141 inline const std::string &getScrollAction() const { return *resource.scroll_action; }
140 inline const bool getScrollReverse() const { return *resource.scroll_reverse; } 142 inline const bool getScrollReverse() const { return *resource.scroll_reverse; }
141 inline const bool getDefaultExternalTabs() const { return *resource.default_external_tabs; } 143 inline const bool getDefaultInternalTabs() const { return *resource.default_internal_tabs; }
142 144
143 inline Slit *slit() { return m_slit.get(); } 145 inline Slit *slit() { return m_slit.get(); }
144 inline const Slit *slit() const { return m_slit.get(); } 146 inline const Slit *slit() const { return m_slit.get(); }
@@ -203,6 +205,7 @@ public:
203 void update(FbTk::Subject *subj); 205 void update(FbTk::Subject *subj);
204 206
205 FbTk::Menu *createMenu(const std::string &label); 207 FbTk::Menu *createMenu(const std::string &label);
208 FbTk::Menu *createToggleMenu(const std::string &label);
206 void hideMenus(); 209 void hideMenus();
207 // for extras to add menus. 210 // for extras to add menus.
208 // These menus will be marked internal, 211 // These menus will be marked internal,
@@ -218,6 +221,8 @@ public:
218 void setRootColormapInstalled(bool r) { root_colormap_installed = r; } 221 void setRootColormapInstalled(bool r) { root_colormap_installed = r; }
219 void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } 222 void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; }
220 223
224 void saveTabPlacement(FbWinFrame::TabPlacement place) { *resource.tab_placement = place; }
225
221 void saveWorkspaces(int w) { *resource.workspaces = w; } 226 void saveWorkspaces(int w) { *resource.workspaces = w; }
222 227
223 void saveMenu(FbTk::Menu &menu) { m_rootmenu_list.push_back(&menu); } 228 void saveMenu(FbTk::Menu &menu) { m_rootmenu_list.push_back(&menu); }
@@ -275,6 +280,7 @@ public:
275 280
276 281
277 void reconfigure(); 282 void reconfigure();
283 void reconfigureTabs();
278 void rereadMenu(); 284 void rereadMenu();
279 void shutdown(); 285 void shutdown();
280 /// show position window centered on the screen with "X x Y" text 286 /// show position window centered on the screen with "X x Y" text
@@ -434,6 +440,7 @@ private:
434 antialias, auto_raise, click_raises, decorate_transient; 440 antialias, auto_raise, click_raises, decorate_transient;
435 FbTk::Resource<std::string> rootcommand; 441 FbTk::Resource<std::string> rootcommand;
436 FbTk::Resource<ResizeModel> resize_model; 442 FbTk::Resource<ResizeModel> resize_model;
443 FbTk::Resource<FbWinFrame::TabPlacement> tab_placement;
437 FbTk::Resource<std::string> windowmenufile; 444 FbTk::Resource<std::string> windowmenufile;
438 FbTk::Resource<FollowModel> follow_model; 445 FbTk::Resource<FollowModel> follow_model;
439 bool ordered_dither; 446 bool ordered_dither;
@@ -447,7 +454,7 @@ private:
447 FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style; 454 FbTk::Resource<FbTk::GContext::CapStyle> gc_cap_style;
448 FbTk::Resource<std::string> scroll_action; 455 FbTk::Resource<std::string> scroll_action;
449 FbTk::Resource<bool> scroll_reverse; 456 FbTk::Resource<bool> scroll_reverse;
450 FbTk::Resource<bool> default_external_tabs; 457 FbTk::Resource<bool> default_internal_tabs;
451 458
452 } resource; 459 } resource;
453 460