diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-08-22 13:38:12 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-08-22 13:38:12 +0000 |
| commit | e58c174e6bed62ca4f6188f0ef68fd5eb7f4381e (patch) | |
| tree | 32c3b6b7bc4fc4f76541078a7d1781f6872a1502 /app/xterm/ptyx.h | |
| parent | 3ee16a263dc221489e6f26bc32140c5d71c35609 (diff) | |
Update to xterm 261. Tested by krw@, jcs@.
Diffstat (limited to 'app/xterm/ptyx.h')
| -rw-r--r-- | app/xterm/ptyx.h | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/app/xterm/ptyx.h b/app/xterm/ptyx.h index f3b1e1a4d..24fa5c19a 100644 --- a/app/xterm/ptyx.h +++ b/app/xterm/ptyx.h @@ -1,4 +1,4 @@ -/* $XTermId: ptyx.h,v 1.666 2010/04/18 16:50:09 tom Exp $ */ +/* $XTermId: ptyx.h,v 1.670 2010/06/15 08:34:38 tom Exp $ */ /* * Copyright 1999-2009,2010 by Thomas E. Dickey @@ -328,8 +328,16 @@ typedef struct { /* * ANSI emulation, special character codes */ +#define ANSI_EOT 0x04 #define ANSI_BEL 0x07 +#define ANSI_BS 0x08 +#define ANSI_HT 0x09 +#define ANSI_LF 0x0A +#define ANSI_VT 0x0B #define ANSI_FF 0x0C /* C0, C1 control names */ +#define ANSI_CR 0x0D +#define ANSI_SO 0x0E +#define ANSI_SI 0x0F #define ANSI_XON 0x11 /* DC1 */ #define ANSI_XOFF 0x13 /* DC3 */ #define ANSI_NAK 0x15 @@ -1321,6 +1329,17 @@ typedef struct { } XTermFonts; #if OPT_RENDERFONT +typedef enum { + erFalse = 0 + , erTrue + , erDefault + , erLast +} RenderFont; + +#define DefaultRenderFont(xw) \ + if ((xw)->misc.render_font == erDefault) \ + (xw)->misc.render_font = erFalse + typedef struct { XftFont * font; FontMap map; @@ -2072,6 +2091,12 @@ typedef enum { /* legal values for screen.utf8_mode */ #define KEYBOARD_TYPES NAME_TCAP_KT NAME_HP_KT NAME_SCO_KT NAME_SUN_KT NAME_VT220_KT #if OPT_TRACE +#define TRACE_RC(code,func) code = func +#else +#define TRACE_RC(code,func) func +#endif + +#if OPT_TRACE extern const char * visibleKeyboardType(xtermKeyboardType); #endif @@ -2192,6 +2217,7 @@ typedef struct _Misc { char *face_name; char *face_wide_name; float face_size[NMENUFONTS]; + char *render_font_s; Boolean render_font; #endif } Misc; @@ -2421,7 +2447,7 @@ typedef struct _TekWidgetRec { /* * Macro to check if we are iconified; do not use render for that case. */ -#define UsingRenderFont(xw) ((xw)->misc.render_font && !IsIcon(TScreenOf(xw))) +#define UsingRenderFont(xw) (((xw)->misc.render_font == True) && !IsIcon(TScreenOf(xw))) /* * These definitions do not depend on whether xterm supports active-icon. @@ -2531,6 +2557,10 @@ typedef struct Tek_Link #define TRACE(p) /*nothing*/ #endif +#ifndef TRACE_CLOSE +#define TRACE_CLOSE() /*nothing*/ +#endif + #ifndef TRACE_ARGV #define TRACE_ARGV(tag,argv) /*nothing*/ #endif |