surface started

7 files changed, 116 insertions, 56 deletions

diff --git a/otk/Makefile.am b/otk/Makefile.am
index ae5bcf79..ac326598 100644
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES= -I../src
 #noinst_LIBRARIES=libotk.a
 noinst_LTLIBRARIES=libotk.la
 
-libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc \
+libotk_la_SOURCES=rendercontrol.cc truerendercontrol.cc surface.cc \
                   color.cc display.cc font.cc gccache.cc image.cc \
                   property.cc imagecontrol.cc rect.cc screeninfo.cc \
                   texture.cc timer.cc style.cc \
diff --git a/otk/otk.hh b/otk/otk.hh
index 397534e5..74fbac55 100644
--- a/otk/otk.hh
+++ b/otk/otk.hh
@@ -26,6 +26,7 @@
 #include "screeninfo.hh"
 #include "strut.hh"
 #include "style.hh"
+#include "surface.hh"
 #include "texture.hh"
 #include "timer.hh"
 #include "util.hh"
diff --git a/otk/surface.cc b/otk/surface.cc
new file mode 100644
index 00000000..cea793f2
--- /dev/null
+++ b/otk/surface.cc
@@ -0,0 +1,34 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#ifdef    HAVE_CONFIG_H
+#  include "../config.h"
+#endif // HAVE_CONFIG_H
+
+#include "surface.hh"
+#include "display.hh"
+
+namespace otk {
+
+Surface::Surface()
+  : _size(1, 1),
+    _pm(None)
+{
+}
+
+Surface::Surface(const Point &size)
+  : _size(size),
+    _pm(None)
+{
+}
+
+Surface::~Surface()
+{
+  if (_pm != None) XFreePixmap(**display, _pm);
+}
+
+void Surface::setSize(int w, int h)
+{
+  _size.setPoint(w, h);
+}
+
+}
diff --git a/otk/surface.hh b/otk/surface.hh
new file mode 100644
index 00000000..7289b14a
--- /dev/null
+++ b/otk/surface.hh
@@ -0,0 +1,33 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+#ifndef __surface_hh
+#define __surface_hh
+
+#include "point.hh"
+
+extern "C" {
+#include <X11/Xlib.h>
+}
+
+namespace otk {
+
+class Surface {
+  Point _size;
+  Pixmap _pm;
+
+protected:
+  Surface();
+  Surface(const Point &size);
+
+  virtual void setSize(int w, int h);
+
+public:
+  virtual ~Surface();
+
+  virtual const Point& size() const { return _size; }
+  virtual int width() const { return _size.x(); }
+  virtual int height() const { return _size.y(); }
+};
+
+}
+
+#endif // __surface_hh
diff --git a/otk/truerendercontrol.cc b/otk/truerendercontrol.cc
index a15cbd57..39176a6c 100644
--- a/otk/truerendercontrol.cc
+++ b/otk/truerendercontrol.cc
@@ -103,30 +103,23 @@ void TrueRenderControl::render(Widget *wi)
 {
   assert(wi);
   
-  XGCValues gcv;
-  gcv.cap_style = CapProjecting;
-
-  int w = 255, h = 31;
+  int w = wi->width(), h = wi->height();
   Pixmap p = XCreatePixmap(**display, wi->window(), w, h, _screen->depth());
   XImage *im = XCreateImage(**display, _screen->visual(), _screen->depth(),
 			    ZPixmap, 0, NULL, w, h, 32, 0);
-  //GC gc = XCreateGC(**display, _screen->rootWindow(), GCCapStyle, &gcv);
 
-  // XXX  + 1?
   unsigned char *data = new unsigned char[im->bytes_per_line * h];
   unsigned char *dp = data;
 
-  for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-    renderPixel(im, dp, 0);
-  for (int y = 0; y < 10; ++y)
+  for (int y = 0; y < h/3; ++y)
     for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _red_color_table[x] << _red_offset);
-  for (int y = 0; y < 10; ++y)
+      renderPixel(im, dp, _red_color_table[255*x/w] << _red_offset);
+  for (int y = 0; y < h/3; ++y)
     for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _green_color_table[x] << _green_offset);
-  for (int y = 0; y < 10; ++y)
+      renderPixel(im, dp, _green_color_table[255*x/w] << _green_offset);
+  for (int y = 0; y < h/3; ++y)
     for (int x = 0; x < w; ++x, dp += im->bits_per_pixel/8)
-      renderPixel(im, dp, _blue_color_table[x] << _blue_offset);
+      renderPixel(im, dp, _blue_color_table[255*x/w] << _blue_offset);
 
   printf("\nDone %d %d\n", im->bytes_per_line * h, dp - data);
 
diff --git a/otk/widget.cc b/otk/widget.cc
index e53e3585..551a7900 100644
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -23,8 +23,9 @@ Widget::Widget(Widget *parent, Direction direction)
     _visible(false), _grabbed_mouse(false),
     _grabbed_keyboard(false), _stretchable_vert(false),
     _stretchable_horz(false), _texture(0), _bg_pixmap(0), _bg_pixel(0),
