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.172 by root, Sat Dec 31 16:30:42 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 */
… …
631#ifdef TRANSPARENT 629#ifdef TRANSPARENT
632 Rs_transparent, 630 Rs_transparent,
633 Rs_transparent_all, 631 Rs_transparent_all,
634#endif 632#endif
635#if ENABLE_FRILLS 633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
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_pty_fd,
641 Rs_cursorUnderline, 640 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
… …
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 819
820#define TermWin_TotalWidth() ((int32_t)this->width) 820#define TermWin_TotalWidth() ((int32_t)this->width)
821#define TermWin_TotalHeight() ((int32_t)this->height) 821#define TermWin_TotalHeight() ((int32_t)this->height)
822 822
823#define LINENO(n) (((n) + term_start + total_rows) % total_rows) 823// for m >= -n, ensure remainder lies between 0..n-1
824#define MOD(m,n) (((m) + (n)) % (n))
825
826#define LINENO(n) MOD (term_start + int(n), total_rows)
824#define ROW(n) (save [LINENO (n)]) 827#define ROW(n) row_buf [LINENO (n)]
825 828
826/* how to build & extract colors and attributes */ 829/* how to build & extract colors and attributes */
827#define GET_BASEFG(x) (((x) & RS_fgMask)) 830#define GET_BASEFG(x) (((x) & RS_fgMask))
828#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
829#ifndef NO_BRIGHTCOLOR 832#ifndef NO_BRIGHTCOLOR
830# define GET_FGCOLOR(x) \ 833# define GET_FGCOLOR(x) ( \
831 ((((x) & RS_Bold) == 0 \ 834 !((x) & RS_Bold) \
832 || GET_BASEFG (x) < minCOLOR \ 835 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
833 || GET_BASEFG (x) >= minBrightCOLOR) \ 836 || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \
834 ? GET_BASEFG (x) \ 837 ? GET_BASEFG (x) \
835 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 838 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
836# define GET_BGCOLOR(x) \ 839# define GET_BGCOLOR(x) ( \
837 ((((x) & RS_Blink) == 0 \ 840 !((x) & RS_Blink) \
838 || GET_BASEBG (x) < minCOLOR \ 841 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
839 || GET_BASEBG (x) >= minBrightCOLOR) \ 842 || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \
840 ? GET_BASEBG (x) \ 843 ? GET_BASEBG (x) \
841 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 844 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
842#else 845#else
843# define GET_FGCOLOR(x) GET_BASEFG(x) 846# define GET_FGCOLOR(x) GET_BASEFG(x)
844# define GET_BGCOLOR(x) GET_BASEBG(x) 847# define GET_BGCOLOR(x) GET_BASEBG(x)
845#endif 848#endif
846 849
… …
957#endif 960#endif
958 961
959extern class rxvt_failure_exception { } rxvt_failure_exception; 962extern class rxvt_failure_exception { } rxvt_failure_exception;
960 963
961typedef callback1<void, const char *> log_callback; 964typedef callback1<void, const char *> log_callback;
965typedef callback1<int, int> getfd_callback;
962 966
963extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 967extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
964extern void rxvt_log (const char *fmt, ...); 968extern void rxvt_log (const char *fmt, ...);
965extern void rxvt_warn (const char *fmt, ...); 969extern void rxvt_warn (const char *fmt, ...);
966extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 970extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1043 class keyboard_manager; 1047 class keyboard_manager;
1044#endif 1048#endif
1045 1049
1046struct rxvt_term : zero_initialized, rxvt_vars { 1050struct rxvt_term : zero_initialized, rxvt_vars {
1047 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
1048 1053
1049 struct mbstate mbstate; // current input multibyte state 1054 struct mbstate mbstate; // current input multibyte state
1050 1055
1051 unsigned char want_refresh:1, 1056 unsigned char want_refresh:1,
1052#ifdef TRANSPARENT 1057#ifdef TRANSPARENT
… …
1257 // ISO 14755 entry support 1262 // ISO 14755 entry support
1258 unicode_t iso14755buf; 1263 unicode_t iso14755buf;
1259 void commit_iso14755 (); 1264 void commit_iso14755 ();
1260 int hex_keyval (XKeyEvent &ev); 1265 int hex_keyval (XKeyEvent &ev);
1261# if ISO_14755 1266# if ISO_14755
1262 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);
1263 void iso14755_54 (int x, int y); 1268 void iso14755_54 (int x, int y);
1264# endif 1269# endif
1265#endif 1270#endif
1266 1271
1267 // modifies first argument(!) 1272 // modifies first argument(!)
… …
1321 1326
1322 void tt_winch (); 1327 void tt_winch ();
1323 1328
1324 rxvt_term (); 1329 rxvt_term ();
1325 ~rxvt_term (); 1330 ~rxvt_term ();
1331 void child_exit (); // child has exited, usually destroys
1326 void destroy (); 1332 void destroy ();
1327 void emergency_cleanup (); 1333 void emergency_cleanup ();
1328 1334
1329 bool init (int argc, const char *const *argv); 1335 bool init (int argc, const char *const *argv);
1330 bool init_vars (); 1336 bool init_vars ();
… …
1467 { 1473 {
1468 l.t = (text_t *)talloc->alloc (); 1474 l.t = (text_t *)talloc->alloc ();
1469 l.r = (rend_t *)ralloc->alloc (); 1475 l.r = (rend_t *)ralloc->alloc ();
1470 } 1476 }
1471 1477
1478#if 0
1472 void lfree (line_t &l) 1479 void lfree (line_t &l)
1473 { 1480 {
1474 talloc->free (l.t); 1481 talloc->free (l.t);
1475 ralloc->free (l.r); 1482 ralloc->free (l.r);
1476 } 1483 }
1484#endif
1477 1485
1478 void lresize (line_t &l) 1486 void lresize (line_t &l)
1479 { 1487 {
1480 if (!l.t) 1488 if (!l.t)
1481 return; 1489 return;
… …
1491 1499
1492 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1500 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); 1501 void scr_blank_screen_mem (line_t &l, rend_t efs);
1494 int scr_scroll_text (int row1, int row2, int count); 1502 int scr_scroll_text (int row1, int row2, int count);
1495 void scr_reset (); 1503 void scr_reset ();
1496 void scr_reset_realloc ();
1497 void scr_release (); 1504 void scr_release ();
1498 void scr_clear (bool really = false); 1505 void scr_clear (bool really = false);
1499 void scr_refresh (unsigned char refresh_type); 1506 void scr_refresh (unsigned char refresh_type);
1500 bool scr_refresh_rend (rend_t mask, rend_t value); 1507 bool scr_refresh_rend (rend_t mask, rend_t value);
1501 void scr_erase_screen (int mode); 1508 void scr_erase_screen (int mode);

Diff Legend

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