X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.hh;h=be30baa58fce1e89524987a6bb8000c4c918d776;hb=fc792813a24d22330b49eda8b3ef7054eadf20d3;hp=55b0babd04f4147cb0d09dce19f30fbf6243c435;hpb=c9be3ee06121bc4d0dec3586918607f18dabdb89;p=chaz%2Fopenbox

diff --git a/util/epist/screen.hh b/util/epist/screen.hh
index 55b0babd..be30baa5 100644
--- a/util/epist/screen.hh
+++ b/util/epist/screen.hh
@@ -28,27 +28,34 @@ extern "C" {
 }
 
 #include <vector>
+#include <string>
 
 #include "window.hh"
 
 class epist;
 class screen;
 class XAtom;
+class ScreenInfo;
 
 class screen {
   epist *_epist;
   XAtom *_xatom;
   int _number;
   Window _root;
+  const ScreenInfo *_info;
 
   std::string _wm_name;
   
   WindowList _clients;
   WindowList::iterator _active;
+  unsigned int _active_desktop;
+  unsigned int _num_desktops;
 
   bool _managed;
 
   XWindow *findWindow(const XEvent &e) const;
+  void updateNumDesktops();
+  void updateActiveDesktop();
   void updateClientList();
   void updateActiveWindow();
   bool doAddWindow(Window window) const;
@@ -60,15 +67,21 @@ public:
   
   inline Window rootWindow() const { return _root; }
   inline bool managed() const { return _managed; }
+  inline int number() const { return _number; }
   
   void processEvent(const XEvent &e);
 
   void handleKeypress(const XEvent &e);
 
-  void cycleWindow(const bool forward) const;
-  void cycleWorkspace(const bool forward) const;
+  void cycleWindow(const bool forward, const bool alldesktops = false,
+                   const bool sameclass = false,
+                   const std::string &classname = "") const;
+  void cycleWorkspace(const bool forward, const bool loop = true) const;
   void changeWorkspace(const int num) const;
   void toggleShaded(const Window win) const;
+  void execCommand(const std::string &cmd) const;
+
+  void grabKey(const KeyCode keyCode, const int modifierMask) const;
 };
 
 #endif // __screen_hh