aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-02-22 15:10:43 (GMT)
committerrathnor <rathnor>2003-02-22 15:10:43 (GMT)
commitcc2f023a22db212b4097d7756379bb6b9e866b11 (patch)
tree33cd8f790e760965960d54406250dd73ab0aec93 /src/Screen.hh
parent7cf8c0863e6dd07e1023207964605de12f7d0a3c (diff)
downloadfluxbox-cc2f023a22db212b4097d7756379bb6b9e866b11.zip
fluxbox-cc2f023a22db212b4097d7756379bb6b9e866b11.tar.bz2
fix focus models for new event handler and Resource setup
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 1b833d4..a30ca40 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.69 2003/02/20 23:33:08 fluxgen Exp $ 25// $Id: Screen.hh,v 1.70 2003/02/22 15:10:43 rathnor Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -79,8 +79,8 @@ public:
79 ~BScreen(); 79 ~BScreen();
80 80
81 inline bool doToolbarAutoHide() const { return *resource.toolbar_auto_hide; } 81 inline bool doToolbarAutoHide() const { return *resource.toolbar_auto_hide; }
82 inline bool isSloppyFocus() const { return resource.sloppy_focus; } 82 inline bool isSloppyFocus() const { return (*resource.focus_model == Fluxbox::SLOPPYFOCUS); }
83 inline bool isSemiSloppyFocus() const { return resource.semi_sloppy_focus; } 83 inline bool isSemiSloppyFocus() const { return (*resource.focus_model == Fluxbox::SEMISLOPPYFOCUS); }
84 inline bool isRootColormapInstalled() const { return root_colormap_installed; } 84 inline bool isRootColormapInstalled() const { return root_colormap_installed; }
85 inline bool isScreenManaged() const { return managed; } 85 inline bool isScreenManaged() const { return managed; }
86 inline bool isTabRotateVertical() const { return *resource.tab_rotate_vertical; } 86 inline bool isTabRotateVertical() const { return *resource.tab_rotate_vertical; }
@@ -104,6 +104,7 @@ public:
104 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); } 104 FbTk::Menu * const getRootmenu() { return m_rootmenu.get(); }
105 105
106 inline const std::string &getRootCommand() const { return *resource.rootcommand; } 106 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
107 inline Fluxbox::FocusModel getFocusModel() const { return *resource.focus_model; }
107 108
108 inline bool doSlitAutoHide() const { return resource.slit_auto_hide; } 109 inline bool doSlitAutoHide() const { return resource.slit_auto_hide; }
109#ifdef SLIT 110#ifdef SLIT
@@ -188,9 +189,10 @@ public:
188 189
189 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; } 190 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; }
190 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } 191 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; }
191 inline void saveSloppyFocus(bool s) { resource.sloppy_focus = s; } 192 inline void saveFocusModel(Fluxbox::FocusModel model) { resource.focus_model = model; }
192 inline void saveSemiSloppyFocus(bool s) { resource.semi_sloppy_focus = s; } 193 //DEL inline void saveSloppyFocus(bool s) { resource.sloppy_focus = s; }
193 inline void saveAutoRaise(bool a) { resource.auto_raise = a; } 194 //DEL inline void saveSemiSloppyFocus(bool s) { resource.semi_sloppy_focus = s; }
195 //DEL inline void saveAutoRaise(bool a) { resource.auto_raise = a; }
194 inline void saveWorkspaces(int w) { *resource.workspaces = w; } 196 inline void saveWorkspaces(int w) { *resource.workspaces = w; }
195 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; } 197 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; }
196 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; } 198 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; }
@@ -382,8 +384,8 @@ private:
382 focus_last, focus_new, 384 focus_last, focus_new,
383 antialias; 385 antialias;
384 Resource<std::string> rootcommand; 386 Resource<std::string> rootcommand;
385 bool auto_raise, sloppy_focus, semi_sloppy_focus, 387 Resource<Fluxbox::FocusModel> focus_model;
386 ordered_dither; 388 bool auto_raise, ordered_dither;
387 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold, 389 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold,
388 tab_width, tab_height; 390 tab_width, tab_height;
389 Resource<Fluxbox::Layer> slit_layernum, toolbar_layernum; 391 Resource<Fluxbox::Layer> slit_layernum, toolbar_layernum;