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.266 by root, Sat Jan 20 00:45:30 2007 UTC vs.
Revision 1.269 by root, Tue May 1 21:30:01 2007 UTC

687#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
688#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
691 691
692#define OPTION(opt) (options & (opt))
693#define DEFAULT_OPTIONS (Opt_scrollBar \
694 | Opt_scrollTtyOutput \
695 | Opt_jumpScroll \
696 | Opt_secondaryScreen \
697 | Opt_secondaryScroll \
698 | Opt_pastableTabs \
699 | Opt_intensityStyles)
700
701// for m >= -n, ensure remainder lies between 0..n-1 692// for m >= -n, ensure remainder lies between 0..n-1
702#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
703 694
704#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
705#define ROW(n) row_buf [LINENO (n)] 696#define ROW(n) row_buf [LINENO (n)]
905 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
906 897
907 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
908#ifdef TRANSPARENT 899#ifdef TRANSPARENT
909 want_full_refresh:1, /* awaiting full screen refresh */ 900 want_full_refresh:1, /* awaiting full screen refresh */
910#endif
911#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
912 am_transparent:1, /* is a transparent term */ 901 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif 903#endif
915 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 905 num_scr_allow:1,
1296 { 1285 {
1297 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1298#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1299 if (r & RS_Bold 1288 if (r & RS_Bold
1300# if ENABLE_STYLES 1289# if ENABLE_STYLES
1301 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1302# endif 1291# endif
1303 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1304 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1305#endif 1294#endif
1306 return base; 1295 return base;
1310 { 1299 {
1311 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1312#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1313 if (r & RS_Blink 1302 if (r & RS_Blink
1314# if ENABLE_STYLES 1303# if ENABLE_STYLES
1315 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1316# endif 1305# endif
1317 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1318 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1319#endif 1308#endif
1320 return base; 1309 return base;
1321 } 1310 }
1322 1311
1323 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1324 { 1313 {
1325 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1326 } 1315 }
1327 1316
1328 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1329 { 1318 {
1330 if (set) 1319 if (set)
1331 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1332 else 1321 else
1333 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1334 } 1323 }
1335 1324
1336 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;
1337 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;
1338 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