ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.159 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.165 by root, Tue Dec 20 22:27:49 2005 UTC

… …
491 URxvt_view_down = 721, 491 URxvt_view_down = 721,
492}; 492};
493 493
494/* Words starting with `Color_' are colours. Others are counts */ 494/* Words starting with `Color_' are colours. Others are counts */
495/* 495/*
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 496 * The PixColor and rendition colour usage should probably be decoupled
499 * on the unnecessary items, e.g. Color_pointer, but won't bother 497 * 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 498 * until we need to. Also, be aware of usage in pixcolor_set
501 */ 499 */
502 500
503enum colour_list { 501enum colour_list {
… …
552 Color_scroll, 550 Color_scroll,
553 Color_trough, 551 Color_trough,
554#endif 552#endif
555#if TINTING 553#if TINTING
556 Color_tint, 554 Color_tint,
555#endif
556#if OFF_FOCUS_FADING
557 Color_fade,
557#endif 558#endif
558 NRS_COLORS, /* */ 559 NRS_COLORS, /* */
559#ifdef KEEP_SCROLLCOLOR 560#ifdef KEEP_SCROLLCOLOR
560 Color_topShadow = NRS_COLORS, 561 Color_topShadow = NRS_COLORS,
561 Color_bottomShadow, 562 Color_bottomShadow,
… …
817#define dDisp Display *disp = display->display 818#define dDisp Display *disp = display->display
818 819
819/* convert pixel dimensions to row/column values. Everything as int32_t */ 820/* convert pixel dimensions to row/column values. Everything as int32_t */
820#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 821#define Pixel2Col(x) Pixel2Width((int32_t)(x))
821#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 822#define Pixel2Row(y) Pixel2Height((int32_t)(y))
822#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 823#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
823#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 824#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
824#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 825#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
825#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 826#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
826#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 827#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
827#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 828#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
828 829
829#define TermWin_TotalWidth() ((int32_t)TermWin.width) 830#define TermWin_TotalWidth() ((int32_t)this->width)
830#define TermWin_TotalHeight() ((int32_t)TermWin.height) 831#define TermWin_TotalHeight() ((int32_t)this->height)
832
833#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
834#define ROW(n) (save [LINENO (n)])
831 835
832/* how to build & extract colors and attributes */ 836/* how to build & extract colors and attributes */
833#define GET_BASEFG(x) (((x) & RS_fgMask)) 837#define GET_BASEFG(x) (((x) & RS_fgMask))
834#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 838#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
835#ifndef NO_BRIGHTCOLOR 839#ifndef NO_BRIGHTCOLOR
… …
869 873
870#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 874#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))) 875#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
872 876
873#if ENABLE_STYLES 877#if ENABLE_STYLES
874# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 878# define FONTSET(style) fontset[GET_STYLE (style)]
875#else 879#else
876# define FONTSET(style) TermWin.fontset[0] 880# define FONTSET(style) fontset[0]
877#endif 881#endif
878 882
879#ifdef HAVE_SCROLLBARS 883#ifdef HAVE_SCROLLBARS
880# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 884# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
881#else 885#else
… …
906#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 910#define scrollbar_size() (scrollBar.end - scrollBar.beg \
907 - scrollbar_minheight ()) 911 - scrollbar_minheight ())
908 912
909#if (MENUBAR_MAX > 1) 913#if (MENUBAR_MAX > 1)
910/* rendition style flags */ 914/* rendition style flags */
911# define menuBar_height() (TermWin.fheight + SHADOW) 915# define menuBar_height() (fheight + SHADOW)
912# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 916# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
913# define isMenuBarWindow(w) ((w) == menuBar.win) 917# define isMenuBarWindow(w) ((w) == menuBar.win)
914#else 918#else
915# define menuBar_height() (0) 919# define menuBar_height() (0)
916# define menuBar_TotalHeight() (0) 920# define menuBar_TotalHeight() (0)
… …
1278#if TRANSPARENT 1282#if TRANSPARENT
1279 void rootwin_cb (XEvent &xev); 1283 void rootwin_cb (XEvent &xev);
1280 xevent_watcher rootwin_ev; 1284 xevent_watcher rootwin_ev;
1281#endif 1285#endif
1282 1286
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); 1287 void x_cb (XEvent &xev);
1288 xevent_watcher termwin_ev; 1288 xevent_watcher termwin_ev;
1289 xevent_watcher vt_ev; 1289 xevent_watcher vt_ev;
1290#ifdef HAVE_SCROLLBARS 1290#ifdef HAVE_SCROLLBARS
1291 xevent_watcher scrollbar_ev; 1291 xevent_watcher scrollbar_ev;
… …
1351 int run_child (const char *const *argv); 1351 int run_child (const char *const *argv);
1352 1352
1353 void color_aliases (int idx); 1353 void color_aliases (int idx);
1354 void recolour_cursor (); 1354 void recolour_cursor ();
1355 void create_windows (int argc, const char *const *argv); 1355 void create_windows (int argc, const char *const *argv);
1356 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1356 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1357 void window_calc (unsigned int width, unsigned int height); 1357 void window_calc (unsigned int newwidth, unsigned int newheight);
1358 1358
1359#if USE_XIM 1359#if USE_XIM
1360 rxvt_xim *input_method; 1360 rxvt_xim *input_method;
1361 XIC Input_Context; 1361 XIC Input_Context;
1362 XIMStyle input_style; 1362 XIMStyle input_style;
… …
1434 void set_title (const char *str); 1434 void set_title (const char *str);
1435 void set_icon_name (const char *str); 1435 void set_icon_name (const char *str);
1436 void set_window_color (int idx, const char *color); 1436 void set_window_color (int idx, const char *color);
1437 void set_colorfgbg (); 1437 void set_colorfgbg ();
1438 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1438 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1439 void set_widthheight (unsigned int width, unsigned int height); 1439 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1440 1440
1441#ifdef MENUBAR 1441#ifdef MENUBAR
1442 // menubar.C 1442 // menubar.C
1443 void menuitem_free (menu_t *menu, menuitem_t *item); 1443 void menuitem_free (menu_t *menu, menuitem_t *item);
1444 int action_dispatch (action_t *action); 1444 int action_dispatch (action_t *action);
… …
1470 void menubar_control (XButtonEvent &ev); 1470 void menubar_control (XButtonEvent &ev);
1471 void map_menuBar (int map); 1471 void map_menuBar (int map);
1472#endif 1472#endif
1473 1473
1474 // screen.C 1474 // screen.C
1475 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1475
1476 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1476 void lalloc (line_t &l)
1477 {
1478 l.t = (text_t *)talloc->alloc ();
1479 l.r = (rend_t *)ralloc->alloc ();
1480 }
1481
1482 void lfree (line_t &l)
1483 {
1484 talloc->free (l.t);
1485 ralloc->free (l.r);
1486 }
1487
1488 void lresize (line_t &l)
1489 {
1490 if (!l.t)
1491 return;
1492
1493 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));
1495
1496 MIN_IT (l.l, (int16_t)ncol);
1497
1498 if (ncol > prev_ncol)
1499 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1500 }
1501
1502 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);
1477 int scr_scroll_text (int row1, int row2, int count, int spec); 1504 int scr_scroll_text (int row1, int row2, int count);
1478 void scr_reset (); 1505 void scr_reset ();
1479 void scr_reset_realloc (); 1506 void scr_reset_realloc ();
1480 void scr_release (); 1507 void scr_release ();
1481 void scr_clear (bool really = false); 1508 void scr_clear (bool really = false);
1482 void scr_refresh (unsigned char refresh_type); 1509 void scr_refresh (unsigned char refresh_type);
… …
1490 void scr_touch (bool refresh); 1517 void scr_touch (bool refresh);
1491 void scr_expose (int x, int y, int width, int height, bool refresh); 1518 void scr_expose (int x, int y, int width, int height, bool refresh);
1492 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1519 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1493 void scr_recolour (); 1520 void scr_recolour ();
1494 void scr_remap_chars (); 1521 void scr_remap_chars ();
1495 void scr_remap_chars (text_t *tp, rend_t *rp); 1522 void scr_remap_chars (const line_t &l);
1496 1523
1497 void scr_poweron (); 1524 void scr_poweron ();
1498 void scr_cursor (int mode); 1525 void scr_cursor (int mode);
1499 void scr_do_wrap (); 1526 void scr_do_wrap ();
1500 int scr_change_screen (int scrn); 1527 int scr_change_screen (int scrn);

Diff Legend

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