sync with bb. mostly cleanups in Window.cc

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index 44199b3437c5881f5238616f792222c387408f0b..72e7dc0aca91f229a689297a0587e843279b5d11 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -129,6 +129,9 @@ private:
   NetizenList netizenList;
   BlackboxWindowList iconList, windowList;
 
+  typedef std::vector<Window> WindowList;
+  WindowList desktopWindowList, systrayWindowList;
+
   Slit *slit;
   Toolbar *toolbar;
   Workspace *current_workspace;
@@ -141,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;
 
@@ -190,7 +191,7 @@ private:
   void InitMenu(void);
   void LoadStyle(void);
 
-
+  void updateWorkArea(void);
 public:
   enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
          UnderMousePlacement, LeftRight, RightLeft, TopBottom, BottomTop };
@@ -305,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);