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.155 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.200 by root, Fri Jan 13 04:19:41 2006 UTC

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

Diff Legend

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