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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines