properly handle workspace names, and changes to them.

[chaz/openbox] / src / Screen.hh

diff --git a/src/Screen.hh b/src/Screen.hh
index 4de9daa2da45471c01c7b1758345165ebdfe7aef..37946b99aea49f5db7a8c01572b471d488ba58b5 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -156,7 +156,8 @@ private:
     int toolbar_placement, toolbar_width_percent, placement_policy,
       edge_snap_threshold, row_direction, col_direction;
 
-    unsigned int handle_width, bevel_width, frame_width, border_width;
+    unsigned int handle_width, bevel_width, frame_width, border_width,
+      resize_zones;
 
 #ifdef    HAVE_STRFTIME
     std::string strftime_format;
@@ -241,12 +242,14 @@ public:
   { return resource.frame_width; }
   inline unsigned int getBorderWidth(void) const
   { return resource.border_width; }
+  inline unsigned int getResizeZones(void) const
+  { return resource.resize_zones; }
 
-  inline unsigned int getCurrentWorkspaceID(void)
+  inline unsigned int getCurrentWorkspaceID(void) const
   { return current_workspace->getID(); }
-  inline unsigned int getWorkspaceCount(void)
+  inline unsigned int getWorkspaceCount(void) const
   { return workspacesList.size(); }
-  inline unsigned int getIconCount(void) { return iconList.size(); }
+  inline unsigned int getIconCount(void) const { return iconList.size(); }
   inline unsigned int getNumberOfWorkspaces(void) const
   { return resource.workspaces; }
   inline int getPlacementPolicy(void) const
@@ -276,6 +279,7 @@ public:
   void saveHideToolbar(bool h);
   void saveWindowToWindowSnap(bool s);
   void saveWindowCornerSnap(bool s);
+  void saveResizeZones(unsigned int z);
   inline void iconUpdate(void) { iconmenu->update(); }
 
 #ifdef    HAVE_STRFTIME
@@ -322,7 +326,7 @@ public:
   void manageWindow(Window w);
   void unmanageWindow(BlackboxWindow *w, bool remap);
   void raiseWindows(Window *workspace_stack, unsigned int num);
-  void lowerDesktops(void);
+  void lowerWindows(Window *workspace_stack, unsigned int num);
   void reassociateWindow(BlackboxWindow *w, unsigned int wkspc_id,
                          bool ignore_sticky);
   void propagateWindowName(const BlackboxWindow *bw);
@@ -340,6 +344,7 @@ public:
   void hideGeometry(void);
 
   void buttonPressEvent(const XButtonEvent *xbutton);
+  void propertyNotifyEvent(const XPropertyEvent *pe);
 
   void updateNetizenCurrentWorkspace(void);
   void updateNetizenWorkspaceCount(void);