X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=60fd2ddbea98ffbf75cfb7538ca00bda7a469bf6;hb=c09095554429d93f2e1f4fef2d6028a523f6206c;hp=dd12de7c14cf5c5645a2c62226979d387360a835;hpb=f0e2abf573760ab075b4683d7724f72f2d00f914;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index dd12de7c..60fd2ddb 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,3 +1,6 @@
+#ifndef __focus_hh
+#define __focus_hh
+
 #include <string>
 #include <list>
 
@@ -22,6 +25,11 @@ public:
 
   virtual ~OtkWidget();
 
+  virtual void update(void);
+
+  virtual bool expose(const XExposeEvent &e);
+  virtual bool configure(const XConfigureEvent &e);
+
   inline Window getWindow(void) const { return _window; }
   inline const OtkWidget *getParent(void) const { return _parent; }
   inline const OtkWidgetList &getChildren(void) const { return _children; }
@@ -31,6 +39,12 @@ public:
   void move(const Point &to);
   void move(int x, int y);
 
+  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);
 
@@ -53,16 +67,17 @@ public:
   bool grabKeyboard(void);
   void ungrabKeyboard(void);
 
-  inline const BTexture *getTexture(void) const { return _texture; }
-  virtual void setTexture(BTexture *texture = 0);
+  inline BTexture *getTexture(void) const { return _texture; }
+  virtual void setTexture(BTexture *texture)
+  { _texture = texture; _dirty = true; }
 
   virtual void addChild(OtkWidget *child, bool front = false);
   virtual void removeChild(OtkWidget *child);
 
-  inline bool getStretchableHorz(void) const { return _stretchable_horz; }
+  inline bool isStretchableHorz(void) const { return _stretchable_horz; }
   void setStretchableHorz(bool s_horz) { _stretchable_horz = s_horz; }
 
-  inline bool getStretchableVert(void) const { return _stretchable_vert; }
+  inline bool isStretchableVert(void) const { return _stretchable_vert; }
   void setStretchableVert(bool s_vert)  { _stretchable_vert = s_vert; }
 
   inline Cursor getCursor(void) const { return _cursor; }
@@ -80,16 +95,22 @@ public:
 private:
 
   void create(void);
+  void adjust(void);
+  void adjustHorz(void);
+  void adjustVert(void);
+  void internalResize(int width, int height);
+  void render(void);
 
   Window _window;
 
   OtkWidget *_parent;
   OtkWidgetList _children;
- 
+
   Style *_style;
   Direction _direction;
   Cursor _cursor;
   int _bevel_width;
+  int _ignore_config;
 
   bool _visible;
   bool _focused;
@@ -102,9 +123,17 @@ private:
 
   BTexture *_texture;
   Pixmap _bg_pixmap;
+  unsigned int _bg_pixel;
 
   Rect _rect;
   unsigned int _screen;
+
+  bool _fixed_width;
+  bool _fixed_height;
+
+  bool _dirty;
 };
 
 }
+
+#endif // __widget_hh