aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorakir <akir>2004-10-18 01:24:24 (GMT)
committerakir <akir>2004-10-18 01:24:24 (GMT)
commit2760b03b2e0a7ee93e4ce70daf73faa609076dff (patch)
treeec5b2a3312ed65016ecfb1922cc9f5183a7d0d75 /src/Screen.hh
parent65ce32a28e59140f7ad9e599518fabc14712010d (diff)
downloadfluxbox_pavel-2760b03b2e0a7ee93e4ce70daf73faa609076dff.zip
fluxbox_pavel-2760b03b2e0a7ee93e4ce70daf73faa609076dff.tar.bz2
cosmetic changes, added ResizeModel to ScreenRessources
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 4788fff..e861386 100644
--- a/src/Screen.hh
+++ b/src/Screen.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: Screen.hh,v 1.148 2004/10/16 22:18:56 akir Exp $ 25// $Id: Screen.hh,v 1.149 2004/10/18 01:24:23 akir Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -77,7 +77,8 @@ class Subject;
77 */ 77 */
78class BScreen : public FbTk::Observer, private FbTk::NotCopyable { 78class BScreen : public FbTk::Observer, private FbTk::NotCopyable {
79public: 79public:
80 enum FocusModel { SLOPPYFOCUS=0, SEMISLOPPYFOCUS, CLICKTOFOCUS }; 80 enum ResizeModel { BOTTOMRESIZE = 0, QUADRANTRESIZE, DEFAULTRESIZE = BOTTOMRESIZE };
81 enum FocusModel { SLOPPYFOCUS = 0, SEMISLOPPYFOCUS, CLICKTOFOCUS };
81 enum FollowModel { ///< a window becomes active / focussed on a different workspace 82 enum FollowModel { ///< a window becomes active / focussed on a different workspace
82 IGNORE_OTHER_WORKSPACES = 0, ///< who cares? 83 IGNORE_OTHER_WORKSPACES = 0, ///< who cares?
83 FOLLOW_ACTIVE_WINDOW, ///< go to that workspace 84 FOLLOW_ACTIVE_WINDOW, ///< go to that workspace
@@ -128,7 +129,7 @@ public:
128 FbTk::Menu &configMenu() { return *m_configmenu.get(); } 129 FbTk::Menu &configMenu() { return *m_configmenu.get(); }
129 130
130 inline const std::string &getRootCommand() const { return *resource.rootcommand; } 131 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
131 inline const std::string &getResizeMode() const { return *resource.resizemode; } 132 inline ResizeModel getResizeModel() const { return *resource.resize_model; }
132 inline FocusModel getFocusModel() const { return *resource.focus_model; } 133 inline FocusModel getFocusModel() const { return *resource.focus_model; }
133 inline FollowModel getFollowModel() const { return *resource.follow_model; } 134 inline FollowModel getFollowModel() const { return *resource.follow_model; }
134 135
@@ -437,7 +438,7 @@ private:
437 focus_last, focus_new, 438 focus_last, focus_new,
438 antialias, auto_raise, click_raises, decorate_transient; 439 antialias, auto_raise, click_raises, decorate_transient;
439 FbTk::Resource<std::string> rootcommand; 440 FbTk::Resource<std::string> rootcommand;
440 FbTk::Resource<std::string> resizemode; 441 FbTk::Resource<ResizeModel> resize_model;
441 FbTk::Resource<std::string> windowmenufile; 442 FbTk::Resource<std::string> windowmenufile;
442 FbTk::Resource<FocusModel> focus_model; 443 FbTk::Resource<FocusModel> focus_model;
443 FbTk::Resource<FollowModel> follow_model; 444 FbTk::Resource<FollowModel> follow_model;