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.155 by root, Sun Apr 17 22:36:13 2005 UTC vs.
Revision 1.196 by root, Wed Jan 11 02:13:56 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"
23 25
24#if ENABLE_FRILLS 26#if ENABLE_FRILLS
25# define ENABLE_XEMBED 1 27# define ENABLE_XEMBED 1
26# define ENABLE_EWMH 1 28# define ENABLE_EWMH 1
27# define CURSOR_BLINK 1 29# define CURSOR_BLINK 1
… …
70 72
71#ifndef STDIN_FILENO 73#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 74# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 75# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 76# 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 77#endif
85 78
86/* 79/*
87 ***************************************************************************** 80 *****************************************************************************
88 * PROTOTYPES 81 * PROTOTYPES
… …
118char ** rxvt_splitcommastring (const char *cs); 111char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs); 112void rxvt_freecommastring (char **cs);
120char * 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);
121void 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);
122void 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);
123 117
124/* 118/*
125 ***************************************************************************** 119 *****************************************************************************
126 * STRUCTURES AND TYPEDEFS 120 * STRUCTURES AND TYPEDEFS
127 ***************************************************************************** 121 *****************************************************************************
… …
137#endif 131#endif
138 132
139/* 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
140 * scrollColor resource. 134 * scrollColor resource.
141 */ 135 */
142#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 136#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
143# define KEEP_SCROLLCOLOR 1 137# define KEEP_SCROLLCOLOR 1
144#else 138#else
145# undef KEEP_SCROLLCOLOR 139# undef KEEP_SCROLLCOLOR
146#endif 140#endif
147 141
… …
161 Time time; /* milliseconds */ 155 Time time; /* milliseconds */
162 unsigned int state; /* key or button mask */ 156 unsigned int state; /* key or button mask */
163 unsigned int button; /* detail */ 157 unsigned int button; /* detail */
164}; 158};
165 159
166#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
167#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
168#define SWAP_IT(one, two, typeof) \
169 do { \
170 typeof swapittmp; \
171 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
172 } while (/* CONSTCOND */ 0)
173#define BOUND_POSITIVE_INT16(val) \
174 (int16_t) ((val) <= 0 \
175 ? 0 \
176 : min ((val), (((uint16_t)-1)>>1)))
177
178#if ENABLE_FRILLS 160#if ENABLE_FRILLS
179typedef struct _mwmhints { 161typedef struct _mwmhints {
180 CARD32 flags; 162 CARD32 flags;
181 CARD32 functions; 163 CARD32 functions;
182 CARD32 decorations; 164 CARD32 decorations;
… …
229 211
230#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
231# define NO_MOUSE_REPORT_SCROLLBAR 1 213# define NO_MOUSE_REPORT_SCROLLBAR 1
232#endif 214#endif
233 215
234#ifdef NO_RESOURCES 216#if defined (ISO_14755) || defined (ENABLE_PERL)
235# undef USE_XGETDEFAULT
236#endif
237
238#if ISO_14755
239# define ENABLE_OVERLAY 1 217# define ENABLE_OVERLAY 1
240#endif 218#endif
241 219
242/* now look for other badly set stuff */ 220/* now look for other badly set stuff */
243 221
… …
258# define HAVE_SCROLLBARS 1 236# define HAVE_SCROLLBARS 1
259#endif 237#endif
260 238
261/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 239/* width of scrollBar, menuBar shadow, must be 1 or 2 */
262#ifdef HALFSHADOW 240#ifdef HALFSHADOW
263# define SHADOW 1 241# define MENU_SHADOW 1
264#else 242#else
265# define SHADOW 2 243# define MENU_SHADOW 2
266#endif 244#endif
267 245
268#define R_SB_ALIGN_CENTRE 0 246#define R_SB_ALIGN_CENTRE 0
269#define R_SB_ALIGN_TOP 1 247#define R_SB_ALIGN_TOP 1
270#define R_SB_ALIGN_BOTTOM 2 248#define R_SB_ALIGN_BOTTOM 2
271 249
272#define R_SB_RXVT 0
273#define R_SB_NEXT 1 250#define R_SB_NEXT 1
274#define R_SB_XTERM 2 251#define R_SB_XTERM 2
275#define R_SB_PLAIN 4 252#define R_SB_PLAIN 4
253#define R_SB_RXVT 8
276 254
277#define SB_WIDTH_NEXT 19 255#define SB_WIDTH_NEXT 19
278#define SB_WIDTH_XTERM 15 256#define SB_WIDTH_XTERM 15
279#define SB_WIDTH_PLAIN 7 257#define SB_WIDTH_PLAIN 7
280#ifndef SB_WIDTH_RXVT 258#ifndef SB_WIDTH_RXVT
… …
362#define FONT_DN "#-" 340#define FONT_DN "#-"
363#define FONT_UP "#+" 341#define FONT_UP "#+"
364 342
365/* flags for rxvt_scr_gotorc () */ 343/* flags for rxvt_scr_gotorc () */
366enum { 344enum {
367 C_RELATIVE = 1 , /* col movement is relative */ 345 C_RELATIVE = 1, /* col movement is relative */
368 R_RELATIVE = 2, /* row movement is relative */ 346 R_RELATIVE = 2, /* row movement is relative */
369 RELATIVE = 1 | 2, 347 RELATIVE = C_RELATIVE | R_RELATIVE,
370}; 348};
371 349
372/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 350/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
373enum { 351enum {
374 INSERT = -1, /* don't change these values */ 352 INSERT = -1, /* don't change these values */
… …
387enum { 365enum {
388 PRIMARY = 0, 366 PRIMARY = 0,
389 SECONDARY, 367 SECONDARY,
390}; 368};
391 369
392#define RS_None 0 /* Normal */ 370#define RS_None 0
393 371
394#define RS_fgMask 0x0000007fUL /* 128 colors */ 372#define RS_fgMask 0x0000007fUL // 128 colors
395#define RS_bgMask 0x00003f80UL /* 128 colors */ 373#define RS_bgMask 0x00003f80UL // 128 colors
396 374
397// font styles 375// font styles
398#define RS_Bold 0x00004000UL // value 1 376#define RS_Bold 0x00004000UL // value 1
399#define RS_Italic 0x00008000UL // value 2 377#define RS_Italic 0x00008000UL // value 2
400 378
401// fake styles 379// fake styles
402#define RS_Blink 0x00010000UL /* blink */ 380#define RS_Blink 0x00010000UL // blink
403#define RS_RVid 0x00020000UL /* reverse video */ 381#define RS_RVid 0x00020000UL // reverse video
404#define RS_Uline 0x00040000UL /* underline */ 382#define RS_Uline 0x00040000UL // underline
405 383
406// 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
407 388
408// other flags 389// other flags
409#define RS_Careful 0x80000000UL /* be careful when drawing these */ 390#define RS_Careful 0x80000000UL /* be careful when drawing these */
410 391
411#define RS_styleCount 4 392#define RS_styleCount 4
… …
486 URxvt_italicFont = 712, 467 URxvt_italicFont = 712,
487 URxvt_boldItalicFont = 713, 468 URxvt_boldItalicFont = 713,
488 469
489 URxvt_view_up = 720, 470 URxvt_view_up = 720,
490 URxvt_view_down = 721, 471 URxvt_view_down = 721,
472
473 URxvt_perl = 777,
491}; 474};
492 475
493/* Words starting with `Color_' are colours. Others are counts */ 476/* Words starting with `Color_' are colours. Others are counts */
494/* 477/*
495 * The following comment is mostly obsolete since pixcolor_set was expanded:
496 * We're currently upto 29 colours. Only 3 more available. The
497 * PixColor and rendition colour usage should probably be decoupled 478 * The PixColor and rendition colour usage should probably be decoupled
498 * 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
499 * 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
500 */ 481 */
501 482
502enum colour_list { 483enum colour_list {
… …
552 Color_trough, 533 Color_trough,
553#endif 534#endif
554#if TINTING 535#if TINTING
555 Color_tint, 536 Color_tint,
556#endif 537#endif
538#if OFF_FOCUS_FADING
539 Color_fade,
540#endif
557 NRS_COLORS, /* */ 541 NRS_COLORS, /* */
558#ifdef KEEP_SCROLLCOLOR 542#ifdef KEEP_SCROLLCOLOR
559 Color_topShadow = NRS_COLORS, 543 Color_topShadow = NRS_COLORS,
560 Color_bottomShadow, 544 Color_bottomShadow,
561 TOTAL_COLORS 545 TOTAL_COLORS
… …
571 555
572/* 556/*
573 * Resource list 557 * Resource list
574 */ 558 */
575enum { 559enum {
576 Rs_display_name = 0, 560# define def(name) Rs_ ## name,
577 Rs_term_name, 561# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
578 Rs_iconName, 562# include "rsinc.h"
579 Rs_geometry, 563# undef def
580 Rs_reverseVideo, 564# undef reserve
581 Rs_color,
582 _Rs_color = Rs_color + NRS_COLORS - 1,
583 Rs_font,
584#if ENABLE_STYLES
585 Rs_boldFont,
586 Rs_italicFont,
587 Rs_boldItalicFont,
588#endif
589 Rs_name,
590 Rs_title,
591#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
592 Rs_path,
593#endif
594#ifdef XPM_BACKGROUND
595 Rs_backgroundPixmap,
596#endif
597#if (MENUBAR_MAX)
598 Rs_menu,
599#endif
600 Rs_loginShell,
601 Rs_jumpScroll,
602#ifdef HAVE_SCROLLBARS
603 Rs_scrollBar,
604 Rs_scrollBar_right,
605 Rs_scrollBar_floating,
606 Rs_scrollBar_align,
607 Rs_scrollstyle, /* Rs_scrollBar_style */
608 Rs_scrollBar_thickness,
609#endif
610 Rs_scrollTtyOutput,
611 Rs_scrollTtyKeypress,
612 Rs_scrollWithBuffer,
613 Rs_saveLines,
614 Rs_utmpInhibit,
615 Rs_visualBell,
616#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
617 Rs_mapAlert,
618#endif
619#ifdef META8_OPTION
620 Rs_meta8,
621#endif
622#ifdef MOUSE_WHEEL
623 Rs_mouseWheelScrollPage,
624#endif
625#ifndef NO_BACKSPACE_KEY
626 Rs_backspace_key,
627#endif
628#ifndef NO_DELETE_KEY
629 Rs_delete_key,
630#endif
631 Rs_selectstyle,
632#ifdef PRINTPIPE
633 Rs_print_pipe,
634#endif
635#ifdef USE_XIM
636 Rs_preeditType,
637 Rs_inputMethod,
638#endif
639#ifdef TRANSPARENT
640 Rs_transparent,
641 Rs_transparent_all,
642#endif
643#if ENABLE_FRILLS
644 Rs_ext_bwidth,
645 Rs_int_bwidth,
646 Rs_borderLess,
647 Rs_lineSpace,
648 Rs_pty_fd,
649 Rs_cursorUnderline,
650#endif
651#if CURSOR_BLINK
652 Rs_cursorBlink,
653#endif
654#if ENABLE_XEMBED
655 Rs_embed,
656#endif
657 Rs_cutchars,
658 Rs_modifier,
659 Rs_answerbackstring,
660 Rs_tripleclickwords,
661 Rs_insecure,
662 Rs_pointerBlank,
663 Rs_pointerBlankDelay,
664 Rs_imLocale,
665 Rs_imFont,
666 Rs_pastableTabs,
667#ifndef NO_SECONDARY_SCREEN
668 Rs_secondaryScreen,
669 Rs_secondaryScroll,
670#endif
671#ifdef OFF_FOCUS_FADING
672 Rs_fade,
673#endif
674#ifdef TINTING
675 Rs_shade,
676#endif
677 NUM_RESOURCES 565 NUM_RESOURCES
678}; 566};
679 567
680// see init.C:xa_names, which must be kept in sync 568// see init.C:xa_names, which must be kept in sync
681enum { 569enum {
… …
756#endif 644#endif
757 645
758// do not change these constants lightly, there are many interdependencies 646// do not change these constants lightly, there are many interdependencies
759#define IMBUFSIZ 128 // input modifier buffer sizes 647#define IMBUFSIZ 128 // input modifier buffer sizes
760#define KBUFSZ 512 // size of keyboard mapping buffer 648#define KBUFSZ 512 // size of keyboard mapping buffer
761#define CBUFSIZ 4096 // size of command buffer 649#define CBUFSIZ 2048 // size of command buffer
762#define UBUFSIZ 4096 // character buffer 650#define UBUFSIZ 2048 // character buffer
763 651
764#ifndef PATH_MAX 652#ifndef PATH_MAX
765# define PATH_MAX 16384 653# define PATH_MAX 16384
766#endif 654#endif
767 655
… …
795/* 683/*
796 ***************************************************************************** 684 *****************************************************************************
797 * MACRO DEFINES 685 * MACRO DEFINES
798 ***************************************************************************** 686 *****************************************************************************
799 */ 687 */
800#define memset(x, y, z) memset((x), (y), (size_t)(z))
801#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
802#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
803#define strcasecmp(x, y) strcasecmp((x), (y))
804#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
805#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
806#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
807#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
808#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
809#define strcat(x, y) strcat((char *)(x), (const char *)(y))
810#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
811#define strdup(x) strdup((const char *)(x))
812#define strlen(x) strlen((const char *)(x))
813#define strchr(x, y) strchr((const char *)(x), (int)(y))
814#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
815
816#define dDisp Display *disp = display->display 688#define dDisp Display *disp = display->display
817 689
818/* convert pixel dimensions to row/column values. Everything as int32_t */ 690/* convert pixel dimensions to row/column values. Everything as int32_t */
819#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 691#define Pixel2Col(x) Pixel2Width((int32_t)(x))
820#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 692#define Pixel2Row(y) Pixel2Height((int32_t)(y))
821#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 693#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
822#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 694#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
823#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 695#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
824#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 696#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
825#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 697#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
826#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 698#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
827 699
828#define TermWin_TotalWidth() ((int32_t)TermWin.width) 700#define TEMP_ENV temp_environ temp_environ (envv)
829#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)]
830 712
831/* how to build & extract colors and attributes */ 713/* how to build & extract colors and attributes */
832#define GET_BASEFG(x) (((x) & RS_fgMask)) 714#define GET_BASEFG(x) (((x) & RS_fgMask))
833#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 715#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
834#ifndef NO_BRIGHTCOLOR
835# define GET_FGCOLOR(x) \
836 ((((x) & RS_Bold) == 0 \
837 || GET_BASEFG (x) < minCOLOR \
838 || GET_BASEFG (x) >= minBrightCOLOR) \
839 ? GET_BASEFG (x) \
840 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
841# define GET_BGCOLOR(x) \
842 ((((x) & RS_Blink) == 0 \
843 || GET_BASEBG (x) < minCOLOR \
844 || GET_BASEBG (x) >= minBrightCOLOR) \
845 ? GET_BASEBG (x) \
846 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
847#else
848# define GET_FGCOLOR(x) GET_BASEFG(x)
849# define GET_BGCOLOR(x) GET_BASEBG(x)
850#endif
851 716
852#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 717#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
853#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 718#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
854 719
855#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 720#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
868 733
869#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)))
870#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)))
871 736
872#if ENABLE_STYLES 737#if ENABLE_STYLES
873# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
874#else 739#else
875# define FONTSET(style) TermWin.fontset[0] 740# define FONTSET(style) fontset[0]
876#endif 741#endif
877 742
878#ifdef HAVE_SCROLLBARS 743#ifdef HAVE_SCROLLBARS
879# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 744# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
880#else 745#else
… …
905#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 770#define scrollbar_size() (scrollBar.end - scrollBar.beg \
906 - scrollbar_minheight ()) 771 - scrollbar_minheight ())
907 772
908#if (MENUBAR_MAX > 1) 773#if (MENUBAR_MAX > 1)
909/* rendition style flags */ 774/* rendition style flags */
910# define menuBar_height() (TermWin.fheight + SHADOW) 775# define menuBar_height() (fheight + MENU_SHADOW)
911# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 776# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
912# define isMenuBarWindow(w) ((w) == menuBar.win) 777# define isMenuBarWindow(w) ((w) == menuBar.win)
913#else 778#else
914# define menuBar_height() (0) 779# define menuBar_height() (0)
915# define menuBar_TotalHeight() (0) 780# define menuBar_TotalHeight() (0)
916# define isMenuBarWindow(w) (0) 781# define isMenuBarWindow(w) (0)
… …
962#endif 827#endif
963 828
964extern class rxvt_failure_exception { } rxvt_failure_exception; 829extern class rxvt_failure_exception { } rxvt_failure_exception;
965 830
966typedef callback1<void, const char *> log_callback; 831typedef callback1<void, const char *> log_callback;
832typedef callback1<int, int> getfd_callback;
967 833
968extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 834extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
969extern void rxvt_log (const char *fmt, ...); 835extern void rxvt_log (const char *fmt, ...);
970extern void rxvt_warn (const char *fmt, ...); 836extern void rxvt_warn (const char *fmt, ...);
971extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 837extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
972extern void rxvt_exit_failure () __attribute__ ((noreturn)); 838extern void rxvt_exit_failure () __attribute__ ((noreturn));
973 839
974#define SET_LOCALE(locale) rxvt_set_locale (locale) 840#define SET_LOCALE(locale) rxvt_set_locale (locale)
975extern 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 ();
976 844
977/*
978 ***************************************************************************** 845/****************************************************************************/
979 * VARIABLES 846
980 *****************************************************************************
981 */
982#ifdef MENUBAR 847#ifdef MENUBAR
983# include "menubar.h" 848# include "menubar.h"
984#endif 849#endif
985 850
986#define BLINK_INTERVAL 0.5 851#define BLINK_INTERVAL 0.5
… …
993# endif 858# endif
994# endif 859# endif
995# define __attribute__(x) 860# define __attribute__(x)
996#endif 861#endif
997 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
998// primivite wrapper around mbstate_t to ensure initialisation 912// primivite wrapper around mbstate_t to ensure initialisation
999struct mbstate { 913struct mbstate {
1000 mbstate_t mbs; 914 mbstate_t mbs;
1001 915
1002 operator mbstate_t *() { return &mbs; } 916 operator mbstate_t *() { return &mbs; }
1003 void reset () { memset (&mbs, 0, sizeof (mbs)); } 917 void reset () { memset (&mbs, 0, sizeof (mbs)); }
1004 mbstate () { reset (); } 918 mbstate () { reset (); }
1005}; 919};
1006 920
921/****************************************************************************/
922
1007#define UNICODE_MASK 0x1fffffUL 923#define UNICODE_MASK 0x1fffffUL
1008 924
1009#if UNICODE3 925#if UNICODE3
1010# define COMPOSE_LO 0x40000000UL 926# define COMPOSE_LO 0x40000000UL
1011# define COMPOSE_HI 0x400fffffUL 927# define COMPOSE_HI 0x400fffffUL
1012# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 928# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1013#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
1014# define COMPOSE_LO 0xd800UL 934# define COMPOSE_LO 0xd800UL
1015# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 935# define COMPOSE_HI 0xf8ffUL
1016# 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)
1017#endif 938#endif
1018 939
1019#if ENABLE_COMBINING 940#if ENABLE_COMBINING
1020// compose chars are used to represent composite characters 941// compose chars are used to represent composite characters
1021// that are not representable in unicode, as well as characters 942// that are not representable in unicode, as well as characters
… …
1041}; 962};
1042 963
1043extern class rxvt_composite_vec rxvt_composite; 964extern class rxvt_composite_vec rxvt_composite;
1044#endif 965#endif
1045 966
967/****************************************************************************/
1046 968
1047#ifdef KEYSYM_RESOURCE 969#ifdef KEYSYM_RESOURCE
1048 class keyboard_manager; 970 class keyboard_manager;
1049#endif 971#endif
1050 972
1051struct rxvt_term : zero_initialized, rxvt_vars { 973struct rxvt_term : zero_initialized, rxvt_vars {
1052 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
1053 975 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
976#if ENABLE_PERL
977 rxvt_perl_term perl;
978#endif
1054 struct mbstate mbstate; // current input multibyte state 979 struct mbstate mbstate; // current input multibyte state
1055 980
1056 unsigned char want_refresh:1, 981 unsigned char want_refresh:1,
1057#ifdef TRANSPARENT 982#ifdef TRANSPARENT
1058 want_full_refresh:1, /* awaiting full screen refresh */ 983 want_full_refresh:1, /* awaiting full screen refresh */
… …
1208 bar_t *CurrentBar; 1133 bar_t *CurrentBar;
1209# if ! (MENUBAR_MAX > 1) 1134# if ! (MENUBAR_MAX > 1)
1210 bar_t BarList; 1135 bar_t BarList;
1211# endif /* (MENUBAR_MAX > 1) */ 1136# endif /* (MENUBAR_MAX > 1) */
1212#endif 1137#endif
1213#ifdef CURSOR_BLINK
1214 struct timeval lastcursorchange;
1215#endif
1216#ifdef POINTER_BLANK
1217 struct timeval lastmotion;
1218#endif
1219 1138
1220#if ENABLE_OVERLAY 1139#if ENABLE_OVERLAY
1221 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1140 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1222 text_t **ov_text; 1141 text_t **ov_text;
1223 rend_t **ov_rend; 1142 rend_t **ov_rend;
… …
1227 void scr_overlay_off (); 1146 void scr_overlay_off ();
1228 void scr_overlay_set (int x, int y, 1147 void scr_overlay_set (int x, int y,
1229 text_t text, 1148 text_t text,
1230 rend_t rend = OVERLAY_RSTYLE); 1149 rend_t rend = OVERLAY_RSTYLE);
1231 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);
1232#endif 1152#endif
1233 1153
1234 vector<void *> allocated; // free these memory blocks with free() 1154 vector<void *> allocated; // free these memory blocks with free()
1235 1155
1236 char *env_windowid; /* environmental variable WINDOWID */ 1156 char *env_windowid; /* environmental variable WINDOWID */
1237 char *env_display; /* environmental variable DISPLAY */ 1157 char *env_display; /* environmental variable DISPLAY */
1238 char *env_term; /* environmental variable TERM */ 1158 char *env_term; /* environmental variable TERM */
1239 char *env_colorfgbg; 1159 char *env_colorfgbg;
1240 char *locale; 1160 char *locale;
1241 char charsets[4]; 1161 char charsets[4];
1242 unsigned char *v_buffer; /* pointer to physical buffer */ 1162 char *v_buffer; /* pointer to physical buffer */
1243 unsigned int v_buflen; /* size of area to write */ 1163 unsigned int v_buflen; /* size of area to write */
1244 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1164 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1245 1165
1246#ifdef KEYSYM_RESOURCE 1166#ifdef KEYSYM_RESOURCE
1247 keyboard_manager *keyboard; 1167 keyboard_manager *keyboard;
1248#endif 1168#endif
1249 1169
1250 const char *rs[NUM_RESOURCES]; 1170 const char *rs[NUM_RESOURCES];
1251 /* command input buffering */ 1171 /* command input buffering */
1252 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1172 char *cmdbuf_ptr, *cmdbuf_endp;
1253 unsigned char cmdbuf_base[CBUFSIZ]; 1173 char cmdbuf_base[CBUFSIZ];
1254 1174
1255 rxvt_salloc *talloc; // text line allocator 1175 rxvt_salloc *talloc; // text line allocator
1256 rxvt_salloc *ralloc; // rend line allocator 1176 rxvt_salloc *ralloc; // rend line allocator
1257 1177
1258 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
… …
1261 // ISO 14755 entry support 1181 // ISO 14755 entry support
1262 unicode_t iso14755buf; 1182 unicode_t iso14755buf;
1263 void commit_iso14755 (); 1183 void commit_iso14755 ();
1264 int hex_keyval (XKeyEvent &ev); 1184 int hex_keyval (XKeyEvent &ev);
1265# if ISO_14755 1185# if ISO_14755
1266 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);
1267 void iso14755_54 (int x, int y); 1187 void iso14755_54 (int x, int y);
1268# endif 1188# endif
1269#endif 1189#endif
1270 1190
1271 // modifies first argument(!) 1191 // modifies first argument(!)
1272 void paste (unsigned char *data, unsigned int len); 1192 void paste (char *data, unsigned int len);
1273 1193
1274 void flush (); 1194 void flush ();
1275 1195
1276#if TRANSPARENT 1196#if TRANSPARENT
1277 void rootwin_cb (XEvent &xev); 1197 void rootwin_cb (XEvent &xev);
1278 xevent_watcher rootwin_ev; 1198 xevent_watcher rootwin_ev;
1279#endif 1199#endif
1280
1281
1282 void sig_term (sig_watcher &w); sig_watcher sw_term, sw_int;
1283 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1284 1200
1285 void x_cb (XEvent &xev); 1201 void x_cb (XEvent &xev);
1286 xevent_watcher termwin_ev; 1202 xevent_watcher termwin_ev;
1287 xevent_watcher vt_ev; 1203 xevent_watcher vt_ev;
1288#ifdef HAVE_SCROLLBARS 1204#ifdef HAVE_SCROLLBARS
… …
1322 void pointer_blank (); 1238 void pointer_blank ();
1323#endif 1239#endif
1324 void pointer_unblank (); 1240 void pointer_unblank ();
1325 1241
1326 void tt_printf (const char *fmt,...); 1242 void tt_printf (const char *fmt,...);
1327 void tt_write (const unsigned char *data, unsigned int len); 1243 void tt_write (const char *data, unsigned int len);
1328 void pty_write (); 1244 void pty_write ();
1329 1245
1330 void tt_winch (); 1246 void tt_winch ();
1331 1247
1332 rxvt_term (); 1248 rxvt_term ();
1333 ~rxvt_term (); 1249 ~rxvt_term ();
1250 void child_exit (); // child has exited, usually destroys
1334 void destroy (); 1251 void destroy ();
1335 void emergency_cleanup (); 1252 void emergency_cleanup ();
1336 1253
1337 bool init (int argc, const char *const *argv); 1254 bool init (int argc, const char *const *argv);
1338 bool init_vars (); 1255 bool init_vars ();
1339 1256
1340 bool pty_fill (); 1257 bool pty_fill ();
1341 1258
1342 void init_secondary (); 1259 void init_secondary ();
1343 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);
1344 void init_env (); 1262 void init_env ();
1345 void set_locale (const char *locale); 1263 void set_locale (const char *locale);
1346 void init_xlocale (); 1264 void init_xlocale ();
1347 void init_command (const char *const *argv); 1265 void init_command (const char *const *argv);
1348 void run_command (const char *const *argv); 1266 void run_command (const char *const *argv);
1349 int run_child (const char *const *argv); 1267 int run_child (const char *const *argv);
1350 1268
1351 void color_aliases (int idx); 1269 void color_aliases (int idx);
1352 void recolour_cursor (); 1270 void recolour_cursor ();
1353 void create_windows (int argc, const char *const *argv); 1271 void create_windows (int argc, const char *const *argv);
1354 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);
1355 void window_calc (unsigned int width, unsigned int height); 1273 void window_calc (unsigned int newwidth, unsigned int newheight);
1356 1274
1357#if USE_XIM 1275#if USE_XIM
1358 rxvt_xim *input_method; 1276 rxvt_xim *input_method;
1359 XIC Input_Context; 1277 XIC Input_Context;
1360 XIMStyle input_style; 1278 XIMStyle input_style;
… …
1383 1301
1384 /* autoconvert */ 1302 /* autoconvert */
1385 1303
1386 // command.C 1304 // command.C
1387 void lookup_key (XKeyEvent &ev); 1305 void lookup_key (XKeyEvent &ev);
1388 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1306 unsigned int cmd_write (const char *str, unsigned int count);
1389 1307
1390 unicode_t next_char (); 1308 wchar_t next_char ();
1391 unicode_t cmd_getc (); 1309 wchar_t cmd_getc ();
1392 unicode_t next_octet (); 1310 uint32_t next_octet ();
1393 unicode_t cmd_get8 (); 1311 uint32_t cmd_get8 ();
1394 1312
1395 bool cmd_parse (); 1313 bool cmd_parse ();
1396 void mouse_report (XButtonEvent &ev); 1314 void mouse_report (XButtonEvent &ev);
1397 void button_press (XButtonEvent &ev); 1315 void button_press (XButtonEvent &ev);
1398 void button_release (XButtonEvent &ev); 1316 void button_release (XButtonEvent &ev);
… …
1407 void process_nonprinting (unicode_t ch); 1325 void process_nonprinting (unicode_t ch);
1408 void process_escape_vt52 (unicode_t ch); 1326 void process_escape_vt52 (unicode_t ch);
1409 void process_escape_seq (); 1327 void process_escape_seq ();
1410 void process_csi_seq (); 1328 void process_csi_seq ();
1411 void process_window_ops (const int *args, unsigned int nargs); 1329 void process_window_ops (const int *args, unsigned int nargs);
1412 unsigned char *get_to_st (unicode_t &ends_how); 1330 char *get_to_st (unicode_t &ends_how);
1413 void process_dcs_seq (); 1331 void process_dcs_seq ();
1414 void process_osc_seq (); 1332 void process_osc_seq ();
1415 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);
1416 void process_xterm_seq (int op, const char *str, unsigned char resp); 1334 void process_xterm_seq (int op, const char *str, char resp);
1417 int privcases (int mode, unsigned long bit); 1335 int privcases (int mode, unsigned long bit);
1418 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);
1419 void process_sgr_mode (unsigned int nargs, const int *arg); 1337 void process_sgr_mode (unsigned int nargs, const int *arg);
1420 void process_graphics (); 1338 void process_graphics ();
1421 // init.C 1339 // init.C
… …
1432 void set_title (const char *str); 1350 void set_title (const char *str);
1433 void set_icon_name (const char *str); 1351 void set_icon_name (const char *str);
1434 void set_window_color (int idx, const char *color); 1352 void set_window_color (int idx, const char *color);
1435 void set_colorfgbg (); 1353 void set_colorfgbg ();
1436 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1354 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1437 void set_widthheight (unsigned int width, unsigned int height); 1355 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1438 1356
1439#ifdef MENUBAR 1357#ifdef MENUBAR
1440 // menubar.C 1358 // menubar.C
1441 void menuitem_free (menu_t *menu, menuitem_t *item); 1359 void menuitem_free (menu_t *menu, menuitem_t *item);
1442 int action_dispatch (action_t *action); 1360 int action_dispatch (action_t *action);
… …
1468 void menubar_control (XButtonEvent &ev); 1386 void menubar_control (XButtonEvent &ev);
1469 void map_menuBar (int map); 1387 void map_menuBar (int map);
1470#endif 1388#endif
1471 1389
1472 // screen.C 1390 // screen.C
1473 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1391
1474 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);
1475 int scr_scroll_text (int row1, int row2, int count, int spec); 1463 int scr_scroll_text (int row1, int row2, int count);
1476 void scr_reset (); 1464 void scr_reset ();
1477 void scr_reset_realloc ();
1478 void scr_release (); 1465 void scr_release ();
1479 void scr_clear (bool really = false); 1466 void scr_clear (bool really = false);
1480 void scr_refresh (unsigned char refresh_type); 1467 void scr_refresh (unsigned char refresh_type);
1481 bool scr_refresh_rend (rend_t mask, rend_t value); 1468 bool scr_refresh_rend (rend_t mask, rend_t value);
1482 void scr_erase_screen (int mode); 1469 void scr_erase_screen (int mode);
… …
1488 void scr_touch (bool refresh); 1475 void scr_touch (bool refresh);
1489 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);
1490 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1477 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1491 void scr_recolour (); 1478 void scr_recolour ();
1492 void scr_remap_chars (); 1479 void scr_remap_chars ();
1493 void scr_remap_chars (text_t *tp, rend_t *rp); 1480 void scr_remap_chars (line_t &l);
1494 1481
1495 void scr_poweron (); 1482 void scr_poweron ();
1496 void scr_cursor (int mode); 1483 void scr_cursor (int mode);
1497 void scr_do_wrap (); 1484 void scr_do_wrap ();
1498 int scr_change_screen (int scrn); 1485 int scr_change_screen (int scrn);
1499 void scr_color (unsigned int color, int fgbg); 1486 void scr_color (unsigned int color, int fgbg);
1500 void scr_rendition (int set, int style); 1487 void scr_rendition (int set, int style);
1501 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);
1502 void scr_backspace (); 1489 void scr_backspace ();
1503 void scr_tab (int count, bool ht = false); 1490 void scr_tab (int count, bool ht = false);
1504 void scr_gotorc (int row, int col, int relative); 1491 void scr_gotorc (int row, int col, int relative);
1505 void scr_index (enum page_dirn direction); 1492 void scr_index (enum page_dirn direction);
1506 void scr_erase_line (int mode); 1493 void scr_erase_line (int mode);
… …
1521 int scr_move_to (int y, int len); 1508 int scr_move_to (int y, int len);
1522 int scr_page (enum page_dirn direction, int nlines); 1509 int scr_page (enum page_dirn direction, int nlines);
1523 int scr_changeview (unsigned int oldviewstart); 1510 int scr_changeview (unsigned int oldviewstart);
1524 void scr_bell (); 1511 void scr_bell ();
1525 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);
1526 void scr_reverse_selection (); 1515 void scr_reverse_selection ();
1527 void scr_dump (int fd); 1516 void scr_dump (int fd);
1528 void selection_check (int check_more); 1517 void selection_check (int check_more);
1529 void selection_paste (Window win, Atom prop, bool delete_prop); 1518 void selection_paste (Window win, Atom prop, bool delete_prop);
1530 void selection_property (Window win, Atom prop); 1519 void selection_property (Window win, Atom prop);
1531 void selection_request (Time tm, int x, int y); 1520 void selection_request (Time tm, int x, int y);
1532 int selection_request_other (Atom target, int selnum); 1521 int selection_request_other (Atom target, int selnum);
1533 void selection_clear (); 1522 void selection_clear ();
1534 void selection_make (Time tm); 1523 void selection_make (Time tm);
1524 bool selection_grab (Time tm);
1535 void selection_start_colrow (int col, int row); 1525 void selection_start_colrow (int col, int row);
1536 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);
1537 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);
1538 void selection_remove_trailing_spaces (); 1528 void selection_remove_trailing_spaces ();
1539 void selection_send (const XSelectionRequestEvent &rq); 1529 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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