#include "Workspace.hh"
#include "Workspacemenu.hh"
#include "blackbox.hh"
+
class Slit; // forward reference
+class BFont;
+class XAtom;
enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
BTexture t_focus, t_unfocus, l_focus, l_unfocus, h_focus, h_unfocus,
b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
- XFontSet fontset;
- XFontSetExtents *fontset_extents;
- XFontStruct *font;
+ BFont *font;
TextJustify justify;
- int doJustify(const char *text, int &start_pos, unsigned int max_length,
- unsigned int modifier, bool multibyte) const;
+ void doJustify(const std::string &text, int &start_pos,
+ unsigned int max_length, unsigned int modifier) const;
};
struct ToolbarStyle {
BColor l_text, w_text, c_text, b_pic;
BTexture toolbar, label, window, button, pressed, clock;
- XFontSet fontset;
- XFontSetExtents *fontset_extents;
- XFontStruct *font;
+ BFont *font;
TextJustify justify;
- int doJustify(const char *text, int &start_pos, unsigned int max_length,
- unsigned int modifier, bool multibyte) const;
+ void doJustify(const std::string &text, int &start_pos,
+ unsigned int max_length, unsigned int modifier) const;
};
struct MenuStyle {
BColor t_text, f_text, h_text, d_text;
BTexture title, frame, hilite;
- XFontSet t_fontset, f_fontset;
- XFontSetExtents *t_fontset_extents, *f_fontset_extents;
- XFontStruct *t_font, *f_font;
+ BFont *t_font, *f_font;
TextJustify t_justify, f_justify;
int bullet, bullet_pos;
Iconmenu *iconmenu;
Rootmenu *rootmenu;
Configuration *config;
+ XAtom *xatom;
typedef std::list<Rootmenu*> RootmenuList;
RootmenuList rootmenuList;
NetizenList netizenList;
BlackboxWindowList iconList, windowList;
+ typedef std::vector<Window> WindowList;
+ WindowList desktopWindowList, systrayWindowList;
+
Slit *slit;
Toolbar *toolbar;
Workspace *current_workspace;
typedef std::list<Strut*> StrutList;
StrutList strutList;
- typedef std::vector<std::string> WorkspaceNamesList;
- WorkspaceNamesList workspaceNames;
typedef std::vector<Workspace*> WorkspaceList;
WorkspaceList workspacesList;
MenuStyle mstyle;
bool sloppy_focus, auto_raise, auto_edge_balance, ordered_dither,
- opaque_move, full_max, focus_new, focus_last, click_raise,
- hide_toolbar;
+ opaque_move, full_max, focus_new, focus_last, click_raise,
+ hide_toolbar, window_to_window_snap, window_corner_snap;
BColor border_color;
unsigned int workspaces;
BTexture readDatabaseTexture(const std::string &rname,
const std::string &default_color,
- Configuration &style);
+ const Configuration &style);
BColor readDatabaseColor(const std::string &rname,
const std::string &default_color,
- Configuration &style);
- XFontSet readDatabaseFontSet(const std::string &rname, Configuration &style);
- XFontStruct *readDatabaseFont(const std::string &rname, Configuration &style);
- XFontSet createFontSet(const std::string &fontname);
+ const Configuration &style);
+ BFont *readDatabaseFont(const std::string &rname, const Configuration &style);
void InitMenu(void);
void LoadStyle(void);
-
+ void updateWorkArea(void);
public:
enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
UnderMousePlacement, LeftRight, RightLeft, TopBottom, BottomTop };
inline bool doFocusNew(void) const { return resource.focus_new; }
inline bool doFocusLast(void) const { return resource.focus_last; }
inline bool doHideToolbar(void) const { return resource.hide_toolbar; }
+ inline bool getWindowToWindowSnap(void) const
+ { return resource.window_to_window_snap; }
+ inline bool getWindowCornerSnap(void) const
+ { return resource.window_corner_snap; }
inline const GC &getOpGC(void) const { return opGC; }
void saveFocusNew(bool f);
void saveFocusLast(bool f);
void saveHideToolbar(bool h);
+ void saveWindowToWindowSnap(bool s);
+ void saveWindowCornerSnap(bool s);
inline void iconUpdate(void) { iconmenu->update(); }
#ifdef HAVE_STRFTIME
unsigned int addWorkspace(void);
unsigned int removeLastWorkspace(void);
- void removeWorkspaceNames(void);
- void addWorkspaceName(const std::string& name);
- const std::string getNameOfWorkspace(unsigned int id);
void changeWorkspaceID(unsigned int id);
void saveWorkspaceNames(void);
void addNetizen(Netizen *n);
void removeNetizen(Window w);
+ void addDesktopWindow(Window window);
+ void removeDesktopWindow(Window window);
+
+ void addSystrayWindow(Window window);
+ void removeSystrayWindow(Window window);
+
void addIcon(BlackboxWindow *w);
void removeIcon(BlackboxWindow *w);
+ void updateClientList(void);
+ void updateStackingList(void);
void manageWindow(Window w);
void unmanageWindow(BlackboxWindow *w, bool remap);
void raiseWindows(Window *workspace_stack, unsigned int num);
+ void lowerDesktops(void);
void reassociateWindow(BlackboxWindow *w, unsigned int wkspc_id,
bool ignore_sticky);
void propagateWindowName(const BlackboxWindow *bw);
void save_rc(void);
void reconfigure(void);
void toggleFocusModel(FocusModel model);
- void updateFocusModel(void);
void rereadMenu(void);
void shutdown(void);
void showPosition(int x, int y);
void showGeometry(unsigned int gx, unsigned int gy);
void hideGeometry(void);
- void buttonPressEvent(XButtonEvent *xbutton);
+ void buttonPressEvent(const XButtonEvent *xbutton);
void updateNetizenCurrentWorkspace(void);
void updateNetizenWorkspaceCount(void);