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.207 by root, Mon Jan 16 09:51:57 2006 UTC

… …
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include "rxvtlib.h" 4#include "rxvtlib.h"
5 5
6#include "feature.h" 6#include "feature.h"
7
8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1
10#endif
11
12#if ENABLE_PERL
13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1
15#endif
16
17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1
20# define CURSOR_BLINK 1
21#else
22# define ENABLE_MINIMAL 1
23#endif
7 24
8#include <limits.h> 25#include <limits.h>
9 26
10#include <X11/cursorfont.h> 27#include <X11/cursorfont.h>
11#include <X11/keysym.h> 28#include <X11/keysym.h>
… …
19#include "rxvtfont.h" 36#include "rxvtfont.h"
20#include "rxvttoolkit.h" 37#include "rxvttoolkit.h"
21#include "iom.h" 38#include "iom.h"
22#include "salloc.h" 39#include "salloc.h"
23 40
24#if ENABLE_FRILLS 41#include "rxvtperl.h"
25# define ENABLE_XEMBED 1 42
43// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL
45# define strcmp(a,b) (strcmp)(a,b)
46# define strlen(a) (strlen)(a)
47# define strcpy(a,b) (strcpy)(a,b)
48# define memset(a,c,l) (memset)(a,c,l)
49# define memcpy(a,b,l) (memcpy)(a,b,l)
26#endif 50#endif
27 51
28/* 52/*
29 ***************************************************************************** 53 *****************************************************************************
30 * SYSTEM HACKS 54 * SYSTEM HACKS
… …
39#if defined (sun) && !defined (__sun__) 63#if defined (sun) && !defined (__sun__)
40# define __sun__ 1 64# define __sun__ 1
41#endif 65#endif
42 66
43#ifndef HAVE_XPOINTER 67#ifndef HAVE_XPOINTER
44typedef char *XPointer; 68typedef char *XPointer;
45#endif 69#endif
46 70
47#ifdef HAVE_TERMIOS_H 71#ifdef HAVE_TERMIOS_H
48# include <termios.h> 72# include <termios.h>
49typedef struct termios ttymode_t; 73typedef struct termios ttymode_t;
… …
68 92
69#ifndef STDIN_FILENO 93#ifndef STDIN_FILENO
70# define STDIN_FILENO 0 94# define STDIN_FILENO 0
71# define STDOUT_FILENO 1 95# define STDOUT_FILENO 1
72# define STDERR_FILENO 2 96# 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 97#endif
83 98
84/* 99/*
85 ***************************************************************************** 100 *****************************************************************************
86 * PROTOTYPES 101 * PROTOTYPES
… …
116char ** rxvt_splitcommastring (const char *cs); 131char ** rxvt_splitcommastring (const char *cs);
117void rxvt_freecommastring (char **cs); 132void rxvt_freecommastring (char **cs);
118char * rxvt_File_find (const char *file, const char *ext, const char *path); 133char * rxvt_File_find (const char *file, const char *ext, const char *path);
119void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h); 134void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
120void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type); 135void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
136void rxvt_usleep (int usecs);
137
138/////////////////////////////////////////////////////////////////////////////
139
140// temporarily replace the process environment
141extern char **environ;
142extern char **rxvt_environ; // the original environ pointer
143
144inline void set_environ (stringvec *envv)
145{
146 if (envv)
147 environ = (char **)envv->begin ();
148}
149
150inline void set_environ (char **envv)
151{
152 if (envv)
153 environ = envv;
154}
121 155
122/* 156/*
123 ***************************************************************************** 157 *****************************************************************************
124 * STRUCTURES AND TYPEDEFS 158 * STRUCTURES AND TYPEDEFS
125 ***************************************************************************** 159 *****************************************************************************
… …
135#endif 169#endif
136 170
137/* If we're using either the rxvt scrollbar or menu bars, keep the 171/* If we're using either the rxvt scrollbar or menu bars, keep the
138 * scrollColor resource. 172 * scrollColor resource.
139 */ 173 */
140#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 174#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
141# define KEEP_SCROLLCOLOR 1 175# define KEEP_SCROLLCOLOR 1
142#else 176#else
143# undef KEEP_SCROLLCOLOR 177# undef KEEP_SCROLLCOLOR
144#endif 178#endif
145 179
… …
159 Time time; /* milliseconds */ 193 Time time; /* milliseconds */
160 unsigned int state; /* key or button mask */ 194 unsigned int state; /* key or button mask */
161 unsigned int button; /* detail */ 195 unsigned int button; /* detail */
162}; 196};
163 197
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 198#if ENABLE_FRILLS
177typedef struct _mwmhints { 199typedef struct _mwmhints {
178 CARD32 flags; 200 CARD32 flags;
179 CARD32 functions; 201 CARD32 functions;
180 CARD32 decorations; 202 CARD32 decorations;
… …
227 249
228#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 250#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
229# define NO_MOUSE_REPORT_SCROLLBAR 1 251# define NO_MOUSE_REPORT_SCROLLBAR 1
230#endif 252#endif
231 253
232#ifdef NO_RESOURCES
233# undef USE_XGETDEFAULT
234#endif
235
236#if ISO_14755
237# define ENABLE_OVERLAY 1
238#endif
239
240/* now look for other badly set stuff */ 254/* now look for other badly set stuff */
241 255
242#if !defined (EACCESS) && defined(EAGAIN) 256#if !defined (EACCESS) && defined(EAGAIN)
243# define EACCESS EAGAIN 257# define EACCESS EAGAIN
244#endif 258#endif
… …
256# define HAVE_SCROLLBARS 1 270# define HAVE_SCROLLBARS 1
257#endif 271#endif
258 272
259/* width of scrollBar, menuBar shadow, must be 1 or 2 */ 273/* width of scrollBar, menuBar shadow, must be 1 or 2 */
260#ifdef HALFSHADOW 274#ifdef HALFSHADOW
261# define SHADOW 1 275# define MENU_SHADOW 1
262#else 276#else
263# define SHADOW 2 277# define MENU_SHADOW 2
264#endif 278#endif
265 279
266#define R_SB_ALIGN_CENTRE 0 280#define R_SB_ALIGN_CENTRE 0
267#define R_SB_ALIGN_TOP 1 281#define R_SB_ALIGN_TOP 1
268#define R_SB_ALIGN_BOTTOM 2 282#define R_SB_ALIGN_BOTTOM 2
269 283
270#define R_SB_RXVT 0
271#define R_SB_NEXT 1 284#define R_SB_NEXT 1
272#define R_SB_XTERM 2 285#define R_SB_XTERM 2
273#define R_SB_PLAIN 4 286#define R_SB_PLAIN 4
287#define R_SB_RXVT 8
274 288
275#define SB_WIDTH_NEXT 19 289#define SB_WIDTH_NEXT 19
276#define SB_WIDTH_XTERM 15 290#define SB_WIDTH_XTERM 15
277#define SB_WIDTH_PLAIN 7 291#define SB_WIDTH_PLAIN 7
278#ifndef SB_WIDTH_RXVT 292#ifndef SB_WIDTH_RXVT
… …
360#define FONT_DN "#-" 374#define FONT_DN "#-"
361#define FONT_UP "#+" 375#define FONT_UP "#+"
362 376
363/* flags for rxvt_scr_gotorc () */ 377/* flags for rxvt_scr_gotorc () */
364enum { 378enum {
365 C_RELATIVE = 1 , /* col movement is relative */ 379 C_RELATIVE = 1, /* col movement is relative */
366 R_RELATIVE = 2, /* row movement is relative */ 380 R_RELATIVE = 2, /* row movement is relative */
367 RELATIVE = 1 | 2, 381 RELATIVE = C_RELATIVE | R_RELATIVE,
368}; 382};
369 383
370/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 384/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
371enum { 385enum {
372 INSERT = -1, /* don't change these values */ 386 INSERT = -1, /* don't change these values */
… …
385enum { 399enum {
386 PRIMARY = 0, 400 PRIMARY = 0,
387 SECONDARY, 401 SECONDARY,
388}; 402};
389 403
390#define RS_None 0 /* Normal */ 404#define RS_None 0
391 405
392#define RS_fgMask 0x0000007fUL /* 128 colors */ 406#define RS_fgMask 0x0000007fUL // 128 colors
393#define RS_bgMask 0x00003f80UL /* 128 colors */ 407#define RS_bgMask 0x00003f80UL // 128 colors
394 408
395// font styles 409// font styles
396#define RS_Bold 0x00004000UL // value 1 410#define RS_Bold 0x00004000UL // value 1
397#define RS_Italic 0x00008000UL // value 2 411#define RS_Italic 0x00008000UL // value 2
398 412
399// fake styles 413// fake styles
400#define RS_Blink 0x00010000UL /* blink */ 414#define RS_Blink 0x00010000UL // blink
401#define RS_RVid 0x00020000UL /* reverse video */ 415#define RS_RVid 0x00020000UL // reverse video
402#define RS_Uline 0x00040000UL /* underline */ 416#define RS_Uline 0x00040000UL // underline
403 417
404// 5 bits still to go 418// 5 custom bits for extensions
419#define RS_customCount 32
420#define RS_customMask 0x00f80000UL
421#define RS_customShift 19
405 422
406// other flags 423// other flags
407#define RS_Careful 0x80000000UL /* be careful when drawing these */ 424#define RS_Careful 0x80000000UL /* be careful when drawing these */
408 425
409#define RS_styleCount 4 426#define RS_styleCount 4
… …
451 XTerm_property = 3, // change X property 468 XTerm_property = 3, // change X property
452 XTerm_Color = 4, // change colors 469 XTerm_Color = 4, // change colors
453 XTerm_Color00 = 10, // not implemented, CLASH! 470 XTerm_Color00 = 10, // not implemented, CLASH!
454 XTerm_Color01 = 11, // not implemented 471 XTerm_Color01 = 11, // not implemented
455 XTerm_Color_cursor = 12, // change actual 'Cursor' color 472 XTerm_Color_cursor = 12, // change actual 'Cursor' color
456 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 473 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
457 XTerm_Color_pointer_bg = 14, // not implemented 474 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
458 XTerm_Color05 = 15, // not implemented 475 XTerm_Color05 = 15, // not implemented (tektronix fg)
459 XTerm_Color06 = 16, // not implemented 476 XTerm_Color06 = 16, // not implemented (tektronix bg)
460 XTerm_Color_RV = 17, // change actual 'Highlight' color 477 XTerm_Color_RV = 17, // change actual 'Highlight' color
461 XTerm_logfile = 46, // not implemented 478 XTerm_logfile = 46, // not implemented
462 XTerm_font = 50, 479 XTerm_font = 50,
463 480
464 XTerm_konsole30 = 30, // reserved for konsole 481 XTerm_konsole30 = 30, // reserved for konsole
465 XTerm_konsole31 = 31, // reserved for konsole 482 XTerm_konsole31 = 31, // reserved for konsole
466 XTerm_emacs51 = 51, // reserved for emacs shell 483 XTerm_emacs51 = 51, // reserved for emacs shell
467 /* 484 /*
468 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 485 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
486 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
469 */ 487 */
470 XTerm_Color_BD = 18, // change actual 'Bold' color 488 Rxvt_Color_BD = 18, // change actual 'Bold' color
471 XTerm_Color_UL = 19, // change actual 'Underline' color 489 Rxvt_Color_UL = 19, // change actual 'Underline' color
472 XTerm_Pixmap = 20, // new bg pixmap 490 Rxvt_Pixmap = 20, // new bg pixmap
473 XTerm_restoreFG = 39, // change default fg color 491 Rxvt_restoreFG = 39, // change default fg color
474 XTerm_restoreBG = 49, // change default bg color 492 Rxvt_restoreBG = 49, // change default bg color
475 XTerm_dumpscreen = 55, // dump scrollback and all of screen 493 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
494
476 XTerm_locale = 701, // change locale 495 URxvt_locale = 701, // change locale
477 XTerm_Menu = 703, // set menu item 496 URxvt_Menu = 703, // set menu item
478 XTerm_Color_IT = 704, // change actual 'Italic' colour 497 URxvt_Color_IT = 704, // change actual 'Italic' colour
479 XTerm_Color_tint = 705, // change actual tint colour 498 URxvt_Color_tint = 705, // change actual tint colour
499 URxvt_Color_BD = 706,
500 URxvt_Color_UL = 707,
480 501
481 URxvt_font = 710, 502 URxvt_font = 710,
482 URxvt_boldFont = 711, 503 URxvt_boldFont = 711,
483 URxvt_italicFont = 712, 504 URxvt_italicFont = 712,
484 URxvt_boldItalicFont = 713, 505 URxvt_boldItalicFont = 713,
506
507 URxvt_view_up = 720,
508 URxvt_view_down = 721,
509
510 URxvt_perl = 777,
485}; 511};
486 512
487/* Words starting with `Color_' are colours. Others are counts */ 513/* Words starting with `Color_' are colours. Others are counts */
488/* 514/*
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 515 * The PixColor and rendition colour usage should probably be decoupled
492 * on the unnecessary items, e.g. Color_pointer, but won't bother 516 * 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 517 * until we need to. Also, be aware of usage in pixcolor_set
494 */ 518 */
495 519
496enum colour_list { 520enum colour_list {
… …
546 Color_trough, 570 Color_trough,
547#endif 571#endif
548#if TINTING 572#if TINTING
549 Color_tint, 573 Color_tint,
550#endif 574#endif
575#if OFF_FOCUS_FADING
576 Color_fade,
577#endif
551 NRS_COLORS, /* */ 578 NRS_COLORS, /* */
552#ifdef KEEP_SCROLLCOLOR 579#ifdef KEEP_SCROLLCOLOR
553 Color_topShadow = NRS_COLORS, 580 Color_topShadow = NRS_COLORS,
554 Color_bottomShadow, 581 Color_bottomShadow,
555 TOTAL_COLORS 582 TOTAL_COLORS
… …
565 592
566/* 593/*
567 * Resource list 594 * Resource list
568 */ 595 */
569enum { 596enum {
570 Rs_display_name = 0, 597# define def(name) Rs_ ## name,
571 Rs_term_name, 598# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
572 Rs_iconName, 599# include "rsinc.h"
573 Rs_geometry, 600# undef def
574 Rs_reverseVideo, 601# 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 602 NUM_RESOURCES
669}; 603};
670 604
671// see init.C:xa_names, which must be kept in sync 605// see init.C:xa_names, which must be kept in sync
672enum { 606enum {
… …
680 XA_INCR, 614 XA_INCR,
681 XA_WM_PROTOCOLS, 615 XA_WM_PROTOCOLS,
682 XA_WM_DELETE_WINDOW, 616 XA_WM_DELETE_WINDOW,
683 XA_CLIPBOARD, 617 XA_CLIPBOARD,
684#if ENABLE_FRILLS 618#if ENABLE_FRILLS
619 XA_MOTIF_WM_HINTS,
620#endif
621#if ENABLE_EWMH
685 XA_NET_WM_PID, 622 XA_NET_WM_PID,
686 XA_MOTIF_WM_HINTS,
687 XA_NET_WM_NAME, 623 XA_NET_WM_NAME,
688 XA_NET_WM_ICON_NAME, 624 XA_NET_WM_ICON_NAME,
625 XA_NET_WM_PING,
689#endif 626#endif
690#if USE_XIM 627#if USE_XIM
691 XA_WM_LOCALE_NAME, 628 XA_WM_LOCALE_NAME,
692#endif 629#endif
693#if TRANSPARENT 630#if TRANSPARENT
… …
744#endif 681#endif
745 682
746// do not change these constants lightly, there are many interdependencies 683// do not change these constants lightly, there are many interdependencies
747#define IMBUFSIZ 128 // input modifier buffer sizes 684#define IMBUFSIZ 128 // input modifier buffer sizes
748#define KBUFSZ 512 // size of keyboard mapping buffer 685#define KBUFSZ 512 // size of keyboard mapping buffer
749#define CBUFSIZ 4096 // size of command buffer 686#define CBUFSIZ 2048 // size of command buffer
750#define UBUFSIZ 4096 // character buffer 687#define UBUFSIZ 2048 // character buffer
751 688
752#ifndef PATH_MAX 689#ifndef PATH_MAX
753# define PATH_MAX 16384 690# define PATH_MAX 16384
754#endif 691#endif
755 692
… …
783/* 720/*
784 ***************************************************************************** 721 *****************************************************************************
785 * MACRO DEFINES 722 * MACRO DEFINES
786 ***************************************************************************** 723 *****************************************************************************
787 */ 724 */
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 725#define dDisp Display *disp = display->display
805 726
806/* convert pixel dimensions to row/column values. Everything as int32_t */ 727/* convert pixel dimensions to row/column values. Everything as int32_t */
807#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 728#define Pixel2Col(x) Pixel2Width((int32_t)(x))
808#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 729#define Pixel2Row(y) Pixel2Height((int32_t)(y))
809#define Pixel2Width(x) ((int32_t)(x) / (int32_t)TermWin.fwidth) 730#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
810#define Pixel2Height(y) ((int32_t)(y) / (int32_t)TermWin.fheight) 731#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
811#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 732#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
812#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 733#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
813#define Width2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fwidth) 734#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
814#define Height2Pixel(n) ((int32_t)(n) * (int32_t)TermWin.fheight) 735#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
815 736
816#define TermWin_TotalWidth() ((int32_t)TermWin.width) 737#define OPTION(opt) (options & (opt))
817#define TermWin_TotalHeight() ((int32_t)TermWin.height) 738#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
739 | Opt_jumpScroll | Opt_secondaryScreen \
740 | Opt_pastableTabs | Opt_intensityStyles)
741
742// for m >= -n, ensure remainder lies between 0..n-1
743#define MOD(m,n) (((m) + (n)) % (n))
744
745#define LINENO(n) MOD (term_start + int(n), total_rows)
746#define ROW(n) row_buf [LINENO (n)]
818 747
819/* how to build & extract colors and attributes */ 748/* how to build & extract colors and attributes */
820#define GET_BASEFG(x) (((x) & RS_fgMask)) 749#define GET_BASEFG(x) (((x) & RS_fgMask))
821#define GET_BASEBG(x) (((x) & RS_bgMask)>>Color_Bits) 750#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 751
840#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift) 752#define GET_FONT(x) (((x) & RS_fontMask) >> RS_fontShift)
841#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift)) 753#define SET_FONT(x,fid) (((x) & ~RS_fontMask) | ((fid) << RS_fontShift))
842 754
843#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift) 755#define GET_STYLE(x) (((x) & RS_styleMask) >> RS_styleShift)
… …
856 768
857#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 769#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))) 770#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS)))
859 771
860#if ENABLE_STYLES 772#if ENABLE_STYLES
861# define FONTSET(style) TermWin.fontset[GET_STYLE (style)] 773# define FONTSET(style) fontset[GET_STYLE (style)]
862#else 774#else
863# define FONTSET(style) TermWin.fontset[0] 775# define FONTSET(style) fontset[0]
864#endif 776#endif
865 777
866#ifdef HAVE_SCROLLBARS 778#ifdef HAVE_SCROLLBARS
867# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2) 779# define scrollbar_TotalWidth() (scrollBar.width + sb_shadow * 2)
868#else 780#else
… …
893#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 805#define scrollbar_size() (scrollBar.end - scrollBar.beg \
894 - scrollbar_minheight ()) 806 - scrollbar_minheight ())
895 807
896#if (MENUBAR_MAX > 1) 808#if (MENUBAR_MAX > 1)
897/* rendition style flags */ 809/* rendition style flags */
898# define menuBar_height() (TermWin.fheight + SHADOW) 810# define menuBar_height() (fheight + MENU_SHADOW)
899# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin) 811# define menuBar_TotalHeight() (menuBar_height() + MENU_SHADOW + menuBar_margin)
900# define isMenuBarWindow(w) ((w) == menuBar.win) 812# define isMenuBarWindow(w) ((w) == menuBar.win)
901#else 813#else
902# define menuBar_height() (0) 814# define menuBar_height() (0)
903# define menuBar_TotalHeight() (0) 815# define menuBar_TotalHeight() (0)
904# define isMenuBarWindow(w) (0) 816# define isMenuBarWindow(w) (0)
… …
950#endif 862#endif
951 863
952extern class rxvt_failure_exception { } rxvt_failure_exception; 864extern class rxvt_failure_exception { } rxvt_failure_exception;
953 865
954typedef callback1<void, const char *> log_callback; 866typedef callback1<void, const char *> log_callback;
867typedef callback1<int, int> getfd_callback;
955 868
956extern void rxvt_vlog (const char *fmt, va_list arg_ptr); 869extern void rxvt_vlog (const char *fmt, va_list arg_ptr);
957extern void rxvt_log (const char *fmt, ...); 870extern void rxvt_log (const char *fmt, ...);
958extern void rxvt_warn (const char *fmt, ...); 871extern void rxvt_warn (const char *fmt, ...);
959extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 872extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
960extern void rxvt_exit_failure () __attribute__ ((noreturn)); 873extern void rxvt_exit_failure () __attribute__ ((noreturn));
961 874
962#define SET_LOCALE(locale) rxvt_set_locale (locale) 875#define SET_LOCALE(locale) rxvt_set_locale (locale)
963extern bool rxvt_set_locale (const char *locale); 876extern bool rxvt_set_locale (const char *locale);
877extern void rxvt_push_locale (const char *locale);
878extern void rxvt_pop_locale ();
964 879
965/*
966 ***************************************************************************** 880/****************************************************************************/
967 * VARIABLES 881
968 *****************************************************************************
969 */
970#ifdef MENUBAR 882#ifdef MENUBAR
971# include "menubar.h" 883# include "menubar.h"
972#endif 884#endif
973 885
974#define BLINK_INTERVAL 0.5 886#define BLINK_INTERVAL 0.5
… …
981# endif 893# endif
982# endif 894# endif
983# define __attribute__(x) 895# define __attribute__(x)
984#endif 896#endif
985 897
898/****************************************************************************/
899
900#define LINE_LONGER 0x0001 // line is continued on the next row
901#define LINE_FILTERED 0x0002 // line has been filtered
902#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
903
904struct line_t {
905 text_t *t; // terminal the text
906 rend_t *r; // rendition, uses RS_ flags
907 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
908 uint32_t f; // flags
909
910 bool is_longer ()
911 {
912 return f & LINE_LONGER;
913 }
914
915 void is_longer (int set)
916 {
917 if (set)
918 f |= LINE_LONGER;
919 else
920 f &= ~LINE_LONGER;
921 }
922
923 void clear ()
924 {
925 t = 0;
926 r = 0;
927 l = 0;
928 f = 0;
929 }
930
931 void touch () // call whenever a line is changed/touched/updated
932 {
933#if ENABLE_PERL
934 f &= ~LINE_FILTERED;
935#endif
936 }
937
938 void touch (int col)
939 {
940 max_it (l, col);
941 touch ();
942 }
943};
944
945/****************************************************************************/
946
986// primivite wrapper around mbstate_t to ensure initialisation 947// primivite wrapper around mbstate_t to ensure initialisation
987struct mbstate { 948struct mbstate {
988 mbstate_t mbs; 949 mbstate_t mbs;
989 950
990 operator mbstate_t *() { return &mbs; } 951 operator mbstate_t *() { return &mbs; }
991 void reset () { memset (&mbs, 0, sizeof (mbs)); } 952 void reset () { memset (&mbs, 0, sizeof (mbs)); }
992 mbstate () { reset (); } 953 mbstate () { reset (); }
993}; 954};
994 955
956/****************************************************************************/
957
995#define UNICODE_MASK 0x1fffffUL 958#define UNICODE_MASK 0x1fffffUL
996 959
997#if UNICODE3 960#if UNICODE3
998# define COMPOSE_LO 0x40000000UL 961# define COMPOSE_LO 0x40000000UL
999# define COMPOSE_HI 0x400fffffUL 962# define COMPOSE_HI 0x400fffffUL
1000# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 963# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
1001#else 964#else
965# if ENABLE_PERL
966# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
967# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
968# else
1002# define COMPOSE_LO 0xd800UL 969# define COMPOSE_LO 0xd800UL
1003# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 970# define COMPOSE_HI 0xf8ffUL
1004# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 971# endif
972# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
1005#endif 973#endif
1006 974
1007#if ENABLE_COMBINING 975#if ENABLE_COMBINING
1008// compose chars are used to represent composite characters 976// compose chars are used to represent composite characters
1009// that are not representable in unicode, as well as characters 977// that are not representable in unicode, as well as characters
… …
1029}; 997};
1030 998
1031extern class rxvt_composite_vec rxvt_composite; 999extern class rxvt_composite_vec rxvt_composite;
1032#endif 1000#endif
1033 1001
1002/****************************************************************************/
1034 1003
1035#ifdef KEYSYM_RESOURCE 1004#ifdef KEYSYM_RESOURCE
1036 class keyboard_manager; 1005 class keyboard_manager;
1037#endif 1006#endif
1038 1007
1039struct rxvt_term : zero_initialized, rxvt_vars { 1008struct rxvt_term : zero_initialized, rxvt_vars {
1040 log_callback *log_hook; // log error messages through this hook, if != 0 1009 log_callback *log_hook; // log error messages through this hook, if != 0
1041 1010 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1011#if ENABLE_PERL
1012 rxvt_perl_term perl;
1013#endif
1042 struct mbstate mbstate; // current input multibyte state 1014 struct mbstate mbstate; // current input multibyte state
1043 1015
1044 unsigned char want_refresh:1, 1016 unsigned char want_refresh:1,
1045#ifdef TRANSPARENT 1017#ifdef TRANSPARENT
1046 want_full_refresh:1, /* awaiting full screen refresh */ 1018 want_full_refresh:1, /* awaiting full screen refresh */
… …
1196 bar_t *CurrentBar; 1168 bar_t *CurrentBar;
1197# if ! (MENUBAR_MAX > 1) 1169# if ! (MENUBAR_MAX > 1)
1198 bar_t BarList; 1170 bar_t BarList;
1199# endif /* (MENUBAR_MAX > 1) */ 1171# endif /* (MENUBAR_MAX > 1) */
1200#endif 1172#endif
1201#ifdef CURSOR_BLINK
1202 struct timeval lastcursorchange;
1203#endif
1204#ifdef POINTER_BLANK
1205 struct timeval lastmotion;
1206#endif
1207 1173
1208#if ENABLE_OVERLAY 1174#if ENABLE_OVERLAY
1209 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1175 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1210 text_t **ov_text; 1176 text_t **ov_text;
1211 rend_t **ov_rend; 1177 rend_t **ov_rend;
… …
1215 void scr_overlay_off (); 1181 void scr_overlay_off ();
1216 void scr_overlay_set (int x, int y, 1182 void scr_overlay_set (int x, int y,
1217 text_t text, 1183 text_t text,
1218 rend_t rend = OVERLAY_RSTYLE); 1184 rend_t rend = OVERLAY_RSTYLE);
1219 void scr_overlay_set (int x, int y, const char *s); 1185 void scr_overlay_set (int x, int y, const char *s);
1186 void scr_overlay_set (int x, int y, const wchar_t *s);
1220#endif 1187#endif
1221 1188
1222 vector<void *> allocated; // free these memory blocks with free() 1189 vector<void *> allocated; // free these memory blocks with free()
1223 1190
1224 char *env_windowid; /* environmental variable WINDOWID */ 1191 char *env_windowid; /* environmental variable WINDOWID */
1225 char *env_display; /* environmental variable DISPLAY */ 1192 char *env_display; /* environmental variable DISPLAY */
1226 char *env_term; /* environmental variable TERM */ 1193 char *env_term; /* environmental variable TERM */
1227 char *env_colorfgbg; 1194 char *env_colorfgbg;
1228 char *locale; 1195 char *locale;
1229 char charsets[4]; 1196 char charsets[4];
1230 unsigned char *v_buffer; /* pointer to physical buffer */ 1197 char *v_buffer; /* pointer to physical buffer */
1231 unsigned int v_buflen; /* size of area to write */ 1198 unsigned int v_buflen; /* size of area to write */
1232 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1199 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1233 1200
1234#ifdef KEYSYM_RESOURCE 1201#ifdef KEYSYM_RESOURCE
1235 keyboard_manager *keyboard; 1202 keyboard_manager *keyboard;
1236#endif 1203#endif
1237 1204
1238 const char *rs[NUM_RESOURCES]; 1205 const char *rs[NUM_RESOURCES];
1239 /* command input buffering */ 1206 /* command input buffering */
1240 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1207 char *cmdbuf_ptr, *cmdbuf_endp;
1241 unsigned char cmdbuf_base[CBUFSIZ]; 1208 char cmdbuf_base[CBUFSIZ];
1242 1209
1243 rxvt_salloc *talloc; // text line allocator 1210 rxvt_salloc *talloc; // text line allocator
1244 rxvt_salloc *ralloc; // rend line allocator 1211 rxvt_salloc *ralloc; // rend line allocator
1245 1212
1246 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1213 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1249 // ISO 14755 entry support 1216 // ISO 14755 entry support
1250 unicode_t iso14755buf; 1217 unicode_t iso14755buf;
1251 void commit_iso14755 (); 1218 void commit_iso14755 ();
1252 int hex_keyval (XKeyEvent &ev); 1219 int hex_keyval (XKeyEvent &ev);
1253# if ISO_14755 1220# if ISO_14755
1254 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE); 1221 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1255 void iso14755_54 (int x, int y); 1222 void iso14755_54 (int x, int y);
1256# endif 1223# endif
1257#endif 1224#endif
1258 1225
1259 // modifies first argument(!) 1226 // modifies first argument(!)
1260 void paste (unsigned char *data, unsigned int len); 1227 void paste (char *data, unsigned int len);
1261 1228
1262 void flush (); 1229 long vt_emask, vt_emask_perl;
1230
1231 void vt_select_input () const
1232 {
1233 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1234 }
1263 1235
1264#if TRANSPARENT 1236#if TRANSPARENT
1265 void rootwin_cb (XEvent &xev); 1237 void rootwin_cb (XEvent &xev);
1266 xevent_watcher rootwin_ev; 1238 xevent_watcher rootwin_ev;
1267#endif 1239#endif
1268 1240
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
1273 void x_cb (XEvent &xev); 1241 void x_cb (XEvent &xev);
1242 void flush ();
1274 xevent_watcher termwin_ev; 1243 xevent_watcher termwin_ev;
1275 xevent_watcher vt_ev; 1244 xevent_watcher vt_ev;
1276#ifdef HAVE_SCROLLBARS 1245#ifdef HAVE_SCROLLBARS
1277 xevent_watcher scrollbar_ev; 1246 xevent_watcher scrollbar_ev;
1278#endif 1247#endif
… …
1310 void pointer_blank (); 1279 void pointer_blank ();
1311#endif 1280#endif
1312 void pointer_unblank (); 1281 void pointer_unblank ();
1313 1282
1314 void tt_printf (const char *fmt,...); 1283 void tt_printf (const char *fmt,...);
1315 void tt_write (const unsigned char *data, unsigned int len); 1284 void tt_write (const char *data, unsigned int len);
1316 void pty_write (); 1285 void pty_write ();
1317 1286
1318 void tt_winch (); 1287 void tt_winch ();
1319 1288
1320 rxvt_term (); 1289 rxvt_term ();
1321 ~rxvt_term (); 1290 ~rxvt_term ();
1291 void child_exit (); // child has exited, usually destroys
1322 void destroy (); 1292 void destroy ();
1323 void emergency_cleanup (); 1293 void emergency_cleanup ();
1324 1294
1325 bool init (int argc, const char *const *argv); 1295 bool init (int argc, const char *const *argv);
1326 bool init_vars (); 1296 bool init_vars ();
1327 1297
1328 bool pty_fill (); 1298 bool pty_fill ();
1329 1299
1300 void make_current () const // make this the "currently active" urxvt instance
1301 {
1302 SET_R (this);
1303 rxvt_set_locale (locale);
1304 set_environ (envv);
1305 }
1306
1330 void init_secondary (); 1307 void init_secondary ();
1331 const char **init_resources (int argc, const char *const *argv); 1308 const char **init_resources (int argc, const char *const *argv);
1309 const char *x_resource (const char *name);
1332 void init_env (); 1310 void init_env ();
1333 void set_locale (const char *locale); 1311 void set_locale (const char *locale);
1334 void init_xlocale (); 1312 void init_xlocale ();
1335 void init_command (const char *const *argv); 1313 void init_command (const char *const *argv);
1336 void run_command (const char *const *argv); 1314 void run_command (const char *const *argv);
1337 int run_child (const char *const *argv); 1315 int run_child (const char *const *argv);
1338 1316
1339 void color_aliases (int idx); 1317 void color_aliases (int idx);
1340 void recolour_cursor (); 1318 void recolour_cursor ();
1341 void create_windows (int argc, const char *const *argv); 1319 void create_windows (int argc, const char *const *argv);
1342 void resize_all_windows (unsigned int width, unsigned int height, int ignoreparent); 1320 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1343 void window_calc (unsigned int width, unsigned int height); 1321 void window_calc (unsigned int newwidth, unsigned int newheight);
1344 1322
1345#if USE_XIM 1323#if USE_XIM
1346 rxvt_xim *input_method; 1324 rxvt_xim *input_method;
1347 XIC Input_Context; 1325 XIC Input_Context;
1348 XIMStyle input_style; 1326 XIMStyle input_style;
… …
1371 1349
1372 /* autoconvert */ 1350 /* autoconvert */
1373 1351
1374 // command.C 1352 // command.C
1375 void lookup_key (XKeyEvent &ev); 1353 void lookup_key (XKeyEvent &ev);
1376 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1354 unsigned int cmd_write (const char *str, unsigned int count);
1377 1355
1378 unicode_t next_char (); 1356 wchar_t next_char ();
1379 unicode_t cmd_getc (); 1357 wchar_t cmd_getc ();
1380 unicode_t next_octet (); 1358 uint32_t next_octet ();
1381 unicode_t cmd_get8 (); 1359 uint32_t cmd_get8 ();
1382 1360
1383 bool cmd_parse (); 1361 bool cmd_parse ();
1384 void mouse_report (XButtonEvent &ev); 1362 void mouse_report (XButtonEvent &ev);
1385 void button_press (XButtonEvent &ev); 1363 void button_press (XButtonEvent &ev);
1386 void button_release (XButtonEvent &ev); 1364 void button_release (XButtonEvent &ev);
… …
1395 void process_nonprinting (unicode_t ch); 1373 void process_nonprinting (unicode_t ch);
1396 void process_escape_vt52 (unicode_t ch); 1374 void process_escape_vt52 (unicode_t ch);
1397 void process_escape_seq (); 1375 void process_escape_seq ();
1398 void process_csi_seq (); 1376 void process_csi_seq ();
1399 void process_window_ops (const int *args, unsigned int nargs); 1377 void process_window_ops (const int *args, unsigned int nargs);
1400 unsigned char *get_to_st (unicode_t &ends_how); 1378 char *get_to_st (unicode_t &ends_how);
1401 void process_dcs_seq (); 1379 void process_dcs_seq ();
1402 void process_osc_seq (); 1380 void process_osc_seq ();
1403 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1381 void process_color_seq (int report, int color, const char *str, char resp);
1404 void process_xterm_seq (int op, const char *str, unsigned char resp); 1382 void process_xterm_seq (int op, const char *str, char resp);
1405 int privcases (int mode, unsigned long bit); 1383 int privcases (int mode, unsigned long bit);
1406 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1384 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1407 void process_sgr_mode (unsigned int nargs, const int *arg); 1385 void process_sgr_mode (unsigned int nargs, const int *arg);
1408 void process_graphics (); 1386 void process_graphics ();
1409 // init.C 1387 // init.C
… …
1420 void set_title (const char *str); 1398 void set_title (const char *str);
1421 void set_icon_name (const char *str); 1399 void set_icon_name (const char *str);
1422 void set_window_color (int idx, const char *color); 1400 void set_window_color (int idx, const char *color);
1423 void set_colorfgbg (); 1401 void set_colorfgbg ();
1424 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1402 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1425 void set_widthheight (unsigned int width, unsigned int height); 1403 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1426 1404
1427#ifdef MENUBAR 1405#ifdef MENUBAR
1428 // menubar.C 1406 // menubar.C
1429 void menuitem_free (menu_t *menu, menuitem_t *item); 1407 void menuitem_free (menu_t *menu, menuitem_t *item);
1430 int action_dispatch (action_t *action); 1408 int action_dispatch (action_t *action);
… …
1456 void menubar_control (XButtonEvent &ev); 1434 void menubar_control (XButtonEvent &ev);
1457 void map_menuBar (int map); 1435 void map_menuBar (int map);
1458#endif 1436#endif
1459 1437
1460 // screen.C 1438 // screen.C
1461 void scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs); 1439
1462 void scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs); 1440 void lalloc (line_t &l) const
1441 {
1442 l.t = (text_t *)talloc->alloc ();
1443 l.r = (rend_t *)ralloc->alloc ();
1444 }
1445
1446#if 0
1447 void lfree (line_t &l)
1448 {
1449 talloc->free (l.t);
1450 ralloc->free (l.r);
1451 }
1452#endif
1453
1454 void lresize (line_t &l) const
1455 {
1456 if (!l.t)
1457 return;
1458
1459 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1460 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1461
1462 l.l = min (l.l, ncol);
1463
1464 if (ncol > prev_ncol)
1465 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1466 }
1467
1468 int fgcolor_of (rend_t r) const
1469 {
1470 int base = GET_BASEFG (r);
1471#ifndef NO_BRIGHTCOLOR
1472 if (r & RS_Bold
1473# if ENABLE_STYLES
1474 && OPTION (Opt_intensityStyles)
1475# endif
1476 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1477 base += minBrightCOLOR - minCOLOR;
1478#endif
1479 return base;
1480 }
1481
1482 int bgcolor_of (rend_t r) const
1483 {
1484 int base = GET_BASEBG (r);
1485#ifndef NO_BRIGHTCOLOR
1486 if (r & RS_Blink
1487# if ENABLE_STYLES
1488 && OPTION (Opt_intensityStyles)
1489# endif
1490 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1491 base += minBrightCOLOR - minCOLOR;
1492#endif
1493 return base;
1494 }
1495
1496 bool option (uint32_t opt) const
1497 {
1498 return OPTION (opt);
1499 }
1500
1501 void set_option (uint32_t opt, bool set)
1502 {
1503 if (set)
1504 options |= opt;
1505 else
1506 options &= ~opt;
1507 }
1508
1509 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1510 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1463 int scr_scroll_text (int row1, int row2, int count, int spec); 1511 int scr_scroll_text (int row1, int row2, int count);
1464 void scr_reset (); 1512 void scr_reset ();
1465 void scr_reset_realloc ();
1466 void scr_release (); 1513 void scr_release ();
1467 void scr_clear (bool really = false); 1514 void scr_clear (bool really = false);
1468 void scr_refresh (unsigned char refresh_type); 1515 void scr_refresh (unsigned char refresh_type);
1469 bool scr_refresh_rend (rend_t mask, rend_t value); 1516 bool scr_refresh_rend (rend_t mask, rend_t value);
1470 void scr_erase_screen (int mode); 1517 void scr_erase_screen (int mode);
1518#if ENABLE_FRILLS
1519 void scr_erase_savelines ();
1520 void scr_backindex ();
1521 void scr_forwardindex ();
1522#endif
1471 void scr_touch (bool refresh); 1523 void scr_touch (bool refresh);
1472 void scr_expose (int x, int y, int width, int height, bool refresh); 1524 void scr_expose (int x, int y, int width, int height, bool refresh);
1473 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1525 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1474 void scr_recolour (); 1526 void scr_recolour ();
1475 void scr_remap_chars (); 1527 void scr_remap_chars ();
1476 void scr_remap_chars (text_t *tp, rend_t *rp); 1528 void scr_remap_chars (line_t &l);
1477 1529
1478 void scr_poweron (); 1530 void scr_poweron ();
1479 void scr_cursor (int mode); 1531 void scr_cursor (int mode);
1480 void scr_do_wrap (); 1532 void scr_do_wrap ();
1481 int scr_change_screen (int scrn); 1533 int scr_change_screen (int scrn);
1482 void scr_color (unsigned int color, int fgbg); 1534 void scr_color (unsigned int color, int fgbg);
1483 void scr_rendition (int set, int style); 1535 void scr_rendition (int set, int style);
1484 void scr_add_lines (const unicode_t *str, int nlines, int len); 1536 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1485 void scr_backspace (); 1537 void scr_backspace ();
1486 void scr_tab (int count, bool ht = false); 1538 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); 1539 void scr_gotorc (int row, int col, int relative);
1490 void scr_index (enum page_dirn direction); 1540 void scr_index (enum page_dirn direction);
1491 void scr_erase_line (int mode); 1541 void scr_erase_line (int mode);
1492 void scr_E (); 1542 void scr_E ();
1493 void scr_insdel_lines (int count, int insdel); 1543 void scr_insdel_lines (int count, int insdel);
… …
1501 void scr_rvideo_mode (int mode); 1551 void scr_rvideo_mode (int mode);
1502 void scr_report_position (); 1552 void scr_report_position ();
1503 void set_font_style (); 1553 void set_font_style ();
1504 void scr_charset_choose (int set); 1554 void scr_charset_choose (int set);
1505 void scr_charset_set (int set, unsigned int ch); 1555 void scr_charset_set (int set, unsigned int ch);
1506 int scr_move_to (int y, int len); 1556 void scr_move_to (int y, int len);
1507 int scr_page (enum page_dirn direction, int nlines); 1557 bool scr_page (enum page_dirn direction, int nlines);
1508 int scr_changeview (unsigned int oldviewstart); 1558 bool scr_changeview (int new_view_start);
1509 void scr_bell (); 1559 void scr_bell ();
1510 void scr_printscreen (int fullhist); 1560 void scr_printscreen (int fullhist);
1561 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1562 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1511 void scr_reverse_selection (); 1563 void scr_reverse_selection ();
1512 void scr_dump (int fd); 1564 void scr_dump (int fd);
1513 void selection_check (int check_more); 1565 void selection_check (int check_more);
1514 void selection_paste (Window win, Atom prop, bool delete_prop); 1566 void selection_paste (Window win, Atom prop, bool delete_prop);
1515 void selection_property (Window win, Atom prop); 1567 void selection_property (Window win, Atom prop);
1516 void selection_request (Time tm, int x, int y); 1568 void selection_request (Time tm, int x, int y);
1517 int selection_request_other (Atom target, int selnum); 1569 int selection_request_other (Atom target, int selnum);
1518 void selection_clear (); 1570 void selection_clear ();
1519 void selection_make (Time tm); 1571 void selection_make (Time tm);
1572 bool selection_grab (Time tm);
1520 void selection_start_colrow (int col, int row); 1573 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); 1574 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); 1575 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1523 void selection_remove_trailing_spaces (); 1576 void selection_remove_trailing_spaces ();
1524 void selection_send (const XSelectionRequestEvent &rq); 1577 void selection_send (const XSelectionRequestEvent &rq);

Diff Legend

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