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.175 by root, Sat Dec 31 18:19:07 2005 UTC vs.
Revision 1.213 by root, Tue Jan 17 06:06:42 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
26# define ENABLE_EWMH 1 43// try to avoid some macros to decrease code size, on some systems
27# define CURSOR_BLINK 1 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)
28#endif 50#endif
29 51
30/* 52/*
31 ***************************************************************************** 53 *****************************************************************************
32 * SYSTEM HACKS 54 * SYSTEM HACKS
… …
41#if defined (sun) && !defined (__sun__) 63#if defined (sun) && !defined (__sun__)
42# define __sun__ 1 64# define __sun__ 1
43#endif 65#endif
44 66
45#ifndef HAVE_XPOINTER 67#ifndef HAVE_XPOINTER
46typedef char *XPointer; 68typedef char *XPointer;
47#endif 69#endif
48 70
49#ifdef HAVE_TERMIOS_H 71#ifdef HAVE_TERMIOS_H
50# include <termios.h> 72# include <termios.h>
51typedef struct termios ttymode_t; 73typedef struct termios ttymode_t;
… …
70 92
71#ifndef STDIN_FILENO 93#ifndef STDIN_FILENO
72# define STDIN_FILENO 0 94# define STDIN_FILENO 0
73# define STDOUT_FILENO 1 95# define STDOUT_FILENO 1
74# define STDERR_FILENO 2 96# define STDERR_FILENO 2
75#endif
76
77#if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT)
78# if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX)
79# define NO_SETOWNER_TTYDEV 1
80# endif
81#endif
82#if defined(__CYGWIN32__) || defined(PTYS_ARE_OPENPTY)
83# define NO_SETOWNER_TTYDEV 1
84#endif 97#endif
85 98
86/* 99/*
87 ***************************************************************************** 100 *****************************************************************************
88 * PROTOTYPES 101 * PROTOTYPES
… …
116char * rxvt_Str_trim (char *str); 129char * rxvt_Str_trim (char *str);
117int rxvt_Str_escaped (char *str); 130int rxvt_Str_escaped (char *str);
118char ** rxvt_splitcommastring (const char *cs); 131char ** rxvt_splitcommastring (const char *cs);
119void rxvt_freecommastring (char **cs); 132void rxvt_freecommastring (char **cs);
120char * 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);
121void rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h);
122void rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type);
123void rxvt_usleep (int usecs); 134void rxvt_usleep (int usecs);
135
136/////////////////////////////////////////////////////////////////////////////
137
138// temporarily replace the process environment
139extern char **environ;
140extern char **rxvt_environ; // the original environ pointer
141
142inline void set_environ (stringvec *envv)
143{
144 if (envv)
145 environ = (char **)envv->begin ();
146}
147
148inline void set_environ (char **envv)
149{
150 if (envv)
151 environ = envv;
152}
124 153
125/* 154/*
126 ***************************************************************************** 155 *****************************************************************************
127 * STRUCTURES AND TYPEDEFS 156 * STRUCTURES AND TYPEDEFS
128 ***************************************************************************** 157 *****************************************************************************
129 */ 158 */
130struct grwin_t; 159struct grwin_t;
131 160
132/* Sanitize menubar info */
133#ifndef MENUBAR
134# undef MENUBAR_MAX
135#endif
136#ifndef MENUBAR_MAX
137# define MENUBAR_MAX 0
138#endif
139
140/* If we're using either the rxvt scrollbar or menu bars, keep the 161/* If we're using either the rxvt scrollbar, keep the
141 * scrollColor resource. 162 * scrollColor resource.
142 */ 163 */
143#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR) 164#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
144# define KEEP_SCROLLCOLOR 1 165# define KEEP_SCROLLCOLOR 1
145#else 166#else
146# undef KEEP_SCROLLCOLOR 167# undef KEEP_SCROLLCOLOR
147#endif 168#endif
148 169
… …
218 239
219#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 240#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
220# define NO_MOUSE_REPORT_SCROLLBAR 1 241# define NO_MOUSE_REPORT_SCROLLBAR 1
221#endif 242#endif
222 243
223#ifdef NO_RESOURCES
224# undef USE_XGETDEFAULT
225#endif
226
227#if ISO_14755
228# define ENABLE_OVERLAY 1
229#endif
230
231/* now look for other badly set stuff */ 244/* now look for other badly set stuff */
232 245
233#if !defined (EACCESS) && defined(EAGAIN) 246#if !defined (EACCESS) && defined(EAGAIN)
234# define EACCESS EAGAIN 247# define EACCESS EAGAIN
235#endif 248#endif
… …
237#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 250#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
238# define EXIT_SUCCESS 0 /* exit function success */ 251# define EXIT_SUCCESS 0 /* exit function success */
239# define EXIT_FAILURE 1 /* exit function failure */ 252# define EXIT_FAILURE 1 /* exit function failure */
240#endif 253#endif
241 254
242#define menuBar_esc 10
243#define scrollBar_esc 30 255#define scrollBar_esc 30
244#define menuBar_margin 2 /* margin below text */
245 256
246#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 257#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
247# define HAVE_SCROLLBARS 1 258# define HAVE_SCROLLBARS 1
248#endif
249
250/* width of scrollBar, menuBar shadow, must be 1 or 2 */
251#ifdef HALFSHADOW
252# define SHADOW 1
253#else
254# define SHADOW 2
255#endif 259#endif
256 260
257#define R_SB_ALIGN_CENTRE 0 261#define R_SB_ALIGN_CENTRE 0
258#define R_SB_ALIGN_TOP 1 262#define R_SB_ALIGN_TOP 1
259#define R_SB_ALIGN_BOTTOM 2 263#define R_SB_ALIGN_BOTTOM 2
… …
332 * | 336 * |
333 * +---< SB_WIDTH_NEXT 337 * +---< SB_WIDTH_NEXT
334 */ 338 */
335 339
336enum { 340enum {
337 NO_REFRESH = 0 , /* Window not visible at all! */ 341 NO_REFRESH = 0, /* Window not visible at all! */
338 FAST_REFRESH = 1<<0, /* Fully exposed window */ 342 FAST_REFRESH = 1, /* Fully exposed window */
339 SLOW_REFRESH = 1<<1, /* Partially exposed window */ 343 SLOW_REFRESH = 2, /* Partially exposed window */
340 SMOOTH_REFRESH = 1<<2, /* Do sync'ing to make it smooth */
341}; 344};
342 345
343#ifdef NO_SECONDARY_SCREEN 346#ifdef NO_SECONDARY_SCREEN
344# define NSCREENS 0 347# define NSCREENS 0
345#else 348#else
… …
376enum { 379enum {
377 PRIMARY = 0, 380 PRIMARY = 0,
378 SECONDARY, 381 SECONDARY,
379}; 382};
380 383
381#define RS_None 0 /* Normal */ 384#define RS_None 0
382 385
383#define RS_fgMask 0x0000007fUL /* 128 colors */ 386#define RS_fgMask 0x0000007fUL // 128 colors
384#define RS_bgMask 0x00003f80UL /* 128 colors */ 387#define RS_bgMask 0x00003f80UL // 128 colors
385 388
386// font styles 389// font styles
387#define RS_Bold 0x00004000UL // value 1 390#define RS_Bold 0x00004000UL // value 1
388#define RS_Italic 0x00008000UL // value 2 391#define RS_Italic 0x00008000UL // value 2
389 392
390// fake styles 393// fake styles
391#define RS_Blink 0x00010000UL /* blink */ 394#define RS_Blink 0x00010000UL // blink
392#define RS_RVid 0x00020000UL /* reverse video */ 395#define RS_RVid 0x00020000UL // reverse video
393#define RS_Uline 0x00040000UL /* underline */ 396#define RS_Uline 0x00040000UL // underline
394 397
395// 5 bits still to go 398// 5 custom bits for extensions
399#define RS_customCount 32
400#define RS_customMask 0x00f80000UL
401#define RS_customShift 19
396 402
397// other flags 403// other flags
398#define RS_Careful 0x80000000UL /* be careful when drawing these */ 404#define RS_Careful 0x80000000UL /* be careful when drawing these */
399 405
400#define RS_styleCount 4 406#define RS_styleCount 4
… …
442 XTerm_property = 3, // change X property 448 XTerm_property = 3, // change X property
443 XTerm_Color = 4, // change colors 449 XTerm_Color = 4, // change colors
444 XTerm_Color00 = 10, // not implemented, CLASH! 450 XTerm_Color00 = 10, // not implemented, CLASH!
445 XTerm_Color01 = 11, // not implemented 451 XTerm_Color01 = 11, // not implemented
446 XTerm_Color_cursor = 12, // change actual 'Cursor' color 452 XTerm_Color_cursor = 12, // change actual 'Cursor' color
447 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' color 453 XTerm_Color_pointer_fg = 13, // change actual 'Pointer' fg color
448 XTerm_Color_pointer_bg = 14, // not implemented 454 XTerm_Color_pointer_bg = 14, // change actual 'Pointer' bg color
449 XTerm_Color05 = 15, // not implemented 455 XTerm_Color05 = 15, // not implemented (tektronix fg)
450 XTerm_Color06 = 16, // not implemented 456 XTerm_Color06 = 16, // not implemented (tektronix bg)
451 XTerm_Color_RV = 17, // change actual 'Highlight' color 457 XTerm_Color_RV = 17, // change actual 'Highlight' color
452 XTerm_logfile = 46, // not implemented 458 XTerm_logfile = 46, // not implemented
453 XTerm_font = 50, 459 XTerm_font = 50,
454 460
455 XTerm_konsole30 = 30, // reserved for konsole 461 XTerm_konsole30 = 30, // reserved for konsole
456 XTerm_konsole31 = 31, // reserved for konsole 462 XTerm_konsole31 = 31, // reserved for konsole
457 XTerm_emacs51 = 51, // reserved for emacs shell 463 XTerm_emacs51 = 51, // reserved for emacs shell
458 /* 464 /*
459 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL) 465 * rxvt extensions of XTerm OSCs: ESC ] Ps;Pt (ST|BEL)
466 * at least Rxvt_Color_BD and Rxvt_Color_UL clash with xterm
460 */ 467 */
461 XTerm_Color_BD = 18, // change actual 'Bold' color 468 Rxvt_Color_BD = 18, // change actual 'Bold' color
462 XTerm_Color_UL = 19, // change actual 'Underline' color 469 Rxvt_Color_UL = 19, // change actual 'Underline' color
463 XTerm_Pixmap = 20, // new bg pixmap 470 Rxvt_Pixmap = 20, // new bg pixmap
464 XTerm_restoreFG = 39, // change default fg color 471 Rxvt_restoreFG = 39, // change default fg color
465 XTerm_restoreBG = 49, // change default bg color 472 Rxvt_restoreBG = 49, // change default bg color
466 XTerm_dumpscreen = 55, // dump scrollback and all of screen 473 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
467 474
468 URxvt_locale = 701, // change locale 475 URxvt_locale = 701, // change locale
469 URxvt_Menu = 703, // set menu item 476
470 URxvt_Color_IT = 704, // change actual 'Italic' colour 477 URxvt_Color_IT = 704, // change actual 'Italic' colour
471 URxvt_Color_tint = 705, // change actual tint colour 478 URxvt_Color_tint = 705, // change actual tint colour
479 URxvt_Color_BD = 706,
480 URxvt_Color_UL = 707,
472 481
473 URxvt_font = 710, 482 URxvt_font = 710,
474 URxvt_boldFont = 711, 483 URxvt_boldFont = 711,
475 URxvt_italicFont = 712, 484 URxvt_italicFont = 712,
476 URxvt_boldItalicFont = 713, 485 URxvt_boldItalicFont = 713,
477 486
478 URxvt_view_up = 720, 487 URxvt_view_up = 720,
479 URxvt_view_down = 721, 488 URxvt_view_down = 721,
489
490 URxvt_perl = 777,
480}; 491};
481 492
482/* Words starting with `Color_' are colours. Others are counts */ 493/* Words starting with `Color_' are colours. Others are counts */
483/* 494/*
484 * The PixColor and rendition colour usage should probably be decoupled 495 * The PixColor and rendition colour usage should probably be decoupled
… …
561 572
562/* 573/*
563 * Resource list 574 * Resource list
564 */ 575 */
565enum { 576enum {
566 Rs_display_name = 0, 577# define def(name) Rs_ ## name,
567 Rs_term_name, 578# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
568 Rs_iconName, 579# include "rsinc.h"
569 Rs_geometry, 580# undef def
570 Rs_reverseVideo, 581# undef reserve
571 Rs_color,
572 _Rs_color = Rs_color + NRS_COLORS - 1,
573 Rs_font,
574#if ENABLE_STYLES
575 Rs_boldFont,
576 Rs_italicFont,
577 Rs_boldItalicFont,
578 Rs_intensityStyles,
579#endif
580 Rs_name,
581 Rs_title,
582#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
583 Rs_path,
584#endif
585#ifdef XPM_BACKGROUND
586 Rs_backgroundPixmap,
587#endif
588#if (MENUBAR_MAX)
589 Rs_menu,
590#endif
591 Rs_loginShell,
592 Rs_jumpScroll,
593#ifdef HAVE_SCROLLBARS
594 Rs_scrollBar,
595 Rs_scrollBar_right,
596 Rs_scrollBar_floating,
597 Rs_scrollBar_align,
598 Rs_scrollstyle, /* Rs_scrollBar_style */
599 Rs_scrollBar_thickness,
600#endif
601 Rs_scrollTtyOutput,
602 Rs_scrollTtyKeypress,
603 Rs_scrollWithBuffer,
604 Rs_saveLines,
605 Rs_utmpInhibit,
606 Rs_visualBell,
607#if ! defined(NO_MAPALERT) && defined(MAPALERT_OPTION)
608 Rs_mapAlert,
609#endif
610#ifdef META8_OPTION
611 Rs_meta8,
612#endif
613#ifdef MOUSE_WHEEL
614 Rs_mouseWheelScrollPage,
615#endif
616#ifndef NO_BACKSPACE_KEY
617 Rs_backspace_key,
618#endif
619#ifndef NO_DELETE_KEY
620 Rs_delete_key,
621#endif
622 Rs_selectstyle,
623#ifdef PRINTPIPE
624 Rs_print_pipe,
625#endif
626#ifdef USE_XIM
627 Rs_preeditType,
628 Rs_inputMethod,
629#endif
630#ifdef TRANSPARENT
631 Rs_transparent,
632 Rs_transparent_all,
633#endif
634#if ENABLE_FRILLS
635 Rs_pty_fd,
636 Rs_hold,
637 Rs_ext_bwidth,
638 Rs_int_bwidth,
639 Rs_borderLess,
640 Rs_lineSpace,
641 Rs_cursorUnderline,
642#endif
643#if CURSOR_BLINK
644 Rs_cursorBlink,
645#endif
646#if ENABLE_XEMBED
647 Rs_embed,
648#endif
649 Rs_cutchars,
650 Rs_modifier,
651 Rs_answerbackstring,
652 Rs_tripleclickwords,
653 Rs_insecure,
654 Rs_pointerBlank,
655 Rs_pointerBlankDelay,
656 Rs_imLocale,
657 Rs_imFont,
658 Rs_pastableTabs,
659#ifndef NO_SECONDARY_SCREEN
660 Rs_secondaryScreen,
661 Rs_secondaryScroll,
662#endif
663#ifdef OFF_FOCUS_FADING
664 Rs_fade,
665#endif
666#ifdef TINTING
667 Rs_shade,
668#endif
669 NUM_RESOURCES 582 NUM_RESOURCES
670}; 583};
671 584
672// see init.C:xa_names, which must be kept in sync 585// see init.C:xa_names, which must be kept in sync
673enum { 586enum {
… …
723#define PrivMode_ShiftKeys (1UL<<10) 636#define PrivMode_ShiftKeys (1UL<<10)
724#define PrivMode_VisibleCursor (1UL<<11) 637#define PrivMode_VisibleCursor (1UL<<11)
725#define PrivMode_MouseX10 (1UL<<12) 638#define PrivMode_MouseX10 (1UL<<12)
726#define PrivMode_MouseX11 (1UL<<13) 639#define PrivMode_MouseX11 (1UL<<13)
727#define PrivMode_scrollBar (1UL<<14) 640#define PrivMode_scrollBar (1UL<<14)
728#define PrivMode_menuBar (1UL<<15)
729#define PrivMode_TtyOutputInh (1UL<<16) 641#define PrivMode_TtyOutputInh (1UL<<15)
730#define PrivMode_Keypress (1UL<<17) 642#define PrivMode_Keypress (1UL<<16)
731#define PrivMode_smoothScroll (1UL<<18) 643#define PrivMode_smoothScroll (1UL<<17)
732#define PrivMode_vt52 (1UL<<19) 644#define PrivMode_vt52 (1UL<<18)
733#define PrivMode_LFNL (1UL<<20) 645#define PrivMode_LFNL (1UL<<19)
734/* too annoying to implement X11 highlight tracking */ 646/* too annoying to implement X11 highlight tracking */
735/* #define PrivMode_MouseX11Track (1LU<<21) */ 647/* #define PrivMode_MouseX11Track (1LU<<20) */
736 648
737#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 649#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
738#define PrivMode(test,bit) \ 650#define PrivMode(test,bit) \
739 if (test) \ 651 if (test) \
740 priv_modes |= (bit); \ 652 priv_modes |= (bit); \
… …
748#endif 660#endif
749 661
750// do not change these constants lightly, there are many interdependencies 662// do not change these constants lightly, there are many interdependencies
751#define IMBUFSIZ 128 // input modifier buffer sizes 663#define IMBUFSIZ 128 // input modifier buffer sizes
752#define KBUFSZ 512 // size of keyboard mapping buffer 664#define KBUFSZ 512 // size of keyboard mapping buffer
753#define CBUFSIZ 4096 // size of command buffer 665#define CBUFSIZ 2048 // size of command buffer
754#define UBUFSIZ 4096 // character buffer 666#define UBUFSIZ 2048 // character buffer
755 667
756#ifndef PATH_MAX 668#ifndef PATH_MAX
757# define PATH_MAX 16384 669# define PATH_MAX 16384
758#endif 670#endif
759 671
… …
787/* 699/*
788 ***************************************************************************** 700 *****************************************************************************
789 * MACRO DEFINES 701 * MACRO DEFINES
790 ***************************************************************************** 702 *****************************************************************************
791 */ 703 */
792#define memset(x, y, z) memset((x), (y), (size_t)(z)) 704#define dLocal(type,name) type const name = this->name
793#define memcpy(x, y, z) memcpy((void *)(x), (const void *)(y), (z))
794#define memmove(x, y, z) memmove((void *)(x), (const void *)(y), (z))
795#define strcasecmp(x, y) strcasecmp((x), (y))
796#define strncasecmp(x, y, z) strncasecmp((x), (y), (z))
797#define strcpy(x, y) strcpy((char *)(x), (const char *)(y))
798#define strncpy(x, y, z) strncpy((char *)(x), (const char *)(y), (z))
799#define strcmp(x, y) strcmp((const char *)(x), (const char *)(y))
800#define strncmp(x, y, z) strncmp((const char *)(x), (const char *)(y), (z))
801#define strcat(x, y) strcat((char *)(x), (const char *)(y))
802#define strncat(x, y, z) strncat((char *)(x), (const char *)(y), (z))
803#define strdup(x) strdup((const char *)(x))
804#define strlen(x) strlen((const char *)(x))
805#define strchr(x, y) strchr((const char *)(x), (int)(y))
806#define strrchr(x, y) strrchr((const char *)(x), (int)(y))
807
808#define dDisp Display *disp = display->display 705#define dDisp Display *disp = this->display->display
809 706
810/* convert pixel dimensions to row/column values. Everything as int32_t */ 707/* convert pixel dimensions to row/column values. Everything as int32_t */
811#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 708#define Pixel2Col(x) Pixel2Width((int32_t)(x))
812#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 709#define Pixel2Row(y) Pixel2Height((int32_t)(y))
813#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 710#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
815#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 712#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
816#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 713#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
817#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 714#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
818#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 715#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
819 716
820#define TermWin_TotalWidth() ((int32_t)this->width) 717#define OPTION(opt) (options & (opt))
821#define TermWin_TotalHeight() ((int32_t)this->height) 718#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
719 | Opt_jumpScroll | Opt_secondaryScreen \
720 | Opt_pastableTabs | Opt_intensityStyles)
822 721
823// for m >= -n, ensure remainder lies between 0..n-1 722// for m >= -n, ensure remainder lies between 0..n-1
824#define MOD(m,n) (((m) + (n)) % (n)) 723#define MOD(m,n) (((m) + (n)) % (n))
825 724
826#define LINENO(n) MOD (term_start + int(n), total_rows) 725#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
884#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 783#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
885#define scrollbar_position(y) ((y) - scrollBar.beg) 784#define scrollbar_position(y) ((y) - scrollBar.beg)
886#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 785#define scrollbar_size() (scrollBar.end - scrollBar.beg \
887 - scrollbar_minheight ()) 786 - scrollbar_minheight ())
888 787
889#if (MENUBAR_MAX > 1)
890/* rendition style flags */
891# define menuBar_height() (fheight + SHADOW)
892# define menuBar_TotalHeight() (menuBar_height() + SHADOW + menuBar_margin)
893# define isMenuBarWindow(w) ((w) == menuBar.win)
894#else
895# define menuBar_height() (0)
896# define menuBar_TotalHeight() (0)
897# define isMenuBarWindow(w) (0)
898#endif
899
900#ifdef XPM_BACKGROUND 788#ifdef XPM_BACKGROUND
901# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 789# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
902#else 790#else
903# define XPMClearArea(a, b, c, d, e, f, g) 791# define XPMClearArea(a, b, c, d, e, f, g)
904#endif
905
906#ifdef UTMP_SUPPORT
907# if !defined(RXVT_UTMPX_FILE) || !defined(HAVE_STRUCT_UTMPX)
908# undef HAVE_UTMPX_H
909# undef HAVE_STRUCT_UTMPX
910# endif
911# if !defined(RXVT_UTMP_FILE) || !defined(HAVE_STRUCT_UTMP)
912# undef HAVE_UTMP_H
913# undef HAVE_STRUCT_UTMP
914# endif
915
916# ifdef HAVE_UTMPX_H
917# include <utmpx.h>
918# endif
919# ifdef HAVE_UTMP_H
920# include <utmp.h>
921# endif
922#endif 792#endif
923 793
924#ifdef DEBUG_CMD 794#ifdef DEBUG_CMD
925# define D_CMD(x) fprintf x ; fputc('\n', stderr) 795# define D_CMD(x) fprintf x ; fputc('\n', stderr)
926#else 796#else
… …
953extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn)); 823extern void rxvt_fatal (const char *fmt, ...) __attribute__ ((noreturn));
954extern void rxvt_exit_failure () __attribute__ ((noreturn)); 824extern void rxvt_exit_failure () __attribute__ ((noreturn));
955 825
956#define SET_LOCALE(locale) rxvt_set_locale (locale) 826#define SET_LOCALE(locale) rxvt_set_locale (locale)
957extern bool rxvt_set_locale (const char *locale); 827extern bool rxvt_set_locale (const char *locale);
828extern void rxvt_push_locale (const char *locale);
829extern void rxvt_pop_locale ();
958 830
959/*
960 ***************************************************************************** 831/****************************************************************************/
961 * VARIABLES
962 *****************************************************************************
963 */
964#ifdef MENUBAR
965# include "menubar.h"
966#endif
967 832
968#define BLINK_INTERVAL 0.5 833#define BLINK_INTERVAL 0.5
969#define TEXT_BLINK_INTERVAL 0.5 834#define TEXT_BLINK_INTERVAL 0.5
970 835
971#ifndef __attribute__ 836#ifndef __attribute__
… …
975# endif 840# endif
976# endif 841# endif
977# define __attribute__(x) 842# define __attribute__(x)
978#endif 843#endif
979 844
845/****************************************************************************/
846
847#define LINE_LONGER 0x0001 // line is continued on the next row
848#define LINE_FILTERED 0x0002 // line has been filtered
849#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
850
851struct line_t {
852 text_t *t; // terminal the text
853 rend_t *r; // rendition, uses RS_ flags
854 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
855 uint32_t f; // flags
856
857 bool is_longer ()
858 {
859 return f & LINE_LONGER;
860 }
861
862 void is_longer (int set)
863 {
864 if (set)
865 f |= LINE_LONGER;
866 else
867 f &= ~LINE_LONGER;
868 }
869
870 void clear ()
871 {
872 t = 0;
873 r = 0;
874 l = 0;
875 f = 0;
876 }
877
878 void touch () // call whenever a line is changed/touched/updated
879 {
880#if ENABLE_PERL
881 f &= ~LINE_FILTERED;
882#endif
883 }
884
885 void touch (int col)
886 {
887 max_it (l, col);
888 touch ();
889 }
890};
891
892/****************************************************************************/
893
980// primivite wrapper around mbstate_t to ensure initialisation 894// primivite wrapper around mbstate_t to ensure initialisation
981struct mbstate { 895struct mbstate {
982 mbstate_t mbs; 896 mbstate_t mbs;
983 897
984 operator mbstate_t *() { return &mbs; } 898 operator mbstate_t *() { return &mbs; }
985 void reset () { memset (&mbs, 0, sizeof (mbs)); } 899 void reset () { memset (&mbs, 0, sizeof (mbs)); }
986 mbstate () { reset (); } 900 mbstate () { reset (); }
987}; 901};
988 902
903/****************************************************************************/
904
989#define UNICODE_MASK 0x1fffffUL 905#define UNICODE_MASK 0x1fffffUL
990 906
991#if UNICODE3 907#if UNICODE3
992# define COMPOSE_LO 0x40000000UL 908# define COMPOSE_LO 0x40000000UL
993# define COMPOSE_HI 0x400fffffUL 909# define COMPOSE_HI 0x400fffffUL
994# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 910# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
995#else 911#else
912# if ENABLE_PERL
913# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates
914# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
915# else
996# define COMPOSE_LO 0xd800UL 916# define COMPOSE_LO 0xd800UL
997# define COMPOSE_HI 0xf8ffUL // dfff should be safer, but... 917# define COMPOSE_HI 0xf8ffUL
998# define IS_COMPOSE(n) (COMPOSE_LO <= (n) && (n) <= COMPOSE_HI) 918# endif
919# define IS_COMPOSE(n) IN_RANGE_INC ((n), COMPOSE_LO, COMPOSE_HI)
999#endif 920#endif
1000 921
1001#if ENABLE_COMBINING 922#if ENABLE_COMBINING
1002// compose chars are used to represent composite characters 923// compose chars are used to represent composite characters
1003// that are not representable in unicode, as well as characters 924// that are not representable in unicode, as well as characters
… …
1023}; 944};
1024 945
1025extern class rxvt_composite_vec rxvt_composite; 946extern class rxvt_composite_vec rxvt_composite;
1026#endif 947#endif
1027 948
949/****************************************************************************/
1028 950
1029#ifdef KEYSYM_RESOURCE 951#ifdef KEYSYM_RESOURCE
1030 class keyboard_manager; 952 class keyboard_manager;
1031#endif 953#endif
1032 954
1033struct rxvt_term : zero_initialized, rxvt_vars { 955struct rxvt_term : zero_initialized, rxvt_vars {
1034 log_callback *log_hook; // log error messages through this hook, if != 0 956 log_callback *log_hook; // log error messages through this hook, if != 0
1035 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 957 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
1036 958#if ENABLE_PERL
959 rxvt_perl_term perl;
960#endif
1037 struct mbstate mbstate; // current input multibyte state 961 struct mbstate mbstate; // current input multibyte state
1038 962
1039 unsigned char want_refresh:1, 963 unsigned char want_refresh:1,
1040#ifdef TRANSPARENT 964#ifdef TRANSPARENT
1041 want_full_refresh:1, /* awaiting full screen refresh */ 965 want_full_refresh:1, /* awaiting full screen refresh */
… …
1096 refresh_limit, 1020 refresh_limit,
1097 last_bot, /* scrollbar last bottom position */ 1021 last_bot, /* scrollbar last bottom position */
1098 last_top, /* scrollbar last top position */ 1022 last_top, /* scrollbar last top position */
1099 last_state, /* scrollbar last state */ 1023 last_state, /* scrollbar last state */
1100 scrollbar_len, 1024 scrollbar_len,
1101#ifdef MENUBAR
1102 menu_readonly, /* okay to alter menu? */
1103 Arrows_x,
1104#endif
1105#if MENUBAR_MAX > 1
1106 Nbars,
1107#endif
1108 window_vt_x, 1025 window_vt_x,
1109 window_vt_y, 1026 window_vt_y,
1110 window_sb_x, 1027 window_sb_x,
1111# ifdef POINTER_BLANK 1028# ifdef POINTER_BLANK
1112 pointerBlankDelay, 1029 pointerBlankDelay,
… …
1121 unsigned long priv_modes, 1038 unsigned long priv_modes,
1122 SavedModes; 1039 SavedModes;
1123/* ---------- */ 1040/* ---------- */
1124 Atom xa[NUM_XA]; 1041 Atom xa[NUM_XA];
1125/* ---------- */ 1042/* ---------- */
1126#ifdef MENUBAR 1043#ifdef RXVT_SCROLLBAR
1127 GC menubarGC;
1128#endif
1129#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1130 GC scrollbarGC, 1044 GC scrollbarGC,
1131 topShadowGC, 1045 topShadowGC,
1132 botShadowGC; 1046 botShadowGC;
1133#endif 1047#endif
1134#ifdef XTERM_SCROLLBAR 1048#ifdef XTERM_SCROLLBAR
… …
1166 const char *key_delete; 1080 const char *key_delete;
1167#endif 1081#endif
1168 struct mouse_event MEvent; 1082 struct mouse_event MEvent;
1169 XComposeStatus compose; 1083 XComposeStatus compose;
1170 ttymode_t tio; 1084 ttymode_t tio;
1171#ifdef UTMP_SUPPORT
1172# ifdef HAVE_STRUCT_UTMP
1173 struct utmp ut;
1174# endif
1175# ifdef HAVE_STRUCT_UTMPX
1176 struct utmpx utx;
1177# endif
1178# if (defined(HAVE_STRUCT_UTMP) && defined(HAVE_UTMP_PID)) || defined(HAVE_STRUCT_UTMPX)
1179 char ut_id[5];
1180# endif
1181 int utmp_pos;
1182#endif
1183 row_col_t oldcursor; 1085 row_col_t oldcursor;
1184#ifdef XPM_BACKGROUND 1086#ifdef XPM_BACKGROUND
1185 bgPixmap_t bgPixmap; 1087 bgPixmap_t bgPixmap;
1186 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1088 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1187#endif
1188#ifdef MENUBAR
1189 menu_t *ActiveMenu, /* currently active menu */
1190 *BuildMenu; /* the menu currently being built */
1191 bar_t *CurrentBar;
1192# if ! (MENUBAR_MAX > 1)
1193 bar_t BarList;
1194# endif /* (MENUBAR_MAX > 1) */
1195#endif
1196#ifdef CURSOR_BLINK
1197 struct timeval lastcursorchange;
1198#endif
1199#ifdef POINTER_BLANK
1200 struct timeval lastmotion;
1201#endif 1089#endif
1202 1090
1203#if ENABLE_OVERLAY 1091#if ENABLE_OVERLAY
1204 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1092 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1205 text_t **ov_text; 1093 text_t **ov_text;
… …
1221 char *env_display; /* environmental variable DISPLAY */ 1109 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */ 1110 char *env_term; /* environmental variable TERM */
1223 char *env_colorfgbg; 1111 char *env_colorfgbg;
1224 char *locale; 1112 char *locale;
1225 char charsets[4]; 1113 char charsets[4];
1226 unsigned char *v_buffer; /* pointer to physical buffer */ 1114 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1115 unsigned int v_buflen; /* size of area to write */
1228 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1116 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */
1229 1117
1230#ifdef KEYSYM_RESOURCE 1118#ifdef KEYSYM_RESOURCE
1231 keyboard_manager *keyboard; 1119 keyboard_manager *keyboard;
1232#endif 1120#endif
1233 1121
1234 const char *rs[NUM_RESOURCES]; 1122 const char *rs[NUM_RESOURCES];
1235 /* command input buffering */ 1123 /* command input buffering */
1236 unsigned char *cmdbuf_ptr, *cmdbuf_endp; 1124 char *cmdbuf_ptr, *cmdbuf_endp;
1237 unsigned char cmdbuf_base[CBUFSIZ]; 1125 char cmdbuf_base[CBUFSIZ];
1126
1127 rxvt_ptytty pty;
1128 rxvt_session session;
1238 1129
1239 rxvt_salloc *talloc; // text line allocator 1130 rxvt_salloc *talloc; // text line allocator
1240 rxvt_salloc *ralloc; // rend line allocator 1131 rxvt_salloc *ralloc; // rend line allocator
1241 1132
1242 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1133 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1251 void iso14755_54 (int x, int y); 1142 void iso14755_54 (int x, int y);
1252# endif 1143# endif
1253#endif 1144#endif
1254 1145
1255 // modifies first argument(!) 1146 // modifies first argument(!)
1256 void paste (unsigned char *data, unsigned int len); 1147 void paste (char *data, unsigned int len);
1257 1148
1258 void flush (); 1149 long vt_emask, vt_emask_perl;
1150
1151 void vt_select_input () const
1152 {
1153 XSelectInput (display->display, vt, vt_emask | vt_emask_perl);
1154 }
1259 1155
1260#if TRANSPARENT 1156#if TRANSPARENT
1261 void rootwin_cb (XEvent &xev); 1157 void rootwin_cb (XEvent &xev);
1262 xevent_watcher rootwin_ev; 1158 xevent_watcher rootwin_ev;
1263#endif 1159#endif
1264 1160
1265 void x_cb (XEvent &xev); 1161 void x_cb (XEvent &xev);
1162 void flush ();
1266 xevent_watcher termwin_ev; 1163 xevent_watcher termwin_ev;
1267 xevent_watcher vt_ev; 1164 xevent_watcher vt_ev;
1268#ifdef HAVE_SCROLLBARS 1165#ifdef HAVE_SCROLLBARS
1269 xevent_watcher scrollbar_ev; 1166 xevent_watcher scrollbar_ev;
1270#endif 1167#endif
1271#ifdef MENUBAR
1272 xevent_watcher menubar_ev;
1273#endif
1274 1168
1275 void check_cb (check_watcher &w); check_watcher check_ev; 1169 void check_cb (check_watcher &w); check_watcher check_ev;
1276 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1170 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1277 void flush_cb (time_watcher &w); time_watcher flush_ev; 1171 void flush_cb (time_watcher &w); time_watcher flush_ev;
1278 1172
… …
1302 void pointer_blank (); 1196 void pointer_blank ();
1303#endif 1197#endif
1304 void pointer_unblank (); 1198 void pointer_unblank ();
1305 1199
1306 void tt_printf (const char *fmt,...); 1200 void tt_printf (const char *fmt,...);
1307 void tt_write (const unsigned char *data, unsigned int len); 1201 void tt_write (const char *data, unsigned int len);
1308 void pty_write (); 1202 void pty_write ();
1309 1203
1310 void tt_winch (); 1204 void tt_winch ();
1311 1205
1312 rxvt_term (); 1206 rxvt_term ();
… …
1318 bool init (int argc, const char *const *argv); 1212 bool init (int argc, const char *const *argv);
1319 bool init_vars (); 1213 bool init_vars ();
1320 1214
1321 bool pty_fill (); 1215 bool pty_fill ();
1322 1216
1217 void make_current () const // make this the "currently active" urxvt instance
1218 {
1219 SET_R (this);
1220 rxvt_set_locale (locale);
1221 set_environ (envv);
1222 }
1223
1323 void init_secondary (); 1224 void init_secondary ();
1324 const char **init_resources (int argc, const char *const *argv); 1225 const char **init_resources (int argc, const char *const *argv);
1226 const char *x_resource (const char *name);
1325 void init_env (); 1227 void init_env ();
1326 void set_locale (const char *locale); 1228 void set_locale (const char *locale);
1327 void init_xlocale (); 1229 void init_xlocale ();
1328 void init_command (const char *const *argv); 1230 void init_command (const char *const *argv);
1329 void run_command (const char *const *argv); 1231 void run_command (const char *const *argv);
… …
1364 1266
1365 /* autoconvert */ 1267 /* autoconvert */
1366 1268
1367 // command.C 1269 // command.C
1368 void lookup_key (XKeyEvent &ev); 1270 void lookup_key (XKeyEvent &ev);
1369 unsigned int cmd_write (const unsigned char *str, unsigned int count); 1271 unsigned int cmd_write (const char *str, unsigned int count);
1370 1272
1371 unicode_t next_char (); 1273 wchar_t next_char ();
1372 unicode_t cmd_getc (); 1274 wchar_t cmd_getc ();
1373 unicode_t next_octet (); 1275 uint32_t next_octet ();
1374 unicode_t cmd_get8 (); 1276 uint32_t cmd_get8 ();
1375 1277
1376 bool cmd_parse (); 1278 bool cmd_parse ();
1377 void mouse_report (XButtonEvent &ev); 1279 void mouse_report (XButtonEvent &ev);
1378 void button_press (XButtonEvent &ev); 1280 void button_press (XButtonEvent &ev);
1379 void button_release (XButtonEvent &ev); 1281 void button_release (XButtonEvent &ev);
… …
1388 void process_nonprinting (unicode_t ch); 1290 void process_nonprinting (unicode_t ch);
1389 void process_escape_vt52 (unicode_t ch); 1291 void process_escape_vt52 (unicode_t ch);
1390 void process_escape_seq (); 1292 void process_escape_seq ();
1391 void process_csi_seq (); 1293 void process_csi_seq ();
1392 void process_window_ops (const int *args, unsigned int nargs); 1294 void process_window_ops (const int *args, unsigned int nargs);
1393 unsigned char *get_to_st (unicode_t &ends_how); 1295 char *get_to_st (unicode_t &ends_how);
1394 void process_dcs_seq (); 1296 void process_dcs_seq ();
1395 void process_osc_seq (); 1297 void process_osc_seq ();
1396 void process_color_seq (int report, int color, const char *str, unsigned char resp); 1298 void process_color_seq (int report, int color, const char *str, char resp);
1397 void process_xterm_seq (int op, const char *str, unsigned char resp); 1299 void process_xterm_seq (int op, const char *str, char resp);
1398 int privcases (int mode, unsigned long bit); 1300 int privcases (int mode, unsigned long bit);
1399 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1301 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1400 void process_sgr_mode (unsigned int nargs, const int *arg); 1302 void process_sgr_mode (unsigned int nargs, const int *arg);
1401 void process_graphics (); 1303 void process_graphics ();
1402 // init.C 1304 // init.C
1403 void Get_Colours (); 1305 void Get_Colours ();
1404 void get_ourmods (); 1306 void get_ourmods ();
1405 // logging.C
1406 void makeutent (const char *pty, const char *hostname);
1407 void cleanutent ();
1408 // main.C 1307 // main.C
1409 void privileged_utmp (rxvt_privaction action); 1308 void privileged_utmp (rxvt_privaction action);
1410 bool set_fonts (); 1309 bool set_fonts ();
1411 void set_string_property (Atom prop, const char *str, int len = -1); 1310 void set_string_property (Atom prop, const char *str, int len = -1);
1412 void set_utf8_property (Atom prop, const char *str, int len = -1); 1311 void set_utf8_property (Atom prop, const char *str, int len = -1);
… …
1415 void set_window_color (int idx, const char *color); 1314 void set_window_color (int idx, const char *color);
1416 void set_colorfgbg (); 1315 void set_colorfgbg ();
1417 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1316 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour);
1418 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1317 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1419 1318
1420#ifdef MENUBAR
1421 // menubar.C
1422 void menuitem_free (menu_t *menu, menuitem_t *item);
1423 int action_dispatch (action_t *action);
1424 void menuarrow_free (char name);
1425 void menuarrow_add (char *string);
1426 char *menu_find_base (menu_t **menu, char *path);
1427 menu_t *menu_delete (menu_t *menu);
1428 menu_t *menu_add (menu_t *parent, char *path);
1429 void drawbox_menubar (int x, int len, int state);
1430 void drawtriangle (int x, int y, int state);
1431 void drawbox_menuitem (int y, int state);
1432 void menu_show ();
1433 void menu_display (void (rxvt_term::*update) ());
1434 void menu_hide_all ();
1435 void menu_hide ();
1436 void menu_clear (menu_t *menu);
1437 void menubar_clear ();
1438 bar_t *menubar_find (const char *name);
1439 int menubar_push (const char *name);
1440 void menubar_remove (const char *name);
1441 void menubar_dump (FILE *fp);
1442 void menubar_read (const char *filename);
1443 void menubar_dispatch (char *str);
1444 void draw_Arrows (int name, int state);
1445 void menubar_expose ();
1446 int menubar_mapping (int map);
1447 int menu_select (XButtonEvent &ev);
1448 void menubar_select (XButtonEvent &ev);
1449 void menubar_control (XButtonEvent &ev);
1450 void map_menuBar (int map);
1451#endif
1452
1453 // screen.C 1319 // screen.C
1454 1320
1455 void lalloc (line_t &l) 1321 void lalloc (line_t &l) const
1456 { 1322 {
1457 l.t = (text_t *)talloc->alloc (); 1323 l.t = (text_t *)talloc->alloc ();
1458 l.r = (rend_t *)ralloc->alloc (); 1324 l.r = (rend_t *)ralloc->alloc ();
1459 } 1325 }
1460 1326
… …
1464 talloc->free (l.t); 1330 talloc->free (l.t);
1465 ralloc->free (l.r); 1331 ralloc->free (l.r);
1466 } 1332 }
1467#endif 1333#endif
1468 1334
1469 void lresize (line_t &l) 1335 void lresize (line_t &l) const
1470 { 1336 {
1471 if (!l.t) 1337 if (!l.t)
1472 return; 1338 return;
1473 1339
1474 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1340 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1478 1344
1479 if (ncol > prev_ncol) 1345 if (ncol > prev_ncol)
1480 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE); 1346 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1481 } 1347 }
1482 1348
1483 int fgcolor_of (rend_t r) 1349 int fgcolor_of (rend_t r) const
1484 { 1350 {
1485 int base = GET_BASEFG (r); 1351 int base = GET_BASEFG (r);
1486#ifndef NO_BRIGHTCOLOR 1352#ifndef NO_BRIGHTCOLOR
1487 if (r & RS_Bold 1353 if (r & RS_Bold
1488# if ENABLE_STYLES 1354# if ENABLE_STYLES
… …
1492 base += minBrightCOLOR - minCOLOR; 1358 base += minBrightCOLOR - minCOLOR;
1493#endif 1359#endif
1494 return base; 1360 return base;
1495 } 1361 }
1496 1362
1497 int bgcolor_of (rend_t r) 1363 int bgcolor_of (rend_t r) const
1498 { 1364 {
1499 int base = GET_BASEBG (r); 1365 int base = GET_BASEBG (r);
1500#ifndef NO_BRIGHTCOLOR 1366#ifndef NO_BRIGHTCOLOR
1501 if (r & RS_Blink 1367 if (r & RS_Blink
1502# if ENABLE_STYLES 1368# if ENABLE_STYLES
… …
1506 base += minBrightCOLOR - minCOLOR; 1372 base += minBrightCOLOR - minCOLOR;
1507#endif 1373#endif
1508 return base; 1374 return base;
1509 } 1375 }
1510 1376
1377 bool option (uint32_t opt) const
1378 {
1379 return OPTION (opt);
1380 }
1381
1382 void set_option (uint32_t opt, bool set)
1383 {
1384 if (set)
1385 options |= opt;
1386 else
1387 options &= ~opt;
1388 }
1389
1511 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs); 1390 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const;
1512 void scr_blank_screen_mem (line_t &l, rend_t efs); 1391 void scr_blank_screen_mem (line_t &l, rend_t efs) const;
1513 int scr_scroll_text (int row1, int row2, int count); 1392 int scr_scroll_text (int row1, int row2, int count);
1514 void scr_reset (); 1393 void scr_reset ();
1515 void scr_release (); 1394 void scr_release ();
1516 void scr_clear (bool really = false); 1395 void scr_clear (bool really = false);
1517 void scr_refresh (unsigned char refresh_type); 1396 void scr_refresh ();
1518 bool scr_refresh_rend (rend_t mask, rend_t value); 1397 bool scr_refresh_rend (rend_t mask, rend_t value);
1519 void scr_erase_screen (int mode); 1398 void scr_erase_screen (int mode);
1520#if ENABLE_FRILLS 1399#if ENABLE_FRILLS
1521 void scr_erase_savelines (); 1400 void scr_erase_savelines ();
1522 void scr_backindex (); 1401 void scr_backindex ();
… …
1525 void scr_touch (bool refresh); 1404 void scr_touch (bool refresh);
1526 void scr_expose (int x, int y, int width, int height, bool refresh); 1405 void scr_expose (int x, int y, int width, int height, bool refresh);
1527 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE); 1406 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1528 void scr_recolour (); 1407 void scr_recolour ();
1529 void scr_remap_chars (); 1408 void scr_remap_chars ();
1530 void scr_remap_chars (const line_t &l); 1409 void scr_remap_chars (line_t &l);
1531 1410
1532 void scr_poweron (); 1411 void scr_poweron ();
1533 void scr_cursor (int mode); 1412 void scr_cursor (int mode);
1534 void scr_do_wrap (); 1413 void scr_do_wrap ();
1535 int scr_change_screen (int scrn); 1414 int scr_change_screen (int scrn);
1536 void scr_color (unsigned int color, int fgbg); 1415 void scr_color (unsigned int color, int fgbg);
1537 void scr_rendition (int set, int style); 1416 void scr_rendition (int set, int style);
1538 void scr_add_lines (const unicode_t *str, int nlines, int len); 1417 void scr_add_lines (const wchar_t *str, int len, int minlines = 0);
1539 void scr_backspace (); 1418 void scr_backspace ();
1540 void scr_tab (int count, bool ht = false); 1419 void scr_tab (int count, bool ht = false);
1541 void scr_gotorc (int row, int col, int relative); 1420 void scr_gotorc (int row, int col, int relative);
1542 void scr_index (enum page_dirn direction); 1421 void scr_index (enum page_dirn direction);
1543 void scr_erase_line (int mode); 1422 void scr_erase_line (int mode);
… …
1553 void scr_rvideo_mode (int mode); 1432 void scr_rvideo_mode (int mode);
1554 void scr_report_position (); 1433 void scr_report_position ();
1555 void set_font_style (); 1434 void set_font_style ();
1556 void scr_charset_choose (int set); 1435 void scr_charset_choose (int set);
1557 void scr_charset_set (int set, unsigned int ch); 1436 void scr_charset_set (int set, unsigned int ch);
1558 int scr_move_to (int y, int len); 1437 void scr_move_to (int y, int len);
1559 int scr_page (enum page_dirn direction, int nlines); 1438 bool scr_page (enum page_dirn direction, int nlines);
1560 int scr_changeview (unsigned int oldviewstart); 1439 bool scr_changeview (int new_view_start);
1561 void scr_bell (); 1440 void scr_bell ();
1562 void scr_printscreen (int fullhist); 1441 void scr_printscreen (int fullhist);
1442 void scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2);
1443 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle);
1563 void scr_reverse_selection (); 1444 void scr_reverse_selection ();
1564 void scr_dump (int fd); 1445 void scr_dump (int fd);
1565 void selection_check (int check_more); 1446 void selection_check (int check_more);
1566 void selection_paste (Window win, Atom prop, bool delete_prop); 1447 void selection_paste (Window win, Atom prop, bool delete_prop);
1567 void selection_property (Window win, Atom prop); 1448 void selection_property (Window win, Atom prop);
1568 void selection_request (Time tm, int x, int y); 1449 void selection_request (Time tm, int x, int y);
1569 int selection_request_other (Atom target, int selnum); 1450 int selection_request_other (Atom target, int selnum);
1570 void selection_clear (); 1451 void selection_clear ();
1571 void selection_make (Time tm); 1452 void selection_make (Time tm);
1453 bool selection_grab (Time tm);
1572 void selection_start_colrow (int col, int row); 1454 void selection_start_colrow (int col, int row);
1573 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret); 1455 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret);
1574 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange); 1456 void selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange);
1575 void selection_remove_trailing_spaces (); 1457 void selection_remove_trailing_spaces ();
1576 void selection_send (const XSelectionRequestEvent &rq); 1458 void selection_send (const XSelectionRequestEvent &rq);
… …
1583 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len); 1465 int scrollbar_show_next (int update, int last_top, int last_bot, int scrollbar_len);
1584#endif 1466#endif
1585 1467
1586#if defined(RXVT_SCROLLBAR) 1468#if defined(RXVT_SCROLLBAR)
1587 // scrollbar-rxvt.C 1469 // scrollbar-rxvt.C
1588 void Draw_button (int x, int y, int state, int dirn);
1589 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len); 1470 int scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len);
1590#endif 1471#endif
1591 1472
1592#if defined(XTERM_SCROLLBAR) 1473#if defined(XTERM_SCROLLBAR)
1593 // scrollbar-xterm.C 1474 // scrollbar-xterm.C

Diff Legend

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