X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FScreen.hh;h=c6044812897d0e09f9d8afa8a59f3d3637c839f1;hb=fa3fb793e7e8a4d7dfdc1d4997983ea59a8b6924;hp=32440d7b6d9c1315b42d1371de573bafa2d34b83;hpb=c2afc72a41a4093f1fdfdf3245d5d70ef8bf9ad2;p=chaz%2Fopenbox

diff --git a/src/Screen.hh b/src/Screen.hh
index 32440d7b..c6044812 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -72,7 +72,8 @@ 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;
+    h_focus, h_unfocus, b_focus, b_unfocus, b_pressed, b_pressed_focus,
+    b_pressed_unfocus, g_focus, g_unfocus;
 
 #ifdef    BITMAPBUTTONS
   PixmapMask close_button, max_button, icon_button, stick_button;
@@ -206,7 +207,8 @@ private:
   
   BTexture readDatabaseTexture(const std::string &rname,
                                const std::string &default_color,
-                               const Configuration &style);
+                               const Configuration &style, 
+                               bool allowNoTexture = false);
   BColor readDatabaseColor(const std::string &rname,
                            const std::string &default_color,
                            const Configuration &style);
@@ -272,7 +274,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; }
 
@@ -397,9 +399,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);