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.290 by sasha, Thu Aug 9 22:08:21 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# define bgPmap_geometrySet (1UL<<0)
179# define bgPmap_propScale (1UL<<1)
180# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_propScale)
181
182# define bgPmap_Transparent (1UL<<16)
183 unsigned long flags;
184
209#ifdef XPM_BACKGROUND 185# ifdef XPM_BACKGROUND
210typedef struct { 186# ifdef HAVE_AFTERIMAGE
211 short w, h, x, y; 187 ASImage *original_asim;
188 bool render_asim (ASImage *background, ARGB32 background_tint);
189# endif
190
191#define bgPmap_defaultScale 100
192#define bgPmap_defaultAlign 50
193 unsigned int h_scale, v_scale;/* percents of the window size */
194 int h_align, v_align; /* percents of the window size:
195 0 - left align, 50 - center, 100 - right */
196 bool handle_geometry (const char *geom);
197 void set_defaultGeometry ()
198 {
199 h_scale = v_scale = bgPmap_defaultScale;
200 h_align = v_align = bgPmap_defaultAlign;
201 flags |= bgPmap_geometrySet;
202 };
203
204# endif /* XPM_BACKGROUND */
205
206 rxvt_term *target;
207 bool set_target (rxvt_term *new_target);
208
209# ifdef ENABLE_TRANSPARENCY
210 int root_depth; /* obtained when target is set */
211 Pixmap root_pixmap; /* current root pixmap set */
212 bool make_transparency_pixmap ();
213# endif
214
212 Pixmap pixmap; 215 Pixmap pixmap;
213} bgPixmap_t; 216 unsigned int pmap_width, pmap_height;
217 unsigned int pmap_depth;
218
219 bool window_size_sensitive ();
220 void apply_background ();
221
222};
223#else
224# undef HAVE_BG_PIXMAP
214#endif 225#endif
215 226
216/* 227/*
217 * the 'essential' information for reporting Mouse Events 228 * the 'essential' information for reporting Mouse Events
218 * pared down from XButtonEvent 229 * pared down from XButtonEvent
… …
432// fake styles 443// fake styles
433#define RS_Blink 0x00010000UL // blink 444#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 445#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 446#define RS_Uline 0x00040000UL // underline
436 447
448// toggle this to force redraw, must be != RS_Careful
449#define RS_redraw 0x01000000UL
450
437// 5 custom bits for extensions 451// 5 custom bits for extensions
438#define RS_customCount 32 452#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 453#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 454#define RS_customShift 19
441 455
… …
510 Rxvt_restoreFG = 39, // change default fg color 524 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 525 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 526 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 527
514 URxvt_locale = 701, // change locale 528 URxvt_locale = 701, // change locale
529 URxvt_version = 702, // request version
515 530
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 531 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 532 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 533 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 534 URxvt_Color_UL = 707,
… …
535 * on the unnecessary items, e.g. Color_pointer, but won't bother 550 * 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 551 * until we need to. Also, be aware of usage in pixcolor_set
537 */ 552 */
538 553
539enum colour_list { 554enum colour_list {
555 Color_none = -2,
556 Color_transparent = -1,
540 Color_fg = 0, 557 Color_fg = 0,
541 Color_bg, 558 Color_bg,
542 minCOLOR, /* 2 */ 559 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 560 Color_Black = minCOLOR,
544 Color_Red3, 561 Color_Red3,
… …
586#endif 603#endif
587#ifdef KEEP_SCROLLCOLOR 604#ifdef KEEP_SCROLLCOLOR
588 Color_scroll, 605 Color_scroll,
589 Color_trough, 606 Color_trough,
590#endif 607#endif
591#if TINTING 608#if ENABLE_TRANSPARENCY
592 Color_tint, 609 Color_tint,
593#endif 610#endif
594#if OFF_FOCUS_FADING 611#if OFF_FOCUS_FADING
595 Color_fade, 612 Color_fade,
596#endif 613#endif
… …
603 TOTAL_COLORS = NRS_COLORS 620 TOTAL_COLORS = NRS_COLORS
604#endif 621#endif
605}; 622};
606 623
607#define Color_Bits 7 // 0 .. maxTermCOLOR 624#define Color_Bits 7 // 0 .. maxTermCOLOR
608
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611 625
612/* 626/*
613 * Resource list 627 * Resource list
614 */ 628 */
615enum { 629enum {
… …
699 ***************************************************************************** 713 *****************************************************************************
700 * MACRO DEFINES 714 * MACRO DEFINES
701 ***************************************************************************** 715 *****************************************************************************
702 */ 716 */
703#define dLocal(type,name) type const name = this->name 717#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 718
706// for speed reasons, we assume that all latin1 characters 719// for speed reasons, we assume that all codepoints 32 to 126 are
707// are single-width (the first unicdoe combining character 720// single-width.
708// is actually 0x300, but ascii is what matters most). 721#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
709#define WCWIDTH(c) ((c) < 0x100 ? 1 : wcwidth (c))
710 722
711/* convert pixel dimensions to row/column values. Everything as int32_t */ 723/* convert pixel dimensions to row/column values. Everything as int32_t */
712#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 724#define Pixel2Col(x) Pixel2Width((int32_t)(x))
713#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 725#define Pixel2Row(y) Pixel2Height((int32_t)(y))
714#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 726#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
716#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 728#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
717#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 729#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
718#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 730#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
719#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 731#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
720 732
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 733// for m >= -n, ensure remainder lies between 0..n-1
727#define MOD(m,n) (((m) + (n)) % (n)) 734#define MOD(m,n) (((m) + (n)) % (n))
728 735
729#define LINENO(n) MOD (term_start + int(n), total_rows) 736#define LINENO(n) MOD (term_start + int(n), total_rows)
730#define ROW(n) row_buf [LINENO (n)] 737#define ROW(n) row_buf [LINENO (n)]
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 755#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 756#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 757
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 758#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 759
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 760#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 761#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 762
756#if ENABLE_STYLES 763#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 764# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 765#else
759# define FONTSET(style) fontset[0] 766# define FONTSET(style) fontset[0]
… …
787#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 794#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
788#define scrollbar_position(y) ((y) - scrollBar.beg) 795#define scrollbar_position(y) ((y) - scrollBar.beg)
789#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 796#define scrollbar_size() (scrollBar.end - scrollBar.beg \
790 - scrollbar_minheight ()) 797 - scrollbar_minheight ())
791 798
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; 799typedef callback<void (const char *)> log_callback;
799typedef callback1<int, int> getfd_callback; 800typedef callback<int (int)> getfd_callback;
800 801
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 802#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern bool rxvt_set_locale (const char *locale) NOTHROW; 803extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW; 804extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW; 805extern void rxvt_pop_locale () NOTHROW;
… …
806/****************************************************************************/ 807/****************************************************************************/
807 808
808#define LINE_LONGER 0x0001 // line is continued on the next row 809#define LINE_LONGER 0x0001 // line is continued on the next row
809#define LINE_FILTERED 0x0002 // line has been filtered 810#define LINE_FILTERED 0x0002 // line has been filtered
810#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 811#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
812#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
813#define LINE_BIDI 0x0010 // line needs bidi (NYI)
811 814
812struct line_t { 815struct line_t {
813 text_t *t; // terminal the text 816 text_t *t; // terminal the text
814 rend_t *r; // rendition, uses RS_ flags 817 rend_t *r; // rendition, uses RS_ flags
815 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 818 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
869# define COMPOSE_LO 0x40000000UL 872# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 873# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 874# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 875#else
873# if ENABLE_PERL 876# if ENABLE_PERL
874# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 877# 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 878# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
876# else 879# else
877# define COMPOSE_LO 0xd800UL 880# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 881# define COMPOSE_HI 0xf8ffUL
879# endif 882# endif
… …
908#endif 911#endif
909 912
910/****************************************************************************/ 913/****************************************************************************/
911 914
912#ifdef KEYSYM_RESOURCE 915#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 916class keyboard_manager;
914#endif 917#endif
915 918
916struct rxvt_term : zero_initialized, rxvt_vars { 919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
920
921 // special markers with magic addresses
922 static const char resval_undef []; // options specifically unset
923 static const char resval_on []; // boolean options switched on
924 static const char resval_off []; // or off
925
917 log_callback *log_hook; // log error messages through this hook, if != 0 926 log_callback *log_hook; // log error messages through this hook, if != 0
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 927 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 928#if ENABLE_PERL
920 rxvt_perl_term perl; 929 rxvt_perl_term perl;
921#endif 930#endif
922 struct mbstate mbstate; // current input multibyte state 931 struct mbstate mbstate; // current input multibyte state
923 932
924 unsigned char want_refresh:1, 933 unsigned char want_refresh:1,
925#ifdef TRANSPARENT 934#ifdef ENABLE_TRANSPARENCY
926 want_full_refresh:1, /* awaiting full screen refresh */ 935 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 */ 936 am_transparent:1, /* is a transparent term */
930 am_pixmap_trans:1, /* transparency w/known root pixmap */ 937 am_pixmap_trans:1, /* transparency w/known root pixmap */
931#endif 938#endif
932 current_screen:1, /* primary or secondary */ 939 current_screen:1, /* primary or secondary */
933 num_scr_allow:1, 940 num_scr_allow:1,
… …
962 int prev_ncol, /* screen: previous number of columns */ 969 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 970 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 971/* ---------- */
965 rend_t rstyle; 972 rend_t rstyle;
966/* ---------- */ 973/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */
969#ifdef SELECTION_SCROLLING 974#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 975 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 976 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 977 int selection_save_x,
973 selection_save_y, 978 selection_save_y,
… …
978 /* give proper Scroll behaviour */ 983 /* give proper Scroll behaviour */
979#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 984#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
980 mouse_slip_wheel_speed, 985 mouse_slip_wheel_speed,
981#endif 986#endif
982 refresh_count, 987 refresh_count,
983 refresh_limit,
984 last_bot, /* scrollbar last bottom position */ 988 last_bot, /* scrollbar last bottom position */
985 last_top, /* scrollbar last top position */ 989 last_top, /* scrollbar last top position */
986 last_state, /* scrollbar last state */ 990 last_state, /* scrollbar last state */
987 scrollbar_len, 991 scrollbar_len,
988 window_vt_x, 992 window_vt_x,
… …
1044#endif 1048#endif
1045 struct mouse_event MEvent; 1049 struct mouse_event MEvent;
1046 XComposeStatus compose; 1050 XComposeStatus compose;
1047 ttymode_t tio; 1051 ttymode_t tio;
1048 row_col_t oldcursor; 1052 row_col_t oldcursor;
1049#ifdef XPM_BACKGROUND 1053#ifdef HAVE_BG_PIXMAP
1050 bgPixmap_t bgPixmap; 1054 bgPixmap_t bgPixmap;
1051 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1055#endif
1056#ifdef HAVE_AFTERIMAGE
1057 ASVisual *asv;
1058 ASImageManager *asimman;
1052#endif 1059#endif
1053 1060
1054#if ENABLE_OVERLAY 1061#if ENABLE_OVERLAY
1055 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1062 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1056 text_t **ov_text; 1063 text_t **ov_text;
… …
1066 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1073 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1067#endif 1074#endif
1068 1075
1069 vector<void *> allocated; // free these memory blocks with free() 1076 vector<void *> allocated; // free these memory blocks with free()
1070 1077
1071 char *env_windowid; /* environmental variable WINDOWID */ 1078 char env_windowid[21]; /* environmental variable WINDOWID */
1079 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1072 char *env_display; /* environmental variable DISPLAY */ 1080 char *env_display; /* environmental variable DISPLAY */
1073 char *env_term; /* environmental variable TERM */ 1081 char *env_term; /* environmental variable TERM */
1074 char *env_colorfgbg; 1082
1075 char *locale; 1083 char *locale;
1076 char charsets[4]; 1084 char charsets[4];
1077 char *v_buffer; /* pointer to physical buffer */ 1085 char *v_buffer; /* pointer to physical buffer */
1078 unsigned int v_buflen; /* size of area to write */ 1086 unsigned int v_buflen; /* size of area to write */
1079 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1087 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1080 1088
1081#ifdef KEYSYM_RESOURCE 1089#ifdef KEYSYM_RESOURCE
1082 keyboard_manager *keyboard; 1090 keyboard_manager *keyboard;
1083#endif 1091#endif
1084 1092
… …
1110 1118
1111 long vt_emask, vt_emask_perl, vt_emask_xim; 1119 long vt_emask, vt_emask_perl, vt_emask_xim;
1112 1120
1113 void vt_select_input () const NOTHROW 1121 void vt_select_input () const NOTHROW
1114 { 1122 {
1115 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1123 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1116 } 1124 }
1117 1125
1118#if TRANSPARENT 1126#if ENABLE_TRANSPARENCY || ENABLE_PERL
1119 void rootwin_cb (XEvent &xev); 1127 void rootwin_cb (XEvent &xev);
1120 xevent_watcher rootwin_ev; 1128 xevent_watcher rootwin_ev;
1129#endif
1130#if ENABLE_TRANSPARENCY
1131 int check_our_parents ();
1132 void check_our_parents_cb (time_watcher &w);
1133 time_watcher check_our_parents_ev;
1121#endif 1134#endif
1122 1135
1123 void x_cb (XEvent &xev); 1136 void x_cb (XEvent &xev);
1124 void flush (); 1137 void flush ();
1125 xevent_watcher termwin_ev; 1138 xevent_watcher termwin_ev;
… …
1185 bool pty_fill (); 1198 bool pty_fill ();
1186 1199
1187 void make_current () const // make this the "currently active" urxvt instance 1200 void make_current () const // make this the "currently active" urxvt instance
1188 { 1201 {
1189 SET_R (this); 1202 SET_R (this);
1203 set_environ (envv);
1190 rxvt_set_locale (locale); 1204 rxvt_set_locale (locale);
1191 set_environ (envv);
1192 } 1205 }
1193 1206
1194 void init_secondary (); 1207 void init_secondary ();
1195 const char **init_resources (int argc, const char *const *argv); 1208 const char **init_resources (int argc, const char *const *argv);
1196 const char *x_resource (const char *name); 1209 const char *x_resource (const char *name);
… …
1221 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1234 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1222 1235
1223 bool IMisRunning (); 1236 bool IMisRunning ();
1224 void IMSendSpot (); 1237 void IMSendSpot ();
1225 bool IM_get_IC (const char *modifiers); 1238 bool IM_get_IC (const char *modifiers);
1226 void IMSetStatusPosition (); 1239 void IMSetPosition ();
1227#endif 1240#endif
1228 1241
1229 void resize_scrollbar (); 1242 void resize_scrollbar ();
1230 1243
1231 // command.C 1244 // command.C
1232 void lookup_key (XKeyEvent &ev); 1245 void key_press (XKeyEvent &ev);
1246 void key_release (XKeyEvent &ev);
1233 unsigned int cmd_write (const char *str, unsigned int count); 1247 unsigned int cmd_write (const char *str, unsigned int count);
1234 1248
1235 wchar_t next_char () NOTHROW; 1249 wchar_t next_char () NOTHROW;
1236 wchar_t cmd_getc () THROW ((class out_of_input)); 1250 wchar_t cmd_getc () THROW ((class out_of_input));
1237 uint32_t next_octet () NOTHROW; 1251 uint32_t next_octet () NOTHROW;
… …
1241 void mouse_report (XButtonEvent &ev); 1255 void mouse_report (XButtonEvent &ev);
1242 void button_press (XButtonEvent &ev); 1256 void button_press (XButtonEvent &ev);
1243 void button_release (XButtonEvent &ev); 1257 void button_release (XButtonEvent &ev);
1244 void focus_in (); 1258 void focus_in ();
1245 void focus_out (); 1259 void focus_out ();
1246 int check_our_parents (); 1260 void update_fade_color (unsigned int idx);
1247#ifdef PRINTPIPE 1261#ifdef PRINTPIPE
1248 FILE *popen_printer (); 1262 FILE *popen_printer ();
1249 int pclose_printer (FILE *stream); 1263 int pclose_printer (FILE *stream);
1250#endif 1264#endif
1251 void process_print_pipe (); 1265 void process_print_pipe ();
… …
1272 void set_utf8_property (Atom prop, const char *str, int len = -1); 1286 void set_utf8_property (Atom prop, const char *str, int len = -1);
1273 void set_title (const char *str); 1287 void set_title (const char *str);
1274 void set_icon_name (const char *str); 1288 void set_icon_name (const char *str);
1275 void set_window_color (int idx, const char *color); 1289 void set_window_color (int idx, const char *color);
1276 void set_colorfgbg (); 1290 void set_colorfgbg ();
1277 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1291 bool set_color (rxvt_color &color, const char *name);
1292 void alias_color (int dst, int src);
1278 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1293 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1279 1294
1280 // screen.C 1295 // screen.C
1281 1296
1282 void lalloc (line_t &l) const 1297 void lalloc (line_t &l) const
… …
1311 { 1326 {
1312 int base = GET_BASEFG (r); 1327 int base = GET_BASEFG (r);
1313#ifndef NO_BRIGHTCOLOR 1328#ifndef NO_BRIGHTCOLOR
1314 if (r & RS_Bold 1329 if (r & RS_Bold
1315# if ENABLE_STYLES 1330# if ENABLE_STYLES
1316 && OPTION (Opt_intensityStyles) 1331 && option (Opt_intensityStyles)
1317# endif 1332# endif
1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1333 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1319 base += minBrightCOLOR - minCOLOR; 1334 base += minBrightCOLOR - minCOLOR;
1320#endif 1335#endif
1321 return base; 1336 return base;
… …
1325 { 1340 {
1326 int base = GET_BASEBG (r); 1341 int base = GET_BASEBG (r);
1327#ifndef NO_BRIGHTCOLOR 1342#ifndef NO_BRIGHTCOLOR
1328 if (r & RS_Blink 1343 if (r & RS_Blink
1329# if ENABLE_STYLES 1344# if ENABLE_STYLES
1330 && OPTION (Opt_intensityStyles) 1345 && option (Opt_intensityStyles)
1331# endif 1346# endif
1332 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1347 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1333 base += minBrightCOLOR - minCOLOR; 1348 base += minBrightCOLOR - minCOLOR;
1334#endif 1349#endif
1335 return base; 1350 return base;
1336 } 1351 }
1337 1352
1338 bool option (uint32_t opt) const NOTHROW 1353 bool option (uint8_t opt) const NOTHROW
1339 { 1354 {
1340 return OPTION (opt); 1355 return options[opt >> 3] & (1 << (opt & 7));
1341 } 1356 }
1342 1357
1343 void set_option (uint32_t opt, bool set) NOTHROW 1358 void set_option (uint8_t opt, bool set = true) NOTHROW
1344 { 1359 {
1345 if (set) 1360 if (set)
1346 options |= opt; 1361 options[opt >> 3] |= (1 << (opt & 7));
1347 else 1362 else
1348 options &= ~opt; 1363 options[opt >> 3] &= ~(1 << (opt & 7));
1349 } 1364 }
1350 1365
1351 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1366 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; 1367 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; 1368 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1459 void get_options (int argc, const char *const *argv); 1474 void get_options (int argc, const char *const *argv);
1460 int parse_keysym (const char *str, const char *arg); 1475 int parse_keysym (const char *str, const char *arg);
1461 void get_xdefaults (FILE *stream, const char *name); 1476 void get_xdefaults (FILE *stream, const char *name);
1462 void extract_resources (); 1477 void extract_resources ();
1463 // xpm.C 1478 // xpm.C
1464 int scale_pixmap (const char *geom); 1479//int scale_pixmap (const char *geom);
1465 void resize_pixmap (); 1480 void resize_pixmap ();
1466 Pixmap set_bgPixmap (const char *file); 1481 void set_bgPixmap (const char *file);
1482 void get_window_origin (int &x, int &y);
1483 Pixmap get_pixmap_property (int prop_id);
1467}; 1484};
1468 1485
1469/* 1486/*
1470 ***************************************************************************** 1487 *****************************************************************************
1471 * PROTOTYPES 1488 * PROTOTYPES

Diff Legend

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