give gc's/BPen's a width

diff --git a/src/GCCache.cc b/src/GCCache.cc
index 35670a85046583142e93ae75c2508ef77e7e5bc6..75c7252a80d74ef39f3f972ae5678bb9b768e755 100644 (file)
--- a/src/GCCache.cc
+++ b/src/GCCache.cc
@@ -43,12 +43,17 @@ BGCCacheContext::~BGCCacheContext(void) {
 
 void BGCCacheContext::set(const BColor &_color,
                           const XFontStruct * const _font,
-                          const int _function, const int _subwindow) {
+                          const int _function, const int _subwindow,
+                          int _linewidth) {
   XGCValues gcv;
   pixel = gcv.foreground = _color.pixel();
   function = gcv.function = _function;
   subwindow = gcv.subwindow_mode = _subwindow;
-  unsigned long mask = GCForeground | GCFunction | GCSubwindowMode;
+  linewidth = gcv.line_width = _linewidth;
+  gcv.cap_style = CapProjecting;
+
+  unsigned long mask = GCForeground | GCFunction | GCSubwindowMode |
+    GCLineWidth | GCCapStyle;
 
   if (_font) {
     fontid = gcv.font = _font->fid;
@@ -131,7 +136,7 @@ void BGCCache::release(BGCCacheContext *ctx) {
 
 BGCCacheItem *BGCCache::find(const BColor &_color,
                              const XFontStruct * const _font,
-                             int _function, int _subwindow) {
+                             int _function, int _subwindow, int _linewidth) {
   const unsigned long pixel = _color.pixel();
   const unsigned int screen = _color.screen();
   const int key = _color.red() ^ _color.green() ^ _color.blue();
@@ -142,7 +147,8 @@ BGCCacheItem *BGCCache::find(const BColor &_color,
   // this will either loop 8 times then return/abort or it will stop matching
   while (c->ctx &&
          (c->ctx->pixel != pixel || c->ctx->function != _function ||
-          c->ctx->subwindow != _subwindow || c->ctx->screen != screen)) {
+          c->ctx->subwindow != _subwindow || c->ctx->screen != screen ||
+          c->ctx->linewidth != _linewidth)) {
     if (i < 7) {
       prev = c;
       c = cache[ ++k ];
@@ -151,7 +157,7 @@ BGCCacheItem *BGCCache::find(const BColor &_color,
     }
     if (c->count == 0 && c->ctx->screen == screen) {
       // use this cache item
-      c->ctx->set(_color, _font, _function, _subwindow);
+      c->ctx->set(_color, _font, _function, _subwindow, _linewidth);
       c->ctx->used = true;
       c->count = 1;
       c->hits = 1;
@@ -175,7 +181,7 @@ BGCCacheItem *BGCCache::find(const BColor &_color,
     }
   } else {
     c->ctx = nextContext(screen);
-    c->ctx->set(_color, _font, _function, _subwindow);
+    c->ctx->set(_color, _font, _function, _subwindow, _linewidth);
     c->ctx->used = true;
     c->count = 1;
     c->hits = 1;

diff --git a/src/GCCache.hh b/src/GCCache.hh
index 56f234a3eb0c42cc0cea873af3202be6cc4fbfc4..536a474649381a19d556346787c7af1e03232cb3 100644 (file)
--- a/src/GCCache.hh
+++ b/src/GCCache.hh
@@ -36,7 +36,7 @@ class BGCCacheItem;
 class BGCCacheContext {
 public:
   void set(const BColor &_color, const XFontStruct * const _font,
-           const int _function, const int _subwindow);
+           const int _function, const int _subwindow, const int _linewidth);
   void set(const XFontStruct * const _font);
 
   ~BGCCacheContext(void);
@@ -44,7 +44,7 @@ public:
 private:
   BGCCacheContext(const BaseDisplay * const _display)
     : display(_display), gc(0), pixel(0ul), fontid(0ul),
-      function(0), subwindow(0), used(false), screen(~(0u)) {}
+      function(0), subwindow(0), used(false), screen(~(0u)), _linewidth(0) {}
 
   const BaseDisplay *display;
   GC gc;
@@ -54,6 +54,7 @@ private:
   int subwindow;
   bool used;
   unsigned int screen;
+  int linewidth;
 
   BGCCacheContext(const BGCCacheContext &_nocopy);
   BGCCacheContext &operator=(const BGCCacheContext &_nocopy);
@@ -89,7 +90,8 @@ public:
   void purge(void);
 
   BGCCacheItem *find(const BColor &_color, const XFontStruct * const _font = 0,
-                     int _function = GXcopy, int _subwindow = ClipByChildren);
+                     int _function = GXcopy, int _subwindow = ClipByChildren,
+                     int _linewidth = 0);
   void release(BGCCacheItem *_item);
 
 private:
@@ -111,13 +113,16 @@ private:
 class BPen {
 public:
   inline BPen(const BColor &_color,  const XFontStruct * const _font = 0,
-              int _function = GXcopy, int _subwindow = ClipByChildren)
+              int _function = GXcopy, int _subwindow = ClipByChildren,
+              int _linewidth = 0)
     : color(_color), font(_font), function(_function), subwindow(_subwindow),
-      cache(_color.display()->gcCache()), item(0) { }
+      cache(_color.display()->gcCache()), item(0), linewidth(_linewidth) { }
+
   inline ~BPen(void) { if (item) cache->release(item); }
 
   inline const GC &gc(void) const {
-    if (! item) item = cache->find(color, font, function, subwindow);
+    if (! item) item = cache->find(color, font, function, subwindow,
+                                   linewidth);
     return item->gc();
   }
 
@@ -126,6 +131,7 @@ private:
   const XFontStruct *font;
   int function;
   int subwindow;
+  int linewidth;
 
   mutable BGCCache *cache;
   mutable BGCCacheItem *item;