aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-14 12:13:36 (GMT)
committerfluxgen <fluxgen>2003-04-14 12:13:36 (GMT)
commitf4ce449632eeb85aaeae63f32a7165d71047cde0 (patch)
tree22c3cf8815c69cf4397d0567fd07327e988f9981 /src/Screen.hh
parent0c895209d2d1425389100e6be734b960475c6883 (diff)
downloadfluxbox-f4ce449632eeb85aaeae63f32a7165d71047cde0.zip
fluxbox-f4ce449632eeb85aaeae63f32a7165d71047cde0.tar.bz2
merged with embedded-tab-branch
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh22
1 files changed, 5 insertions, 17 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index af60665..b4adcbf 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.73 2003/03/03 21:51:06 rathnor Exp $ 25// $Id: Screen.hh,v 1.74 2003/04/14 12:13:36 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -30,7 +30,6 @@
30#include "Theme.hh" 30#include "Theme.hh"
31#include "BaseDisplay.hh" 31#include "BaseDisplay.hh"
32#include "Workspace.hh" 32#include "Workspace.hh"
33#include "Tab.hh"
34#include "Resource.hh" 33#include "Resource.hh"
35#include "Subject.hh" 34#include "Subject.hh"
36#include "FbWinFrameTheme.hh" 35#include "FbWinFrameTheme.hh"
@@ -58,6 +57,7 @@ class Slit;
58class Toolbar; 57class Toolbar;
59class FbWinFrameTheme; 58class FbWinFrameTheme;
60class RootTheme; 59class RootTheme;
60class WinClient;
61 61
62namespace FbTk { 62namespace FbTk {
63class MenuTheme; 63class MenuTheme;
@@ -85,7 +85,6 @@ public:
85 inline bool isSemiSloppyFocus() const { return (*resource.focus_model == Fluxbox::SEMISLOPPYFOCUS); } 85 inline bool isSemiSloppyFocus() const { return (*resource.focus_model == Fluxbox::SEMISLOPPYFOCUS); }
86 inline bool isRootColormapInstalled() const { return root_colormap_installed; } 86 inline bool isRootColormapInstalled() const { return root_colormap_installed; }
87 inline bool isScreenManaged() const { return managed; } 87 inline bool isScreenManaged() const { return managed; }
88 inline bool isTabRotateVertical() const { return *resource.tab_rotate_vertical; }
89 inline bool isSloppyWindowGrouping() const { return *resource.sloppy_window_grouping; } 88 inline bool isSloppyWindowGrouping() const { return *resource.sloppy_window_grouping; }
90 inline bool isWorkspaceWarping() const { return *resource.workspace_warping; } 89 inline bool isWorkspaceWarping() const { return *resource.workspace_warping; }
91 inline bool isDesktopWheeling() const { return *resource.desktop_wheeling; } 90 inline bool isDesktopWheeling() const { return *resource.desktop_wheeling; }
@@ -188,14 +187,10 @@ public:
188 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } 187 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; }
189 inline int getRowPlacementDirection() const { return resource.row_direction; } 188 inline int getRowPlacementDirection() const { return resource.row_direction; }
190 inline int getColPlacementDirection() const { return resource.col_direction; } 189 inline int getColPlacementDirection() const { return resource.col_direction; }
191 inline unsigned int getTabWidth() const { return *resource.tab_width; }
192 inline unsigned int getTabHeight() const { return *resource.tab_height; }
193 190
194 inline int getSlitLayerNum() const { return (*resource.slit_layernum).getNum(); } 191 inline int getSlitLayerNum() const { return (*resource.slit_layernum).getNum(); }
195 inline int getToolbarLayerNum() const { return (*resource.toolbar_layernum).getNum(); } 192 inline int getToolbarLayerNum() const { return (*resource.toolbar_layernum).getNum(); }
196 193
197 inline Tab::Placement getTabPlacement() const { return *resource.tab_placement; }
198 inline Tab::Alignment getTabAlignment() const { return *resource.tab_alignment; }
199 194
200 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; } 195 inline void setRootColormapInstalled(Bool r) { root_colormap_installed = r; }
201 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } 196 inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; }
@@ -218,11 +213,6 @@ public:
218 inline void saveFullMax(bool f) { resource.full_max = f; } 213 inline void saveFullMax(bool f) { resource.full_max = f; }
219 inline void saveFocusNew(bool f) { resource.focus_new = f; } 214 inline void saveFocusNew(bool f) { resource.focus_new = f; }
220 inline void saveFocusLast(bool f) { resource.focus_last = f; } 215 inline void saveFocusLast(bool f) { resource.focus_last = f; }
221 inline void saveTabWidth(unsigned int w) { resource.tab_width = w; }
222 inline void saveTabHeight(unsigned int h) { resource.tab_height = h; }
223 inline void saveTabPlacement(Tab::Placement p) { *resource.tab_placement = p; }
224 inline void saveTabAlignment(Tab::Alignment a) { *resource.tab_alignment = a; }
225 inline void saveTabRotateVertical(bool r) { resource.tab_rotate_vertical = r; }
226 inline void saveSloppyWindowGrouping(bool s) { resource.sloppy_window_grouping = s; } 216 inline void saveSloppyWindowGrouping(bool s) { resource.sloppy_window_grouping = s; }
227 inline void saveWorkspaceWarping(bool s) { resource.workspace_warping = s; } 217 inline void saveWorkspaceWarping(bool s) { resource.workspace_warping = s; }
228 inline void saveDesktopWheeling(bool s) { resource.desktop_wheeling = s; } 218 inline void saveDesktopWheeling(bool s) { resource.desktop_wheeling = s; }
@@ -301,6 +291,7 @@ public:
301 void updateNetizenWindowLower(Window); 291 void updateNetizenWindowLower(Window);
302 /// create window frame for client window and attach it 292 /// create window frame for client window and attach it
303 FluxboxWindow *createWindow(Window clientwin); 293 FluxboxWindow *createWindow(Window clientwin);
294 FluxboxWindow *createWindow(WinClient &client);
304 void setupWindowActions(FluxboxWindow &win); 295 void setupWindowActions(FluxboxWindow &win);
305 296
306 enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT, LEFTRIGHT, 297 enum { ROWSMARTPLACEMENT = 1, COLSMARTPLACEMENT, CASCADEPLACEMENT, LEFTRIGHT,
@@ -386,7 +377,7 @@ private:
386 377
387 Resource<bool> toolbar_auto_hide, 378 Resource<bool> toolbar_auto_hide,
388 image_dither, opaque_move, full_max, 379 image_dither, opaque_move, full_max,
389 max_over_slit, tab_rotate_vertical, 380 max_over_slit,
390 sloppy_window_grouping, workspace_warping, 381 sloppy_window_grouping, workspace_warping,
391 desktop_wheeling, show_window_pos, 382 desktop_wheeling, show_window_pos,
392 focus_last, focus_new, 383 focus_last, focus_new,
@@ -394,13 +385,10 @@ private:
394 Resource<std::string> rootcommand; 385 Resource<std::string> rootcommand;
395 Resource<Fluxbox::FocusModel> focus_model; 386 Resource<Fluxbox::FocusModel> focus_model;
396 bool ordered_dither; 387 bool ordered_dither;
397 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold, 388 Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold;
398 tab_width, tab_height;
399 Resource<Fluxbox::Layer> slit_layernum, toolbar_layernum; 389 Resource<Fluxbox::Layer> slit_layernum, toolbar_layernum;
400 int placement_policy, row_direction, col_direction; 390 int placement_policy, row_direction, col_direction;
401 391
402 Resource<Tab::Placement> tab_placement;
403 Resource<Tab::Alignment> tab_alignment;
404 Resource<ToolbarHandler::ToolbarMode> toolbar_mode; 392 Resource<ToolbarHandler::ToolbarMode> toolbar_mode;
405 Resource<int> toolbar_on_head; 393 Resource<int> toolbar_on_head;
406 Resource<Toolbar::Placement> toolbar_placement; 394 Resource<Toolbar::Placement> toolbar_placement;