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.151 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.170 by root, Fri Dec 23 14:46:35 2005 UTC

21#include "iom.h" 21#include "iom.h"
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
27# define CURSOR_BLINK 1
26#endif 28#endif
27 29
28/* 30/*
29 ***************************************************************************** 31 *****************************************************************************
30 * SYSTEM HACKS 32 * SYSTEM HACKS
116char ** rxvt_splitcommastring (const char *cs); 118char ** rxvt_splitcommastring (const char *cs);
117void rxvt_freecommastring (char **cs); 119void rxvt_freecommastring (char **cs);
118char * 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);
119void 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);
120void 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);
121 124
122/* 125/*
123 ***************************************************************************** 126 *****************************************************************************
124 * STRUCTURES AND TYPEDEFS 127 * STRUCTURES AND TYPEDEFS
125 ***************************************************************************** 128 *****************************************************************************
135#endif 138#endif
136 139
137/* 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
138 * scrollColor resource. 141 * scrollColor resource.
139 */ 142 */
140#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
141# define KEEP_SCROLLCOLOR 1 144# define KEEP_SCROLLCOLOR 1
142#else 145#else
143# undef KEEP_SCROLLCOLOR 146# undef KEEP_SCROLLCOLOR
144#endif 147#endif
145 148
159 Time time; /* milliseconds */ 162 Time time; /* milliseconds */
160 unsigned int state; /* key or button mask */ 163 unsigned int state; /* key or button mask */
161 unsigned int button; /* detail */ 164 unsigned int button; /* detail */
162}; 165};
163 166
164#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
165#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
166#define SWAP_IT(one, two, typeof) \
167 do { \
168 typeof swapittmp; \
169 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
170 } while (/* CONSTCOND */ 0)
171#define BOUND_POSITIVE_INT16(val) \
172 (int16_t) ((val) <= 0 \
173 ? 0 \
174 : min ((val), (((uint16_t)-1)>>1)))
175
176#if ENABLE_FRILLS 167#if ENABLE_FRILLS
177typedef struct _mwmhints { 168typedef struct _mwmhints {
178 CARD32 flags; 169 CARD32 flags;
179 CARD32 functions; 170 CARD32 functions;
180 CARD32 decorations; 171 CARD32 decorations;
265 256
266#define R_SB_ALIGN_CENTRE 0 257#define R_SB_ALIGN_CENTRE 0
267#define R_SB_ALIGN_TOP 1 258#define R_SB_ALIGN_TOP 1
268#define R_SB_ALIGN_BOTTOM 2 259#define R_SB_ALIGN_BOTTOM 2
269 260
270#define R_SB_RXVT 0
271#define R_SB_NEXT 1 261#define R_SB_NEXT 1
272#define R_SB_XTERM 2 262#define R_SB_XTERM 2
273#define R_SB_PLAIN 4 263#define R_SB_PLAIN 4
264#define R_SB_RXVT 8
274 265
275#define SB_WIDTH_NEXT 19 266#define SB_WIDTH_NEXT 19
276#define SB_WIDTH_XTERM 15 267#define SB_WIDTH_XTERM 15
277#define SB_WIDTH_PLAIN 7 268#define SB_WIDTH_PLAIN 7
278#ifndef SB_WIDTH_RXVT 269#ifndef SB_WIDTH_RXVT
360#define FONT_DN "#-" 351#define FONT_DN "#-"
361#define FONT_UP "#+" 352#define FONT_UP "#+"
362 353
363/* flags for rxvt_scr_gotorc () */ 354/* flags for rxvt_scr_gotorc () */
364enum { 355enum {
365 C_RELATIVE = 1 , /* col movement is relative */ 356 C_RELATIVE = 1, /* col movement is relative */
366 R_RELATIVE = 2, /* row movement is relative */ 357 R_RELATIVE = 2, /* row movement is relative */
367 RELATIVE = 1 | 2, 358 RELATIVE = C_RELATIVE | R_RELATIVE,
368}; 359};
369 360
370/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 361/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
371enum { 362enum {
372 INSERT = -1, /* don't change these values */ 363 INSERT = -1, /* don't change these values */
471 XTerm_Color_UL = 19, // change actual 'Underline' color 462 XTerm_Color_UL = 19, // change actual 'Underline' color
472 XTerm_Pixmap = 20, // new bg pixmap 463 XTerm_Pixmap = 20, // new bg pixmap
473 XTerm_restoreFG = 39, // change default fg color 464 XTerm_restoreFG = 39, // change default fg color
474 XTerm_restoreBG = 49, // change default bg color 465 XTerm_restoreBG = 49, // change default bg color
475 XTerm_dumpscreen = 55, // dump scrollback and all of screen 466 XTerm_dumpscreen = 55, // dump scrollback and all of screen
467
476 XTerm_locale = 701, // change locale 468 URxvt_locale = 701, // change locale
477 XTerm_Menu = 703, // set menu item 469 URxvt_Menu = 703, // set menu item
478 XTerm_Color_IT = 704, // change actual 'Italic' colour 470 URxvt_Color_IT = 704, // change actual 'Italic' colour
479 XTerm_Color_tint = 705, // change actual tint colour 471 URxvt_Color_tint = 705, // change actual tint colour
480 472
481 URxvt_font = 710, 473 URxvt_font = 710,
482 URxvt_boldFont = 711, 474 URxvt_boldFont = 711,
483 URxvt_italicFont = 712, 475 URxvt_italicFont = 712,
484 URxvt_boldItalicFont = 713, 476 URxvt_boldItalicFont = 713,
477
478 URxvt_view_up = 720,
479 URxvt_view_down = 721,
485}; 480};
486 481
487/* Words starting with `Color_' are colours. Others are counts */ 482/* Words starting with `Color_' are colours. Others are counts */
488/* 483/*
489 * The following comment is mostly obsolete since pixcolor_set was expanded:
490 * We're currently upto 29 colours. Only 3 more available. The
491 * PixColor and rendition colour usage should probably be decoupled 484 * The PixColor and rendition colour usage should probably be decoupled
492 * 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
493 * 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
494 */ 487 */
495 488
496enum colour_list { 489enum colour_list {
546 Color_trough, 539 Color_trough,
547#endif 540#endif
548#if TINTING 541#if TINTING
549 Color_tint, 542 Color_tint,
550#endif 543#endif
544#if OFF_FOCUS_FADING
545 Color_fade,
546#endif
551 NRS_COLORS, /* */ 547 NRS_COLORS, /* */
552#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
553 Color_topShadow = NRS_COLORS, 549 Color_topShadow = NRS_COLORS,
554 Color_bottomShadow, 550 Color_bottomShadow,
555 TOTAL_COLORS 551 TOTAL_COLORS
633#ifdef TRANSPARENT 629#ifdef TRANSPARENT
634 Rs_transparent, 630 Rs_transparent,
635 Rs_transparent_all, 631 Rs_transparent_all,
636#endif 632#endif
637#if ENABLE_FRILLS 633#if ENABLE_FRILLS
634 Rs_pty_fd,
635 Rs_hold,
638 Rs_ext_bwidth, 636 Rs_ext_bwidth,
639 Rs_int_bwidth, 637 Rs_int_bwidth,
640 Rs_borderLess, 638 Rs_borderLess,
641 Rs_lineSpace, 639 Rs_lineSpace,
642 Rs_pty_fd, 640 Rs_cursorUnderline,
641#endif
642#if CURSOR_BLINK
643 Rs_cursorBlink,
643#endif 644#endif
644#if ENABLE_XEMBED 645#if ENABLE_XEMBED
645 Rs_embed, 646 Rs_embed,
646#endif 647#endif
647 Rs_cutchars, 648 Rs_cutchars,
648 Rs_modifier, 649 Rs_modifier,
649 Rs_answerbackstring, 650 Rs_answerbackstring,
650 Rs_tripleclickwords, 651 Rs_tripleclickwords,
651 Rs_insecure, 652 Rs_insecure,
652 Rs_cursorBlink,
653 Rs_pointerBlank, 653 Rs_pointerBlank,
654 Rs_pointerBlankDelay, 654 Rs_pointerBlankDelay,
655 Rs_imLocale, 655 Rs_imLocale,
656 Rs_imFont, 656 Rs_imFont,
657 Rs_pastableTabs, 657 Rs_pastableTabs,
680 XA_INCR, 680 XA_INCR,
681 XA_WM_PROTOCOLS, 681 XA_WM_PROTOCOLS,
682 XA_WM_DELETE_WINDOW, 682 XA_WM_DELETE_WINDOW,
683 XA_CLIPBOARD, 683 XA_CLIPBOARD,
684#if ENABLE_FRILLS 684#if ENABLE_FRILLS
685 XA_MOTIF_WM_HINTS,
686#endif
687#if ENABLE_EWMH
685 XA_NET_WM_PID, 688 XA_NET_WM_PID,
686 XA_MOTIF_WM_HINTS,
687 XA_NET_WM_NAME, 689 XA_NET_WM_NAME,
688 XA_NET_WM_ICON_NAME, 690 XA_NET_WM_ICON_NAME,
691 XA_NET_WM_PING,
689#endif 692#endif
690#if USE_XIM 693#if USE_XIM
691 XA_WM_LOCALE_NAME, 694 XA_WM_LOCALE_NAME,
692#endif 695#endif
693#if TRANSPARENT 696#if TRANSPARENT
804#define dDisp Display *disp = display->display 807#define dDisp Display *disp = display->display
805 808
806/* convert pixel dimensions to row/column values. Everything as int32_t */ 809/* convert pixel dimensions to row/column values. Everything as int32_t */
807#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 810#define Pixel2Col(x) Pixel2Width((int32_t)(x))
808#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 811#define Pixel2Row(y) Pixel2Height((int32_t)(y))
809#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 812#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
810#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 813#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
811#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 814#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
812#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 815#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
813#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 816#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
814#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 817#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
815 818
816#define TermWin_TotalWidth() ((int32_t)TermWin.width) 819#define TermWin_TotalWidth() ((int32_t)this->width)
817#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)]
818 827
819/* how to build & extract colors and attributes */ 828/* how to build & extract colors and attributes */
820#define GET_BASEFG(x) (((x) & RS_fgMask)) 829#define GET_BASEFG(x) (((x) & RS_fgMask))
821#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 830#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
822#ifndef NO_BRIGHTCOLOR 831#ifndef NO_BRIGHTCOLOR
823# define GET_FGCOLOR(x) \ 832# define GET_FGCOLOR(x) \
824 ((((x) & RS_Bold) == 0 \ 833 ((((x) & RS_Bold) == 0 \
825 || GET_BASEFG (x) < minCOLOR \ 834 || GET_BASEFG (x) < minCOLOR \
826 || GET_BASEFG (x) >= minBrightCOLOR) \ 835 || GET_BASEFG (x) >= minBrightCOLOR) \
827 ? GET_BASEFG (x) \ 836 ? GET_BASEFG (x) \
828 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR))) 837 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
829# define GET_BGCOLOR(x) \ 838# define GET_BGCOLOR(x) \
830 ((((x) & RS_Blink) == 0 \ 839 ((((x) & RS_Blink) == 0 \
831 || GET_BASEBG (x) < minCOLOR \ 840 || GET_BASEBG (x) < minCOLOR \
832 || GET_BASEBG (x) >= minBrightCOLOR) \ 841 || GET_BASEBG (x) >= minBrightCOLOR) \
833 ? GET_BASEBG (x) \ 842 ? GET_BASEBG (x) \
834 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR))) 843 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
835#else 844#else
856 865
857#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)))
858#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)))
859 868
860#if ENABLE_STYLES 869#if ENABLE_STYLES
861# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 870# define FONTSET(style) fontset[GET_STYLE (style)]
862#else 871#else
863# define FONTSET(style) TermWin.fontset[0] 872# define FONTSET(style) fontset[0]
864#endif 873#endif
865 874
866#ifdef HAVE_SCROLLBARS 875#ifdef HAVE_SCROLLBARS
867# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 876# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
868#else 877#else
893#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 902#define scrollbar_size() (scrollBar.end - scrollBar.beg \
894 - scrollbar_minheight ()) 903 - scrollbar_minheight ())
895 904
896#if (MENUBAR_MAX > 1) 905#if (MENUBAR_MAX > 1)
897/* rendition style flags */ 906/* rendition style flags */
898# define menuBar_height() (TermWin.fheight + SHADOW) 907# define menuBar_height() (fheight + SHADOW)
899# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 908# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
900# define isMenuBarWindow(w) ((w) == menuBar.win) 909# define isMenuBarWindow(w) ((w) == menuBar.win)
901#else 910#else
902# define menuBar_height() (0) 911# define menuBar_height() (0)
903# define menuBar_TotalHeight() (0) 912# define menuBar_TotalHeight() (0)
950#endif 959#endif
951 960
952extern class rxvt_failure_exception { } rxvt_failure_exception; 961extern class rxvt_failure_exception { } rxvt_failure_exception;
953 962
954typedef callback1<void, const char *> log_callback; 963typedef callback1<void, const char *> log_callback;
964typedef callback1<int, int> getfd_callback;
955 965
956extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 966extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
957extern void rxvt_log (const char *fmt, ...); 967extern void rxvt_log (const char *fmt, ...);
958extern void rxvt_warn (const char *fmt, ...); 968extern void rxvt_warn (const char *fmt, ...);
959extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 969extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
1036 class keyboard_manager; 1046 class keyboard_manager;
1037#endif 1047#endif
1038 1048
1039struct rxvt_term : zero_initialized, rxvt_vars { 1049struct rxvt_term : zero_initialized, rxvt_vars {
1040 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
1041 1052
1042 struct mbstate mbstate; // current input multibyte state 1053 struct mbstate mbstate; // current input multibyte state
1043 1054
1044 unsigned char want_refresh:1, 1055 unsigned char want_refresh:1,
1045#ifdef TRANSPARENT 1056#ifdef TRANSPARENT
1215 void scr_overlay_off (); 1226 void scr_overlay_off ();
1216 void scr_overlay_set (int x, int y, 1227 void scr_overlay_set (int x, int y,
1217 text_t text, 1228 text_t text,
1218 rend_t rend = OVERLAY_RSTYLE); 1229 rend_t rend = OVERLAY_RSTYLE);
1219 void scr_overlay_set (int x, int y, const char *s); 1230 void scr_overlay_set (int x, int y, const char *s);
1231 void scr_overlay_set (int x, int y, const wchar_t *s);
1220#endif 1232#endif
1221 1233
1222 vector<void *> allocated; // free these memory blocks with free() 1234 vector<void *> allocated; // free these memory blocks with free()
1223 1235
1224 char *env_windowid; /* environmental variable WINDOWID */ 1236 char *env_windowid; /* environmental variable WINDOWID */
1264#if TRANSPARENT 1276#if TRANSPARENT
1265 void rootwin_cb (XEvent &xev); 1277 void rootwin_cb (XEvent &xev);
1266 xevent_watcher rootwin_ev; 1278 xevent_watcher rootwin_ev;
1267#endif 1279#endif
1268 1280
1269
1270 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1271 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1272
1273 void x_cb (XEvent &xev); 1281 void x_cb (XEvent &xev);
1274 xevent_watcher termwin_ev; 1282 xevent_watcher termwin_ev;
1275 xevent_watcher vt_ev; 1283 xevent_watcher vt_ev;
1276#ifdef HAVE_SCROLLBARS 1284#ifdef HAVE_SCROLLBARS
1277 xevent_watcher scrollbar_ev; 1285 xevent_watcher scrollbar_ev;
1317 1325
1318 void tt_winch (); 1326 void tt_winch ();
1319 1327
1320 rxvt_term (); 1328 rxvt_term ();
1321 ~rxvt_term (); 1329 ~rxvt_term ();
1330 void child_exit (); // child has exited, usually destroys
1322 void destroy (); 1331 void destroy ();
1323 void emergency_cleanup (); 1332 void emergency_cleanup ();
1324 1333
1325 bool init (int argc, const char *const *argv); 1334 bool init (int argc, const char *const *argv);
1326 bool init_vars (); 1335 bool init_vars ();
1337 int run_child (const char *const *argv); 1346 int run_child (const char *const *argv);
1338 1347
1339 void color_aliases (int idx); 1348 void color_aliases (int idx);
1340 void recolour_cursor (); 1349 void recolour_cursor ();
1341 void create_windows (int argc, const char *const *argv); 1350 void create_windows (int argc, const char *const *argv);
1342 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);
1343 void window_calc (unsigned int width, unsigned int height); 1352 void window_calc (unsigned int newwidth, unsigned int newheight);
1344 1353
1345#if USE_XIM 1354#if USE_XIM
1346 rxvt_xim *input_method; 1355 rxvt_xim *input_method;
1347 XIC Input_Context; 1356 XIC Input_Context;
1348 XIMStyle input_style; 1357 XIMStyle input_style;
1420 void set_title (const char *str); 1429 void set_title (const char *str);
1421 void set_icon_name (const char *str); 1430 void set_icon_name (const char *str);
1422 void set_window_color (int idx, const char *color); 1431 void set_window_color (int idx, const char *color);
1423 void set_colorfgbg (); 1432 void set_colorfgbg ();
1424 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1433 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1425 void set_widthheight (unsigned int width, unsigned int height); 1434 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1426 1435
1427#ifdef MENUBAR 1436#ifdef MENUBAR
1428 // menubar.C 1437 // menubar.C
1429 void menuitem_free (menu_t *menu, menuitem_t *item); 1438 void menuitem_free (menu_t *menu, menuitem_t *item);
1430 int action_dispatch (action_t *action); 1439 int action_dispatch (action_t *action);
1456 void menubar_control (XButtonEvent &ev); 1465 void menubar_control (XButtonEvent &ev);
1457 void map_menuBar (int map); 1466 void map_menuBar (int map);
1458#endif 1467#endif
1459 1468
1460 // screen.C 1469 // screen.C
1461 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1470
1462 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);
1463 int scr_scroll_text (int row1, int row2, int count, int spec); 1501 int scr_scroll_text (int row1, int row2, int count);
1464 void scr_reset (); 1502 void scr_reset ();
1465 void scr_reset_realloc ();
1466 void scr_release (); 1503 void scr_release ();
1467 void scr_clear (bool really = false); 1504 void scr_clear (bool really = false);
1468 void scr_refresh (unsigned char refresh_type); 1505 void scr_refresh (unsigned char refresh_type);
1469 bool scr_refresh_rend (rend_t mask, rend_t value); 1506 bool scr_refresh_rend (rend_t mask, rend_t value);
1470 void scr_erase_screen (int mode); 1507 void scr_erase_screen (int mode);
1508#if ENABLE_FRILLS
1509 void scr_erase_savelines ();
1510 void scr_backindex ();
1511 void scr_forwardindex ();
1512#endif
1471 void scr_touch (bool refresh); 1513 void scr_touch (bool refresh);
1472 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);
1473 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1515 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1474 void scr_recolour (); 1516 void scr_recolour ();
1475 void scr_remap_chars (); 1517 void scr_remap_chars ();
1476 void scr_remap_chars (text_t *tp, rend_t *rp); 1518 void scr_remap_chars (const line_t &l);
1477 1519
1478 void scr_poweron (); 1520 void scr_poweron ();
1479 void scr_cursor (int mode); 1521 void scr_cursor (int mode);
1480 void scr_do_wrap (); 1522 void scr_do_wrap ();
1481 int scr_change_screen (int scrn); 1523 int scr_change_screen (int scrn);
1482 void scr_color (unsigned int color, int fgbg); 1524 void scr_color (unsigned int color, int fgbg);
1483 void scr_rendition (int set, int style); 1525 void scr_rendition (int set, int style);
1484 void scr_add_lines (const unicode_t *str, int nlines, int len); 1526 void scr_add_lines (const unicode_t *str, int nlines, int len);
1485 void scr_backspace (); 1527 void scr_backspace ();
1486 void scr_tab (int count, bool ht = false); 1528 void scr_tab (int count, bool ht = false);
1487 void scr_backindex ();
1488 void scr_forwardindex ();
1489 void scr_gotorc (int row, int col, int relative); 1529 void scr_gotorc (int row, int col, int relative);
1490 void scr_index (enum page_dirn direction); 1530 void scr_index (enum page_dirn direction);
1491 void scr_erase_line (int mode); 1531 void scr_erase_line (int mode);
1492 void scr_E (); 1532 void scr_E ();
1493 void scr_insdel_lines (int count, int insdel); 1533 void scr_insdel_lines (int count, int insdel);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines