X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=3427e6814942d5a6ee8092ddb973f29fdb5d55db;hb=5072931be0ff28cd9447926d50fe5ea202e2c370;hp=337bbf14a493a1002e09820cccd9d186c2c48c56;hpb=bf404e092be46801b1a78f9a71e10d0d00b75894;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index 337bbf14..3427e681 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,12 +1,14 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 #ifndef __widget_hh
 #define __widget_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>
@@ -17,33 +19,33 @@ extern "C" {
 
 namespace otk {
 
-class OtkWidget : public OtkEventHandler {
+class Widget : public EventHandler {
 
 public:
 
   enum Direction { Horizontal, Vertical };
 
-  typedef std::list<OtkWidget *> OtkWidgetList;
+  typedef std::list<Widget *> WidgetList;
 
-  OtkWidget(otk::OtkWidget *parent, Direction = Horizontal);
-  OtkWidget(otk::OtkEventDispatcher *event_dispatcher, otk::Style *style,
-            Direction direction = Horizontal, Cursor cursor = 0,
-            int bevel_width = 1, bool override_redirect = false);
+  Widget(Widget *parent, Direction = Horizontal);
+  Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
+         Direction direction = Horizontal, Cursor cursor = 0,
+         int bevel_width = 1, bool override_redirect = false);
 
-  virtual ~OtkWidget();
+  virtual ~Widget();
 
-  virtual void update(void);
+  virtual void update();
 
   void exposeHandler(const XExposeEvent &e);
   void configureHandler(const XConfigureEvent &e);
 
   inline Window window(void) const { return _window; }
-  inline const otk::OtkWidget *parent(void) const { return _parent; }
-  inline const OtkWidgetList &children(void) const { return _children; }
+  inline const Widget *parent(void) const { return _parent; }
+  inline const WidgetList &children(void) const { return _children; }
   inline unsigned int screen(void) const { return _screen; }
-  inline const otk::Rect &rect(void) const { return _rect; }
+  inline const Rect &rect(void) const { return _rect; }
 
-  void move(const otk::Point &to);
+  void move(const Point &to);
   void move(int x, int y);
 
   virtual void setWidth(int);
@@ -52,11 +54,11 @@ public:
   virtual int width() const { return _rect.width(); }
   virtual int height() const { return _rect.height(); }
 
-  virtual void resize(const otk::Point &to);
+  virtual void resize(const Point &to);
   virtual void resize(int x, int y);
 
-  virtual void setGeometry(const otk::Rect &new_geom);
-  virtual void setGeometry(const otk::Point &topleft, int width, int height);
+  virtual void setGeometry(const Rect &new_geom);
+  virtual void setGeometry(const Point &topleft, int width, int height);
   virtual void setGeometry(int x, int y, int width, int height);
 
   inline bool isVisible(void) const { return _visible; };
@@ -75,24 +77,24 @@ public:
   bool grabKeyboard(void);
   void ungrabKeyboard(void);
 
-  inline otk::BTexture *texture(void) const { return _texture; }
-  virtual void setTexture(otk::BTexture *texture)
+  inline RenderTexture *texture(void) const { return _texture; }
+  virtual void setTexture(RenderTexture *texture)
     { _texture = texture; _dirty = true; }
 
-  inline const otk::BColor *borderColor(void) const { return _bcolor; }
-  virtual void setBorderColor(const otk::BColor *color) {
+  inline const RenderColor *borderColor(void) const { return _bcolor; }
+  virtual void setBorderColor(const RenderColor *color) {
     assert(color); _bcolor = color;
-    XSetWindowBorder(OBDisplay::display, _window, color->pixel());
+    XSetWindowBorder(**display, _window, color->pixel());
   }
 
   inline int borderWidth(void) const { return _bwidth; }
   void setBorderWidth(int width) {
     _bwidth = width;
-    XSetWindowBorderWidth(otk::OBDisplay::display, _window, width);
+    XSetWindowBorderWidth(**display, _window, width);
   }
 
-  virtual void addChild(OtkWidget *child, bool front = false);
-  virtual void removeChild(OtkWidget *child);
+  virtual void addChild(Widget *child, bool front = false);
+  virtual void removeChild(Widget *child);
 
   inline bool isStretchableHorz(void) const { return _stretchable_horz; }
   void setStretchableHorz(bool s_horz = true) { _stretchable_horz = s_horz; }
@@ -103,22 +105,25 @@ public:
   inline Cursor cursor(void) const { return _cursor; }
   void setCursor(Cursor cursor) {
     _cursor = cursor;
-    XDefineCursor(OBDisplay::display, _window, _cursor);
+    XDefineCursor(**display, _window, _cursor);
   }
 
   inline int bevelWidth(void) const { return _bevel_width; }
   void setBevelWidth(int bevel_width)
-  { assert(bevel_width > 0); _bevel_width = bevel_width; }
+    { assert(bevel_width > 0); _bevel_width = bevel_width; }
 
   inline Direction direction(void) const { return _direction; }
   void setDirection(Direction dir) { _direction = dir; }
 
-  inline otk::Style *style(void) const { return _style; }
-  virtual void setStyle(otk::Style *style);
+  inline RenderStyle *style(void) const { return _style; }
+  virtual void setStyle(RenderStyle *style);
 
-  inline otk::OtkEventDispatcher *eventDispatcher(void)
-  { return _event_dispatcher; }
-  void setEventDispatcher(otk::OtkEventDispatcher *disp);
+  inline long eventMask(void) const { return _event_mask; }
+  void setEventMask(long e);
+
+  inline EventDispatcher *eventDispatcher(void)
+    { return _event_dispatcher; }
+  void setEventDispatcher(EventDispatcher *disp);
 
 protected:
   
@@ -131,13 +136,14 @@ protected:
   virtual void adjustVert(void);
   virtual void internalResize(int width, int height);
   virtual void render(void);
+  virtual void renderForeground() {} // for overriding
 
   Window _window;
 
-  OtkWidget *_parent;
-  OtkWidgetList _children;
+  Widget *_parent;
+  WidgetList _children;
 
-  Style *_style;
+  RenderStyle *_style;
   Direction _direction;
   Cursor _cursor;
   int _bevel_width;
@@ -151,11 +157,11 @@ protected:
   bool _stretchable_vert;
   bool _stretchable_horz;
 
-  BTexture *_texture;
+  RenderTexture *_texture;
   Pixmap _bg_pixmap;
   unsigned int _bg_pixel;
 
-  const BColor *_bcolor;
+  const RenderColor *_bcolor;
   unsigned int _bwidth;
 
   Rect _rect;
@@ -164,7 +170,11 @@ protected:
   bool _fixed_width;
   bool _fixed_height;
 
-  OtkEventDispatcher *_event_dispatcher;
+  long _event_mask;
+
+  Surface *_surface;
+
+  EventDispatcher *_event_dispatcher;
 };
 
 }