X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.hh;h=5f1553c3502d3f37499dbf440313c5f108af6766;hb=70eb03ad50e1a71fd64c8cb1ebabbff311850553;hp=fb3b1e37e5d9404e707e8447d9e242a48ea6bee3;hpb=77342413efd183bd1c0681a57b68acc836022923;p=chaz%2Fopenbox

diff --git a/otk/widget.hh b/otk/widget.hh
index fb3b1e37..5f1553c3 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,16 +1,20 @@
 #ifndef __widget_hh
 #define __widget_hh
 
-#include <string>
-#include <list>
-
 #include "rect.hh"
 #include "point.hh"
 #include "texture.hh"
 #include "style.hh"
-#include "eventhandler.hh"
+#include "eventdispatcher.hh"
 #include "application.hh"
 
+extern "C" {
+#include <assert.h>
+}
+
+#include <string>
+#include <list>
+
 namespace otk {
 
 class OtkWidget : public OtkEventHandler {
@@ -22,17 +26,16 @@ public:
   typedef std::list<OtkWidget *> OtkWidgetList;
 
   OtkWidget(OtkWidget *parent, Direction = Horizontal);
-  OtkWidget(OtkApplication *app, Direction direction = Horizontal,
-            Cursor cursor = 0, int bevel_width = 1);
-  OtkWidget(Style *style, Direction direction = Horizontal,
-            Cursor cursor = 0, int bevel_width = 1);
+  OtkWidget(OtkEventDispatcher *event_dispatcher, Style *style,
+            Direction direction = Horizontal, Cursor cursor = 0,
+            int bevel_width = 1);
 
   virtual ~OtkWidget();
 
   virtual void update(void);
 
-  int exposeHandler(const XExposeEvent &e);
-  int configureHandler(const XConfigureEvent &e);
+  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; }
@@ -57,11 +60,12 @@ public:
   virtual void setGeometry(int x, int y, int width, int height);
 
   inline bool isVisible(void) const { return _visible; };
-  virtual void show(void);
-  virtual void hide(void);
+  virtual void show(bool recursive = false);
+  virtual void hide(bool recursive = false);
 
   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);
@@ -73,18 +77,34 @@ 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);
 
   inline bool isStretchableHorz(void) const { return _stretchable_horz; }
-  void setStretchableHorz(bool s_horz) { _stretchable_horz = s_horz; }
+  void setStretchableHorz(bool s_horz = true) { _stretchable_horz = s_horz; }
 
   inline bool isStretchableVert(void) const { return _stretchable_vert; }
-  void setStretchableVert(bool s_vert)  { _stretchable_vert = s_vert; }
+  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)
@@ -94,20 +114,24 @@ public:
   void setDirection(Direction dir) { _direction = dir; }
 
   inline Style *getStyle(void) const { return _style; }
-  void setStyle(Style *style) { _style = style; }
+  virtual void setStyle(Style *style);
 
   inline OtkEventDispatcher *getEventDispatcher(void)
   { return _event_dispatcher; }
   void setEventDispatcher(OtkEventDispatcher *disp);
 
+  void unmanaged(void) { _unmanaged = true; }
+
 protected:
   
   bool _dirty;
+  bool _focused;
+
+  virtual void adjust(void);
 
 private:
 
   void create(void);
-  void adjust(void);
   void adjustHorz(void);
   void adjustVert(void);
   void internalResize(int width, int height);
@@ -125,7 +149,6 @@ private:
   int _ignore_config;
 
   bool _visible;
-  bool _focused;
 
   bool _grabbed_mouse;
   bool _grabbed_keyboard;
@@ -137,12 +160,17 @@ 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;
 };