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;
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;
bool sloppy_focus, auto_raise, auto_edge_balance, ordered_dither,
opaque_move, full_max, focus_new, focus_last, click_raise,
- hide_toolbar, window_to_window_snap, window_corner_snap;
+ hide_toolbar, window_to_window_snap, window_corner_snap, aa_fonts,
+ ignore_shaded, ignore_maximized;
BColor border_color;
unsigned int workspaces;
int toolbar_placement, toolbar_width_percent, placement_policy,
edge_snap_threshold, row_direction, col_direction;
- 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,
- UnderMousePlacement, LeftRight, RightLeft, TopBottom, BottomTop };
+ UnderMousePlacement, 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,
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; }
{ 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
void saveColPlacementDirection(int d);
void saveEdgeSnapThreshold(int t);
void saveImageDither(bool d);
+ void saveAAFonts(bool f);
void saveOpaqueMove(bool o);
void saveFullMax(bool f);
void saveFocusNew(bool f);
void saveHideToolbar(bool h);
void saveWindowToWindowSnap(bool s);
void saveWindowCornerSnap(bool s);
+ void saveResizeZones(unsigned int z);
+ void savePlaceIgnoreShaded(bool i);
+ void savePlaceIgnoreMaximized(bool i);
inline void iconUpdate(void) { iconmenu->update(); }
#ifdef HAVE_STRFTIME
void manageWindow(Window w);
void unmanageWindow(BlackboxWindow *w, bool remap);
void raiseWindows(Window *workspace_stack, unsigned int num);
- void lowerDesktops(void);
+ 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 buttonPressEvent(const XButtonEvent *xbutton);
+ void propertyNotifyEvent(const XPropertyEvent *pe);
void updateNetizenCurrentWorkspace(void);
void updateNetizenWorkspaceCount(void);