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

Diff Legend

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