summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-11-27 21:53:55 (GMT)
committerfluxgen <fluxgen>2002-11-27 21:53:55 (GMT)
commit02352e9f8162940e70cbf49ecb97a6a4608fb322 (patch)
treedc3f4dd5b797526bcfcda6cb740931c6c5c276ac
parentf604debc9feb28affd8e9108f4fd897017f704bd (diff)
downloadfluxbox_lack-02352e9f8162940e70cbf49ecb97a6a4608fb322.zip
fluxbox_lack-02352e9f8162940e70cbf49ecb97a6a4608fb322.tar.bz2
removed compile time options
-rw-r--r--src/Screen.hh57
1 files changed, 12 insertions, 45 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index c5d586b..af53863 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.51 2002/11/27 13:00:05 fluxgen Exp $ 25// $Id: Screen.hh,v 1.52 2002/11/27 21:53:55 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -34,28 +34,9 @@
34#include "Resource.hh" 34#include "Resource.hh"
35#include "Toolbar.hh" 35#include "Toolbar.hh"
36 36
37#ifdef HAVE_CONFIG_H
38#include "config.h"
39#endif // HAVE_CONFIG_H
40
41#ifdef SLIT
42#include "Slit.hh"
43#endif // SLIT
44
45#include <X11/Xlib.h> 37#include <X11/Xlib.h>
46#include <X11/Xresource.h> 38#include <X11/Xresource.h>
47 39
48#ifdef TIME_WITH_SYS_TIME
49#include <sys/time.h>
50#include <time.h>
51#else // !TIME_WITH_SYS_TIME
52#ifdef HAVE_SYS_TIME_H
53#include <sys/time.h>
54#else // !HAVE_SYS_TIME_H
55#include <time.h>
56#endif // HAVE_SYS_TIME_H
57#endif // TIME_WITH_SYS_TIME
58
59#include <cstdio> 40#include <cstdio>
60#include <string> 41#include <string>
61#include <list> 42#include <list>
@@ -68,6 +49,7 @@ class Workspacemenu;
68class Iconmenu; 49class Iconmenu;
69class Rootmenu; 50class Rootmenu;
70class Netizen; 51class Netizen;
52class Slit;
71 53
72class BScreen : public ScreenInfo { 54class BScreen : public ScreenInfo {
73public: 55public:
@@ -106,7 +88,7 @@ public:
106 Rootmenu * const getRootmenu() { return rootmenu; } 88 Rootmenu * const getRootmenu() { return rootmenu; }
107 89
108 inline const std::string &getRootCommand() const { return *resource.rootcommand; } 90 inline const std::string &getRootCommand() const { return *resource.rootcommand; }
109#ifdef SLIT 91
110 inline bool isSlitOnTop() const { return resource.slit_on_top; } 92 inline bool isSlitOnTop() const { return resource.slit_on_top; }
111 inline bool doSlitAutoHide() const { return resource.slit_auto_hide; } 93 inline bool doSlitAutoHide() const { return resource.slit_auto_hide; }
112 inline Slit *getSlit() { return m_slit.get(); } 94 inline Slit *getSlit() { return m_slit.get(); }
@@ -117,12 +99,9 @@ public:
117 inline void saveSlitDirection(int d) { resource.slit_direction = d; } 99 inline void saveSlitDirection(int d) { resource.slit_direction = d; }
118 inline void saveSlitOnTop(bool t) { resource.slit_on_top = t; } 100 inline void saveSlitOnTop(bool t) { resource.slit_on_top = t; }
119 inline void saveSlitAutoHide(bool t) { resource.slit_auto_hide = t; } 101 inline void saveSlitAutoHide(bool t) { resource.slit_auto_hide = t; }
120#ifdef XINERAMA 102
121 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; } 103 inline unsigned int getSlitOnHead() const { return resource.slit_on_head; }
122 inline void saveSlitOnHead(unsigned int h) { resource.slit_on_head = h; } 104 inline void saveSlitOnHead(unsigned int h) { resource.slit_on_head = h; }
123#endif // XINERAMA
124
125#endif // SLIT
126 105
127 inline const Toolbar * const getToolbar() const { return m_toolbar.get(); } 106 inline const Toolbar * const getToolbar() const { return m_toolbar.get(); }
128 inline Toolbar * const getToolbar() { return m_toolbar.get(); } 107 inline Toolbar * const getToolbar() { return m_toolbar.get(); }
@@ -163,9 +142,9 @@ public:
163 /// @return the resource value of number of workspace 142 /// @return the resource value of number of workspace
164 inline int getNumberOfWorkspaces() const { return *resource.workspaces; } 143 inline int getNumberOfWorkspaces() const { return *resource.workspaces; }
165 inline Toolbar::Placement getToolbarPlacement() const { return *resource.toolbar_placement; } 144 inline Toolbar::Placement getToolbarPlacement() const { return *resource.toolbar_placement; }
166#ifdef XINERAMA 145
167 inline int getToolbarOnHead() { return *resource.toolbar_on_head; } 146 inline int getToolbarOnHead() { return *resource.toolbar_on_head; }
168#endif // XINERAMA 147
169 inline int getToolbarWidthPercent() const { return *resource.toolbar_width_percent; } 148 inline int getToolbarWidthPercent() const { return *resource.toolbar_width_percent; }
170 inline int getPlacementPolicy() const { return resource.placement_policy; } 149 inline int getPlacementPolicy() const { return resource.placement_policy; }
171 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } 150 inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; }
@@ -186,9 +165,9 @@ public:
186 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; } 165 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; }
187 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; } 166 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; }
188 inline void saveToolbarPlacement(Toolbar::Placement p) { *resource.toolbar_placement = p; } 167 inline void saveToolbarPlacement(Toolbar::Placement p) { *resource.toolbar_placement = p; }
189#ifdef XINERAMA 168
190 inline void saveToolbarOnHead(int head) { *resource.toolbar_on_head = head; } 169 inline void saveToolbarOnHead(int head) { *resource.toolbar_on_head = head; }
191#endif // XINERAMA 170
192 171
193 inline void savePlacementPolicy(int p) { resource.placement_policy = p; } 172 inline void savePlacementPolicy(int p) { resource.placement_policy = p; }
194 inline void saveRowPlacementDirection(int d) { resource.row_direction = d; } 173 inline void saveRowPlacementDirection(int d) { resource.row_direction = d; }
@@ -213,15 +192,13 @@ public:
213 inline void setAutoGroupWindow(Window w = 0) { auto_group_window = w; } 192 inline void setAutoGroupWindow(Window w = 0) { auto_group_window = w; }
214 void setAntialias(bool value); 193 void setAntialias(bool value);
215 194
216 #ifdef HAVE_STRFTIME
217 inline const char *getStrftimeFormat() { return resource.strftime_format.c_str(); } 195 inline const char *getStrftimeFormat() { return resource.strftime_format.c_str(); }
218 void saveStrftimeFormat(const char *format); 196 void saveStrftimeFormat(const char *format);
219 #else // !HAVE_STRFTIME 197
220 inline int getDateFormat() { return resource.date_format; } 198 inline int getDateFormat() { return resource.date_format; }
221 inline void saveDateFormat(int f) { resource.date_format = f; } 199 inline void saveDateFormat(int f) { resource.date_format = f; }
222 inline bool isClock24Hour() { return resource.clock24hour; } 200 inline bool isClock24Hour() { return resource.clock24hour; }
223 inline void saveClock24Hour(bool c) { resource.clock24hour = c; } 201 inline void saveClock24Hour(bool c) { resource.clock24hour = c; }
224 #endif // HAVE_STRFTIME
225 202
226 inline Theme::WindowStyle *getWindowStyle() { return &theme->getWindowStyle(); } 203 inline Theme::WindowStyle *getWindowStyle() { return &theme->getWindowStyle(); }
227 inline Theme::MenuStyle *getMenuStyle() { return &theme->getMenuStyle(); } 204 inline Theme::MenuStyle *getMenuStyle() { return &theme->getMenuStyle(); }
@@ -331,9 +308,7 @@ private:
331 Netizens netizenList; 308 Netizens netizenList;
332 Icons iconList; 309 Icons iconList;
333 310
334#ifdef SLIT
335 std::auto_ptr<Slit> m_slit; 311 std::auto_ptr<Slit> m_slit;
336#endif // SLIT
337 312
338 std::auto_ptr<Toolbar> m_toolbar; 313 std::auto_ptr<Toolbar> m_toolbar;
339 Workspace *current_workspace; 314 Workspace *current_workspace;
@@ -367,30 +342,22 @@ private:
367 342
368 Resource<Tab::Placement> tab_placement; 343 Resource<Tab::Placement> tab_placement;
369 Resource<Tab::Alignment> tab_alignment; 344 Resource<Tab::Alignment> tab_alignment;
370#ifdef XINERAMA
371 Resource<int> toolbar_on_head; 345 Resource<int> toolbar_on_head;
372#endif // XINERAMA 346
373 347
374 Resource<Toolbar::Placement> toolbar_placement; 348 Resource<Toolbar::Placement> toolbar_placement;
375 349
376 350
377#ifdef SLIT
378 bool slit_on_top, slit_auto_hide; 351 bool slit_on_top, slit_auto_hide;
379 int slit_placement, slit_direction; 352 int slit_placement, slit_direction;
380 353
381#ifdef XINERAMA
382 unsigned int slit_on_head; 354 unsigned int slit_on_head;
383#endif // XINERAMA
384 355
385#endif // SLIT
386
387
388#ifdef HAVE_STRFTIME
389 std::string strftime_format; 356 std::string strftime_format;
390#else // !HAVE_STRFTIME 357
391 bool clock24hour; 358 bool clock24hour;
392 int date_format; 359 int date_format;
393#endif // HAVE_STRFTIME 360
394 361
395 } resource; 362 } resource;
396}; 363};