X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=7c508fcdf445626c71c494b641a7ae3fea3433e6;hb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;hp=57973e9b35594b553908e0d534630f9326545608;hpb=fa05dc56ea0bf29100efd2cb4399d8f4818f73e7;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index 57973e9b..7c508fcd 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -6,7 +6,7 @@
 #include "texture.hh"
 #include "style.hh"
 #include "eventdispatcher.hh"
-#include "application.hh"
+#include "display.hh"
 
 extern "C" {
 #include <assert.h>
@@ -25,8 +25,8 @@ public:
 
   typedef std::list<OtkWidget *> OtkWidgetList;
 
-  OtkWidget(OtkWidget *parent, Direction = Horizontal);
-  OtkWidget(OtkEventDispatcher *event_dispatcher, Style *style,
+  OtkWidget(otk::OtkWidget *parent, Direction = Horizontal);
+  OtkWidget(otk::OtkEventDispatcher *event_dispatcher, otk::Style *style,
             Direction direction = Horizontal, Cursor cursor = 0,
             int bevel_width = 1);
 
@@ -37,13 +37,13 @@ public:
   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 otk::OtkWidget *parent(void) const { return _parent; }
+  inline const OtkWidgetList &children(void) const { return _children; }
+  inline unsigned int screen(void) const { return _screen; }
+  inline const otk::Rect &rect(void) const { return _rect; }
 
-  void move(const Point &to);
+  void move(const otk::Point &to);
   void move(int x, int y);
 
   virtual void setWidth(int);
@@ -52,11 +52,11 @@ public:
   virtual int width() const { return _rect.width(); }
   virtual int height() const { return _rect.height(); }
 
-  virtual void resize(const Point &to);
+  virtual void resize(const otk::Point &to);
   virtual void resize(int x, int y);
 
-  virtual void setGeometry(const Rect &new_geom);
-  virtual void setGeometry(const Point &topleft, int width, int height);
+  virtual void setGeometry(const otk::Rect &new_geom);
+  virtual void setGeometry(const otk::Point &topleft, int width, int height);
   virtual void setGeometry(int x, int y, int width, int height);
 
   inline bool isVisible(void) const { return _visible; };
@@ -65,6 +65,7 @@ public:
 
   inline bool isFocused(void) const { return _focused; };
   virtual void focus(void);
+  virtual void unfocus(void);
 
   inline bool hasGrabbedMouse(void) const { return _grabbed_mouse; }
   bool grabMouse(void);
@@ -74,9 +75,21 @@ public:
   bool grabKeyboard(void);
   void ungrabKeyboard(void);
 
-  inline BTexture *getTexture(void) const { return _texture; }
-  virtual void setTexture(BTexture *texture)
-  { _texture = texture; _dirty = true; }
+  inline otk::BTexture *texture(void) const { return _texture; }
+  virtual void setTexture(otk::BTexture *texture)
+    { _texture = texture; _dirty = true; }
+
+  inline const otk::BColor *borderColor(void) const { return _bcolor; }
+  virtual void setBorderColor(const otk::BColor *color) {
+    assert(color); _bcolor = color;
+    XSetWindowBorder(OBDisplay::display, _window, color->pixel());
+  }
+
+  inline int borderWidth(void) const { return _bwidth; }
+  void setBorderWidth(int width) {
+    _bwidth = width;
+    XSetWindowBorderWidth(otk::OBDisplay::display, _window, width);
+  }
 
   virtual void addChild(OtkWidget *child, bool front = false);
   virtual void removeChild(OtkWidget *child);
@@ -87,40 +100,37 @@ 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);
   }
 
-  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; }
 
-  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) { assert(style); _style = style; }
+  inline otk::Style *style(void) const { return _style; }
+  virtual void setStyle(otk::Style *style);
 
-  inline OtkEventDispatcher *getEventDispatcher(void)
+  inline otk::OtkEventDispatcher *eventDispatcher(void)
   { return _event_dispatcher; }
-  void setEventDispatcher(OtkEventDispatcher *disp);
-
-  void unmanaged(void) { _unmanaged = true; }
+  void setEventDispatcher(otk::OtkEventDispatcher *disp);
 
 protected:
   
   bool _dirty;
+  bool _focused;
 
-private:
-
-  void create(void);
-  void adjust(void);
-  void adjustHorz(void);
-  void adjustVert(void);
-  void internalResize(int width, int height);
-  void render(void);
+  virtual void adjust(void);
+  virtual void create(void);
+  virtual void adjustHorz(void);
+  virtual void adjustVert(void);
+  virtual void internalResize(int width, int height);
+  virtual void render(void);
 
   Window _window;
 
@@ -134,7 +144,6 @@ private:
   int _ignore_config;
 
   bool _visible;
-  bool _focused;
 
   bool _grabbed_mouse;
   bool _grabbed_keyboard;
@@ -146,16 +155,16 @@ private:
   Pixmap _bg_pixmap;
   unsigned int _bg_pixel;
 
+  const BColor *_bcolor;
+  unsigned int _bwidth;
+
   Rect _rect;
   unsigned int _screen;
 
   bool _fixed_width;
   bool _fixed_height;
 
-  bool _unmanaged;
-
   OtkEventDispatcher *_event_dispatcher;
-  OtkApplication *_application;
 };
 
 }