provide RenderControls to all otk from the display class. initialize them all there. try use bitshifts instead of color tables in the TrueRenderControl class for finding correct rgbs. Move the image/pixmap/xftdraw into the surface class, and it maintains them, recreating them when it resizes.

1 files changed, 2 insertions, 5 deletions

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index b1b8c764..eed535c3 100644
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -13,14 +13,10 @@ namespace otk {
 FocusLabel::FocusLabel(Widget *parent)
   : FocusWidget(parent), _text("")
 {
-  const ScreenInfo *info = display->screenInfo(screen());
-  _xftdraw = XftDrawCreate(**display, window(), info->visual(),
-                           info->colormap());
 }
 
 FocusLabel::~FocusLabel()
 {
-  XftDrawDestroy(_xftdraw);
 }
 
 
@@ -72,7 +68,8 @@ void FocusLabel::update(void)
 
     FocusWidget::update();
 
-    ft->drawString(_xftdraw, x, 0, *text_color, t);
+    display->renderControl(_screen)->
+      drawString(this, *ft, x, 0, *text_color, t);
   } else
     FocusWidget::update();
 }