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.176 by root, Sat Dec 31 19:30:25 2005 UTC

… …
376enum { 376enum {
377 PRIMARY = 0, 377 PRIMARY = 0,
378 SECONDARY, 378 SECONDARY,
379}; 379};
380 380
381#define RS_None 0 /* Normal */ 381#define RS_None 0
382 382
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 383#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 384#define RS_bgMask 0x00003f80UL // 128 colors
385 385
386// font styles 386// font styles
387#define RS_Bold 0x00004000UL // value 1 387#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 388#define RS_Italic 0x00008000UL // value 2
389 389
390// fake styles 390// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 391#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 392#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 393#define RS_Uline 0x00040000UL // underline
394 394
395// 5 bits still to go 395// 5 custom bits for extensions
396#define RS_customCount 32
397#define RS_customMask 0x00f80000UL
398#define RS_customShift 19
396 399
397// other flags 400// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 401#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 402
400#define RS_styleCount 4 403#define RS_styleCount 4
… …
573 Rs_font, 576 Rs_font,
574#if ENABLE_STYLES 577#if ENABLE_STYLES
575 Rs_boldFont, 578 Rs_boldFont,
576 Rs_italicFont, 579 Rs_italicFont,
577 Rs_boldItalicFont, 580 Rs_boldItalicFont,
581 Rs_intensityStyles,
578#endif 582#endif
579 Rs_name, 583 Rs_name,
580 Rs_title, 584 Rs_title,
581#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 585#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
582 Rs_path, 586 Rs_path,
… …
629#ifdef TRANSPARENT 633#ifdef TRANSPARENT
630 Rs_transparent, 634 Rs_transparent,
631 Rs_transparent_all, 635 Rs_transparent_all,
632#endif 636#endif
633#if ENABLE_FRILLS 637#if ENABLE_FRILLS
638 Rs_pty_fd,
639 Rs_hold,
634 Rs_ext_bwidth, 640 Rs_ext_bwidth,
635 Rs_int_bwidth, 641 Rs_int_bwidth,
636 Rs_borderLess, 642 Rs_borderLess,
637 Rs_lineSpace, 643 Rs_lineSpace,
638 Rs_pty_fd,
639 Rs_cursorUnderline, 644 Rs_cursorUnderline,
640#endif 645#endif
641#if CURSOR_BLINK 646#if CURSOR_BLINK
642 Rs_cursorBlink, 647 Rs_cursorBlink,
643#endif 648#endif
… …
825#define ROW(n) row_buf [LINENO (n)] 830#define ROW(n) row_buf [LINENO (n)]
826 831
827/* how to build & extract colors and attributes */ 832/* how to build & extract colors and attributes */
828#define GET_BASEFG(x) (((x) & RS_fgMask)) 833#define GET_BASEFG(x) (((x) & RS_fgMask))
829#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 834#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 835
848#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 836#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
849#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 837#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
850 838
851#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 839#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
958#endif 946#endif
959 947
960extern class rxvt_failure_exception { } rxvt_failure_exception; 948extern class rxvt_failure_exception { } rxvt_failure_exception;
961 949
962typedef callback1<void, const char *> log_callback; 950typedef callback1<void, const char *> log_callback;
951typedef callback1<int, int> getfd_callback;
963 952
964extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 953extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
965extern void rxvt_log (const char *fmt, ...); 954extern void rxvt_log (const char *fmt, ...);
966extern void rxvt_warn (const char *fmt, ...); 955extern void rxvt_warn (const char *fmt, ...);
967extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 956extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1044 class keyboard_manager; 1033 class keyboard_manager;
1045#endif 1034#endif
1046 1035
1047struct rxvt_term : zero_initialized, rxvt_vars { 1036struct rxvt_term : zero_initialized, rxvt_vars {
1048 log_callback *log_hook; // log error messages through this hook, if != 0 1037 log_callback *log_hook; // log error messages through this hook, if != 0
1038 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1049 1039
1050 struct mbstate mbstate; // current input multibyte state 1040 struct mbstate mbstate; // current input multibyte state
1051 1041
1052 unsigned char want_refresh:1, 1042 unsigned char want_refresh:1,
1053#ifdef TRANSPARENT 1043#ifdef TRANSPARENT
… …
1258 // ISO 14755 entry support 1248 // ISO 14755 entry support
1259 unicode_t iso14755buf; 1249 unicode_t iso14755buf;
1260 void commit_iso14755 (); 1250 void commit_iso14755 ();
1261 int hex_keyval (XKeyEvent &ev); 1251 int hex_keyval (XKeyEvent &ev);
1262# if ISO_14755 1252# if ISO_14755
1263 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1253 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); 1254 void iso14755_54 (int x, int y);
1265# endif 1255# endif
1266#endif 1256#endif
1267 1257
1268 // modifies first argument(!) 1258 // modifies first argument(!)
… …
1322 1312
1323 void tt_winch (); 1313 void tt_winch ();
1324 1314
1325 rxvt_term (); 1315 rxvt_term ();
1326 ~rxvt_term (); 1316 ~rxvt_term ();
1317 void child_exit (); // child has exited, usually destroys
1327 void destroy (); 1318 void destroy ();
1328 void emergency_cleanup (); 1319 void emergency_cleanup ();
1329 1320
1330 bool init (int argc, const char *const *argv); 1321 bool init (int argc, const char *const *argv);
1331 bool init_vars (); 1322 bool init_vars ();
… …
1468 { 1459 {
1469 l.t = (text_t *)talloc->alloc (); 1460 l.t = (text_t *)talloc->alloc ();
1470 l.r = (rend_t *)ralloc->alloc (); 1461 l.r = (rend_t *)ralloc->alloc ();
1471 } 1462 }
1472 1463
1464#if 0
1473 void lfree (line_t &l) 1465 void lfree (line_t &l)
1474 { 1466 {
1475 talloc->free (l.t); 1467 talloc->free (l.t);
1476 ralloc->free (l.r); 1468 ralloc->free (l.r);
1477 } 1469 }
1470#endif
1478 1471
1479 void lresize (line_t &l) 1472 void lresize (line_t &l)
1480 { 1473 {
1481 if (!l.t) 1474 if (!l.t)
1482 return; 1475 return;
… …
1486 1479
1487 l.l = min (l.l, ncol); 1480 l.l = min (l.l, ncol);
1488 1481
1489 if (ncol > prev_ncol) 1482 if (ncol > prev_ncol)
1490 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1483 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1484 }
1485
1486 int fgcolor_of (rend_t r)
1487 {
1488 int base = GET_BASEFG (r);
1489#ifndef NO_BRIGHTCOLOR
1490 if (r & RS_Bold
1491# if ENABLE_STYLES
1492 && OPTION (Opt_intensityStyles)
1493# endif
1494 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1495 base += minBrightCOLOR - minCOLOR;
1496#endif
1497 return base;
1498 }
1499
1500 int bgcolor_of (rend_t r)
1501 {
1502 int base = GET_BASEBG (r);
1503#ifndef NO_BRIGHTCOLOR
1504 if (r & RS_Blink
1505# if ENABLE_STYLES
1506 && OPTION (Opt_intensityStyles)
1507# endif
1508 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1509 base += minBrightCOLOR - minCOLOR;
1510#endif
1511 return base;
1491 } 1512 }
1492 1513
1493 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1514 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); 1515 void scr_blank_screen_mem (line_t &l, rend_t efs);
1495 int scr_scroll_text (int row1, int row2, int count); 1516 int scr_scroll_text (int row1, int row2, int count);

Diff Legend

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