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

diff --git a/otk/widget.hh b/otk/widget.hh
index bec645c5..e2e477df 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,11 +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>
@@ -16,31 +19,31 @@ 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(OtkWidget *parent, Direction = Horizontal);
-  OtkWidget(OtkEventDispatcher *event_dispatcher, Style *style,
-            Direction direction = Horizontal, Cursor cursor = 0,
-            int bevel_width = 1);
+  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 getWindow(void) const { return _window; }
-  inline const OtkWidget *getParent(void) const { return _parent; }
-  inline const OtkWidgetList &getChildren(void) const { return _children; }
-  inline unsigned int getScreen(void) const { return _screen; }
-  inline const Rect &getRect(void) const { return _rect; }
+  inline Window window(void) const { return _window; }
+  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 Rect &rect(void) const { return _rect; }
 
   void move(const Point &to);
   void move(int x, int y);
@@ -74,24 +77,24 @@ public:
   bool grabKeyboard(void);
   void ungrabKeyboard(void);
 
-  inline BTexture *getTexture(void) const { return _texture; }
-  virtual void setTexture(BTexture *texture)
+  inline RenderTexture *texture(void) const { return _texture; }
+  virtual void setTexture(RenderTexture *texture)
     { _texture = texture; _dirty = true; }
 
-  inline const BColor *getBorderColor(void) const { return _bcolor; }
-  virtual void setBorderColor(const 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 getBorderWidth(void) const { return _bwidth; }
+  inline int borderWidth(void) const { return _bwidth; }
   void setBorderWidth(int width) {
     _bwidth = width;
-    XSetWindowBorderWidth(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; }
@@ -99,27 +102,25 @@ public:
   inline bool isStretchableVert(void) const { return _stretchable_vert; }
   void setStretchableVert(bool s_vert = true)  { _stretchable_vert = s_vert; }
 
-  inline Cursor getCursor(void) const { return _cursor; }
+  inline Cursor cursor(void) const { return _cursor; }
   void setCursor(Cursor cursor) {
     _cursor = cursor;
-    XDefineCursor(OBDisplay::display, _window, _cursor);
+    XDefineCursor(**display, _window, _cursor);
   }
 
-  inline int getBevelWidth(void) const { return _bevel_width; }
+  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 getDirection(void) const { return _direction; }
+  inline Direction direction(void) const { return _direction; }
   void setDirection(Direction dir) { _direction = dir; }
 
-  inline Style *getStyle(void) const { return _style; }
-  virtual void setStyle(Style *style);
+  inline RenderStyle *style(void) const { return _style; }
+  virtual void setStyle(RenderStyle *style);
 
-  inline OtkEventDispatcher *getEventDispatcher(void)
-  { return _event_dispatcher; }
-  void setEventDispatcher(OtkEventDispatcher *disp);
-
-  void unmanaged(void) { _unmanaged = true; }
+  inline EventDispatcher *eventDispatcher(void)
+    { return _event_dispatcher; }
+  void setEventDispatcher(EventDispatcher *disp);
 
 protected:
   
@@ -127,18 +128,19 @@ protected:
   bool _focused;
 
   virtual void adjust(void);
-  virtual void create(void);
+  virtual void create(bool override_redirect = false);
   virtual void adjustHorz(void);
   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;
@@ -152,11 +154,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;
@@ -165,9 +167,9 @@ protected:
   bool _fixed_width;
   bool _fixed_height;
 
-  bool _unmanaged;
+  Surface *_surface;
 
-  OtkEventDispatcher *_event_dispatcher;
+  EventDispatcher *_event_dispatcher;
 };
 
 }