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.250 by root, Tue Jan 31 01:21:21 2006 UTC vs.
Revision 1.308 by ayin, Fri Oct 12 15:13:13 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>
… …
69 70
70#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
71typedef char *XPointer; 72typedef char *XPointer;
72#endif 73#endif
73 74
74#ifdef HAVE_TERMIOS_H
75# include <termios.h> 75#include <termios.h>
76typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
77#else
78# include <sgtty.h>
79typedef struct {
80 struct sgttyb sg;
81 struct tchars tc;
82 struct ltchars lc;
83 int line;
84 int local;
85} ttymode_t;
86#endif
87 77
88#ifdef XPM_BACKGROUND 78#ifdef HAVE_AFTERIMAGE
89# ifdef XPM_INC_X11 79# include <afterimage.h>
90# include <X11/xpm.h> 80#undef min
91# else 81#undef max
92# include <xpm.h>
93# endif 82#endif
94#endif 83
84#include "background.h"
95 85
96#ifndef STDIN_FILENO 86#ifndef STDIN_FILENO
97# define STDIN_FILENO 0 87# define STDIN_FILENO 0
98# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
99# define STDERR_FILENO 2 89# define STDERR_FILENO 2
… …
111 ***************************************************************************** 101 *****************************************************************************
112 * PROTOTYPES 102 * PROTOTYPES
113 ***************************************************************************** 103 *****************************************************************************
114 */ 104 */
115// main.C 105// main.C
116RETSIGTYPE rxvt_Child_signal (int sig) NOTHROW;
117RETSIGTYPE rxvt_Exit_signal (int sig) NOTHROW;
118void rxvt_clean_exit () NOTHROW;
119void * rxvt_malloc (size_t size); 106void * rxvt_malloc (size_t size);
120void * rxvt_calloc (size_t number, size_t size); 107void * rxvt_calloc (size_t number, size_t size);
121void * rxvt_realloc (void *ptr, size_t size); 108void * rxvt_realloc (void *ptr, size_t size);
122 109
123// misc.C 110// misc.C
124char * rxvt_wcstombs (const wchar_t *str, int len = -1); 111char * rxvt_wcstombs (const wchar_t *str, int len = -1);
125wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 112wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
126char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 113char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
127wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 114wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
128char * rxvt_strdup_cpp (const char *str);
129 115
130#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 116#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
131 117
132char * rxvt_r_basename (const char *str) NOTHROW; 118char * rxvt_basename (const char *str) NOTHROW;
133void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 119void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
134void rxvt_log (const char *fmt,...) NOTHROW; 120void rxvt_log (const char *fmt,...) NOTHROW;
135void rxvt_warn (const char *fmt,...) NOTHROW; 121void rxvt_warn (const char *fmt,...) NOTHROW;
136void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 122void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
137void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 123void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN;
138 124
139int rxvt_Str_match (const char *s1, const char *s2) NOTHROW;
140const char * rxvt_Str_skip_space (const char *str) NOTHROW;
141char * rxvt_Str_trim (char *str) NOTHROW; 125char * rxvt_strtrim (char *str) NOTHROW;
142int rxvt_Str_escaped (char *str) NOTHROW;
143char ** rxvt_splitcommastring (const char *cs) NOTHROW; 126char ** rxvt_splitcommastring (const char *cs) NOTHROW;
144void rxvt_freecommastring (char **cs) NOTHROW; 127void rxvt_freecommastring (char **cs) NOTHROW;
145char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
146 128
147///////////////////////////////////////////////////////////////////////////// 129/////////////////////////////////////////////////////////////////////////////
148 130
149// temporarily replace the process environment 131// temporarily replace the process environment
150extern char **environ; 132extern char **environ;
151extern char **rxvt_environ; // the original environ pointer 133extern char **rxvt_environ; // the original environ pointer
152 134
153inline void set_environ (stringvec *envv) 135static inline void set_environ (stringvec *envv)
154{ 136{
155#if ENABLE_PERL 137#if ENABLE_PERL
156 assert (envv); 138 assert (envv);
157#else 139#else
158 if (envv) 140 if (envv)
159#endif 141#endif
160 environ = (char **)envv->begin (); 142 environ = (char **)envv->begin ();
161} 143}
162 144
163inline void set_environ (char **envv) 145static inline void set_environ (char **envv)
164{ 146{
165#if ENABLE_PERL 147#if ENABLE_PERL
166 assert (envv); 148 assert (envv);
167#else 149#else
168 if (envv) 150 if (envv)
… …
182 */ 164 */
183#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 165#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
184# define KEEP_SCROLLCOLOR 1 166# define KEEP_SCROLLCOLOR 1
185#else 167#else
186# undef KEEP_SCROLLCOLOR 168# undef KEEP_SCROLLCOLOR
187#endif
188
189#ifdef XPM_BACKGROUND
190typedef struct {
191 short w, h, x, y;
192 Pixmap pixmap;
193} bgPixmap_t;
194#endif 169#endif
195 170
196/* 171/*
197 * the 'essential' information for reporting Mouse Events 172 * the 'essential' information for reporting Mouse Events
198 * pared down from XButtonEvent 173 * pared down from XButtonEvent
… …
245 ***************************************************************************** 220 *****************************************************************************
246 */ 221 */
247 222
248/* COLORTERM, TERM environment variables */ 223/* COLORTERM, TERM environment variables */
249#define COLORTERMENV "rxvt" 224#define COLORTERMENV "rxvt"
250#ifdef XPM_BACKGROUND 225#ifdef BG_IMAGE_FROM_FILE
251# define COLORTERMENVFULL COLORTERMENV "-xpm" 226# define COLORTERMENVFULL COLORTERMENV "-xpm"
252#else 227#else
253# define COLORTERMENVFULL COLORTERMENV 228# define COLORTERMENVFULL COLORTERMENV
254#endif 229#endif
255#ifndef TERMENV 230#ifndef TERMENV
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 494 * on the unnecessary items, e.g. Color_pointer, but won't bother
520 * until we need to. Also, be aware of usage in pixcolor_set 495 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 496 */
522 497
523enum colour_list { 498enum colour_list {
499 Color_none = -2,
500 Color_transparent = -1,
524 Color_fg = 0, 501 Color_fg = 0,
525 Color_bg, 502 Color_bg,
526 minCOLOR, /* 2 */ 503 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 504 Color_Black = minCOLOR,
528 Color_Red3, 505 Color_Red3,
… …
570#endif 547#endif
571#ifdef KEEP_SCROLLCOLOR 548#ifdef KEEP_SCROLLCOLOR
572 Color_scroll, 549 Color_scroll,
573 Color_trough, 550 Color_trough,
574#endif 551#endif
575#if TINTING 552#if ENABLE_TRANSPARENCY
576 Color_tint, 553 Color_tint,
577#endif 554#endif
578#if OFF_FOCUS_FADING 555#if OFF_FOCUS_FADING
579 Color_fade, 556 Color_fade,
580#endif 557#endif
… …
587 TOTAL_COLORS = NRS_COLORS 564 TOTAL_COLORS = NRS_COLORS
588#endif 565#endif
589}; 566};
590 567
591#define Color_Bits 7 // 0 .. maxTermCOLOR 568#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 569
596/* 570/*
597 * Resource list 571 * Resource list
598 */ 572 */
599enum { 573enum {
… …
628#define PrivMode_LFNL (1UL<<19) 602#define PrivMode_LFNL (1UL<<19)
629/* too annoying to implement X11 highlight tracking */ 603/* too annoying to implement X11 highlight tracking */
630/* #define PrivMode_MouseX11Track (1LU<<20) */ 604/* #define PrivMode_MouseX11Track (1LU<<20) */
631 605
632#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11) 606#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11)
633#define PrivMode(test,bit) \
634 if (test) \
635 priv_modes |= (bit); \
636 else \
637 priv_modes &= ~(bit)
638 607
639#ifdef ALLOW_132_MODE 608#ifdef ALLOW_132_MODE
640# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 609# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
641#else 610#else
642# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor) 611# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor)
… …
684 * MACRO DEFINES 653 * MACRO DEFINES
685 ***************************************************************************** 654 *****************************************************************************
686 */ 655 */
687#define dLocal(type,name) type const name = this->name 656#define dLocal(type,name) type const name = this->name
688 657
689// for speed reasons, we assume that all latin1 characters 658// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 659// single-width.
691// is actually 0x300, but ascii is what matters most). 660#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 661
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 662/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 663#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 664#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 665#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 667#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 668#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 669#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 670#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 671
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
708
709// for m >= -n, ensure remainder lies between 0..n-1 672// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 673#define MOD(m,n) (((m) + (n)) % (n))
711 674
712#define LINENO(n) MOD (term_start + int(n), total_rows) 675#define LINENO(n) MOD (term_start + int(n), total_rows)
713#define ROW(n) row_buf [LINENO (n)] 676#define ROW(n) row_buf [LINENO (n)]
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 694#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 695#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 696
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 697#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 698
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 699#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 700#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 701
739#if ENABLE_STYLES 702#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 703# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 704#else
742# define FONTSET(style) fontset[0] 705# define FONTSET(style) fontset[0]
… …
770#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 733#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
771#define scrollbar_position(y) ((y) - scrollBar.beg) 734#define scrollbar_position(y) ((y) - scrollBar.beg)
772#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 735#define scrollbar_size() (scrollBar.end - scrollBar.beg \
773 - scrollbar_minheight ()) 736 - scrollbar_minheight ())
774 737
775#ifdef XPM_BACKGROUND
776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
777#else
778# define XPMClearArea(a, b, c, d, e, f, g)
779#endif
780
781typedef callback1<void, const char *> log_callback; 738typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 739typedef callback<int (int)> getfd_callback;
783 740
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 741#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 742extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 743extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 744extern void rxvt_pop_locale () NOTHROW;
… …
789/****************************************************************************/ 746/****************************************************************************/
790 747
791#define LINE_LONGER 0x0001 // line is continued on the next row 748#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 749#define LINE_FILTERED 0x0002 // line has been filtered
793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 750#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
751#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
752#define LINE_BIDI 0x0010 // line needs bidi (NYI)
794 753
795struct line_t { 754struct line_t {
796 text_t *t; // terminal the text 755 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 756 rend_t *r; // rendition, uses RS_ flags
798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 757 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
891#endif 850#endif
892 851
893/****************************************************************************/ 852/****************************************************************************/
894 853
895#ifdef KEYSYM_RESOURCE 854#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 855class keyboard_manager;
897#endif 856#endif
898 857
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 858struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
859
860 // special markers with magic addresses
861 static const char resval_undef []; // options specifically unset
862 static const char resval_on []; // boolean options switched on
863 static const char resval_off []; // or off
864
900 log_callback *log_hook; // log error messages through this hook, if != 0 865 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 866 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 867#if ENABLE_PERL
903 rxvt_perl_term perl; 868 rxvt_perl_term perl;
904#endif 869#endif
905 struct mbstate mbstate; // current input multibyte state 870 struct mbstate mbstate; // current input multibyte state
906 871
907 unsigned char want_refresh:1, 872 unsigned char want_refresh:1,
908#ifdef TRANSPARENT
909 want_full_refresh:1, /* awaiting full screen refresh */
910#endif
911#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
912 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif
915 current_screen:1, /* primary or secondary */ 873 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 874 num_scr_allow:1,
917 bypass_keystate:1, 875 bypass_keystate:1,
918#ifdef CURSOR_BLINK 876#ifdef CURSOR_BLINK
919 hidden_cursor:1, 877 hidden_cursor:1,
… …
945 int prev_ncol, /* screen: previous number of columns */ 903 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 904 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 905/* ---------- */
948 rend_t rstyle; 906 rend_t rstyle;
949/* ---------- */ 907/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */
952#ifdef SELECTION_SCROLLING 908#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 909 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 910 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 911 int selection_save_x,
956 selection_save_y, 912 selection_save_y,
… …
961 /* give proper Scroll behaviour */ 917 /* give proper Scroll behaviour */
962#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 918#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
963 mouse_slip_wheel_speed, 919 mouse_slip_wheel_speed,
964#endif 920#endif
965 refresh_count, 921 refresh_count,
966 refresh_limit,
967 last_bot, /* scrollbar last bottom position */ 922 last_bot, /* scrollbar last bottom position */
968 last_top, /* scrollbar last top position */ 923 last_top, /* scrollbar last top position */
969 last_state, /* scrollbar last state */ 924 last_state, /* scrollbar last state */
970 scrollbar_len, 925 scrollbar_len,
971 window_vt_x, 926 window_vt_x,
… …
1017 char * incr_buf; 972 char * incr_buf;
1018 size_t incr_buf_size, incr_buf_fill; 973 size_t incr_buf_size, incr_buf_fill;
1019/* ---------- */ 974/* ---------- */
1020 Cursor leftptr_cursor; 975 Cursor leftptr_cursor;
1021/* ---------- */ 976/* ---------- */
1022#ifndef NO_BACKSPACE_KEY
1023 const char *key_backspace;
1024#endif
1025#ifndef NO_DELETE_KEY
1026 const char *key_delete;
1027#endif
1028 struct mouse_event MEvent; 977 struct mouse_event MEvent;
1029 XComposeStatus compose; 978 XComposeStatus compose;
1030 ttymode_t tio; 979 ttymode_t tio;
1031 row_col_t oldcursor; 980 row_col_t oldcursor;
1032#ifdef XPM_BACKGROUND 981#ifdef HAVE_BG_PIXMAP
1033 bgPixmap_t bgPixmap; 982 bgPixmap_t bgPixmap;
1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 983#endif
984#ifdef HAVE_AFTERIMAGE
985 ASVisual *asv;
986 ASImageManager *asimman;
1035#endif 987#endif
1036 988
1037#if ENABLE_OVERLAY 989#if ENABLE_OVERLAY
1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 990 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1039 text_t **ov_text; 991 text_t **ov_text;
… …
1094 1046
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1047 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1048
1097 void vt_select_input () const NOTHROW 1049 void vt_select_input () const NOTHROW
1098 { 1050 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1051 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1052 }
1101 1053
1102#if TRANSPARENT 1054#if ENABLE_TRANSPARENCY || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1055 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1056 xevent_watcher rootwin_ev;
1057#endif
1058#ifdef HAVE_BG_PIXMAP
1059 int update_background ();
1060 void update_background_cb (time_watcher &w);
1061 time_watcher update_background_ev;
1105#endif 1062#endif
1106 1063
1107 void x_cb (XEvent &xev); 1064 void x_cb (XEvent &xev);
1108 void flush (); 1065 void flush ();
1109 xevent_watcher termwin_ev; 1066 xevent_watcher termwin_ev;
… …
1169 bool pty_fill (); 1126 bool pty_fill ();
1170 1127
1171 void make_current () const // make this the "currently active" urxvt instance 1128 void make_current () const // make this the "currently active" urxvt instance
1172 { 1129 {
1173 SET_R (this); 1130 SET_R (this);
1131 set_environ (envv);
1174 rxvt_set_locale (locale); 1132 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1133 }
1177 1134
1178 void init_secondary (); 1135 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1136 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name); 1137 const char *x_resource (const char *name);
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1162 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1163
1207 bool IMisRunning (); 1164 bool IMisRunning ();
1208 void IMSendSpot (); 1165 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1166 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1167 void IMSetPosition ();
1211#endif 1168#endif
1212 1169
1213 void resize_scrollbar (); 1170 void resize_scrollbar ();
1214 1171
1215 // command.C 1172 // command.C
1216 void lookup_key (XKeyEvent &ev); 1173 void key_press (XKeyEvent &ev);
1174 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1175 unsigned int cmd_write (const char *str, unsigned int count);
1218 1176
1219 wchar_t next_char () NOTHROW; 1177 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1178 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1179 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1183 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1184 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1185 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1186 void focus_in ();
1229 void focus_out (); 1187 void focus_out ();
1230 int check_our_parents (); 1188 void update_fade_color (unsigned int idx);
1231#ifdef PRINTPIPE 1189#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1190 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1191 int pclose_printer (FILE *stream);
1234#endif 1192#endif
1235 void process_print_pipe (); 1193 void process_print_pipe ();
… …
1257 void set_title (const char *str); 1215 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1216 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1217 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1218 void set_colorfgbg ();
1261 bool set_color (rxvt_color &color, const char *name); 1219 bool set_color (rxvt_color &color, const char *name);
1220 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1221 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1222 void get_window_origin (int &x, int &y);
1223 Pixmap get_pixmap_property (int prop_id);
1263 1224
1264 // screen.C 1225 // screen.C
1265 1226
1266 void lalloc (line_t &l) const 1227 void lalloc (line_t &l) const
1267 { 1228 {
… …
1295 { 1256 {
1296 int base = GET_BASEFG (r); 1257 int base = GET_BASEFG (r);
1297#ifndef NO_BRIGHTCOLOR 1258#ifndef NO_BRIGHTCOLOR
1298 if (r & RS_Bold 1259 if (r & RS_Bold
1299# if ENABLE_STYLES 1260# if ENABLE_STYLES
1300 && OPTION (Opt_intensityStyles) 1261 && option (Opt_intensityStyles)
1301# endif 1262# endif
1302 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1263 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1303 base += minBrightCOLOR - minCOLOR; 1264 base += minBrightCOLOR - minCOLOR;
1304#endif 1265#endif
1305 return base; 1266 return base;
… …
1309 { 1270 {
1310 int base = GET_BASEBG (r); 1271 int base = GET_BASEBG (r);
1311#ifndef NO_BRIGHTCOLOR 1272#ifndef NO_BRIGHTCOLOR
1312 if (r & RS_Blink 1273 if (r & RS_Blink
1313# if ENABLE_STYLES 1274# if ENABLE_STYLES
1314 && OPTION (Opt_intensityStyles) 1275 && option (Opt_intensityStyles)
1315# endif 1276# endif
1316 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1277 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1317 base += minBrightCOLOR - minCOLOR; 1278 base += minBrightCOLOR - minCOLOR;
1318#endif 1279#endif
1319 return base; 1280 return base;
1320 } 1281 }
1321 1282
1322 bool option (uint32_t opt) const NOTHROW 1283 bool option (uint8_t opt) const NOTHROW
1323 { 1284 {
1324 return OPTION (opt); 1285 return options[opt >> 3] & (1 << (opt & 7));
1325 } 1286 }
1326 1287
1327 void set_option (uint32_t opt, bool set) NOTHROW 1288 void set_option (uint8_t opt, bool set = true) NOTHROW
1328 { 1289 {
1329 if (set) 1290 if (set)
1330 options |= opt; 1291 options[opt >> 3] |= (1 << (opt & 7));
1331 else 1292 else
1332 options &= ~opt; 1293 options[opt >> 3] &= ~(1 << (opt & 7));
1294 }
1295
1296 void PrivMode (int set, unsigned bit) NOTHROW
1297 {
1298 if (set)
1299 priv_modes |= bit;
1300 else
1301 priv_modes &= ~bit;
1333 } 1302 }
1334 1303
1335 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1304 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1336 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1305 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1337 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1306 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
… …
1442 // xdefaults.C 1411 // xdefaults.C
1443 void get_options (int argc, const char *const *argv); 1412 void get_options (int argc, const char *const *argv);
1444 int parse_keysym (const char *str, const char *arg); 1413 int parse_keysym (const char *str, const char *arg);
1445 void get_xdefaults (FILE *stream, const char *name); 1414 void get_xdefaults (FILE *stream, const char *name);
1446 void extract_resources (); 1415 void extract_resources ();
1447 // xpm.C
1448 int scale_pixmap (const char *geom);
1449 void resize_pixmap ();
1450 Pixmap set_bgPixmap (const char *file);
1451}; 1416};
1452 1417
1453/*
1454 *****************************************************************************
1455 * PROTOTYPES
1456 *****************************************************************************
1457 */
1458#ifdef PROTOTYPES
1459# define __PROTO(p) p
1460#else
1461# define __PROTO(p) ()
1462#endif
1463
1464#endif /* _RXVT_H_ */ 1418#endif /* _RXVT_H_ */
1465 1419

Diff Legend

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