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.150 by root, Sat Feb 19 01:07:58 2005 UTC vs.
Revision 1.196 by root, Wed Jan 11 02:13:56 2006 UTC

… …
19#include "rxvtfont.h" 19#include "rxvtfont.h"
20#include "rxvttoolkit.h" 20#include "rxvttoolkit.h"
21#include "iom.h" 21#include "iom.h"
22#include "salloc.h" 22#include "salloc.h"
23 23
24#include "rxvtperl.h"
25
24#if ENABLE_FRILLS 26#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 27# define ENABLE_XEMBED 1
28# define ENABLE_EWMH 1
29# define CURSOR_BLINK 1
26#endif 30#endif
27 31
28/* 32/*
29 ***************************************************************************** 33 *****************************************************************************
30 * SYSTEM HACKS 34 * SYSTEM HACKS
… …
68 72
69#ifndef STDIN_FILENO 73#ifndef STDIN_FILENO
70# define STDIN_FILENO 0 74# define STDIN_FILENO 0
71# define STDOUT_FILENO 1 75# define STDOUT_FILENO 1
72# define STDERR_FILENO 2 76# define STDERR_FILENO 2
73#endif
74
75#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
76# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
77# define NO_SETOWNER_TTYDEV 1
78# endif
79#endif
80#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
81# define NO_SETOWNER_TTYDEV 1
82#endif 77#endif
83 78
84/* 79/*
85 ***************************************************************************** 80 *****************************************************************************
86 * PROTOTYPES 81 * PROTOTYPES
… …
116char ** rxvt_splitcommastring (const char *cs); 111char ** rxvt_splitcommastring (const char *cs);
117void rxvt_freecommastring (char **cs); 112void rxvt_freecommastring (char **cs);
118char * rxvt_File_find (const char *file, const char *ext, const char *path); 113char * rxvt_File_find (const char *file, const char *ext, const char *path);
119void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 114void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
120void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 115void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
116void rxvt_usleep (int usecs);
121 117
122/* 118/*
123 ***************************************************************************** 119 *****************************************************************************
124 * STRUCTURES AND TYPEDEFS 120 * STRUCTURES AND TYPEDEFS
125 ***************************************************************************** 121 *****************************************************************************
… …
135#endif 131#endif
136 132
137/* If we're using either the rxvt scrollbar or menu bars, keep the 133/* If we're using either the rxvt scrollbar or menu bars, keep the
138 * scrollColor resource. 134 * scrollColor resource.
139 */ 135 */
140#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 136#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
141# define KEEP_SCROLLCOLOR 1 137# define KEEP_SCROLLCOLOR 1
142#else 138#else
143# undef KEEP_SCROLLCOLOR 139# undef KEEP_SCROLLCOLOR
144#endif 140#endif
145 141
… …
159 Time time; /* milliseconds */ 155 Time time; /* milliseconds */
160 unsigned int state; /* key or button mask */ 156 unsigned int state; /* key or button mask */
161 unsigned int button; /* detail */ 157 unsigned int button; /* detail */
162}; 158};
163 159
164#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
165#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
166#define SWAP_IT(one, two, typeof) \
167 do { \
168 typeof swapittmp; \
169 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
170 } while (/* CONSTCOND */ 0)
171#define BOUND_POSITIVE_INT16(val) \
172 (int16_t) ((val) <= 0 \
173 ? 0 \
174 : min ((val), (((uint16_t)-1)>>1)))
175
176#if ENABLE_FRILLS 160#if ENABLE_FRILLS
177typedef struct _mwmhints { 161typedef struct _mwmhints {
178 CARD32 flags; 162 CARD32 flags;
179 CARD32 functions; 163 CARD32 functions;
180 CARD32 decorations; 164 CARD32 decorations;
… …
202 186
203// XEMBED detail code 187// XEMBED detail code
204# define XEMBED_FOCUS_CURRENT 0 188# define XEMBED_FOCUS_CURRENT 0
205# define XEMBED_FOCUS_FIRST 1 189# define XEMBED_FOCUS_FIRST 1
206# define XEMBED_FOCUS_LAST 2 190# define XEMBED_FOCUS_LAST 2
191
192# define XEMBED_MAPPED (1 << 0)
207#endif 193#endif
208 194
209/* 195/*
210 ***************************************************************************** 196 *****************************************************************************
211 * NORMAL DEFINES 197 * NORMAL DEFINES
… …
225 211
226#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
227# define NO_MOUSE_REPORT_SCROLLBAR 1 213# define NO_MOUSE_REPORT_SCROLLBAR 1
228#endif 214#endif
229 215
230#ifdef NO_RESOURCES 216#if defined (ISO_14755) || defined (ENABLE_PERL)
231# undef USE_XGETDEFAULT
232#endif
233
234#if ISO_14755
235# define ENABLE_OVERLAY 1 217# define ENABLE_OVERLAY 1
236#endif 218#endif
237 219
238/* now look for other badly set stuff */ 220/* now look for other badly set stuff */
239 221
… …
254# define HAVE_SCROLLBARS 1 236# define HAVE_SCROLLBARS 1
255#endif 237#endif
256 238
257/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 239/* width of scrollBar, menuBar shadow, must be 1 or 2 */
258#ifdef HALFSHADOW 240#ifdef HALFSHADOW
259# define SHADOW 1 241# define MENU_SHADOW 1
260#else 242#else
261# define SHADOW 2 243# define MENU_SHADOW 2
262#endif 244#endif
263 245
264#define R_SB_ALIGN_CENTRE 0 246#define R_SB_ALIGN_CENTRE 0
265#define R_SB_ALIGN_TOP 1 247#define R_SB_ALIGN_TOP 1
266#define R_SB_ALIGN_BOTTOM 2 248#define R_SB_ALIGN_BOTTOM 2
267 249
268#define R_SB_RXVT 0
269#define R_SB_NEXT 1 250#define R_SB_NEXT 1
270#define R_SB_XTERM 2 251#define R_SB_XTERM 2
271#define R_SB_PLAIN 4 252#define R_SB_PLAIN 4
253#define R_SB_RXVT 8
272 254
273#define SB_WIDTH_NEXT 19 255#define SB_WIDTH_NEXT 19
274#define SB_WIDTH_XTERM 15 256#define SB_WIDTH_XTERM 15
275#define SB_WIDTH_PLAIN 7 257#define SB_WIDTH_PLAIN 7
276#ifndef SB_WIDTH_RXVT 258#ifndef SB_WIDTH_RXVT
… …
358#define FONT_DN "#-" 340#define FONT_DN "#-"
359#define FONT_UP "#+" 341#define FONT_UP "#+"
360 342
361/* flags for rxvt_scr_gotorc () */ 343/* flags for rxvt_scr_gotorc () */
362enum { 344enum {
363 C_RELATIVE = 1 , /* col movement is relative */ 345 C_RELATIVE = 1, /* col movement is relative */
364 R_RELATIVE = 2, /* row movement is relative */ 346 R_RELATIVE = 2, /* row movement is relative */
365 RELATIVE = 1 | 2, 347 RELATIVE = C_RELATIVE | R_RELATIVE,
366}; 348};
367 349
368/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 350/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
369enum { 351enum {
370 INSERT = -1, /* don't change these values */ 352 INSERT = -1, /* don't change these values */
… …
383enum { 365enum {
384 PRIMARY = 0, 366 PRIMARY = 0,
385 SECONDARY, 367 SECONDARY,
386}; 368};
387 369
388#define RS_None 0 /* Normal */ 370#define RS_None 0
389 371
390#define RS_fgMask 0x0000007fUL /* 128 colors */ 372#define RS_fgMask 0x0000007fUL // 128 colors
391#define RS_bgMask 0x00003f80UL /* 128 colors */ 373#define RS_bgMask 0x00003f80UL // 128 colors
392 374
393// font styles 375// font styles
394#define RS_Bold 0x00004000UL // value 1 376#define RS_Bold 0x00004000UL // value 1
395#define RS_Italic 0x00008000UL // value 2 377#define RS_Italic 0x00008000UL // value 2
396 378
397// fake styles 379// fake styles
398#define RS_Blink 0x00010000UL /* blink */ 380#define RS_Blink 0x00010000UL // blink
399#define RS_RVid 0x00020000UL /* reverse video */ 381#define RS_RVid 0x00020000UL // reverse video
400#define RS_Uline 0x00040000UL /* underline */ 382#define RS_Uline 0x00040000UL // underline
401 383
402// 5 bits still to go 384// 5 custom bits for extensions
385#define RS_customCount 32
386#define RS_customMask 0x00f80000UL
387#define RS_customShift 19
403 388
404// other flags 389// other flags
405#define RS_Careful 0x80000000UL /* be careful when drawing these */ 390#define RS_Careful 0x80000000UL /* be careful when drawing these */
406 391
407#define RS_styleCount 4 392#define RS_styleCount 4
… …
469 XTerm_Color_UL = 19, // change actual 'Underline' color 454 XTerm_Color_UL = 19, // change actual 'Underline' color
470 XTerm_Pixmap = 20, // new bg pixmap 455 XTerm_Pixmap = 20, // new bg pixmap
471 XTerm_restoreFG = 39, // change default fg color 456 XTerm_restoreFG = 39, // change default fg color
472 XTerm_restoreBG = 49, // change default bg color 457 XTerm_restoreBG = 49, // change default bg color
473 XTerm_dumpscreen = 55, // dump scrollback and all of screen 458 XTerm_dumpscreen = 55, // dump scrollback and all of screen
459
474 XTerm_locale = 701, // change locale 460 URxvt_locale = 701, // change locale
475 XTerm_Menu = 703, // set menu item 461 URxvt_Menu = 703, // set menu item
476 XTerm_Color_IT = 704, // change actual 'Italic' colour 462 URxvt_Color_IT = 704, // change actual 'Italic' colour
477 XTerm_Color_tint = 705, // change actual tint colour 463 URxvt_Color_tint = 705, // change actual tint colour
478 464
479 URxvt_font = 710, 465 URxvt_font = 710,
480 URxvt_boldFont = 711, 466 URxvt_boldFont = 711,
481 URxvt_italicFont = 712, 467 URxvt_italicFont = 712,
482 URxvt_boldItalicFont = 713, 468 URxvt_boldItalicFont = 713,
469
470 URxvt_view_up = 720,
471 URxvt_view_down = 721,
472
473 URxvt_perl = 777,
483}; 474};
484 475
485/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
486/* 477/*
487 * The following comment is mostly obsolete since pixcolor_set was expanded:
488 * We're currently upto 29 colours. Only 3 more available. The
489 * PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
490 * on the unnecessary items, e.g. Color_pointer, but won't bother 479 * on the unnecessary items, e.g. Color_pointer, but won't bother
491 * until we need to. Also, be aware of usage in pixcolor_set 480 * until we need to. Also, be aware of usage in pixcolor_set
492 */ 481 */
493 482
494enum colour_list { 483enum colour_list {
… …
544 Color_trough, 533 Color_trough,
545#endif 534#endif
546#if TINTING 535#if TINTING
547 Color_tint, 536 Color_tint,
548#endif 537#endif
538#if OFF_FOCUS_FADING
539 Color_fade,
540#endif
549 NRS_COLORS, /* */ 541 NRS_COLORS, /* */
550#ifdef KEEP_SCROLLCOLOR 542#ifdef KEEP_SCROLLCOLOR
551 Color_topShadow = NRS_COLORS, 543 Color_topShadow = NRS_COLORS,
552 Color_bottomShadow, 544 Color_bottomShadow,
553 TOTAL_COLORS 545 TOTAL_COLORS
… …
563 555
564/* 556/*
565 * Resource list 557 * Resource list
566 */ 558 */
567enum { 559enum {
568 Rs_display_name = 0, 560# define def(name) Rs_ ## name,
569 Rs_term_name, 561# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
570 Rs_iconName, 562# include "rsinc.h"
571 Rs_geometry, 563# undef def
572 Rs_reverseVideo, 564# undef reserve
573 Rs_color,
574 _Rs_color = Rs_color + NRS_COLORS - 1,
575 Rs_font,
576#if ENABLE_STYLES
577 Rs_boldFont,
578 Rs_italicFont,
579 Rs_boldItalicFont,
580#endif
581 Rs_name,
582 Rs_title,
583#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
584 Rs_path,
585#endif
586#ifdef XPM_BACKGROUND
587 Rs_backgroundPixmap,
588#endif
589#if (MENUBAR_MAX)
590 Rs_menu,
591#endif
592 Rs_loginShell,
593 Rs_jumpScroll,
594#ifdef HAVE_SCROLLBARS
595 Rs_scrollBar,
596 Rs_scrollBar_right,
597 Rs_scrollBar_floating,
598 Rs_scrollBar_align,
599 Rs_scrollstyle, /* Rs_scrollBar_style */
600 Rs_scrollBar_thickness,
601#endif
602 Rs_scrollTtyOutput,
603 Rs_scrollTtyKeypress,
604 Rs_scrollWithBuffer,
605 Rs_saveLines,
606 Rs_utmpInhibit,
607 Rs_visualBell,
608#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
609 Rs_mapAlert,
610#endif
611#ifdef META8_OPTION
612 Rs_meta8,
613#endif
614#ifdef MOUSE_WHEEL
615 Rs_mouseWheelScrollPage,
616#endif
617#ifndef NO_BACKSPACE_KEY
618 Rs_backspace_key,
619#endif
620#ifndef NO_DELETE_KEY
621 Rs_delete_key,
622#endif
623 Rs_selectstyle,
624#ifdef PRINTPIPE
625 Rs_print_pipe,
626#endif
627#ifdef USE_XIM
628 Rs_preeditType,
629 Rs_inputMethod,
630#endif
631#ifdef TRANSPARENT
632 Rs_transparent,
633 Rs_transparent_all,
634#endif
635#if ENABLE_FRILLS
636 Rs_ext_bwidth,
637 Rs_int_bwidth,
638 Rs_borderLess,
639 Rs_lineSpace,
640 Rs_pty_fd,
641#endif
642#if ENABLE_XEMBED
643 Rs_embed,
644#endif
645 Rs_cutchars,
646 Rs_modifier,
647 Rs_answerbackstring,
648 Rs_tripleclickwords,
649 Rs_insecure,
650 Rs_cursorBlink,
651 Rs_pointerBlank,
652 Rs_pointerBlankDelay,
653 Rs_imLocale,
654 Rs_imFont,
655 Rs_pastableTabs,
656#ifndef NO_SECONDARY_SCREEN
657 Rs_secondaryScreen,
658 Rs_secondaryScroll,
659#endif
660#ifdef OFF_FOCUS_FADING
661 Rs_fade,
662#endif
663#ifdef TINTING
664 Rs_shade,
665#endif
666 NUM_RESOURCES 565 NUM_RESOURCES
667}; 566};
668 567
669// see init.C:xa_names, which must be kept in sync 568// see init.C:xa_names, which must be kept in sync
670enum { 569enum {
… …
678 XA_INCR, 577 XA_INCR,
679 XA_WM_PROTOCOLS, 578 XA_WM_PROTOCOLS,
680 XA_WM_DELETE_WINDOW, 579 XA_WM_DELETE_WINDOW,
681 XA_CLIPBOARD, 580 XA_CLIPBOARD,
682#if ENABLE_FRILLS 581#if ENABLE_FRILLS
582 XA_MOTIF_WM_HINTS,
583#endif
584#if ENABLE_EWMH
683 XA_NET_WM_PID, 585 XA_NET_WM_PID,
684 XA_MOTIF_WM_HINTS,
685 XA_NET_WM_NAME, 586 XA_NET_WM_NAME,
686 XA_NET_WM_ICON_NAME, 587 XA_NET_WM_ICON_NAME,
588 XA_NET_WM_PING,
687#endif 589#endif
688#if USE_XIM 590#if USE_XIM
689 XA_WM_LOCALE_NAME, 591 XA_WM_LOCALE_NAME,
690#endif 592#endif
691#if TRANSPARENT 593#if TRANSPARENT
… …
696 XA_DNDPROTOCOL, 598 XA_DNDPROTOCOL,
697 XA_DNDSELECTION, 599 XA_DNDSELECTION,
698#endif 600#endif
699#if ENABLE_XEMBED 601#if ENABLE_XEMBED
700 XA_XEMBED, 602 XA_XEMBED,
603 XA_XEMBED_INFO,
701#endif 604#endif
702 NUM_XA 605 NUM_XA
703}; 606};
704 607
705/* DEC private modes */ 608/* DEC private modes */
… …
741#endif 644#endif
742 645
743// do not change these constants lightly, there are many interdependencies 646// do not change these constants lightly, there are many interdependencies
744#define IMBUFSIZ 128 // input modifier buffer sizes 647#define IMBUFSIZ 128 // input modifier buffer sizes
745#define KBUFSZ 512 // size of keyboard mapping buffer 648#define KBUFSZ 512 // size of keyboard mapping buffer
746#define CBUFSIZ 4096 // size of command buffer 649#define CBUFSIZ 2048 // size of command buffer
747#define UBUFSIZ 4096 // character buffer 650#define UBUFSIZ 2048 // character buffer
748 651
749#ifndef PATH_MAX 652#ifndef PATH_MAX
750# define PATH_MAX 16384 653# define PATH_MAX 16384
751#endif 654#endif
752 655
… …
780/* 683/*
781 ***************************************************************************** 684 *****************************************************************************
782 * MACRO DEFINES 685 * MACRO DEFINES
783 ***************************************************************************** 686 *****************************************************************************
784 */ 687 */
785#define memset(x, y, z) memset((x), (y), (size_t)(z))
786#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
787#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
788#define strcasecmp(x, y) strcasecmp((x), (y))
789#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
790#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
791#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
792#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
793#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
794#define strcat(x, y) strcat((char *)(x), (const char *)(y))
795#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
796#define strdup(x) strdup((const char *)(x))
797#define strlen(x) strlen((const char *)(x))
798#define strchr(x, y) strchr((const char *)(x), (int)(y))
799#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
800
801#define dDisp Display *disp = display->display 688#define dDisp Display *disp = display->display
802 689
803/* convert pixel dimensions to row/column values. Everything as int32_t */ 690/* convert pixel dimensions to row/column values. Everything as int32_t */
804#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 691#define Pixel2Col(x) Pixel2Width((int32_t)(x))
805#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 692#define Pixel2Row(y) Pixel2Height((int32_t)(y))
806#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 693#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
807#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 694#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
808#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 695#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
809#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 696#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
810#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 697#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
811#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 698#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
812 699
813#define TermWin_TotalWidth() ((int32_t)TermWin.width) 700#define TEMP_ENV temp_environ temp_environ (envv)
814#define TermWin_TotalHeight() ((int32_t)TermWin.height) 701
702#define OPTION(opt) (options & (opt))
703#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
704 | Opt_jumpScroll | Opt_secondaryScreen \
705 | Opt_pastableTabs | Opt_intensityStyles)
706
707// for m >= -n, ensure remainder lies between 0..n-1
708#define MOD(m,n) (((m) + (n)) % (n))
709
710#define LINENO(n) MOD (term_start + int(n), total_rows)
711#define ROW(n) row_buf [LINENO (n)]
815 712
816/* how to build & extract colors and attributes */ 713/* how to build & extract colors and attributes */
817#define GET_BASEFG(x) (((x) & RS_fgMask)) 714#define GET_BASEFG(x) (((x) & RS_fgMask))
818#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 715#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
819#ifndef NO_BRIGHTCOLOR
820# define GET_FGCOLOR(x) \
821 ((((x) & RS_Bold) == 0 \
822 || GET_BASEFG (x) < minCOLOR \
823 || GET_BASEFG (x) >= minBrightCOLOR) \
824 ? GET_BASEFG (x) \
825 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
826# define GET_BGCOLOR(x) \
827 ((((x) & RS_Blink) == 0 \
828 || GET_BASEBG (x) < minCOLOR \
829 || GET_BASEBG (x) >= minBrightCOLOR) \
830 ? GET_BASEBG (x) \
831 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
832#else
833# define GET_FGCOLOR(x) GET_BASEFG(x)
834# define GET_BGCOLOR(x) GET_BASEBG(x)
835#endif
836 716
837#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 717#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
838#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 718#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
839 719
840#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 720#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
853 733
854#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
855#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
856 736
857#if ENABLE_STYLES 737#if ENABLE_STYLES
858# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
859#else 739#else
860# define FONTSET(style) TermWin.fontset[0] 740# define FONTSET(style) fontset[0]
861#endif 741#endif
862 742
863#ifdef HAVE_SCROLLBARS 743#ifdef HAVE_SCROLLBARS
864# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 744# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
865#else 745#else
… …
890#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 770#define scrollbar_size() (scrollBar.end - scrollBar.beg \
891 - scrollbar_minheight ()) 771 - scrollbar_minheight ())
892 772
893#if (MENUBAR_MAX > 1) 773#if (MENUBAR_MAX > 1)
894/* rendition style flags */ 774/* rendition style flags */
895# define menuBar_height() (TermWin.fheight + SHADOW) 775# define menuBar_height() (fheight + MENU_SHADOW)
896# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 776# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
897# define isMenuBarWindow(w) ((w) == menuBar.win) 777# define isMenuBarWindow(w) ((w) == menuBar.win)
898#else 778#else
899# define menuBar_height() (0) 779# define menuBar_height() (0)
900# define menuBar_TotalHeight() (0) 780# define menuBar_TotalHeight() (0)
901# define isMenuBarWindow(w) (0) 781# define isMenuBarWindow(w) (0)
… …
947#endif 827#endif
948 828
949extern class rxvt_failure_exception { } rxvt_failure_exception; 829extern class rxvt_failure_exception { } rxvt_failure_exception;
950 830
951typedef callback1<void, const char *> log_callback; 831typedef callback1<void, const char *> log_callback;
832typedef callback1<int, int> getfd_callback;
952 833
953extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 834extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
954extern void rxvt_log (const char *fmt, ...); 835extern void rxvt_log (const char *fmt, ...);
955extern void rxvt_warn (const char *fmt, ...); 836extern void rxvt_warn (const char *fmt, ...);
956extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 837extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
957extern void rxvt_exit_failure () __attribute__ ((noreturn)); 838extern void rxvt_exit_failure () __attribute__ ((noreturn));
958 839
959#define SET_LOCALE(locale) rxvt_set_locale (locale) 840#define SET_LOCALE(locale) rxvt_set_locale (locale)
960extern bool rxvt_set_locale (const char *locale); 841extern bool rxvt_set_locale (const char *locale);
842extern void rxvt_push_locale (const char *locale);
843extern void rxvt_pop_locale ();
961 844
962/*
963 ***************************************************************************** 845/****************************************************************************/
964 * VARIABLES 846
965 *****************************************************************************
966 */
967#ifdef MENUBAR 847#ifdef MENUBAR
968# include "menubar.h" 848# include "menubar.h"
969#endif 849#endif
970 850
971#define BLINK_INTERVAL 0.5 851#define BLINK_INTERVAL 0.5
… …
978# endif 858# endif
979# endif 859# endif
980# define __attribute__(x) 860# define __attribute__(x)
981#endif 861#endif
982 862
863/****************************************************************************/
864
865#define LINE_LONGER 0x0001 // line is continued on the next row
866#define LINE_FILTERED 0x0002 // line has been filtered
867#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
868
869struct line_t {
870 text_t *t; // terminal the text
871 rend_t *r; // rendition, uses RS_ flags
872 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
873 uint32_t f; // flags
874
875 bool is_longer ()
876 {
877 return f & LINE_LONGER;
878 }
879
880 void is_longer (int set)
881 {
882 if (set)
883 f |= LINE_LONGER;
884 else
885 f &= ~LINE_LONGER;
886 }
887
888 void clear ()
889 {
890 t = 0;
891 r = 0;
892 l = 0;
893 f = 0;
894 }
895
896 void touch () // call whenever a line is changed/touched/updated
897 {
898#if ENABLE_PERL
899 f &= ~LINE_FILTERED;
900#endif
901 }
902
903 void touch (int col)
904 {
905 max_it (l, col);
906 touch ();
907 }
908};
909
910/****************************************************************************/
911
983// primivite wrapper around mbstate_t to ensure initialisation 912// primivite wrapper around mbstate_t to ensure initialisation
984struct mbstate { 913struct mbstate {
985 mbstate_t mbs; 914 mbstate_t mbs;
986 915
987 operator mbstate_t *() { return &mbs; } 916 operator mbstate_t *() { return &mbs; }
988 void reset () { memset (&mbs, 0, sizeof (mbs)); } 917 void reset () { memset (&mbs, 0, sizeof (mbs)); }
989 mbstate () { reset (); } 918 mbstate () { reset (); }
990}; 919};
991 920
921/****************************************************************************/
922
992#define UNICODE_MASK 0x1fffffUL 923#define UNICODE_MASK 0x1fffffUL
993 924
994#if UNICODE3 925#if UNICODE3
995# define COMPOSE_LO 0x40000000UL 926# define COMPOSE_LO 0x40000000UL
996# define COMPOSE_HI 0x400fffffUL 927# define COMPOSE_HI 0x400fffffUL
997# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 928# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
998#else 929#else
930# if ENABLE_PERL
931# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
932# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
933# else
999# define COMPOSE_LO 0xd800UL 934# define COMPOSE_LO 0xd800UL
1000# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 935# define COMPOSE_HI 0xf8ffUL
1001# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 936# endif
937# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1002#endif 938#endif
1003 939
1004#if ENABLE_COMBINING 940#if ENABLE_COMBINING
1005// compose chars are used to represent composite characters 941// compose chars are used to represent composite characters
1006// that are not representable in unicode, as well as characters 942// that are not representable in unicode, as well as characters
… …
1026}; 962};
1027 963
1028extern class rxvt_composite_vec rxvt_composite; 964extern class rxvt_composite_vec rxvt_composite;
1029#endif 965#endif
1030 966
967/****************************************************************************/
1031 968
1032#ifdef KEYSYM_RESOURCE 969#ifdef KEYSYM_RESOURCE
1033 class keyboard_manager; 970 class keyboard_manager;
1034#endif 971#endif
1035 972
1036struct rxvt_term : zero_initialized, rxvt_vars { 973struct rxvt_term : zero_initialized, rxvt_vars {
1037 log_callback *log_hook; // log error messages through this hook, if != 0 974 log_callback *log_hook; // log error messages through this hook, if != 0
1038 975 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
976#if ENABLE_PERL
977 rxvt_perl_term perl;
978#endif
1039 struct mbstate mbstate; // current input multibyte state 979 struct mbstate mbstate; // current input multibyte state
1040 980
1041 unsigned char want_refresh:1, 981 unsigned char want_refresh:1,
1042#ifdef TRANSPARENT 982#ifdef TRANSPARENT
1043 want_full_refresh:1, /* awaiting full screen refresh */ 983 want_full_refresh:1, /* awaiting full screen refresh */
… …
1193 bar_t *CurrentBar; 1133 bar_t *CurrentBar;
1194# if ! (MENUBAR_MAX > 1) 1134# if ! (MENUBAR_MAX > 1)
1195 bar_t BarList; 1135 bar_t BarList;
1196# endif /* (MENUBAR_MAX > 1) */ 1136# endif /* (MENUBAR_MAX > 1) */
1197#endif 1137#endif
1198#ifdef CURSOR_BLINK
1199 struct timeval lastcursorchange;
1200#endif
1201#ifdef POINTER_BLANK
1202 struct timeval lastmotion;
1203#endif
1204 1138
1205#if ENABLE_OVERLAY 1139#if ENABLE_OVERLAY
1206 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1140 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1207 text_t **ov_text; 1141 text_t **ov_text;
1208 rend_t **ov_rend; 1142 rend_t **ov_rend;
… …
1212 void scr_overlay_off (); 1146 void scr_overlay_off ();
1213 void scr_overlay_set (int x, int y, 1147 void scr_overlay_set (int x, int y,
1214 text_t text, 1148 text_t text,
1215 rend_t rend = OVERLAY_RSTYLE); 1149 rend_t rend = OVERLAY_RSTYLE);
1216 void scr_overlay_set (int x, int y, const char *s); 1150 void scr_overlay_set (int x, int y, const char *s);
1151 void scr_overlay_set (int x, int y, const wchar_t *s);
1217#endif 1152#endif
1218 1153
1219 vector<void *> allocated; // free these memory blocks with free() 1154 vector<void *> allocated; // free these memory blocks with free()
1220 1155
1221 char *env_windowid; /* environmental variable WINDOWID */ 1156 char *env_windowid; /* environmental variable WINDOWID */
1222 char *env_display; /* environmental variable DISPLAY */ 1157 char *env_display; /* environmental variable DISPLAY */
1223 char *env_term; /* environmental variable TERM */ 1158 char *env_term; /* environmental variable TERM */
1224 char *env_colorfgbg; 1159 char *env_colorfgbg;
1225 char *locale; 1160 char *locale;
1226 char charsets[4]; 1161 char charsets[4];
1227 unsigned char *v_buffer; /* pointer to physical buffer */ 1162 char *v_buffer; /* pointer to physical buffer */
1228 unsigned int v_buflen; /* size of area to write */ 1163 unsigned int v_buflen; /* size of area to write */
1229 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1164 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1230 1165
1231#ifdef KEYSYM_RESOURCE 1166#ifdef KEYSYM_RESOURCE
1232 keyboard_manager *keyboard; 1167 keyboard_manager *keyboard;
1233#endif 1168#endif
1234 1169
1235 const char *rs[NUM_RESOURCES]; 1170 const char *rs[NUM_RESOURCES];
1236 /* command input buffering */ 1171 /* command input buffering */
1237 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1172 char *cmdbuf_ptr, *cmdbuf_endp;
1238 unsigned char cmdbuf_base[CBUFSIZ]; 1173 char cmdbuf_base[CBUFSIZ];
1239 1174
1240 rxvt_salloc *talloc; // text line allocator 1175 rxvt_salloc *talloc; // text line allocator
1241 rxvt_salloc *ralloc; // rend line allocator 1176 rxvt_salloc *ralloc; // rend line allocator
1242 1177
1243 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1178 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1246 // ISO 14755 entry support 1181 // ISO 14755 entry support
1247 unicode_t iso14755buf; 1182 unicode_t iso14755buf;
1248 void commit_iso14755 (); 1183 void commit_iso14755 ();
1249 int hex_keyval (XKeyEvent &ev); 1184 int hex_keyval (XKeyEvent &ev);
1250# if ISO_14755 1185# if ISO_14755
1251 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1186 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1252 void iso14755_54 (int x, int y); 1187 void iso14755_54 (int x, int y);
1253# endif 1188# endif
1254#endif 1189#endif
1255 1190
1256 // modifies first argument(!) 1191 // modifies first argument(!)
1257 void paste (unsigned char *data, unsigned int len); 1192 void paste (char *data, unsigned int len);
1258 1193
1259 void flush (); 1194 void flush ();
1260 1195
1261#if TRANSPARENT 1196#if TRANSPARENT
1262 void rootwin_cb (XEvent &xev); 1197 void rootwin_cb (XEvent &xev);
1263 xevent_watcher rootwin_ev; 1198 xevent_watcher rootwin_ev;
1264#endif 1199#endif
1265
1266
1267 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1268 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1269 1200
1270 void x_cb (XEvent &xev); 1201 void x_cb (XEvent &xev);
1271 xevent_watcher termwin_ev; 1202 xevent_watcher termwin_ev;
1272 xevent_watcher vt_ev; 1203 xevent_watcher vt_ev;
1273#ifdef HAVE_SCROLLBARS 1204#ifdef HAVE_SCROLLBARS
… …
1307 void pointer_blank (); 1238 void pointer_blank ();
1308#endif 1239#endif
1309 void pointer_unblank (); 1240 void pointer_unblank ();
1310 1241
1311 void tt_printf (const char *fmt,...); 1242 void tt_printf (const char *fmt,...);
1312 void tt_write (const unsigned char *data, unsigned int len); 1243 void tt_write (const char *data, unsigned int len);
1313 void pty_write (); 1244 void pty_write ();
1314 1245
1315 void tt_winch (); 1246 void tt_winch ();
1316 1247
1317 rxvt_term (); 1248 rxvt_term ();
1318 ~rxvt_term (); 1249 ~rxvt_term ();
1250 void child_exit (); // child has exited, usually destroys
1319 void destroy (); 1251 void destroy ();
1320 void emergency_cleanup (); 1252 void emergency_cleanup ();
1321 1253
1322 bool init (int argc, const char *const *argv); 1254 bool init (int argc, const char *const *argv);
1323 bool init_vars (); 1255 bool init_vars ();
1324 1256
1325 bool pty_fill (); 1257 bool pty_fill ();
1326 1258
1327 void init_secondary (); 1259 void init_secondary ();
1328 const char **init_resources (int argc, const char *const *argv); 1260 const char **init_resources (int argc, const char *const *argv);
1261 const char *x_resource (const char *name);
1329 void init_env (); 1262 void init_env ();
1330 void set_locale (const char *locale); 1263 void set_locale (const char *locale);
1331 void init_xlocale (); 1264 void init_xlocale ();
1332 void init_command (const char *const *argv); 1265 void init_command (const char *const *argv);
1333 void run_command (const char *const *argv); 1266 void run_command (const char *const *argv);
1334 int run_child (const char *const *argv); 1267 int run_child (const char *const *argv);
1335 1268
1336 void color_aliases (int idx); 1269 void color_aliases (int idx);
1337 void recolour_cursor (); 1270 void recolour_cursor ();
1338 void create_windows (int argc, const char *const *argv); 1271 void create_windows (int argc, const char *const *argv);
1339 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1272 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1340 void window_calc (unsigned int width, unsigned int height); 1273 void window_calc (unsigned int newwidth, unsigned int newheight);
1341 1274
1342#if USE_XIM 1275#if USE_XIM
1343 rxvt_xim *input_method; 1276 rxvt_xim *input_method;
1344 XIC Input_Context; 1277 XIC Input_Context;
1345 XIMStyle input_style; 1278 XIMStyle input_style;
… …
1368 1301
1369 /* autoconvert */ 1302 /* autoconvert */
1370 1303
1371 // command.C 1304 // command.C
1372 void lookup_key (XKeyEvent &ev); 1305 void lookup_key (XKeyEvent &ev);
1373 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1306 unsigned int cmd_write (const char *str, unsigned int count);
1374 1307
1375 unicode_t next_char (); 1308 wchar_t next_char ();
1376 unicode_t cmd_getc (); 1309 wchar_t cmd_getc ();
1377 unicode_t next_octet (); 1310 uint32_t next_octet ();
1378 unicode_t cmd_get8 (); 1311 uint32_t cmd_get8 ();
1379 1312
1380 bool cmd_parse (); 1313 bool cmd_parse ();
1381 void mouse_report (XButtonEvent &ev); 1314 void mouse_report (XButtonEvent &ev);
1382 void button_press (XButtonEvent &ev); 1315 void button_press (XButtonEvent &ev);
1383 void button_release (XButtonEvent &ev); 1316 void button_release (XButtonEvent &ev);
… …
1392 void process_nonprinting (unicode_t ch); 1325 void process_nonprinting (unicode_t ch);
1393 void process_escape_vt52 (unicode_t ch); 1326 void process_escape_vt52 (unicode_t ch);
1394 void process_escape_seq (); 1327 void process_escape_seq ();
1395 void process_csi_seq (); 1328 void process_csi_seq ();
1396 void process_window_ops (const int *args, unsigned int nargs); 1329 void process_window_ops (const int *args, unsigned int nargs);
1397 unsigned char *get_to_st (unicode_t &ends_how); 1330 char *get_to_st (unicode_t &ends_how);
1398 void process_dcs_seq (); 1331 void process_dcs_seq ();
1399 void process_osc_seq (); 1332 void process_osc_seq ();
1400 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1333 void process_color_seq (int report, int color, const char *str, char resp);
1401 void process_xterm_seq (int op, const char *str, unsigned char resp); 1334 void process_xterm_seq (int op, const char *str, char resp);
1402 int privcases (int mode, unsigned long bit); 1335 int privcases (int mode, unsigned long bit);
1403 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1336 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1404 void process_sgr_mode (unsigned int nargs, const int *arg); 1337 void process_sgr_mode (unsigned int nargs, const int *arg);
1405 void process_graphics (); 1338 void process_graphics ();
1406 // init.C 1339 // init.C
… …
1417 void set_title (const char *str); 1350 void set_title (const char *str);
1418 void set_icon_name (const char *str); 1351 void set_icon_name (const char *str);
1419 void set_window_color (int idx, const char *color); 1352 void set_window_color (int idx, const char *color);
1420 void set_colorfgbg (); 1353 void set_colorfgbg ();
1421 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1354 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1422 void set_widthheight (unsigned int width, unsigned int height); 1355 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1423 1356
1424#ifdef MENUBAR 1357#ifdef MENUBAR
1425 // menubar.C 1358 // menubar.C
1426 void menuitem_free (menu_t *menu, menuitem_t *item); 1359 void menuitem_free (menu_t *menu, menuitem_t *item);
1427 int action_dispatch (action_t *action); 1360 int action_dispatch (action_t *action);
… …
1453 void menubar_control (XButtonEvent &ev); 1386 void menubar_control (XButtonEvent &ev);
1454 void map_menuBar (int map); 1387 void map_menuBar (int map);
1455#endif 1388#endif
1456 1389
1457 // screen.C 1390 // screen.C
1458 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1391
1459 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1392 void lalloc (line_t &l)
1393 {
1394 l.t = (text_t *)talloc->alloc ();
1395 l.r = (rend_t *)ralloc->alloc ();
1396 }
1397
1398#if 0
1399 void lfree (line_t &l)
1400 {
1401 talloc->free (l.t);
1402 ralloc->free (l.r);
1403 }
1404#endif
1405
1406 void lresize (line_t &l)
1407 {
1408 if (!l.t)
1409 return;
1410
1411 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1412 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1413
1414 l.l = min (l.l, ncol);
1415
1416 if (ncol > prev_ncol)
1417 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1418 }
1419
1420 int fgcolor_of (rend_t r)
1421 {
1422 int base = GET_BASEFG (r);
1423#ifndef NO_BRIGHTCOLOR
1424 if (r & RS_Bold
1425# if ENABLE_STYLES
1426 && OPTION (Opt_intensityStyles)
1427# endif
1428 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1429 base += minBrightCOLOR - minCOLOR;
1430#endif
1431 return base;
1432 }
1433
1434 int bgcolor_of (rend_t r)
1435 {
1436 int base = GET_BASEBG (r);
1437#ifndef NO_BRIGHTCOLOR
1438 if (r & RS_Blink
1439# if ENABLE_STYLES
1440 && OPTION (Opt_intensityStyles)
1441# endif
1442 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1443 base += minBrightCOLOR - minCOLOR;
1444#endif
1445 return base;
1446 }
1447
1448 bool option (uint32_t opt)
1449 {
1450 return OPTION (opt);
1451 }
1452
1453 void set_option (uint32_t opt, bool set)
1454 {
1455 if (set)
1456 options |= opt;
1457 else
1458 options &= ~opt;
1459 }
1460
1461 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1462 void scr_blank_screen_mem (line_t &l, rend_t efs);
1460 int scr_scroll_text (int row1, int row2, int count, int spec); 1463 int scr_scroll_text (int row1, int row2, int count);
1461 void scr_reset (); 1464 void scr_reset ();
1462 void scr_reset_realloc ();
1463 void scr_release (); 1465 void scr_release ();
1464 void scr_clear (bool really = false); 1466 void scr_clear (bool really = false);
1465 void scr_refresh (unsigned char refresh_type); 1467 void scr_refresh (unsigned char refresh_type);
1466 bool scr_refresh_rend (rend_t mask, rend_t value); 1468 bool scr_refresh_rend (rend_t mask, rend_t value);
1467 void scr_erase_screen (int mode); 1469 void scr_erase_screen (int mode);
1470#if ENABLE_FRILLS
1471 void scr_erase_savelines ();
1472 void scr_backindex ();
1473 void scr_forwardindex ();
1474#endif
1468 void scr_touch (bool refresh); 1475 void scr_touch (bool refresh);
1469 void scr_expose (int x, int y, int width, int height, bool refresh); 1476 void scr_expose (int x, int y, int width, int height, bool refresh);
1470 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1477 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1471 void scr_recolour (); 1478 void scr_recolour ();
1472 void scr_remap_chars (); 1479 void scr_remap_chars ();
1473 void scr_remap_chars (text_t *tp, rend_t *rp); 1480 void scr_remap_chars (line_t &l);
1474 1481
1475 void scr_poweron (); 1482 void scr_poweron ();
1476 void scr_cursor (int mode); 1483 void scr_cursor (int mode);
1477 void scr_do_wrap (); 1484 void scr_do_wrap ();
1478 int scr_change_screen (int scrn); 1485 int scr_change_screen (int scrn);
1479 void scr_color (unsigned int color, int fgbg); 1486 void scr_color (unsigned int color, int fgbg);
1480 void scr_rendition (int set, int style); 1487 void scr_rendition (int set, int style);
1481 void scr_add_lines (const unicode_t *str, int nlines, int len); 1488 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1482 void scr_backspace (); 1489 void scr_backspace ();
1483 void scr_tab (int count, bool ht = false); 1490 void scr_tab (int count, bool ht = false);
1484 void scr_backindex ();
1485 void scr_forwardindex ();
1486 void scr_gotorc (int row, int col, int relative); 1491 void scr_gotorc (int row, int col, int relative);
1487 void scr_index (enum page_dirn direction); 1492 void scr_index (enum page_dirn direction);
1488 void scr_erase_line (int mode); 1493 void scr_erase_line (int mode);
1489 void scr_E (); 1494 void scr_E ();
1490 void scr_insdel_lines (int count, int insdel); 1495 void scr_insdel_lines (int count, int insdel);
… …
1503 int scr_move_to (int y, int len); 1508 int scr_move_to (int y, int len);
1504 int scr_page (enum page_dirn direction, int nlines); 1509 int scr_page (enum page_dirn direction, int nlines);
1505 int scr_changeview (unsigned int oldviewstart); 1510 int scr_changeview (unsigned int oldviewstart);
1506 void scr_bell (); 1511 void scr_bell ();
1507 void scr_printscreen (int fullhist); 1512 void scr_printscreen (int fullhist);
1513 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1514 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1508 void scr_reverse_selection (); 1515 void scr_reverse_selection ();
1509 void scr_dump (int fd); 1516 void scr_dump (int fd);
1510 void selection_check (int check_more); 1517 void selection_check (int check_more);
1511 void selection_paste (Window win, Atom prop, bool delete_prop); 1518 void selection_paste (Window win, Atom prop, bool delete_prop);
1512 void selection_property (Window win, Atom prop); 1519 void selection_property (Window win, Atom prop);
1513 void selection_request (Time tm, int x, int y); 1520 void selection_request (Time tm, int x, int y);
1514 int selection_request_other (Atom target, int selnum); 1521 int selection_request_other (Atom target, int selnum);
1515 void selection_clear (); 1522 void selection_clear ();
1516 void selection_make (Time tm); 1523 void selection_make (Time tm);
1524 bool selection_grab (Time tm);
1517 void selection_start_colrow (int col, int row); 1525 void selection_start_colrow (int col, int row);
1518 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1526 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1519 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1527 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1520 void selection_remove_trailing_spaces (); 1528 void selection_remove_trailing_spaces ();
1521 void selection_send (const XSelectionRequestEvent &rq); 1529 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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