sync with bb. mostly cleanups in Window.cc

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index cb28dea0663f1d78fb44b932b550c6f6939206e9..72e7dc0aca91f229a689297a0587e843279b5d11 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -55,6 +55,7 @@ extern "C" {
 #include "Workspacemenu.hh"
 #include "blackbox.hh"
 class Slit; // forward reference
+class XAtom;
 
 enum TextJustify { LeftJustify = 1, RightJustify, CenterJustify };
 
@@ -119,6 +120,7 @@ private:
   Iconmenu *iconmenu;
   Rootmenu *rootmenu;
   Configuration *config;
+  XAtom *xatom;
 
   typedef std::list<Rootmenu*> RootmenuList;
   RootmenuList rootmenuList;
@@ -127,6 +129,9 @@ private:
   NetizenList netizenList;
   BlackboxWindowList iconList, windowList;
 
+  typedef std::vector<Window> WindowList;
+  WindowList desktopWindowList, systrayWindowList;
+
   Slit *slit;
   Toolbar *toolbar;
   Workspace *current_workspace;
@@ -139,8 +144,6 @@ private:
 
   typedef std::list<Strut*> StrutList;
   StrutList strutList;
-  typedef std::vector<std::string> WorkspaceNamesList;
-  WorkspaceNamesList workspaceNames;
   typedef std::vector<Workspace*> WorkspaceList;
   WorkspaceList workspacesList;
 
@@ -150,7 +153,8 @@ private:
     MenuStyle mstyle;
 
     bool sloppy_focus, auto_raise, auto_edge_balance, ordered_dither,
-         opaque_move, full_max, focus_new, focus_last, click_raise;
+      opaque_move, full_max, focus_new, focus_last, click_raise,
+      hide_toolbar, window_to_window_snap, window_corner_snap;
     BColor border_color;
 
     unsigned int workspaces;
@@ -187,10 +191,10 @@ private:
   void InitMenu(void);
   void LoadStyle(void);
 
-
+  void updateWorkArea(void);
 public:
-  enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement, LeftRight,
-         RightLeft, TopBottom, BottomTop };
+  enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
+         UnderMousePlacement, LeftRight, RightLeft, TopBottom, BottomTop };
   enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
   enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure,
          WindowShade, WindowIconify, WindowMaximize, WindowClose, WindowRaise,
@@ -212,6 +216,11 @@ public:
   inline bool doFullMax(void) const { return resource.full_max; }
   inline bool doFocusNew(void) const { return resource.focus_new; }
   inline bool doFocusLast(void) const { return resource.focus_last; }
+  inline bool doHideToolbar(void) const { return resource.hide_toolbar; }
+  inline bool getWindowToWindowSnap(void) const
+    { return resource.window_to_window_snap; }
+  inline bool getWindowCornerSnap(void) const
+    { return resource.window_corner_snap; }
 
   inline const GC &getOpGC(void) const { return opGC; }
 
@@ -268,6 +277,9 @@ public:
   void saveFullMax(bool f);
   void saveFocusNew(bool f);
   void saveFocusLast(bool f);
+  void saveHideToolbar(bool h);
+  void saveWindowToWindowSnap(bool s);
+  void saveWindowCornerSnap(bool s);
   inline void iconUpdate(void) { iconmenu->update(); }
 
 #ifdef    HAVE_STRFTIME
@@ -294,21 +306,27 @@ public:
 
   unsigned int addWorkspace(void);
   unsigned int removeLastWorkspace(void);
-  void removeWorkspaceNames(void);
-  void addWorkspaceName(const std::string& name);
-  const std::string getNameOfWorkspace(unsigned int id);
   void changeWorkspaceID(unsigned int id);
   void saveWorkspaceNames(void);
 
   void addNetizen(Netizen *n);
   void removeNetizen(Window w);
 
+  void addDesktopWindow(Window window);
+  void removeDesktopWindow(Window window);
+
+  void addSystrayWindow(Window window);
+  void removeSystrayWindow(Window window);
+
   void addIcon(BlackboxWindow *w);
   void removeIcon(BlackboxWindow *w);
 
+  void updateClientList(void);
+  void updateStackingList(void);
   void manageWindow(Window w);
   void unmanageWindow(BlackboxWindow *w, bool remap);
   void raiseWindows(Window *workspace_stack, unsigned int num);
+  void lowerDesktops(void);
   void reassociateWindow(BlackboxWindow *w, unsigned int wkspc_id,
                          bool ignore_sticky);
   void propagateWindowName(const BlackboxWindow *bw);