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.151 by root, Sun Feb 20 00:09:25 2005 UTC vs.
Revision 1.191 by root, Sun Jan 8 01:02:15 2006 UTC

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

Diff Legend

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