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

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.168 by root, Thu Dec 22 16:44:10 2005 UTC vs.
Revision 1.172 by root, Sat Dec 31 16:30:42 2005 UTC

… …
636 Rs_ext_bwidth, 636 Rs_ext_bwidth,
637 Rs_int_bwidth, 637 Rs_int_bwidth,
638 Rs_borderLess, 638 Rs_borderLess,
639 Rs_lineSpace, 639 Rs_lineSpace,
640 Rs_cursorUnderline, 640 Rs_cursorUnderline,
641 Rs_intensityStyles,
641#endif 642#endif
642#if CURSOR_BLINK 643#if CURSOR_BLINK
643 Rs_cursorBlink, 644 Rs_cursorBlink,
644#endif 645#endif
645#if ENABLE_XEMBED 646#if ENABLE_XEMBED
… …
827 828
828/* how to build & extract colors and attributes */ 829/* how to build & extract colors and attributes */
829#define GET_BASEFG(x) (((x) & RS_fgMask)) 830#define GET_BASEFG(x) (((x) & RS_fgMask))
830#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
831#ifndef NO_BRIGHTCOLOR 832#ifndef NO_BRIGHTCOLOR
832# define GET_FGCOLOR(x) \ 833# define GET_FGCOLOR(x) ( \
833 ((((x) & RS_Bold) == 0 \ 834 !((x) & RS_Bold) \
834 || GET_BASEFG (x) < minCOLOR \ 835 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
835 || GET_BASEFG (x) >= minBrightCOLOR) \ 836 || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \
836 ? GET_BASEFG (x) \ 837 ? GET_BASEFG (x) \
837 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 838 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
838# define GET_BGCOLOR(x) \ 839# define GET_BGCOLOR(x) ( \
839 ((((x) & RS_Blink) == 0 \ 840 !((x) & RS_Blink) \
840 || GET_BASEBG (x) < minCOLOR \ 841 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
841 || GET_BASEBG (x) >= minBrightCOLOR) \ 842 || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \
842 ? GET_BASEBG (x) \ 843 ? GET_BASEBG (x) \
843 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 844 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
844#else 845#else
845# define GET_FGCOLOR(x) GET_BASEFG(x) 846# define GET_FGCOLOR(x) GET_BASEFG(x)
846# define GET_BGCOLOR(x) GET_BASEBG(x) 847# define GET_BGCOLOR(x) GET_BASEBG(x)
847#endif 848#endif
848 849
… …
959#endif 960#endif
960 961
961extern class rxvt_failure_exception { } rxvt_failure_exception; 962extern class rxvt_failure_exception { } rxvt_failure_exception;
962 963
963typedef callback1<void, const char *> log_callback; 964typedef callback1<void, const char *> log_callback;
965typedef callback1<int, int> getfd_callback;
964 966
965extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 967extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
966extern void rxvt_log (const char *fmt, ...); 968extern void rxvt_log (const char *fmt, ...);
967extern void rxvt_warn (const char *fmt, ...); 969extern void rxvt_warn (const char *fmt, ...);
968extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 970extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1045 class keyboard_manager; 1047 class keyboard_manager;
1046#endif 1048#endif
1047 1049
1048struct rxvt_term : zero_initialized, rxvt_vars { 1050struct rxvt_term : zero_initialized, rxvt_vars {
1049 log_callback *log_hook; // log error messages through this hook, if != 0 1051 log_callback *log_hook; // log error messages through this hook, if != 0
1052 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1050 1053
1051 struct mbstate mbstate; // current input multibyte state 1054 struct mbstate mbstate; // current input multibyte state
1052 1055
1053 unsigned char want_refresh:1, 1056 unsigned char want_refresh:1,
1054#ifdef TRANSPARENT 1057#ifdef TRANSPARENT
… …
1259 // ISO 14755 entry support 1262 // ISO 14755 entry support
1260 unicode_t iso14755buf; 1263 unicode_t iso14755buf;
1261 void commit_iso14755 (); 1264 void commit_iso14755 ();
1262 int hex_keyval (XKeyEvent &ev); 1265 int hex_keyval (XKeyEvent &ev);
1263# if ISO_14755 1266# if ISO_14755
1264 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1267 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1265 void iso14755_54 (int x, int y); 1268 void iso14755_54 (int x, int y);
1266# endif 1269# endif
1267#endif 1270#endif
1268 1271
1269 // modifies first argument(!) 1272 // modifies first argument(!)
… …
1470 { 1473 {
1471 l.t = (text_t *)talloc->alloc (); 1474 l.t = (text_t *)talloc->alloc ();
1472 l.r = (rend_t *)ralloc->alloc (); 1475 l.r = (rend_t *)ralloc->alloc ();
1473 } 1476 }
1474 1477
1478#if 0
1475 void lfree (line_t &l) 1479 void lfree (line_t &l)
1476 { 1480 {
1477 talloc->free (l.t); 1481 talloc->free (l.t);
1478 ralloc->free (l.r); 1482 ralloc->free (l.r);
1479 } 1483 }
1484#endif
1480 1485
1481 void lresize (line_t &l) 1486 void lresize (line_t &l)
1482 { 1487 {
1483 if (!l.t) 1488 if (!l.t)
1484 return; 1489 return;

Diff Legend

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