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.153 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.175 by root, Sat Dec 31 18:19:07 2005 UTC

22#include "salloc.h" 22#include "salloc.h"
23 23
24#if ENABLE_FRILLS 24#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 25# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 26# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1
27#endif 28#endif
28 29
29/* 30/*
30 ***************************************************************************** 31 *****************************************************************************
31 * SYSTEM HACKS 32 * SYSTEM HACKS
117char ** rxvt_splitcommastring (const char *cs); 118char ** rxvt_splitcommastring (const char *cs);
118void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
119char * rxvt_File_find (const char *file, const char *ext, const char *path); 120char * rxvt_File_find (const char *file, const char *ext, const char *path);
120void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
121void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
123void rxvt_usleep (int usecs);
122 124
123/* 125/*
124 ***************************************************************************** 126 *****************************************************************************
125 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
126 ***************************************************************************** 128 *****************************************************************************
136#endif 138#endif
137 139
138/* If we're using either the rxvt scrollbar or menu bars, keep the 140/* If we're using either the rxvt scrollbar or menu bars, keep the
139 * scrollColor resource. 141 * scrollColor resource.
140 */ 142 */
141#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
142# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
143#else 145#else
144# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
145#endif 147#endif
146 148
160 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
161 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
162 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
163}; 165};
164 166
165#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
166#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
167#define SWAP_IT(one, two, typeof) \
168 do { \
169 typeof swapittmp; \
170 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
171 } while (/* CONSTCOND */ 0)
172#define BOUND_POSITIVE_INT16(val) \
173 (int16_t) ((val) <= 0 \
174 ? 0 \
175 : min ((val), (((uint16_t)-1)>>1)))
176
177#if ENABLE_FRILLS 167#if ENABLE_FRILLS
178typedef struct _mwmhints { 168typedef struct _mwmhints {
179 CARD32 flags; 169 CARD32 flags;
180 CARD32 functions; 170 CARD32 functions;
181 CARD32 decorations; 171 CARD32 decorations;
266 256
267#define R_SB_ALIGN_CENTRE 0 257#define R_SB_ALIGN_CENTRE 0
268#define R_SB_ALIGN_TOP 1 258#define R_SB_ALIGN_TOP 1
269#define R_SB_ALIGN_BOTTOM 2 259#define R_SB_ALIGN_BOTTOM 2
270 260
271#define R_SB_RXVT 0
272#define R_SB_NEXT 1 261#define R_SB_NEXT 1
273#define R_SB_XTERM 2 262#define R_SB_XTERM 2
274#define R_SB_PLAIN 4 263#define R_SB_PLAIN 4
264#define R_SB_RXVT 8
275 265
276#define SB_WIDTH_NEXT 19 266#define SB_WIDTH_NEXT 19
277#define SB_WIDTH_XTERM 15 267#define SB_WIDTH_XTERM 15
278#define SB_WIDTH_PLAIN 7 268#define SB_WIDTH_PLAIN 7
279#ifndef SB_WIDTH_RXVT 269#ifndef SB_WIDTH_RXVT
361#define FONT_DN "#-" 351#define FONT_DN "#-"
362#define FONT_UP "#+" 352#define FONT_UP "#+"
363 353
364/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
365enum { 355enum {
366 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
367 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
368 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
369}; 359};
370 360
371/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
372enum { 362enum {
373 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
489 URxvt_view_down = 721, 479 URxvt_view_down = 721,
490}; 480};
491 481
492/* Words starting with `Color_' are colours. Others are counts */ 482/* Words starting with `Color_' are colours. Others are counts */
493/* 483/*
494 * The following comment is mostly obsolete since pixcolor_set was expanded:
495 * We're currently upto 29 colours. Only 3 more available. The
496 * PixColor and rendition colour usage should probably be decoupled 484 * The PixColor and rendition colour usage should probably be decoupled
497 * 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
498 * 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
499 */ 487 */
500 488
501enum colour_list { 489enum colour_list {
551 Color_trough, 539 Color_trough,
552#endif 540#endif
553#if TINTING 541#if TINTING
554 Color_tint, 542 Color_tint,
555#endif 543#endif
544#if OFF_FOCUS_FADING
545 Color_fade,
546#endif
556 NRS_COLORS, /* */ 547 NRS_COLORS, /* */
557#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
558 Color_topShadow = NRS_COLORS, 549 Color_topShadow = NRS_COLORS,
559 Color_bottomShadow, 550 Color_bottomShadow,
560 TOTAL_COLORS 551 TOTAL_COLORS
582 Rs_font, 573 Rs_font,
583#if ENABLE_STYLES 574#if ENABLE_STYLES
584 Rs_boldFont, 575 Rs_boldFont,
585 Rs_italicFont, 576 Rs_italicFont,
586 Rs_boldItalicFont, 577 Rs_boldItalicFont,
578 Rs_intensityStyles,
587#endif 579#endif
588 Rs_name, 580 Rs_name,
589 Rs_title, 581 Rs_title,
590#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 582#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
591 Rs_path, 583 Rs_path,
638#ifdef TRANSPARENT 630#ifdef TRANSPARENT
639 Rs_transparent, 631 Rs_transparent,
640 Rs_transparent_all, 632 Rs_transparent_all,
641#endif 633#endif
642#if ENABLE_FRILLS 634#if ENABLE_FRILLS
635 Rs_pty_fd,
636 Rs_hold,
643 Rs_ext_bwidth, 637 Rs_ext_bwidth,
644 Rs_int_bwidth, 638 Rs_int_bwidth,
645 Rs_borderLess, 639 Rs_borderLess,
646 Rs_lineSpace, 640 Rs_lineSpace,
647 Rs_pty_fd, 641 Rs_cursorUnderline,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
648#endif 645#endif
649#if ENABLE_XEMBED 646#if ENABLE_XEMBED
650 Rs_embed, 647 Rs_embed,
651#endif 648#endif
652 Rs_cutchars, 649 Rs_cutchars,
653 Rs_modifier, 650 Rs_modifier,
654 Rs_answerbackstring, 651 Rs_answerbackstring,
655 Rs_tripleclickwords, 652 Rs_tripleclickwords,
656 Rs_insecure, 653 Rs_insecure,
657 Rs_cursorBlink,
658 Rs_pointerBlank, 654 Rs_pointerBlank,
659 Rs_pointerBlankDelay, 655 Rs_pointerBlankDelay,
660 Rs_imLocale, 656 Rs_imLocale,
661 Rs_imFont, 657 Rs_imFont,
662 Rs_pastableTabs, 658 Rs_pastableTabs,
812#define dDisp Display *disp = display->display 808#define dDisp Display *disp = display->display
813 809
814/* convert pixel dimensions to row/column values. Everything as int32_t */ 810/* convert pixel dimensions to row/column values. Everything as int32_t */
815#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 811#define Pixel2Col(x) Pixel2Width((int32_t)(x))
816#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 812#define Pixel2Row(y) Pixel2Height((int32_t)(y))
817#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 813#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
818#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 814#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
819#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 815#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
820#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 816#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
821#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
822#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
823 819
824#define TermWin_TotalWidth() ((int32_t)TermWin.width) 820#define TermWin_TotalWidth() ((int32_t)this->width)
825#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)]
826 828
827/* how to build & extract colors and attributes */ 829/* how to build & extract colors and attributes */
828#define GET_BASEFG(x) (((x) & RS_fgMask)) 830#define GET_BASEFG(x) (((x) & RS_fgMask))
829#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 831#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
830#ifndef NO_BRIGHTCOLOR
831# define GET_FGCOLOR(x) \
832 ((((x) & RS_Bold) == 0 \
833 || GET_BASEFG (x) < minCOLOR \
834 || GET_BASEFG (x) >= minBrightCOLOR) \
835 ? GET_BASEFG (x) \
836 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
837# define GET_BGCOLOR(x) \
838 ((((x) & RS_Blink) == 0 \
839 || GET_BASEBG (x) < minCOLOR \
840 || GET_BASEBG (x) >= minBrightCOLOR) \
841 ? GET_BASEBG (x) \
842 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
843#else
844# define GET_FGCOLOR(x) GET_BASEFG(x)
845# define GET_BGCOLOR(x) GET_BASEBG(x)
846#endif
847 832
848#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 833#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
849#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 834#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
850 835
851#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 836#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
864 849
865#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)))
866#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)))
867 852
868#if ENABLE_STYLES 853#if ENABLE_STYLES
869# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 854# define FONTSET(style) fontset[GET_STYLE (style)]
870#else 855#else
871# define FONTSET(style) TermWin.fontset[0] 856# define FONTSET(style) fontset[0]
872#endif 857#endif
873 858
874#ifdef HAVE_SCROLLBARS 859#ifdef HAVE_SCROLLBARS
875# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 860# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
876#else 861#else
901#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 886#define scrollbar_size() (scrollBar.end - scrollBar.beg \
902 - scrollbar_minheight ()) 887 - scrollbar_minheight ())
903 888
904#if (MENUBAR_MAX > 1) 889#if (MENUBAR_MAX > 1)
905/* rendition style flags */ 890/* rendition style flags */
906# define menuBar_height() (TermWin.fheight + SHADOW) 891# define menuBar_height() (fheight + SHADOW)
907# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 892# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
908# define isMenuBarWindow(w) ((w) == menuBar.win) 893# define isMenuBarWindow(w) ((w) == menuBar.win)
909#else 894#else
910# define menuBar_height() (0) 895# define menuBar_height() (0)
911# define menuBar_TotalHeight() (0) 896# define menuBar_TotalHeight() (0)
958#endif 943#endif
959 944
960extern class rxvt_failure_exception { } rxvt_failure_exception; 945extern class rxvt_failure_exception { } rxvt_failure_exception;
961 946
962typedef callback1<void, const char *> log_callback; 947typedef callback1<void, const char *> log_callback;
948typedef callback1<int, int> getfd_callback;
963 949
964extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 950extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
965extern void rxvt_log (const char *fmt, ...); 951extern void rxvt_log (const char *fmt, ...);
966extern void rxvt_warn (const char *fmt, ...); 952extern void rxvt_warn (const char *fmt, ...);
967extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 953extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
1044 class keyboard_manager; 1030 class keyboard_manager;
1045#endif 1031#endif
1046 1032
1047struct rxvt_term : zero_initialized, rxvt_vars { 1033struct rxvt_term : zero_initialized, rxvt_vars {
1048 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
1049 1036
1050 struct mbstate mbstate; // current input multibyte state 1037 struct mbstate mbstate; // current input multibyte state
1051 1038
1052 unsigned char want_refresh:1, 1039 unsigned char want_refresh:1,
1053#ifdef TRANSPARENT 1040#ifdef TRANSPARENT
1223 void scr_overlay_off (); 1210 void scr_overlay_off ();
1224 void scr_overlay_set (int x, int y, 1211 void scr_overlay_set (int x, int y,
1225 text_t text, 1212 text_t text,
1226 rend_t rend = OVERLAY_RSTYLE); 1213 rend_t rend = OVERLAY_RSTYLE);
1227 void scr_overlay_set (int x, int y, const char *s); 1214 void scr_overlay_set (int x, int y, const char *s);
1215 void scr_overlay_set (int x, int y, const wchar_t *s);
1228#endif 1216#endif
1229 1217
1230 vector<void *> allocated; // free these memory blocks with free() 1218 vector<void *> allocated; // free these memory blocks with free()
1231 1219
1232 char *env_windowid; /* environmental variable WINDOWID */ 1220 char *env_windowid; /* environmental variable WINDOWID */
1257 // ISO 14755 entry support 1245 // ISO 14755 entry support
1258 unicode_t iso14755buf; 1246 unicode_t iso14755buf;
1259 void commit_iso14755 (); 1247 void commit_iso14755 ();
1260 int hex_keyval (XKeyEvent &ev); 1248 int hex_keyval (XKeyEvent &ev);
1261# if ISO_14755 1249# if ISO_14755
1262 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);
1263 void iso14755_54 (int x, int y); 1251 void iso14755_54 (int x, int y);
1264# endif 1252# endif
1265#endif 1253#endif
1266 1254
1267 // modifies first argument(!) 1255 // modifies first argument(!)
1271 1259
1272#if TRANSPARENT 1260#if TRANSPARENT
1273 void rootwin_cb (XEvent &xev); 1261 void rootwin_cb (XEvent &xev);
1274 xevent_watcher rootwin_ev; 1262 xevent_watcher rootwin_ev;
1275#endif 1263#endif
1276
1277
1278 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1279 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1280 1264
1281 void x_cb (XEvent &xev); 1265 void x_cb (XEvent &xev);
1282 xevent_watcher termwin_ev; 1266 xevent_watcher termwin_ev;
1283 xevent_watcher vt_ev; 1267 xevent_watcher vt_ev;
1284#ifdef HAVE_SCROLLBARS 1268#ifdef HAVE_SCROLLBARS
1325 1309
1326 void tt_winch (); 1310 void tt_winch ();
1327 1311
1328 rxvt_term (); 1312 rxvt_term ();
1329 ~rxvt_term (); 1313 ~rxvt_term ();
1314 void child_exit (); // child has exited, usually destroys
1330 void destroy (); 1315 void destroy ();
1331 void emergency_cleanup (); 1316 void emergency_cleanup ();
1332 1317
1333 bool init (int argc, const char *const *argv); 1318 bool init (int argc, const char *const *argv);
1334 bool init_vars (); 1319 bool init_vars ();
1345 int run_child (const char *const *argv); 1330 int run_child (const char *const *argv);
1346 1331
1347 void color_aliases (int idx); 1332 void color_aliases (int idx);
1348 void recolour_cursor (); 1333 void recolour_cursor ();
1349 void create_windows (int argc, const char *const *argv); 1334 void create_windows (int argc, const char *const *argv);
1350 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);
1351 void window_calc (unsigned int width, unsigned int height); 1336 void window_calc (unsigned int newwidth, unsigned int newheight);
1352 1337
1353#if USE_XIM 1338#if USE_XIM
1354 rxvt_xim *input_method; 1339 rxvt_xim *input_method;
1355 XIC Input_Context; 1340 XIC Input_Context;
1356 XIMStyle input_style; 1341 XIMStyle input_style;
1428 void set_title (const char *str); 1413 void set_title (const char *str);
1429 void set_icon_name (const char *str); 1414 void set_icon_name (const char *str);
1430 void set_window_color (int idx, const char *color); 1415 void set_window_color (int idx, const char *color);
1431 void set_colorfgbg (); 1416 void set_colorfgbg ();
1432 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1417 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1433 void set_widthheight (unsigned int width, unsigned int height); 1418 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1434 1419
1435#ifdef MENUBAR 1420#ifdef MENUBAR
1436 // menubar.C 1421 // menubar.C
1437 void menuitem_free (menu_t *menu, menuitem_t *item); 1422 void menuitem_free (menu_t *menu, menuitem_t *item);
1438 int action_dispatch (action_t *action); 1423 int action_dispatch (action_t *action);
1464 void menubar_control (XButtonEvent &ev); 1449 void menubar_control (XButtonEvent &ev);
1465 void map_menuBar (int map); 1450 void map_menuBar (int map);
1466#endif 1451#endif
1467 1452
1468 // screen.C 1453 // screen.C
1469 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1454
1470 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# if ENABLE_STYLES
1489 && OPTION (Opt_intensityStyles)
1490# endif
1491 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1492 base += minBrightCOLOR - minCOLOR;
1493#endif
1494 return base;
1495 }
1496
1497 int bgcolor_of (rend_t r)
1498 {
1499 int base = GET_BASEBG (r);
1500#ifndef NO_BRIGHTCOLOR
1501 if (r & RS_Blink
1502# if ENABLE_STYLES
1503 && OPTION (Opt_intensityStyles)
1504# endif
1505 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1506 base += minBrightCOLOR - minCOLOR;
1507#endif
1508 return base;
1509 }
1510
1511 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1512 void scr_blank_screen_mem (line_t &l, rend_t efs);
1471 int scr_scroll_text (int row1, int row2, int count, int spec); 1513 int scr_scroll_text (int row1, int row2, int count);
1472 void scr_reset (); 1514 void scr_reset ();
1473 void scr_reset_realloc ();
1474 void scr_release (); 1515 void scr_release ();
1475 void scr_clear (bool really = false); 1516 void scr_clear (bool really = false);
1476 void scr_refresh (unsigned char refresh_type); 1517 void scr_refresh (unsigned char refresh_type);
1477 bool scr_refresh_rend (rend_t mask, rend_t value); 1518 bool scr_refresh_rend (rend_t mask, rend_t value);
1478 void scr_erase_screen (int mode); 1519 void scr_erase_screen (int mode);
1520#if ENABLE_FRILLS
1479 void scr_erase_savelines (); 1521 void scr_erase_savelines ();
1522 void scr_backindex ();
1523 void scr_forwardindex ();
1524#endif
1480 void scr_touch (bool refresh); 1525 void scr_touch (bool refresh);
1481 void scr_expose (int x, int y, int width, int height, bool refresh); 1526 void scr_expose (int x, int y, int width, int height, bool refresh);
1482 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1527 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1483 void scr_recolour (); 1528 void scr_recolour ();
1484 void scr_remap_chars (); 1529 void scr_remap_chars ();
1485 void scr_remap_chars (text_t *tp, rend_t *rp); 1530 void scr_remap_chars (const line_t &l);
1486 1531
1487 void scr_poweron (); 1532 void scr_poweron ();
1488 void scr_cursor (int mode); 1533 void scr_cursor (int mode);
1489 void scr_do_wrap (); 1534 void scr_do_wrap ();
1490 int scr_change_screen (int scrn); 1535 int scr_change_screen (int scrn);
1491 void scr_color (unsigned int color, int fgbg); 1536 void scr_color (unsigned int color, int fgbg);
1492 void scr_rendition (int set, int style); 1537 void scr_rendition (int set, int style);
1493 void scr_add_lines (const unicode_t *str, int nlines, int len); 1538 void scr_add_lines (const unicode_t *str, int nlines, int len);
1494 void scr_backspace (); 1539 void scr_backspace ();
1495 void scr_tab (int count, bool ht = false); 1540 void scr_tab (int count, bool ht = false);
1496 void scr_backindex ();
1497 void scr_forwardindex ();
1498 void scr_gotorc (int row, int col, int relative); 1541 void scr_gotorc (int row, int col, int relative);
1499 void scr_index (enum page_dirn direction); 1542 void scr_index (enum page_dirn direction);
1500 void scr_erase_line (int mode); 1543 void scr_erase_line (int mode);
1501 void scr_E (); 1544 void scr_E ();
1502 void scr_insdel_lines (int count, int insdel); 1545 void scr_insdel_lines (int count, int insdel);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines