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.244 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.293 by sasha, Thu Aug 16 21:26:20 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 double invalid_since;
245
212 Pixmap pixmap; 246 Pixmap pixmap;
213} bgPixmap_t; 247 unsigned int pmap_width, pmap_height;
248 unsigned int pmap_depth;
249
250 bool window_size_sensitive ();
251 bool need_client_side_rendering ();
252 void apply ();
253 bool render ();
254 void invalidate () {
255 if (!(flags & isInvalid))
256 {
257 flags |= isInvalid;
258 invalid_since = NOW;
259 }
260 };
261};
262#else
263# undef HAVE_BG_PIXMAP
214#endif 264#endif
215 265
216/* 266/*
217 * the 'essential' information for reporting Mouse Events 267 * the 'essential' information for reporting Mouse Events
218 * pared down from XButtonEvent 268 * pared down from XButtonEvent
… …
432// fake styles 482// fake styles
433#define RS_Blink 0x00010000UL // blink 483#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 484#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 485#define RS_Uline 0x00040000UL // underline
436 486
487// toggle this to force redraw, must be != RS_Careful
488#define RS_redraw 0x01000000UL
489
437// 5 custom bits for extensions 490// 5 custom bits for extensions
438#define RS_customCount 32 491#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 492#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 493#define RS_customShift 19
441 494
… …
510 Rxvt_restoreFG = 39, // change default fg color 563 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 564 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 565 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 566
514 URxvt_locale = 701, // change locale 567 URxvt_locale = 701, // change locale
568 URxvt_version = 702, // request version
515 569
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 570 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 571 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 572 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 573 URxvt_Color_UL = 707,
… …
535 * on the unnecessary items, e.g. Color_pointer, but won't bother 589 * 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 590 * until we need to. Also, be aware of usage in pixcolor_set
537 */ 591 */
538 592
539enum colour_list { 593enum colour_list {
594 Color_none = -2,
595 Color_transparent = -1,
540 Color_fg = 0, 596 Color_fg = 0,
541 Color_bg, 597 Color_bg,
542 minCOLOR, /* 2 */ 598 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 599 Color_Black = minCOLOR,
544 Color_Red3, 600 Color_Red3,
… …
586#endif 642#endif
587#ifdef KEEP_SCROLLCOLOR 643#ifdef KEEP_SCROLLCOLOR
588 Color_scroll, 644 Color_scroll,
589 Color_trough, 645 Color_trough,
590#endif 646#endif
591#if TINTING 647#if ENABLE_TRANSPARENCY
592 Color_tint, 648 Color_tint,
593#endif 649#endif
594#if OFF_FOCUS_FADING 650#if OFF_FOCUS_FADING
595 Color_fade, 651 Color_fade,
596#endif 652#endif
… …
603 TOTAL_COLORS = NRS_COLORS 659 TOTAL_COLORS = NRS_COLORS
604#endif 660#endif
605}; 661};
606 662
607#define Color_Bits 7 // 0 .. maxTermCOLOR 663#define Color_Bits 7 // 0 .. maxTermCOLOR
608
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611 664
612/* 665/*
613 * Resource list 666 * Resource list
614 */ 667 */
615enum { 668enum {
… …
699 ***************************************************************************** 752 *****************************************************************************
700 * MACRO DEFINES 753 * MACRO DEFINES
701 ***************************************************************************** 754 *****************************************************************************
702 */ 755 */
703#define dLocal(type,name) type const name = this->name 756#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 757
706// for speed reasons, we assume that all latin1 characters 758// for speed reasons, we assume that all codepoints 32 to 126 are
707// are single-width (the first unicode combining character 759// single-width.
708// is actually 0x300, but ascii is what matters most). 760#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
709#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
710 761
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 762/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 763#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 764#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 765#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
716#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 767#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
717#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 768#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 769#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 770#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
720 771
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 772// for m >= -n, ensure remainder lies between 0..n-1
727#define MOD(m,n) (((m) + (n)) % (n)) 773#define MOD(m,n) (((m) + (n)) % (n))
728 774
729#define LINENO(n) MOD (term_start + int(n), total_rows) 775#define LINENO(n) MOD (term_start + int(n), total_rows)
730#define ROW(n) row_buf [LINENO (n)] 776#define ROW(n) row_buf [LINENO (n)]
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 794#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 795#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 796
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 797#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 798
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 799#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 800#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 801
756#if ENABLE_STYLES 802#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 803# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 804#else
759# define FONTSET(style) fontset[0] 805# define FONTSET(style) fontset[0]
… …
787#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 833#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788#define scrollbar_position(y) ((y) - scrollBar.beg) 834#define scrollbar_position(y) ((y) - scrollBar.beg)
789#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 835#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790 - scrollbar_minheight ()) 836 - scrollbar_minheight ())
791 837
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; 838typedef callback<void (const char *)> log_callback;
799typedef callback1<int, int> getfd_callback; 839typedef callback<int (int)> getfd_callback;
800 840
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 841#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern bool rxvt_set_locale (const char *locale) NOTHROW; 842extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW; 843extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW; 844extern void rxvt_pop_locale () NOTHROW;
… …
806/****************************************************************************/ 846/****************************************************************************/
807 847
808#define LINE_LONGER 0x0001 // line is continued on the next row 848#define LINE_LONGER 0x0001 // line is continued on the next row
809#define LINE_FILTERED 0x0002 // line has been filtered 849#define LINE_FILTERED 0x0002 // line has been filtered
810#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 850#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
851#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
852#define LINE_BIDI 0x0010 // line needs bidi (NYI)
811 853
812struct line_t { 854struct line_t {
813 text_t *t; // terminal the text 855 text_t *t; // terminal the text
814 rend_t *r; // rendition, uses RS_ flags 856 rend_t *r; // rendition, uses RS_ flags
815 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 857 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
869# define COMPOSE_LO 0x40000000UL 911# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 912# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 913# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 914#else
873# if ENABLE_PERL 915# if ENABLE_PERL
874# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 916# 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 917# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
876# else 918# else
877# define COMPOSE_LO 0xd800UL 919# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 920# define COMPOSE_HI 0xf8ffUL
879# endif 921# endif
… …
908#endif 950#endif
909 951
910/****************************************************************************/ 952/****************************************************************************/
911 953
912#ifdef KEYSYM_RESOURCE 954#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 955class keyboard_manager;
914#endif 956#endif
915 957
916struct rxvt_term : zero_initialized, rxvt_vars { 958struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
959
960 // special markers with magic addresses
961 static const char resval_undef []; // options specifically unset
962 static const char resval_on []; // boolean options switched on
963 static const char resval_off []; // or off
964
917 log_callback *log_hook; // log error messages through this hook, if != 0 965 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 966 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 967#if ENABLE_PERL
920 rxvt_perl_term perl; 968 rxvt_perl_term perl;
921#endif 969#endif
922 struct mbstate mbstate; // current input multibyte state 970 struct mbstate mbstate; // current input multibyte state
923 971
924 unsigned char want_refresh:1, 972 unsigned char want_refresh:1,
925#ifdef TRANSPARENT 973#ifdef ENABLE_TRANSPARENCY
926 want_full_refresh:1, /* awaiting full screen refresh */ 974 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 */ 975 am_transparent:1, /* is a transparent term */
930 am_pixmap_trans:1, /* transparency w/known root pixmap */ 976 am_pixmap_trans:1, /* transparency w/known root pixmap */
931#endif 977#endif
932 current_screen:1, /* primary or secondary */ 978 current_screen:1, /* primary or secondary */
933 num_scr_allow:1, 979 num_scr_allow:1,
… …
962 int prev_ncol, /* screen: previous number of columns */ 1008 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 1009 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 1010/* ---------- */
965 rend_t rstyle; 1011 rend_t rstyle;
966/* ---------- */ 1012/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */
969#ifdef SELECTION_SCROLLING 1013#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 1014 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 1015 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 1016 int selection_save_x,
973 selection_save_y, 1017 selection_save_y,
… …
978 /* give proper Scroll behaviour */ 1022 /* give proper Scroll behaviour */
979#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1023#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
980 mouse_slip_wheel_speed, 1024 mouse_slip_wheel_speed,
981#endif 1025#endif
982 refresh_count, 1026 refresh_count,
983 refresh_limit,
984 last_bot, /* scrollbar last bottom position */ 1027 last_bot, /* scrollbar last bottom position */
985 last_top, /* scrollbar last top position */ 1028 last_top, /* scrollbar last top position */
986 last_state, /* scrollbar last state */ 1029 last_state, /* scrollbar last state */
987 scrollbar_len, 1030 scrollbar_len,
988 window_vt_x, 1031 window_vt_x,
… …
1044#endif 1087#endif
1045 struct mouse_event MEvent; 1088 struct mouse_event MEvent;
1046 XComposeStatus compose; 1089 XComposeStatus compose;
1047 ttymode_t tio; 1090 ttymode_t tio;
1048 row_col_t oldcursor; 1091 row_col_t oldcursor;
1049#ifdef XPM_BACKGROUND 1092#ifdef HAVE_BG_PIXMAP
1050 bgPixmap_t bgPixmap; 1093 bgPixmap_t bgPixmap;
1051 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1094#endif
1095#ifdef HAVE_AFTERIMAGE
1096 ASVisual *asv;
1097 ASImageManager *asimman;
1052#endif 1098#endif
1053 1099
1054#if ENABLE_OVERLAY 1100#if ENABLE_OVERLAY
1055 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1101 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1056 text_t **ov_text; 1102 text_t **ov_text;
… …
1111 1157
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1158 long vt_emask, vt_emask_perl, vt_emask_xim;
1113 1159
1114 void vt_select_input () const NOTHROW 1160 void vt_select_input () const NOTHROW
1115 { 1161 {
1116 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1162 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 } 1163 }
1118 1164
1119#if TRANSPARENT 1165#if ENABLE_TRANSPARENCY || ENABLE_PERL
1120 void rootwin_cb (XEvent &xev); 1166 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1167 xevent_watcher rootwin_ev;
1168#endif
1169#ifdef HAVE_BG_PIXMAP
1170 int update_background ();
1171 void update_background_cb (time_watcher &w);
1172 time_watcher update_background_ev;
1122#endif 1173#endif
1123 1174
1124 void x_cb (XEvent &xev); 1175 void x_cb (XEvent &xev);
1125 void flush (); 1176 void flush ();
1126 xevent_watcher termwin_ev; 1177 xevent_watcher termwin_ev;
… …
1186 bool pty_fill (); 1237 bool pty_fill ();
1187 1238
1188 void make_current () const // make this the "currently active" urxvt instance 1239 void make_current () const // make this the "currently active" urxvt instance
1189 { 1240 {
1190 SET_R (this); 1241 SET_R (this);
1242 set_environ (envv);
1191 rxvt_set_locale (locale); 1243 rxvt_set_locale (locale);
1192 set_environ (envv);
1193 } 1244 }
1194 1245
1195 void init_secondary (); 1246 void init_secondary ();
1196 const char **init_resources (int argc, const char *const *argv); 1247 const char **init_resources (int argc, const char *const *argv);
1197 const char *x_resource (const char *name); 1248 const char *x_resource (const char *name);
… …
1222 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1273 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1223 1274
1224 bool IMisRunning (); 1275 bool IMisRunning ();
1225 void IMSendSpot (); 1276 void IMSendSpot ();
1226 bool IM_get_IC (const char *modifiers); 1277 bool IM_get_IC (const char *modifiers);
1227 void IMSetStatusPosition (); 1278 void IMSetPosition ();
1228#endif 1279#endif
1229 1280
1230 void resize_scrollbar (); 1281 void resize_scrollbar ();
1231 1282
1232 // command.C 1283 // command.C
1233 void lookup_key (XKeyEvent &ev); 1284 void key_press (XKeyEvent &ev);
1285 void key_release (XKeyEvent &ev);
1234 unsigned int cmd_write (const char *str, unsigned int count); 1286 unsigned int cmd_write (const char *str, unsigned int count);
1235 1287
1236 wchar_t next_char () NOTHROW; 1288 wchar_t next_char () NOTHROW;
1237 wchar_t cmd_getc () THROW ((class out_of_input)); 1289 wchar_t cmd_getc () THROW ((class out_of_input));
1238 uint32_t next_octet () NOTHROW; 1290 uint32_t next_octet () NOTHROW;
… …
1242 void mouse_report (XButtonEvent &ev); 1294 void mouse_report (XButtonEvent &ev);
1243 void button_press (XButtonEvent &ev); 1295 void button_press (XButtonEvent &ev);
1244 void button_release (XButtonEvent &ev); 1296 void button_release (XButtonEvent &ev);
1245 void focus_in (); 1297 void focus_in ();
1246 void focus_out (); 1298 void focus_out ();
1247 int check_our_parents (); 1299 void update_fade_color (unsigned int idx);
1248#ifdef PRINTPIPE 1300#ifdef PRINTPIPE
1249 FILE *popen_printer (); 1301 FILE *popen_printer ();
1250 int pclose_printer (FILE *stream); 1302 int pclose_printer (FILE *stream);
1251#endif 1303#endif
1252 void process_print_pipe (); 1304 void process_print_pipe ();
… …
1273 void set_utf8_property (Atom prop, const char *str, int len = -1); 1325 void set_utf8_property (Atom prop, const char *str, int len = -1);
1274 void set_title (const char *str); 1326 void set_title (const char *str);
1275 void set_icon_name (const char *str); 1327 void set_icon_name (const char *str);
1276 void set_window_color (int idx, const char *color); 1328 void set_window_color (int idx, const char *color);
1277 void set_colorfgbg (); 1329 void set_colorfgbg ();
1278 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1330 bool set_color (rxvt_color &color, const char *name);
1331 void alias_color (int dst, int src);
1279 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1332 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1280 1333
1281 // screen.C 1334 // screen.C
1282 1335
1283 void lalloc (line_t &l) const 1336 void lalloc (line_t &l) const
… …
1312 { 1365 {
1313 int base = GET_BASEFG (r); 1366 int base = GET_BASEFG (r);
1314#ifndef NO_BRIGHTCOLOR 1367#ifndef NO_BRIGHTCOLOR
1315 if (r & RS_Bold 1368 if (r & RS_Bold
1316# if ENABLE_STYLES 1369# if ENABLE_STYLES
1317 && OPTION (Opt_intensityStyles) 1370 && option (Opt_intensityStyles)
1318# endif 1371# endif
1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1372 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1320 base += minBrightCOLOR - minCOLOR; 1373 base += minBrightCOLOR - minCOLOR;
1321#endif 1374#endif
1322 return base; 1375 return base;
… …
1326 { 1379 {
1327 int base = GET_BASEBG (r); 1380 int base = GET_BASEBG (r);
1328#ifndef NO_BRIGHTCOLOR 1381#ifndef NO_BRIGHTCOLOR
1329 if (r & RS_Blink 1382 if (r & RS_Blink
1330# if ENABLE_STYLES 1383# if ENABLE_STYLES
1331 && OPTION (Opt_intensityStyles) 1384 && option (Opt_intensityStyles)
1332# endif 1385# endif
1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1386 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1334 base += minBrightCOLOR - minCOLOR; 1387 base += minBrightCOLOR - minCOLOR;
1335#endif 1388#endif
1336 return base; 1389 return base;
1337 } 1390 }
1338 1391
1339 bool option (uint32_t opt) const NOTHROW 1392 bool option (uint8_t opt) const NOTHROW
1340 { 1393 {
1341 return OPTION (opt); 1394 return options[opt >> 3] & (1 << (opt & 7));
1342 } 1395 }
1343 1396
1344 void set_option (uint32_t opt, bool set) NOTHROW 1397 void set_option (uint8_t opt, bool set = true) NOTHROW
1345 { 1398 {
1346 if (set) 1399 if (set)
1347 options |= opt; 1400 options[opt >> 3] |= (1 << (opt & 7));
1348 else 1401 else
1349 options &= ~opt; 1402 options[opt >> 3] &= ~(1 << (opt & 7));
1350 } 1403 }
1351 1404
1352 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1405 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; 1406 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; 1407 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1460 void get_options (int argc, const char *const *argv); 1513 void get_options (int argc, const char *const *argv);
1461 int parse_keysym (const char *str, const char *arg); 1514 int parse_keysym (const char *str, const char *arg);
1462 void get_xdefaults (FILE *stream, const char *name); 1515 void get_xdefaults (FILE *stream, const char *name);
1463 void extract_resources (); 1516 void extract_resources ();
1464 // xpm.C 1517 // xpm.C
1465 int scale_pixmap (const char *geom); 1518 void get_window_origin (int &x, int &y);
1466 void resize_pixmap (); 1519 Pixmap get_pixmap_property (int prop_id);
1467 Pixmap set_bgPixmap (const char *file);
1468}; 1520};
1469 1521
1470/* 1522/*
1471 ***************************************************************************** 1523 *****************************************************************************
1472 * PROTOTYPES 1524 * PROTOTYPES

Diff Legend

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