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.159 by root, Fri Aug 5 16:42:44 2005 UTC vs.
Revision 1.205 by root, Mon Jan 16 06:37:52 2006 UTC

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

Diff Legend

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