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.149 by root, Thu Feb 17 15:07:48 2005 UTC vs.
Revision 1.190 by root, Sat Jan 7 19:29:17 2006 UTC

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

Diff Legend

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