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.165 by root, Tue Dec 20 22:27:49 2005 UTC vs.
Revision 1.170 by root, Fri Dec 23 14:46:35 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,
652#endif 641#endif
653#if CURSOR_BLINK 642#if CURSOR_BLINK
654 Rs_cursorBlink, 643 Rs_cursorBlink,
655#endif 644#endif
… …
828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 817#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
829 818
830#define TermWin_TotalWidth() ((int32_t)this->width) 819#define TermWin_TotalWidth() ((int32_t)this->width)
831#define TermWin_TotalHeight() ((int32_t)this->height) 820#define TermWin_TotalHeight() ((int32_t)this->height)
832 821
833#define LINENO(n) (((n) + term_start + total_rows) % total_rows) 822// for m >= -n, ensure remainder lies between 0..n-1
823#define MOD(m,n) (((m) + (n)) % (n))
824
825#define LINENO(n) MOD (term_start + int(n), total_rows)
834#define ROW(n) (save [LINENO (n)]) 826#define ROW(n) row_buf [LINENO (n)]
835 827
836/* how to build & extract colors and attributes */ 828/* how to build & extract colors and attributes */
837#define GET_BASEFG(x) (((x) & RS_fgMask)) 829#define GET_BASEFG(x) (((x) & RS_fgMask))
838#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 830#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
839#ifndef NO_BRIGHTCOLOR 831#ifndef NO_BRIGHTCOLOR
840# define GET_FGCOLOR(x) \ 832# define GET_FGCOLOR(x) \
841 ((((x) & RS_Bold) == 0 \ 833 ((((x) & RS_Bold) == 0 \
842 || GET_BASEFG (x) < minCOLOR \ 834 || GET_BASEFG (x) < minCOLOR \
843 || GET_BASEFG (x) >= minBrightCOLOR) \ 835 || GET_BASEFG (x) >= minBrightCOLOR) \
844 ? GET_BASEFG (x) \ 836 ? GET_BASEFG (x) \
845 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 837 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
846# define GET_BGCOLOR(x) \ 838# define GET_BGCOLOR(x) \
847 ((((x) & RS_Blink) == 0 \ 839 ((((x) & RS_Blink) == 0 \
848 || GET_BASEBG (x) < minCOLOR \ 840 || GET_BASEBG (x) < minCOLOR \
849 || GET_BASEBG (x) >= minBrightCOLOR) \ 841 || GET_BASEBG (x) >= minBrightCOLOR) \
850 ? GET_BASEBG (x) \ 842 ? GET_BASEBG (x) \
851 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 843 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
852#else 844#else
… …
967#endif 959#endif
968 960
969extern class rxvt_failure_exception { } rxvt_failure_exception; 961extern class rxvt_failure_exception { } rxvt_failure_exception;
970 962
971typedef callback1<void, const char *> log_callback; 963typedef callback1<void, const char *> log_callback;
964typedef callback1<int, int> getfd_callback;
972 965
973extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 966extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
974extern void rxvt_log (const char *fmt, ...); 967extern void rxvt_log (const char *fmt, ...);
975extern void rxvt_warn (const char *fmt, ...); 968extern void rxvt_warn (const char *fmt, ...);
976extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 969extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1053 class keyboard_manager; 1046 class keyboard_manager;
1054#endif 1047#endif
1055 1048
1056struct rxvt_term : zero_initialized, rxvt_vars { 1049struct rxvt_term : zero_initialized, rxvt_vars {
1057 log_callback *log_hook; // log error messages through this hook, if != 0 1050 log_callback *log_hook; // log error messages through this hook, if != 0
1051 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1058 1052
1059 struct mbstate mbstate; // current input multibyte state 1053 struct mbstate mbstate; // current input multibyte state
1060 1054
1061 unsigned char want_refresh:1, 1055 unsigned char want_refresh:1,
1062#ifdef TRANSPARENT 1056#ifdef TRANSPARENT
… …
1331 1325
1332 void tt_winch (); 1326 void tt_winch ();
1333 1327
1334 rxvt_term (); 1328 rxvt_term ();
1335 ~rxvt_term (); 1329 ~rxvt_term ();
1330 void child_exit (); // child has exited, usually destroys
1336 void destroy (); 1331 void destroy ();
1337 void emergency_cleanup (); 1332 void emergency_cleanup ();
1338 1333
1339 bool init (int argc, const char *const *argv); 1334 bool init (int argc, const char *const *argv);
1340 bool init_vars (); 1335 bool init_vars ();
… …
1477 { 1472 {
1478 l.t = (text_t *)talloc->alloc (); 1473 l.t = (text_t *)talloc->alloc ();
1479 l.r = (rend_t *)ralloc->alloc (); 1474 l.r = (rend_t *)ralloc->alloc ();
1480 } 1475 }
1481 1476
1477#if 0
1482 void lfree (line_t &l) 1478 void lfree (line_t &l)
1483 { 1479 {
1484 talloc->free (l.t); 1480 talloc->free (l.t);
1485 ralloc->free (l.r); 1481 ralloc->free (l.r);
1486 } 1482 }
1483#endif
1487 1484
1488 void lresize (line_t &l) 1485 void lresize (line_t &l)
1489 { 1486 {
1490 if (!l.t) 1487 if (!l.t)
1491 return; 1488 return;
1492 1489
1493 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1490 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1494 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t)); 1491 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1495 1492
1496 MIN_IT (l.l, (int16_t)ncol); 1493 l.l = min (l.l, ncol);
1497 1494
1498 if (ncol > prev_ncol) 1495 if (ncol > prev_ncol)
1499 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1496 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1500 } 1497 }
1501 1498
1502 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1499 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1503 void scr_blank_screen_mem (line_t &l, rend_t efs); 1500 void scr_blank_screen_mem (line_t &l, rend_t efs);
1504 int scr_scroll_text (int row1, int row2, int count); 1501 int scr_scroll_text (int row1, int row2, int count);
1505 void scr_reset (); 1502 void scr_reset ();
1506 void scr_reset_realloc ();
1507 void scr_release (); 1503 void scr_release ();
1508 void scr_clear (bool really = false); 1504 void scr_clear (bool really = false);
1509 void scr_refresh (unsigned char refresh_type); 1505 void scr_refresh (unsigned char refresh_type);
1510 bool scr_refresh_rend (rend_t mask, rend_t value); 1506 bool scr_refresh_rend (rend_t mask, rend_t value);
1511 void scr_erase_screen (int mode); 1507 void scr_erase_screen (int mode);

Diff Legend

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