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.153 by root, Mon Feb 21 19:26:07 2005 UTC vs.
Revision 1.198 by root, Thu Jan 12 00:35:39 2006 UTC

… …
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23 23
24#include "rxvtperl.h"
25
24#if ENABLE_FRILLS 26#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 27# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 28# define ENABLE_EWMH 1
29# define CURSOR_BLINK 1
27#endif 30#endif
28 31
29/* 32/*
30 ***************************************************************************** 33 *****************************************************************************
31 * SYSTEM HACKS 34 * SYSTEM HACKS
… …
69 72
70#ifndef STDIN_FILENO 73#ifndef STDIN_FILENO
71# define STDIN_FILENO 0 74# define STDIN_FILENO 0
72# define STDOUT_FILENO 1 75# define STDOUT_FILENO 1
73# define STDERR_FILENO 2 76# define STDERR_FILENO 2
74#endif
75
76#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
77# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
78# define NO_SETOWNER_TTYDEV 1
79# endif
80#endif
81#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
82# define NO_SETOWNER_TTYDEV 1
83#endif 77#endif
84 78
85/* 79/*
86 ***************************************************************************** 80 *****************************************************************************
87 * PROTOTYPES 81 * PROTOTYPES
… …
117char ** rxvt_splitcommastring (const char *cs); 111char ** rxvt_splitcommastring (const char *cs);
118void rxvt_freecommastring (char **cs); 112void rxvt_freecommastring (char **cs);
119char * rxvt_File_find (const char *file, const char *ext, const char *path); 113char * 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); 114void 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); 115void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
116void rxvt_usleep (int usecs);
117
118/////////////////////////////////////////////////////////////////////////////
119
120// temporarily replace the process environment
121extern char **environ;
122extern char **rxvt_environ; // the original environ pointer
123
124struct temp_environ
125{
126 char **prev;
127
128 temp_environ (const stringvec *envv)
129 : prev(environ)
130 {
131 if (envv)
132 environ = (char **)envv->begin ();
133 }
134
135 temp_environ (char **env)
136 : prev(environ)
137 {
138 if (env)
139 environ = env;
140 }
141
142 ~temp_environ ()
143 {
144 environ = prev;
145 }
146};
147
148#define TEMP_ENV temp_environ temp_environ (envv)
122 149
123/* 150/*
124 ***************************************************************************** 151 *****************************************************************************
125 * STRUCTURES AND TYPEDEFS 152 * STRUCTURES AND TYPEDEFS
126 ***************************************************************************** 153 *****************************************************************************
… …
136#endif 163#endif
137 164
138/* If we're using either the rxvt scrollbar or menu bars, keep the 165/* If we're using either the rxvt scrollbar or menu bars, keep the
139 * scrollColor resource. 166 * scrollColor resource.
140 */ 167 */
141#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 168#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
142# define KEEP_SCROLLCOLOR 1 169# define KEEP_SCROLLCOLOR 1
143#else 170#else
144# undef KEEP_SCROLLCOLOR 171# undef KEEP_SCROLLCOLOR
145#endif 172#endif
146 173
… …
160 Time time; /* milliseconds */ 187 Time time; /* milliseconds */
161 unsigned int state; /* key or button mask */ 188 unsigned int state; /* key or button mask */
162 unsigned int button; /* detail */ 189 unsigned int button; /* detail */
163}; 190};
164 191
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 192#if ENABLE_FRILLS
178typedef struct _mwmhints { 193typedef struct _mwmhints {
179 CARD32 flags; 194 CARD32 flags;
180 CARD32 functions; 195 CARD32 functions;
181 CARD32 decorations; 196 CARD32 decorations;
… …
228 243
229#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 244#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
230# define NO_MOUSE_REPORT_SCROLLBAR 1 245# define NO_MOUSE_REPORT_SCROLLBAR 1
231#endif 246#endif
232 247
233#ifdef NO_RESOURCES 248#if defined (ISO_14755) || defined (ENABLE_PERL)
234# undef USE_XGETDEFAULT
235#endif
236
237#if ISO_14755
238# define ENABLE_OVERLAY 1 249# define ENABLE_OVERLAY 1
239#endif 250#endif
240 251
241/* now look for other badly set stuff */ 252/* now look for other badly set stuff */
242 253
… …
257# define HAVE_SCROLLBARS 1 268# define HAVE_SCROLLBARS 1
258#endif 269#endif
259 270
260/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 271/* width of scrollBar, menuBar shadow, must be 1 or 2 */
261#ifdef HALFSHADOW 272#ifdef HALFSHADOW
262# define SHADOW 1 273# define MENU_SHADOW 1
263#else 274#else
264# define SHADOW 2 275# define MENU_SHADOW 2
265#endif 276#endif
266 277
267#define R_SB_ALIGN_CENTRE 0 278#define R_SB_ALIGN_CENTRE 0
268#define R_SB_ALIGN_TOP 1 279#define R_SB_ALIGN_TOP 1
269#define R_SB_ALIGN_BOTTOM 2 280#define R_SB_ALIGN_BOTTOM 2
270 281
271#define R_SB_RXVT 0
272#define R_SB_NEXT 1 282#define R_SB_NEXT 1
273#define R_SB_XTERM 2 283#define R_SB_XTERM 2
274#define R_SB_PLAIN 4 284#define R_SB_PLAIN 4
285#define R_SB_RXVT 8
275 286
276#define SB_WIDTH_NEXT 19 287#define SB_WIDTH_NEXT 19
277#define SB_WIDTH_XTERM 15 288#define SB_WIDTH_XTERM 15
278#define SB_WIDTH_PLAIN 7 289#define SB_WIDTH_PLAIN 7
279#ifndef SB_WIDTH_RXVT 290#ifndef SB_WIDTH_RXVT
… …
361#define FONT_DN "#-" 372#define FONT_DN "#-"
362#define FONT_UP "#+" 373#define FONT_UP "#+"
363 374
364/* flags for rxvt_scr_gotorc () */ 375/* flags for rxvt_scr_gotorc () */
365enum { 376enum {
366 C_RELATIVE = 1 , /* col movement is relative */ 377 C_RELATIVE = 1, /* col movement is relative */
367 R_RELATIVE = 2, /* row movement is relative */ 378 R_RELATIVE = 2, /* row movement is relative */
368 RELATIVE = 1 | 2, 379 RELATIVE = C_RELATIVE | R_RELATIVE,
369}; 380};
370 381
371/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 382/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
372enum { 383enum {
373 INSERT = -1, /* don't change these values */ 384 INSERT = -1, /* don't change these values */
… …
386enum { 397enum {
387 PRIMARY = 0, 398 PRIMARY = 0,
388 SECONDARY, 399 SECONDARY,
389}; 400};
390 401
391#define RS_None 0 /* Normal */ 402#define RS_None 0
392 403
393#define RS_fgMask 0x0000007fUL /* 128 colors */ 404#define RS_fgMask 0x0000007fUL // 128 colors
394#define RS_bgMask 0x00003f80UL /* 128 colors */ 405#define RS_bgMask 0x00003f80UL // 128 colors
395 406
396// font styles 407// font styles
397#define RS_Bold 0x00004000UL // value 1 408#define RS_Bold 0x00004000UL // value 1
398#define RS_Italic 0x00008000UL // value 2 409#define RS_Italic 0x00008000UL // value 2
399 410
400// fake styles 411// fake styles
401#define RS_Blink 0x00010000UL /* blink */ 412#define RS_Blink 0x00010000UL // blink
402#define RS_RVid 0x00020000UL /* reverse video */ 413#define RS_RVid 0x00020000UL // reverse video
403#define RS_Uline 0x00040000UL /* underline */ 414#define RS_Uline 0x00040000UL // underline
404 415
405// 5 bits still to go 416// 5 custom bits for extensions
417#define RS_customCount 32
418#define RS_customMask 0x00f80000UL
419#define RS_customShift 19
406 420
407// other flags 421// other flags
408#define RS_Careful 0x80000000UL /* be careful when drawing these */ 422#define RS_Careful 0x80000000UL /* be careful when drawing these */
409 423
410#define RS_styleCount 4 424#define RS_styleCount 4
… …
452 XTerm_property = 3, // change X property 466 XTerm_property = 3, // change X property
453 XTerm_Color = 4, // change colors 467 XTerm_Color = 4, // change colors
454 XTerm_Color00 = 10, // not implemented, CLASH! 468 XTerm_Color00 = 10, // not implemented, CLASH!
455 XTerm_Color01 = 11, // not implemented 469 XTerm_Color01 = 11, // not implemented
456 XTerm_Color_cursor = 12, // change actual 'Cursor' color 470 XTerm_Color_cursor = 12, // change actual 'Cursor' color
457 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 471 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
458 XTerm_Color_pointer_bg = 14, // not implemented 472 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
459 XTerm_Color05 = 15, // not implemented 473 XTerm_Color05 = 15, // not implemented (tektronix fg)
460 XTerm_Color06 = 16, // not implemented 474 XTerm_Color06 = 16, // not implemented (tektronix bg)
461 XTerm_Color_RV = 17, // change actual 'Highlight' color 475 XTerm_Color_RV = 17, // change actual 'Highlight' color
462 XTerm_logfile = 46, // not implemented 476 XTerm_logfile = 46, // not implemented
463 XTerm_font = 50, 477 XTerm_font = 50,
464 478
465 XTerm_konsole30 = 30, // reserved for konsole 479 XTerm_konsole30 = 30, // reserved for konsole
466 XTerm_konsole31 = 31, // reserved for konsole 480 XTerm_konsole31 = 31, // reserved for konsole
467 XTerm_emacs51 = 51, // reserved for emacs shell 481 XTerm_emacs51 = 51, // reserved for emacs shell
468 /* 482 /*
469 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 483 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
484 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
470 */ 485 */
471 XTerm_Color_BD = 18, // change actual 'Bold' color 486 Rxvt_Color_BD = 18, // change actual 'Bold' color
472 XTerm_Color_UL = 19, // change actual 'Underline' color 487 Rxvt_Color_UL = 19, // change actual 'Underline' color
473 XTerm_Pixmap = 20, // new bg pixmap 488 Rxvt_Pixmap = 20, // new bg pixmap
474 XTerm_restoreFG = 39, // change default fg color 489 Rxvt_restoreFG = 39, // change default fg color
475 XTerm_restoreBG = 49, // change default bg color 490 Rxvt_restoreBG = 49, // change default bg color
476 XTerm_dumpscreen = 55, // dump scrollback and all of screen 491 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
477 492
478 URxvt_locale = 701, // change locale 493 URxvt_locale = 701, // change locale
479 URxvt_Menu = 703, // set menu item 494 URxvt_Menu = 703, // set menu item
480 URxvt_Color_IT = 704, // change actual 'Italic' colour 495 URxvt_Color_IT = 704, // change actual 'Italic' colour
481 URxvt_Color_tint = 705, // change actual tint colour 496 URxvt_Color_tint = 705, // change actual tint colour
497 URxvt_Color_BD = 706,
498 URxvt_Color_UL = 707,
482 499
483 URxvt_font = 710, 500 URxvt_font = 710,
484 URxvt_boldFont = 711, 501 URxvt_boldFont = 711,
485 URxvt_italicFont = 712, 502 URxvt_italicFont = 712,
486 URxvt_boldItalicFont = 713, 503 URxvt_boldItalicFont = 713,
487 504
488 URxvt_view_up = 720, 505 URxvt_view_up = 720,
489 URxvt_view_down = 721, 506 URxvt_view_down = 721,
507
508 URxvt_perl = 777,
490}; 509};
491 510
492/* Words starting with `Color_' are colours. Others are counts */ 511/* Words starting with `Color_' are colours. Others are counts */
493/* 512/*
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 513 * The PixColor and rendition colour usage should probably be decoupled
497 * on the unnecessary items, e.g. Color_pointer, but won't bother 514 * 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 515 * until we need to. Also, be aware of usage in pixcolor_set
499 */ 516 */
500 517
501enum colour_list { 518enum colour_list {
… …
551 Color_trough, 568 Color_trough,
552#endif 569#endif
553#if TINTING 570#if TINTING
554 Color_tint, 571 Color_tint,
555#endif 572#endif
573#if OFF_FOCUS_FADING
574 Color_fade,
575#endif
556 NRS_COLORS, /* */ 576 NRS_COLORS, /* */
557#ifdef KEEP_SCROLLCOLOR 577#ifdef KEEP_SCROLLCOLOR
558 Color_topShadow = NRS_COLORS, 578 Color_topShadow = NRS_COLORS,
559 Color_bottomShadow, 579 Color_bottomShadow,
560 TOTAL_COLORS 580 TOTAL_COLORS
… …
570 590
571/* 591/*
572 * Resource list 592 * Resource list
573 */ 593 */
574enum { 594enum {
575 Rs_display_name = 0, 595# define def(name) Rs_ ## name,
576 Rs_term_name, 596# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
577 Rs_iconName, 597# include "rsinc.h"
578 Rs_geometry, 598# undef def
579 Rs_reverseVideo, 599# undef reserve
580 Rs_color,
581 _Rs_color = Rs_color + NRS_COLORS - 1,
582 Rs_font,
583#if ENABLE_STYLES
584 Rs_boldFont,
585 Rs_italicFont,
586 Rs_boldItalicFont,
587#endif
588 Rs_name,
589 Rs_title,
590#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
591 Rs_path,
592#endif
593#ifdef XPM_BACKGROUND
594 Rs_backgroundPixmap,
595#endif
596#if (MENUBAR_MAX)
597 Rs_menu,
598#endif
599 Rs_loginShell,
600 Rs_jumpScroll,
601#ifdef HAVE_SCROLLBARS
602 Rs_scrollBar,
603 Rs_scrollBar_right,
604 Rs_scrollBar_floating,
605 Rs_scrollBar_align,
606 Rs_scrollstyle, /* Rs_scrollBar_style */
607 Rs_scrollBar_thickness,
608#endif
609 Rs_scrollTtyOutput,
610 Rs_scrollTtyKeypress,
611 Rs_scrollWithBuffer,
612 Rs_saveLines,
613 Rs_utmpInhibit,
614 Rs_visualBell,
615#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
616 Rs_mapAlert,
617#endif
618#ifdef META8_OPTION
619 Rs_meta8,
620#endif
621#ifdef MOUSE_WHEEL
622 Rs_mouseWheelScrollPage,
623#endif
624#ifndef NO_BACKSPACE_KEY
625 Rs_backspace_key,
626#endif
627#ifndef NO_DELETE_KEY
628 Rs_delete_key,
629#endif
630 Rs_selectstyle,
631#ifdef PRINTPIPE
632 Rs_print_pipe,
633#endif
634#ifdef USE_XIM
635 Rs_preeditType,
636 Rs_inputMethod,
637#endif
638#ifdef TRANSPARENT
639 Rs_transparent,
640 Rs_transparent_all,
641#endif
642#if ENABLE_FRILLS
643 Rs_ext_bwidth,
644 Rs_int_bwidth,
645 Rs_borderLess,
646 Rs_lineSpace,
647 Rs_pty_fd,
648#endif
649#if ENABLE_XEMBED
650 Rs_embed,
651#endif
652 Rs_cutchars,
653 Rs_modifier,
654 Rs_answerbackstring,
655 Rs_tripleclickwords,
656 Rs_insecure,
657 Rs_cursorBlink,
658 Rs_pointerBlank,
659 Rs_pointerBlankDelay,
660 Rs_imLocale,
661 Rs_imFont,
662 Rs_pastableTabs,
663#ifndef NO_SECONDARY_SCREEN
664 Rs_secondaryScreen,
665 Rs_secondaryScroll,
666#endif
667#ifdef OFF_FOCUS_FADING
668 Rs_fade,
669#endif
670#ifdef TINTING
671 Rs_shade,
672#endif
673 NUM_RESOURCES 600 NUM_RESOURCES
674}; 601};
675 602
676// see init.C:xa_names, which must be kept in sync 603// see init.C:xa_names, which must be kept in sync
677enum { 604enum {
… …
752#endif 679#endif
753 680
754// do not change these constants lightly, there are many interdependencies 681// do not change these constants lightly, there are many interdependencies
755#define IMBUFSIZ 128 // input modifier buffer sizes 682#define IMBUFSIZ 128 // input modifier buffer sizes
756#define KBUFSZ 512 // size of keyboard mapping buffer 683#define KBUFSZ 512 // size of keyboard mapping buffer
757#define CBUFSIZ 4096 // size of command buffer 684#define CBUFSIZ 2048 // size of command buffer
758#define UBUFSIZ 4096 // character buffer 685#define UBUFSIZ 2048 // character buffer
759 686
760#ifndef PATH_MAX 687#ifndef PATH_MAX
761# define PATH_MAX 16384 688# define PATH_MAX 16384
762#endif 689#endif
763 690
… …
791/* 718/*
792 ***************************************************************************** 719 *****************************************************************************
793 * MACRO DEFINES 720 * MACRO DEFINES
794 ***************************************************************************** 721 *****************************************************************************
795 */ 722 */
796#define memset(x, y, z) memset((x), (y), (size_t)(z))
797#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
798#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
799#define strcasecmp(x, y) strcasecmp((x), (y))
800#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
801#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
802#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
803#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
804#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
805#define strcat(x, y) strcat((char *)(x), (const char *)(y))
806#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
807#define strdup(x) strdup((const char *)(x))
808#define strlen(x) strlen((const char *)(x))
809#define strchr(x, y) strchr((const char *)(x), (int)(y))
810#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
811
812#define dDisp Display *disp = display->display 723#define dDisp Display *disp = display->display
813 724
814/* convert pixel dimensions to row/column values. Everything as int32_t */ 725/* convert pixel dimensions to row/column values. Everything as int32_t */
815#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 726#define Pixel2Col(x) Pixel2Width((int32_t)(x))
816#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 727#define Pixel2Row(y) Pixel2Height((int32_t)(y))
817#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 728#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
818#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 729#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
819#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 730#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
820#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 731#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
821#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 732#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
822#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 733#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
823 734
824#define TermWin_TotalWidth() ((int32_t)TermWin.width) 735#define OPTION(opt) (options & (opt))
825#define TermWin_TotalHeight() ((int32_t)TermWin.height) 736#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
737 | Opt_jumpScroll | Opt_secondaryScreen \
738 | Opt_pastableTabs | Opt_intensityStyles)
739
740// for m >= -n, ensure remainder lies between 0..n-1
741#define MOD(m,n) (((m) + (n)) % (n))
742
743#define LINENO(n) MOD (term_start + int(n), total_rows)
744#define ROW(n) row_buf [LINENO (n)]
826 745
827/* how to build & extract colors and attributes */ 746/* how to build & extract colors and attributes */
828#define GET_BASEFG(x) (((x) & RS_fgMask)) 747#define GET_BASEFG(x) (((x) & RS_fgMask))
829#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 748#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 749
848#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 750#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
849#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 751#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
850 752
851#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 753#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
864 766
865#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 767#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))) 768#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
867 769
868#if ENABLE_STYLES 770#if ENABLE_STYLES
869# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 771# define FONTSET(style) fontset[GET_STYLE (style)]
870#else 772#else
871# define FONTSET(style) TermWin.fontset[0] 773# define FONTSET(style) fontset[0]
872#endif 774#endif
873 775
874#ifdef HAVE_SCROLLBARS 776#ifdef HAVE_SCROLLBARS
875# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 777# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
876#else 778#else
… …
901#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 803#define scrollbar_size() (scrollBar.end - scrollBar.beg \
902 - scrollbar_minheight ()) 804 - scrollbar_minheight ())
903 805
904#if (MENUBAR_MAX > 1) 806#if (MENUBAR_MAX > 1)
905/* rendition style flags */ 807/* rendition style flags */
906# define menuBar_height() (TermWin.fheight + SHADOW) 808# define menuBar_height() (fheight + MENU_SHADOW)
907# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 809# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
908# define isMenuBarWindow(w) ((w) == menuBar.win) 810# define isMenuBarWindow(w) ((w) == menuBar.win)
909#else 811#else
910# define menuBar_height() (0) 812# define menuBar_height() (0)
911# define menuBar_TotalHeight() (0) 813# define menuBar_TotalHeight() (0)
912# define isMenuBarWindow(w) (0) 814# define isMenuBarWindow(w) (0)
… …
958#endif 860#endif
959 861
960extern class rxvt_failure_exception { } rxvt_failure_exception; 862extern class rxvt_failure_exception { } rxvt_failure_exception;
961 863
962typedef callback1<void, const char *> log_callback; 864typedef callback1<void, const char *> log_callback;
865typedef callback1<int, int> getfd_callback;
963 866
964extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 867extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
965extern void rxvt_log (const char *fmt, ...); 868extern void rxvt_log (const char *fmt, ...);
966extern void rxvt_warn (const char *fmt, ...); 869extern void rxvt_warn (const char *fmt, ...);
967extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 870extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
968extern void rxvt_exit_failure () __attribute__ ((noreturn)); 871extern void rxvt_exit_failure () __attribute__ ((noreturn));
969 872
970#define SET_LOCALE(locale) rxvt_set_locale (locale) 873#define SET_LOCALE(locale) rxvt_set_locale (locale)
971extern bool rxvt_set_locale (const char *locale); 874extern bool rxvt_set_locale (const char *locale);
875extern void rxvt_push_locale (const char *locale);
876extern void rxvt_pop_locale ();
972 877
973/*
974 ***************************************************************************** 878/****************************************************************************/
975 * VARIABLES 879
976 *****************************************************************************
977 */
978#ifdef MENUBAR 880#ifdef MENUBAR
979# include "menubar.h" 881# include "menubar.h"
980#endif 882#endif
981 883
982#define BLINK_INTERVAL 0.5 884#define BLINK_INTERVAL 0.5
… …
989# endif 891# endif
990# endif 892# endif
991# define __attribute__(x) 893# define __attribute__(x)
992#endif 894#endif
993 895
896/****************************************************************************/
897
898#define LINE_LONGER 0x0001 // line is continued on the next row
899#define LINE_FILTERED 0x0002 // line has been filtered
900#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
901
902struct line_t {
903 text_t *t; // terminal the text
904 rend_t *r; // rendition, uses RS_ flags
905 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
906 uint32_t f; // flags
907
908 bool is_longer ()
909 {
910 return f & LINE_LONGER;
911 }
912
913 void is_longer (int set)
914 {
915 if (set)
916 f |= LINE_LONGER;
917 else
918 f &= ~LINE_LONGER;
919 }
920
921 void clear ()
922 {
923 t = 0;
924 r = 0;
925 l = 0;
926 f = 0;
927 }
928
929 void touch () // call whenever a line is changed/touched/updated
930 {
931#if ENABLE_PERL
932 f &= ~LINE_FILTERED;
933#endif
934 }
935
936 void touch (int col)
937 {
938 max_it (l, col);
939 touch ();
940 }
941};
942
943/****************************************************************************/
944
994// primivite wrapper around mbstate_t to ensure initialisation 945// primivite wrapper around mbstate_t to ensure initialisation
995struct mbstate { 946struct mbstate {
996 mbstate_t mbs; 947 mbstate_t mbs;
997 948
998 operator mbstate_t *() { return &mbs; } 949 operator mbstate_t *() { return &mbs; }
999 void reset () { memset (&mbs, 0, sizeof (mbs)); } 950 void reset () { memset (&mbs, 0, sizeof (mbs)); }
1000 mbstate () { reset (); } 951 mbstate () { reset (); }
1001}; 952};
1002 953
954/****************************************************************************/
955
1003#define UNICODE_MASK 0x1fffffUL 956#define UNICODE_MASK 0x1fffffUL
1004 957
1005#if UNICODE3 958#if UNICODE3
1006# define COMPOSE_LO 0x40000000UL 959# define COMPOSE_LO 0x40000000UL
1007# define COMPOSE_HI 0x400fffffUL 960# define COMPOSE_HI 0x400fffffUL
1008# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 961# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1009#else 962#else
963# if ENABLE_PERL
964# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
965# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
966# else
1010# define COMPOSE_LO 0xd800UL 967# define COMPOSE_LO 0xd800UL
1011# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 968# define COMPOSE_HI 0xf8ffUL
1012# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 969# endif
970# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1013#endif 971#endif
1014 972
1015#if ENABLE_COMBINING 973#if ENABLE_COMBINING
1016// compose chars are used to represent composite characters 974// compose chars are used to represent composite characters
1017// that are not representable in unicode, as well as characters 975// that are not representable in unicode, as well as characters
… …
1037}; 995};
1038 996
1039extern class rxvt_composite_vec rxvt_composite; 997extern class rxvt_composite_vec rxvt_composite;
1040#endif 998#endif
1041 999
1000/****************************************************************************/
1042 1001
1043#ifdef KEYSYM_RESOURCE 1002#ifdef KEYSYM_RESOURCE
1044 class keyboard_manager; 1003 class keyboard_manager;
1045#endif 1004#endif
1046 1005
1047struct rxvt_term : zero_initialized, rxvt_vars { 1006struct rxvt_term : zero_initialized, rxvt_vars {
1048 log_callback *log_hook; // log error messages through this hook, if != 0 1007 log_callback *log_hook; // log error messages through this hook, if != 0
1049 1008 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1009#if ENABLE_PERL
1010 rxvt_perl_term perl;
1011#endif
1050 struct mbstate mbstate; // current input multibyte state 1012 struct mbstate mbstate; // current input multibyte state
1051 1013
1052 unsigned char want_refresh:1, 1014 unsigned char want_refresh:1,
1053#ifdef TRANSPARENT 1015#ifdef TRANSPARENT
1054 want_full_refresh:1, /* awaiting full screen refresh */ 1016 want_full_refresh:1, /* awaiting full screen refresh */
… …
1204 bar_t *CurrentBar; 1166 bar_t *CurrentBar;
1205# if ! (MENUBAR_MAX > 1) 1167# if ! (MENUBAR_MAX > 1)
1206 bar_t BarList; 1168 bar_t BarList;
1207# endif /* (MENUBAR_MAX > 1) */ 1169# endif /* (MENUBAR_MAX > 1) */
1208#endif 1170#endif
1209#ifdef CURSOR_BLINK
1210 struct timeval lastcursorchange;
1211#endif
1212#ifdef POINTER_BLANK
1213 struct timeval lastmotion;
1214#endif
1215 1171
1216#if ENABLE_OVERLAY 1172#if ENABLE_OVERLAY
1217 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1173 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1218 text_t **ov_text; 1174 text_t **ov_text;
1219 rend_t **ov_rend; 1175 rend_t **ov_rend;
… …
1223 void scr_overlay_off (); 1179 void scr_overlay_off ();
1224 void scr_overlay_set (int x, int y, 1180 void scr_overlay_set (int x, int y,
1225 text_t text, 1181 text_t text,
1226 rend_t rend = OVERLAY_RSTYLE); 1182 rend_t rend = OVERLAY_RSTYLE);
1227 void scr_overlay_set (int x, int y, const char *s); 1183 void scr_overlay_set (int x, int y, const char *s);
1184 void scr_overlay_set (int x, int y, const wchar_t *s);
1228#endif 1185#endif
1229 1186
1230 vector<void *> allocated; // free these memory blocks with free() 1187 vector<void *> allocated; // free these memory blocks with free()
1231 1188
1232 char *env_windowid; /* environmental variable WINDOWID */ 1189 char *env_windowid; /* environmental variable WINDOWID */
1233 char *env_display; /* environmental variable DISPLAY */ 1190 char *env_display; /* environmental variable DISPLAY */
1234 char *env_term; /* environmental variable TERM */ 1191 char *env_term; /* environmental variable TERM */
1235 char *env_colorfgbg; 1192 char *env_colorfgbg;
1236 char *locale; 1193 char *locale;
1237 char charsets[4]; 1194 char charsets[4];
1238 unsigned char *v_buffer; /* pointer to physical buffer */ 1195 char *v_buffer; /* pointer to physical buffer */
1239 unsigned int v_buflen; /* size of area to write */ 1196 unsigned int v_buflen; /* size of area to write */
1240 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1197 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1241 1198
1242#ifdef KEYSYM_RESOURCE 1199#ifdef KEYSYM_RESOURCE
1243 keyboard_manager *keyboard; 1200 keyboard_manager *keyboard;
1244#endif 1201#endif
1245 1202
1246 const char *rs[NUM_RESOURCES]; 1203 const char *rs[NUM_RESOURCES];
1247 /* command input buffering */ 1204 /* command input buffering */
1248 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1205 char *cmdbuf_ptr, *cmdbuf_endp;
1249 unsigned char cmdbuf_base[CBUFSIZ]; 1206 char cmdbuf_base[CBUFSIZ];
1250 1207
1251 rxvt_salloc *talloc; // text line allocator 1208 rxvt_salloc *talloc; // text line allocator
1252 rxvt_salloc *ralloc; // rend line allocator 1209 rxvt_salloc *ralloc; // rend line allocator
1253 1210
1254 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1211 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1257 // ISO 14755 entry support 1214 // ISO 14755 entry support
1258 unicode_t iso14755buf; 1215 unicode_t iso14755buf;
1259 void commit_iso14755 (); 1216 void commit_iso14755 ();
1260 int hex_keyval (XKeyEvent &ev); 1217 int hex_keyval (XKeyEvent &ev);
1261# if ISO_14755 1218# if ISO_14755
1262 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1219 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); 1220 void iso14755_54 (int x, int y);
1264# endif 1221# endif
1265#endif 1222#endif
1266 1223
1267 // modifies first argument(!) 1224 // modifies first argument(!)
1268 void paste (unsigned char *data, unsigned int len); 1225 void paste (char *data, unsigned int len);
1269 1226
1270 void flush (); 1227 void flush ();
1271 1228
1272#if TRANSPARENT 1229#if TRANSPARENT
1273 void rootwin_cb (XEvent &xev); 1230 void rootwin_cb (XEvent &xev);
1274 xevent_watcher rootwin_ev; 1231 xevent_watcher rootwin_ev;
1275#endif 1232#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 1233
1281 void x_cb (XEvent &xev); 1234 void x_cb (XEvent &xev);
1282 xevent_watcher termwin_ev; 1235 xevent_watcher termwin_ev;
1283 xevent_watcher vt_ev; 1236 xevent_watcher vt_ev;
1284#ifdef HAVE_SCROLLBARS 1237#ifdef HAVE_SCROLLBARS
… …
1318 void pointer_blank (); 1271 void pointer_blank ();
1319#endif 1272#endif
1320 void pointer_unblank (); 1273 void pointer_unblank ();
1321 1274
1322 void tt_printf (const char *fmt,...); 1275 void tt_printf (const char *fmt,...);
1323 void tt_write (const unsigned char *data, unsigned int len); 1276 void tt_write (const char *data, unsigned int len);
1324 void pty_write (); 1277 void pty_write ();
1325 1278
1326 void tt_winch (); 1279 void tt_winch ();
1327 1280
1328 rxvt_term (); 1281 rxvt_term ();
1329 ~rxvt_term (); 1282 ~rxvt_term ();
1283 void child_exit (); // child has exited, usually destroys
1330 void destroy (); 1284 void destroy ();
1331 void emergency_cleanup (); 1285 void emergency_cleanup ();
1332 1286
1333 bool init (int argc, const char *const *argv); 1287 bool init (int argc, const char *const *argv);
1334 bool init_vars (); 1288 bool init_vars ();
1335 1289
1336 bool pty_fill (); 1290 bool pty_fill ();
1337 1291
1338 void init_secondary (); 1292 void init_secondary ();
1339 const char **init_resources (int argc, const char *const *argv); 1293 const char **init_resources (int argc, const char *const *argv);
1294 const char *x_resource (const char *name);
1340 void init_env (); 1295 void init_env ();
1341 void set_locale (const char *locale); 1296 void set_locale (const char *locale);
1342 void init_xlocale (); 1297 void init_xlocale ();
1343 void init_command (const char *const *argv); 1298 void init_command (const char *const *argv);
1344 void run_command (const char *const *argv); 1299 void run_command (const char *const *argv);
1345 int run_child (const char *const *argv); 1300 int run_child (const char *const *argv);
1346 1301
1347 void color_aliases (int idx); 1302 void color_aliases (int idx);
1348 void recolour_cursor (); 1303 void recolour_cursor ();
1349 void create_windows (int argc, const char *const *argv); 1304 void create_windows (int argc, const char *const *argv);
1350 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1305 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1351 void window_calc (unsigned int width, unsigned int height); 1306 void window_calc (unsigned int newwidth, unsigned int newheight);
1352 1307
1353#if USE_XIM 1308#if USE_XIM
1354 rxvt_xim *input_method; 1309 rxvt_xim *input_method;
1355 XIC Input_Context; 1310 XIC Input_Context;
1356 XIMStyle input_style; 1311 XIMStyle input_style;
… …
1379 1334
1380 /* autoconvert */ 1335 /* autoconvert */
1381 1336
1382 // command.C 1337 // command.C
1383 void lookup_key (XKeyEvent &ev); 1338 void lookup_key (XKeyEvent &ev);
1384 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1339 unsigned int cmd_write (const char *str, unsigned int count);
1385 1340
1386 unicode_t next_char (); 1341 wchar_t next_char ();
1387 unicode_t cmd_getc (); 1342 wchar_t cmd_getc ();
1388 unicode_t next_octet (); 1343 uint32_t next_octet ();
1389 unicode_t cmd_get8 (); 1344 uint32_t cmd_get8 ();
1390 1345
1391 bool cmd_parse (); 1346 bool cmd_parse ();
1392 void mouse_report (XButtonEvent &ev); 1347 void mouse_report (XButtonEvent &ev);
1393 void button_press (XButtonEvent &ev); 1348 void button_press (XButtonEvent &ev);
1394 void button_release (XButtonEvent &ev); 1349 void button_release (XButtonEvent &ev);
… …
1403 void process_nonprinting (unicode_t ch); 1358 void process_nonprinting (unicode_t ch);
1404 void process_escape_vt52 (unicode_t ch); 1359 void process_escape_vt52 (unicode_t ch);
1405 void process_escape_seq (); 1360 void process_escape_seq ();
1406 void process_csi_seq (); 1361 void process_csi_seq ();
1407 void process_window_ops (const int *args, unsigned int nargs); 1362 void process_window_ops (const int *args, unsigned int nargs);
1408 unsigned char *get_to_st (unicode_t &ends_how); 1363 char *get_to_st (unicode_t &ends_how);
1409 void process_dcs_seq (); 1364 void process_dcs_seq ();
1410 void process_osc_seq (); 1365 void process_osc_seq ();
1411 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1366 void process_color_seq (int report, int color, const char *str, char resp);
1412 void process_xterm_seq (int op, const char *str, unsigned char resp); 1367 void process_xterm_seq (int op, const char *str, char resp);
1413 int privcases (int mode, unsigned long bit); 1368 int privcases (int mode, unsigned long bit);
1414 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1369 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1415 void process_sgr_mode (unsigned int nargs, const int *arg); 1370 void process_sgr_mode (unsigned int nargs, const int *arg);
1416 void process_graphics (); 1371 void process_graphics ();
1417 // init.C 1372 // init.C
… …
1428 void set_title (const char *str); 1383 void set_title (const char *str);
1429 void set_icon_name (const char *str); 1384 void set_icon_name (const char *str);
1430 void set_window_color (int idx, const char *color); 1385 void set_window_color (int idx, const char *color);
1431 void set_colorfgbg (); 1386 void set_colorfgbg ();
1432 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1387 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1433 void set_widthheight (unsigned int width, unsigned int height); 1388 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1434 1389
1435#ifdef MENUBAR 1390#ifdef MENUBAR
1436 // menubar.C 1391 // menubar.C
1437 void menuitem_free (menu_t *menu, menuitem_t *item); 1392 void menuitem_free (menu_t *menu, menuitem_t *item);
1438 int action_dispatch (action_t *action); 1393 int action_dispatch (action_t *action);
… …
1464 void menubar_control (XButtonEvent &ev); 1419 void menubar_control (XButtonEvent &ev);
1465 void map_menuBar (int map); 1420 void map_menuBar (int map);
1466#endif 1421#endif
1467 1422
1468 // screen.C 1423 // screen.C
1469 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1424
1470 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1425 void lalloc (line_t &l)
1426 {
1427 l.t = (text_t *)talloc->alloc ();
1428 l.r = (rend_t *)ralloc->alloc ();
1429 }
1430
1431#if 0
1432 void lfree (line_t &l)
1433 {
1434 talloc->free (l.t);
1435 ralloc->free (l.r);
1436 }
1437#endif
1438
1439 void lresize (line_t &l)
1440 {
1441 if (!l.t)
1442 return;
1443
1444 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1445 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1446
1447 l.l = min (l.l, ncol);
1448
1449 if (ncol > prev_ncol)
1450 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1451 }
1452
1453 int fgcolor_of (rend_t r)
1454 {
1455 int base = GET_BASEFG (r);
1456#ifndef NO_BRIGHTCOLOR
1457 if (r & RS_Bold
1458# if ENABLE_STYLES
1459 && OPTION (Opt_intensityStyles)
1460# endif
1461 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1462 base += minBrightCOLOR - minCOLOR;
1463#endif
1464 return base;
1465 }
1466
1467 int bgcolor_of (rend_t r)
1468 {
1469 int base = GET_BASEBG (r);
1470#ifndef NO_BRIGHTCOLOR
1471 if (r & RS_Blink
1472# if ENABLE_STYLES
1473 && OPTION (Opt_intensityStyles)
1474# endif
1475 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1476 base += minBrightCOLOR - minCOLOR;
1477#endif
1478 return base;
1479 }
1480
1481 bool option (uint32_t opt)
1482 {
1483 return OPTION (opt);
1484 }
1485
1486 void set_option (uint32_t opt, bool set)
1487 {
1488 if (set)
1489 options |= opt;
1490 else
1491 options &= ~opt;
1492 }
1493
1494 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1495 void scr_blank_screen_mem (line_t &l, rend_t efs);
1471 int scr_scroll_text (int row1, int row2, int count, int spec); 1496 int scr_scroll_text (int row1, int row2, int count);
1472 void scr_reset (); 1497 void scr_reset ();
1473 void scr_reset_realloc ();
1474 void scr_release (); 1498 void scr_release ();
1475 void scr_clear (bool really = false); 1499 void scr_clear (bool really = false);
1476 void scr_refresh (unsigned char refresh_type); 1500 void scr_refresh (unsigned char refresh_type);
1477 bool scr_refresh_rend (rend_t mask, rend_t value); 1501 bool scr_refresh_rend (rend_t mask, rend_t value);
1478 void scr_erase_screen (int mode); 1502 void scr_erase_screen (int mode);
1503#if ENABLE_FRILLS
1479 void scr_erase_savelines (); 1504 void scr_erase_savelines ();
1505 void scr_backindex ();
1506 void scr_forwardindex ();
1507#endif
1480 void scr_touch (bool refresh); 1508 void scr_touch (bool refresh);
1481 void scr_expose (int x, int y, int width, int height, bool refresh); 1509 void scr_expose (int x, int y, int width, int height, bool refresh);
1482 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1510 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1483 void scr_recolour (); 1511 void scr_recolour ();
1484 void scr_remap_chars (); 1512 void scr_remap_chars ();
1485 void scr_remap_chars (text_t *tp, rend_t *rp); 1513 void scr_remap_chars (line_t &l);
1486 1514
1487 void scr_poweron (); 1515 void scr_poweron ();
1488 void scr_cursor (int mode); 1516 void scr_cursor (int mode);
1489 void scr_do_wrap (); 1517 void scr_do_wrap ();
1490 int scr_change_screen (int scrn); 1518 int scr_change_screen (int scrn);
1491 void scr_color (unsigned int color, int fgbg); 1519 void scr_color (unsigned int color, int fgbg);
1492 void scr_rendition (int set, int style); 1520 void scr_rendition (int set, int style);
1493 void scr_add_lines (const unicode_t *str, int nlines, int len); 1521 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1494 void scr_backspace (); 1522 void scr_backspace ();
1495 void scr_tab (int count, bool ht = false); 1523 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); 1524 void scr_gotorc (int row, int col, int relative);
1499 void scr_index (enum page_dirn direction); 1525 void scr_index (enum page_dirn direction);
1500 void scr_erase_line (int mode); 1526 void scr_erase_line (int mode);
1501 void scr_E (); 1527 void scr_E ();
1502 void scr_insdel_lines (int count, int insdel); 1528 void scr_insdel_lines (int count, int insdel);
… …
1515 int scr_move_to (int y, int len); 1541 int scr_move_to (int y, int len);
1516 int scr_page (enum page_dirn direction, int nlines); 1542 int scr_page (enum page_dirn direction, int nlines);
1517 int scr_changeview (unsigned int oldviewstart); 1543 int scr_changeview (unsigned int oldviewstart);
1518 void scr_bell (); 1544 void scr_bell ();
1519 void scr_printscreen (int fullhist); 1545 void scr_printscreen (int fullhist);
1546 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1547 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1520 void scr_reverse_selection (); 1548 void scr_reverse_selection ();
1521 void scr_dump (int fd); 1549 void scr_dump (int fd);
1522 void selection_check (int check_more); 1550 void selection_check (int check_more);
1523 void selection_paste (Window win, Atom prop, bool delete_prop); 1551 void selection_paste (Window win, Atom prop, bool delete_prop);
1524 void selection_property (Window win, Atom prop); 1552 void selection_property (Window win, Atom prop);
1525 void selection_request (Time tm, int x, int y); 1553 void selection_request (Time tm, int x, int y);
1526 int selection_request_other (Atom target, int selnum); 1554 int selection_request_other (Atom target, int selnum);
1527 void selection_clear (); 1555 void selection_clear ();
1528 void selection_make (Time tm); 1556 void selection_make (Time tm);
1557 bool selection_grab (Time tm);
1529 void selection_start_colrow (int col, int row); 1558 void selection_start_colrow (int col, int row);
1530 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1559 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1531 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1560 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1532 void selection_remove_trailing_spaces (); 1561 void selection_remove_trailing_spaces ();
1533 void selection_send (const XSelectionRequestEvent &rq); 1562 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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