X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=2e58cc9928459726876bb984822dd56ccbabd117;hb=52b83a9dbb2b7823d5f78781f5948dfd8d77d50b;hp=ca65730c1a5b795800bfde0e34f983f203c48297;hpb=6d68ac2256dc212dc0f2dd8a15d013d6ce3fc4b8;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index ca65730c..2e58cc99 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,17 +1,23 @@
-#ifndef __focus_hh
-#define __focus_hh
-
-#include <string>
-#include <list>
+#ifndef __widget_hh
+#define __widget_hh
 
 #include "rect.hh"
 #include "point.hh"
 #include "texture.hh"
 #include "style.hh"
+#include "eventdispatcher.hh"
+#include "application.hh"
+
+extern "C" {
+#include <assert.h>
+}
+
+#include <string>
+#include <list>
 
 namespace otk {
 
-class OtkWidget {
+class OtkWidget : public OtkEventHandler {
 
 public:
 
@@ -20,14 +26,16 @@ public:
   typedef std::list<OtkWidget *> OtkWidgetList;
 
   OtkWidget(OtkWidget *parent, Direction = Horizontal);
-  OtkWidget(Style *style, Direction direction = Horizontal,
-            Cursor cursor = 0, int bevel_width = 1);
+  OtkWidget(OtkEventDispatcher *event_dispatcher, Style *style,
+            Direction direction = Horizontal, Cursor cursor = 0,
+            int bevel_width = 1);
 
   virtual ~OtkWidget();
 
   virtual void update(void);
 
-  virtual bool expose(const XExposeEvent &e);
+  void exposeHandler(const XExposeEvent &e);
+  void configureHandler(const XConfigureEvent &e);
 
   inline Window getWindow(void) const { return _window; }
   inline const OtkWidget *getParent(void) const { return _parent; }
@@ -41,6 +49,9 @@ public:
   virtual void setWidth(int);
   virtual void setHeight(int);
 
+  virtual int width() const { return _rect.width(); }
+  virtual int height() const { return _rect.height(); }
+
   virtual void resize(const Point &to);
   virtual void resize(int x, int y);
 
@@ -49,8 +60,8 @@ public:
   virtual void setGeometry(int x, int y, int width, int height);
 
   inline bool isVisible(void) const { return _visible; };
-  virtual void show(void);
-  virtual void hide(void);
+  virtual void show(bool recursive = false);
+  virtual void hide(bool recursive = false);
 
   inline bool isFocused(void) const { return _focused; };
   virtual void focus(void);
@@ -71,10 +82,10 @@ public:
   virtual void removeChild(OtkWidget *child);
 
   inline bool isStretchableHorz(void) const { return _stretchable_horz; }
-  void setStretchableHorz(bool s_horz) { _stretchable_horz = s_horz; }
+  void setStretchableHorz(bool s_horz = true) { _stretchable_horz = s_horz; }
 
   inline bool isStretchableVert(void) const { return _stretchable_vert; }
-  void setStretchableVert(bool s_vert)  { _stretchable_vert = s_vert; }
+  void setStretchableVert(bool s_vert = true)  { _stretchable_vert = s_vert; }
 
   inline Cursor getCursor(void) const { return _cursor; }
 
@@ -86,7 +97,17 @@ public:
   void setDirection(Direction dir) { _direction = dir; }
 
   inline Style *getStyle(void) const { return _style; }
-  void setStyle(Style *style) { _style = style; }
+  virtual void setStyle(Style *style) { assert(style); _style = style; }
+
+  inline OtkEventDispatcher *getEventDispatcher(void)
+  { return _event_dispatcher; }
+  void setEventDispatcher(OtkEventDispatcher *disp);
+
+  void unmanaged(void) { _unmanaged = true; }
+
+protected:
+  
+  bool _dirty;
 
 private:
 
@@ -106,6 +127,7 @@ private:
   Direction _direction;
   Cursor _cursor;
   int _bevel_width;
+  int _ignore_config;
 
   bool _visible;
   bool _focused;
@@ -126,8 +148,10 @@ private:
   bool _fixed_width;
   bool _fixed_height;
 
-protected:
-  bool _dirty;
+  bool _unmanaged;
+
+  OtkEventDispatcher *_event_dispatcher;
+  OtkApplication *_application;
 };
 
 }