X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fscreen.hh;h=87eeff74807154ef824f6e64d9be806f116fc597;hb=91b078433073e674c0844de44124dbce4d1e2b82;hp=4c3a47c2f89a5c8b7387f6fbb28808e3bab9a18c;hpb=6d403febc6fe6c29728d013280756f7951f195db;p=chaz%2Fopenbox

diff --git a/util/epist/screen.hh b/util/epist/screen.hh
index 4c3a47c2..87eeff74 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.
+// 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
@@ -46,8 +46,9 @@ class screen {
 
   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;
 
@@ -68,18 +69,24 @@ 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 bool alldesktops = false,
+  void cycleWindow(const bool forward, const bool allscreens = false,
+                   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;
+  void ungrabKey(const KeyCode keyCode, const int modifierMask) const;
 };
 
 #endif // __screen_hh