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.160 by root, Thu Aug 11 02:05:07 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
… …
818#define dDisp Display *disp = display->display 807#define dDisp Display *disp = display->display
819 808
820/* convert pixel dimensions to row/column values. Everything as int32_t */ 809/* convert pixel dimensions to row/column values. Everything as int32_t */
821#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 810#define Pixel2Col(x) Pixel2Width((int32_t)(x))
822#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 811#define Pixel2Row(y) Pixel2Height((int32_t)(y))
823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 812#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 813#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
825#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 814#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
826#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 815#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 816#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 817#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
829 818
830#define TermWin_TotalWidth() ((int32_t)TermWin.width) 819#define TermWin_TotalWidth() ((int32_t)this->width)
831#define TermWin_TotalHeight() ((int32_t)TermWin.height) 820#define TermWin_TotalHeight() ((int32_t)this->height)
821
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)
826#define ROW(n) row_buf [LINENO (n)]
832 827
833/* how to build & extract colors and attributes */ 828/* how to build & extract colors and attributes */
834#define GET_BASEFG(x) (((x) & RS_fgMask)) 829#define GET_BASEFG(x) (((x) & RS_fgMask))
835#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 830#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
836#ifndef NO_BRIGHTCOLOR 831#ifndef NO_BRIGHTCOLOR
837# define GET_FGCOLOR(x) \ 832# define GET_FGCOLOR(x) \
838 ((((x) & RS_Bold) == 0 \ 833 ((((x) & RS_Bold) == 0 \
839 || GET_BASEFG (x) < minCOLOR \ 834 || GET_BASEFG (x) < minCOLOR \
840 || GET_BASEFG (x) >= minBrightCOLOR) \ 835 || GET_BASEFG (x) >= minBrightCOLOR) \
841 ? GET_BASEFG (x) \ 836 ? GET_BASEFG (x) \
842 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 837 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
843# define GET_BGCOLOR(x) \ 838# define GET_BGCOLOR(x) \
844 ((((x) & RS_Blink) == 0 \ 839 ((((x) & RS_Blink) == 0 \
845 || GET_BASEBG (x) < minCOLOR \ 840 || GET_BASEBG (x) < minCOLOR \
846 || GET_BASEBG (x) >= minBrightCOLOR) \ 841 || GET_BASEBG (x) >= minBrightCOLOR) \
847 ? GET_BASEBG (x) \ 842 ? GET_BASEBG (x) \
848 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 843 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
849#else 844#else
… …
870 865
871#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 866#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
872#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 867#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
873 868
874#if ENABLE_STYLES 869#if ENABLE_STYLES
875# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 870# define FONTSET(style) fontset[GET_STYLE (style)]
876#else 871#else
877# define FONTSET(style) TermWin.fontset[0] 872# define FONTSET(style) fontset[0]
878#endif 873#endif
879 874
880#ifdef HAVE_SCROLLBARS 875#ifdef HAVE_SCROLLBARS
881# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 876# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
882#else 877#else
… …
907#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 902#define scrollbar_size() (scrollBar.end - scrollBar.beg \
908 - scrollbar_minheight ()) 903 - scrollbar_minheight ())
909 904
910#if (MENUBAR_MAX > 1) 905#if (MENUBAR_MAX > 1)
911/* rendition style flags */ 906/* rendition style flags */
912# define menuBar_height() (TermWin.fheight + SHADOW) 907# define menuBar_height() (fheight + SHADOW)
913# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 908# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
914# define isMenuBarWindow(w) ((w) == menuBar.win) 909# define isMenuBarWindow(w) ((w) == menuBar.win)
915#else 910#else
916# define menuBar_height() (0) 911# define menuBar_height() (0)
917# define menuBar_TotalHeight() (0) 912# define menuBar_TotalHeight() (0)
… …
964#endif 959#endif
965 960
966extern class rxvt_failure_exception { } rxvt_failure_exception; 961extern class rxvt_failure_exception { } rxvt_failure_exception;
967 962
968typedef callback1<void, const char *> log_callback; 963typedef callback1<void, const char *> log_callback;
964typedef callback1<int, int> getfd_callback;
969 965
970extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 966extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
971extern void rxvt_log (const char *fmt, ...); 967extern void rxvt_log (const char *fmt, ...);
972extern void rxvt_warn (const char *fmt, ...); 968extern void rxvt_warn (const char *fmt, ...);
973extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 969extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
… …
1050 class keyboard_manager; 1046 class keyboard_manager;
1051#endif 1047#endif
1052 1048
1053struct rxvt_term : zero_initialized, rxvt_vars { 1049struct rxvt_term : zero_initialized, rxvt_vars {
1054 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
1055 1052
1056 struct mbstate mbstate; // current input multibyte state 1053 struct mbstate mbstate; // current input multibyte state
1057 1054
1058 unsigned char want_refresh:1, 1055 unsigned char want_refresh:1,
1059#ifdef TRANSPARENT 1056#ifdef TRANSPARENT
… …
1279#if TRANSPARENT 1276#if TRANSPARENT
1280 void rootwin_cb (XEvent &xev); 1277 void rootwin_cb (XEvent &xev);
1281 xevent_watcher rootwin_ev; 1278 xevent_watcher rootwin_ev;
1282#endif 1279#endif
1283 1280
1284
1285 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1286 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1287
1288 void x_cb (XEvent &xev); 1281 void x_cb (XEvent &xev);
1289 xevent_watcher termwin_ev; 1282 xevent_watcher termwin_ev;
1290 xevent_watcher vt_ev; 1283 xevent_watcher vt_ev;
1291#ifdef HAVE_SCROLLBARS 1284#ifdef HAVE_SCROLLBARS
1292 xevent_watcher scrollbar_ev; 1285 xevent_watcher scrollbar_ev;
… …
1332 1325
1333 void tt_winch (); 1326 void tt_winch ();
1334 1327
1335 rxvt_term (); 1328 rxvt_term ();
1336 ~rxvt_term (); 1329 ~rxvt_term ();
1330 void child_exit (); // child has exited, usually destroys
1337 void destroy (); 1331 void destroy ();
1338 void emergency_cleanup (); 1332 void emergency_cleanup ();
1339 1333
1340 bool init (int argc, const char *const *argv); 1334 bool init (int argc, const char *const *argv);
1341 bool init_vars (); 1335 bool init_vars ();
… …
1352 int run_child (const char *const *argv); 1346 int run_child (const char *const *argv);
1353 1347
1354 void color_aliases (int idx); 1348 void color_aliases (int idx);
1355 void recolour_cursor (); 1349 void recolour_cursor ();
1356 void create_windows (int argc, const char *const *argv); 1350 void create_windows (int argc, const char *const *argv);
1357 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1351 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1358 void window_calc (unsigned int width, unsigned int height); 1352 void window_calc (unsigned int newwidth, unsigned int newheight);
1359 1353
1360#if USE_XIM 1354#if USE_XIM
1361 rxvt_xim *input_method; 1355 rxvt_xim *input_method;
1362 XIC Input_Context; 1356 XIC Input_Context;
1363 XIMStyle input_style; 1357 XIMStyle input_style;
… …
1435 void set_title (const char *str); 1429 void set_title (const char *str);
1436 void set_icon_name (const char *str); 1430 void set_icon_name (const char *str);
1437 void set_window_color (int idx, const char *color); 1431 void set_window_color (int idx, const char *color);
1438 void set_colorfgbg (); 1432 void set_colorfgbg ();
1439 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1433 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1440 void set_widthheight (unsigned int width, unsigned int height); 1434 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1441 1435
1442#ifdef MENUBAR 1436#ifdef MENUBAR
1443 // menubar.C 1437 // menubar.C
1444 void menuitem_free (menu_t *menu, menuitem_t *item); 1438 void menuitem_free (menu_t *menu, menuitem_t *item);
1445 int action_dispatch (action_t *action); 1439 int action_dispatch (action_t *action);
… …
1471 void menubar_control (XButtonEvent &ev); 1465 void menubar_control (XButtonEvent &ev);
1472 void map_menuBar (int map); 1466 void map_menuBar (int map);
1473#endif 1467#endif
1474 1468
1475 // screen.C 1469 // screen.C
1476 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1470
1477 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1471 void lalloc (line_t &l)
1472 {
1473 l.t = (text_t *)talloc->alloc ();
1474 l.r = (rend_t *)ralloc->alloc ();
1475 }
1476
1477#if 0
1478 void lfree (line_t &l)
1479 {
1480 talloc->free (l.t);
1481 ralloc->free (l.r);
1482 }
1483#endif
1484
1485 void lresize (line_t &l)
1486 {
1487 if (!l.t)
1488 return;
1489
1490 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
1493 l.l = min (l.l, ncol);
1494
1495 if (ncol > prev_ncol)
1496 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1497 }
1498
1499 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);
1478 int scr_scroll_text (int row1, int row2, int count, int spec); 1501 int scr_scroll_text (int row1, int row2, int count);
1479 void scr_reset (); 1502 void scr_reset ();
1480 void scr_reset_realloc ();
1481 void scr_release (); 1503 void scr_release ();
1482 void scr_clear (bool really = false); 1504 void scr_clear (bool really = false);
1483 void scr_refresh (unsigned char refresh_type); 1505 void scr_refresh (unsigned char refresh_type);
1484 bool scr_refresh_rend (rend_t mask, rend_t value); 1506 bool scr_refresh_rend (rend_t mask, rend_t value);
1485 void scr_erase_screen (int mode); 1507 void scr_erase_screen (int mode);
… …
1491 void scr_touch (bool refresh); 1513 void scr_touch (bool refresh);
1492 void scr_expose (int x, int y, int width, int height, bool refresh); 1514 void scr_expose (int x, int y, int width, int height, bool refresh);
1493 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1515 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1494 void scr_recolour (); 1516 void scr_recolour ();
1495 void scr_remap_chars (); 1517 void scr_remap_chars ();
1496 void scr_remap_chars (text_t *tp, rend_t *rp); 1518 void scr_remap_chars (const line_t &l);
1497 1519
1498 void scr_poweron (); 1520 void scr_poweron ();
1499 void scr_cursor (int mode); 1521 void scr_cursor (int mode);
1500 void scr_do_wrap (); 1522 void scr_do_wrap ();
1501 int scr_change_screen (int scrn); 1523 int scr_change_screen (int scrn);

Diff Legend

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