# include "Slit.h"
#endif // SLIT
#include "Image.h"
+#include "Resource.h"
// forward declaration
class BScreen;
Pixmap geom_pixmap;
Window geom_window;
- Openbox *openbox;
+ Openbox &openbox;
BImageControl *image_control;
Configmenu *configmenu;
Iconmenu *iconmenu;
Bool toolbar_on_top, toolbar_auto_hide, sloppy_focus, auto_raise,
auto_edge_balance, image_dither, ordered_dither, opaque_move, full_max,
- focus_new, focus_last;
+ focus_new, focus_last, toolbar_total_hide;
BColor border_color;
- XrmDatabase stylerc;
+ obResource styleconfig;
int workspaces, toolbar_placement, toolbar_width_percent, placement_policy,
edge_snap_threshold, row_direction, col_direction;
protected:
Bool parseMenuFile(FILE *, Rootmenu *);
- void readDatabaseTexture(char *, char *, BTexture *, unsigned long);
- void readDatabaseColor(char *, char *, BColor *, unsigned long);
+ void readDatabaseTexture(const char *, const char *, BTexture *,
+ unsigned long);
+ void readDatabaseColor(const char *, const char *, BColor *, unsigned long);
- void readDatabaseFontSet(char *, char *, XFontSet *);
- XFontSet createFontSet(char *);
- void readDatabaseFont(char *, char *, XFontStruct **);
+ void readDatabaseFontSet(const char *, const char *, XFontSet *);
+ XFontSet createFontSet(const char *);
+ void readDatabaseFont(const char *, const char *, XFontStruct **);
void InitMenu(void);
void LoadStyle(void);
public:
- BScreen(Openbox *, int);
+ BScreen(Openbox &, int);
~BScreen(void);
inline const Bool &isToolbarOnTop(void) const
{ return resource.toolbar_on_top; }
inline const Bool &doToolbarAutoHide(void) const
{ return resource.toolbar_auto_hide; }
+ inline const Bool &doToolbarHide(void) const
+ {return resource.toolbar_total_hide;}
inline const Bool &isSloppyFocus(void) const
{ return resource.sloppy_focus; }
inline const Bool &isRootColormapInstalled(void) const
inline const GC &getOpGC() const { return opGC; }
- inline Openbox *getOpenbox(void) { return openbox; }
+ inline Openbox &getOpenbox(void) { return openbox; }
inline BColor *getBorderColor(void) { return &resource.border_color; }
inline BImageControl *getImageControl(void) { return image_control; }
inline Rootmenu *getRootmenu(void) { return rootmenu; }
inline const int getCurrentWorkspaceID()
{ return current_workspace->getWorkspaceID(); }
- inline const int getCount(void) { return workspacesList->count(); }
+ inline const int getWorkspaceCount(void) { return workspacesList->count(); }
inline const int getIconCount(void) { return iconList->count(); }
inline const int &getNumberOfWorkspaces(void) const
{ return resource.workspaces; }
inline void saveFocusNew(Bool f) { resource.focus_new = f; }
inline void saveFocusLast(Bool f) { resource.focus_last = f; }
inline void iconUpdate(void) { iconmenu->update(); }
-
#ifdef HAVE_STRFTIME
inline char *getStrftimeFormat(void) { return resource.strftime_format; }
- void saveStrftimeFormat(char *);
+ void saveStrftimeFormat(const char *);
#else // !HAVE_STRFTIME
inline int getDateFormat(void) { return resource.date_format; }
inline void saveDateFormat(int f) { resource.date_format = f; }
int removeLastWorkspace(void);
void removeWorkspaceNames(void);
- void addWorkspaceName(char *);
+ void addWorkspaceName(const char *);
void addNetizen(Netizen *);
void removeNetizen(Window);
void addIcon(OpenboxWindow *);
void showPosition(int, int);
void showGeometry(unsigned int, unsigned int);
void hideGeometry(void);
-
+ void saveToolbarHide( Bool b);
void updateNetizenCurrentWorkspace(void);
void updateNetizenWorkspaceCount(void);
void updateNetizenWindowFocus(void);
void updateNetizenWindowRaise(Window);
void updateNetizenWindowLower(Window);
- enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement, LeftRight,
- RightLeft, TopBottom, BottomTop };
+ enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
+ BestFitPlacement, LeftRight, RightLeft, TopBottom, BottomTop };
enum { LeftJustify = 1, RightJustify, CenterJustify };
enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure,