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

Diff Legend

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