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.156 by root, Fri Apr 22 12:52:28 2005 UTC vs.
Revision 1.179 by root, Mon Jan 2 15:10:18 2006 UTC

70 70
71#ifndef STDIN_FILENO 71#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 72# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 73# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 74# define STDERR_FILENO 2
75#endif
76
77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
79# define NO_SETOWNER_TTYDEV 1
80# endif
81#endif
82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
83# define NO_SETOWNER_TTYDEV 1
84#endif 75#endif
85 76
86/* 77/*
87 ***************************************************************************** 78 *****************************************************************************
88 * PROTOTYPES 79 * PROTOTYPES
118char ** rxvt_splitcommastring (const char *cs); 109char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs); 110void rxvt_freecommastring (char **cs);
120char * rxvt_File_find (const char *file, const char *ext, const char *path); 111char * rxvt_File_find (const char *file, const char *ext, const char *path);
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 112void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 113void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
114void rxvt_usleep (int usecs);
123 115
124/* 116/*
125 ***************************************************************************** 117 *****************************************************************************
126 * STRUCTURES AND TYPEDEFS 118 * STRUCTURES AND TYPEDEFS
127 ***************************************************************************** 119 *****************************************************************************
161 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
162 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
163 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
164}; 156};
165 157
166#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
167#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
168#define SWAP_IT(one, two, typeof) \
169 do { \
170 typeof swapittmp; \
171 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
172 } while (/* CONSTCOND */ 0)
173#define BOUND_POSITIVE_INT16(val) \
174 (int16_t) ((val) <= 0 \
175 ? 0 \
176 : min ((val), (((uint16_t)-1)>>1)))
177
178#if ENABLE_FRILLS 158#if ENABLE_FRILLS
179typedef struct _mwmhints { 159typedef struct _mwmhints {
180 CARD32 flags; 160 CARD32 flags;
181 CARD32 functions; 161 CARD32 functions;
182 CARD32 decorations; 162 CARD32 decorations;
267 247
268#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
269#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
270#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
271 251
272#define R_SB_RXVT 0
273#define R_SB_NEXT 1 252#define R_SB_NEXT 1
274#define R_SB_XTERM 2 253#define R_SB_XTERM 2
275#define R_SB_PLAIN 4 254#define R_SB_PLAIN 4
255#define R_SB_RXVT 8
276 256
277#define SB_WIDTH_NEXT 19 257#define SB_WIDTH_NEXT 19
278#define SB_WIDTH_XTERM 15 258#define SB_WIDTH_XTERM 15
279#define SB_WIDTH_PLAIN 7 259#define SB_WIDTH_PLAIN 7
280#ifndef SB_WIDTH_RXVT 260#ifndef SB_WIDTH_RXVT
362#define FONT_DN "#-" 342#define FONT_DN "#-"
363#define FONT_UP "#+" 343#define FONT_UP "#+"
364 344
365/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
366enum { 346enum {
367 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
368 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
369 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
370}; 350};
371 351
372/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
373enum { 353enum {
374 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
387enum { 367enum {
388 PRIMARY = 0, 368 PRIMARY = 0,
389 SECONDARY, 369 SECONDARY,
390}; 370};
391 371
392#define RS_None 0 /* Normal */ 372#define RS_None 0
393 373
394#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
395#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
396 376
397// font styles 377// font styles
398#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
399#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
400 380
401// fake styles 381// fake styles
402#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
403#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
404#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
405 385
406// 5 bits still to go 386// 5 custom bits for extensions
387#define RS_customCount 32
388#define RS_customMask 0x00f80000UL
389#define RS_customShift 19
407 390
408// other flags 391// other flags
409#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
410 393
411#define RS_styleCount 4 394#define RS_styleCount 4
490 URxvt_view_down = 721, 473 URxvt_view_down = 721,
491}; 474};
492 475
493/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
494/* 477/*
495 * The following comment is mostly obsolete since pixcolor_set was expanded:
496 * We're currently upto 29 colours. Only 3 more available. The
497 * PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
498 * on the unnecessary items, e.g. Color_pointer, but won't bother 479 * on the unnecessary items, e.g. Color_pointer, but won't bother
499 * until we need to. Also, be aware of usage in pixcolor_set 480 * until we need to. Also, be aware of usage in pixcolor_set
500 */ 481 */
501 482
502enum colour_list { 483enum colour_list {
552 Color_trough, 533 Color_trough,
553#endif 534#endif
554#if TINTING 535#if TINTING
555 Color_tint, 536 Color_tint,
556#endif 537#endif
538#if OFF_FOCUS_FADING
539 Color_fade,
540#endif
557 NRS_COLORS, /* */ 541 NRS_COLORS, /* */
558#ifdef KEEP_SCROLLCOLOR 542#ifdef KEEP_SCROLLCOLOR
559 Color_topShadow = NRS_COLORS, 543 Color_topShadow = NRS_COLORS,
560 Color_bottomShadow, 544 Color_bottomShadow,
561 TOTAL_COLORS 545 TOTAL_COLORS
583 Rs_font, 567 Rs_font,
584#if ENABLE_STYLES 568#if ENABLE_STYLES
585 Rs_boldFont, 569 Rs_boldFont,
586 Rs_italicFont, 570 Rs_italicFont,
587 Rs_boldItalicFont, 571 Rs_boldItalicFont,
572 Rs_intensityStyles,
588#endif 573#endif
589 Rs_name, 574 Rs_name,
590 Rs_title, 575 Rs_title,
591#if defined (XPM_BACKGROUND) || (MENUBAR_MAX) 576#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
592 Rs_path, 577 Rs_path,
639#ifdef TRANSPARENT 624#ifdef TRANSPARENT
640 Rs_transparent, 625 Rs_transparent,
641 Rs_transparent_all, 626 Rs_transparent_all,
642#endif 627#endif
643#if ENABLE_FRILLS 628#if ENABLE_FRILLS
629 Rs_pty_fd,
630 Rs_hold,
644 Rs_ext_bwidth, 631 Rs_ext_bwidth,
645 Rs_int_bwidth, 632 Rs_int_bwidth,
646 Rs_borderLess, 633 Rs_borderLess,
647 Rs_lineSpace, 634 Rs_lineSpace,
648 Rs_pty_fd,
649 Rs_cursorUnderline, 635 Rs_cursorUnderline,
650#endif 636#endif
651#if CURSOR_BLINK 637#if CURSOR_BLINK
652 Rs_cursorBlink, 638 Rs_cursorBlink,
653#endif 639#endif
756#endif 742#endif
757 743
758// do not change these constants lightly, there are many interdependencies 744// do not change these constants lightly, there are many interdependencies
759#define IMBUFSIZ 128 // input modifier buffer sizes 745#define IMBUFSIZ 128 // input modifier buffer sizes
760#define KBUFSZ 512 // size of keyboard mapping buffer 746#define KBUFSZ 512 // size of keyboard mapping buffer
761#define CBUFSIZ 4096 // size of command buffer 747#define CBUFSIZ 2048 // size of command buffer
762#define UBUFSIZ 4096 // character buffer 748#define UBUFSIZ 2048 // character buffer
763 749
764#ifndef PATH_MAX 750#ifndef PATH_MAX
765# define PATH_MAX 16384 751# define PATH_MAX 16384
766#endif 752#endif
767 753
816#define dDisp Display *disp = display->display 802#define dDisp Display *disp = display->display
817 803
818/* convert pixel dimensions to row/column values. Everything as int32_t */ 804/* convert pixel dimensions to row/column values. Everything as int32_t */
819#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 805#define Pixel2Col(x) Pixel2Width((int32_t)(x))
820#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 806#define Pixel2Row(y) Pixel2Height((int32_t)(y))
821#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 807#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
822#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 808#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
823#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 809#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
824#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 810#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
825#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 811#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
826#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 812#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
827 813
828#define TermWin_TotalWidth() ((int32_t)TermWin.width) 814#define TermWin_TotalWidth() ((int32_t)this->width)
829#define TermWin_TotalHeight() ((int32_t)TermWin.height) 815#define TermWin_TotalHeight() ((int32_t)this->height)
816
817// for m >= -n, ensure remainder lies between 0..n-1
818#define MOD(m,n) (((m) + (n)) % (n))
819
820#define LINENO(n) MOD (term_start + int(n), total_rows)
821#define ROW(n) row_buf [LINENO (n)]
830 822
831/* how to build & extract colors and attributes */ 823/* how to build & extract colors and attributes */
832#define GET_BASEFG(x) (((x) & RS_fgMask)) 824#define GET_BASEFG(x) (((x) & RS_fgMask))
833#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 825#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
834#ifndef NO_BRIGHTCOLOR
835# define GET_FGCOLOR(x) \
836 ((((x) & RS_Bold) == 0 \
837 || GET_BASEFG (x) < minCOLOR \
838 || GET_BASEFG (x) >= minBrightCOLOR) \
839 ? GET_BASEFG (x) \
840 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
841# define GET_BGCOLOR(x) \
842 ((((x) & RS_Blink) == 0 \
843 || GET_BASEBG (x) < minCOLOR \
844 || GET_BASEBG (x) >= minBrightCOLOR) \
845 ? GET_BASEBG (x) \
846 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
847#else
848# define GET_FGCOLOR(x) GET_BASEFG(x)
849# define GET_BGCOLOR(x) GET_BASEBG(x)
850#endif
851 826
852#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 827#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
853#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 828#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
854 829
855#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 830#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
868 843
869#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 844#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
870#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 845#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
871 846
872#if ENABLE_STYLES 847#if ENABLE_STYLES
873# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 848# define FONTSET(style) fontset[GET_STYLE (style)]
874#else 849#else
875# define FONTSET(style) TermWin.fontset[0] 850# define FONTSET(style) fontset[0]
876#endif 851#endif
877 852
878#ifdef HAVE_SCROLLBARS 853#ifdef HAVE_SCROLLBARS
879# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 854# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
880#else 855#else
905#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 880#define scrollbar_size() (scrollBar.end - scrollBar.beg \
906 - scrollbar_minheight ()) 881 - scrollbar_minheight ())
907 882
908#if (MENUBAR_MAX > 1) 883#if (MENUBAR_MAX > 1)
909/* rendition style flags */ 884/* rendition style flags */
910# define menuBar_height() (TermWin.fheight + SHADOW) 885# define menuBar_height() (fheight + SHADOW)
911# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 886# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
912# define isMenuBarWindow(w) ((w) == menuBar.win) 887# define isMenuBarWindow(w) ((w) == menuBar.win)
913#else 888#else
914# define menuBar_height() (0) 889# define menuBar_height() (0)
915# define menuBar_TotalHeight() (0) 890# define menuBar_TotalHeight() (0)
962#endif 937#endif
963 938
964extern class rxvt_failure_exception { } rxvt_failure_exception; 939extern class rxvt_failure_exception { } rxvt_failure_exception;
965 940
966typedef callback1<void, const char *> log_callback; 941typedef callback1<void, const char *> log_callback;
942typedef callback1<int, int> getfd_callback;
967 943
968extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 944extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
969extern void rxvt_log (const char *fmt, ...); 945extern void rxvt_log (const char *fmt, ...);
970extern void rxvt_warn (const char *fmt, ...); 946extern void rxvt_warn (const char *fmt, ...);
971extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 947extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
1048 class keyboard_manager; 1024 class keyboard_manager;
1049#endif 1025#endif
1050 1026
1051struct rxvt_term : zero_initialized, rxvt_vars { 1027struct rxvt_term : zero_initialized, rxvt_vars {
1052 log_callback *log_hook; // log error messages through this hook, if != 0 1028 log_callback *log_hook; // log error messages through this hook, if != 0
1029 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1053 1030
1054 struct mbstate mbstate; // current input multibyte state 1031 struct mbstate mbstate; // current input multibyte state
1055 1032
1056 unsigned char want_refresh:1, 1033 unsigned char want_refresh:1,
1057#ifdef TRANSPARENT 1034#ifdef TRANSPARENT
1227 void scr_overlay_off (); 1204 void scr_overlay_off ();
1228 void scr_overlay_set (int x, int y, 1205 void scr_overlay_set (int x, int y,
1229 text_t text, 1206 text_t text,
1230 rend_t rend = OVERLAY_RSTYLE); 1207 rend_t rend = OVERLAY_RSTYLE);
1231 void scr_overlay_set (int x, int y, const char *s); 1208 void scr_overlay_set (int x, int y, const char *s);
1209 void scr_overlay_set (int x, int y, const wchar_t *s);
1232#endif 1210#endif
1233 1211
1234 vector<void *> allocated; // free these memory blocks with free() 1212 vector<void *> allocated; // free these memory blocks with free()
1235 1213
1236 char *env_windowid; /* environmental variable WINDOWID */ 1214 char *env_windowid; /* environmental variable WINDOWID */
1261 // ISO 14755 entry support 1239 // ISO 14755 entry support
1262 unicode_t iso14755buf; 1240 unicode_t iso14755buf;
1263 void commit_iso14755 (); 1241 void commit_iso14755 ();
1264 int hex_keyval (XKeyEvent &ev); 1242 int hex_keyval (XKeyEvent &ev);
1265# if ISO_14755 1243# if ISO_14755
1266 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1244 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1267 void iso14755_54 (int x, int y); 1245 void iso14755_54 (int x, int y);
1268# endif 1246# endif
1269#endif 1247#endif
1270 1248
1271 // modifies first argument(!) 1249 // modifies first argument(!)
1275 1253
1276#if TRANSPARENT 1254#if TRANSPARENT
1277 void rootwin_cb (XEvent &xev); 1255 void rootwin_cb (XEvent &xev);
1278 xevent_watcher rootwin_ev; 1256 xevent_watcher rootwin_ev;
1279#endif 1257#endif
1280
1281
1282 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1283 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1284 1258
1285 void x_cb (XEvent &xev); 1259 void x_cb (XEvent &xev);
1286 xevent_watcher termwin_ev; 1260 xevent_watcher termwin_ev;
1287 xevent_watcher vt_ev; 1261 xevent_watcher vt_ev;
1288#ifdef HAVE_SCROLLBARS 1262#ifdef HAVE_SCROLLBARS
1329 1303
1330 void tt_winch (); 1304 void tt_winch ();
1331 1305
1332 rxvt_term (); 1306 rxvt_term ();
1333 ~rxvt_term (); 1307 ~rxvt_term ();
1308 void child_exit (); // child has exited, usually destroys
1334 void destroy (); 1309 void destroy ();
1335 void emergency_cleanup (); 1310 void emergency_cleanup ();
1336 1311
1337 bool init (int argc, const char *const *argv); 1312 bool init (int argc, const char *const *argv);
1338 bool init_vars (); 1313 bool init_vars ();
1349 int run_child (const char *const *argv); 1324 int run_child (const char *const *argv);
1350 1325
1351 void color_aliases (int idx); 1326 void color_aliases (int idx);
1352 void recolour_cursor (); 1327 void recolour_cursor ();
1353 void create_windows (int argc, const char *const *argv); 1328 void create_windows (int argc, const char *const *argv);
1354 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1329 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1355 void window_calc (unsigned int width, unsigned int height); 1330 void window_calc (unsigned int newwidth, unsigned int newheight);
1356 1331
1357#if USE_XIM 1332#if USE_XIM
1358 rxvt_xim *input_method; 1333 rxvt_xim *input_method;
1359 XIC Input_Context; 1334 XIC Input_Context;
1360 XIMStyle input_style; 1335 XIMStyle input_style;
1432 void set_title (const char *str); 1407 void set_title (const char *str);
1433 void set_icon_name (const char *str); 1408 void set_icon_name (const char *str);
1434 void set_window_color (int idx, const char *color); 1409 void set_window_color (int idx, const char *color);
1435 void set_colorfgbg (); 1410 void set_colorfgbg ();
1436 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1411 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1437 void set_widthheight (unsigned int width, unsigned int height); 1412 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1438 1413
1439#ifdef MENUBAR 1414#ifdef MENUBAR
1440 // menubar.C 1415 // menubar.C
1441 void menuitem_free (menu_t *menu, menuitem_t *item); 1416 void menuitem_free (menu_t *menu, menuitem_t *item);
1442 int action_dispatch (action_t *action); 1417 int action_dispatch (action_t *action);
1468 void menubar_control (XButtonEvent &ev); 1443 void menubar_control (XButtonEvent &ev);
1469 void map_menuBar (int map); 1444 void map_menuBar (int map);
1470#endif 1445#endif
1471 1446
1472 // screen.C 1447 // screen.C
1473 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1448
1474 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1449 void lalloc (line_t &l)
1450 {
1451 l.t = (text_t *)talloc->alloc ();
1452 l.r = (rend_t *)ralloc->alloc ();
1453 }
1454
1455#if 0
1456 void lfree (line_t &l)
1457 {
1458 talloc->free (l.t);
1459 ralloc->free (l.r);
1460 }
1461#endif
1462
1463 void lresize (line_t &l)
1464 {
1465 if (!l.t)
1466 return;
1467
1468 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1469 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1470
1471 l.l = min (l.l, ncol);
1472
1473 if (ncol > prev_ncol)
1474 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1475 }
1476
1477 int fgcolor_of (rend_t r)
1478 {
1479 int base = GET_BASEFG (r);
1480#ifndef NO_BRIGHTCOLOR
1481 if (r & RS_Bold
1482# if ENABLE_STYLES
1483 && OPTION (Opt_intensityStyles)
1484# endif
1485 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1486 base += minBrightCOLOR - minCOLOR;
1487#endif
1488 return base;
1489 }
1490
1491 int bgcolor_of (rend_t r)
1492 {
1493 int base = GET_BASEBG (r);
1494#ifndef NO_BRIGHTCOLOR
1495 if (r & RS_Blink
1496# if ENABLE_STYLES
1497 && OPTION (Opt_intensityStyles)
1498# endif
1499 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1500 base += minBrightCOLOR - minCOLOR;
1501#endif
1502 return base;
1503 }
1504
1505 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1506 void scr_blank_screen_mem (line_t &l, rend_t efs);
1475 int scr_scroll_text (int row1, int row2, int count, int spec); 1507 int scr_scroll_text (int row1, int row2, int count);
1476 void scr_reset (); 1508 void scr_reset ();
1477 void scr_reset_realloc ();
1478 void scr_release (); 1509 void scr_release ();
1479 void scr_clear (bool really = false); 1510 void scr_clear (bool really = false);
1480 void scr_refresh (unsigned char refresh_type); 1511 void scr_refresh (unsigned char refresh_type);
1481 bool scr_refresh_rend (rend_t mask, rend_t value); 1512 bool scr_refresh_rend (rend_t mask, rend_t value);
1482 void scr_erase_screen (int mode); 1513 void scr_erase_screen (int mode);
1488 void scr_touch (bool refresh); 1519 void scr_touch (bool refresh);
1489 void scr_expose (int x, int y, int width, int height, bool refresh); 1520 void scr_expose (int x, int y, int width, int height, bool refresh);
1490 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1521 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1491 void scr_recolour (); 1522 void scr_recolour ();
1492 void scr_remap_chars (); 1523 void scr_remap_chars ();
1493 void scr_remap_chars (text_t *tp, rend_t *rp); 1524 void scr_remap_chars (const line_t &l);
1494 1525
1495 void scr_poweron (); 1526 void scr_poweron ();
1496 void scr_cursor (int mode); 1527 void scr_cursor (int mode);
1497 void scr_do_wrap (); 1528 void scr_do_wrap ();
1498 int scr_change_screen (int scrn); 1529 int scr_change_screen (int scrn);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines