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.242 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.292 by sasha, Mon Aug 13 22:41:34 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
93#endif 82#endif
94 83
95#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
96# define STDIN_FILENO 0 85# define STDIN_FILENO 0
97# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 87# define STDERR_FILENO 2
99#endif 88#endif
100 89
101/****************************************************************************/ 90/****************************************************************************/
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 91
124// exception thrown on fatal (per-instance) errors 92// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 93class rxvt_failure_exception { };
126 94
127// exception thrown when the command parser runs out of input data 95// exception thrown when the command parser runs out of input data
… …
143// misc.C 111// misc.C
144char * rxvt_wcstombs (const wchar_t *str, int len = -1); 112char * rxvt_wcstombs (const wchar_t *str, int len = -1);
145wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 113wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
146char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 114char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
147wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 115wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
148char * rxvt_strdup_cpp (const char *str);
149 116
150#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 117#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
151 118
152char * rxvt_r_basename (const char *str) NOTHROW; 119char * rxvt_r_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 120void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
160const char * rxvt_Str_skip_space (const char *str) NOTHROW; 127const char * rxvt_Str_skip_space (const char *str) NOTHROW;
161char * rxvt_Str_trim (char *str) NOTHROW; 128char * rxvt_Str_trim (char *str) NOTHROW;
162int rxvt_Str_escaped (char *str) NOTHROW; 129int rxvt_Str_escaped (char *str) NOTHROW;
163char ** rxvt_splitcommastring (const char *cs) NOTHROW; 130char ** rxvt_splitcommastring (const char *cs) NOTHROW;
164void rxvt_freecommastring (char **cs) NOTHROW; 131void rxvt_freecommastring (char **cs) NOTHROW;
165char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
166 132
167///////////////////////////////////////////////////////////////////////////// 133/////////////////////////////////////////////////////////////////////////////
168 134
169// temporarily replace the process environment 135// temporarily replace the process environment
170extern char **environ; 136extern char **environ;
… …
204# define KEEP_SCROLLCOLOR 1 170# define KEEP_SCROLLCOLOR 1
205#else 171#else
206# undef KEEP_SCROLLCOLOR 172# undef KEEP_SCROLLCOLOR
207#endif 173#endif
208 174
175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
176# define HAVE_BG_PIXMAP 1/* to simplify further usage */
177struct bgPixmap_t {
178
179 enum {
180 geometrySet = (1UL<<0),
181 propScale = (1UL<<1),
182 geometryFlags = (geometrySet|propScale),
183
184 tintSet = (1UL<<8),
185 tintNeeded = (1UL<<9),
186 tintServerSide = (1UL<<10),
187 tintFlags = (tintSet|tintServerSide|tintNeeded),
188 blurNeeded = (1UL<<11),
189
190 isTransparent = (1UL<<16),
191 isInvalid = (1UL<<17)
192 };
193
194 unsigned long flags;
195
209#ifdef XPM_BACKGROUND 196# ifdef XPM_BACKGROUND
210typedef struct { 197# ifdef HAVE_AFTERIMAGE
211 short w, h, x, y; 198 ASImage *original_asim;
199 bool render_asim (ASImage *background, ARGB32 background_tint);
200# endif
201
202 enum { defaultScale = 100, defaultAlign = 50 };
203
204 unsigned int h_scale, v_scale;/* percents of the window size */
205 int h_align, v_align; /* percents of the window size:
206 0 - left align, 50 - center, 100 - right */
207 void unset_geometry () { flags = flags & ~geometryFlags; };
208 bool set_geometry (const char *geom);
209 void set_defaultGeometry ()
210 {
211 h_scale = v_scale = defaultScale;
212 h_align = v_align = defaultAlign;
213 flags |= geometrySet;
214 };
215
216 bool set_file (const char *file);
217# endif /* XPM_BACKGROUND */
218
219 rxvt_term *target;
220 bool set_target (rxvt_term *new_target);
221
222# ifdef ENABLE_TRANSPARENCY
223 int root_depth; /* obtained when target is set */
224 Pixmap root_pixmap; /* current root pixmap set */
225 rxvt_color tint;
226 int shade;
227 int h_blurRadius, v_blurRadius;
228
229 bool set_transparent ();
230 bool set_blur_radius (const char *geom);
231 bool set_tint (rxvt_color &new_tint);
232 bool unset_tint ();
233 bool set_shade (const char *shade_str);
234 bool set_root_pixmap ();
235
236 enum {
237 transpPmapTiled = (1UL<<0),
238 transpPmapTinted = tintNeeded,
239 transpPmapBlured = blurNeeded,
240 transpTransformations = (tintNeeded|blurNeeded)
241 };
242 unsigned long make_transparency_pixmap ();/* returns combination of the above flags */
243# endif
244
212 Pixmap pixmap; 245 Pixmap pixmap;
213} bgPixmap_t; 246 unsigned int pmap_width, pmap_height;
247 unsigned int pmap_depth;
248
249 bool window_size_sensitive ();
250 void apply ();
251 bool render ();
252 void invalidate () { flags |= isInvalid; };
253};
254#else
255# undef HAVE_BG_PIXMAP
214#endif 256#endif
215 257
216/* 258/*
217 * the 'essential' information for reporting Mouse Events 259 * the 'essential' information for reporting Mouse Events
218 * pared down from XButtonEvent 260 * pared down from XButtonEvent
… …
432// fake styles 474// fake styles
433#define RS_Blink 0x00010000UL // blink 475#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 476#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 477#define RS_Uline 0x00040000UL // underline
436 478
479// toggle this to force redraw, must be != RS_Careful
480#define RS_redraw 0x01000000UL
481
437// 5 custom bits for extensions 482// 5 custom bits for extensions
438#define RS_customCount 32 483#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 484#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 485#define RS_customShift 19
441 486
… …
510 Rxvt_restoreFG = 39, // change default fg color 555 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 556 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 557 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 558
514 URxvt_locale = 701, // change locale 559 URxvt_locale = 701, // change locale
560 URxvt_version = 702, // request version
515 561
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 562 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 563 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 564 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 565 URxvt_Color_UL = 707,
… …
535 * on the unnecessary items, e.g. Color_pointer, but won't bother 581 * 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 582 * until we need to. Also, be aware of usage in pixcolor_set
537 */ 583 */
538 584
539enum colour_list { 585enum colour_list {
586 Color_none = -2,
587 Color_transparent = -1,
540 Color_fg = 0, 588 Color_fg = 0,
541 Color_bg, 589 Color_bg,
542 minCOLOR, /* 2 */ 590 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 591 Color_Black = minCOLOR,
544 Color_Red3, 592 Color_Red3,
… …
586#endif 634#endif
587#ifdef KEEP_SCROLLCOLOR 635#ifdef KEEP_SCROLLCOLOR
588 Color_scroll, 636 Color_scroll,
589 Color_trough, 637 Color_trough,
590#endif 638#endif
591#if TINTING 639#if ENABLE_TRANSPARENCY
592 Color_tint, 640 Color_tint,
593#endif 641#endif
594#if OFF_FOCUS_FADING 642#if OFF_FOCUS_FADING
595 Color_fade, 643 Color_fade,
596#endif 644#endif
… …
603 TOTAL_COLORS = NRS_COLORS 651 TOTAL_COLORS = NRS_COLORS
604#endif 652#endif
605}; 653};
606 654
607#define Color_Bits 7 // 0 .. maxTermCOLOR 655#define Color_Bits 7 // 0 .. maxTermCOLOR
608
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611 656
612/* 657/*
613 * Resource list 658 * Resource list
614 */ 659 */
615enum { 660enum {
… …
699 ***************************************************************************** 744 *****************************************************************************
700 * MACRO DEFINES 745 * MACRO DEFINES
701 ***************************************************************************** 746 *****************************************************************************
702 */ 747 */
703#define dLocal(type,name) type const name = this->name 748#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 749
706// for speed reasons, we assume that all latin1 characters 750// for speed reasons, we assume that all codepoints 32 to 126 are
707// are single-width (the first unicdoe combining character 751// single-width.
708// is actually 0x300, but ascii is what matters most). 752#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
710 753
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 754/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 755#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 756#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 757#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
716#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 759#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
717#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 760#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 761#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 762#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
720 763
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 764// for m >= -n, ensure remainder lies between 0..n-1
727#define MOD(m,n) (((m) + (n)) % (n)) 765#define MOD(m,n) (((m) + (n)) % (n))
728 766
729#define LINENO(n) MOD (term_start + int(n), total_rows) 767#define LINENO(n) MOD (term_start + int(n), total_rows)
730#define ROW(n) row_buf [LINENO (n)] 768#define ROW(n) row_buf [LINENO (n)]
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 786#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 787#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 788
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 789#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 790
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 791#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 792#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 793
756#if ENABLE_STYLES 794#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 795# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 796#else
759# define FONTSET(style) fontset[0] 797# define FONTSET(style) fontset[0]
… …
787#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 825#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788#define scrollbar_position(y) ((y) - scrollBar.beg) 826#define scrollbar_position(y) ((y) - scrollBar.beg)
789#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 827#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790 - scrollbar_minheight ()) 828 - scrollbar_minheight ())
791 829
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; 830typedef callback<void (const char *)> log_callback;
799typedef callback1<int, int> getfd_callback; 831typedef callback<int (int)> getfd_callback;
800 832
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 833#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern bool rxvt_set_locale (const char *locale) NOTHROW; 834extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW; 835extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW; 836extern void rxvt_pop_locale () NOTHROW;
… …
806/****************************************************************************/ 838/****************************************************************************/
807 839
808#define LINE_LONGER 0x0001 // line is continued on the next row 840#define LINE_LONGER 0x0001 // line is continued on the next row
809#define LINE_FILTERED 0x0002 // line has been filtered 841#define LINE_FILTERED 0x0002 // line has been filtered
810#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 842#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
843#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
844#define LINE_BIDI 0x0010 // line needs bidi (NYI)
811 845
812struct line_t { 846struct line_t {
813 text_t *t; // terminal the text 847 text_t *t; // terminal the text
814 rend_t *r; // rendition, uses RS_ flags 848 rend_t *r; // rendition, uses RS_ flags
815 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 849 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
869# define COMPOSE_LO 0x40000000UL 903# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 904# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 905# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 906#else
873# if ENABLE_PERL 907# if ENABLE_PERL
874# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 908# 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 909# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
876# else 910# else
877# define COMPOSE_LO 0xd800UL 911# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 912# define COMPOSE_HI 0xf8ffUL
879# endif 913# endif
… …
908#endif 942#endif
909 943
910/****************************************************************************/ 944/****************************************************************************/
911 945
912#ifdef KEYSYM_RESOURCE 946#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 947class keyboard_manager;
914#endif 948#endif
915 949
916struct rxvt_term : zero_initialized, rxvt_vars { 950struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
951
952 // special markers with magic addresses
953 static const char resval_undef []; // options specifically unset
954 static const char resval_on []; // boolean options switched on
955 static const char resval_off []; // or off
956
917 log_callback *log_hook; // log error messages through this hook, if != 0 957 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 958 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 959#if ENABLE_PERL
920 rxvt_perl_term perl; 960 rxvt_perl_term perl;
921#endif 961#endif
922 struct mbstate mbstate; // current input multibyte state 962 struct mbstate mbstate; // current input multibyte state
923 963
924 unsigned char want_refresh:1, 964 unsigned char want_refresh:1,
925#ifdef TRANSPARENT 965#ifdef ENABLE_TRANSPARENCY
926 want_full_refresh:1, /* awaiting full screen refresh */ 966 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 */ 967 am_transparent:1, /* is a transparent term */
930 am_pixmap_trans:1, /* transparency w/known root pixmap */ 968 am_pixmap_trans:1, /* transparency w/known root pixmap */
931#endif 969#endif
932 current_screen:1, /* primary or secondary */ 970 current_screen:1, /* primary or secondary */
933 num_scr_allow:1, 971 num_scr_allow:1,
… …
962 int prev_ncol, /* screen: previous number of columns */ 1000 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 1001 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 1002/* ---------- */
965 rend_t rstyle; 1003 rend_t rstyle;
966/* ---------- */ 1004/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */
969#ifdef SELECTION_SCROLLING 1005#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 1006 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 1007 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 1008 int selection_save_x,
973 selection_save_y, 1009 selection_save_y,
… …
978 /* give proper Scroll behaviour */ 1014 /* give proper Scroll behaviour */
979#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1015#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
980 mouse_slip_wheel_speed, 1016 mouse_slip_wheel_speed,
981#endif 1017#endif
982 refresh_count, 1018 refresh_count,
983 refresh_limit,
984 last_bot, /* scrollbar last bottom position */ 1019 last_bot, /* scrollbar last bottom position */
985 last_top, /* scrollbar last top position */ 1020 last_top, /* scrollbar last top position */
986 last_state, /* scrollbar last state */ 1021 last_state, /* scrollbar last state */
987 scrollbar_len, 1022 scrollbar_len,
988 window_vt_x, 1023 window_vt_x,
… …
1044#endif 1079#endif
1045 struct mouse_event MEvent; 1080 struct mouse_event MEvent;
1046 XComposeStatus compose; 1081 XComposeStatus compose;
1047 ttymode_t tio; 1082 ttymode_t tio;
1048 row_col_t oldcursor; 1083 row_col_t oldcursor;
1049#ifdef XPM_BACKGROUND 1084#ifdef HAVE_BG_PIXMAP
1050 bgPixmap_t bgPixmap; 1085 bgPixmap_t bgPixmap;
1051 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1086#endif
1087#ifdef HAVE_AFTERIMAGE
1088 ASVisual *asv;
1089 ASImageManager *asimman;
1052#endif 1090#endif
1053 1091
1054#if ENABLE_OVERLAY 1092#if ENABLE_OVERLAY
1055 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1093 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1056 text_t **ov_text; 1094 text_t **ov_text;
… …
1066 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1104 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1067#endif 1105#endif
1068 1106
1069 vector<void *> allocated; // free these memory blocks with free() 1107 vector<void *> allocated; // free these memory blocks with free()
1070 1108
1071 char *env_windowid; /* environmental variable WINDOWID */ 1109 char env_windowid[21]; /* environmental variable WINDOWID */
1110 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1072 char *env_display; /* environmental variable DISPLAY */ 1111 char *env_display; /* environmental variable DISPLAY */
1073 char *env_term; /* environmental variable TERM */ 1112 char *env_term; /* environmental variable TERM */
1074 char *env_colorfgbg; 1113
1075 char *locale; 1114 char *locale;
1076 char charsets[4]; 1115 char charsets[4];
1077 char *v_buffer; /* pointer to physical buffer */ 1116 char *v_buffer; /* pointer to physical buffer */
1078 unsigned int v_buflen; /* size of area to write */ 1117 unsigned int v_buflen; /* size of area to write */
1079 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1118 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1080 1119
1081#ifdef KEYSYM_RESOURCE 1120#ifdef KEYSYM_RESOURCE
1082 keyboard_manager *keyboard; 1121 keyboard_manager *keyboard;
1083#endif 1122#endif
1084 1123
… …
1110 1149
1111 long vt_emask, vt_emask_perl, vt_emask_xim; 1150 long vt_emask, vt_emask_perl, vt_emask_xim;
1112 1151
1113 void vt_select_input () const NOTHROW 1152 void vt_select_input () const NOTHROW
1114 { 1153 {
1115 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1154 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1116 } 1155 }
1117 1156
1118#if TRANSPARENT 1157#if ENABLE_TRANSPARENCY || ENABLE_PERL
1119 void rootwin_cb (XEvent &xev); 1158 void rootwin_cb (XEvent &xev);
1120 xevent_watcher rootwin_ev; 1159 xevent_watcher rootwin_ev;
1160#endif
1161#if ENABLE_TRANSPARENCY
1162 int check_our_parents ();
1163 void check_our_parents_cb (time_watcher &w);
1164 time_watcher check_our_parents_ev;
1121#endif 1165#endif
1122 1166
1123 void x_cb (XEvent &xev); 1167 void x_cb (XEvent &xev);
1124 void flush (); 1168 void flush ();
1125 xevent_watcher termwin_ev; 1169 xevent_watcher termwin_ev;
… …
1185 bool pty_fill (); 1229 bool pty_fill ();
1186 1230
1187 void make_current () const // make this the "currently active" urxvt instance 1231 void make_current () const // make this the "currently active" urxvt instance
1188 { 1232 {
1189 SET_R (this); 1233 SET_R (this);
1234 set_environ (envv);
1190 rxvt_set_locale (locale); 1235 rxvt_set_locale (locale);
1191 set_environ (envv);
1192 } 1236 }
1193 1237
1194 void init_secondary (); 1238 void init_secondary ();
1195 const char **init_resources (int argc, const char *const *argv); 1239 const char **init_resources (int argc, const char *const *argv);
1196 const char *x_resource (const char *name); 1240 const char *x_resource (const char *name);
… …
1221 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1265 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1222 1266
1223 bool IMisRunning (); 1267 bool IMisRunning ();
1224 void IMSendSpot (); 1268 void IMSendSpot ();
1225 bool IM_get_IC (const char *modifiers); 1269 bool IM_get_IC (const char *modifiers);
1226 void IMSetStatusPosition (); 1270 void IMSetPosition ();
1227#endif 1271#endif
1228 1272
1229 void resize_scrollbar (); 1273 void resize_scrollbar ();
1230 1274
1231 // command.C 1275 // command.C
1232 void lookup_key (XKeyEvent &ev); 1276 void key_press (XKeyEvent &ev);
1277 void key_release (XKeyEvent &ev);
1233 unsigned int cmd_write (const char *str, unsigned int count); 1278 unsigned int cmd_write (const char *str, unsigned int count);
1234 1279
1235 wchar_t next_char () NOTHROW; 1280 wchar_t next_char () NOTHROW;
1236 wchar_t cmd_getc () THROW ((class out_of_input)); 1281 wchar_t cmd_getc () THROW ((class out_of_input));
1237 uint32_t next_octet () NOTHROW; 1282 uint32_t next_octet () NOTHROW;
… …
1241 void mouse_report (XButtonEvent &ev); 1286 void mouse_report (XButtonEvent &ev);
1242 void button_press (XButtonEvent &ev); 1287 void button_press (XButtonEvent &ev);
1243 void button_release (XButtonEvent &ev); 1288 void button_release (XButtonEvent &ev);
1244 void focus_in (); 1289 void focus_in ();
1245 void focus_out (); 1290 void focus_out ();
1246 int check_our_parents (); 1291 void update_fade_color (unsigned int idx);
1247#ifdef PRINTPIPE 1292#ifdef PRINTPIPE
1248 FILE *popen_printer (); 1293 FILE *popen_printer ();
1249 int pclose_printer (FILE *stream); 1294 int pclose_printer (FILE *stream);
1250#endif 1295#endif
1251 void process_print_pipe (); 1296 void process_print_pipe ();
… …
1272 void set_utf8_property (Atom prop, const char *str, int len = -1); 1317 void set_utf8_property (Atom prop, const char *str, int len = -1);
1273 void set_title (const char *str); 1318 void set_title (const char *str);
1274 void set_icon_name (const char *str); 1319 void set_icon_name (const char *str);
1275 void set_window_color (int idx, const char *color); 1320 void set_window_color (int idx, const char *color);
1276 void set_colorfgbg (); 1321 void set_colorfgbg ();
1277 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1322 bool set_color (rxvt_color &color, const char *name);
1323 void alias_color (int dst, int src);
1278 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1324 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1279 1325
1280 // screen.C 1326 // screen.C
1281 1327
1282 void lalloc (line_t &l) const 1328 void lalloc (line_t &l) const
… …
1311 { 1357 {
1312 int base = GET_BASEFG (r); 1358 int base = GET_BASEFG (r);
1313#ifndef NO_BRIGHTCOLOR 1359#ifndef NO_BRIGHTCOLOR
1314 if (r & RS_Bold 1360 if (r & RS_Bold
1315# if ENABLE_STYLES 1361# if ENABLE_STYLES
1316 && OPTION (Opt_intensityStyles) 1362 && option (Opt_intensityStyles)
1317# endif 1363# endif
1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1364 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1319 base += minBrightCOLOR - minCOLOR; 1365 base += minBrightCOLOR - minCOLOR;
1320#endif 1366#endif
1321 return base; 1367 return base;
… …
1325 { 1371 {
1326 int base = GET_BASEBG (r); 1372 int base = GET_BASEBG (r);
1327#ifndef NO_BRIGHTCOLOR 1373#ifndef NO_BRIGHTCOLOR
1328 if (r & RS_Blink 1374 if (r & RS_Blink
1329# if ENABLE_STYLES 1375# if ENABLE_STYLES
1330 && OPTION (Opt_intensityStyles) 1376 && option (Opt_intensityStyles)
1331# endif 1377# endif
1332 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1378 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1333 base += minBrightCOLOR - minCOLOR; 1379 base += minBrightCOLOR - minCOLOR;
1334#endif 1380#endif
1335 return base; 1381 return base;
1336 } 1382 }
1337 1383
1338 bool option (uint32_t opt) const NOTHROW 1384 bool option (uint8_t opt) const NOTHROW
1339 { 1385 {
1340 return OPTION (opt); 1386 return options[opt >> 3] & (1 << (opt & 7));
1341 } 1387 }
1342 1388
1343 void set_option (uint32_t opt, bool set) NOTHROW 1389 void set_option (uint8_t opt, bool set = true) NOTHROW
1344 { 1390 {
1345 if (set) 1391 if (set)
1346 options |= opt; 1392 options[opt >> 3] |= (1 << (opt & 7));
1347 else 1393 else
1348 options &= ~opt; 1394 options[opt >> 3] &= ~(1 << (opt & 7));
1349 } 1395 }
1350 1396
1351 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1397 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1352 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1398 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1353 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1399 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1459 void get_options (int argc, const char *const *argv); 1505 void get_options (int argc, const char *const *argv);
1460 int parse_keysym (const char *str, const char *arg); 1506 int parse_keysym (const char *str, const char *arg);
1461 void get_xdefaults (FILE *stream, const char *name); 1507 void get_xdefaults (FILE *stream, const char *name);
1462 void extract_resources (); 1508 void extract_resources ();
1463 // xpm.C 1509 // xpm.C
1464 int scale_pixmap (const char *geom); 1510 void get_window_origin (int &x, int &y);
1465 void resize_pixmap (); 1511 Pixmap get_pixmap_property (int prop_id);
1466 Pixmap set_bgPixmap (const char *file);
1467}; 1512};
1468 1513
1469/* 1514/*
1470 ***************************************************************************** 1515 *****************************************************************************
1471 * PROTOTYPES 1516 * PROTOTYPES

Diff Legend

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