merged with 2_1-merged-to-HEAD-2002-09-30

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index dee0a962cc4164f5b22c2939ff2c3b438efd95d4..c96c973e0ce2ea635e4b504a29e741ecc5314f4f 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -61,12 +61,22 @@ struct Strut;
 
 enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
 
+#ifdef    BITMAPBUTTONS
+struct PixmapMask {
+  Pixmap mask;
+  unsigned int w, h;
+};
+#endif // BITMAPBUTTONS
+
 struct WindowStyle {
   BColor l_text_focus, l_text_unfocus, b_pic_focus,
     b_pic_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;
 
+#ifdef    BITMAPBUTTONS
+  PixmapMask close_button, max_button, icon_button, stick_button;
+#endif // BITMAPBUTTONS
   BFont *font;
 
   TextJustify justify;
@@ -79,6 +89,10 @@ struct ToolbarStyle {
   BColor l_text, w_text, c_text, b_pic;
   BTexture toolbar, label, window, button, pressed, clock;
 
+#ifdef    BITMAPBUTTONS
+  PixmapMask left_button, right_button;
+#endif // BITMAPBUTTONS
+  
   BFont *font;
 
   TextJustify justify;
@@ -90,7 +104,11 @@ struct ToolbarStyle {
 struct MenuStyle {
   BColor t_text, f_text, h_text, d_text;
   BTexture title, frame, hilite;
-
+  
+#ifdef    BITMAPBUTTONS
+  PixmapMask bullet_image, tick_image;
+#endif // BITMAPBUTTONS
+  
   BFont *t_font, *f_font;
 
   TextJustify t_justify, f_justify;
@@ -163,6 +181,8 @@ private:
     unsigned int handle_width, bevel_width, frame_width, border_width,
       resize_zones;
 
+    unsigned int root_menu_button, workspace_menu_button;
+
 #ifdef    HAVE_STRFTIME
     std::string strftime_format;
 #else // !HAVE_STRFTIME
@@ -178,6 +198,12 @@ private:
 
   bool parseMenuFile(FILE *file, Rootmenu *menu);
 
+#ifdef    BITMAPBUTTONS
+  void readDatabaseMask(const std::string &rname,
+                        PixmapMask &pixmapMask,
+                        const Configuration &style);
+#endif // BITMAPBUTTONS
+  
   BTexture readDatabaseTexture(const std::string &rname,
                                const std::string &default_color,
                                const Configuration &style);
@@ -231,6 +257,10 @@ public:
   inline bool doWorkspaceWarping(void) const
     { return resource.workspace_warping; }
   inline int rootScrollDirection(void) const { return resource.root_scroll; }
+  inline unsigned int rootMenuButton(void) const
+    { return resource.root_menu_button; }
+  inline unsigned int workspaceMenuButton(void) const
+    { return resource.workspace_menu_button; }
 
   inline const GC &getOpGC(void) const { return opGC; }
 
@@ -242,7 +272,7 @@ public:
   inline Slit *getSlit(void) { return slit; }
   inline Toolbar *getToolbar(void) { return toolbar; }
 
-  Workspace *getWorkspace(unsigned int index);
+  Workspace *getWorkspace(unsigned int index) const;
 
   inline Workspace *getCurrentWorkspace(void) { return current_workspace; }
 
@@ -313,6 +343,8 @@ public:
   void saveAllowScrollLock(bool a);
   void saveWorkspaceWarping(bool w);
   void saveRootScrollDirection(int d);
+  void saveRootMenuButton(unsigned int b);
+  void saveWorkspaceMenuButton(unsigned int b);
   inline void iconUpdate(void) { iconmenu->update(); }
 
 #ifdef    HAVE_STRFTIME
@@ -365,9 +397,9 @@ public:
   void reassociateWindow(BlackboxWindow *w, unsigned int wkspc_id,
                          bool ignore_sticky);
   void propagateWindowName(const BlackboxWindow *bw);
-  void prevFocus(void);
-  void nextFocus(void);
-  void raiseFocus(void);
+  void prevFocus(void) const;
+  void nextFocus(void) const;
+  void raiseFocus(void) const;
   void load_rc(void);
   void save_rc(void);
   void reconfigure(void);