X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Frendercontrol.cc;h=edf4a470d5bff80f17d04f1b17ec7a2ffe4ce1a1;hb=2808ab5bad8ff49a1af909c2515288310cc89378;hp=1bb59c80cf7e2099c24e9240acca1ca8aa2d2c4e;hpb=11f59d7925068357e24ca743c23019f671e6a5d7;p=chaz%2Fopenbox

diff --git a/otk/rendercontrol.cc b/otk/rendercontrol.cc
index 1bb59c80..edf4a470 100644
--- a/otk/rendercontrol.cc
+++ b/otk/rendercontrol.cc
@@ -1,13 +1,13 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "config.h"
 
 #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 +19,7 @@ extern "C" {
 #  include <stdlib.h>
 #endif // HAVE_STDLIB_H
 
-#include "gettext.h"
+#include "../src/gettext.h"
 #define _(str) gettext(str)
 }
 
@@ -34,10 +34,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 +49,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,
@@ -99,7 +102,6 @@ void RenderControl::drawString(Surface& sf, const Font &font, int x, int y,
   else
     XftDrawString8(d, &c, font._xftfont, x, font._xftfont->ascent + y,
                    (FcChar8*)string.c_str(), string.bytes());
-  printf("DRAW A STRING!: %s\n", string.c_str());
   return;
 }
 
@@ -113,7 +115,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())
@@ -188,4 +190,28 @@ void RenderControl::drawSolidBackground(Surface& sf,
   }
 }
 
+void RenderControl::drawMask(Surface &sf, const RenderColor &color,
+                             const PixmapMask &mask) const
+{
+  assert(_screen == sf._screen);
+  assert(_screen == color.screen());
+
+  if (mask.mask == None) return; // no mask given
+
+  int width = sf.size().width(), height = sf.size().height();
+  
+  // set the clip region
+  int x = (width - mask.w) / 2, y = (height - mask.h) / 2;
+  XSetClipMask(**display, color.gc(), mask.mask);
+  XSetClipOrigin(**display, color.gc(), x, y);
+
+  // fill in the clipped region
+  XFillRectangle(**display, sf.pixmap(), color.gc(), x, y,
+                 x + mask.w, y + mask.h);
+
+  // unset the clip region
+  XSetClipMask(**display, color.gc(), None);
+  XSetClipOrigin(**display, color.gc(), 0, 0);
+}
+
 }