X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.hh;h=98f8a351023ff03b24349cdb5c061432e6c9ccae;hb=bd05f7ec58f3e1f5839c372ad4fb007a8d8866f5;hp=42e685de87a7a81dddcce4d5b6ce191cee51a254;hpb=b4411cb1ef1c25a287181b570e974545e1010530;p=chaz%2Fopenbox

diff --git a/util/epist/screen.hh b/util/epist/screen.hh
index 42e685de..98f8a351 100644
--- a/util/epist/screen.hh
+++ b/util/epist/screen.hh
@@ -1,5 +1,5 @@
-// -*- mode: C++; indent-tabs-mode: nil; -*-
-// screen.hh for Epistophy - a key handler for NETWM/EWMH window managers.
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// screen.hh for Epistrophy - a key handler for NETWM/EWMH window managers.
 // Copyright (c) 2002 - 2002 Ben Jansens <ben at orodu.net>
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,27 +28,35 @@ 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;
+  WindowList &_clients;
+  WindowList::iterator &_active;
+  WindowList::iterator _last_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,14 +68,30 @@ public:
   
   inline Window rootWindow() const { return _root; }
   inline bool managed() const { return _managed; }
+  inline int number() const { return _number; }
+
+  const XWindow *lastActiveWindow() const;
   
   void processEvent(const XEvent &e);
-
   void handleKeypress(const XEvent &e);
+  void updateEverything();
+
+  void cycleWindow(const bool forward, const int increment,
+                   const bool allscreens = false,
+                   const bool alldesktops = false,
+                   const bool sameclass = false,
+                   const std::string &classname = "") const;
+  void cycleWorkspace(const bool forward, const int increment,
+                      const bool loop = true) const;
+  void changeWorkspace(const int num) const;
+  void changeWorkspaceVert(const int num) const;
+  void changeWorkspaceHorz(const int num) const;
 
-  void cycleWorkspace(const bool forward)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;
+  void ungrabKey(const KeyCode keyCode, const int modifierMask) const;
 };
 
 #endif // __screen_hh