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

Diff Legend

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