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.245 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.287 by sasha, Mon Aug 6 22:42:05 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 {
209#ifdef XPM_BACKGROUND 178# ifdef XPM_BACKGROUND
210typedef struct { 179
211 short w, h, x, y; 180# ifdef HAVE_AFTERIMAGE
181 ASImage *original_asim;
182
183 bool render_asim (rxvt_term *target, ASImage *background, ARGB32 tint);
184# endif
185
186#define bgPmap_defaultScale 100
187#define bgPmap_defaultAlign 50
188 unsigned int h_scale, v_scale;/* percents of the window size */
189 int h_align, v_align; /* percents of the window size:
190 0 - left align, 50 - center, 100 - right */
191
192 bool handle_geometry (const char *geom);
193
194# endif
195
196# define bgPmap_geometrySet (1UL<<0)
197# define bgPmap_propScale (1UL<<1)
198# define bgPmap_geometryFlags (bgPmap_geometrySet|bgPmap_propScale)
199
200# define bgPmap_Transparent (1UL<<16)
201 unsigned long flags;
202
212 Pixmap pixmap; 203 Pixmap pixmap;
213} bgPixmap_t; 204 unsigned int pmap_width, pmap_height;
205 unsigned int pmap_depth;
206
207 bool window_size_sensitive();
208
209};
210#else
211# undef HAVE_BG_PIXMAP
214#endif 212#endif
215 213
216/* 214/*
217 * the 'essential' information for reporting Mouse Events 215 * the 'essential' information for reporting Mouse Events
218 * pared down from XButtonEvent 216 * pared down from XButtonEvent
… …
432// fake styles 430// fake styles
433#define RS_Blink 0x00010000UL // blink 431#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 432#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 433#define RS_Uline 0x00040000UL // underline
436 434
435// toggle this to force redraw, must be != RS_Careful
436#define RS_redraw 0x01000000UL
437
437// 5 custom bits for extensions 438// 5 custom bits for extensions
438#define RS_customCount 32 439#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 440#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 441#define RS_customShift 19
441 442
… …
510 Rxvt_restoreFG = 39, // change default fg color 511 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 512 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 513 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 514
514 URxvt_locale = 701, // change locale 515 URxvt_locale = 701, // change locale
516 URxvt_version = 702, // request version
515 517
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 518 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 519 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 520 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 521 URxvt_Color_UL = 707,
… …
535 * on the unnecessary items, e.g. Color_pointer, but won't bother 537 * 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 538 * until we need to. Also, be aware of usage in pixcolor_set
537 */ 539 */
538 540
539enum colour_list { 541enum colour_list {
542 Color_none = -2,
543 Color_transparent = -1,
540 Color_fg = 0, 544 Color_fg = 0,
541 Color_bg, 545 Color_bg,
542 minCOLOR, /* 2 */ 546 minCOLOR, /* 2 */
543 Color_Black = minCOLOR, 547 Color_Black = minCOLOR,
544 Color_Red3, 548 Color_Red3,
… …
586#endif 590#endif
587#ifdef KEEP_SCROLLCOLOR 591#ifdef KEEP_SCROLLCOLOR
588 Color_scroll, 592 Color_scroll,
589 Color_trough, 593 Color_trough,
590#endif 594#endif
591#if TINTING 595#if ENABLE_TRANSPARENCY
592 Color_tint, 596 Color_tint,
593#endif 597#endif
594#if OFF_FOCUS_FADING 598#if OFF_FOCUS_FADING
595 Color_fade, 599 Color_fade,
596#endif 600#endif
… …
603 TOTAL_COLORS = NRS_COLORS 607 TOTAL_COLORS = NRS_COLORS
604#endif 608#endif
605}; 609};
606 610
607#define Color_Bits 7 // 0 .. maxTermCOLOR 611#define Color_Bits 7 // 0 .. maxTermCOLOR
608
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611 612
612/* 613/*
613 * Resource list 614 * Resource list
614 */ 615 */
615enum { 616enum {
… …
700 * MACRO DEFINES 701 * MACRO DEFINES
701 ***************************************************************************** 702 *****************************************************************************
702 */ 703 */
703#define dLocal(type,name) type const name = this->name 704#define dLocal(type,name) type const name = this->name
704 705
705// for speed reasons, we assume that all latin1 characters 706// for speed reasons, we assume that all codepoints 32 to 126 are
706// are single-width (the first unicode combining character 707// single-width.
707// is actually 0x300, but ascii is what matters most). 708#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
708#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
709 709
710/* convert pixel dimensions to row/column values. Everything as int32_t */ 710/* convert pixel dimensions to row/column values. Everything as int32_t */
711#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 711#define Pixel2Col(x) Pixel2Width((int32_t)(x))
712#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 712#define Pixel2Row(y) Pixel2Height((int32_t)(y))
713#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 713#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
715#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 715#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
716#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 716#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
717#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 717#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
718#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 718#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
719 719
720#define OPTION(opt) (options & (opt))
721#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
722 | Opt_jumpScroll | Opt_secondaryScreen \
723 | Opt_pastableTabs | Opt_intensityStyles)
724
725// for m >= -n, ensure remainder lies between 0..n-1 720// for m >= -n, ensure remainder lies between 0..n-1
726#define MOD(m,n) (((m) + (n)) % (n)) 721#define MOD(m,n) (((m) + (n)) % (n))
727 722
728#define LINENO(n) MOD (term_start + int(n), total_rows) 723#define LINENO(n) MOD (term_start + int(n), total_rows)
729#define ROW(n) row_buf [LINENO (n)] 724#define ROW(n) row_buf [LINENO (n)]
… …
747#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 742#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
748#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 743#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
749 744
750#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 745#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
751 746
752#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 747#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
753#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 748#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
754 749
755#if ENABLE_STYLES 750#if ENABLE_STYLES
756# define FONTSET(style) fontset[GET_STYLE (style)] 751# define FONTSET(style) fontset[GET_STYLE (style)]
757#else 752#else
758# define FONTSET(style) fontset[0] 753# define FONTSET(style) fontset[0]
… …
786#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 781#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
787#define scrollbar_position(y) ((y) - scrollBar.beg) 782#define scrollbar_position(y) ((y) - scrollBar.beg)
788#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 783#define scrollbar_size() (scrollBar.end - scrollBar.beg \
789 - scrollbar_minheight ()) 784 - scrollbar_minheight ())
790 785
791#ifdef XPM_BACKGROUND
792# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
793#else
794# define XPMClearArea(a, b, c, d, e, f, g)
795#endif
796
797typedef callback1<void, const char *> log_callback; 786typedef callback<void (const char *)> log_callback;
798typedef callback1<int, int> getfd_callback; 787typedef callback<int (int)> getfd_callback;
799 788
800#define SET_LOCALE(locale) rxvt_set_locale (locale) 789#define SET_LOCALE(locale) rxvt_set_locale (locale)
801extern bool rxvt_set_locale (const char *locale) NOTHROW; 790extern bool rxvt_set_locale (const char *locale) NOTHROW;
802extern void rxvt_push_locale (const char *locale) NOTHROW; 791extern void rxvt_push_locale (const char *locale) NOTHROW;
803extern void rxvt_pop_locale () NOTHROW; 792extern void rxvt_pop_locale () NOTHROW;
… …
805/****************************************************************************/ 794/****************************************************************************/
806 795
807#define LINE_LONGER 0x0001 // line is continued on the next row 796#define LINE_LONGER 0x0001 // line is continued on the next row
808#define LINE_FILTERED 0x0002 // line has been filtered 797#define LINE_FILTERED 0x0002 // line has been filtered
809#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 798#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
799#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
800#define LINE_BIDI 0x0010 // line needs bidi (NYI)
810 801
811struct line_t { 802struct line_t {
812 text_t *t; // terminal the text 803 text_t *t; // terminal the text
813 rend_t *r; // rendition, uses RS_ flags 804 rend_t *r; // rendition, uses RS_ flags
814 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 805 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
868# define COMPOSE_LO 0x40000000UL 859# define COMPOSE_LO 0x40000000UL
869# define COMPOSE_HI 0x400fffffUL 860# define COMPOSE_HI 0x400fffffUL
870# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 861# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
871#else 862#else
872# if ENABLE_PERL 863# if ENABLE_PERL
873# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 864# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
874# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 865# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
875# else 866# else
876# define COMPOSE_LO 0xd800UL 867# define COMPOSE_LO 0xd800UL
877# define COMPOSE_HI 0xf8ffUL 868# define COMPOSE_HI 0xf8ffUL
878# endif 869# endif
… …
907#endif 898#endif
908 899
909/****************************************************************************/ 900/****************************************************************************/
910 901
911#ifdef KEYSYM_RESOURCE 902#ifdef KEYSYM_RESOURCE
912 class keyboard_manager; 903class keyboard_manager;
913#endif 904#endif
914 905
915struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 906struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
907
908 // special markers with magic addresses
909 static const char resval_undef []; // options specifically unset
910 static const char resval_on []; // boolean options switched on
911 static const char resval_off []; // or off
912
916 log_callback *log_hook; // log error messages through this hook, if != 0 913 log_callback *log_hook; // log error messages through this hook, if != 0
917 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 914 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
918#if ENABLE_PERL 915#if ENABLE_PERL
919 rxvt_perl_term perl; 916 rxvt_perl_term perl;
920#endif 917#endif
921 struct mbstate mbstate; // current input multibyte state 918 struct mbstate mbstate; // current input multibyte state
922 919
923 unsigned char want_refresh:1, 920 unsigned char want_refresh:1,
924#ifdef TRANSPARENT 921#ifdef ENABLE_TRANSPARENCY
925 want_full_refresh:1, /* awaiting full screen refresh */ 922 want_full_refresh:1, /* awaiting full screen refresh */
926#endif
927#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
928 am_transparent:1, /* is a transparent term */ 923 am_transparent:1, /* is a transparent term */
929 am_pixmap_trans:1, /* transparency w/known root pixmap */ 924 am_pixmap_trans:1, /* transparency w/known root pixmap */
930#endif 925#endif
931 current_screen:1, /* primary or secondary */ 926 current_screen:1, /* primary or secondary */
932 num_scr_allow:1, 927 num_scr_allow:1,
… …
961 int prev_ncol, /* screen: previous number of columns */ 956 int prev_ncol, /* screen: previous number of columns */
962 prev_nrow; /* screen: previous number of rows */ 957 prev_nrow; /* screen: previous number of rows */
963/* ---------- */ 958/* ---------- */
964 rend_t rstyle; 959 rend_t rstyle;
965/* ---------- */ 960/* ---------- */
966 uint32_t pixcolor_set[NPIXCLR_SETS];
967/* ---------- */
968#ifdef SELECTION_SCROLLING 961#ifdef SELECTION_SCROLLING
969 int scroll_selection_lines; 962 int scroll_selection_lines;
970 enum page_dirn scroll_selection_dir; 963 enum page_dirn scroll_selection_dir;
971 int selection_save_x, 964 int selection_save_x,
972 selection_save_y, 965 selection_save_y,
… …
977 /* give proper Scroll behaviour */ 970 /* give proper Scroll behaviour */
978#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 971#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
979 mouse_slip_wheel_speed, 972 mouse_slip_wheel_speed,
980#endif 973#endif
981 refresh_count, 974 refresh_count,
982 refresh_limit,
983 last_bot, /* scrollbar last bottom position */ 975 last_bot, /* scrollbar last bottom position */
984 last_top, /* scrollbar last top position */ 976 last_top, /* scrollbar last top position */
985 last_state, /* scrollbar last state */ 977 last_state, /* scrollbar last state */
986 scrollbar_len, 978 scrollbar_len,
987 window_vt_x, 979 window_vt_x,
… …
1043#endif 1035#endif
1044 struct mouse_event MEvent; 1036 struct mouse_event MEvent;
1045 XComposeStatus compose; 1037 XComposeStatus compose;
1046 ttymode_t tio; 1038 ttymode_t tio;
1047 row_col_t oldcursor; 1039 row_col_t oldcursor;
1048#ifdef XPM_BACKGROUND 1040#ifdef HAVE_BG_PIXMAP
1049 bgPixmap_t bgPixmap; 1041 bgPixmap_t bgPixmap;
1050 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1042#endif
1043#ifdef HAVE_AFTERIMAGE
1044 ASVisual *asv;
1045 ASImageManager *asimman;
1051#endif 1046#endif
1052 1047
1053#if ENABLE_OVERLAY 1048#if ENABLE_OVERLAY
1054 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1049 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1055 text_t **ov_text; 1050 text_t **ov_text;
… …
1110 1105
1111 long vt_emask, vt_emask_perl, vt_emask_xim; 1106 long vt_emask, vt_emask_perl, vt_emask_xim;
1112 1107
1113 void vt_select_input () const NOTHROW 1108 void vt_select_input () const NOTHROW
1114 { 1109 {
1115 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1110 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1116 } 1111 }
1117 1112
1118#if TRANSPARENT 1113#if ENABLE_TRANSPARENCY || ENABLE_PERL
1119 void rootwin_cb (XEvent &xev); 1114 void rootwin_cb (XEvent &xev);
1120 xevent_watcher rootwin_ev; 1115 xevent_watcher rootwin_ev;
1116#endif
1117#if ENABLE_TRANSPARENCY
1118 int check_our_parents ();
1119 void check_our_parents_cb (time_watcher &w);
1120 time_watcher check_our_parents_ev;
1121#endif 1121#endif
1122 1122
1123 void x_cb (XEvent &xev); 1123 void x_cb (XEvent &xev);
1124 void flush (); 1124 void flush ();
1125 xevent_watcher termwin_ev; 1125 xevent_watcher termwin_ev;
… …
1185 bool pty_fill (); 1185 bool pty_fill ();
1186 1186
1187 void make_current () const // make this the "currently active" urxvt instance 1187 void make_current () const // make this the "currently active" urxvt instance
1188 { 1188 {
1189 SET_R (this); 1189 SET_R (this);
1190 set_environ (envv);
1190 rxvt_set_locale (locale); 1191 rxvt_set_locale (locale);
1191 set_environ (envv);
1192 } 1192 }
1193 1193
1194 void init_secondary (); 1194 void init_secondary ();
1195 const char **init_resources (int argc, const char *const *argv); 1195 const char **init_resources (int argc, const char *const *argv);
1196 const char *x_resource (const char *name); 1196 const char *x_resource (const char *name);
… …
1221 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1221 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1222 1222
1223 bool IMisRunning (); 1223 bool IMisRunning ();
1224 void IMSendSpot (); 1224 void IMSendSpot ();
1225 bool IM_get_IC (const char *modifiers); 1225 bool IM_get_IC (const char *modifiers);
1226 void IMSetStatusPosition (); 1226 void IMSetPosition ();
1227#endif 1227#endif
1228 1228
1229 void resize_scrollbar (); 1229 void resize_scrollbar ();
1230 1230
1231 // command.C 1231 // command.C
1232 void lookup_key (XKeyEvent &ev); 1232 void key_press (XKeyEvent &ev);
1233 void key_release (XKeyEvent &ev);
1233 unsigned int cmd_write (const char *str, unsigned int count); 1234 unsigned int cmd_write (const char *str, unsigned int count);
1234 1235
1235 wchar_t next_char () NOTHROW; 1236 wchar_t next_char () NOTHROW;
1236 wchar_t cmd_getc () THROW ((class out_of_input)); 1237 wchar_t cmd_getc () THROW ((class out_of_input));
1237 uint32_t next_octet () NOTHROW; 1238 uint32_t next_octet () NOTHROW;
… …
1241 void mouse_report (XButtonEvent &ev); 1242 void mouse_report (XButtonEvent &ev);
1242 void button_press (XButtonEvent &ev); 1243 void button_press (XButtonEvent &ev);
1243 void button_release (XButtonEvent &ev); 1244 void button_release (XButtonEvent &ev);
1244 void focus_in (); 1245 void focus_in ();
1245 void focus_out (); 1246 void focus_out ();
1246 int check_our_parents (); 1247 void update_fade_color (unsigned int idx);
1247#ifdef PRINTPIPE 1248#ifdef PRINTPIPE
1248 FILE *popen_printer (); 1249 FILE *popen_printer ();
1249 int pclose_printer (FILE *stream); 1250 int pclose_printer (FILE *stream);
1250#endif 1251#endif
1251 void process_print_pipe (); 1252 void process_print_pipe ();
… …
1272 void set_utf8_property (Atom prop, const char *str, int len = -1); 1273 void set_utf8_property (Atom prop, const char *str, int len = -1);
1273 void set_title (const char *str); 1274 void set_title (const char *str);
1274 void set_icon_name (const char *str); 1275 void set_icon_name (const char *str);
1275 void set_window_color (int idx, const char *color); 1276 void set_window_color (int idx, const char *color);
1276 void set_colorfgbg (); 1277 void set_colorfgbg ();
1277 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1278 bool set_color (rxvt_color &color, const char *name);
1279 void alias_color (int dst, int src);
1278 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1280 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1279 1281
1280 // screen.C 1282 // screen.C
1281 1283
1282 void lalloc (line_t &l) const 1284 void lalloc (line_t &l) const
… …
1311 { 1313 {
1312 int base = GET_BASEFG (r); 1314 int base = GET_BASEFG (r);
1313#ifndef NO_BRIGHTCOLOR 1315#ifndef NO_BRIGHTCOLOR
1314 if (r & RS_Bold 1316 if (r & RS_Bold
1315# if ENABLE_STYLES 1317# if ENABLE_STYLES
1316 && OPTION (Opt_intensityStyles) 1318 && option (Opt_intensityStyles)
1317# endif 1319# endif
1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1320 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1319 base += minBrightCOLOR - minCOLOR; 1321 base += minBrightCOLOR - minCOLOR;
1320#endif 1322#endif
1321 return base; 1323 return base;
… …
1325 { 1327 {
1326 int base = GET_BASEBG (r); 1328 int base = GET_BASEBG (r);
1327#ifndef NO_BRIGHTCOLOR 1329#ifndef NO_BRIGHTCOLOR
1328 if (r & RS_Blink 1330 if (r & RS_Blink
1329# if ENABLE_STYLES 1331# if ENABLE_STYLES
1330 && OPTION (Opt_intensityStyles) 1332 && option (Opt_intensityStyles)
1331# endif 1333# endif
1332 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1334 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1333 base += minBrightCOLOR - minCOLOR; 1335 base += minBrightCOLOR - minCOLOR;
1334#endif 1336#endif
1335 return base; 1337 return base;
1336 } 1338 }
1337 1339
1338 bool option (uint32_t opt) const NOTHROW 1340 bool option (uint8_t opt) const NOTHROW
1339 { 1341 {
1340 return OPTION (opt); 1342 return options[opt >> 3] & (1 << (opt & 7));
1341 } 1343 }
1342 1344
1343 void set_option (uint32_t opt, bool set) NOTHROW 1345 void set_option (uint8_t opt, bool set = true) NOTHROW
1344 { 1346 {
1345 if (set) 1347 if (set)
1346 options |= opt; 1348 options[opt >> 3] |= (1 << (opt & 7));
1347 else 1349 else
1348 options &= ~opt; 1350 options[opt >> 3] &= ~(1 << (opt & 7));
1349 } 1351 }
1350 1352
1351 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1353 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; 1354 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; 1355 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1459 void get_options (int argc, const char *const *argv); 1461 void get_options (int argc, const char *const *argv);
1460 int parse_keysym (const char *str, const char *arg); 1462 int parse_keysym (const char *str, const char *arg);
1461 void get_xdefaults (FILE *stream, const char *name); 1463 void get_xdefaults (FILE *stream, const char *name);
1462 void extract_resources (); 1464 void extract_resources ();
1463 // xpm.C 1465 // xpm.C
1464 int scale_pixmap (const char *geom); 1466//int scale_pixmap (const char *geom);
1465 void resize_pixmap (); 1467 void resize_pixmap ();
1466 Pixmap set_bgPixmap (const char *file); 1468 void set_bgPixmap (const char *file);
1467}; 1469};
1468 1470
1469/* 1471/*
1470 ***************************************************************************** 1472 *****************************************************************************
1471 * PROTOTYPES 1473 * PROTOTYPES

Diff Legend

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