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.126 by root, Wed Dec 1 02:12:18 2004 UTC vs.
Revision 1.185 by root, Wed Jan 4 02:37:30 2006 UTC

… …
10#include <X11/cursorfont.h> 10#include <X11/cursorfont.h>
11#include <X11/keysym.h> 11#include <X11/keysym.h>
12#include <X11/keysymdef.h> 12#include <X11/keysymdef.h>
13#include <X11/Xatom.h> 13#include <X11/Xatom.h>
14#if ENABLE_FRILLS 14#if ENABLE_FRILLS
15#include <X11/Xmd.h> 15# include <X11/Xmd.h>
16#endif 16#endif
17 17
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 *****************************************************************************
… …
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 75#endif
70 76
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
79
80/* 77/*
81 ***************************************************************************** 78 *****************************************************************************
82 * PROTOTYPES 79 * PROTOTYPES
83 ***************************************************************************** 80 *****************************************************************************
84 */ 81 */
82// main.C
85RETSIGTYPE rxvt_Child_signal (int sig); 83RETSIGTYPE rxvt_Child_signal (int sig);
86RETSIGTYPE rxvt_Exit_signal (int sig); 84RETSIGTYPE rxvt_Exit_signal (int sig);
87void rxvt_clean_exit (); 85void rxvt_clean_exit ();
88void * rxvt_malloc (size_t size); 86void * rxvt_malloc (size_t size);
89void * rxvt_calloc (size_t number, size_t size); 87void * rxvt_calloc (size_t number, size_t size);
90void * rxvt_realloc (void *ptr, size_t size); 88void * rxvt_realloc (void *ptr, size_t size);
89void rxvt_privileges (rxvt_privaction action);
90
91// util.C
91char * rxvt_wcstombs (const wchar_t *str, int len); 92char * rxvt_wcstombs (const wchar_t *str, int len = -1);
93wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
94char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
95wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
92char * rxvt_strdup (const char *str); 96char * rxvt_strdup (const char *str);
97
98// misc.C
93char * rxvt_r_basename (const char *str); 99char * rxvt_r_basename (const char *str);
94void rxvt_vlog (const char *fmt, va_list arg_ptr); 100void rxvt_vlog (const char *fmt, va_list arg_ptr);
95void rxvt_log (const char *fmt,...); 101void rxvt_log (const char *fmt,...);
96void rxvt_warn (const char *fmt,...); 102void rxvt_warn (const char *fmt,...);
97void rxvt_fatal (const char *fmt,...); 103void rxvt_fatal (const char *fmt,...);
… …
103char ** rxvt_splitcommastring (const char *cs); 109char ** rxvt_splitcommastring (const char *cs);
104void rxvt_freecommastring (char **cs); 110void rxvt_freecommastring (char **cs);
105char * 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);
106void 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);
107void 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);
108 114void rxvt_usleep (int usecs);
109void rxvt_privileges (rxvt_privaction action);
110 115
111/* 116/*
112 ***************************************************************************** 117 *****************************************************************************
113 * STRUCTURES AND TYPEDEFS 118 * STRUCTURES AND TYPEDEFS
114 ***************************************************************************** 119 *****************************************************************************
… …
124#endif 129#endif
125 130
126/* 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
127 * scrollColor resource. 132 * scrollColor resource.
128 */ 133 */
129#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 134#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
130# define KEEP_SCROLLCOLOR 1 135# define KEEP_SCROLLCOLOR 1
131#else 136#else
132# undef KEEP_SCROLLCOLOR 137# undef KEEP_SCROLLCOLOR
133#endif 138#endif
134 139
135#ifdef XPM_BACKGROUND 140#ifdef XPM_BACKGROUND
136typedef struct { 141typedef struct {
137 short w, h, x, y; 142 short w, h, x, y;
138 Pixmap pixmap; 143 Pixmap pixmap;
139} bgPixmap_t; 144} bgPixmap_t;
140#endif 145#endif
141 146
142/* 147/*
143 * the 'essential' information for reporting Mouse Events 148 * the 'essential' information for reporting Mouse Events
144 * pared down from XButtonEvent 149 * pared down from XButtonEvent
145 */ 150 */
146struct mouse_event { 151struct mouse_event {
147 int clicks; 152 int clicks;
148 Time time; /* milliseconds */ 153 Time time; /* milliseconds */
149 unsigned int state; /* key or button mask */ 154 unsigned int state; /* key or button mask */
150 unsigned int button; /* detail */ 155 unsigned int button; /* detail */
151}; 156};
152
153#define MAX_IT(current, other) if ((other) > (current)) (current) = (other)
154#define MIN_IT(current, other) if ((other) < (current)) (current) = (other)
155#define SWAP_IT(one, two, typeof) \
156 do { \
157 typeof swapittmp; \
158 (swapittmp) = (one); (one) = (two); (two) = (swapittmp); \
159 } while (/* CONSTCOND */ 0)
160#define BOUND_POSITIVE_INT16(val) \
161 (int16_t) ((val) <= 0 \
162 ? 0 \
163 : min ((val), (((uint16_t)-1)>>1)))
164 157
165#if ENABLE_FRILLS 158#if ENABLE_FRILLS
166typedef struct _mwmhints { 159typedef struct _mwmhints {
167 CARD32 flags; 160 CARD32 flags;
168 CARD32 functions; 161 CARD32 functions;
… …
170 INT32 input_mode; 163 INT32 input_mode;
171 CARD32 status; 164 CARD32 status;
172} MWMHints; 165} MWMHints;
173#endif 166#endif
174 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
175/* 193/*
176 ***************************************************************************** 194 *****************************************************************************
177 * NORMAL DEFINES 195 * NORMAL DEFINES
178 ***************************************************************************** 196 *****************************************************************************
179 */ 197 */
… …
195 213
196#ifdef NO_RESOURCES 214#ifdef NO_RESOURCES
197# undef USE_XGETDEFAULT 215# undef USE_XGETDEFAULT
198#endif 216#endif
199 217
200#if ISO_14755 218#if defined (ISO_14755) || defined (ENABLE_PERL)
201# define ENABLE_OVERLAY 1 219# define ENABLE_OVERLAY 1
202#endif 220#endif
203 221
204/* now look for other badly set stuff */ 222/* now look for other badly set stuff */
205 223
… …
220# define HAVE_SCROLLBARS 1 238# define HAVE_SCROLLBARS 1
221#endif 239#endif
222 240
223/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 241/* width of scrollBar, menuBar shadow, must be 1 or 2 */
224#ifdef HALFSHADOW 242#ifdef HALFSHADOW
225# define SHADOW 1 243# define MENU_SHADOW 1
226#else 244#else
227# define SHADOW 2 245# define MENU_SHADOW 2
228#endif 246#endif
229 247
230#define R_SB_ALIGN_CENTRE 0 248#define R_SB_ALIGN_CENTRE 0
231#define R_SB_ALIGN_TOP 1 249#define R_SB_ALIGN_TOP 1
232#define R_SB_ALIGN_BOTTOM 2 250#define R_SB_ALIGN_BOTTOM 2
233 251
234#define R_SB_RXVT 0
235#define R_SB_NEXT 1 252#define R_SB_NEXT 1
236#define R_SB_XTERM 2 253#define R_SB_XTERM 2
237#define R_SB_PLAIN 4 254#define R_SB_PLAIN 4
255#define R_SB_RXVT 8
238 256
239#define SB_WIDTH_NEXT 19 257#define SB_WIDTH_NEXT 19
240#define SB_WIDTH_XTERM 15 258#define SB_WIDTH_XTERM 15
241#define SB_WIDTH_PLAIN 7 259#define SB_WIDTH_PLAIN 7
242#ifndef SB_WIDTH_RXVT 260#ifndef SB_WIDTH_RXVT
… …
324#define FONT_DN "#-" 342#define FONT_DN "#-"
325#define FONT_UP "#+" 343#define FONT_UP "#+"
326 344
327/* flags for rxvt_scr_gotorc () */ 345/* flags for rxvt_scr_gotorc () */
328enum { 346enum {
329 C_RELATIVE = 1 , /* col movement is relative */ 347 C_RELATIVE = 1, /* col movement is relative */
330 R_RELATIVE = 2, /* row movement is relative */ 348 R_RELATIVE = 2, /* row movement is relative */
331 RELATIVE = 1 | 2, 349 RELATIVE = C_RELATIVE | R_RELATIVE,
332}; 350};
333 351
334/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 352/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
335enum { 353enum {
336 INSERT = -1, /* don't change these values */ 354 INSERT = -1, /* don't change these values */
… …
349enum { 367enum {
350 PRIMARY = 0, 368 PRIMARY = 0,
351 SECONDARY, 369 SECONDARY,
352}; 370};
353 371
354#define RS_None 0 /* Normal */ 372#define RS_None 0
355 373
356#define RS_fgMask 0x0000007fUL /* 128 colors */ 374#define RS_fgMask 0x0000007fUL // 128 colors
357#define RS_bgMask 0x00003f80UL /* 128 colors */ 375#define RS_bgMask 0x00003f80UL // 128 colors
358 376
359// font styles 377// font styles
360#define RS_Bold 0x00004000UL // value 1 378#define RS_Bold 0x00004000UL // value 1
361#define RS_Italic 0x00008000UL // value 2 379#define RS_Italic 0x00008000UL // value 2
362 380
363// fake styles 381// fake styles
364#define RS_Blink 0x00010000UL /* blink */ 382#define RS_Blink 0x00010000UL // blink
365#define RS_RVid 0x00020000UL /* reverse video */ 383#define RS_RVid 0x00020000UL // reverse video
366#define RS_Uline 0x00040000UL /* underline */ 384#define RS_Uline 0x00040000UL // underline
367 385
368// 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
369 390
370// other flags 391// other flags
371#define RS_Careful 0x80000000UL /* be careful when drawing these */ 392#define RS_Careful 0x80000000UL /* be careful when drawing these */
372 393
373#define RS_styleCount 4 394#define RS_styleCount 4
… …
435 XTerm_Color_UL = 19, // change actual 'Underline' color 456 XTerm_Color_UL = 19, // change actual 'Underline' color
436 XTerm_Pixmap = 20, // new bg pixmap 457 XTerm_Pixmap = 20, // new bg pixmap
437 XTerm_restoreFG = 39, // change default fg color 458 XTerm_restoreFG = 39, // change default fg color
438 XTerm_restoreBG = 49, // change default bg color 459 XTerm_restoreBG = 49, // change default bg color
439 XTerm_dumpscreen = 55, // dump scrollback and all of screen 460 XTerm_dumpscreen = 55, // dump scrollback and all of screen
461
440 XTerm_locale = 701, // change locale 462 URxvt_locale = 701, // change locale
441 XTerm_Menu = 703, // set menu item 463 URxvt_Menu = 703, // set menu item
442 XTerm_Color_IT = 704, // change actual 'Italic' colour 464 URxvt_Color_IT = 704, // change actual 'Italic' colour
443 XTerm_Color_tint = 705, // change actual tint colour 465 URxvt_Color_tint = 705, // change actual tint colour
444 466
445 URxvt_font = 710, 467 URxvt_font = 710,
446 URxvt_boldFont = 711, 468 URxvt_boldFont = 711,
447 URxvt_italicFont = 712, 469 URxvt_italicFont = 712,
448 URxvt_boldItalicFont = 713, 470 URxvt_boldItalicFont = 713,
471
472 URxvt_view_up = 720,
473 URxvt_view_down = 721,
474
475 URxvt_perl = 777,
449}; 476};
450 477
451/* Words starting with `Color_' are colours. Others are counts */ 478/* Words starting with `Color_' are colours. Others are counts */
452/* 479/*
453 * The following comment is mostly obsolete since pixcolor_set was expanded:
454 * We're currently upto 29 colours. Only 3 more available. The
455 * PixColor and rendition colour usage should probably be decoupled 480 * The PixColor and rendition colour usage should probably be decoupled
456 * 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
457 * 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
458 */ 483 */
459 484
460enum colour_list { 485enum colour_list {
… …
497 Color_BD, 522 Color_BD,
498 Color_IT, 523 Color_IT,
499 Color_UL, 524 Color_UL,
500 Color_RV, 525 Color_RV,
501#endif 526#endif
527#if ENABLE_FRILLS
528 Color_underline,
529#endif
502#ifdef OPTION_HC 530#ifdef OPTION_HC
503 Color_HC, 531 Color_HC,
504#endif 532#endif
505#ifdef KEEP_SCROLLCOLOR 533#ifdef KEEP_SCROLLCOLOR
506 Color_scroll, 534 Color_scroll,
507 Color_trough, 535 Color_trough,
508#endif 536#endif
509#if TINTING 537#if TINTING
510 Color_tint, 538 Color_tint,
539#endif
540#if OFF_FOCUS_FADING
541 Color_fade,
511#endif 542#endif
512 NRS_COLORS, /* */ 543 NRS_COLORS, /* */
513#ifdef KEEP_SCROLLCOLOR 544#ifdef KEEP_SCROLLCOLOR
514 Color_topShadow = NRS_COLORS, 545 Color_topShadow = NRS_COLORS,
515 Color_bottomShadow, 546 Color_bottomShadow,
… …
526 557
527/* 558/*
528 * Resource list 559 * Resource list
529 */ 560 */
530enum { 561enum {
531 Rs_display_name = 0, 562# define def(name) Rs_ ## name,
532 Rs_term_name, 563# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
533 Rs_iconName, 564# include "rsinc.h"
534 Rs_geometry, 565# undef def
535 Rs_reverseVideo, 566# undef reserve
536 Rs_color,
537 _Rs_color = Rs_color + NRS_COLORS - 1,
538 Rs_font,
539#if ENABLE_STYLES
540 Rs_boldFont,
541 Rs_italicFont,
542 Rs_boldItalicFont,
543#endif
544 Rs_name,
545 Rs_title,
546#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
547 Rs_path,
548#endif
549#ifdef XPM_BACKGROUND
550 Rs_backgroundPixmap,
551#endif
552#if (MENUBAR_MAX)
553 Rs_menu,
554#endif
555 Rs_loginShell,
556 Rs_jumpScroll,
557#ifdef HAVE_SCROLLBARS
558 Rs_scrollBar,
559 Rs_scrollBar_right,
560 Rs_scrollBar_floating,
561 Rs_scrollBar_align,
562#endif
563 Rs_scrollstyle, /* Rs_scrollBar_style */
564 Rs_scrollTtyOutput,
565 Rs_scrollTtyKeypress,
566 Rs_scrollWithBuffer,
567 Rs_saveLines,
568 Rs_utmpInhibit,
569 Rs_visualBell,
570#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
571 Rs_mapAlert,
572#endif
573#ifdef META8_OPTION
574 Rs_meta8,
575#endif
576#ifdef MOUSE_WHEEL
577 Rs_mouseWheelScrollPage,
578#endif
579#ifndef NO_BACKSPACE_KEY
580 Rs_backspace_key,
581#endif
582#ifndef NO_DELETE_KEY
583 Rs_delete_key,
584#endif
585 Rs_selectstyle,
586#ifdef PRINTPIPE
587 Rs_print_pipe,
588#endif
589#ifdef USE_XIM
590 Rs_preeditType,
591 Rs_inputMethod,
592#endif
593#ifdef TRANSPARENT
594 Rs_transparent,
595 Rs_transparent_all,
596#endif
597#if ENABLE_FRILLS
598 Rs_ext_bwidth,
599 Rs_int_bwidth,
600 Rs_borderLess,
601#endif
602 Rs_scrollBar_thickness,
603#ifndef NO_LINESPACE
604 Rs_lineSpace,
605#endif
606 Rs_cutchars,
607 Rs_modifier,
608 Rs_answerbackstring,
609 Rs_tripleclickwords,
610 Rs_insecure,
611 Rs_cursorBlink,
612 Rs_pointerBlank,
613 Rs_pointerBlankDelay,
614 Rs_imLocale,
615 Rs_pastableTabs,
616#ifndef NO_SECONDARY_SCREEN
617 Rs_secondaryScreen,
618 Rs_secondaryScroll,
619#endif
620#ifdef OFF_FOCUS_FADING
621 Rs_fade,
622#endif
623#ifdef TINTING
624 Rs_shade,
625#endif
626 NUM_RESOURCES 567 NUM_RESOURCES
627}; 568};
628 569
629// see init.C:xa_names, which must be kept in sync 570// see init.C:xa_names, which must be kept in sync
630enum { 571enum {
… …
634 XA_MULTIPLE, 575 XA_MULTIPLE,
635 XA_TARGETS, 576 XA_TARGETS,
636 XA_TIMESTAMP, 577 XA_TIMESTAMP,
637 XA_VT_SELECTION, 578 XA_VT_SELECTION,
638 XA_INCR, 579 XA_INCR,
580 XA_WM_PROTOCOLS,
639 XA_WMDELETEWINDOW, 581 XA_WM_DELETE_WINDOW,
582 XA_CLIPBOARD,
583#if ENABLE_FRILLS
584 XA_MOTIF_WM_HINTS,
585#endif
586#if ENABLE_EWMH
587 XA_NET_WM_PID,
588 XA_NET_WM_NAME,
589 XA_NET_WM_ICON_NAME,
590 XA_NET_WM_PING,
591#endif
592#if USE_XIM
593 XA_WM_LOCALE_NAME,
594#endif
640#ifdef TRANSPARENT 595#if TRANSPARENT
641 XA_XROOTPMAPID, 596 XA_XROOTPMAP_ID,
642 XA_XSETROOTID, 597 XA_ESETROOT_PMAP_ID,
643#endif 598#endif
644#ifdef OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */ 599#if OFFIX_DND /* OffiX Dnd (drag 'n' drop) support */
645 XA_DNDPROTOCOL, 600 XA_DNDPROTOCOL,
646 XA_DNDSELECTION, 601 XA_DNDSELECTION,
647#endif /* OFFIX_DND */ 602#endif
648 XA_CLIPBOARD, 603#if ENABLE_XEMBED
604 XA_XEMBED,
605 XA_XEMBED_INFO,
606#endif
649 NUM_XA 607 NUM_XA
650}; 608};
651 609
652/* DEC private modes */ 610/* DEC private modes */
653#define PrivMode_132 (1UL<<0) 611#define PrivMode_132 (1UL<<0)
… …
680 priv_modes |= (bit); \ 638 priv_modes |= (bit); \
681 else \ 639 else \
682 priv_modes &= ~(bit) 640 priv_modes &= ~(bit)
683 641
684#ifdef ALLOW_132_MODE 642#ifdef ALLOW_132_MODE
685# 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)
686#else 644#else
687# define PrivMode_Default (PrivMode_Autowrap|PrivMode_aplKP|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 645# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
688#endif 646#endif
689 647
690// do not change these constants lightly, there are many interdependencies 648// do not change these constants lightly, there are many interdependencies
691#define IMBUFSIZ 128 // input modifier buffer sizes 649#define IMBUFSIZ 128 // input modifier buffer sizes
692#define KBUFSZ 512 // size of keyboard mapping buffer 650#define KBUFSZ 512 // size of keyboard mapping buffer
693#define CBUFSIZ 4096 // size of command buffer 651#define CBUFSIZ 2048 // size of command buffer
694#define UBUFSIZ 4096 // character buffer 652#define UBUFSIZ 2048 // character buffer
695 653
696#ifndef PATH_MAX 654#ifndef PATH_MAX
697# define PATH_MAX 16384 655# define PATH_MAX 16384
698#endif 656#endif
699 657
… …
743#define strdup(x) strdup((const char *)(x)) 701#define strdup(x) strdup((const char *)(x))
744#define strlen(x) strlen((const char *)(x)) 702#define strlen(x) strlen((const char *)(x))
745#define strchr(x, y) strchr((const char *)(x), (int)(y)) 703#define strchr(x, y) strchr((const char *)(x), (int)(y))
746#define strrchr(x, y) strrchr((const char *)(x), (int)(y)) 704#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
747 705
706#define dDisp Display *disp = display->display
707
748/* convert pixel dimensions to row/column values. Everything as int32_t */ 708/* convert pixel dimensions to row/column values. Everything as int32_t */
749#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 709#define Pixel2Col(x) Pixel2Width((int32_t)(x))
750#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 710#define Pixel2Row(y) Pixel2Height((int32_t)(y))
751#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 711#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
752#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 712#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
753#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 713#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
754#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 714#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
755#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 715#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
756#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 716#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
757 717
758#define TermWin_TotalWidth() ((int32_t)TermWin.width) 718#define TermWin_TotalWidth() ((int32_t)this->width)
759#define TermWin_TotalHeight() ((int32_t)TermWin.height) 719#define TermWin_TotalHeight() ((int32_t)this->height)
720
721// for m >= -n, ensure remainder lies between 0..n-1
722#define MOD(m,n) (((m) + (n)) % (n))
723
724#define LINENO(n) MOD (term_start + int(n), total_rows)
725#define ROW(n) row_buf [LINENO (n)]
760 726
761/* how to build & extract colors and attributes */ 727/* how to build & extract colors and attributes */
762#define GET_BASEFG(x) (((x) & RS_fgMask)) 728#define GET_BASEFG(x) (((x) & RS_fgMask))
763#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 729#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits)
764#ifndef NO_BRIGHTCOLOR
765# define GET_FGCOLOR(x) \
766 ((((x) & RS_Bold) == 0 \
767 || GET_BASEFG (x) < minCOLOR \
768 || GET_BASEFG (x) >= minBrightCOLOR) \
769 ? GET_BASEFG (x) \
770 : (GET_BASEFG (x) + (minBrightCOLOR - minCOLOR)))
771# define GET_BGCOLOR(x) \
772 ((((x) & RS_Blink) == 0 \
773 || GET_BASEBG (x) < minCOLOR \
774 || GET_BASEBG (x) >= minBrightCOLOR) \
775 ? GET_BASEBG (x) \
776 : (GET_BASEBG (x) + (minBrightCOLOR - minCOLOR)))
777#else
778# define GET_FGCOLOR(x) GET_BASEFG(x)
779# define GET_BGCOLOR(x) GET_BASEBG(x)
780#endif
781 730
782#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 731#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
783#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 732#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
784 733
785#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 734#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
798 747
799#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 748#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS)))
800#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 749#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
801 750
802#if ENABLE_STYLES 751#if ENABLE_STYLES
803# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 752# define FONTSET(style) fontset[GET_STYLE (style)]
804#else 753#else
805# define FONTSET(style) TermWin.fontset[0] 754# define FONTSET(style) fontset[0]
806#endif 755#endif
807 756
808#ifdef HAVE_SCROLLBARS 757#ifdef HAVE_SCROLLBARS
809# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 758# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
810#else 759#else
… …
835#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 784#define scrollbar_size() (scrollBar.end - scrollBar.beg \
836 - scrollbar_minheight ()) 785 - scrollbar_minheight ())
837 786
838#if (MENUBAR_MAX > 1) 787#if (MENUBAR_MAX > 1)
839/* rendition style flags */ 788/* rendition style flags */
840# define menuBar_height() (TermWin.fheight + SHADOW) 789# define menuBar_height() (fheight + MENU_SHADOW)
841# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 790# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
842# define isMenuBarWindow(w) ((w) == menuBar.win) 791# define isMenuBarWindow(w) ((w) == menuBar.win)
843#else 792#else
844# define menuBar_height() (0) 793# define menuBar_height() (0)
845# define menuBar_TotalHeight() (0) 794# define menuBar_TotalHeight() (0)
846# define isMenuBarWindow(w) (0) 795# define isMenuBarWindow(w) (0)
… …
849#ifdef XPM_BACKGROUND 798#ifdef XPM_BACKGROUND
850# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 799# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
851#else 800#else
852# define XPMClearArea(a, b, c, d, e, f, g) 801# define XPMClearArea(a, b, c, d, e, f, g)
853#endif 802#endif
854
855#ifndef STRICT_FONT_CHECKING
856# define rxvt_get_fontwidest(font) ((font)->max_bounds.width)
857#endif
858
859#define rxvt_Gr_ButtonPress(x,y) rxvt_Gr_ButtonReport (R, 'P',(x),(y))
860#define rxvt_Gr_ButtonRelease(x,y) rxvt_Gr_ButtonReport (R, 'R',(x),(y))
861 803
862#ifdef UTMP_SUPPORT 804#ifdef UTMP_SUPPORT
863# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX) 805# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
864# undef HAVE_UTMPX_H 806# undef HAVE_UTMPX_H
865# undef HAVE_STRUCT_UTMPX 807# undef HAVE_STRUCT_UTMPX
… …
899#endif 841#endif
900 842
901extern class rxvt_failure_exception { } rxvt_failure_exception; 843extern class rxvt_failure_exception { } rxvt_failure_exception;
902 844
903typedef callback1<void, const char *> log_callback; 845typedef callback1<void, const char *> log_callback;
846typedef callback1<int, int> getfd_callback;
904 847
905extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 848extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
906extern void rxvt_log (const char *fmt, ...); 849extern void rxvt_log (const char *fmt, ...);
907extern void rxvt_warn (const char *fmt, ...); 850extern void rxvt_warn (const char *fmt, ...);
908extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 851extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
909extern void rxvt_exit_failure () __attribute__ ((noreturn)); 852extern void rxvt_exit_failure () __attribute__ ((noreturn));
910 853
911#define SET_LOCALE(locale) rxvt_set_locale (locale) 854#define SET_LOCALE(locale) rxvt_set_locale (locale)
912extern bool rxvt_set_locale (const char *locale); 855extern bool rxvt_set_locale (const char *locale);
856extern bool rxvt_push_locale (const char *locale);
857extern void rxvt_pop_locale ();
913 858
914/* 859/*
915 ***************************************************************************** 860 *****************************************************************************
916 * VARIABLES 861 * VARIABLES
917 ***************************************************************************** 862 *****************************************************************************
… …
938 883
939 operator mbstate_t *() { return &mbs; } 884 operator mbstate_t *() { return &mbs; }
940 void reset () { memset (&mbs, 0, sizeof (mbs)); } 885 void reset () { memset (&mbs, 0, sizeof (mbs)); }
941 mbstate () { reset (); } 886 mbstate () { reset (); }
942}; 887};
888
889#define UNICODE_MASK 0x1fffffUL
943 890
944#if UNICODE3 891#if UNICODE3
945# define COMPOSE_LO 0x40000000UL 892# define COMPOSE_LO 0x40000000UL
946# define COMPOSE_HI 0x400fffffUL 893# define COMPOSE_HI 0x400fffffUL
947# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 894# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
… …
977 924
978extern class rxvt_composite_vec rxvt_composite; 925extern class rxvt_composite_vec rxvt_composite;
979#endif 926#endif
980 927
981 928
929#ifdef KEYSYM_RESOURCE
930 class keyboard_manager;
931#endif
932
982struct rxvt_term : zero_initialized, rxvt_vars { 933struct rxvt_term : zero_initialized, rxvt_vars {
983 log_callback *log_hook; // log error messages through this hook, if != 0 934 log_callback *log_hook; // log error messages through this hook, if != 0
935 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
936
937#if ENABLE_PERL
938 void *self; // perl's $self
939#endif
984 940
985 struct mbstate mbstate; // current input multibyte state 941 struct mbstate mbstate; // current input multibyte state
986 942
987 unsigned char want_refresh:1, 943 unsigned char want_refresh:1,
988#ifdef TRANSPARENT 944#ifdef TRANSPARENT
… …
1003 hidden_text:1, 959 hidden_text:1,
1004#endif 960#endif
1005#ifdef POINTER_BLANK 961#ifdef POINTER_BLANK
1006 hidden_pointer:1, 962 hidden_pointer:1,
1007#endif 963#endif
1008// enc_utf8:1, /* wether terminal reads/writes utf-8 */ 964 enc_utf8:1, /* wether locale uses utf-8 */
1009 seen_input:1, /* wether we have seen some program output yet */ 965 seen_input:1, /* wether we have seen some program output yet */
1010 seen_resize:1, /* wether we had a resize event */ 966 seen_resize:1, /* wether we had a resize event */
1011 parsed_geometry:1; 967 parsed_geometry:1;
1012 968
1013 unsigned char refresh_type, 969 unsigned char refresh_type,
… …
1059# ifdef POINTER_BLANK 1015# ifdef POINTER_BLANK
1060 pointerBlankDelay, 1016 pointerBlankDelay,
1061# endif 1017# endif
1062 allowedxerror; 1018 allowedxerror;
1063/* ---------- */ 1019/* ---------- */
1064 unsigned int ModMetaMask, 1020 unsigned int ModLevel3Mask,
1021 ModMetaMask,
1065 ModNumLockMask; 1022 ModNumLockMask;
1066 int old_width, /* last used width in screen resize */ 1023 int old_width, /* last used width in screen resize */
1067 old_height; /* last used height in screen resize */ 1024 old_height; /* last used height in screen resize */
1068 unsigned long priv_modes, 1025 unsigned long priv_modes,
1069 SavedModes; 1026 SavedModes;
… …
1099#endif 1056#endif
1100/* ---------- */ 1057/* ---------- */
1101 Time selection_time, 1058 Time selection_time,
1102 selection_request_time; 1059 selection_request_time;
1103 pid_t cmd_pid; /* process id of child */ 1060 pid_t cmd_pid; /* process id of child */
1061 char * incr_buf;
1062 size_t incr_buf_size, incr_buf_fill;
1104/* ---------- */ 1063/* ---------- */
1105 Cursor leftptr_cursor; 1064 Cursor leftptr_cursor;
1106#ifdef POINTER_BLANK
1107 Cursor blank_cursor;
1108#endif
1109/* ---------- */ 1065/* ---------- */
1110#ifndef NO_BACKSPACE_KEY 1066#ifndef NO_BACKSPACE_KEY
1111 const char *key_backspace; 1067 const char *key_backspace;
1112#endif 1068#endif
1113#ifndef NO_DELETE_KEY 1069#ifndef NO_DELETE_KEY
… …
1158 void scr_overlay_off (); 1114 void scr_overlay_off ();
1159 void scr_overlay_set (int x, int y, 1115 void scr_overlay_set (int x, int y,
1160 text_t text, 1116 text_t text,
1161 rend_t rend = OVERLAY_RSTYLE); 1117 rend_t rend = OVERLAY_RSTYLE);
1162 void scr_overlay_set (int x, int y, const char *s); 1118 void scr_overlay_set (int x, int y, const char *s);
1119 void scr_overlay_set (int x, int y, const wchar_t *s);
1163#endif 1120#endif
1164 1121
1165 vector<void *> allocated; // free these memory blocks with free() 1122 vector<void *> allocated; // free these memory blocks with free()
1166 1123
1167 char *env_windowid; /* environmental variable WINDOWID */ 1124 char *env_windowid; /* environmental variable WINDOWID */
1168 char *env_display; /* environmental variable DISPLAY */ 1125 char *env_display; /* environmental variable DISPLAY */
1169 char *env_term; /* environmental variable TERM */ 1126 char *env_term; /* environmental variable TERM */
1170 char *env_colorfgbg; 1127 char *env_colorfgbg;
1171 char *locale; 1128 char *locale;
1172#if 0
1173 char *codeset;
1174#endif
1175 char charsets[4]; 1129 char charsets[4];
1176 unsigned char *v_buffer; /* pointer to physical buffer */ 1130 unsigned char *v_buffer; /* pointer to physical buffer */
1177 unsigned int v_buflen; /* size of area to write */ 1131 unsigned int v_buflen; /* size of area to write */
1178 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1132 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1133
1179#ifdef KEYSYM_RESOURCE 1134#ifdef KEYSYM_RESOURCE
1180 const unsigned char *Keysym_map[256]; 1135 keyboard_manager *keyboard;
1181#endif 1136#endif
1137
1182 const char *rs[NUM_RESOURCES]; 1138 const char *rs[NUM_RESOURCES];
1183 /* command input buffering */ 1139 /* command input buffering */
1184 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1140 unsigned char *cmdbuf_ptr, *cmdbuf_endp;
1185 unsigned char cmdbuf_base[CBUFSIZ]; 1141 unsigned char cmdbuf_base[CBUFSIZ];
1186 1142
… …
1193 // ISO 14755 entry support 1149 // ISO 14755 entry support
1194 unicode_t iso14755buf; 1150 unicode_t iso14755buf;
1195 void commit_iso14755 (); 1151 void commit_iso14755 ();
1196 int hex_keyval (XKeyEvent &ev); 1152 int hex_keyval (XKeyEvent &ev);
1197# if ISO_14755 1153# if ISO_14755
1198 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1154 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1199 void iso14755_54 (int x, int y); 1155 void iso14755_54 (int x, int y);
1200# endif 1156# endif
1201#endif 1157#endif
1202 1158
1159 // modifies first argument(!)
1203 void paste (const unsigned char *data, unsigned int len); 1160 void paste (unsigned char *data, unsigned int len);
1204 1161
1205 void flush (); 1162 void flush ();
1206 1163
1207#if TRANSPARENT 1164#if TRANSPARENT
1208 void rootwin_cb (XEvent &xev); 1165 void rootwin_cb (XEvent &xev);
1209 xevent_watcher rootwin_ev; 1166 xevent_watcher rootwin_ev;
1210#endif 1167#endif
1211
1212
1213 void sig_term (sig_watcher &w); sig_watcher sw_term;
1214 void sig_chld (sig_watcher &w); sig_watcher sw_chld;
1215 1168
1216 void x_cb (XEvent &xev); 1169 void x_cb (XEvent &xev);
1217 xevent_watcher termwin_ev; 1170 xevent_watcher termwin_ev;
1218 xevent_watcher vt_ev; 1171 xevent_watcher vt_ev;
1219#ifdef HAVE_SCROLLBARS 1172#ifdef HAVE_SCROLLBARS
… …
1254#endif 1207#endif
1255 void pointer_unblank (); 1208 void pointer_unblank ();
1256 1209
1257 void tt_printf (const char *fmt,...); 1210 void tt_printf (const char *fmt,...);
1258 void tt_write (const unsigned char *data, unsigned int len); 1211 void tt_write (const unsigned char *data, unsigned int len);
1212 void pty_write ();
1259 1213
1260 void tt_winch (); 1214 void tt_winch ();
1261 1215
1262 rxvt_term (); 1216 rxvt_term ();
1263 ~rxvt_term (); 1217 ~rxvt_term ();
1218 void child_exit (); // child has exited, usually destroys
1264 void destroy (); 1219 void destroy ();
1220 void emergency_cleanup ();
1265 1221
1266 bool init (int argc, const char *const *argv); 1222 bool init (int argc, const char *const *argv);
1267 bool init_vars (); 1223 bool init_vars ();
1268 1224
1269 bool pty_fill (); 1225 bool pty_fill ();
… …
1278 int run_child (const char *const *argv); 1234 int run_child (const char *const *argv);
1279 1235
1280 void color_aliases (int idx); 1236 void color_aliases (int idx);
1281 void recolour_cursor (); 1237 void recolour_cursor ();
1282 void create_windows (int argc, const char *const *argv); 1238 void create_windows (int argc, const char *const *argv);
1283 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1239 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1284 void window_calc (unsigned int width, unsigned int height); 1240 void window_calc (unsigned int newwidth, unsigned int newheight);
1285 1241
1286#if USE_XIM 1242#if USE_XIM
1287 rxvt_xim *input_method; 1243 rxvt_xim *input_method;
1288 XIC Input_Context; 1244 XIC Input_Context;
1289 XIMStyle input_style; 1245 XIMStyle input_style;
… …
1323 1279
1324 bool cmd_parse (); 1280 bool cmd_parse ();
1325 void mouse_report (XButtonEvent &ev); 1281 void mouse_report (XButtonEvent &ev);
1326 void button_press (XButtonEvent &ev); 1282 void button_press (XButtonEvent &ev);
1327 void button_release (XButtonEvent &ev); 1283 void button_release (XButtonEvent &ev);
1284 void focus_in ();
1285 void focus_out ();
1328 int check_our_parents (); 1286 int check_our_parents ();
1329#ifdef PRINTPIPE 1287#ifdef PRINTPIPE
1330 FILE *popen_printer (); 1288 FILE *popen_printer ();
1331 int pclose_printer (FILE *stream); 1289 int pclose_printer (FILE *stream);
1332#endif 1290#endif
… …
1352 void makeutent (const char *pty, const char *hostname); 1310 void makeutent (const char *pty, const char *hostname);
1353 void cleanutent (); 1311 void cleanutent ();
1354 // main.C 1312 // main.C
1355 void privileged_utmp (rxvt_privaction action); 1313 void privileged_utmp (rxvt_privaction action);
1356 bool set_fonts (); 1314 bool set_fonts ();
1315 void set_string_property (Atom prop, const char *str, int len = -1);
1316 void set_utf8_property (Atom prop, const char *str, int len = -1);
1357 void set_title (const char *str); 1317 void set_title (const char *str);
1358 void set_icon_name (const char *str); 1318 void set_icon_name (const char *str);
1359 void set_window_color (int idx, const char *color); 1319 void set_window_color (int idx, const char *color);
1360 void set_colorfgbg (); 1320 void set_colorfgbg ();
1361 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1321 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1362 void set_widthheight (unsigned int width, unsigned int height); 1322 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1363 1323
1364#ifdef MENUBAR 1324#ifdef MENUBAR
1365 // menubar.C 1325 // menubar.C
1366 void menuitem_free (menu_t *menu, menuitem_t *item); 1326 void menuitem_free (menu_t *menu, menuitem_t *item);
1367 int action_dispatch (action_t *action); 1327 int action_dispatch (action_t *action);
… …
1393 void menubar_control (XButtonEvent &ev); 1353 void menubar_control (XButtonEvent &ev);
1394 void map_menuBar (int map); 1354 void map_menuBar (int map);
1395#endif 1355#endif
1396 1356
1397 // screen.C 1357 // screen.C
1398 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1358
1399 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1359 void lalloc (line_t &l)
1360 {
1361 l.t = (text_t *)talloc->alloc ();
1362 l.r = (rend_t *)ralloc->alloc ();
1363 }
1364
1365#if 0
1366 void lfree (line_t &l)
1367 {
1368 talloc->free (l.t);
1369 ralloc->free (l.r);
1370 }
1371#endif
1372
1373 void lresize (line_t &l)
1374 {
1375 if (!l.t)
1376 return;
1377
1378 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1379 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1380
1381 l.l = min (l.l, ncol);
1382
1383 if (ncol > prev_ncol)
1384 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1385 }
1386
1387 int fgcolor_of (rend_t r)
1388 {
1389 int base = GET_BASEFG (r);
1390#ifndef NO_BRIGHTCOLOR
1391 if (r & RS_Bold
1392# if ENABLE_STYLES
1393 && OPTION (Opt_intensityStyles)
1394# endif
1395 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1396 base += minBrightCOLOR - minCOLOR;
1397#endif
1398 return base;
1399 }
1400
1401 int bgcolor_of (rend_t r)
1402 {
1403 int base = GET_BASEBG (r);
1404#ifndef NO_BRIGHTCOLOR
1405 if (r & RS_Blink
1406# if ENABLE_STYLES
1407 && OPTION (Opt_intensityStyles)
1408# endif
1409 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1410 base += minBrightCOLOR - minCOLOR;
1411#endif
1412 return base;
1413 }
1414
1415 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs);
1416 void scr_blank_screen_mem (line_t &l, rend_t efs);
1400 int scr_scroll_text (int row1, int row2, int count, int spec); 1417 int scr_scroll_text (int row1, int row2, int count);
1401 void scr_reset (); 1418 void scr_reset ();
1402 void scr_reset_realloc ();
1403 void scr_release (); 1419 void scr_release ();
1404 void scr_clear (bool really = false); 1420 void scr_clear (bool really = false);
1405 void scr_refresh (unsigned char refresh_type); 1421 void scr_refresh (unsigned char refresh_type);
1406 bool scr_refresh_rend (rend_t mask, rend_t value); 1422 bool scr_refresh_rend (rend_t mask, rend_t value);
1407 void scr_erase_screen (int mode); 1423 void scr_erase_screen (int mode);
1424#if ENABLE_FRILLS
1425 void scr_erase_savelines ();
1426 void scr_backindex ();
1427 void scr_forwardindex ();
1428#endif
1408 void scr_touch (bool refresh); 1429 void scr_touch (bool refresh);
1409 void scr_expose (int x, int y, int width, int height, bool refresh); 1430 void scr_expose (int x, int y, int width, int height, bool refresh);
1410 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1431 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1411 void scr_recolour (); 1432 void scr_recolour ();
1412 void scr_remap_chars (); 1433 void scr_remap_chars ();
1413 void scr_remap_chars (text_t *tp, rend_t *rp); 1434 void scr_remap_chars (const line_t &l);
1414 1435
1415 void scr_poweron (); 1436 void scr_poweron ();
1416 void scr_cursor (int mode); 1437 void scr_cursor (int mode);
1417 void scr_do_wrap (); 1438 void scr_do_wrap ();
1418 int scr_change_screen (int scrn); 1439 int scr_change_screen (int scrn);
1419 void scr_color (unsigned int color, int fgbg); 1440 void scr_color (unsigned int color, int fgbg);
1420 void scr_rendition (int set, int style); 1441 void scr_rendition (int set, int style);
1421 void scr_add_lines (const unicode_t *str, int nlines, int len); 1442 void scr_add_lines (const unicode_t *str, int nlines, int len);
1422 void scr_backspace (); 1443 void scr_backspace ();
1423 void scr_tab (int count, bool ht = false); 1444 void scr_tab (int count, bool ht = false);
1424 void scr_backindex ();
1425 void scr_forwardindex ();
1426 void scr_gotorc (int row, int col, int relative); 1445 void scr_gotorc (int row, int col, int relative);
1427 void scr_index (enum page_dirn direction); 1446 void scr_index (enum page_dirn direction);
1428 void scr_erase_line (int mode); 1447 void scr_erase_line (int mode);
1429 void scr_E (); 1448 void scr_E ();
1430 void scr_insdel_lines (int count, int insdel); 1449 void scr_insdel_lines (int count, int insdel);
… …
1446 void scr_bell (); 1465 void scr_bell ();
1447 void scr_printscreen (int fullhist); 1466 void scr_printscreen (int fullhist);
1448 void scr_reverse_selection (); 1467 void scr_reverse_selection ();
1449 void scr_dump (int fd); 1468 void scr_dump (int fd);
1450 void selection_check (int check_more); 1469 void selection_check (int check_more);
1451 int selection_paste (Window win, Atom prop, bool delete_prop); 1470 void selection_paste (Window win, Atom prop, bool delete_prop);
1452 void selection_property (Window win, Atom prop); 1471 void selection_property (Window win, Atom prop);
1453 void selection_request (Time tm, int x, int y); 1472 void selection_request (Time tm, int x, int y);
1454 int selection_request_other (Atom target, int selnum); 1473 int selection_request_other (Atom target, int selnum);
1455 void selection_clear (); 1474 void selection_clear ();
1456 void selection_make (Time tm); 1475 void selection_make (Time tm);
1476 bool selection_grab (Time tm);
1457 void selection_start_colrow (int col, int row); 1477 void selection_start_colrow (int col, int row);
1458 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1478 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1459 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1479 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1460 void selection_remove_trailing_spaces (); 1480 void selection_remove_trailing_spaces ();
1461 void selection_send (const XSelectionRequestEvent &rq); 1481 void selection_send (const XSelectionRequestEvent &rq);
… …
1491 1511
1492 // xdefaults.C 1512 // xdefaults.C
1493 void get_options (int argc, const char *const *argv); 1513 void get_options (int argc, const char *const *argv);
1494 int parse_keysym (const char *str, const char *arg); 1514 int parse_keysym (const char *str, const char *arg);
1495 void get_xdefaults (FILE *stream, const char *name); 1515 void get_xdefaults (FILE *stream, const char *name);
1496 void extract_resources (Display *display, const char *name); 1516 void extract_resources ();
1497 // xpm.C 1517 // xpm.C
1498 int scale_pixmap (const char *geom); 1518 int scale_pixmap (const char *geom);
1499 void resize_pixmap (); 1519 void resize_pixmap ();
1500 Pixmap set_bgPixmap (const char *file); 1520 Pixmap set_bgPixmap (const char *file);
1501}; 1521};

Diff Legend

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