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.174 by root, Sat Dec 31 17:16:17 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
836# define GET_FGCOLOR(x) \
837 ((((x) & RS_Bold) == 0 \
838 || GET_BASEFG (x) < minCOLOR \
839 || GET_BASEFG (x) >= minBrightCOLOR) \
840 ? GET_BASEFG (x) \
841 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
842# define GET_BGCOLOR(x) \
843 ((((x) & RS_Blink) == 0 \
844 || GET_BASEBG (x) < minCOLOR \
845 || GET_BASEBG (x) >= minBrightCOLOR) \
846 ? GET_BASEBG (x) \
847 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
848#else
849# define GET_FGCOLOR(x) GET_BASEFG(x)
850# define GET_BGCOLOR(x) GET_BASEBG(x)
851#endif
852 832
853#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 833#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
854#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 834#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
855 835
856#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 836#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
869 849
870#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 850#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))) 851#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
872 852
873#if ENABLE_STYLES 853#if ENABLE_STYLES
874# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 854# define FONTSET(style) fontset[GET_STYLE (style)]
875#else 855#else
876# define FONTSET(style) TermWin.fontset[0] 856# define FONTSET(style) fontset[0]
877#endif 857#endif
878 858
879#ifdef HAVE_SCROLLBARS 859#ifdef HAVE_SCROLLBARS
880# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 860# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
881#else 861#else
… …
906#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 886#define scrollbar_size() (scrollBar.end - scrollBar.beg \
907 - scrollbar_minheight ()) 887 - scrollbar_minheight ())
908 888
909#if (MENUBAR_MAX > 1) 889#if (MENUBAR_MAX > 1)
910/* rendition style flags */ 890/* rendition style flags */
911# define menuBar_height() (TermWin.fheight + SHADOW) 891# define menuBar_height() (fheight + SHADOW)
912# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 892# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
913# define isMenuBarWindow(w) ((w) == menuBar.win) 893# define isMenuBarWindow(w) ((w) == menuBar.win)
914#else 894#else
915# define menuBar_height() (0) 895# define menuBar_height() (0)
916# define menuBar_TotalHeight() (0) 896# define menuBar_TotalHeight() (0)
… …
963#endif 943#endif
964 944
965extern class rxvt_failure_exception { } rxvt_failure_exception; 945extern class rxvt_failure_exception { } rxvt_failure_exception;
966 946
967typedef callback1<void, const char *> log_callback; 947typedef callback1<void, const char *> log_callback;
948typedef callback1<int, int> getfd_callback;
968 949
969extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 950extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
970extern void rxvt_log (const char *fmt, ...); 951extern void rxvt_log (const char *fmt, ...);
971extern void rxvt_warn (const char *fmt, ...); 952extern void rxvt_warn (const char *fmt, ...);
972extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 953extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1049 class keyboard_manager; 1030 class keyboard_manager;
1050#endif 1031#endif
1051 1032
1052struct rxvt_term : zero_initialized, rxvt_vars { 1033struct rxvt_term : zero_initialized, rxvt_vars {
1053 log_callback *log_hook; // log error messages through this hook, if != 0 1034 log_callback *log_hook; // log error messages through this hook, if != 0
1035 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1054 1036
1055 struct mbstate mbstate; // current input multibyte state 1037 struct mbstate mbstate; // current input multibyte state
1056 1038
1057 unsigned char want_refresh:1, 1039 unsigned char want_refresh:1,
1058#ifdef TRANSPARENT 1040#ifdef TRANSPARENT
… …
1263 // ISO 14755 entry support 1245 // ISO 14755 entry support
1264 unicode_t iso14755buf; 1246 unicode_t iso14755buf;
1265 void commit_iso14755 (); 1247 void commit_iso14755 ();
1266 int hex_keyval (XKeyEvent &ev); 1248 int hex_keyval (XKeyEvent &ev);
1267# if ISO_14755 1249# if ISO_14755
1268 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1250 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1269 void iso14755_54 (int x, int y); 1251 void iso14755_54 (int x, int y);
1270# endif 1252# endif
1271#endif 1253#endif
1272 1254
1273 // modifies first argument(!) 1255 // modifies first argument(!)
… …
1277 1259
1278#if TRANSPARENT 1260#if TRANSPARENT
1279 void rootwin_cb (XEvent &xev); 1261 void rootwin_cb (XEvent &xev);
1280 xevent_watcher rootwin_ev; 1262 xevent_watcher rootwin_ev;
1281#endif 1263#endif
1282
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 1264
1287 void x_cb (XEvent &xev); 1265 void x_cb (XEvent &xev);
1288 xevent_watcher termwin_ev; 1266 xevent_watcher termwin_ev;
1289 xevent_watcher vt_ev; 1267 xevent_watcher vt_ev;
1290#ifdef HAVE_SCROLLBARS 1268#ifdef HAVE_SCROLLBARS
… …
1331 1309
1332 void tt_winch (); 1310 void tt_winch ();
1333 1311
1334 rxvt_term (); 1312 rxvt_term ();
1335 ~rxvt_term (); 1313 ~rxvt_term ();
1314 void child_exit (); // child has exited, usually destroys
1336 void destroy (); 1315 void destroy ();
1337 void emergency_cleanup (); 1316 void emergency_cleanup ();
1338 1317
1339 bool init (int argc, const char *const *argv); 1318 bool init (int argc, const char *const *argv);
1340 bool init_vars (); 1319 bool init_vars ();
… …
1351 int run_child (const char *const *argv); 1330 int run_child (const char *const *argv);
1352 1331
1353 void color_aliases (int idx); 1332 void color_aliases (int idx);
1354 void recolour_cursor (); 1333 void recolour_cursor ();
1355 void create_windows (int argc, const char *const *argv); 1334 void create_windows (int argc, const char *const *argv);
1356 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1335 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1357 void window_calc (unsigned int width, unsigned int height); 1336 void window_calc (unsigned int newwidth, unsigned int newheight);
1358 1337
1359#if USE_XIM 1338#if USE_XIM
1360 rxvt_xim *input_method; 1339 rxvt_xim *input_method;
1361 XIC Input_Context; 1340 XIC Input_Context;
1362 XIMStyle input_style; 1341 XIMStyle input_style;
… …
1434 void set_title (const char *str); 1413 void set_title (const char *str);
1435 void set_icon_name (const char *str); 1414 void set_icon_name (const char *str);
1436 void set_window_color (int idx, const char *color); 1415 void set_window_color (int idx, const char *color);
1437 void set_colorfgbg (); 1416 void set_colorfgbg ();
1438 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1417 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1439 void set_widthheight (unsigned int width, unsigned int height); 1418 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1440 1419
1441#ifdef MENUBAR 1420#ifdef MENUBAR
1442 // menubar.C 1421 // menubar.C
1443 void menuitem_free (menu_t *menu, menuitem_t *item); 1422 void menuitem_free (menu_t *menu, menuitem_t *item);
1444 int action_dispatch (action_t *action); 1423 int action_dispatch (action_t *action);
… …
1470 void menubar_control (XButtonEvent &ev); 1449 void menubar_control (XButtonEvent &ev);
1471 void map_menuBar (int map); 1450 void map_menuBar (int map);
1472#endif 1451#endif
1473 1452
1474 // screen.C 1453 // screen.C
1475 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1454
1476 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1455 void lalloc (line_t &l)
1456 {
1457 l.t = (text_t *)talloc->alloc ();
1458 l.r = (rend_t *)ralloc->alloc ();
1459 }
1460
1461#if 0
1462 void lfree (line_t &l)
1463 {
1464 talloc->free (l.t);
1465 ralloc->free (l.r);
1466 }
1467#endif
1468
1469 void lresize (line_t &l)
1470 {
1471 if (!l.t)
1472 return;
1473
1474 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1475 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1476
1477 l.l = min (l.l, ncol);
1478
1479 if (ncol > prev_ncol)
1480 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1481 }
1482
1483 int fgcolor_of (rend_t r)
1484 {
1485 int base = GET_BASEFG (r);
1486#ifndef NO_BRIGHTCOLOR
1487 if (r & RS_Bold
1488 && (!ENABLE_STYLES || OPTION (Opt_intensityStyles))
1489 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1490 base += minBrightCOLOR - minCOLOR;
1491#endif
1492 return base;
1493 }
1494
1495 int bgcolor_of (rend_t r)
1496 {
1497 int base = GET_BASEBG (r);
1498#ifndef NO_BRIGHTCOLOR
1499 if (r & RS_Blink
1500 && (!ENABLE_STYLES || OPTION (Opt_intensityStyles))
1501 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1502 base += minBrightCOLOR - minCOLOR;
1503#endif
1504 return base;
1505 }
1506
1507 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1508 void scr_blank_screen_mem (line_t &l, rend_t efs);
1477 int scr_scroll_text (int row1, int row2, int count, int spec); 1509 int scr_scroll_text (int row1, int row2, int count);
1478 void scr_reset (); 1510 void scr_reset ();
1479 void scr_reset_realloc ();
1480 void scr_release (); 1511 void scr_release ();
1481 void scr_clear (bool really = false); 1512 void scr_clear (bool really = false);
1482 void scr_refresh (unsigned char refresh_type); 1513 void scr_refresh (unsigned char refresh_type);
1483 bool scr_refresh_rend (rend_t mask, rend_t value); 1514 bool scr_refresh_rend (rend_t mask, rend_t value);
1484 void scr_erase_screen (int mode); 1515 void scr_erase_screen (int mode);
… …
1490 void scr_touch (bool refresh); 1521 void scr_touch (bool refresh);
1491 void scr_expose (int x, int y, int width, int height, bool refresh); 1522 void scr_expose (int x, int y, int width, int height, bool refresh);
1492 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1523 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1493 void scr_recolour (); 1524 void scr_recolour ();
1494 void scr_remap_chars (); 1525 void scr_remap_chars ();
1495 void scr_remap_chars (text_t *tp, rend_t *rp); 1526 void scr_remap_chars (const line_t &l);
1496 1527
1497 void scr_poweron (); 1528 void scr_poweron ();
1498 void scr_cursor (int mode); 1529 void scr_cursor (int mode);
1499 void scr_do_wrap (); 1530 void scr_do_wrap ();
1500 int scr_change_screen (int scrn); 1531 int scr_change_screen (int scrn);

Diff Legend

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