X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercontrol.cc;h=bf69a4e5c7c7694cd3322353fd74f86c57752776;hb=5adb8c82d19a4a7fbd740e24acf2260ed7ab519c;hp=50a00ffa981d100b5a97ef10ba49c38b0d51ae6a;hpb=4dcb3093610b31a9f3af562e7d659a137cb367a4;p=chaz%2Fopenbox

diff --git a/otk/rendercontrol.cc b/otk/rendercontrol.cc
index 50a00ffa..bf69a4e5 100644
--- a/otk/rendercontrol.cc
+++ b/otk/rendercontrol.cc
@@ -6,8 +6,10 @@
 
 #include "rendercontrol.hh"
 #include "truerendercontrol.hh"
+#include "pseudorendercontrol.hh"
 #include "rendertexture.hh"
 #include "rendercolor.hh"
+#include "renderstyle.hh"
 #include "display.hh"
 #include "screeninfo.hh"
 #include "surface.hh"
@@ -19,7 +21,7 @@ extern "C" {
 #  include <stdlib.h>
 #endif // HAVE_STDLIB_H
 
-#include "gettext.h"
+#include "../src/gettext.h"
 #define _(str) gettext(str)
 }
 
@@ -34,10 +36,10 @@ RenderControl *RenderControl::getRenderControl(int screen)
     return new TrueRenderControl(screen);
   case PseudoColor:
   case StaticColor:
-//    return new PseudoRenderControl(screen);
+    return new PseudoRenderControl(screen);
   case GrayScale:
   case StaticGray:
-//    return new GrayRenderControl(screen);
+    return new PseudoRenderControl(screen);
   default:
     printf(_("RenderControl: Unsupported visual %d specified. Aborting.\n"),
 	   vclass);
@@ -49,15 +51,18 @@ RenderControl::RenderControl(int screen)
   : _screen(screen)
 {
   printf("Initializing RenderControl\n");
-
-  
 }
 
 RenderControl::~RenderControl()
 {
   printf("Destroying RenderControl\n");
+}
 
-
+void RenderControl::drawRoot(const RenderColor &color) const
+{
+  Window root = display->screenInfo(_screen)->rootWindow();
+  XSetWindowBackground(**display, root, color.pixel());
+  XClearWindow(**display, root);
 }
 
 void RenderControl::drawString(Surface& sf, const Font &font, int x, int y,
@@ -112,7 +117,7 @@ void RenderControl::drawSolidBackground(Surface& sf,
   
   sf.setPixmap(texture.color());
 
-  int width = sf.width(), height = sf.height();
+  int width = sf.size().width(), height = sf.size().height();
   int left = 0, top = 0, right = width - 1, bottom = height - 1;
 
   if (texture.interlaced())