Do not compile in the block builtin graphics with --disable-frills.

diff --git a/Changes b/Changes
index e2c8738126200a012cd92a7187c3436f145bdc6c..3f7f5dab25e6f07ebefcadd97c0f3c581e350658 100644 (file)
--- a/Changes
+++ b/Changes
@@ -17,6 +17,9 @@ WISH: load system-wide config file even if we don't have one
 WISH: look into XAddConnectionWatch, does anybody need that?
 DUMB: support tex fonts
 
+8.7
+        - do not compile in the block builtin graphics with --disable-frills.
+
 8.6  Fri Nov 23 14:10:57 CET 2007
         - upgrade libev to disable kqueue on anything but netbsd as it
           seems to be broken everywhere else w.r.t. ptys.

diff --git a/src/optinc.h b/src/optinc.h
index f72af00b17f18838c3f895cede4825366a1938d2..e4e7858f06df6f57f66ae8059958e21516a781ce 100644 (file)
--- a/src/optinc.h
+++ b/src/optinc.h
@@ -34,16 +34,19 @@
  def(borderLess,           26) // mwm borderless hints
  def(hold,                 27) // hold window open after exit
  def(override_redirect,    28)
- def(skipBuiltinGlyphs,    29) // do not use internal glyphs
- def(urgentOnBell,         30)
+ def(urgentOnBell,         29)
 #else
  nodef(insecure)
  nodef(borderLess)
  nodef(hold)
  nodef(override_redirect)
- nodef(skipBuiltinGlyphs)
  nodef(urgentOnBell)
 #endif
+#ifdef BUILTIN_GLYPHS
+ def(skipBuiltinGlyphs,    30) // do not use internal glyphs
+#else
+ nodef(skipBuiltinGlyphs)
+#endif
 #if ENABLE_STYLES
  def(intensityStyles,      31) // font styles imply intensity
 #else

diff --git a/src/rsinc.h b/src/rsinc.h
index 97ac52c730ed03ba60ed70aa89e05078bfce4129..60f4564235dbf938617db9ac8c1840d7c616abd9 100644 (file)
--- a/src/rsinc.h
+++ b/src/rsinc.h
@@ -77,9 +77,11 @@
   def (borderLess)
   def (lineSpace)
   def (cursorUnderline)
-  def (skipBuiltinGlyphs)
   def (urgentOnBell)
 #endif
+#ifdef BUILTIN_GLYPHS
+  def (skipBuiltinGlyphs)
+#endif
 #if CURSOR_BLINK
   def (cursorBlink)
 #endif

diff --git a/src/rxvt.h b/src/rxvt.h
index 7aa0a0d9b3dcdb6ea3fd9f058e38e12b08f643e5..c7ef169731290f5a7f9fada295c2675fea93d8b7 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -20,6 +20,7 @@
 # define ENABLE_XIM_ONTHESPOT 1
 # define CURSOR_BLINK         1
 # define OPTION_HC            1
+# define BUILTIN_GLYPHS       1
 #else
 # define ENABLE_MINIMAL 1
 #endif

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index e140daaee89b6624fd41af8c305da71f0a802e59..d8ac109955f4fd1cbb0c57463489e6270a010484 100644 (file)
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -264,8 +264,6 @@ rxvt_font::clear_rect (rxvt_drawable &d, int x, int y, int w, int h, int color)
 
 /////////////////////////////////////////////////////////////////////////////
 
-#include "table/linedraw.h"
-
 struct rxvt_font_default : rxvt_font {
   struct rxvt_fontset *fs;
 
@@ -358,8 +356,10 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
       int width = text - tp;
       int fwidth = term->fwidth * width;
 
+#ifdef BUILTIN_GLYPHS
       if (0x2500 <= t && t <= 0x259f)
         {
+# include "table/linedraw.h"
           uint16_t offs = linedraw_offs[t - 0x2500];
           uint32_t *a = linedraw_command + (offs >> 4);
           uint32_t *b = a + (offs & 15);
@@ -436,6 +436,10 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
                 }
             }
         }
+#else
+      if (0)
+        ;
+#endif
 #if ENABLE_COMBINING
       else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
         {

diff --git a/src/xdefaults.C b/src/xdefaults.C
index 0331a73d78b03479c7f4a710d94b9d6c497202a4..90d969176659b1d0b5f2ff3f9592471313ad21a0 100644 (file)
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -227,9 +227,11 @@ optList[] = {
               STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
               STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
               BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, 0, "borderless window"),
-              BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
               STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
 #endif
+#ifdef BUILTIN_GLYPHS
+              BOOL (Rs_skipBuiltinGlyphs, "skipBuiltinGlyphs", "sbg", Opt_skipBuiltinGlyphs, 0, "do not use internal glyphs"),
+#endif
 #ifdef POINTER_BLANK
               RSTRG (Rs_pointerBlankDelay, "pointerBlankDelay", "number"),
 #endif