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.167 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.174 by root, Sat Dec 31 17:16:17 2005 UTC

… …
629#ifdef TRANSPARENT 629#ifdef TRANSPARENT
630 Rs_transparent, 630 Rs_transparent,
631 Rs_transparent_all, 631 Rs_transparent_all,
632#endif 632#endif
633#if ENABLE_FRILLS 633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
634 Rs_ext_bwidth, 636 Rs_ext_bwidth,
635 Rs_int_bwidth, 637 Rs_int_bwidth,
636 Rs_borderLess, 638 Rs_borderLess,
637 Rs_lineSpace, 639 Rs_lineSpace,
638 Rs_pty_fd,
639 Rs_cursorUnderline, 640 Rs_cursorUnderline,
641 Rs_intensityStyles,
640#endif 642#endif
641#if CURSOR_BLINK 643#if CURSOR_BLINK
642 Rs_cursorBlink, 644 Rs_cursorBlink,
643#endif 645#endif
644#if ENABLE_XEMBED 646#if ENABLE_XEMBED
… …
825#define ROW(n) row_buf [LINENO (n)] 827#define ROW(n) row_buf [LINENO (n)]
826 828
827/* how to build & extract colors and attributes */ 829/* how to build & extract colors and attributes */
828#define GET_BASEFG(x) (((x) & RS_fgMask)) 830#define GET_BASEFG(x) (((x) & RS_fgMask))
829#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
830#ifndef NO_BRIGHTCOLOR
831# define GET_FGCOLOR(x) \
832 ((((x) & RS_Bold) == 0 \
833 || GET_BASEFG (x) < minCOLOR \
834 || GET_BASEFG (x) >= minBrightCOLOR) \
835 ? GET_BASEFG (x) \
836 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
837# define GET_BGCOLOR(x) \
838 ((((x) & RS_Blink) == 0 \
839 || GET_BASEBG (x) < minCOLOR \
840 || GET_BASEBG (x) >= minBrightCOLOR) \
841 ? GET_BASEBG (x) \
842 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
843#else
844# define GET_FGCOLOR(x) GET_BASEFG(x)
845# define GET_BGCOLOR(x) GET_BASEBG(x)
846#endif
847 832
848#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 833#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
849#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 834#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
850 835
851#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 836#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
958#endif 943#endif
959 944
960extern class rxvt_failure_exception { } rxvt_failure_exception; 945extern class rxvt_failure_exception { } rxvt_failure_exception;
961 946
962typedef callback1<void, const char *> log_callback; 947typedef callback1<void, const char *> log_callback;
948typedef callback1<int, int> getfd_callback;
963 949
964extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 950extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
965extern void rxvt_log (const char *fmt, ...); 951extern void rxvt_log (const char *fmt, ...);
966extern void rxvt_warn (const char *fmt, ...); 952extern void rxvt_warn (const char *fmt, ...);
967extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 953extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1044 class keyboard_manager; 1030 class keyboard_manager;
1045#endif 1031#endif
1046 1032
1047struct rxvt_term : zero_initialized, rxvt_vars { 1033struct rxvt_term : zero_initialized, rxvt_vars {
1048 log_callback *log_hook; // log error messages through this hook, if != 0 1034 log_callback *log_hook; // log error messages through this hook, if != 0
1035 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1049 1036
1050 struct mbstate mbstate; // current input multibyte state 1037 struct mbstate mbstate; // current input multibyte state
1051 1038
1052 unsigned char want_refresh:1, 1039 unsigned char want_refresh:1,
1053#ifdef TRANSPARENT 1040#ifdef TRANSPARENT
… …
1258 // ISO 14755 entry support 1245 // ISO 14755 entry support
1259 unicode_t iso14755buf; 1246 unicode_t iso14755buf;
1260 void commit_iso14755 (); 1247 void commit_iso14755 ();
1261 int hex_keyval (XKeyEvent &ev); 1248 int hex_keyval (XKeyEvent &ev);
1262# if ISO_14755 1249# if ISO_14755
1263 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);
1264 void iso14755_54 (int x, int y); 1251 void iso14755_54 (int x, int y);
1265# endif 1252# endif
1266#endif 1253#endif
1267 1254
1268 // modifies first argument(!) 1255 // modifies first argument(!)
… …
1322 1309
1323 void tt_winch (); 1310 void tt_winch ();
1324 1311
1325 rxvt_term (); 1312 rxvt_term ();
1326 ~rxvt_term (); 1313 ~rxvt_term ();
1314 void child_exit (); // child has exited, usually destroys
1327 void destroy (); 1315 void destroy ();
1328 void emergency_cleanup (); 1316 void emergency_cleanup ();
1329 1317
1330 bool init (int argc, const char *const *argv); 1318 bool init (int argc, const char *const *argv);
1331 bool init_vars (); 1319 bool init_vars ();
… …
1468 { 1456 {
1469 l.t = (text_t *)talloc->alloc (); 1457 l.t = (text_t *)talloc->alloc ();
1470 l.r = (rend_t *)ralloc->alloc (); 1458 l.r = (rend_t *)ralloc->alloc ();
1471 } 1459 }
1472 1460
1461#if 0
1473 void lfree (line_t &l) 1462 void lfree (line_t &l)
1474 { 1463 {
1475 talloc->free (l.t); 1464 talloc->free (l.t);
1476 ralloc->free (l.r); 1465 ralloc->free (l.r);
1477 } 1466 }
1467#endif
1478 1468
1479 void lresize (line_t &l) 1469 void lresize (line_t &l)
1480 { 1470 {
1481 if (!l.t) 1471 if (!l.t)
1482 return; 1472 return;
… …
1486 1476
1487 l.l = min (l.l, ncol); 1477 l.l = min (l.l, ncol);
1488 1478
1489 if (ncol > prev_ncol) 1479 if (ncol > prev_ncol)
1490 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 && (!ENABLE_STYLES || OPTION (Opt_intensityStyles))
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR;
1491#endif
1492 return base;
1493 }
1494
1495 int bgcolor_of (rend_t r)
1496 {
1497 int base = GET_BASEBG (r);
1498#ifndef NO_BRIGHTCOLOR
1499 if (r & RS_Blink
1500 && (!ENABLE_STYLES || OPTION (Opt_intensityStyles))
1501 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1502 base += minBrightCOLOR - minCOLOR;
1503#endif
1504 return base;
1491 } 1505 }
1492 1506
1493 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1507 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1494 void scr_blank_screen_mem (line_t &l, rend_t efs); 1508 void scr_blank_screen_mem (line_t &l, rend_t efs);
1495 int scr_scroll_text (int row1, int row2, int count); 1509 int scr_scroll_text (int row1, int row2, int count);

Diff Legend

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