-    _bcolor(0), _bwidth(0), _screen(parent->screen()), _fixed_width(false),
-    _fixed_height(false), _event_dispatcher(parent->eventDispatcher())
+    _bcolor(0), _bwidth(0), _pos(0,0), _screen(parent->screen()),
+    _fixed_width(false), _fixed_height(false),
+    _event_dispatcher(parent->eventDispatcher())
 {
   assert(parent);
   parent->addChild(this);
@@ -42,7 +43,7 @@ Widget::Widget(EventDispatcher *event_dispatcher, Style *style,
     _bevel_width(bevel_width), _ignore_config(0), _visible(false),
     _grabbed_mouse(false), _grabbed_keyboard(false),
     _stretchable_vert(false), _stretchable_horz(false), _texture(0),
-    _bg_pixmap(0), _bg_pixel(0), _bcolor(0), _bwidth(0),
+    _bg_pixmap(0), _bg_pixel(0), _bcolor(0), _bwidth(0), _pos(0,0),
     _screen(style->getScreen()), _fixed_width(false), _fixed_height(false),
     _event_dispatcher(event_dispatcher)
 {
@@ -73,8 +74,6 @@ void Widget::create(bool override_redirect)
   const ScreenInfo *scr_info = display->screenInfo(_screen);
   Window p_window = _parent ? _parent->window() : scr_info->rootWindow();
 
-  _rect.setRect(0, 0, 1, 1); // just some initial values
-
   XSetWindowAttributes attrib_create;
   unsigned long create_mask = CWBackPixmap | CWBorderPixel | CWEventMask;
 
@@ -93,8 +92,8 @@ void Widget::create(bool override_redirect)
     attrib_create.cursor = _cursor;
   }
 
-  _window = XCreateWindow(**display, p_window, _rect.x(),
-                          _rect.y(), _rect.width(), _rect.height(), 0,
+  _window = XCreateWindow(**display, p_window, _pos.x(),
+                          _pos.y(), width(), height(), 0,
                           scr_info->depth(), InputOutput,
                           scr_info->visual(), create_mask, &attrib_create);
   _ignore_config++;
@@ -104,14 +103,14 @@ void Widget::setWidth(int w)
 {
   assert(w > 0);
   _fixed_width = true;  
-  setGeometry(_rect.x(), _rect.y(), w, _rect.height());
+  setGeometry(_pos.x(), _pos.y(), w, height());
 }
 
 void Widget::setHeight(int h)
 {
   assert(h > 0);
   _fixed_height = true;
-  setGeometry(_rect.x(), _rect.y(), _rect.width(), h);
+  setGeometry(_pos.x(), _pos.y(), _pos.x(), h);
 }
 
 void Widget::move(const Point &to)
@@ -121,7 +120,7 @@ void Widget::move(const Point &to)
 
 void Widget::move(int x, int y)
 {
-  _rect.setPos(x, y);
+  _pos.setPoint(x, y);
   XMoveWindow(**display, _window, x, y);
   _ignore_config++;
 }
@@ -135,7 +134,7 @@ void Widget::resize(int w, int h)
 {
   assert(w > 0 && h > 0);
   _fixed_width = _fixed_height = true;
-  setGeometry(_rect.x(), _rect.y(), w, h);
+  setGeometry(_pos.x(), _pos.y(), w, h);
 }
 
 void Widget::setGeometry(const Rect &new_geom)
@@ -150,7 +149,8 @@ void Widget::setGeometry(const Point &topleft, int width, int height)
 
 void Widget::setGeometry(int x, int y, int width, int height)
 {
-  _rect = Rect(x, y, width, height);
+  _pos.setPoint(x, y);
+  setSize(width, height);
   _dirty = true;
 
   // don't use an XMoveResizeWindow here, because it doesn't seem to move
@@ -257,7 +257,7 @@ void Widget::render(void)
 {
   if (!_texture) return;
 
-  _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap);
+  _bg_pixmap = _texture->render(width(), height(), _bg_pixmap);
 
   if (_bg_pixmap) {
     XSetWindowBackgroundPixmap(**display, _window, _bg_pixmap);
@@ -294,22 +294,22 @@ void Widget::adjustHorz(void)
   for (it = _children.begin(); it != end; ++it) {
     tmp = *it;
     if (tmp->isStretchableVert())
-      tmp->setHeight(_rect.height() > _bevel_width * 2 ?
-                     _rect.height() - _bevel_width * 2 : _bevel_width);
+      tmp->setHeight(height() > _bevel_width * 2 ?
+                     height() - _bevel_width * 2 : _bevel_width);
     if (tmp->isStretchableHorz())
       stretchable.push_back(tmp);
     else
-      width += tmp->_rect.width() + _bevel_width;
+      width += tmp->width() + _bevel_width;
 
-    if (tmp->_rect.height() > tallest)
-      tallest = tmp->_rect.height();
+    if (tmp->height() > tallest)
+      tallest = tmp->height();
   }
 
   if (stretchable.size() > 0) {
     WidgetList::iterator str_it = stretchable.begin(),
       str_end = stretchable.end();
 
-    int str_width = _rect.width() - width / stretchable.size();
+    int str_width = Surface::width() - width / stretchable.size();
 
     for (; str_it != str_end; ++str_it)
       (*str_it)->setWidth(str_width > _bevel_width ? str_width - _bevel_width
@@ -323,10 +323,10 @@ void Widget::adjustHorz(void)
     int x, y;
 
     if (prev_widget)
-      x = prev_widget->_rect.x() + prev_widget->_rect.width() + _bevel_width;
+      x = prev_widget->_pos.x() + prev_widget->width() + _bevel_width;
     else
-      x = _rect.x() + _bevel_width;
-    y = (tallest - tmp->_rect.height()) / 2 + _bevel_width;
+      x = _pos.x() + _bevel_width;
+    y = (tallest - tmp->height()) / 2 + _bevel_width;
 
     tmp->move(x, y);
 
@@ -351,22 +351,22 @@ void Widget::adjustVert(void)
   for (it = _children.begin(); it != end; ++it) {
     tmp = *it;
     if (tmp->isStretchableHorz())
-      tmp->setWidth(_rect.width() > _bevel_width * 2 ?
-                    _rect.width() - _bevel_width * 2 : _bevel_width);
+      tmp->setWidth(width() > _bevel_width * 2 ?
+                    width() - _bevel_width * 2 : _bevel_width);
     if (tmp->isStretchableVert())
       stretchable.push_back(tmp);
     else
-      height += tmp->_rect.height() + _bevel_width;
+      height += tmp->height() + _bevel_width;
 
-    if (tmp->_rect.width() > widest)
-      widest = tmp->_rect.width();
+    if (tmp->width() > widest)
+      widest = tmp->width();
   }
 
   if (stretchable.size() > 0) {
     WidgetList::iterator str_it = stretchable.begin(),
       str_end = stretchable.end();
 
-    int str_height = _rect.height() - height / stretchable.size();
+    int str_height = Surface::height() - height / stretchable.size();
 
     for (; str_it != str_end; ++str_it)
       (*str_it)->setHeight(str_height > _bevel_width ?
@@ -380,10 +380,10 @@ void Widget::adjustVert(void)
     int x, y;
 
     if (prev_widget)
-      y = prev_widget->_rect.y() + prev_widget->_rect.height() + _bevel_width;
+      y = prev_widget->_pos.y() + prev_widget->height() + _bevel_width;
     else
-      y = _rect.y() + _bevel_width;
-    x = (widest - tmp->_rect.width()) / 2 + _bevel_width;
+      y = _pos.y() + _bevel_width;
+    x = (widest - tmp->width()) / 2 + _bevel_width;
 
     tmp->move(x, y);
 
@@ -415,9 +415,9 @@ void Widget::internalResize(int w, int h)
   if (! _fixed_width && ! _fixed_height)
     resize(w, h);
   else if (! _fixed_width)
-    resize(w, _rect.height());
+    resize(w, height());
   else if (! _fixed_height)
-    resize(_rect.width(), h);
+    resize(width(), h);
 }
 
 void Widget::addChild(Widget *child, bool front)
@@ -475,9 +475,10 @@ void Widget::configureHandler(const XConfigureEvent &e)
   if (_ignore_config) {
     _ignore_config--;
   } else {
-    if (!(e.width == _rect.width() && e.height == _rect.height())) {
+    if (!(e.width == width() && e.height == height())) {
       _dirty = true;
-      _rect.setSize(e.width, e.height);
+      _pos.setPoint(e.x, e.y);
+      setSize(e.width, e.height);
     }
     update();
   }
diff --git a/otk/widget.hh b/otk/widget.hh
index 7f2d926c..1cfa627f 100644
--- a/otk/widget.hh
+++ b/otk/widget.hh
@@ -2,6 +2,7 @@
 #ifndef __widget_hh
 #define __widget_hh
 
+#include "surface.hh"
 #include "rect.hh"
 #include "point.hh"
 #include "texture.hh"
@@ -18,7 +19,7 @@ extern "C" {
 
 namespace otk {
 
-class Widget : public EventHandler {
+class Widget : public Surface, public EventHandler {
 
 public:
 
@@ -42,7 +43,7 @@ public:
   inline const Widget *parent(void) const { return _parent; }
   inline const WidgetList &children(void) const { return _children; }
   inline unsigned int screen(void) const { return _screen; }
-  inline const Rect &rect(void) const { return _rect; }
+  inline Rect rect(void) const { return Rect(_pos, size()); }
 
   void move(const Point &to);
   void move(int x, int y);
@@ -50,9 +51,6 @@ public:
   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);
 
@@ -159,7 +157,7 @@ protected:
   const Color *_bcolor;
   unsigned int _bwidth;
 
-  Rect _rect;
+  Point _pos;
   unsigned int _screen;
 
   bool _fixed_width;