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.159 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.171 by root, Sat Dec 31 16:06:48 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 */
… …
491 URxvt_view_down = 721, 479 URxvt_view_down = 721,
492}; 480};
493 481
494/* Words starting with `Color_' are colours. Others are counts */ 482/* Words starting with `Color_' are colours. Others are counts */
495/* 483/*
496 * The following comment is mostly obsolete since pixcolor_set was expanded:
497 * We're currently upto 29 colours. Only 3 more available. The
498 * PixColor and rendition colour usage should probably be decoupled 484 * The PixColor and rendition colour usage should probably be decoupled
499 * on the unnecessary items, e.g. Color_pointer, but won't bother 485 * on the unnecessary items, e.g. Color_pointer, but won't bother
500 * until we need to. Also, be aware of usage in pixcolor_set 486 * until we need to. Also, be aware of usage in pixcolor_set
501 */ 487 */
502 488
503enum colour_list { 489enum colour_list {
… …
553 Color_trough, 539 Color_trough,
554#endif 540#endif
555#if TINTING 541#if TINTING
556 Color_tint, 542 Color_tint,
557#endif 543#endif
544#if OFF_FOCUS_FADING
545 Color_fade,
546#endif
558 NRS_COLORS, /* */ 547 NRS_COLORS, /* */
559#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
560 Color_topShadow = NRS_COLORS, 549 Color_topShadow = NRS_COLORS,
561 Color_bottomShadow, 550 Color_bottomShadow,
562 TOTAL_COLORS 551 TOTAL_COLORS
… …
640#ifdef TRANSPARENT 629#ifdef TRANSPARENT
641 Rs_transparent, 630 Rs_transparent,
642 Rs_transparent_all, 631 Rs_transparent_all,
643#endif 632#endif
644#if ENABLE_FRILLS 633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
645 Rs_ext_bwidth, 636 Rs_ext_bwidth,
646 Rs_int_bwidth, 637 Rs_int_bwidth,
647 Rs_borderLess, 638 Rs_borderLess,
648 Rs_lineSpace, 639 Rs_lineSpace,
649 Rs_pty_fd,
650 Rs_cursorUnderline, 640 Rs_cursorUnderline,
641 Rs_intensityStyles,
651#endif 642#endif
652#if CURSOR_BLINK 643#if CURSOR_BLINK
653 Rs_cursorBlink, 644 Rs_cursorBlink,
654#endif 645#endif
655#if ENABLE_XEMBED 646#if ENABLE_XEMBED
… …
817#define dDisp Display *disp = display->display 808#define dDisp Display *disp = display->display
818 809
819/* convert pixel dimensions to row/column values. Everything as int32_t */ 810/* convert pixel dimensions to row/column values. Everything as int32_t */
820#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 811#define Pixel2Col(x) Pixel2Width((int32_t)(x))
821#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 812#define Pixel2Row(y) Pixel2Height((int32_t)(y))
822#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 813#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
823#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 814#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
824#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 815#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
825#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 816#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
826#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
827#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
828 819
829#define TermWin_TotalWidth() ((int32_t)TermWin.width) 820#define TermWin_TotalWidth() ((int32_t)this->width)
830#define TermWin_TotalHeight() ((int32_t)TermWin.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)]
831 828
832/* how to build & extract colors and attributes */ 829/* how to build & extract colors and attributes */
833#define GET_BASEFG(x) (((x) & RS_fgMask)) 830#define GET_BASEFG(x) (((x) & RS_fgMask))
834#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
835#ifndef NO_BRIGHTCOLOR 832#ifndef NO_BRIGHTCOLOR
836# define GET_FGCOLOR(x) \ 833# define GET_FGCOLOR(x) ( \
837 ((((x) & RS_Bold) == 0 \ 834 !((x) & RS_Bold) \
838 || GET_BASEFG (x) < minCOLOR \ 835 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
839 || GET_BASEFG (x) >= minBrightCOLOR) \ 836 || !IN_RANGE_INC (GET_BASEFG (x), minCOLOR, minBrightCOLOR) \
840 ? GET_BASEFG (x) \ 837 ? GET_BASEFG (x) \
841 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 838 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
842# define GET_BGCOLOR(x) \ 839# define GET_BGCOLOR(x) ( \
843 ((((x) & RS_Blink) == 0 \ 840 !((x) & RS_Blink) \
844 || GET_BASEBG (x) < minCOLOR \ 841 || (ENABLE_STYLES && !(options & Opt_intensityStyles)) \
845 || GET_BASEBG (x) >= minBrightCOLOR) \ 842 || !IN_RANGE_INC (GET_BASEBG (x), minCOLOR, minBrightCOLOR) \
846 ? GET_BASEBG (x) \ 843 ? GET_BASEBG (x) \
847 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 844 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
848#else 845#else
849# define GET_FGCOLOR(x) GET_BASEFG(x) 846# define GET_FGCOLOR(x) GET_BASEFG(x)
850# define GET_BGCOLOR(x) GET_BASEBG(x) 847# define GET_BGCOLOR(x) GET_BASEBG(x)
851#endif 848#endif
852 849
… …
869 866
870#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 867#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
871#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 868#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
872 869
873#if ENABLE_STYLES 870#if ENABLE_STYLES
874# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 871# define FONTSET(style) fontset[GET_STYLE (style)]
875#else 872#else
876# define FONTSET(style) TermWin.fontset[0] 873# define FONTSET(style) fontset[0]
877#endif 874#endif
878 875
879#ifdef HAVE_SCROLLBARS 876#ifdef HAVE_SCROLLBARS
880# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 877# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
881#else 878#else
… …
906#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 903#define scrollbar_size() (scrollBar.end - scrollBar.beg \
907 - scrollbar_minheight ()) 904 - scrollbar_minheight ())
908 905
909#if (MENUBAR_MAX > 1) 906#if (MENUBAR_MAX > 1)
910/* rendition style flags */ 907/* rendition style flags */
911# define menuBar_height() (TermWin.fheight + SHADOW) 908# define menuBar_height() (fheight + SHADOW)
912# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 909# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
913# define isMenuBarWindow(w) ((w) == menuBar.win) 910# define isMenuBarWindow(w) ((w) == menuBar.win)
914#else 911#else
915# define menuBar_height() (0) 912# define menuBar_height() (0)
916# define menuBar_TotalHeight() (0) 913# define menuBar_TotalHeight() (0)
… …
963#endif 960#endif
964 961
965extern class rxvt_failure_exception { } rxvt_failure_exception; 962extern class rxvt_failure_exception { } rxvt_failure_exception;
966 963
967typedef callback1<void, const char *> log_callback; 964typedef callback1<void, const char *> log_callback;
965typedef callback1<int, int> getfd_callback;
968 966
969extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 967extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
970extern void rxvt_log (const char *fmt, ...); 968extern void rxvt_log (const char *fmt, ...);
971extern void rxvt_warn (const char *fmt, ...); 969extern void rxvt_warn (const char *fmt, ...);
972extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 970extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1049 class keyboard_manager; 1047 class keyboard_manager;
1050#endif 1048#endif
1051 1049
1052struct rxvt_term : zero_initialized, rxvt_vars { 1050struct rxvt_term : zero_initialized, rxvt_vars {
1053 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
1054 1053
1055 struct mbstate mbstate; // current input multibyte state 1054 struct mbstate mbstate; // current input multibyte state
1056 1055
1057 unsigned char want_refresh:1, 1056 unsigned char want_refresh:1,
1058#ifdef TRANSPARENT 1057#ifdef TRANSPARENT
… …
1278#if TRANSPARENT 1277#if TRANSPARENT
1279 void rootwin_cb (XEvent &xev); 1278 void rootwin_cb (XEvent &xev);
1280 xevent_watcher rootwin_ev; 1279 xevent_watcher rootwin_ev;
1281#endif 1280#endif
1282 1281
1283
1284 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1285 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1286
1287 void x_cb (XEvent &xev); 1282 void x_cb (XEvent &xev);
1288 xevent_watcher termwin_ev; 1283 xevent_watcher termwin_ev;
1289 xevent_watcher vt_ev; 1284 xevent_watcher vt_ev;
1290#ifdef HAVE_SCROLLBARS 1285#ifdef HAVE_SCROLLBARS
1291 xevent_watcher scrollbar_ev; 1286 xevent_watcher scrollbar_ev;
… …
1331 1326
1332 void tt_winch (); 1327 void tt_winch ();
1333 1328
1334 rxvt_term (); 1329 rxvt_term ();
1335 ~rxvt_term (); 1330 ~rxvt_term ();
1331 void child_exit (); // child has exited, usually destroys
1336 void destroy (); 1332 void destroy ();
1337 void emergency_cleanup (); 1333 void emergency_cleanup ();
1338 1334
1339 bool init (int argc, const char *const *argv); 1335 bool init (int argc, const char *const *argv);
1340 bool init_vars (); 1336 bool init_vars ();
… …
1351 int run_child (const char *const *argv); 1347 int run_child (const char *const *argv);
1352 1348
1353 void color_aliases (int idx); 1349 void color_aliases (int idx);
1354 void recolour_cursor (); 1350 void recolour_cursor ();
1355 void create_windows (int argc, const char *const *argv); 1351 void create_windows (int argc, const char *const *argv);
1356 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1352 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1357 void window_calc (unsigned int width, unsigned int height); 1353 void window_calc (unsigned int newwidth, unsigned int newheight);
1358 1354
1359#if USE_XIM 1355#if USE_XIM
1360 rxvt_xim *input_method; 1356 rxvt_xim *input_method;
1361 XIC Input_Context; 1357 XIC Input_Context;
1362 XIMStyle input_style; 1358 XIMStyle input_style;
… …
1434 void set_title (const char *str); 1430 void set_title (const char *str);
1435 void set_icon_name (const char *str); 1431 void set_icon_name (const char *str);
1436 void set_window_color (int idx, const char *color); 1432 void set_window_color (int idx, const char *color);
1437 void set_colorfgbg (); 1433 void set_colorfgbg ();
1438 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1434 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1439 void set_widthheight (unsigned int width, unsigned int height); 1435 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1440 1436
1441#ifdef MENUBAR 1437#ifdef MENUBAR
1442 // menubar.C 1438 // menubar.C
1443 void menuitem_free (menu_t *menu, menuitem_t *item); 1439 void menuitem_free (menu_t *menu, menuitem_t *item);
1444 int action_dispatch (action_t *action); 1440 int action_dispatch (action_t *action);
… …
1470 void menubar_control (XButtonEvent &ev); 1466 void menubar_control (XButtonEvent &ev);
1471 void map_menuBar (int map); 1467 void map_menuBar (int map);
1472#endif 1468#endif
1473 1469
1474 // screen.C 1470 // screen.C
1475 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1471
1476 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1472 void lalloc (line_t &l)
1473 {
1474 l.t = (text_t *)talloc->alloc ();
1475 l.r = (rend_t *)ralloc->alloc ();
1476 }
1477
1478#if 0
1479 void lfree (line_t &l)
1480 {
1481 talloc->free (l.t);
1482 ralloc->free (l.r);
1483 }
1484#endif
1485
1486 void lresize (line_t &l)
1487 {
1488 if (!l.t)
1489 return;
1490
1491 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1492 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1493
1494 l.l = min (l.l, ncol);
1495
1496 if (ncol > prev_ncol)
1497 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1498 }
1499
1500 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1501 void scr_blank_screen_mem (line_t &l, rend_t efs);
1477 int scr_scroll_text (int row1, int row2, int count, int spec); 1502 int scr_scroll_text (int row1, int row2, int count);
1478 void scr_reset (); 1503 void scr_reset ();
1479 void scr_reset_realloc ();
1480 void scr_release (); 1504 void scr_release ();
1481 void scr_clear (bool really = false); 1505 void scr_clear (bool really = false);
1482 void scr_refresh (unsigned char refresh_type); 1506 void scr_refresh (unsigned char refresh_type);
1483 bool scr_refresh_rend (rend_t mask, rend_t value); 1507 bool scr_refresh_rend (rend_t mask, rend_t value);
1484 void scr_erase_screen (int mode); 1508 void scr_erase_screen (int mode);
… …
1490 void scr_touch (bool refresh); 1514 void scr_touch (bool refresh);
1491 void scr_expose (int x, int y, int width, int height, bool refresh); 1515 void scr_expose (int x, int y, int width, int height, bool refresh);
1492 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1516 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1493 void scr_recolour (); 1517 void scr_recolour ();
1494 void scr_remap_chars (); 1518 void scr_remap_chars ();
1495 void scr_remap_chars (text_t *tp, rend_t *rp); 1519 void scr_remap_chars (const line_t &l);
1496 1520
1497 void scr_poweron (); 1521 void scr_poweron ();
1498 void scr_cursor (int mode); 1522 void scr_cursor (int mode);
1499 void scr_do_wrap (); 1523 void scr_do_wrap ();
1500 int scr_change_screen (int scrn); 1524 int scr_change_screen (int scrn);

Diff Legend

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