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.171 by root, Sat Dec 31 16:06:48 2005 UTC vs.
Revision 1.175 by root, Sat Dec 31 18:19:07 2005 UTC

… …
573 Rs_font, 573 Rs_font,
574#if ENABLE_STYLES 574#if ENABLE_STYLES
575 Rs_boldFont, 575 Rs_boldFont,
576 Rs_italicFont, 576 Rs_italicFont,
577 Rs_boldItalicFont, 577 Rs_boldItalicFont,
578 Rs_intensityStyles,
578#endif 579#endif
579 Rs_name, 580 Rs_name,
580 Rs_title, 581 Rs_title,
581#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 582#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
582 Rs_path, 583 Rs_path,
… …
636 Rs_ext_bwidth, 637 Rs_ext_bwidth,
637 Rs_int_bwidth, 638 Rs_int_bwidth,
638 Rs_borderLess, 639 Rs_borderLess,
639 Rs_lineSpace, 640 Rs_lineSpace,
640 Rs_cursorUnderline, 641 Rs_cursorUnderline,
641 Rs_intensityStyles,
642#endif 642#endif
643#if CURSOR_BLINK 643#if CURSOR_BLINK
644 Rs_cursorBlink, 644 Rs_cursorBlink,
645#endif 645#endif
646#if ENABLE_XEMBED 646#if ENABLE_XEMBED
… …
827#define ROW(n) row_buf [LINENO (n)] 827#define ROW(n) row_buf [LINENO (n)]
828 828
829/* how to build & extract colors and attributes */ 829/* how to build & extract colors and attributes */
830#define GET_BASEFG(x) (((x) & RS_fgMask)) 830#define GET_BASEFG(x) (((x) & RS_fgMask))
831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
832#ifndef NO_BRIGHTCOLOR
833# define GET_FGCOLOR(x) ( \
834 !((x) & RS_Bold) \
835 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
836 || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \
837 ? GET_BASEFG (x) \
838 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
839# define GET_BGCOLOR(x) ( \
840 !((x) & RS_Blink) \
841 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
842 || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \
843 ? GET_BASEBG (x) \
844 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
845#else
846# define GET_FGCOLOR(x) GET_BASEFG(x)
847# define GET_BGCOLOR(x) GET_BASEBG(x)
848#endif
849 832
850#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 833#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
851#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 834#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
852 835
853#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 836#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
1262 // ISO 14755 entry support 1245 // ISO 14755 entry support
1263 unicode_t iso14755buf; 1246 unicode_t iso14755buf;
1264 void commit_iso14755 (); 1247 void commit_iso14755 ();
1265 int hex_keyval (XKeyEvent &ev); 1248 int hex_keyval (XKeyEvent &ev);
1266# if ISO_14755 1249# if ISO_14755
1267 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1250 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1268 void iso14755_54 (int x, int y); 1251 void iso14755_54 (int x, int y);
1269# endif 1252# endif
1270#endif 1253#endif
1271 1254
1272 // modifies first argument(!) 1255 // modifies first argument(!)
… …
1493 1476
1494 l.l = min (l.l, ncol); 1477 l.l = min (l.l, ncol);
1495 1478
1496 if (ncol > prev_ncol) 1479 if (ncol > prev_ncol)
1497 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1480 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1481 }
1482
1483 int fgcolor_of (rend_t r)
1484 {
1485 int base = GET_BASEFG (r);
1486#ifndef NO_BRIGHTCOLOR
1487 if (r & RS_Bold
1488# if ENABLE_STYLES
1489 && OPTION (Opt_intensityStyles)
1490# endif
1491 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1492 base += minBrightCOLOR - minCOLOR;
1493#endif
1494 return base;
1495 }
1496
1497 int bgcolor_of (rend_t r)
1498 {
1499 int base = GET_BASEBG (r);
1500#ifndef NO_BRIGHTCOLOR
1501 if (r & RS_Blink
1502# if ENABLE_STYLES
1503 && OPTION (Opt_intensityStyles)
1504# endif
1505 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1506 base += minBrightCOLOR - minCOLOR;
1507#endif
1508 return base;
1498 } 1509 }
1499 1510
1500 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1511 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1501 void scr_blank_screen_mem (line_t &l, rend_t efs); 1512 void scr_blank_screen_mem (line_t &l, rend_t efs);
1502 int scr_scroll_text (int row1, int row2, int count); 1513 int scr_scroll_text (int row1, int row2, int count);

Diff Legend

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