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

diff --git a/otk/widget.hh b/otk/widget.hh
index 5c008e18..5f1553c3 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -1,21 +1,30 @@
 #ifndef __widget_hh
 #define __widget_hh
 
-#include "basewidget.hh"
+#include "rect.hh"
+#include "point.hh"
+#include "texture.hh"
+#include "style.hh"
 #include "eventdispatcher.hh"
+#include "application.hh"
 
 extern "C" {
 #include <assert.h>
 }
 
+#include <string>
+#include <list>
+
 namespace otk {
 
-class OtkWidget : public OtkBaseWidget, public OtkEventHandler {
+class OtkWidget : public OtkEventHandler {
 
 public:
 
   enum Direction { Horizontal, Vertical };
 
+  typedef std::list<OtkWidget *> OtkWidgetList;
+
   OtkWidget(OtkWidget *parent, Direction = Horizontal);
   OtkWidget(OtkEventDispatcher *event_dispatcher, Style *style,
             Direction direction = Horizontal, Cursor cursor = 0,
@@ -28,31 +37,140 @@ 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; }
+
+  void move(const Point &to);
+  void move(int x, int y);
+
+  virtual void setWidth(int);
+  virtual void setHeight(int);
+
+  virtual int width() const { return _rect.width(); }
+  virtual int height() const { return _rect.height(); }
+
+  virtual void resize(const 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(int x, int y, int width, int height);
+
+  inline bool isVisible(void) const { return _visible; };
+  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);
+  void ungrabMouse(void);
+
+  inline bool hasGrabbedKeyboard(void) const { return _grabbed_keyboard; }
+  bool grabKeyboard(void);
+  void ungrabKeyboard(void);
+
+  inline BTexture *getTexture(void) const { return _texture; }
+  virtual void setTexture(BTexture *texture)
+    { _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 = true) { _stretchable_horz = s_horz; }
 
   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; }
+  void setCursor(Cursor cursor) {
+    _cursor = cursor;
+    XDefineCursor(OBDisplay::display, _window, _cursor);
+  }
+
+  inline int getBevelWidth(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; }
   void setDirection(Direction dir) { _direction = dir; }
 
+  inline Style *getStyle(void) const { return _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 adjust(void);
+  void create(void);
   void adjustHorz(void);
   void adjustVert(void);
   void internalResize(int width, int height);
+  void render(void);
+
+  Window _window;
+
+  OtkWidget *_parent;
+  OtkWidgetList _children;
 
+  Style *_style;
   Direction _direction;
+  Cursor _cursor;
+  int _bevel_width;
+  int _ignore_config;
+
+  bool _visible;
+
+  bool _grabbed_mouse;
+  bool _grabbed_keyboard;
 
   bool _stretchable_vert;
   bool _stretchable_horz;
 
+  BTexture *_texture;
+  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;
 };