X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=util%2Fepist%2Fwindow.hh;h=406efe09487c343c01c2bc35649b5a3a8772c4ea;hb=a0cf45a0ef5f7e2cbf0833f4d8655131912400cc;hp=29e2d6ffcffe54e85f572af4b5fe81d18f10d3fd;hpb=c6234a4de0263828e89e3b8812cbb93e72d13ffc;p=chaz%2Fopenbox

diff --git a/util/epist/window.hh b/util/epist/window.hh
index 29e2d6ff..406efe09 100644
--- a/util/epist/window.hh
+++ b/util/epist/window.hh
@@ -30,24 +30,36 @@ extern "C" {
 #include <list>
 #include <string>
 
+#include "../../src/Util.hh"
+
 class epist;
 class screen;
-class XWindow;
 class XAtom;
 
-typedef std::list<XWindow *> WindowList;
-
 class XWindow {
+public:
+  enum Max {
+    Max_None,
+    Max_Horz,
+    Max_Vert,
+    Max_Full
+  };
+
 private:
-  epist *_epist;
+  epist  *_epist;
   screen *_screen;
-  XAtom *_xatom;
+  XAtom  *_xatom;
+
   Window _window;
-  
+
   unsigned int _desktop;
   std::string _title;
   std::string _app_name;
   std::string _app_class;
+  Rect _rect;
+  int _inc_x, _inc_y; // resize increments
+  int _base_x, _base_y; // base size
+  int _gravity;
 
   // states
   bool _shaded;
@@ -57,11 +69,15 @@ private:
 
   bool _unmapped;
 
+  void updateDimentions();
+  void updateHints();
   void updateState();
   void updateDesktop();
   void updateTitle();
   void updateClass();
 
+  void findFramePosition(int &x, int &y) const;
+
 public:
   XWindow(epist *epist, screen *screen, Window window);
   virtual ~XWindow();
@@ -71,12 +87,17 @@ public:
   inline unsigned int desktop() const { return _desktop; }
   inline const std::string &title() const { return _title; }
   inline const std::string &appName() const { return _app_name; }
-  inline const std::string &appClass() const { return _app_name; }
+  inline const std::string &appClass() const { return _app_class; }
   
   inline bool shaded() const { return _shaded; }
   inline bool iconic() const { return _iconic; }
   inline bool maxVert() const { return _max_vert; }
   inline bool maxHorz() const { return _max_horz; }
+  inline const Rect &area() const { return _rect; }
+  inline unsigned int x() const { return _rect.x(); }
+  inline unsigned int y() const { return _rect.y(); }
+  inline unsigned int width() const { return _rect.width(); }
+  inline unsigned int height() const { return _rect.height(); }
 
   void processEvent(const XEvent &e);
 
@@ -85,9 +106,17 @@ public:
   void raise() const;
   void lower() const;
   void iconify() const;
+  void focus() const;
+  void sendTo(unsigned int dest) const;
+  void move(int x, int y) const;
+  void resize(unsigned int width, unsigned int height) const;
+  void toggleMaximize(Max max) const; // i hate toggle functions
+  void maximize(Max max) const;
 
   bool operator == (const XWindow &w) const { return w._window == _window; }
   bool operator == (const Window &w) const { return w == _window; }
 };
 
+typedef std::list<XWindow *> WindowList;
+
 #endif // __window_hh