ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.264 by root, Sat Dec 2 16:57:16 2006 UTC vs.
Revision 1.269 by root, Tue May 1 21:30:01 2007 UTC

… …
70 70
71#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
72typedef char *XPointer; 72typedef char *XPointer;
73#endif 73#endif
74 74
75#ifdef HAVE_TERMIOS_H
76# include <termios.h> 75#include <termios.h>
77typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
78#else
79# include <sgtty.h>
80typedef struct {
81 struct sgttyb sg;
82 struct tchars tc;
83 struct ltchars lc;
84 int line;
85 int local;
86} ttymode_t;
87#endif
88 77
89#ifdef XPM_BACKGROUND 78#ifdef XPM_BACKGROUND
90# ifdef XPM_INC_X11 79# ifdef XPM_INC_X11
91# include <X11/xpm.h> 80# include <X11/xpm.h>
92# else 81# else
… …
684 * MACRO DEFINES 673 * MACRO DEFINES
685 ***************************************************************************** 674 *****************************************************************************
686 */ 675 */
687#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
688 677
689// for speed reasons, we assume that all latin1 characters 678// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 679// single-width.
691// is actually 0x300, but ascii is what matters most). 680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 681
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
698#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight) 686#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar \
706 | Opt_scrollTtyOutput \
707 | Opt_jumpScroll \
708 | Opt_secondaryScreen \
709 | Opt_secondaryScroll \
710 | Opt_pastableTabs \
711 | Opt_intensityStyles)
712 691
713// for m >= -n, ensure remainder lies between 0..n-1 692// for m >= -n, ensure remainder lies between 0..n-1
714#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
715 694
716#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
917 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
918 897
919 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
920#ifdef TRANSPARENT 899#ifdef TRANSPARENT
921 want_full_refresh:1, /* awaiting full screen refresh */ 900 want_full_refresh:1, /* awaiting full screen refresh */
922#endif
923#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
924 am_transparent:1, /* is a transparent term */ 901 am_transparent:1, /* is a transparent term */
925 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
926#endif 903#endif
927 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
928 num_scr_allow:1, 905 num_scr_allow:1,
… …
1308 { 1285 {
1309 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1310#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1311 if (r & RS_Bold 1288 if (r & RS_Bold
1312# if ENABLE_STYLES 1289# if ENABLE_STYLES
1313 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1314# endif 1291# endif
1315 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1316 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1317#endif 1294#endif
1318 return base; 1295 return base;
… …
1322 { 1299 {
1323 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1324#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1325 if (r & RS_Blink 1302 if (r & RS_Blink
1326# if ENABLE_STYLES 1303# if ENABLE_STYLES
1327 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1328# endif 1305# endif
1329 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1330 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1331#endif 1308#endif
1332 return base; 1309 return base;
1333 } 1310 }
1334 1311
1335 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1336 { 1313 {
1337 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1338 } 1315 }
1339 1316
1340 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1341 { 1318 {
1342 if (set) 1319 if (set)
1343 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1344 else 1321 else
1345 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1346 } 1323 }
1347 1324
1348 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1325 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1349 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1326 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1350 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1327 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines