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.243 by root, Wed Jan 25 02:53:13 2006 UTC vs.
Revision 1.308 by ayin, Fri Oct 12 15:13:13 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 ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
22#else 23#else
23# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
24#endif 25#endif
25 26
26#include <limits.h> 27#include <limits.h>
… …
32#if ENABLE_FRILLS 33#if ENABLE_FRILLS
33# include <X11/Xmd.h> 34# include <X11/Xmd.h>
34#endif 35#endif
35 36
36#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
37#include "rxvtfont.h" 39#include "rxvtfont.h"
38#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
39#include "iom.h" 41#include "iom.h"
40#include "salloc.h" 42#include "salloc.h"
41#include "libptytty.h" 43#include "libptytty.h"
… …
68 70
69#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
70typedef char *XPointer; 72typedef char *XPointer;
71#endif 73#endif
72 74
73#ifdef HAVE_TERMIOS_H
74# include <termios.h> 75#include <termios.h>
75typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
76#else
77# include <sgtty.h>
78typedef struct {
79 struct sgttyb sg;
80 struct tchars tc;
81 struct ltchars lc;
82 int line;
83 int local;
84} ttymode_t;
85#endif
86 77
87#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
88# ifdef XPM_INC_X11 79# include <afterimage.h>
89# include <X11/xpm.h> 80#undef min
90# else 81#undef max
91# include <xpm.h>
92# endif 82#endif
93#endif 83
84#include "background.h"
94 85
95#ifndef STDIN_FILENO 86#ifndef STDIN_FILENO
96# define STDIN_FILENO 0 87# define STDIN_FILENO 0
97# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 89# define STDERR_FILENO 2
99#endif 90#endif
100 91
101/****************************************************************************/ 92/****************************************************************************/
102
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123 93
124// exception thrown on fatal (per-instance) errors 94// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 95class rxvt_failure_exception { };
126 96
127// exception thrown when the command parser runs out of input data 97// exception thrown when the command parser runs out of input data
… …
131 ***************************************************************************** 101 *****************************************************************************
132 * PROTOTYPES 102 * PROTOTYPES
133 ***************************************************************************** 103 *****************************************************************************
134 */ 104 */
135// main.C 105// main.C
136RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
137RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
138void rxvt_clean_exit () NOTHROW;
139void * rxvt_malloc (size_t size); 106void * rxvt_malloc (size_t size);
140void * rxvt_calloc (size_t number, size_t size); 107void * rxvt_calloc (size_t number, size_t size);
141void * rxvt_realloc (void *ptr, size_t size); 108void * rxvt_realloc (void *ptr, size_t size);
142 109
143// misc.C 110// misc.C
144char * rxvt_wcstombs (const wchar_t *str, int len = -1); 111char * rxvt_wcstombs (const wchar_t *str, int len = -1);
145wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 112wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 113char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
147wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 114wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
148char * rxvt_strdup_cpp (const char *str);
149 115
150#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 116#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
151 117
152char * rxvt_r_basename (const char *str) NOTHROW; 118char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 119void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 120void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 121void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 122void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 123void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
158 124
159int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
160const char * rxvt_Str_skip_space (const char *str) NOTHROW;
161char * rxvt_Str_trim (char *str) NOTHROW; 125char * rxvt_strtrim (char *str) NOTHROW;
162int rxvt_Str_escaped (char *str) NOTHROW;
163char ** rxvt_splitcommastring (const char *cs) NOTHROW; 126char ** rxvt_splitcommastring (const char *cs) NOTHROW;
164void rxvt_freecommastring (char **cs) NOTHROW; 127void rxvt_freecommastring (char **cs) NOTHROW;
165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
166 128
167///////////////////////////////////////////////////////////////////////////// 129/////////////////////////////////////////////////////////////////////////////
168 130
169// temporarily replace the process environment 131// temporarily replace the process environment
170extern char **environ; 132extern char **environ;
171extern char **rxvt_environ; // the original environ pointer 133extern char **rxvt_environ; // the original environ pointer
172 134
173inline void set_environ (stringvec *envv) 135static inline void set_environ (stringvec *envv)
174{ 136{
175#if ENABLE_PERL 137#if ENABLE_PERL
176 assert (envv); 138 assert (envv);
177#else 139#else
178 if (envv) 140 if (envv)
179#endif 141#endif
180 environ = (char **)envv->begin (); 142 environ = (char **)envv->begin ();
181} 143}
182 144
183inline void set_environ (char **envv) 145static inline void set_environ (char **envv)
184{ 146{
185#if ENABLE_PERL 147#if ENABLE_PERL
186 assert (envv); 148 assert (envv);
187#else 149#else
188 if (envv) 150 if (envv)
… …
202 */ 164 */
203#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 165#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
204# define KEEP_SCROLLCOLOR 1 166# define KEEP_SCROLLCOLOR 1
205#else 167#else
206# undef KEEP_SCROLLCOLOR 168# undef KEEP_SCROLLCOLOR
207#endif
208
209#ifdef XPM_BACKGROUND
210typedef struct {
211 short w, h, x, y;
212 Pixmap pixmap;
213} bgPixmap_t;
214#endif 169#endif
215 170
216/* 171/*
217 * the 'essential' information for reporting Mouse Events 172 * the 'essential' information for reporting Mouse Events
218 * pared down from XButtonEvent 173 * pared down from XButtonEvent
… …
265 ***************************************************************************** 220 *****************************************************************************
266 */ 221 */
267 222
268/* COLORTERM, TERM environment variables */ 223/* COLORTERM, TERM environment variables */
269#define COLORTERMENV "rxvt" 224#define COLORTERMENV "rxvt"
270#ifdef XPM_BACKGROUND 225#ifdef BG_IMAGE_FROM_FILE
271# define COLORTERMENVFULL COLORTERMENV "-xpm" 226# define COLORTERMENVFULL COLORTERMENV "-xpm"
272#else 227#else
273# define COLORTERMENVFULL COLORTERMENV 228# define COLORTERMENVFULL COLORTERMENV
274#endif 229#endif
275#ifndef TERMENV 230#ifndef TERMENV
… …
432// fake styles 387// fake styles
433#define RS_Blink 0x00010000UL // blink 388#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 389#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 390#define RS_Uline 0x00040000UL // underline
436 391
392// toggle this to force redraw, must be != RS_Careful
393#define RS_redraw 0x01000000UL
394
437// 5 custom bits for extensions 395// 5 custom bits for extensions
438#define RS_customCount 32 396#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 397#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 398#define RS_customShift 19
441 399
… …
510 Rxvt_restoreFG = 39, // change default fg color 468 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 469 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 470 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 471
514 URxvt_locale = 701, // change locale 472 URxvt_locale = 701, // change locale
473 URxvt_version = 702, // request version
515 474
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 475 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 476 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 477 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 478 URxvt_Color_UL = 707,
… …
535 * 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
536 * 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
537 */ 496 */
538 497
539enum colour_list { 498enum colour_list {
499 Color_none = -2,
500 Color_transparent = -1,
540 Color_fg = 0, 501 Color_fg = 0,
541 Color_bg, 502 Color_bg,
542 minCOLOR, /* 2 */ 503 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 504 Color_Black = minCOLOR,
544 Color_Red3, 505 Color_Red3,
… …
586#endif 547#endif
587#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
588 Color_scroll, 549 Color_scroll,
589 Color_trough, 550 Color_trough,
590#endif 551#endif
591#if TINTING 552#if ENABLE_TRANSPARENCY
592 Color_tint, 553 Color_tint,
593#endif 554#endif
594#if OFF_FOCUS_FADING 555#if OFF_FOCUS_FADING
595 Color_fade, 556 Color_fade,
596#endif 557#endif
… …
603 TOTAL_COLORS = NRS_COLORS 564 TOTAL_COLORS = NRS_COLORS
604#endif 565#endif
605}; 566};
606 567
607#define Color_Bits 7 // 0 .. maxTermCOLOR 568#define Color_Bits 7 // 0 .. maxTermCOLOR
608
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611 569
612/* 570/*
613 * Resource list 571 * Resource list
614 */ 572 */
615enum { 573enum {
… …
644#define PrivMode_LFNL (1UL<<19) 602#define PrivMode_LFNL (1UL<<19)
645/* too annoying to implement X11 highlight tracking */ 603/* too annoying to implement X11 highlight tracking */
646/* #define PrivMode_MouseX11Track (1LU<<20) */ 604/* #define PrivMode_MouseX11Track (1LU<<20) */
647 605
648#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 606#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
649#define PrivMode(test,bit) \
650 if (test) \
651 priv_modes |= (bit); \
652 else \
653 priv_modes &= ~(bit)
654 607
655#ifdef ALLOW_132_MODE 608#ifdef ALLOW_132_MODE
656# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 609# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
657#else 610#else
658# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 611# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
699 ***************************************************************************** 652 *****************************************************************************
700 * MACRO DEFINES 653 * MACRO DEFINES
701 ***************************************************************************** 654 *****************************************************************************
702 */ 655 */
703#define dLocal(type,name) type const name = this->name 656#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 657
706// for speed reasons, we assume that all latin1 characters 658// for speed reasons, we assume that all codepoints 32 to 126 are
707// are single-width (the first unicdoe combining character 659// single-width.
708// is actually 0x300, but ascii is what matters most). 660#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
710 661
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 662/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 663#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 664#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 665#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
716#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 667#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
717#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 668#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 669#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 670#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
720 671
721#define OPTION(opt) (options & (opt))
722#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
723 | Opt_jumpScroll | Opt_secondaryScreen \
724 | Opt_pastableTabs | Opt_intensityStyles)
725
726// for m >= -n, ensure remainder lies between 0..n-1 672// for m >= -n, ensure remainder lies between 0..n-1
727#define MOD(m,n) (((m) + (n)) % (n)) 673#define MOD(m,n) (((m) + (n)) % (n))
728 674
729#define LINENO(n) MOD (term_start + int(n), total_rows) 675#define LINENO(n) MOD (term_start + int(n), total_rows)
730#define ROW(n) row_buf [LINENO (n)] 676#define ROW(n) row_buf [LINENO (n)]
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 694#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 695#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 696
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 697#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 698
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 699#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 700#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 701
756#if ENABLE_STYLES 702#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 703# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 704#else
759# define FONTSET(style) fontset[0] 705# define FONTSET(style) fontset[0]
… …
787#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 733#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788#define scrollbar_position(y) ((y) - scrollBar.beg) 734#define scrollbar_position(y) ((y) - scrollBar.beg)
789#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 735#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790 - scrollbar_minheight ()) 736 - scrollbar_minheight ())
791 737
792#ifdef XPM_BACKGROUND
793# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
794#else
795# define XPMClearArea(a, b, c, d, e, f, g)
796#endif
797
798typedef callback1<void, const char *> log_callback; 738typedef callback<void (const char *)> log_callback;
799typedef callback1<int, int> getfd_callback; 739typedef callback<int (int)> getfd_callback;
800 740
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 741#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern bool rxvt_set_locale (const char *locale) NOTHROW; 742extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW; 743extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW; 744extern void rxvt_pop_locale () NOTHROW;
… …
806/****************************************************************************/ 746/****************************************************************************/
807 747
808#define LINE_LONGER 0x0001 // line is continued on the next row 748#define LINE_LONGER 0x0001 // line is continued on the next row
809#define LINE_FILTERED 0x0002 // line has been filtered 749#define LINE_FILTERED 0x0002 // line has been filtered
810#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 750#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
751#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
752#define LINE_BIDI 0x0010 // line needs bidi (NYI)
811 753
812struct line_t { 754struct line_t {
813 text_t *t; // terminal the text 755 text_t *t; // terminal the text
814 rend_t *r; // rendition, uses RS_ flags 756 rend_t *r; // rendition, uses RS_ flags
815 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 757 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
869# define COMPOSE_LO 0x40000000UL 811# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 812# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 813# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 814#else
873# if ENABLE_PERL 815# if ENABLE_PERL
874# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 816# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
875# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 817# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
876# else 818# else
877# define COMPOSE_LO 0xd800UL 819# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 820# define COMPOSE_HI 0xf8ffUL
879# endif 821# endif
… …
908#endif 850#endif
909 851
910/****************************************************************************/ 852/****************************************************************************/
911 853
912#ifdef KEYSYM_RESOURCE 854#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 855class keyboard_manager;
914#endif 856#endif
915 857
916struct rxvt_term : zero_initialized, rxvt_vars { 858struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
859
860 // special markers with magic addresses
861 static const char resval_undef []; // options specifically unset
862 static const char resval_on []; // boolean options switched on
863 static const char resval_off []; // or off
864
917 log_callback *log_hook; // log error messages through this hook, if != 0 865 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 866 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 867#if ENABLE_PERL
920 rxvt_perl_term perl; 868 rxvt_perl_term perl;
921#endif 869#endif
922 struct mbstate mbstate; // current input multibyte state 870 struct mbstate mbstate; // current input multibyte state
923 871
924 unsigned char want_refresh:1, 872 unsigned char want_refresh:1,
925#ifdef TRANSPARENT
926 want_full_refresh:1, /* awaiting full screen refresh */
927#endif
928#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
929 am_transparent:1, /* is a transparent term */
930 am_pixmap_trans:1, /* transparency w/known root pixmap */
931#endif
932 current_screen:1, /* primary or secondary */ 873 current_screen:1, /* primary or secondary */
933 num_scr_allow:1, 874 num_scr_allow:1,
934 bypass_keystate:1, 875 bypass_keystate:1,
935#ifdef CURSOR_BLINK 876#ifdef CURSOR_BLINK
936 hidden_cursor:1, 877 hidden_cursor:1,
… …
962 int prev_ncol, /* screen: previous number of columns */ 903 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 904 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 905/* ---------- */
965 rend_t rstyle; 906 rend_t rstyle;
966/* ---------- */ 907/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */
969#ifdef SELECTION_SCROLLING 908#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 909 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 910 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 911 int selection_save_x,
973 selection_save_y, 912 selection_save_y,
… …
978 /* give proper Scroll behaviour */ 917 /* give proper Scroll behaviour */
979#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 918#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
980 mouse_slip_wheel_speed, 919 mouse_slip_wheel_speed,
981#endif 920#endif
982 refresh_count, 921 refresh_count,
983 refresh_limit,
984 last_bot, /* scrollbar last bottom position */ 922 last_bot, /* scrollbar last bottom position */
985 last_top, /* scrollbar last top position */ 923 last_top, /* scrollbar last top position */
986 last_state, /* scrollbar last state */ 924 last_state, /* scrollbar last state */
987 scrollbar_len, 925 scrollbar_len,
988 window_vt_x, 926 window_vt_x,
… …
1034 char * incr_buf; 972 char * incr_buf;
1035 size_t incr_buf_size, incr_buf_fill; 973 size_t incr_buf_size, incr_buf_fill;
1036/* ---------- */ 974/* ---------- */
1037 Cursor leftptr_cursor; 975 Cursor leftptr_cursor;
1038/* ---------- */ 976/* ---------- */
1039#ifndef NO_BACKSPACE_KEY
1040 const char *key_backspace;
1041#endif
1042#ifndef NO_DELETE_KEY
1043 const char *key_delete;
1044#endif
1045 struct mouse_event MEvent; 977 struct mouse_event MEvent;
1046 XComposeStatus compose; 978 XComposeStatus compose;
1047 ttymode_t tio; 979 ttymode_t tio;
1048 row_col_t oldcursor; 980 row_col_t oldcursor;
1049#ifdef XPM_BACKGROUND 981#ifdef HAVE_BG_PIXMAP
1050 bgPixmap_t bgPixmap; 982 bgPixmap_t bgPixmap;
1051 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 983#endif
984#ifdef HAVE_AFTERIMAGE
985 ASVisual *asv;
986 ASImageManager *asimman;
1052#endif 987#endif
1053 988
1054#if ENABLE_OVERLAY 989#if ENABLE_OVERLAY
1055 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 990 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1056 text_t **ov_text; 991 text_t **ov_text;
… …
1111 1046
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1047 long vt_emask, vt_emask_perl, vt_emask_xim;
1113 1048
1114 void vt_select_input () const NOTHROW 1049 void vt_select_input () const NOTHROW
1115 { 1050 {
1116 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1051 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 } 1052 }
1118 1053
1119#if TRANSPARENT 1054#if ENABLE_TRANSPARENCY || ENABLE_PERL
1120 void rootwin_cb (XEvent &xev); 1055 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1056 xevent_watcher rootwin_ev;
1057#endif
1058#ifdef HAVE_BG_PIXMAP
1059 int update_background ();
1060 void update_background_cb (time_watcher &w);
1061 time_watcher update_background_ev;
1122#endif 1062#endif
1123 1063
1124 void x_cb (XEvent &xev); 1064 void x_cb (XEvent &xev);
1125 void flush (); 1065 void flush ();
1126 xevent_watcher termwin_ev; 1066 xevent_watcher termwin_ev;
… …
1186 bool pty_fill (); 1126 bool pty_fill ();
1187 1127
1188 void make_current () const // make this the "currently active" urxvt instance 1128 void make_current () const // make this the "currently active" urxvt instance
1189 { 1129 {
1190 SET_R (this); 1130 SET_R (this);
1131 set_environ (envv);
1191 rxvt_set_locale (locale); 1132 rxvt_set_locale (locale);
1192 set_environ (envv);
1193 } 1133 }
1194 1134
1195 void init_secondary (); 1135 void init_secondary ();
1196 const char **init_resources (int argc, const char *const *argv); 1136 const char **init_resources (int argc, const char *const *argv);
1197 const char *x_resource (const char *name); 1137 const char *x_resource (const char *name);
… …
1222 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1162 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1223 1163
1224 bool IMisRunning (); 1164 bool IMisRunning ();
1225 void IMSendSpot (); 1165 void IMSendSpot ();
1226 bool IM_get_IC (const char *modifiers); 1166 bool IM_get_IC (const char *modifiers);
1227 void IMSetStatusPosition (); 1167 void IMSetPosition ();
1228#endif 1168#endif
1229 1169
1230 void resize_scrollbar (); 1170 void resize_scrollbar ();
1231 1171
1232 // command.C 1172 // command.C
1233 void lookup_key (XKeyEvent &ev); 1173 void key_press (XKeyEvent &ev);
1174 void key_release (XKeyEvent &ev);
1234 unsigned int cmd_write (const char *str, unsigned int count); 1175 unsigned int cmd_write (const char *str, unsigned int count);
1235 1176
1236 wchar_t next_char () NOTHROW; 1177 wchar_t next_char () NOTHROW;
1237 wchar_t cmd_getc () THROW ((class out_of_input)); 1178 wchar_t cmd_getc () THROW ((class out_of_input));
1238 uint32_t next_octet () NOTHROW; 1179 uint32_t next_octet () NOTHROW;
… …
1242 void mouse_report (XButtonEvent &ev); 1183 void mouse_report (XButtonEvent &ev);
1243 void button_press (XButtonEvent &ev); 1184 void button_press (XButtonEvent &ev);
1244 void button_release (XButtonEvent &ev); 1185 void button_release (XButtonEvent &ev);
1245 void focus_in (); 1186 void focus_in ();
1246 void focus_out (); 1187 void focus_out ();
1247 int check_our_parents (); 1188 void update_fade_color (unsigned int idx);
1248#ifdef PRINTPIPE 1189#ifdef PRINTPIPE
1249 FILE *popen_printer (); 1190 FILE *popen_printer ();
1250 int pclose_printer (FILE *stream); 1191 int pclose_printer (FILE *stream);
1251#endif 1192#endif
1252 void process_print_pipe (); 1193 void process_print_pipe ();
… …
1273 void set_utf8_property (Atom prop, const char *str, int len = -1); 1214 void set_utf8_property (Atom prop, const char *str, int len = -1);
1274 void set_title (const char *str); 1215 void set_title (const char *str);
1275 void set_icon_name (const char *str); 1216 void set_icon_name (const char *str);
1276 void set_window_color (int idx, const char *color); 1217 void set_window_color (int idx, const char *color);
1277 void set_colorfgbg (); 1218 void set_colorfgbg ();
1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1219 bool set_color (rxvt_color &color, const char *name);
1220 void alias_color (int dst, int src);
1279 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1221 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1222 void get_window_origin (int &x, int &y);
1223 Pixmap get_pixmap_property (int prop_id);
1280 1224
1281 // screen.C 1225 // screen.C
1282 1226
1283 void lalloc (line_t &l) const 1227 void lalloc (line_t &l) const
1284 { 1228 {
… …
1312 { 1256 {
1313 int base = GET_BASEFG (r); 1257 int base = GET_BASEFG (r);
1314#ifndef NO_BRIGHTCOLOR 1258#ifndef NO_BRIGHTCOLOR
1315 if (r & RS_Bold 1259 if (r & RS_Bold
1316# if ENABLE_STYLES 1260# if ENABLE_STYLES
1317 && OPTION (Opt_intensityStyles) 1261 && option (Opt_intensityStyles)
1318# endif 1262# endif
1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1263 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1320 base += minBrightCOLOR - minCOLOR; 1264 base += minBrightCOLOR - minCOLOR;
1321#endif 1265#endif
1322 return base; 1266 return base;
… …
1326 { 1270 {
1327 int base = GET_BASEBG (r); 1271 int base = GET_BASEBG (r);
1328#ifndef NO_BRIGHTCOLOR 1272#ifndef NO_BRIGHTCOLOR
1329 if (r & RS_Blink 1273 if (r & RS_Blink
1330# if ENABLE_STYLES 1274# if ENABLE_STYLES
1331 && OPTION (Opt_intensityStyles) 1275 && option (Opt_intensityStyles)
1332# endif 1276# endif
1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1277 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1334 base += minBrightCOLOR - minCOLOR; 1278 base += minBrightCOLOR - minCOLOR;
1335#endif 1279#endif
1336 return base; 1280 return base;
1337 } 1281 }
1338 1282
1339 bool option (uint32_t opt) const NOTHROW 1283 bool option (uint8_t opt) const NOTHROW
1340 { 1284 {
1341 return OPTION (opt); 1285 return options[opt >> 3] & (1 << (opt & 7));
1342 } 1286 }
1343 1287
1344 void set_option (uint32_t opt, bool set) NOTHROW 1288 void set_option (uint8_t opt, bool set = true) NOTHROW
1345 { 1289 {
1346 if (set) 1290 if (set)
1347 options |= opt; 1291 options[opt >> 3] |= (1 << (opt & 7));
1348 else 1292 else
1349 options &= ~opt; 1293 options[opt >> 3] &= ~(1 << (opt & 7));
1294 }
1295
1296 void PrivMode (int set, unsigned bit) NOTHROW
1297 {
1298 if (set)
1299 priv_modes |= bit;
1300 else
1301 priv_modes &= ~bit;
1350 } 1302 }
1351 1303
1352 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1304 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1353 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1305 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1354 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1306 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1459 // xdefaults.C 1411 // xdefaults.C
1460 void get_options (int argc, const char *const *argv); 1412 void get_options (int argc, const char *const *argv);
1461 int parse_keysym (const char *str, const char *arg); 1413 int parse_keysym (const char *str, const char *arg);
1462 void get_xdefaults (FILE *stream, const char *name); 1414 void get_xdefaults (FILE *stream, const char *name);
1463 void extract_resources (); 1415 void extract_resources ();
1464 // xpm.C
1465 int scale_pixmap (const char *geom);
1466 void resize_pixmap ();
1467 Pixmap set_bgPixmap (const char *file);
1468}; 1416};
1469 1417
1470/*
1471 *****************************************************************************
1472 * PROTOTYPES
1473 *****************************************************************************
1474 */
1475#ifdef PROTOTYPES
1476# define __PROTO(p) p
1477#else
1478# define __PROTO(p) ()
1479#endif
1480
1481#endif /* _RXVT_H_ */ 1418#endif /* _RXVT_H_ */
1482 1419

Diff Legend

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