X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FScreen.hh;h=2511ae854f8f8c02178241ae2ec9eb5ee3b3a7b3;hb=ce5313528ead2692adfdfb41cf5e65dafcc0bc64;hp=71a012dd50d43fb9cf46edaef0ab7fc4a3512147;hpb=b9e40b8b1e055baa6a806c56206eb0baccd7ce0a;p=chaz%2Fopenbox

diff --git a/src/Screen.hh b/src/Screen.hh
index 71a012dd..2511ae85 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -62,10 +62,10 @@ 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;
 
   BFont *font;
 
@@ -120,7 +120,7 @@ private:
   BlackboxWindowList iconList, windowList;
 
   typedef std::vector<Window> WindowList;
-  WindowList desktopWindowList, systrayWindowList;
+  WindowList specialWindowList, desktopWindowList, systrayWindowList;
 
   Slit *slit;
   Toolbar *toolbar;
@@ -148,7 +148,7 @@ private:
     bool sloppy_focus, auto_raise, auto_edge_balance, ordered_dither,
       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;
+      ignore_shaded, ignore_maximized, workspace_warping, shadow_fonts;
 
     int snap_to_windows, snap_to_edges;
     unsigned int snap_offset;
@@ -163,6 +163,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
@@ -212,6 +214,7 @@ public:
   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 doShadowFonts(void) const { return resource.shadow_fonts; }
   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; }
@@ -230,6 +233,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; }
 
@@ -296,6 +303,7 @@ public:
   void saveSnapOffset(int o);
   void saveResistanceSize(int s);
   void saveImageDither(bool d);
+  void saveShadowFonts(bool f);
   void saveAAFonts(bool f);
   void saveOpaqueMove(bool o);
   void saveFullMax(bool f);
@@ -311,6 +319,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
@@ -376,6 +386,9 @@ public:
   void showGeometry(unsigned int gx, unsigned int gy);
   void hideGeometry(void);
 
+  void showWorkspaceMenu(int x, int y);
+  void showRootMenu(int x, int y);
+
   void buttonPressEvent(const XButtonEvent *xbutton);
   void propertyNotifyEvent(const XPropertyEvent *pe);