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.166 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.176 by root, Sat Dec 31 19:30:25 2005 UTC

… …
161 int clicks; 161 int clicks;
162 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
163 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
164 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
165}; 165};
166
167#define MAX_POSITIVE_INT16 (((uint16_t)-1)>>1) // TODO: configure/limits
168 166
169#if ENABLE_FRILLS 167#if ENABLE_FRILLS
170typedef struct _mwmhints { 168typedef struct _mwmhints {
171 CARD32 flags; 169 CARD32 flags;
172 CARD32 functions; 170 CARD32 functions;
… …
353#define FONT_DN "#-" 351#define FONT_DN "#-"
354#define FONT_UP "#+" 352#define FONT_UP "#+"
355 353
356/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
357enum { 355enum {
358 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
359 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
360 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
361}; 359};
362 360
363/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
364enum { 362enum {
365 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
… …
378enum { 376enum {
379 PRIMARY = 0, 377 PRIMARY = 0,
380 SECONDARY, 378 SECONDARY,
381}; 379};
382 380
383#define RS_None 0 /* Normal */ 381#define RS_None 0
384 382
385#define RS_fgMask 0x0000007fUL /* 128 colors */ 383#define RS_fgMask 0x0000007fUL // 128 colors
386#define RS_bgMask 0x00003f80UL /* 128 colors */ 384#define RS_bgMask 0x00003f80UL // 128 colors
387 385
388// font styles 386// font styles
389#define RS_Bold 0x00004000UL // value 1 387#define RS_Bold 0x00004000UL // value 1
390#define RS_Italic 0x00008000UL // value 2 388#define RS_Italic 0x00008000UL // value 2
391 389
392// fake styles 390// fake styles
393#define RS_Blink 0x00010000UL /* blink */ 391#define RS_Blink 0x00010000UL // blink
394#define RS_RVid 0x00020000UL /* reverse video */ 392#define RS_RVid 0x00020000UL // reverse video
395#define RS_Uline 0x00040000UL /* underline */ 393#define RS_Uline 0x00040000UL // underline
396 394
397// 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
398 399
399// other flags 400// other flags
400#define RS_Careful 0x80000000UL /* be careful when drawing these */ 401#define RS_Careful 0x80000000UL /* be careful when drawing these */
401 402
402#define RS_styleCount 4 403#define RS_styleCount 4
… …
575 Rs_font, 576 Rs_font,
576#if ENABLE_STYLES 577#if ENABLE_STYLES
577 Rs_boldFont, 578 Rs_boldFont,
578 Rs_italicFont, 579 Rs_italicFont,
579 Rs_boldItalicFont, 580 Rs_boldItalicFont,
581 Rs_intensityStyles,
580#endif 582#endif
581 Rs_name, 583 Rs_name,
582 Rs_title, 584 Rs_title,
583#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 585#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
584 Rs_path, 586 Rs_path,
… …
631#ifdef TRANSPARENT 633#ifdef TRANSPARENT
632 Rs_transparent, 634 Rs_transparent,
633 Rs_transparent_all, 635 Rs_transparent_all,
634#endif 636#endif
635#if ENABLE_FRILLS 637#if ENABLE_FRILLS
638 Rs_pty_fd,
639 Rs_hold,
636 Rs_ext_bwidth, 640 Rs_ext_bwidth,
637 Rs_int_bwidth, 641 Rs_int_bwidth,
638 Rs_borderLess, 642 Rs_borderLess,
639 Rs_lineSpace, 643 Rs_lineSpace,
640 Rs_pty_fd,
641 Rs_cursorUnderline, 644 Rs_cursorUnderline,
642#endif 645#endif
643#if CURSOR_BLINK 646#if CURSOR_BLINK
644 Rs_cursorBlink, 647 Rs_cursorBlink,
645#endif 648#endif
… …
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 821#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 822
820#define TermWin_TotalWidth() ((int32_t)this->width) 823#define TermWin_TotalWidth() ((int32_t)this->width)
821#define TermWin_TotalHeight() ((int32_t)this->height) 824#define TermWin_TotalHeight() ((int32_t)this->height)
822 825
823#define LINENO(n) (((n) + term_start + total_rows) % total_rows) 826// for m >= -n, ensure remainder lies between 0..n-1
827#define MOD(m,n) (((m) + (n)) % (n))
828
829#define LINENO(n) MOD (term_start + int(n), total_rows)
824#define ROW(n) (save [LINENO (n)]) 830#define ROW(n) row_buf [LINENO (n)]
825 831
826/* how to build & extract colors and attributes */ 832/* how to build & extract colors and attributes */
827#define GET_BASEFG(x) (((x) & RS_fgMask)) 833#define GET_BASEFG(x) (((x) & RS_fgMask))
828#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 834#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
829#ifndef NO_BRIGHTCOLOR
830# define GET_FGCOLOR(x) \
831 ((((x) & RS_Bold) == 0 \
832 || GET_BASEFG (x) < minCOLOR \
833 || GET_BASEFG (x) >= minBrightCOLOR) \
834 ? GET_BASEFG (x) \
835 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
836# define GET_BGCOLOR(x) \
837 ((((x) & RS_Blink) == 0 \
838 || GET_BASEBG (x) < minCOLOR \
839 || GET_BASEBG (x) >= minBrightCOLOR) \
840 ? GET_BASEBG (x) \
841 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
842#else
843# define GET_FGCOLOR(x) GET_BASEFG(x)
844# define GET_BGCOLOR(x) GET_BASEBG(x)
845#endif
846 835
847#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 836#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
848#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 837#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
849 838
850#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 839#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
957#endif 946#endif
958 947
959extern class rxvt_failure_exception { } rxvt_failure_exception; 948extern class rxvt_failure_exception { } rxvt_failure_exception;
960 949
961typedef callback1<void, const char *> log_callback; 950typedef callback1<void, const char *> log_callback;
951typedef callback1<int, int> getfd_callback;
962 952
963extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 953extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
964extern void rxvt_log (const char *fmt, ...); 954extern void rxvt_log (const char *fmt, ...);
965extern void rxvt_warn (const char *fmt, ...); 955extern void rxvt_warn (const char *fmt, ...);
966extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 956extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1043 class keyboard_manager; 1033 class keyboard_manager;
1044#endif 1034#endif
1045 1035
1046struct rxvt_term : zero_initialized, rxvt_vars { 1036struct rxvt_term : zero_initialized, rxvt_vars {
1047 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
1048 1039
1049 struct mbstate mbstate; // current input multibyte state 1040 struct mbstate mbstate; // current input multibyte state
1050 1041
1051 unsigned char want_refresh:1, 1042 unsigned char want_refresh:1,
1052#ifdef TRANSPARENT 1043#ifdef TRANSPARENT
… …
1257 // ISO 14755 entry support 1248 // ISO 14755 entry support
1258 unicode_t iso14755buf; 1249 unicode_t iso14755buf;
1259 void commit_iso14755 (); 1250 void commit_iso14755 ();
1260 int hex_keyval (XKeyEvent &ev); 1251 int hex_keyval (XKeyEvent &ev);
1261# if ISO_14755 1252# if ISO_14755
1262 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);
1263 void iso14755_54 (int x, int y); 1254 void iso14755_54 (int x, int y);
1264# endif 1255# endif
1265#endif 1256#endif
1266 1257
1267 // modifies first argument(!) 1258 // modifies first argument(!)
… …
1321 1312
1322 void tt_winch (); 1313 void tt_winch ();
1323 1314
1324 rxvt_term (); 1315 rxvt_term ();
1325 ~rxvt_term (); 1316 ~rxvt_term ();
1317 void child_exit (); // child has exited, usually destroys
1326 void destroy (); 1318 void destroy ();
1327 void emergency_cleanup (); 1319 void emergency_cleanup ();
1328 1320
1329 bool init (int argc, const char *const *argv); 1321 bool init (int argc, const char *const *argv);
1330 bool init_vars (); 1322 bool init_vars ();
… …
1467 { 1459 {
1468 l.t = (text_t *)talloc->alloc (); 1460 l.t = (text_t *)talloc->alloc ();
1469 l.r = (rend_t *)ralloc->alloc (); 1461 l.r = (rend_t *)ralloc->alloc ();
1470 } 1462 }
1471 1463
1464#if 0
1472 void lfree (line_t &l) 1465 void lfree (line_t &l)
1473 { 1466 {
1474 talloc->free (l.t); 1467 talloc->free (l.t);
1475 ralloc->free (l.r); 1468 ralloc->free (l.r);
1476 } 1469 }
1470#endif
1477 1471
1478 void lresize (line_t &l) 1472 void lresize (line_t &l)
1479 { 1473 {
1480 if (!l.t) 1474 if (!l.t)
1481 return; 1475 return;
… …
1487 1481
1488 if (ncol > prev_ncol) 1482 if (ncol > prev_ncol)
1489 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1483 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1490 } 1484 }
1491 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;
1512 }
1513
1492 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);
1493 void scr_blank_screen_mem (line_t &l, rend_t efs); 1515 void scr_blank_screen_mem (line_t &l, rend_t efs);
1494 int scr_scroll_text (int row1, int row2, int count); 1516 int scr_scroll_text (int row1, int row2, int count);
1495 void scr_reset (); 1517 void scr_reset ();
1496 void scr_reset_realloc ();
1497 void scr_release (); 1518 void scr_release ();
1498 void scr_clear (bool really = false); 1519 void scr_clear (bool really = false);
1499 void scr_refresh (unsigned char refresh_type); 1520 void scr_refresh (unsigned char refresh_type);
1500 bool scr_refresh_rend (rend_t mask, rend_t value); 1521 bool scr_refresh_rend (rend_t mask, rend_t value);
1501 void scr_erase_screen (int mode); 1522 void scr_erase_screen (int mode);

Diff Legend

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