X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=e2e477dfdb17cf46162c97446263c1d80945fa3b;hb=df0447ce6d57c6ece97e69fc0874595e4ac0ae75;hp=33c6e99f98670cce38aadcd658649ded3f4fd0cb;hpb=9b6e5f9cf49df78be25720f9c4b33a733b856c9b;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index 33c6e99f..e2e477df 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -2,13 +2,13 @@
 #ifndef __widget_hh
 #define __widget_hh
 
-#include "surface.hh"
 #include "rect.hh"
 #include "point.hh"
-#include "texture.hh"
-#include "style.hh"
+#include "rendertexture.hh"
+#include "renderstyle.hh"
 #include "eventdispatcher.hh"
 #include "display.hh"
+#include "surface.hh"
 
 extern "C" {
 #include <assert.h>
@@ -19,7 +19,7 @@ extern "C" {
 
 namespace otk {
 
-class Widget : public Surface, public EventHandler {
+class Widget : public EventHandler {
 
 public:
 
@@ -28,13 +28,13 @@ public:
   typedef std::list<Widget *> WidgetList;
 
   Widget(Widget *parent, Direction = Horizontal);
-  Widget(EventDispatcher *event_dispatcher, Style *style,
+  Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
          Direction direction = Horizontal, Cursor cursor = 0,
          int bevel_width = 1, bool override_redirect = false);
 
   virtual ~Widget();
 
-  virtual void update(void);
+  virtual void update();
 
   void exposeHandler(const XExposeEvent &e);
   void configureHandler(const XConfigureEvent &e);
@@ -42,7 +42,8 @@ public:
   inline Window window(void) const { return _window; }
   inline const Widget *parent(void) const { return _parent; }
   inline const WidgetList &children(void) const { return _children; }
-  inline Rect rect(void) const { return Rect(_pos, size()); }
+  inline unsigned int screen(void) const { return _screen; }
+  inline const Rect &rect(void) const { return _rect; }
 
   void move(const Point &to);
   void move(int x, int y);
@@ -50,6 +51,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);
 
@@ -73,12 +77,12 @@ public:
   bool grabKeyboard(void);
   void ungrabKeyboard(void);
 
-  inline Texture *texture(void) const { return _texture; }
-  virtual void setTexture(Texture *texture)
+  inline RenderTexture *texture(void) const { return _texture; }
+  virtual void setTexture(RenderTexture *texture)
     { _texture = texture; _dirty = true; }
 
-  inline const Color *borderColor(void) const { return _bcolor; }
-  virtual void setBorderColor(const Color *color) {
+  inline const RenderColor *borderColor(void) const { return _bcolor; }
+  virtual void setBorderColor(const RenderColor *color) {
     assert(color); _bcolor = color;
     XSetWindowBorder(**display, _window, color->pixel());
   }
@@ -111,8 +115,8 @@ public:
   inline Direction direction(void) const { return _direction; }
   void setDirection(Direction dir) { _direction = dir; }
 
-  inline Style *style(void) const { return _style; }
-  virtual void setStyle(Style *style);
+  inline RenderStyle *style(void) const { return _style; }
+  virtual void setStyle(RenderStyle *style);
 
   inline EventDispatcher *eventDispatcher(void)
     { return _event_dispatcher; }
@@ -129,13 +133,14 @@ protected:
   virtual void adjustVert(void);
   virtual void internalResize(int width, int height);
   virtual void render(void);
+  virtual void renderForeground() {} // for overriding
 
   Window _window;
 
   Widget *_parent;
   WidgetList _children;
 
-  Style *_style;
+  RenderStyle *_style;
   Direction _direction;
   Cursor _cursor;
   int _bevel_width;
@@ -149,19 +154,21 @@ protected:
   bool _stretchable_vert;
   bool _stretchable_horz;
 
-  Texture *_texture;
+  RenderTexture *_texture;
   Pixmap _bg_pixmap;
   unsigned int _bg_pixel;
 
-  const Color *_bcolor;
+  const RenderColor *_bcolor;
   unsigned int _bwidth;
 
-  Point _pos;
+  Rect _rect;
   unsigned int _screen;
 
   bool _fixed_width;
   bool _fixed_height;
 
+  Surface *_surface;
+
   EventDispatcher *_event_dispatcher;
 };