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.154 by root, Mon Feb 21 19:30:58 2005 UTC vs.
Revision 1.202 by root, Fri Jan 13 05:13:09 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
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
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
37# define CURSOR_BLINK 1
27#endif 38#endif
28 39
29/* 40/*
30 ***************************************************************************** 41 *****************************************************************************
31 * SYSTEM HACKS 42 * SYSTEM HACKS
… …
40#if defined (sun) && !defined (__sun__) 51#if defined (sun) && !defined (__sun__)
41# define __sun__ 1 52# define __sun__ 1
42#endif 53#endif
43 54
44#ifndef HAVE_XPOINTER 55#ifndef HAVE_XPOINTER
45typedef char *XPointer; 56typedef char *XPointer;
46#endif 57#endif
47 58
48#ifdef HAVE_TERMIOS_H 59#ifdef HAVE_TERMIOS_H
49# include <termios.h> 60# include <termios.h>
50typedef struct termios ttymode_t; 61typedef struct termios ttymode_t;
… …
69 80
70#ifndef STDIN_FILENO 81#ifndef STDIN_FILENO
71# define STDIN_FILENO 0 82# define STDIN_FILENO 0
72# define STDOUT_FILENO 1 83# define STDOUT_FILENO 1
73# define STDERR_FILENO 2 84# 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 85#endif
84 86
85/* 87/*
86 ***************************************************************************** 88 *****************************************************************************
87 * PROTOTYPES 89 * PROTOTYPES
… …
117char ** rxvt_splitcommastring (const char *cs); 119char ** rxvt_splitcommastring (const char *cs);
118void rxvt_freecommastring (char **cs); 120void rxvt_freecommastring (char **cs);
119char * 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);
120void 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);
121void 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}
122 143
123/* 144/*
124 ***************************************************************************** 145 *****************************************************************************
125 * STRUCTURES AND TYPEDEFS 146 * STRUCTURES AND TYPEDEFS
126 ***************************************************************************** 147 *****************************************************************************
… …
136#endif 157#endif
137 158
138/* 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
139 * scrollColor resource. 160 * scrollColor resource.
140 */ 161 */
141#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 162#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
142# define KEEP_SCROLLCOLOR 1 163# define KEEP_SCROLLCOLOR 1
143#else 164#else
144# undef KEEP_SCROLLCOLOR 165# undef KEEP_SCROLLCOLOR
145#endif 166#endif
146 167
… …
160 Time time; /* milliseconds */ 181 Time time; /* milliseconds */
161 unsigned int state; /* key or button mask */ 182 unsigned int state; /* key or button mask */
162 unsigned int button; /* detail */ 183 unsigned int button; /* detail */
163}; 184};
164 185
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 186#if ENABLE_FRILLS
178typedef struct _mwmhints { 187typedef struct _mwmhints {
179 CARD32 flags; 188 CARD32 flags;
180 CARD32 functions; 189 CARD32 functions;
181 CARD32 decorations; 190 CARD32 decorations;
… …
228 237
229#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 238#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
230# define NO_MOUSE_REPORT_SCROLLBAR 1 239# define NO_MOUSE_REPORT_SCROLLBAR 1
231#endif 240#endif
232 241
233#ifdef NO_RESOURCES
234# undef USE_XGETDEFAULT
235#endif
236
237#if ISO_14755
238# define ENABLE_OVERLAY 1
239#endif
240
241/* now look for other badly set stuff */ 242/* now look for other badly set stuff */
242 243
243#if !defined (EACCESS) && defined(EAGAIN) 244#if !defined (EACCESS) && defined(EAGAIN)
244# define EACCESS EAGAIN 245# define EACCESS EAGAIN
245#endif 246#endif
… …
257# define HAVE_SCROLLBARS 1 258# define HAVE_SCROLLBARS 1
258#endif 259#endif
259 260
260/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 261/* width of scrollBar, menuBar shadow, must be 1 or 2 */
261#ifdef HALFSHADOW 262#ifdef HALFSHADOW
262# define SHADOW 1 263# define MENU_SHADOW 1
263#else 264#else
264# define SHADOW 2 265# define MENU_SHADOW 2
265#endif 266#endif
266 267
267#define R_SB_ALIGN_CENTRE 0 268#define R_SB_ALIGN_CENTRE 0
268#define R_SB_ALIGN_TOP 1 269#define R_SB_ALIGN_TOP 1
269#define R_SB_ALIGN_BOTTOM 2 270#define R_SB_ALIGN_BOTTOM 2
270 271
271#define R_SB_RXVT 0
272#define R_SB_NEXT 1 272#define R_SB_NEXT 1
273#define R_SB_XTERM 2 273#define R_SB_XTERM 2
274#define R_SB_PLAIN 4 274#define R_SB_PLAIN 4
275#define R_SB_RXVT 8
275 276
276#define SB_WIDTH_NEXT 19 277#define SB_WIDTH_NEXT 19
277#define SB_WIDTH_XTERM 15 278#define SB_WIDTH_XTERM 15
278#define SB_WIDTH_PLAIN 7 279#define SB_WIDTH_PLAIN 7
279#ifndef SB_WIDTH_RXVT 280#ifndef SB_WIDTH_RXVT
… …
361#define FONT_DN "#-" 362#define FONT_DN "#-"
362#define FONT_UP "#+" 363#define FONT_UP "#+"
363 364
364/* flags for rxvt_scr_gotorc () */ 365/* flags for rxvt_scr_gotorc () */
365enum { 366enum {
366 C_RELATIVE = 1 , /* col movement is relative */ 367 C_RELATIVE = 1, /* col movement is relative */
367 R_RELATIVE = 2, /* row movement is relative */ 368 R_RELATIVE = 2, /* row movement is relative */
368 RELATIVE = 1 | 2, 369 RELATIVE = C_RELATIVE | R_RELATIVE,
369}; 370};
370 371
371/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 372/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
372enum { 373enum {
373 INSERT = -1, /* don't change these values */ 374 INSERT = -1, /* don't change these values */
… …
386enum { 387enum {
387 PRIMARY = 0, 388 PRIMARY = 0,
388 SECONDARY, 389 SECONDARY,
389}; 390};
390 391
391#define RS_None 0 /* Normal */ 392#define RS_None 0
392 393
393#define RS_fgMask 0x0000007fUL /* 128 colors */ 394#define RS_fgMask 0x0000007fUL // 128 colors
394#define RS_bgMask 0x00003f80UL /* 128 colors */ 395#define RS_bgMask 0x00003f80UL // 128 colors
395 396
396// font styles 397// font styles
397#define RS_Bold 0x00004000UL // value 1 398#define RS_Bold 0x00004000UL // value 1
398#define RS_Italic 0x00008000UL // value 2 399#define RS_Italic 0x00008000UL // value 2
399 400
400// fake styles 401// fake styles
401#define RS_Blink 0x00010000UL /* blink */ 402#define RS_Blink 0x00010000UL // blink
402#define RS_RVid 0x00020000UL /* reverse video */ 403#define RS_RVid 0x00020000UL // reverse video
403#define RS_Uline 0x00040000UL /* underline */ 404#define RS_Uline 0x00040000UL // underline
404 405
405// 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
406 410
407// other flags 411// other flags
408#define RS_Careful 0x80000000UL /* be careful when drawing these */ 412#define RS_Careful 0x80000000UL /* be careful when drawing these */
409 413
410#define RS_styleCount 4 414#define RS_styleCount 4
… …
452 XTerm_property = 3, // change X property 456 XTerm_property = 3, // change X property
453 XTerm_Color = 4, // change colors 457 XTerm_Color = 4, // change colors
454 XTerm_Color00 = 10, // not implemented, CLASH! 458 XTerm_Color00 = 10, // not implemented, CLASH!
455 XTerm_Color01 = 11, // not implemented 459 XTerm_Color01 = 11, // not implemented
456 XTerm_Color_cursor = 12, // change actual 'Cursor' color 460 XTerm_Color_cursor = 12, // change actual 'Cursor' color
457 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 461 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
458 XTerm_Color_pointer_bg = 14, // not implemented 462 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
459 XTerm_Color05 = 15, // not implemented 463 XTerm_Color05 = 15, // not implemented (tektronix fg)
460 XTerm_Color06 = 16, // not implemented 464 XTerm_Color06 = 16, // not implemented (tektronix bg)
461 XTerm_Color_RV = 17, // change actual 'Highlight' color 465 XTerm_Color_RV = 17, // change actual 'Highlight' color
462 XTerm_logfile = 46, // not implemented 466 XTerm_logfile = 46, // not implemented
463 XTerm_font = 50, 467 XTerm_font = 50,
464 468
465 XTerm_konsole30 = 30, // reserved for konsole 469 XTerm_konsole30 = 30, // reserved for konsole
466 XTerm_konsole31 = 31, // reserved for konsole 470 XTerm_konsole31 = 31, // reserved for konsole
467 XTerm_emacs51 = 51, // reserved for emacs shell 471 XTerm_emacs51 = 51, // reserved for emacs shell
468 /* 472 /*
469 * 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
470 */ 475 */
471 XTerm_Color_BD = 18, // change actual 'Bold' color 476 Rxvt_Color_BD = 18, // change actual 'Bold' color
472 XTerm_Color_UL = 19, // change actual 'Underline' color 477 Rxvt_Color_UL = 19, // change actual 'Underline' color
473 XTerm_Pixmap = 20, // new bg pixmap 478 Rxvt_Pixmap = 20, // new bg pixmap
474 XTerm_restoreFG = 39, // change default fg color 479 Rxvt_restoreFG = 39, // change default fg color
475 XTerm_restoreBG = 49, // change default bg color 480 Rxvt_restoreBG = 49, // change default bg color
476 XTerm_dumpscreen = 55, // dump scrollback and all of screen 481 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
477 482
478 URxvt_locale = 701, // change locale 483 URxvt_locale = 701, // change locale
479 URxvt_Menu = 703, // set menu item 484 URxvt_Menu = 703, // set menu item
480 URxvt_Color_IT = 704, // change actual 'Italic' colour 485 URxvt_Color_IT = 704, // change actual 'Italic' colour
481 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,
482 489
483 URxvt_font = 710, 490 URxvt_font = 710,
484 URxvt_boldFont = 711, 491 URxvt_boldFont = 711,
485 URxvt_italicFont = 712, 492 URxvt_italicFont = 712,
486 URxvt_boldItalicFont = 713, 493 URxvt_boldItalicFont = 713,
487 494
488 URxvt_view_up = 720, 495 URxvt_view_up = 720,
489 URxvt_view_down = 721, 496 URxvt_view_down = 721,
497
498 URxvt_perl = 777,
490}; 499};
491 500
492/* Words starting with `Color_' are colours. Others are counts */ 501/* Words starting with `Color_' are colours. Others are counts */
493/* 502/*
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 503 * The PixColor and rendition colour usage should probably be decoupled
497 * 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
498 * 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
499 */ 506 */
500 507
501enum colour_list { 508enum colour_list {
… …
551 Color_trough, 558 Color_trough,
552#endif 559#endif
553#if TINTING 560#if TINTING
554 Color_tint, 561 Color_tint,
555#endif 562#endif
563#if OFF_FOCUS_FADING
564 Color_fade,
565#endif
556 NRS_COLORS, /* */ 566 NRS_COLORS, /* */
557#ifdef KEEP_SCROLLCOLOR 567#ifdef KEEP_SCROLLCOLOR
558 Color_topShadow = NRS_COLORS, 568 Color_topShadow = NRS_COLORS,
559 Color_bottomShadow, 569 Color_bottomShadow,
560 TOTAL_COLORS 570 TOTAL_COLORS
… …
570 580
571/* 581/*
572 * Resource list 582 * Resource list
573 */ 583 */
574enum { 584enum {
575 Rs_display_name = 0, 585# define def(name) Rs_ ## name,
576 Rs_term_name, 586# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
577 Rs_iconName, 587# include "rsinc.h"
578 Rs_geometry, 588# undef def
579 Rs_reverseVideo, 589# 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 590 NUM_RESOURCES
674}; 591};
675 592
676// see init.C:xa_names, which must be kept in sync 593// see init.C:xa_names, which must be kept in sync
677enum { 594enum {
… …
752#endif 669#endif
753 670
754// do not change these constants lightly, there are many interdependencies 671// do not change these constants lightly, there are many interdependencies
755#define IMBUFSIZ 128 // input modifier buffer sizes 672#define IMBUFSIZ 128 // input modifier buffer sizes
756#define KBUFSZ 512 // size of keyboard mapping buffer 673#define KBUFSZ 512 // size of keyboard mapping buffer
757#define CBUFSIZ 4096 // size of command buffer 674#define CBUFSIZ 2048 // size of command buffer
758#define UBUFSIZ 4096 // character buffer 675#define UBUFSIZ 2048 // character buffer
759 676
760#ifndef PATH_MAX 677#ifndef PATH_MAX
761# define PATH_MAX 16384 678# define PATH_MAX 16384
762#endif 679#endif
763 680
… …
791/* 708/*
792 ***************************************************************************** 709 *****************************************************************************
793 * MACRO DEFINES 710 * MACRO DEFINES
794 ***************************************************************************** 711 *****************************************************************************
795 */ 712 */
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 713#define dDisp Display *disp = display->display
813 714
814/* convert pixel dimensions to row/column values. Everything as int32_t */ 715/* convert pixel dimensions to row/column values. Everything as int32_t */
815#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 716#define Pixel2Col(x) Pixel2Width((int32_t)(x))
816#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 717#define Pixel2Row(y) Pixel2Height((int32_t)(y))
817#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 718#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
818#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 719#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
819#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 720#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
820#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 721#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
821#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 722#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
822#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 723#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
823 724
824#define TermWin_TotalWidth() ((int32_t)TermWin.width) 725#define OPTION(opt) (options & (opt))
825#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)]
826 735
827/* how to build & extract colors and attributes */ 736/* how to build & extract colors and attributes */
828#define GET_BASEFG(x) (((x) & RS_fgMask)) 737#define GET_BASEFG(x) (((x) & RS_fgMask))
829#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 738#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 739
848#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 740#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
849#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 741#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
850 742
851#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 743#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
864 756
865#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)))
866#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)))
867 759
868#if ENABLE_STYLES 760#if ENABLE_STYLES
869# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 761# define FONTSET(style) fontset[GET_STYLE (style)]
870#else 762#else
871# define FONTSET(style) TermWin.fontset[0] 763# define FONTSET(style) fontset[0]
872#endif 764#endif
873 765
874#ifdef HAVE_SCROLLBARS 766#ifdef HAVE_SCROLLBARS
875# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 767# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
876#else 768#else
… …
901#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 793#define scrollbar_size() (scrollBar.end - scrollBar.beg \
902 - scrollbar_minheight ()) 794 - scrollbar_minheight ())
903 795
904#if (MENUBAR_MAX > 1) 796#if (MENUBAR_MAX > 1)
905/* rendition style flags */ 797/* rendition style flags */
906# define menuBar_height() (TermWin.fheight + SHADOW) 798# define menuBar_height() (fheight + MENU_SHADOW)
907# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 799# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
908# define isMenuBarWindow(w) ((w) == menuBar.win) 800# define isMenuBarWindow(w) ((w) == menuBar.win)
909#else 801#else
910# define menuBar_height() (0) 802# define menuBar_height() (0)
911# define menuBar_TotalHeight() (0) 803# define menuBar_TotalHeight() (0)
912# define isMenuBarWindow(w) (0) 804# define isMenuBarWindow(w) (0)
… …
958#endif 850#endif
959 851
960extern class rxvt_failure_exception { } rxvt_failure_exception; 852extern class rxvt_failure_exception { } rxvt_failure_exception;
961 853
962typedef callback1<void, const char *> log_callback; 854typedef callback1<void, const char *> log_callback;
855typedef callback1<int, int> getfd_callback;
963 856
964extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 857extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
965extern void rxvt_log (const char *fmt, ...); 858extern void rxvt_log (const char *fmt, ...);
966extern void rxvt_warn (const char *fmt, ...); 859extern void rxvt_warn (const char *fmt, ...);
967extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 860extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
968extern void rxvt_exit_failure () __attribute__ ((noreturn)); 861extern void rxvt_exit_failure () __attribute__ ((noreturn));
969 862
970#define SET_LOCALE(locale) rxvt_set_locale (locale) 863#define SET_LOCALE(locale) rxvt_set_locale (locale)
971extern 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 ();
972 867
973/*
974 ***************************************************************************** 868/****************************************************************************/
975 * VARIABLES 869
976 *****************************************************************************
977 */
978#ifdef MENUBAR 870#ifdef MENUBAR
979# include "menubar.h" 871# include "menubar.h"
980#endif 872#endif
981 873
982#define BLINK_INTERVAL 0.5 874#define BLINK_INTERVAL 0.5
… …
989# endif 881# endif
990# endif 882# endif
991# define __attribute__(x) 883# define __attribute__(x)
992#endif 884#endif
993 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
994// primivite wrapper around mbstate_t to ensure initialisation 935// primivite wrapper around mbstate_t to ensure initialisation
995struct mbstate { 936struct mbstate {
996 mbstate_t mbs; 937 mbstate_t mbs;
997 938
998 operator mbstate_t *() { return &mbs; } 939 operator mbstate_t *() { return &mbs; }
999 void reset () { memset (&mbs, 0, sizeof (mbs)); } 940 void reset () { memset (&mbs, 0, sizeof (mbs)); }
1000 mbstate () { reset (); } 941 mbstate () { reset (); }
1001}; 942};
1002 943
944/****************************************************************************/
945
1003#define UNICODE_MASK 0x1fffffUL 946#define UNICODE_MASK 0x1fffffUL
1004 947
1005#if UNICODE3 948#if UNICODE3
1006# define COMPOSE_LO 0x40000000UL 949# define COMPOSE_LO 0x40000000UL
1007# define COMPOSE_HI 0x400fffffUL 950# define COMPOSE_HI 0x400fffffUL
1008# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 951# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1009#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
1010# define COMPOSE_LO 0xd800UL 957# define COMPOSE_LO 0xd800UL
1011# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 958# define COMPOSE_HI 0xf8ffUL
1012# 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)
1013#endif 961#endif
1014 962
1015#if ENABLE_COMBINING 963#if ENABLE_COMBINING
1016// compose chars are used to represent composite characters 964// compose chars are used to represent composite characters
1017// that are not representable in unicode, as well as characters 965// that are not representable in unicode, as well as characters
… …
1037}; 985};
1038 986
1039extern class rxvt_composite_vec rxvt_composite; 987extern class rxvt_composite_vec rxvt_composite;
1040#endif 988#endif
1041 989
990/****************************************************************************/
1042 991
1043#ifdef KEYSYM_RESOURCE 992#ifdef KEYSYM_RESOURCE
1044 class keyboard_manager; 993 class keyboard_manager;
1045#endif 994#endif
1046 995
1047struct rxvt_term : zero_initialized, rxvt_vars { 996struct rxvt_term : zero_initialized, rxvt_vars {
1048 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
1049 998 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
999#if ENABLE_PERL
1000 rxvt_perl_term perl;
1001#endif
1050 struct mbstate mbstate; // current input multibyte state 1002 struct mbstate mbstate; // current input multibyte state
1051 1003
1052 unsigned char want_refresh:1, 1004 unsigned char want_refresh:1,
1053#ifdef TRANSPARENT 1005#ifdef TRANSPARENT
1054 want_full_refresh:1, /* awaiting full screen refresh */ 1006 want_full_refresh:1, /* awaiting full screen refresh */
… …
1204 bar_t *CurrentBar; 1156 bar_t *CurrentBar;
1205# if ! (MENUBAR_MAX > 1) 1157# if ! (MENUBAR_MAX > 1)
1206 bar_t BarList; 1158 bar_t BarList;
1207# endif /* (MENUBAR_MAX > 1) */ 1159# endif /* (MENUBAR_MAX > 1) */
1208#endif 1160#endif
1209#ifdef CURSOR_BLINK
1210 struct timeval lastcursorchange;
1211#endif
1212#ifdef POINTER_BLANK
1213 struct timeval lastmotion;
1214#endif
1215 1161
1216#if ENABLE_OVERLAY 1162#if ENABLE_OVERLAY
1217 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1163 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1218 text_t **ov_text; 1164 text_t **ov_text;
1219 rend_t **ov_rend; 1165 rend_t **ov_rend;
… …
1223 void scr_overlay_off (); 1169 void scr_overlay_off ();
1224 void scr_overlay_set (int x, int y, 1170 void scr_overlay_set (int x, int y,
1225 text_t text, 1171 text_t text,
1226 rend_t rend = OVERLAY_RSTYLE); 1172 rend_t rend = OVERLAY_RSTYLE);
1227 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);
1228#endif 1175#endif
1229 1176
1230 vector<void *> allocated; // free these memory blocks with free() 1177 vector<void *> allocated; // free these memory blocks with free()
1231 1178
1232 char *env_windowid; /* environmental variable WINDOWID */ 1179 char *env_windowid; /* environmental variable WINDOWID */
1233 char *env_display; /* environmental variable DISPLAY */ 1180 char *env_display; /* environmental variable DISPLAY */
1234 char *env_term; /* environmental variable TERM */ 1181 char *env_term; /* environmental variable TERM */
1235 char *env_colorfgbg; 1182 char *env_colorfgbg;
1236 char *locale; 1183 char *locale;
1237 char charsets[4]; 1184 char charsets[4];
1238 unsigned char *v_buffer; /* pointer to physical buffer */ 1185 char *v_buffer; /* pointer to physical buffer */
1239 unsigned int v_buflen; /* size of area to write */ 1186 unsigned int v_buflen; /* size of area to write */
1240 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1187 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1241 1188
1242#ifdef KEYSYM_RESOURCE 1189#ifdef KEYSYM_RESOURCE
1243 keyboard_manager *keyboard; 1190 keyboard_manager *keyboard;
1244#endif 1191#endif
1245 1192
1246 const char *rs[NUM_RESOURCES]; 1193 const char *rs[NUM_RESOURCES];
1247 /* command input buffering */ 1194 /* command input buffering */
1248 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1195 char *cmdbuf_ptr, *cmdbuf_endp;
1249 unsigned char cmdbuf_base[CBUFSIZ]; 1196 char cmdbuf_base[CBUFSIZ];
1250 1197
1251 rxvt_salloc *talloc; // text line allocator 1198 rxvt_salloc *talloc; // text line allocator
1252 rxvt_salloc *ralloc; // rend line allocator 1199 rxvt_salloc *ralloc; // rend line allocator
1253 1200
1254 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
… …
1257 // ISO 14755 entry support 1204 // ISO 14755 entry support
1258 unicode_t iso14755buf; 1205 unicode_t iso14755buf;
1259 void commit_iso14755 (); 1206 void commit_iso14755 ();
1260 int hex_keyval (XKeyEvent &ev); 1207 int hex_keyval (XKeyEvent &ev);
1261# if ISO_14755 1208# if ISO_14755
1262 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);
1263 void iso14755_54 (int x, int y); 1210 void iso14755_54 (int x, int y);
1264# endif 1211# endif
1265#endif 1212#endif
1266 1213
1267 // modifies first argument(!) 1214 // modifies first argument(!)
1268 void paste (unsigned char *data, unsigned int len); 1215 void paste (char *data, unsigned int len);
1269 1216
1270 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 }
1271 1223
1272#if TRANSPARENT 1224#if TRANSPARENT
1273 void rootwin_cb (XEvent &xev); 1225 void rootwin_cb (XEvent &xev);
1274 xevent_watcher rootwin_ev; 1226 xevent_watcher rootwin_ev;
1275#endif 1227#endif
1276 1228
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
1281 void x_cb (XEvent &xev); 1229 void x_cb (XEvent &xev);
1230 void flush ();
1282 xevent_watcher termwin_ev; 1231 xevent_watcher termwin_ev;
1283 xevent_watcher vt_ev; 1232 xevent_watcher vt_ev;
1284#ifdef HAVE_SCROLLBARS 1233#ifdef HAVE_SCROLLBARS
1285 xevent_watcher scrollbar_ev; 1234 xevent_watcher scrollbar_ev;
1286#endif 1235#endif
… …
1318 void pointer_blank (); 1267 void pointer_blank ();
1319#endif 1268#endif
1320 void pointer_unblank (); 1269 void pointer_unblank ();
1321 1270
1322 void tt_printf (const char *fmt,...); 1271 void tt_printf (const char *fmt,...);
1323 void tt_write (const unsigned char *data, unsigned int len); 1272 void tt_write (const char *data, unsigned int len);
1324 void pty_write (); 1273 void pty_write ();
1325 1274
1326 void tt_winch (); 1275 void tt_winch ();
1327 1276
1328 rxvt_term (); 1277 rxvt_term ();
1329 ~rxvt_term (); 1278 ~rxvt_term ();
1279 void child_exit (); // child has exited, usually destroys
1330 void destroy (); 1280 void destroy ();
1331 void emergency_cleanup (); 1281 void emergency_cleanup ();
1332 1282
1333 bool init (int argc, const char *const *argv); 1283 bool init (int argc, const char *const *argv);
1334 bool init_vars (); 1284 bool init_vars ();
1335 1285
1336 bool pty_fill (); 1286 bool pty_fill ();
1337 1287
1338 void init_secondary (); 1288 void init_secondary ();
1339 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);
1340 void init_env (); 1291 void init_env ();
1341 void set_locale (const char *locale); 1292 void set_locale (const char *locale);
1342 void init_xlocale (); 1293 void init_xlocale ();
1343 void init_command (const char *const *argv); 1294 void init_command (const char *const *argv);
1344 void run_command (const char *const *argv); 1295 void run_command (const char *const *argv);
1345 int run_child (const char *const *argv); 1296 int run_child (const char *const *argv);
1346 1297
1347 void color_aliases (int idx); 1298 void color_aliases (int idx);
1348 void recolour_cursor (); 1299 void recolour_cursor ();
1349 void create_windows (int argc, const char *const *argv); 1300 void create_windows (int argc, const char *const *argv);
1350 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);
1351 void window_calc (unsigned int width, unsigned int height); 1302 void window_calc (unsigned int newwidth, unsigned int newheight);
1352 1303
1353#if USE_XIM 1304#if USE_XIM
1354 rxvt_xim *input_method; 1305 rxvt_xim *input_method;
1355 XIC Input_Context; 1306 XIC Input_Context;
1356 XIMStyle input_style; 1307 XIMStyle input_style;
… …
1379 1330
1380 /* autoconvert */ 1331 /* autoconvert */
1381 1332
1382 // command.C 1333 // command.C
1383 void lookup_key (XKeyEvent &ev); 1334 void lookup_key (XKeyEvent &ev);
1384 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1335 unsigned int cmd_write (const char *str, unsigned int count);
1385 1336
1386 unicode_t next_char (); 1337 wchar_t next_char ();
1387 unicode_t cmd_getc (); 1338 wchar_t cmd_getc ();
1388 unicode_t next_octet (); 1339 uint32_t next_octet ();
1389 unicode_t cmd_get8 (); 1340 uint32_t cmd_get8 ();
1390 1341
1391 bool cmd_parse (); 1342 bool cmd_parse ();
1392 void mouse_report (XButtonEvent &ev); 1343 void mouse_report (XButtonEvent &ev);
1393 void button_press (XButtonEvent &ev); 1344 void button_press (XButtonEvent &ev);
1394 void button_release (XButtonEvent &ev); 1345 void button_release (XButtonEvent &ev);
… …
1403 void process_nonprinting (unicode_t ch); 1354 void process_nonprinting (unicode_t ch);
1404 void process_escape_vt52 (unicode_t ch); 1355 void process_escape_vt52 (unicode_t ch);
1405 void process_escape_seq (); 1356 void process_escape_seq ();
1406 void process_csi_seq (); 1357 void process_csi_seq ();
1407 void process_window_ops (const int *args, unsigned int nargs); 1358 void process_window_ops (const int *args, unsigned int nargs);
1408 unsigned char *get_to_st (unicode_t &ends_how); 1359 char *get_to_st (unicode_t &ends_how);
1409 void process_dcs_seq (); 1360 void process_dcs_seq ();
1410 void process_osc_seq (); 1361 void process_osc_seq ();
1411 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);
1412 void process_xterm_seq (int op, const char *str, unsigned char resp); 1363 void process_xterm_seq (int op, const char *str, char resp);
1413 int privcases (int mode, unsigned long bit); 1364 int privcases (int mode, unsigned long bit);
1414 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);
1415 void process_sgr_mode (unsigned int nargs, const int *arg); 1366 void process_sgr_mode (unsigned int nargs, const int *arg);
1416 void process_graphics (); 1367 void process_graphics ();
1417 // init.C 1368 // init.C
… …
1428 void set_title (const char *str); 1379 void set_title (const char *str);
1429 void set_icon_name (const char *str); 1380 void set_icon_name (const char *str);
1430 void set_window_color (int idx, const char *color); 1381 void set_window_color (int idx, const char *color);
1431 void set_colorfgbg (); 1382 void set_colorfgbg ();
1432 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1383 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1433 void set_widthheight (unsigned int width, unsigned int height); 1384 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1434 1385
1435#ifdef MENUBAR 1386#ifdef MENUBAR
1436 // menubar.C 1387 // menubar.C
1437 void menuitem_free (menu_t *menu, menuitem_t *item); 1388 void menuitem_free (menu_t *menu, menuitem_t *item);
1438 int action_dispatch (action_t *action); 1389 int action_dispatch (action_t *action);
… …
1464 void menubar_control (XButtonEvent &ev); 1415 void menubar_control (XButtonEvent &ev);
1465 void map_menuBar (int map); 1416 void map_menuBar (int map);
1466#endif 1417#endif
1467 1418
1468 // screen.C 1419 // screen.C
1469 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1420
1470 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);
1471 int scr_scroll_text (int row1, int row2, int count, int spec); 1492 int scr_scroll_text (int row1, int row2, int count);
1472 void scr_reset (); 1493 void scr_reset ();
1473 void scr_reset_realloc ();
1474 void scr_release (); 1494 void scr_release ();
1475 void scr_clear (bool really = false); 1495 void scr_clear (bool really = false);
1476 void scr_refresh (unsigned char refresh_type); 1496 void scr_refresh (unsigned char refresh_type);
1477 bool scr_refresh_rend (rend_t mask, rend_t value); 1497 bool scr_refresh_rend (rend_t mask, rend_t value);
1478 void scr_erase_screen (int mode); 1498 void scr_erase_screen (int mode);
… …
1484 void scr_touch (bool refresh); 1504 void scr_touch (bool refresh);
1485 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);
1486 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1506 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1487 void scr_recolour (); 1507 void scr_recolour ();
1488 void scr_remap_chars (); 1508 void scr_remap_chars ();
1489 void scr_remap_chars (text_t *tp, rend_t *rp); 1509 void scr_remap_chars (line_t &l);
1490 1510
1491 void scr_poweron (); 1511 void scr_poweron ();
1492 void scr_cursor (int mode); 1512 void scr_cursor (int mode);
1493 void scr_do_wrap (); 1513 void scr_do_wrap ();
1494 int scr_change_screen (int scrn); 1514 int scr_change_screen (int scrn);
1495 void scr_color (unsigned int color, int fgbg); 1515 void scr_color (unsigned int color, int fgbg);
1496 void scr_rendition (int set, int style); 1516 void scr_rendition (int set, int style);
1497 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);
1498 void scr_backspace (); 1518 void scr_backspace ();
1499 void scr_tab (int count, bool ht = false); 1519 void scr_tab (int count, bool ht = false);
1500 void scr_gotorc (int row, int col, int relative); 1520 void scr_gotorc (int row, int col, int relative);
1501 void scr_index (enum page_dirn direction); 1521 void scr_index (enum page_dirn direction);
1502 void scr_erase_line (int mode); 1522 void scr_erase_line (int mode);
… …
1517 int scr_move_to (int y, int len); 1537 int scr_move_to (int y, int len);
1518 int scr_page (enum page_dirn direction, int nlines); 1538 int scr_page (enum page_dirn direction, int nlines);
1519 int scr_changeview (unsigned int oldviewstart); 1539 int scr_changeview (unsigned int oldviewstart);
1520 void scr_bell (); 1540 void scr_bell ();
1521 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);
1522 void scr_reverse_selection (); 1544 void scr_reverse_selection ();
1523 void scr_dump (int fd); 1545 void scr_dump (int fd);
1524 void selection_check (int check_more); 1546 void selection_check (int check_more);
1525 void selection_paste (Window win, Atom prop, bool delete_prop); 1547 void selection_paste (Window win, Atom prop, bool delete_prop);
1526 void selection_property (Window win, Atom prop); 1548 void selection_property (Window win, Atom prop);
1527 void selection_request (Time tm, int x, int y); 1549 void selection_request (Time tm, int x, int y);
1528 int selection_request_other (Atom target, int selnum); 1550 int selection_request_other (Atom target, int selnum);
1529 void selection_clear (); 1551 void selection_clear ();
1530 void selection_make (Time tm); 1552 void selection_make (Time tm);
1553 bool selection_grab (Time tm);
1531 void selection_start_colrow (int col, int row); 1554 void selection_start_colrow (int col, int row);
1532 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);
1533 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);
1534 void selection_remove_trailing_spaces (); 1557 void selection_remove_trailing_spaces ();
1535 void selection_send (const XSelectionRequestEvent &rq); 1558 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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