#ifndef __widget_hh
#define __widget_hh
-#include "surface.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>
namespace otk {
-class Widget : public Surface, public EventHandler {
+class Widget : public EventHandler {
public:
typedef std::list<Widget *> WidgetList;
Widget(Widget *parent, Direction = Horizontal);
- Widget(EventDispatcher *event_dispatcher, Style *style,
+ Widget(EventDispatcher *event_dispatcher, RenderStyle *style,
Direction direction = Horizontal, Cursor cursor = 0,
int bevel_width = 1, bool override_redirect = false);
virtual ~Widget();
- virtual void update(void);
+ virtual void update();
void exposeHandler(const XExposeEvent &e);
void configureHandler(const XConfigureEvent &e);
inline Window window(void) const { return _window; }
inline const Widget *parent(void) const { return _parent; }
inline const WidgetList &children(void) const { return _children; }
- inline Rect rect(void) const { return Rect(_pos, size()); }
+ 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);
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);
bool grabKeyboard(void);
void ungrabKeyboard(void);
- inline Texture *texture(void) const { return _texture; }
- virtual void setTexture(Texture *texture)
+ inline RenderTexture *texture(void) const { return _texture; }
+ virtual void setTexture(RenderTexture *texture)
{ _texture = texture; _dirty = true; }
- inline const Color *borderColor(void) const { return _bcolor; }
- virtual void setBorderColor(const Color *color) {
+ inline const RenderColor *borderColor(void) const { return _bcolor; }
+ virtual void setBorderColor(const RenderColor *color) {
assert(color); _bcolor = color;
XSetWindowBorder(**display, _window, color->pixel());
}
inline Direction direction(void) const { return _direction; }
void setDirection(Direction dir) { _direction = dir; }
- inline Style *style(void) const { return _style; }
- virtual void setStyle(Style *style);
+ inline RenderStyle *style(void) const { return _style; }
+ virtual void setStyle(RenderStyle *style);
+
+ inline long eventMask(void) const { return _event_mask; }
+ void setEventMask(long e);
inline EventDispatcher *eventDispatcher(void)
{ return _event_dispatcher; }
virtual void adjustVert(void);
virtual void internalResize(int width, int height);
virtual void render(void);
+ virtual void renderForeground() {} // for overriding
Window _window;
Widget *_parent;
WidgetList _children;
- Style *_style;
+ RenderStyle *_style;
Direction _direction;
Cursor _cursor;
int _bevel_width;
bool _stretchable_vert;
bool _stretchable_horz;
- Texture *_texture;
+ RenderTexture *_texture;
Pixmap _bg_pixmap;
unsigned int _bg_pixel;
- const Color *_bcolor;
+ const RenderColor *_bcolor;
unsigned int _bwidth;
- Point _pos;
+ Rect _rect;
unsigned int _screen;
bool _fixed_width;
bool _fixed_height;
+ long _event_mask;
+
+ Surface *_surface;
+
EventDispatcher *_event_dispatcher;
};