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.230 by root, Fri Jan 20 22:49:34 2006 UTC vs.
Revision 1.313 by ayin, Wed Oct 24 10:39:58 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1
20# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
43#include "libptytty.h"
40 44
41#include "rxvtperl.h" 45#include "rxvtperl.h"
42 46
43// try to avoid some macros to decrease code size, on some systems 47// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 48#if ENABLE_MINIMAL
… …
66 70
67#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
68typedef char *XPointer; 72typedef char *XPointer;
69#endif 73#endif
70 74
71#ifdef HAVE_TERMIOS_H
72# include <termios.h> 75#include <termios.h>
73typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
74#else
75# include <sgtty.h>
76typedef struct {
77 struct sgttyb sg;
78 struct tchars tc;
79 struct ltchars lc;
80 int line;
81 int local;
82} ttymode_t;
83#endif
84 77
85#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
86# ifdef XPM_INC_X11 79# include <afterimage.h>
87# include <X11/xpm.h> 80#undef min
88# else 81#undef max
89# include <xpm.h>
90# endif 82#endif
91#endif 83
84#include "background.h"
92 85
93#ifndef STDIN_FILENO 86#ifndef STDIN_FILENO
94# define STDIN_FILENO 0 87# define STDIN_FILENO 0
95# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
96# define STDERR_FILENO 2 89# define STDERR_FILENO 2
97#endif 90#endif
98 91
99/****************************************************************************/ 92/****************************************************************************/
100
101#ifndef __attribute__
102# if __GNUC__
103# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
104# define __attribute__(x)
105# endif
106# endif
107# define __attribute__(x)
108#endif
109
110#define NORETURN __attribute__ ((noreturn))
111#define UNUSED __attribute__ ((unused))
112
113// increases code size unless -fno-enforce-eh-specs
114#if __GNUC__
115# define NOTHROW
116# define THROW(x)
117#else
118# define NOTHROW throw()
119# define THROW(x) throw x
120#endif
121 93
122// exception thrown on fatal (per-instance) errors 94// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { }; 95class rxvt_failure_exception { };
124 96
125// exception thrown when the command parser runs out of input data 97// exception thrown when the command parser runs out of input data
… …
129 ***************************************************************************** 101 *****************************************************************************
130 * PROTOTYPES 102 * PROTOTYPES
131 ***************************************************************************** 103 *****************************************************************************
132 */ 104 */
133// main.C 105// main.C
134RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
135RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
136void rxvt_clean_exit () NOTHROW;
137void * rxvt_malloc (size_t size); 106void * rxvt_malloc (size_t size);
138void * rxvt_calloc (size_t number, size_t size); 107void * rxvt_calloc (size_t number, size_t size);
139void * rxvt_realloc (void *ptr, size_t size); 108void * rxvt_realloc (void *ptr, size_t size);
140 109
141// misc.C 110// misc.C
… …
144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 113char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
145wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 114wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
146 115
147#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 116#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148 117
149char * rxvt_r_basename (const char *str) NOTHROW; 118char * rxvt_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 119void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
151void rxvt_log (const char *fmt,...) NOTHROW; 120void rxvt_log (const char *fmt,...) NOTHROW;
152void rxvt_warn (const char *fmt,...) NOTHROW; 121void rxvt_warn (const char *fmt,...) NOTHROW;
153void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 122void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 123void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
155 124
156int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
157const char * rxvt_Str_skip_space (const char *str) NOTHROW;
158char * rxvt_Str_trim (char *str) NOTHROW; 125char * rxvt_strtrim (char *str) NOTHROW;
159int rxvt_Str_escaped (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 126char ** rxvt_splitcommastring (const char *cs) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 127void rxvt_freecommastring (char **cs) NOTHROW;
162char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
163void rxvt_usleep (int usecs) NOTHROW;
164 128
165///////////////////////////////////////////////////////////////////////////// 129/////////////////////////////////////////////////////////////////////////////
166 130
167// temporarily replace the process environment 131// temporarily replace the process environment
168extern char **environ; 132extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 133extern char **rxvt_environ; // the original environ pointer
170 134
171inline void set_environ (stringvec *envv) 135static inline void set_environ (stringvec *envv)
172{ 136{
137#if ENABLE_PERL
138 assert (envv);
139#else
173 if (envv) 140 if (envv)
141#endif
174 environ = (char **)envv->begin (); 142 environ = (char **)envv->begin ();
175} 143}
176 144
177inline void set_environ (char **envv) 145static inline void set_environ (char **envv)
178{ 146{
147#if ENABLE_PERL
148 assert (envv);
149#else
179 if (envv) 150 if (envv)
151#endif
180 environ = envv; 152 environ = envv;
181} 153}
182 154
183/* 155/*
184 ***************************************************************************** 156 *****************************************************************************
… …
193#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 165#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
194# define KEEP_SCROLLCOLOR 1 166# define KEEP_SCROLLCOLOR 1
195#else 167#else
196# undef KEEP_SCROLLCOLOR 168# undef KEEP_SCROLLCOLOR
197#endif 169#endif
198
199#ifdef XPM_BACKGROUND
200typedef struct {
201 short w, h, x, y;
202 Pixmap pixmap;
203} bgPixmap_t;
204#endif
205
206struct rxvt_ptytty {
207 int pty; // pty file descriptor; connected to rxvt
208 int tty; // tty file descriptor; connected to child
209
210 rxvt_ptytty ()
211 : pty(-1), tty(-1)
212 {
213 }
214
215 virtual ~rxvt_ptytty ()
216 {
217 }
218
219 virtual bool get () = 0;
220#if UTMP_SUPPORT
221 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
222#endif
223
224 void close_tty ();
225 bool make_controlling_tty ();
226 void set_utf8_mode (bool on);
227};
228
229rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
230void rxvt_ptytty_server (); // start the ptytty server process
231 170
232/* 171/*
233 * the 'essential' information for reporting Mouse Events 172 * the 'essential' information for reporting Mouse Events
234 * pared down from XButtonEvent 173 * pared down from XButtonEvent
235 */ 174 */
… …
281 ***************************************************************************** 220 *****************************************************************************
282 */ 221 */
283 222
284/* COLORTERM, TERM environment variables */ 223/* COLORTERM, TERM environment variables */
285#define COLORTERMENV "rxvt" 224#define COLORTERMENV "rxvt"
286#ifdef XPM_BACKGROUND 225#ifdef BG_IMAGE_FROM_FILE
287# define COLORTERMENVFULL COLORTERMENV "-xpm" 226# define COLORTERMENVFULL COLORTERMENV "-xpm"
288#else 227#else
289# define COLORTERMENVFULL COLORTERMENV 228# define COLORTERMENVFULL COLORTERMENV
290#endif 229#endif
291#ifndef TERMENV 230#ifndef TERMENV
… …
448// fake styles 387// fake styles
449#define RS_Blink 0x00010000UL // blink 388#define RS_Blink 0x00010000UL // blink
450#define RS_RVid 0x00020000UL // reverse video 389#define RS_RVid 0x00020000UL // reverse video
451#define RS_Uline 0x00040000UL // underline 390#define RS_Uline 0x00040000UL // underline
452 391
392// toggle this to force redraw, must be != RS_Careful
393#define RS_redraw 0x01000000UL
394
453// 5 custom bits for extensions 395// 5 custom bits for extensions
454#define RS_customCount 32 396#define RS_customCount 32
455#define RS_customMask 0x00f80000UL 397#define RS_customMask 0x00f80000UL
456#define RS_customShift 19 398#define RS_customShift 19
457 399
… …
526 Rxvt_restoreFG = 39, // change default fg color 468 Rxvt_restoreFG = 39, // change default fg color
527 Rxvt_restoreBG = 49, // change default bg color 469 Rxvt_restoreBG = 49, // change default bg color
528 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 470 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
529 471
530 URxvt_locale = 701, // change locale 472 URxvt_locale = 701, // change locale
473 URxvt_version = 702, // request version
531 474
532 URxvt_Color_IT = 704, // change actual 'Italic' colour 475 URxvt_Color_IT = 704, // change actual 'Italic' colour
533 URxvt_Color_tint = 705, // change actual tint colour 476 URxvt_Color_tint = 705, // change actual tint colour
534 URxvt_Color_BD = 706, 477 URxvt_Color_BD = 706,
535 URxvt_Color_UL = 707, 478 URxvt_Color_UL = 707,
… …
551 * on the unnecessary items, e.g. Color_pointer, but won't bother 494 * on the unnecessary items, e.g. Color_pointer, but won't bother
552 * until we need to. Also, be aware of usage in pixcolor_set 495 * until we need to. Also, be aware of usage in pixcolor_set
553 */ 496 */
554 497
555enum colour_list { 498enum colour_list {
499 Color_none = -2,
500 Color_transparent = -1,
556 Color_fg = 0, 501 Color_fg = 0,
557 Color_bg, 502 Color_bg,
558 minCOLOR, /* 2 */ 503 minCOLOR, /* 2 */
559 Color_Black = minCOLOR, 504 Color_Black = minCOLOR,
560 Color_Red3, 505 Color_Red3,
… …
602#endif 547#endif
603#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
604 Color_scroll, 549 Color_scroll,
605 Color_trough, 550 Color_trough,
606#endif 551#endif
607#if TINTING 552#if ENABLE_TRANSPARENCY
608 Color_tint, 553 Color_tint,
609#endif 554#endif
610#if OFF_FOCUS_FADING 555#if OFF_FOCUS_FADING
611 Color_fade, 556 Color_fade,
612#endif 557#endif
… …
619 TOTAL_COLORS = NRS_COLORS 564 TOTAL_COLORS = NRS_COLORS
620#endif 565#endif
621}; 566};
622 567
623#define Color_Bits 7 // 0 .. maxTermCOLOR 568#define Color_Bits 7 // 0 .. maxTermCOLOR
624
625#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
626#define NPIXCLR_BITS 32
627 569
628/* 570/*
629 * Resource list 571 * Resource list
630 */ 572 */
631enum { 573enum {
… …
633# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 575# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
634# include "rsinc.h" 576# include "rsinc.h"
635# undef def 577# undef def
636# undef reserve 578# undef reserve
637 NUM_RESOURCES 579 NUM_RESOURCES
638};
639
640// see init.C:xa_names, which must be kept in sync
641enum {
642 XA_TEXT = 0,
643 XA_COMPOUND_TEXT,
644 XA_UTF8_STRING,
645 XA_MULTIPLE,
646 XA_TARGETS,
647 XA_TIMESTAMP,
648 XA_VT_SELECTION,
649 XA_INCR,
650 XA_WM_PROTOCOLS,
651 XA_WM_DELETE_WINDOW,
652 XA_CLIPBOARD,
653#if ENABLE_FRILLS
654 XA_MOTIF_WM_HINTS,
655#endif
656#if ENABLE_EWMH
657 XA_NET_WM_PID,
658 XA_NET_WM_NAME,
659 XA_NET_WM_ICON_NAME,
660 XA_NET_WM_PING,
661#endif
662#if USE_XIM
663 XA_WM_LOCALE_NAME,
664#endif
665#if TRANSPARENT
666 XA_XROOTPMAP_ID,
667 XA_ESETROOT_PMAP_ID,
668#endif
669#if ENABLE_XEMBED
670 XA_XEMBED,
671 XA_XEMBED_INFO,
672#endif
673 NUM_XA
674}; 580};
675 581
676/* DEC private modes */ 582/* DEC private modes */
677#define PrivMode_132 (1UL<<0) 583#define PrivMode_132 (1UL<<0)
678#define PrivMode_132OK (1UL<<1) 584#define PrivMode_132OK (1UL<<1)
… …
692#define PrivMode_TtyOutputInh (1UL<<15) 598#define PrivMode_TtyOutputInh (1UL<<15)
693#define PrivMode_Keypress (1UL<<16) 599#define PrivMode_Keypress (1UL<<16)
694#define PrivMode_smoothScroll (1UL<<17) 600#define PrivMode_smoothScroll (1UL<<17)
695#define PrivMode_vt52 (1UL<<18) 601#define PrivMode_vt52 (1UL<<18)
696#define PrivMode_LFNL (1UL<<19) 602#define PrivMode_LFNL (1UL<<19)
603#define PrivMode_MouseBtnEvent (1UL<<20)
604#define PrivMode_MouseAnyEvent (1UL<<21)
697/* too annoying to implement X11 highlight tracking */ 605/* too annoying to implement X11 highlight tracking */
698/* #define PrivMode_MouseX11Track (1LU<<20) */ 606/* #define PrivMode_MouseX11Track (1LU<<20) */
699 607
700#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 608#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
701#define PrivMode(test,bit) \
702 if (test) \
703 priv_modes |= (bit); \
704 else \
705 priv_modes &= ~(bit)
706 609
707#ifdef ALLOW_132_MODE 610#ifdef ALLOW_132_MODE
708# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 611# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
709#else 612#else
710# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 613# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
751 ***************************************************************************** 654 *****************************************************************************
752 * MACRO DEFINES 655 * MACRO DEFINES
753 ***************************************************************************** 656 *****************************************************************************
754 */ 657 */
755#define dLocal(type,name) type const name = this->name 658#define dLocal(type,name) type const name = this->name
756#define dDisp Display *disp = this->display->display 659
660// for speed reasons, we assume that all codepoints 32 to 126 are
661// single-width.
662#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
757 663
758/* convert pixel dimensions to row/column values. Everything as int32_t */ 664/* convert pixel dimensions to row/column values. Everything as int32_t */
759#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 665#define Pixel2Col(x) Pixel2Width((int32_t)(x))
760#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 666#define Pixel2Row(y) Pixel2Height((int32_t)(y))
761#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 667#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
763#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 669#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
764#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 670#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
765#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 671#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
766#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 672#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
767 673
768#define OPTION(opt) (options & (opt))
769#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
770 | Opt_jumpScroll | Opt_secondaryScreen \
771 | Opt_pastableTabs | Opt_intensityStyles)
772
773// for m >= -n, ensure remainder lies between 0..n-1 674// for m >= -n, ensure remainder lies between 0..n-1
774#define MOD(m,n) (((m) + (n)) % (n)) 675#define MOD(m,n) (((m) + (n)) % (n))
775 676
776#define LINENO(n) MOD (term_start + int(n), total_rows) 677#define LINENO(n) MOD (term_start + int(n), total_rows)
777#define ROW(n) row_buf [LINENO (n)] 678#define ROW(n) row_buf [LINENO (n)]
… …
795#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 696#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
796#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 697#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
797 698
798#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 699#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
799 700
800#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 701#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
801#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 702#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
802 703
803#if ENABLE_STYLES 704#if ENABLE_STYLES
804# define FONTSET(style) fontset[GET_STYLE (style)] 705# define FONTSET(style) fontset[GET_STYLE (style)]
805#else 706#else
806# define FONTSET(style) fontset[0] 707# define FONTSET(style) fontset[0]
… …
834#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 735#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
835#define scrollbar_position(y) ((y) - scrollBar.beg) 736#define scrollbar_position(y) ((y) - scrollBar.beg)
836#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 737#define scrollbar_size() (scrollBar.end - scrollBar.beg \
837 - scrollbar_minheight ()) 738 - scrollbar_minheight ())
838 739
839#ifdef XPM_BACKGROUND
840# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
841#else
842# define XPMClearArea(a, b, c, d, e, f, g)
843#endif
844
845#ifdef DEBUG_CMD
846# define D_CMD(x) fprintf x ; fputc('\n', stderr)
847#else
848# define D_CMD(x)
849#endif
850#ifdef DEBUG_INIT
851# define D_INIT(x) fprintf x ; fputc('\n', stderr)
852#else
853# define D_INIT(x)
854#endif
855#ifdef DEBUG_MAIN
856# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
857#else
858# define D_MAIN(x)
859#endif
860#ifdef DEBUG_SIZE
861# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
862#else
863# define D_SIZE(x)
864#endif
865
866typedef callback1<void, const char *> log_callback; 740typedef callback<void (const char *)> log_callback;
867typedef callback1<int, int> getfd_callback; 741typedef callback<int (int)> getfd_callback;
868 742
869#define SET_LOCALE(locale) rxvt_set_locale (locale) 743#define SET_LOCALE(locale) rxvt_set_locale (locale)
870extern bool rxvt_set_locale (const char *locale) NOTHROW; 744extern bool rxvt_set_locale (const char *locale) NOTHROW;
871extern void rxvt_push_locale (const char *locale) NOTHROW; 745extern void rxvt_push_locale (const char *locale) NOTHROW;
872extern void rxvt_pop_locale () NOTHROW; 746extern void rxvt_pop_locale () NOTHROW;
… …
874/****************************************************************************/ 748/****************************************************************************/
875 749
876#define LINE_LONGER 0x0001 // line is continued on the next row 750#define LINE_LONGER 0x0001 // line is continued on the next row
877#define LINE_FILTERED 0x0002 // line has been filtered 751#define LINE_FILTERED 0x0002 // line has been filtered
878#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 752#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
753#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
754#define LINE_BIDI 0x0010 // line needs bidi (NYI)
879 755
880struct line_t { 756struct line_t {
881 text_t *t; // terminal the text 757 text_t *t; // terminal the text
882 rend_t *r; // rendition, uses RS_ flags 758 rend_t *r; // rendition, uses RS_ flags
883 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 759 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
937# define COMPOSE_LO 0x40000000UL 813# define COMPOSE_LO 0x40000000UL
938# define COMPOSE_HI 0x400fffffUL 814# define COMPOSE_HI 0x400fffffUL
939# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 815# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
940#else 816#else
941# if ENABLE_PERL 817# if ENABLE_PERL
942# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 818# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
943# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 819# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
944# else 820# else
945# define COMPOSE_LO 0xd800UL 821# define COMPOSE_LO 0xd800UL
946# define COMPOSE_HI 0xf8ffUL 822# define COMPOSE_HI 0xf8ffUL
947# endif 823# endif
… …
976#endif 852#endif
977 853
978/****************************************************************************/ 854/****************************************************************************/
979 855
980#ifdef KEYSYM_RESOURCE 856#ifdef KEYSYM_RESOURCE
981 class keyboard_manager; 857class keyboard_manager;
982#endif 858#endif
983 859
984struct rxvt_term : zero_initialized, rxvt_vars { 860struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
861
862 // special markers with magic addresses
863 static const char resval_undef []; // options specifically unset
864 static const char resval_on []; // boolean options switched on
865 static const char resval_off []; // or off
866
985 log_callback *log_hook; // log error messages through this hook, if != 0 867 log_callback *log_hook; // log error messages through this hook, if != 0
986 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 868 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
987#if ENABLE_PERL 869#if ENABLE_PERL
988 rxvt_perl_term perl; 870 rxvt_perl_term perl;
989#endif 871#endif
990 struct mbstate mbstate; // current input multibyte state 872 struct mbstate mbstate; // current input multibyte state
991 873
992 unsigned char want_refresh:1, 874 unsigned char want_refresh:1,
993#ifdef TRANSPARENT
994 want_full_refresh:1, /* awaiting full screen refresh */
995#endif
996#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
997 am_transparent:1, /* is a transparent term */
998 am_pixmap_trans:1, /* transparency w/known root pixmap */
999#endif
1000 current_screen:1, /* primary or secondary */ 875 current_screen:1, /* primary or secondary */
1001 num_scr_allow:1, 876 num_scr_allow:1,
1002 bypass_keystate:1, 877 bypass_keystate:1,
1003#ifdef CURSOR_BLINK 878#ifdef CURSOR_BLINK
1004 hidden_cursor:1, 879 hidden_cursor:1,
… …
1020#endif 895#endif
1021 scrollbar_align, 896 scrollbar_align,
1022 selection_wait, 897 selection_wait,
1023 selection_type; 898 selection_type;
1024/* ---------- */ 899/* ---------- */
900 bool rvideo_state, rvideo_mode;
901#ifndef NO_BELL
1025 short rvideo; 902 bool rvideo_bell;
903#endif
1026 int num_scr; /* screen: number lines scrolled */ 904 int num_scr; /* screen: number lines scrolled */
1027 int prev_ncol, /* screen: previous number of columns */ 905 int prev_ncol, /* screen: previous number of columns */
1028 prev_nrow; /* screen: previous number of rows */ 906 prev_nrow; /* screen: previous number of rows */
1029/* ---------- */ 907/* ---------- */
1030 rend_t rstyle; 908 rend_t rstyle;
1031/* ---------- */
1032 uint32_t pixcolor_set[NPIXCLR_SETS];
1033/* ---------- */ 909/* ---------- */
1034#ifdef SELECTION_SCROLLING 910#ifdef SELECTION_SCROLLING
1035 int scroll_selection_lines; 911 int scroll_selection_lines;
1036 enum page_dirn scroll_selection_dir; 912 enum page_dirn scroll_selection_dir;
1037 int selection_save_x, 913 int selection_save_x,
… …
1043 /* give proper Scroll behaviour */ 919 /* give proper Scroll behaviour */
1044#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 920#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1045 mouse_slip_wheel_speed, 921 mouse_slip_wheel_speed,
1046#endif 922#endif
1047 refresh_count, 923 refresh_count,
1048 refresh_limit,
1049 last_bot, /* scrollbar last bottom position */ 924 last_bot, /* scrollbar last bottom position */
1050 last_top, /* scrollbar last top position */ 925 last_top, /* scrollbar last top position */
1051 last_state, /* scrollbar last state */ 926 last_state, /* scrollbar last state */
1052 scrollbar_len, 927 scrollbar_len,
1053 window_vt_x, 928 window_vt_x,
1054 window_vt_y, 929 window_vt_y,
1055 window_sb_x, 930 window_sb_x,
931 mouse_row,
932 mouse_col,
1056# ifdef POINTER_BLANK 933# ifdef POINTER_BLANK
1057 pointerBlankDelay, 934 pointerBlankDelay,
1058# endif 935# endif
1059 allowedxerror; 936 allowedxerror;
1060/* ---------- */ 937/* ---------- */
… …
1064 int old_width, /* last used width in screen resize */ 941 int old_width, /* last used width in screen resize */
1065 old_height; /* last used height in screen resize */ 942 old_height; /* last used height in screen resize */
1066 unsigned long priv_modes, 943 unsigned long priv_modes,
1067 SavedModes; 944 SavedModes;
1068/* ---------- */ 945/* ---------- */
1069 Atom xa[NUM_XA]; 946 Atom *xa;
1070/* ---------- */ 947/* ---------- */
1071#ifdef RXVT_SCROLLBAR 948#ifdef RXVT_SCROLLBAR
1072 GC scrollbarGC, 949 GC scrollbarGC,
1073 topShadowGC, 950 topShadowGC,
1074 botShadowGC; 951 botShadowGC;
… …
1099 char * incr_buf; 976 char * incr_buf;
1100 size_t incr_buf_size, incr_buf_fill; 977 size_t incr_buf_size, incr_buf_fill;
1101/* ---------- */ 978/* ---------- */
1102 Cursor leftptr_cursor; 979 Cursor leftptr_cursor;
1103/* ---------- */ 980/* ---------- */
1104#ifndef NO_BACKSPACE_KEY
1105 const char *key_backspace;
1106#endif
1107#ifndef NO_DELETE_KEY
1108 const char *key_delete;
1109#endif
1110 struct mouse_event MEvent; 981 struct mouse_event MEvent;
1111 XComposeStatus compose; 982 XComposeStatus compose;
1112 ttymode_t tio; 983 ttymode_t tio;
1113 row_col_t oldcursor; 984 row_col_t oldcursor;
1114#ifdef XPM_BACKGROUND 985#ifdef HAVE_BG_PIXMAP
1115 bgPixmap_t bgPixmap; 986 bgPixmap_t bgPixmap;
1116 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 987#endif
988#ifdef HAVE_AFTERIMAGE
989 ASVisual *asv;
990 ASImageManager *asimman;
1117#endif 991#endif
1118 992
1119#if ENABLE_OVERLAY 993#if ENABLE_OVERLAY
1120 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 994 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1121 text_t **ov_text; 995 text_t **ov_text;
… …
1131 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1005 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1132#endif 1006#endif
1133 1007
1134 vector<void *> allocated; // free these memory blocks with free() 1008 vector<void *> allocated; // free these memory blocks with free()
1135 1009
1136 char *env_windowid; /* environmental variable WINDOWID */ 1010 char env_windowid[21]; /* environmental variable WINDOWID */
1011 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1137 char *env_display; /* environmental variable DISPLAY */ 1012 char *env_display; /* environmental variable DISPLAY */
1138 char *env_term; /* environmental variable TERM */ 1013 char *env_term; /* environmental variable TERM */
1139 char *env_colorfgbg; 1014
1140 char *locale; 1015 char *locale;
1141 char charsets[4]; 1016 char charsets[4];
1142 char *v_buffer; /* pointer to physical buffer */ 1017 char *v_buffer; /* pointer to physical buffer */
1143 unsigned int v_buflen; /* size of area to write */ 1018 unsigned int v_buflen; /* size of area to write */
1144 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1019 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1145 1020
1146#ifdef KEYSYM_RESOURCE 1021#ifdef KEYSYM_RESOURCE
1147 keyboard_manager *keyboard; 1022 keyboard_manager *keyboard;
1148#endif 1023#endif
1149 1024
1150 const char *rs[NUM_RESOURCES]; 1025 const char *rs[NUM_RESOURCES];
1151 /* command input buffering */ 1026 /* command input buffering */
1152 char *cmdbuf_ptr, *cmdbuf_endp; 1027 char *cmdbuf_ptr, *cmdbuf_endp;
1153 char cmdbuf_base[CBUFSIZ]; 1028 char cmdbuf_base[CBUFSIZ];
1154 1029
1155 rxvt_ptytty *pty; 1030 ptytty *pty;
1156 1031
1157 rxvt_salloc *talloc; // text line allocator 1032 rxvt_salloc *talloc; // text line allocator
1158 rxvt_salloc *ralloc; // rend line allocator 1033 rxvt_salloc *ralloc; // rend line allocator
1159 1034
1160 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1035 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1168 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1043 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1);
1169 void iso14755_54 (int x, int y); 1044 void iso14755_54 (int x, int y);
1170# endif 1045# endif
1171#endif 1046#endif
1172 1047
1173 // modifies first argument(!) 1048 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
1174 void paste (char *data, unsigned int len) NOTHROW;
1175
1176 long vt_emask, vt_emask_perl;
1177 1049
1178 void vt_select_input () const NOTHROW 1050 void vt_select_input () const NOTHROW
1179 { 1051 {
1180 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1052 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1181 } 1053 }
1182 1054
1183#if TRANSPARENT 1055#if ENABLE_TRANSPARENCY || ENABLE_PERL
1184 void rootwin_cb (XEvent &xev); 1056 void rootwin_cb (XEvent &xev);
1185 xevent_watcher rootwin_ev; 1057 xevent_watcher rootwin_ev;
1186#endif 1058#endif
1059#ifdef HAVE_BG_PIXMAP
1060 int update_background ();
1061 void update_background_cb (time_watcher &w);
1062 time_watcher update_background_ev;
1063#endif
1187 1064
1188 void x_cb (XEvent &xev); 1065 void x_cb (XEvent &xev);
1189 void flush ();
1190 xevent_watcher termwin_ev; 1066 xevent_watcher termwin_ev;
1191 xevent_watcher vt_ev; 1067 xevent_watcher vt_ev;
1192#ifdef HAVE_SCROLLBARS 1068#ifdef HAVE_SCROLLBARS
1193 xevent_watcher scrollbar_ev; 1069 xevent_watcher scrollbar_ev;
1194#endif 1070#endif
1195 1071
1196 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1072 void child_cb (child_watcher &w, int status); child_watcher child_ev;
1197 void check_cb (check_watcher &w); check_watcher check_ev; 1073 void check_cb (check_watcher &w); check_watcher check_ev;
1198 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1074 void destroy_cb (time_watcher &w); time_watcher destroy_ev;
1075 void flush ();
1199 void flush_cb (time_watcher &w); time_watcher flush_ev; 1076 void flush_cb (time_watcher &w); time_watcher flush_ev;
1200 1077 bool pty_fill ();
1201 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1078 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev;
1202
1203 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1079 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev;
1204 1080
1205#ifdef CURSOR_BLINK 1081#ifdef CURSOR_BLINK
1206 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1082 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev;
1207#endif 1083#endif
1208#ifdef TEXT_BLINK 1084#ifdef TEXT_BLINK
1209 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1085 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev;
1086#endif
1087#ifndef NO_BELL
1088 void bell_cb (time_watcher &w); time_watcher bell_ev;
1210#endif 1089#endif
1211 1090
1212#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1213 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1092 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev;
1214#endif 1093#endif
… …
1227 1106
1228 void tt_printf (const char *fmt,...); 1107 void tt_printf (const char *fmt,...);
1229 void tt_write (const char *data, unsigned int len); 1108 void tt_write (const char *data, unsigned int len);
1230 void pty_write (); 1109 void pty_write ();
1231 1110
1232 void tt_winch (); 1111 bool init (stringvec *argv, stringvec *envv)
1233 1112 {
1234 rxvt_term (); 1113 this->argv = argv;
1235 ~rxvt_term (); 1114 return init (argv->size (), argv->begin (), envv);
1236 void destroy (); 1115 }
1237 void emergency_cleanup ();
1238
1239 bool init (int argc, const char *const *argv);
1240 bool init_vars ();
1241
1242 bool pty_fill ();
1243 1116
1244 void make_current () const // make this the "currently active" urxvt instance 1117 void make_current () const // make this the "currently active" urxvt instance
1245 { 1118 {
1246 SET_R (this); 1119 SET_R (this);
1120 set_environ (envv);
1247 rxvt_set_locale (locale); 1121 rxvt_set_locale (locale);
1248 set_environ (envv);
1249 } 1122 }
1250 1123
1251 void init_secondary ();
1252 const char **init_resources (int argc, const char *const *argv);
1253 const char *x_resource (const char *name);
1254 void init_env ();
1255 void set_locale (const char *locale);
1256 void init_xlocale ();
1257 void init_command (const char *const *argv);
1258 void run_command (const char *const *argv);
1259 int run_child (const char *const *argv);
1260
1261 void color_aliases (int idx);
1262 void recolour_cursor ();
1263 void create_windows (int argc, const char *const *argv);
1264 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1265 void window_calc (unsigned int newwidth, unsigned int newheight);
1266
1267#if USE_XIM 1124#if USE_XIM
1268 rxvt_xim *input_method; 1125 rxvt_xim *input_method;
1269 XIC Input_Context; 1126 XIC Input_Context;
1270 XIMStyle input_style; 1127 XIMStyle input_style;
1271 XPoint spot; // most recently sent spot position 1128 XPoint spot; // most recently sent spot position
1272 1129
1273 void im_destroy (); 1130 void im_destroy ();
1274 void im_cb (); im_watcher im_ev; 1131 void im_cb (); im_watcher im_ev;
1275 void im_set_size (XRectangle &size); 1132 void im_set_size (XRectangle &size);
1276 void im_set_position (XPoint &pos) NOTHROW; 1133 void im_set_position (XPoint &pos) NOTHROW;
… …
1278 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1135 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1279 1136
1280 bool IMisRunning (); 1137 bool IMisRunning ();
1281 void IMSendSpot (); 1138 void IMSendSpot ();
1282 bool IM_get_IC (const char *modifiers); 1139 bool IM_get_IC (const char *modifiers);
1283 void IMSetStatusPosition (); 1140 void IMSetPosition ();
1284#endif 1141#endif
1285
1286 void resize_scrollbar ();
1287 1142
1288 // command.C 1143 // command.C
1289 void lookup_key (XKeyEvent &ev); 1144 void key_press (XKeyEvent &ev);
1145 void key_release (XKeyEvent &ev);
1290 unsigned int cmd_write (const char *str, unsigned int count); 1146 unsigned int cmd_write (const char *str, unsigned int count);
1291 1147
1292 wchar_t next_char () NOTHROW; 1148 wchar_t next_char () NOTHROW;
1293 wchar_t cmd_getc () THROW ((class out_of_input)); 1149 wchar_t cmd_getc () THROW ((class out_of_input));
1294 uint32_t next_octet () NOTHROW; 1150 uint32_t next_octet () NOTHROW;
… …
1298 void mouse_report (XButtonEvent &ev); 1154 void mouse_report (XButtonEvent &ev);
1299 void button_press (XButtonEvent &ev); 1155 void button_press (XButtonEvent &ev);
1300 void button_release (XButtonEvent &ev); 1156 void button_release (XButtonEvent &ev);
1301 void focus_in (); 1157 void focus_in ();
1302 void focus_out (); 1158 void focus_out ();
1303 int check_our_parents (); 1159 void update_fade_color (unsigned int idx);
1304#ifdef PRINTPIPE 1160#ifdef PRINTPIPE
1305 FILE *popen_printer (); 1161 FILE *popen_printer ();
1306 int pclose_printer (FILE *stream); 1162 int pclose_printer (FILE *stream);
1307#endif 1163#endif
1308 void process_print_pipe (); 1164 void process_print_pipe ();
… …
1319 int privcases (int mode, unsigned long bit); 1175 int privcases (int mode, unsigned long bit);
1320 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1176 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1321 void process_sgr_mode (unsigned int nargs, const int *arg); 1177 void process_sgr_mode (unsigned int nargs, const int *arg);
1322 void process_graphics (); 1178 void process_graphics ();
1323 // init.C 1179 // init.C
1180 bool init_vars ();
1181 void init_secondary ();
1182 const char **init_resources (int argc, const char *const *argv);
1183 void init_env ();
1184 void set_locale (const char *locale);
1185 void init_xlocale ();
1186 void init_command (const char *const *argv);
1187 void run_command (const char *const *argv);
1188 int run_child (const char *const *argv);
1189 void color_aliases (int idx);
1190 void create_windows (int argc, const char *const *argv);
1324 void Get_Colours (); 1191 void Get_Colours ();
1325 void get_ourmods (); 1192 void get_ourmods ();
1326 // main.C 1193 // main.C
1194 void tt_winch ();
1195 rxvt_term ();
1196 ~rxvt_term ();
1197 void destroy ();
1198 void emergency_cleanup ();
1199 bool init (int argc, const char *const *argv, stringvec *envv);
1200 void recolour_cursor ();
1201 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1202 void window_calc (unsigned int newwidth, unsigned int newheight);
1327 bool set_fonts (); 1203 bool set_fonts ();
1328 void set_string_property (Atom prop, const char *str, int len = -1); 1204 void set_string_property (Atom prop, const char *str, int len = -1);
1329 void set_utf8_property (Atom prop, const char *str, int len = -1); 1205 void set_utf8_property (Atom prop, const char *str, int len = -1);
1330 void set_title (const char *str); 1206 void set_title (const char *str);
1331 void set_icon_name (const char *str); 1207 void set_icon_name (const char *str);
1332 void set_window_color (int idx, const char *color); 1208 void set_window_color (int idx, const char *color);
1333 void set_colorfgbg (); 1209 void set_colorfgbg ();
1334 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1210 bool set_color (rxvt_color &color, const char *name);
1211 void alias_color (int dst, int src);
1335 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1212 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1213 void get_window_origin (int &x, int &y);
1214 Pixmap get_pixmap_property (int prop_id);
1336 1215
1337 // screen.C 1216 // screen.C
1338 1217
1339 void lalloc (line_t &l) const NOTHROW 1218 void lalloc (line_t &l) const
1340 { 1219 {
1341 l.t = (text_t *)talloc->alloc (); 1220 l.t = (text_t *)talloc->alloc ();
1342 l.r = (rend_t *)ralloc->alloc (); 1221 l.r = (rend_t *)ralloc->alloc ();
1343 } 1222 }
1344 1223
… …
1348 talloc->free (l.t); 1227 talloc->free (l.t);
1349 ralloc->free (l.r); 1228 ralloc->free (l.r);
1350 } 1229 }
1351#endif 1230#endif
1352 1231
1353 void lresize (line_t &l) const NOTHROW 1232 void lresize (line_t &l) const
1354 { 1233 {
1355 if (!l.t) 1234 if (!l.t)
1356 return; 1235 return;
1357 1236
1358 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1237 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1368 { 1247 {
1369 int base = GET_BASEFG (r); 1248 int base = GET_BASEFG (r);
1370#ifndef NO_BRIGHTCOLOR 1249#ifndef NO_BRIGHTCOLOR
1371 if (r & RS_Bold 1250 if (r & RS_Bold
1372# if ENABLE_STYLES 1251# if ENABLE_STYLES
1373 && OPTION (Opt_intensityStyles) 1252 && option (Opt_intensityStyles)
1374# endif 1253# endif
1375 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1254 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1376 base += minBrightCOLOR - minCOLOR; 1255 base += minBrightCOLOR - minCOLOR;
1377#endif 1256#endif
1378 return base; 1257 return base;
… …
1382 { 1261 {
1383 int base = GET_BASEBG (r); 1262 int base = GET_BASEBG (r);
1384#ifndef NO_BRIGHTCOLOR 1263#ifndef NO_BRIGHTCOLOR
1385 if (r & RS_Blink 1264 if (r & RS_Blink
1386# if ENABLE_STYLES 1265# if ENABLE_STYLES
1387 && OPTION (Opt_intensityStyles) 1266 && option (Opt_intensityStyles)
1388# endif 1267# endif
1389 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1268 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1390 base += minBrightCOLOR - minCOLOR; 1269 base += minBrightCOLOR - minCOLOR;
1391#endif 1270#endif
1392 return base; 1271 return base;
1393 } 1272 }
1394 1273
1395 bool option (uint32_t opt) const NOTHROW 1274 bool option (uint8_t opt) const NOTHROW
1396 { 1275 {
1397 return OPTION (opt); 1276 return options[opt >> 3] & (1 << (opt & 7));
1398 } 1277 }
1399 1278
1400 void set_option (uint32_t opt, bool set) NOTHROW 1279 void set_option (uint8_t opt, bool set = true) NOTHROW
1401 { 1280 {
1402 if (set) 1281 if (set)
1403 options |= opt; 1282 options[opt >> 3] |= (1 << (opt & 7));
1404 else 1283 else
1405 options &= ~opt; 1284 options[opt >> 3] &= ~(1 << (opt & 7));
1406 } 1285 }
1407 1286
1287 void PrivMode (int set, unsigned bit) NOTHROW
1288 {
1289 if (set)
1290 priv_modes |= bit;
1291 else
1292 priv_modes &= ~bit;
1293 }
1294
1295 // modifies first argument(!)
1296 void paste (char *data, unsigned int len) NOTHROW;
1408 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1297 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1409 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1298 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1410 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1299 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1411 void scr_reset (); 1300 void scr_reset ();
1412 void scr_release () NOTHROW; 1301 void scr_release () NOTHROW;
… …
1419 void scr_backindex () NOTHROW; 1308 void scr_backindex () NOTHROW;
1420 void scr_forwardindex () NOTHROW; 1309 void scr_forwardindex () NOTHROW;
1421#endif 1310#endif
1422 void scr_touch (bool refresh) NOTHROW; 1311 void scr_touch (bool refresh) NOTHROW;
1423 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1312 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1424 rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
1425 void scr_recolour () NOTHROW; 1313 void scr_recolour () NOTHROW;
1426 void scr_remap_chars () NOTHROW; 1314 void scr_remap_chars () NOTHROW;
1427 void scr_remap_chars (line_t &l) NOTHROW; 1315 void scr_remap_chars (line_t &l) NOTHROW;
1428 1316
1429 enum cursor_mode { SAVE, RESTORE }; 1317 enum cursor_mode { SAVE, RESTORE };
1430 1318
1431 void scr_poweron () NOTHROW; 1319 void scr_poweron ();
1432 void scr_cursor (cursor_mode mode) NOTHROW; 1320 void scr_cursor (cursor_mode mode) NOTHROW;
1433 void scr_do_wrap () NOTHROW; 1321 void scr_do_wrap () NOTHROW;
1322 void scr_swap_screen () NOTHROW;
1434 int scr_change_screen (int scrn) NOTHROW; 1323 void scr_change_screen (int scrn);
1435 void scr_color (unsigned int color, int fgbg) NOTHROW; 1324 void scr_color (unsigned int color, int fgbg) NOTHROW;
1436 void scr_rendition (int set, int style) NOTHROW; 1325 void scr_rendition (int set, int style) NOTHROW;
1437 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1326 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1438 void scr_backspace () NOTHROW; 1327 void scr_backspace () NOTHROW;
1439 void scr_tab (int count, bool ht = false) NOTHROW; 1328 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1447 void scr_cursor_visible (int mode) NOTHROW; 1336 void scr_cursor_visible (int mode) NOTHROW;
1448 void scr_autowrap (int mode) NOTHROW; 1337 void scr_autowrap (int mode) NOTHROW;
1449 void scr_relative_origin (int mode) NOTHROW; 1338 void scr_relative_origin (int mode) NOTHROW;
1450 void scr_insert_mode (int mode) NOTHROW; 1339 void scr_insert_mode (int mode) NOTHROW;
1451 void scr_set_tab (int mode) NOTHROW; 1340 void scr_set_tab (int mode) NOTHROW;
1452 void scr_rvideo_mode (int mode) NOTHROW; 1341 void scr_rvideo_mode (bool on) NOTHROW;
1453 void scr_report_position () NOTHROW; 1342 void scr_report_position () NOTHROW;
1454 void set_font_style () NOTHROW; 1343 void set_font_style () NOTHROW;
1455 void scr_charset_choose (int set) NOTHROW; 1344 void scr_charset_choose (int set) NOTHROW;
1456 void scr_charset_set (int set, unsigned int ch) NOTHROW; 1345 void scr_charset_set (int set, unsigned int ch) NOTHROW;
1457 void scr_move_to (int y, int len) NOTHROW; 1346 void scr_move_to (int y, int len) NOTHROW;
… …
1479 void selection_send (const XSelectionRequestEvent &rq) NOTHROW; 1368 void selection_send (const XSelectionRequestEvent &rq) NOTHROW;
1480 void selection_click (int clicks, int x, int y) NOTHROW; 1369 void selection_click (int clicks, int x, int y) NOTHROW;
1481 void selection_extend (int x, int y, int flag) NOTHROW; 1370 void selection_extend (int x, int y, int flag) NOTHROW;
1482 void selection_rotate (int x, int y) NOTHROW; 1371 void selection_rotate (int x, int y) NOTHROW;
1483 1372
1484 void pixel_position (int *x, int *y) NOTHROW;
1485
1486#if defined(NEXT_SCROLLBAR) 1373#if defined(NEXT_SCROLLBAR)
1487 // scrollbar-next.C 1374 // scrollbar-next.C
1488 Pixmap renderPixmap (const char *const *data, int width, int height); 1375 Pixmap renderPixmap (const char *const *data, int width, int height);
1489 void init_scrollbar_stuff (); 1376 void init_scrollbar_stuff ();
1490 void drawBevel (Drawable d, int x1, int y1, int w, int h); 1377 void drawBevel (Drawable d, int x1, int y1, int w, int h);
… …
1505 // scrollbar-plain.C 1392 // scrollbar-plain.C
1506 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len); 1393 int scrollbar_show_plain (int update, int last_top, int last_bot, int scrollbar_len);
1507#endif 1394#endif
1508 1395
1509 // scrollbar.C 1396 // scrollbar.C
1397 void resize_scrollbar ();
1510 int scrollbar_mapping (int map); 1398 int scrollbar_mapping (int map);
1511 int scrollbar_show (int update); 1399 int scrollbar_show (int update);
1512 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness); 1400 void setup_scrollbar (const char *scrollalign, const char *scrollstyle, const char *thickness);
1513 1401
1514 // xdefaults.C 1402 // xdefaults.C
1515 void get_options (int argc, const char *const *argv); 1403 void get_options (int argc, const char *const *argv);
1516 int parse_keysym (const char *str, const char *arg); 1404 int parse_keysym (const char *str, const char *arg);
1517 void get_xdefaults (FILE *stream, const char *name); 1405 const char *x_resource (const char *name);
1518 void extract_resources (); 1406 void extract_resources ();
1519 // xpm.C
1520 int scale_pixmap (const char *geom);
1521 void resize_pixmap ();
1522 Pixmap set_bgPixmap (const char *file);
1523}; 1407};
1524 1408
1525/*
1526 *****************************************************************************
1527 * PROTOTYPES
1528 *****************************************************************************
1529 */
1530#ifdef PROTOTYPES
1531# define __PROTO(p) p
1532#else
1533# define __PROTO(p) ()
1534#endif
1535
1536#ifdef DEBUG_malloc
1537# include "dmalloc.h" /* This comes last */
1538#endif
1539
1540#endif /* _RXVT_H_ */ 1409#endif /* _RXVT_H_ */
1541 1410

Diff Legend

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