diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-31 14:11:58 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2009-10-31 14:11:58 +0000 |
| commit | 93c5456a54893a8e648cd803abf202e80e9a93b0 (patch) | |
| tree | a522a3e8ef59cfadb54bef4eb060e452464ec1a9 /app/xterm/ptyx.h | |
| parent | 80408f471074022f7300901bf92a1533dae3f8da (diff) | |
Update to xterm 250
Diffstat (limited to 'app/xterm/ptyx.h')
| -rw-r--r-- | app/xterm/ptyx.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/app/xterm/ptyx.h b/app/xterm/ptyx.h index 54b000a07..482fe8590 100644 --- a/app/xterm/ptyx.h +++ b/app/xterm/ptyx.h @@ -1,4 +1,4 @@ -/* $XTermId: ptyx.h,v 1.627 2009/09/10 08:50:02 tom Exp $ */ +/* $XTermId: ptyx.h,v 1.632 2009/10/10 13:02:16 tom Exp $ */ /* * Copyright 1999-2008,2009 by Thomas E. Dickey @@ -461,11 +461,6 @@ typedef struct { #ifndef OPT_COLOR_RES #define OPT_COLOR_RES 1 /* true if xterm delays color-resource evaluation */ -#undef OPT_COLOR_RES2 -#endif - -#ifndef OPT_COLOR_RES2 -#define OPT_COLOR_RES2 OPT_COLOR_RES /* true to avoid using extra resources */ #endif #ifndef OPT_DABBREV @@ -706,9 +701,12 @@ typedef struct { #define OPT_COLOR_RES 0 #endif -#if OPT_COLOR_RES2 && !(OPT_256_COLORS || OPT_88_COLORS) -/* You must have 88/256 colors to need fake-resource logic */ -#undef OPT_COLOR_RES2 +#if OPT_256_COLORS && (OPT_WIDE_CHARS || OPT_RENDERFONT || OPT_XMC_GLITCH) +/* It's actually more complicated than that - but by trimming options you can + * have 256 color resources though. + */ +#define OPT_COLOR_RES2 1 +#else #define OPT_COLOR_RES2 0 #endif @@ -1543,9 +1541,11 @@ typedef struct { Boolean fnt_prop; /* true if proportional fonts */ Boolean fnt_boxes; /* true if font has box-chars */ + Boolean force_packed; /* true to override proportional */ #if OPT_BOX_CHARS Boolean force_box_chars;/* true if we assume that */ - Boolean force_all_chars;/* true to outline missing chars*/ + Boolean force_all_chars;/* true to outline missing chars */ + Boolean allow_packing; /* true to allow packed-fonts */ #endif Dimension fnt_wide; Dimension fnt_high; |