X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=5a40f4e9cc321728c123d8c45ecfc3b2426267df;hb=db23fe0584b9d7ece147ef74c7ad6d45ff7ba6fd;hp=80d269da08e6209025b4af4522bb07b5e615f367;hpb=fb3848450e649a05c0bed84a02bc9ab4e563b5d9;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index 80d269da..5a40f4e9 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>
@@ -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);
@@ -76,7 +77,19 @@ public:
 
   inline BTexture *getTexture(void) const { return _texture; }
   virtual void setTexture(BTexture *texture)
-  { _texture = texture; _dirty = true; }
+    { _texture = texture; _dirty = true; }
+
+  inline const BColor *getBorderColor(void) const { return _bcolor; }
+  virtual void setBorderColor(const BColor *color) {
+    assert(color); _bcolor = color;
+    XSetWindowBorder(OBDisplay::display, _window, color->pixel());
+  }
+
+  inline int getBorderWidth(void) const { return _bwidth; }
+  void setBorderWidth(int width) {
+    _bwidth = width;
+    XSetWindowBorderWidth(OBDisplay::display, _window, width);
+  }
 
   virtual void addChild(OtkWidget *child, bool front = false);
   virtual void removeChild(OtkWidget *child);
@@ -88,6 +101,10 @@ public:
   void setStretchableVert(bool s_vert = true)  { _stretchable_vert = s_vert; }
 
   inline Cursor getCursor(void) const { return _cursor; }
+  void setCursor(Cursor cursor) {
+    _cursor = cursor;
+    XDefineCursor(OBDisplay::display, _window, _cursor);
+  }
 
   inline int getBevelWidth(void) const { return _bevel_width; }
   void setBevelWidth(int bevel_width)
@@ -97,7 +114,7 @@ public:
   void setDirection(Direction dir) { _direction = dir; }
 
   inline Style *getStyle(void) const { return _style; }
-  void setStyle(Style *style) { assert(style); _style = style; }
+  virtual void setStyle(Style *style);
 
   inline OtkEventDispatcher *getEventDispatcher(void)
   { return _event_dispatcher; }
@@ -108,15 +125,14 @@ public:
 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;
 
@@ -130,7 +146,6 @@ private:
   int _ignore_config;
 
   bool _visible;
-  bool _focused;
 
   bool _grabbed_mouse;
   bool _grabbed_keyboard;
@@ -142,6 +157,9 @@ private:
   Pixmap _bg_pixmap;
   unsigned int _bg_pixel;
 
+  const BColor *_bcolor;
+  unsigned int _bwidth;
+
   Rect _rect;
   unsigned int _screen;
 
@@ -151,7 +169,6 @@ private:
   bool _unmanaged;
 
   OtkEventDispatcher *_event_dispatcher;
-  OtkApplication *_application;
 };
 
 }