extern "C" {
#include <X11/Xlib.h>
-#include <X11/Xresource.h>
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
#include "Workspace.hh"
#include "Workspacemenu.hh"
#include "blackbox.hh"
+
class Slit; // forward reference
+class BFont;
+class XAtom;
+struct Strut;
enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
struct WindowStyle {
- BColor f_focus, f_unfocus, l_text_focus, l_text_unfocus, b_pic_focus,
+ BColor l_text_focus, l_text_unfocus, b_pic_focus,
b_pic_unfocus;
- BTexture t_focus, t_unfocus, l_focus, l_unfocus, h_focus, h_unfocus,
- b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
+ BTexture f_focus, f_unfocus, 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;
};
-struct Strut {
- unsigned int top, bottom, left, right;
-
- Strut(void): top(0), bottom(0), left(0), right(0) {}
-};
-
class BScreen : public ScreenInfo {
private:
bool root_colormap_installed, managed, geom_visible;
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 specialWindowList, desktopWindowList, systrayWindowList;
+
Slit *slit;
Toolbar *toolbar;
Workspace *current_workspace;
unsigned long event_mask;
Rect usableArea;
+#ifdef XINERAMA
+ RectList xineramaUsableArea;
+#endif // XINERAMA
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;
+ opaque_move, full_max, focus_new, focus_last, click_raise,
+ allow_scroll_lock, hide_toolbar, window_corner_snap, aa_fonts,
+ ignore_shaded, ignore_maximized, workspace_warping;
+
+ int snap_to_windows, snap_to_edges;
+ unsigned int snap_offset;
+
BColor border_color;
unsigned int workspaces;
int toolbar_placement, toolbar_width_percent, placement_policy,
- edge_snap_threshold, row_direction, col_direction;
+ snap_threshold, row_direction, col_direction, root_scroll,
+ resistance_size;
- unsigned int handle_width, bevel_width, frame_width, border_width;
+ unsigned int handle_width, bevel_width, frame_width, border_width,
+ resize_zones;
#ifdef HAVE_STRFTIME
std::string strftime_format;
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 &rbasename,
+ const Configuration &style);
void InitMenu(void);
void LoadStyle(void);
-
+ void updateWorkArea(void);
public:
- enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement, LeftRight,
- RightLeft, TopBottom, BottomTop };
+ enum { WindowNoSnap = 0, WindowSnap, WindowResistance };
+ enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
+ UnderMousePlacement, ClickMousePlacement, LeftRight, RightLeft,
+ TopBottom, BottomTop, IgnoreShaded, IgnoreMaximized };
enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure,
WindowShade, WindowIconify, WindowMaximize, WindowClose, WindowRaise,
WindowLower, WindowStick, WindowKill, SetStyle };
enum FocusModel { SloppyFocus, ClickToFocus };
+ enum RootScrollDirection { NoScroll = 0, NormalScroll, ReverseScroll };
BScreen(Blackbox *bb, unsigned int scrn);
~BScreen(void);
inline bool doAutoRaise(void) const { return resource.auto_raise; }
inline bool doClickRaise(void) const { return resource.click_raise; }
inline bool isScreenManaged(void) const { return managed; }
+ inline bool doAAFonts(void) const { return resource.aa_fonts; }
inline bool doImageDither(void) const { return image_control->doDither(); }
inline bool doOrderedDither(void) const { return resource.ordered_dither; }
inline bool doOpaqueMove(void) const { return resource.opaque_move; }
inline bool doFullMax(void) const { return resource.full_max; }
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 int getWindowToWindowSnap(void) const
+ { return resource.snap_to_windows; }
+ inline int getWindowToEdgeSnap(void) const
+ { return resource.snap_to_edges; }
+ inline bool getWindowCornerSnap(void) const
+ { return resource.window_corner_snap; }
+ inline bool allowScrollLock(void) const { return resource.allow_scroll_lock; }
+ inline bool doWorkspaceWarping(void) const
+ { return resource.workspace_warping; }
+ inline int rootScrollDirection(void) const { return resource.root_scroll; }
inline const GC &getOpGC(void) const { return opGC; }
{ return resource.frame_width; }
inline unsigned int getBorderWidth(void) const
{ return resource.border_width; }
-
- inline unsigned int getCurrentWorkspaceID(void)
+ inline unsigned int getResizeZones(void) const
+ { return resource.resize_zones; }
+ inline bool getPlaceIgnoreShaded(void) const
+ { return resource.ignore_shaded; }
+ inline bool getPlaceIgnoreMaximized(void) const
+ { return resource.ignore_maximized; }
+
+ inline unsigned int getCurrentWorkspaceID(void) const
{ return current_workspace->getID(); }
- inline unsigned int getWorkspaceCount(void)
+ inline unsigned int getWorkspaceCount(void) const
{ return workspacesList.size(); }
- inline unsigned int getIconCount(void) { return iconList.size(); }
+ inline unsigned int getIconCount(void) const { return iconList.size(); }
inline unsigned int getNumberOfWorkspaces(void) const
{ return resource.workspaces; }
inline int getPlacementPolicy(void) const
{ return resource.placement_policy; }
- inline int getEdgeSnapThreshold(void) const
- { return resource.edge_snap_threshold; }
+ inline int getSnapOffset(void) const
+ { return resource.snap_offset; }
+ inline int getSnapThreshold(void) const
+ { return resource.snap_threshold; }
+ inline int getResistanceSize(void) const
+ { return resource.resistance_size; }
inline int getRowPlacementDirection(void) const
{ return resource.row_direction; }
inline int getColPlacementDirection(void) const
{ return resource.col_direction; }
+ void changeWorkspaceCount(unsigned int new_count);
+
inline void setRootColormapInstalled(bool r) { root_colormap_installed = r; }
void saveSloppyFocus(bool s);
void saveAutoRaise(bool a);
void savePlacementPolicy(int p);
void saveRowPlacementDirection(int d);
void saveColPlacementDirection(int d);
- void saveEdgeSnapThreshold(int t);
+ void saveSnapThreshold(int t);
+ void saveSnapOffset(int o);
+ void saveResistanceSize(int s);
void saveImageDither(bool d);
+ void saveAAFonts(bool f);
void saveOpaqueMove(bool o);
void saveFullMax(bool f);
void saveFocusNew(bool f);
void saveFocusLast(bool f);
+ void saveHideToolbar(bool h);
+ void saveWindowToEdgeSnap(int s);
+ void saveWindowToWindowSnap(int s);
+ void saveWindowCornerSnap(bool s);
+ void saveResizeZones(unsigned int z);
+ void savePlaceIgnoreShaded(bool i);
+ void savePlaceIgnoreMaximized(bool i);
+ void saveAllowScrollLock(bool a);
+ void saveWorkspaceWarping(bool w);
+ void saveRootScrollDirection(int d);
inline void iconUpdate(void) { iconmenu->update(); }
#ifdef HAVE_STRFTIME
BlackboxWindow *getIcon(unsigned int index);
+ // allAvailableAreas should be used whenever possible instead of this function
+ // as then Xinerama will work correctly.
const Rect& availableArea(void) const;
+#ifdef XINERAMA
+ const RectList& allAvailableAreas(void) const;
+#endif // XINERAMA
void updateAvailableArea(void);
void addStrut(Strut *strut);
void removeStrut(Strut *strut);
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 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 lowerWindows(Window *workspace_stack, unsigned int num);
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 showWorkspaceMenu(int x, int y);
+ void showRootMenu(int x, int y);
+
+ void buttonPressEvent(const XButtonEvent *xbutton);
+ void propertyNotifyEvent(const XPropertyEvent *pe);
void updateNetizenCurrentWorkspace(void);
void updateNetizenWorkspaceCount(void);
projects / chaz / openbox / blobdiff