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.164 by root, Tue Dec 20 20:58:31 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_IT(current, other) if ((other) > (current)) (current) = (other)
168#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
169#define SWAP_IT(one, two, typeof) \
170 do { \
171 typeof swapittmp; \
172 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
173 } while (/* CONSTCOND */ 0)
174#define BOUND_POSITIVE_INT16(val) \
175 (int16_t) ((val) <= 0 \
176 ? 0 \
177 : min ((val), (((uint16_t)-1)>>1)))
178 166
179#if ENABLE_FRILLS 167#if ENABLE_FRILLS
180typedef struct _mwmhints { 168typedef struct _mwmhints {
181 CARD32 flags; 169 CARD32 flags;
182 CARD32 functions; 170 CARD32 functions;
… …
363#define FONT_DN "#-" 351#define FONT_DN "#-"
364#define FONT_UP "#+" 352#define FONT_UP "#+"
365 353
366/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
367enum { 355enum {
368 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
369 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
370 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
371}; 359};
372 360
373/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
374enum { 362enum {
375 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
… …
641#ifdef TRANSPARENT 629#ifdef TRANSPARENT
642 Rs_transparent, 630 Rs_transparent,
643 Rs_transparent_all, 631 Rs_transparent_all,
644#endif 632#endif
645#if ENABLE_FRILLS 633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
646 Rs_ext_bwidth, 636 Rs_ext_bwidth,
647 Rs_int_bwidth, 637 Rs_int_bwidth,
648 Rs_borderLess, 638 Rs_borderLess,
649 Rs_lineSpace, 639 Rs_lineSpace,
650 Rs_pty_fd,
651 Rs_cursorUnderline, 640 Rs_cursorUnderline,
641 Rs_intensityStyles,
652#endif 642#endif
653#if CURSOR_BLINK 643#if CURSOR_BLINK
654 Rs_cursorBlink, 644 Rs_cursorBlink,
655#endif 645#endif
656#if ENABLE_XEMBED 646#if ENABLE_XEMBED
… …
825#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 815#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
826#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 816#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
829 819
830#define TermWin_TotalWidth() ((int32_t)width) 820#define TermWin_TotalWidth() ((int32_t)this->width)
831#define TermWin_TotalHeight() ((int32_t)height) 821#define TermWin_TotalHeight() ((int32_t)this->height)
822
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)
827#define ROW(n) row_buf [LINENO (n)]
832 828
833/* how to build & extract colors and attributes */ 829/* how to build & extract colors and attributes */
834#define GET_BASEFG(x) (((x) & RS_fgMask)) 830#define GET_BASEFG(x) (((x) & RS_fgMask))
835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
836#ifndef NO_BRIGHTCOLOR 832#ifndef NO_BRIGHTCOLOR
837# define GET_FGCOLOR(x) \ 833# define GET_FGCOLOR(x) ( \
838 ((((x) & RS_Bold) == 0 \ 834 !((x) & RS_Bold) \
839 || GET_BASEFG (x) < minCOLOR \ 835 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
840 || GET_BASEFG (x) >= minBrightCOLOR) \ 836 || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \
841 ? GET_BASEFG (x) \ 837 ? GET_BASEFG (x) \
842 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 838 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
843# define GET_BGCOLOR(x) \ 839# define GET_BGCOLOR(x) ( \
844 ((((x) & RS_Blink) == 0 \ 840 !((x) & RS_Blink) \
845 || GET_BASEBG (x) < minCOLOR \ 841 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
846 || GET_BASEBG (x) >= minBrightCOLOR) \ 842 || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \
847 ? GET_BASEBG (x) \ 843 ? GET_BASEBG (x) \
848 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 844 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
849#else 845#else
850# define GET_FGCOLOR(x) GET_BASEFG(x) 846# define GET_FGCOLOR(x) GET_BASEFG(x)
851# define GET_BGCOLOR(x) GET_BASEBG(x) 847# define GET_BGCOLOR(x) GET_BASEBG(x)
852#endif 848#endif
853 849
… …
964#endif 960#endif
965 961
966extern class rxvt_failure_exception { } rxvt_failure_exception; 962extern class rxvt_failure_exception { } rxvt_failure_exception;
967 963
968typedef callback1<void, const char *> log_callback; 964typedef callback1<void, const char *> log_callback;
965typedef callback1<int, int> getfd_callback;
969 966
970extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 967extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
971extern void rxvt_log (const char *fmt, ...); 968extern void rxvt_log (const char *fmt, ...);
972extern void rxvt_warn (const char *fmt, ...); 969extern void rxvt_warn (const char *fmt, ...);
973extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 970extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1050 class keyboard_manager; 1047 class keyboard_manager;
1051#endif 1048#endif
1052 1049
1053struct rxvt_term : zero_initialized, rxvt_vars { 1050struct rxvt_term : zero_initialized, rxvt_vars {
1054 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
1055 1053
1056 struct mbstate mbstate; // current input multibyte state 1054 struct mbstate mbstate; // current input multibyte state
1057 1055
1058 unsigned char want_refresh:1, 1056 unsigned char want_refresh:1,
1059#ifdef TRANSPARENT 1057#ifdef TRANSPARENT
… …
1264 // ISO 14755 entry support 1262 // ISO 14755 entry support
1265 unicode_t iso14755buf; 1263 unicode_t iso14755buf;
1266 void commit_iso14755 (); 1264 void commit_iso14755 ();
1267 int hex_keyval (XKeyEvent &ev); 1265 int hex_keyval (XKeyEvent &ev);
1268# if ISO_14755 1266# if ISO_14755
1269 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);
1270 void iso14755_54 (int x, int y); 1268 void iso14755_54 (int x, int y);
1271# endif 1269# endif
1272#endif 1270#endif
1273 1271
1274 // modifies first argument(!) 1272 // modifies first argument(!)
… …
1328 1326
1329 void tt_winch (); 1327 void tt_winch ();
1330 1328
1331 rxvt_term (); 1329 rxvt_term ();
1332 ~rxvt_term (); 1330 ~rxvt_term ();
1331 void child_exit (); // child has exited, usually destroys
1333 void destroy (); 1332 void destroy ();
1334 void emergency_cleanup (); 1333 void emergency_cleanup ();
1335 1334
1336 bool init (int argc, const char *const *argv); 1335 bool init (int argc, const char *const *argv);
1337 bool init_vars (); 1336 bool init_vars ();
… …
1474 { 1473 {
1475 l.t = (text_t *)talloc->alloc (); 1474 l.t = (text_t *)talloc->alloc ();
1476 l.r = (rend_t *)ralloc->alloc (); 1475 l.r = (rend_t *)ralloc->alloc ();
1477 } 1476 }
1478 1477
1478#if 0
1479 void lfree (line_t &l) 1479 void lfree (line_t &l)
1480 { 1480 {
1481 talloc->free (l.t); 1481 talloc->free (l.t);
1482 ralloc->free (l.r); 1482 ralloc->free (l.r);
1483 } 1483 }
1484#endif
1484 1485
1485 void lresize (line_t &l) 1486 void lresize (line_t &l)
1486 { 1487 {
1487 if (!l.t) 1488 if (!l.t)
1488 return; 1489 return;
1489 1490
1490 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1491 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1491 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t)); 1492 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1492 1493
1493 MIN_IT (l.l, (int16_t)ncol); 1494 l.l = min (l.l, ncol);
1494 1495
1495 if (ncol > prev_ncol) 1496 if (ncol > prev_ncol)
1496 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1497 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1497 } 1498 }
1498 1499
1499 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);
1500 void scr_blank_screen_mem (line_t &l, rend_t efs); 1501 void scr_blank_screen_mem (line_t &l, rend_t efs);
1501 int scr_scroll_text (int row1, int row2, int count); 1502 int scr_scroll_text (int row1, int row2, int count);
1502 void scr_reset (); 1503 void scr_reset ();
1503 void scr_reset_realloc ();
1504 void scr_release (); 1504 void scr_release ();
1505 void scr_clear (bool really = false); 1505 void scr_clear (bool really = false);
1506 void scr_refresh (unsigned char refresh_type); 1506 void scr_refresh (unsigned char refresh_type);
1507 bool scr_refresh_rend (rend_t mask, rend_t value); 1507 bool scr_refresh_rend (rend_t mask, rend_t value);
1508 void scr_erase_screen (int mode); 1508 void scr_erase_screen (int mode);

Diff Legend

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