X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=60fd2ddbea98ffbf75cfb7538ca00bda7a469bf6;hb=30a23b645083b17736cb942e1452f06aad680111;hp=bee3ef82d157f7d2dc90f7157179a72006f30a59;hpb=18378aaba1a552c0d4b9386f60f900c658914754;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index bee3ef82..60fd2ddb 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,9 +1,13 @@
+#ifndef __focus_hh
+#define __focus_hh
+
 #include <string>
 #include <list>
 
 #include "rect.hh"
 #include "point.hh"
 #include "texture.hh"
+#include "style.hh"
 
 namespace otk {
 
@@ -11,13 +15,21 @@ class OtkWidget {
 
 public:
 
+  enum Direction { Horizontal, Vertical };
+
   typedef std::list<OtkWidget *> OtkWidgetList;
 
-  OtkWidget(OtkWidget *parent);
-  OtkWidget(unsigned int screen, Cursor);
+  OtkWidget(OtkWidget *parent, Direction = Horizontal);
+  OtkWidget(Style *style, Direction direction = Horizontal,
+            Cursor cursor = 0, int bevel_width = 1);
 
   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; }
@@ -27,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);
 
@@ -40,7 +58,6 @@ public:
 
   inline bool isFocused(void) const { return _focused; };
   virtual void focus(void);
-  virtual void blur(void);
 
   inline bool hasGrabbedMouse(void) const { return _grabbed_mouse; }
   bool grabMouse(void);
@@ -50,29 +67,51 @@ public:
   bool grabKeyboard(void);
   void ungrabKeyboard(void);
 
-  inline const BTexture *getTexture(void) const { return _texture; }
-  virtual void setTexture(BTexture *texture);
+  inline BTexture *getTexture(void) const { return _texture; }
+  virtual void setTexture(BTexture *texture)
+  { _texture = texture; _dirty = true; }
 
-  virtual void addChild(OtkWidget *child);
+  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; }
 
+  inline int getBevelWidth(void) const { return _bevel_width; }
+  void setBevelWidth(int bevel_width)
+  { assert(bevel_width > 0); _bevel_width = bevel_width; }
+
+  inline Direction getDirection(void) const { return _direction; }
+  void setDirection(Direction dir) { _direction = dir; }
+
+  inline Style *getStyle(void) const { return _style; }
+  void setStyle(Style *style) { _style = style; }
+
 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;
 
@@ -83,11 +122,18 @@ private:
   bool _stretchable_horz;
 
   BTexture *_texture;
+  Pixmap _bg_pixmap;
+  unsigned int _bg_pixel;
 
   Rect _rect;
   unsigned int _screen;
 
-  Cursor _cursor;
+  bool _fixed_width;
+  bool _fixed_height;
+
+  bool _dirty;
 };
 
 }
+
+#endif // __widget_hh