sync with bb-cvs

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index ca8194ce317172d9204f30b42550a82efd924ead..cb9a8ae2693400e2944e170c9b1d1c22565fc764 100644 (file)
--- 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;
@@ -151,6 +151,7 @@ private:
       ignore_shaded, ignore_maximized, workspace_warping;
 
     int snap_to_windows, snap_to_edges;
+    unsigned int snap_offset;
 
     BColor border_color;
 
@@ -270,6 +271,8 @@ public:
   { return resource.workspaces; }
   inline int getPlacementPolicy(void) const
   { return resource.placement_policy; }
+  inline int getSnapOffset(void) const
+  { return resource.snap_offset; }
   inline int getSnapThreshold(void) const
   { return resource.snap_threshold; }
   inline int getResistanceSize(void) const
@@ -290,6 +293,7 @@ public:
   void saveRowPlacementDirection(int d);
   void saveColPlacementDirection(int d);
   void saveSnapThreshold(int t);
+  void saveSnapOffset(int o);
   void saveResistanceSize(int s);
   void saveImageDither(bool d);
   void saveAAFonts(bool f);
@@ -372,6 +376,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);