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.313 by ayin, Wed Oct 24 10:39:58 2007 UTC vs.
Revision 1.334 by ayin, Fri Dec 14 11:11:31 2007 UTC

… …
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# define OPTION_HC 1
23# define BUILTIN_GLYPHS 1
23#else 24#else
24# define ENABLE_MINIMAL 1 25# define ENABLE_MINIMAL 1
25#endif 26#endif
26 27
27#include <limits.h> 28#include <limits.h>
28 29
29#include <X11/cursorfont.h> 30#include <X11/cursorfont.h>
30#include <X11/keysym.h> 31#include <X11/keysym.h>
31#include <X11/keysymdef.h> 32#include <X11/keysymdef.h>
32#include <X11/Xatom.h> 33#include <X11/Xatom.h>
33#if ENABLE_FRILLS
34# include <X11/Xmd.h>
35#endif
36 34
37#include "encoding.h" 35#include "encoding.h"
38#include "rxvtutil.h" 36#include "rxvtutil.h"
39#include "rxvtfont.h" 37#include "rxvtfont.h"
40#include "rxvttoolkit.h" 38#include "rxvttoolkit.h"
41#include "iom.h" 39#include "ev_cpp.h"
42#include "salloc.h" 40#include "salloc.h"
43#include "libptytty.h" 41#include "libptytty.h"
44 42
45#include "rxvtperl.h" 43#include "rxvtperl.h"
46 44
… …
73#endif 71#endif
74 72
75#include <termios.h> 73#include <termios.h>
76typedef struct termios ttymode_t; 74typedef struct termios ttymode_t;
77 75
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
82#endif
83
84#include "background.h" 76#include "background.h"
85 77
86#ifndef STDIN_FILENO 78#ifndef STDIN_FILENO
87# define STDIN_FILENO 0 79# define STDIN_FILENO 0
88# define STDOUT_FILENO 1 80# define STDOUT_FILENO 1
89# define STDERR_FILENO 2 81# define STDERR_FILENO 2
90#endif 82#endif
91 83
84#if !defined (EACCESS) && defined(EAGAIN)
85# define EACCESS EAGAIN
86#endif
87
88#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
89# define EXIT_SUCCESS 0 /* exit function success */
90# define EXIT_FAILURE 1 /* exit function failure */
91#endif
92
93#ifndef PATH_MAX
94# define PATH_MAX 16384
95#endif
96
92/****************************************************************************/ 97/****************************************************************************/
93 98
94// exception thrown on fatal (per-instance) errors 99// exception thrown on fatal (per-instance) errors
95class rxvt_failure_exception { }; 100class rxvt_failure_exception { };
96 101
97// exception thrown when the command parser runs out of input data 102// exception thrown when the command parser runs out of input data
98class out_of_input { }; 103class out_of_input { };
99 104
100/* 105/*
101 ***************************************************************************** 106 *****************************************************************************
102 * PROTOTYPES 107 * PROTOTYPES
103 ***************************************************************************** 108 *****************************************************************************
104 */ 109 */
105// main.C 110// main.C
106void * rxvt_malloc (size_t size); 111void * rxvt_malloc (size_t size);
107void * rxvt_calloc (size_t number, size_t size); 112void * rxvt_calloc (size_t number, size_t size);
… …
111char * rxvt_wcstombs (const wchar_t *str, int len = -1); 116char * rxvt_wcstombs (const wchar_t *str, int len = -1);
112wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 117wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
113char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 118char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
114wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 119wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
115 120
116#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
117
118char * rxvt_basename (const char *str) NOTHROW; 121char * rxvt_basename (const char *str) NOTHROW;
119void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 122void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
120void rxvt_log (const char *fmt,...) NOTHROW; 123void rxvt_log (const char *fmt,...) NOTHROW;
121void rxvt_warn (const char *fmt,...) NOTHROW; 124void rxvt_warn (const char *fmt,...) NOTHROW;
122void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 125void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
… …
155/* 158/*
156 ***************************************************************************** 159 *****************************************************************************
157 * STRUCTURES AND TYPEDEFS 160 * STRUCTURES AND TYPEDEFS
158 ***************************************************************************** 161 *****************************************************************************
159 */ 162 */
160struct grwin_t;
161 163
162/* If we're using either the rxvt scrollbar, keep the 164/* If we're using either the rxvt scrollbar, keep the
163 * scrollColor resource. 165 * scrollColor resource.
164 */ 166 */
165#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 167#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
… …
177 Time time; /* milliseconds */ 179 Time time; /* milliseconds */
178 unsigned int state; /* key or button mask */ 180 unsigned int state; /* key or button mask */
179 unsigned int button; /* detail */ 181 unsigned int button; /* detail */
180}; 182};
181 183
182#if ENABLE_FRILLS
183typedef struct _mwmhints {
184 CARD32 flags;
185 CARD32 functions;
186 CARD32 decorations;
187 INT32 input_mode;
188 CARD32 status;
189} MWMHints;
190#endif
191
192#if ENABLE_XEMBED 184#if ENABLE_XEMBED
193// XEMBED messages 185// XEMBED messages
194# define XEMBED_EMBEDDED_NOTIFY 0 186# define XEMBED_EMBEDDED_NOTIFY 0
195# define XEMBED_WINDOW_ACTIVATE 1 187# define XEMBED_WINDOW_ACTIVATE 1
196# define XEMBED_WINDOW_DEACTIVATE 2 188# define XEMBED_WINDOW_DEACTIVATE 2
197# define XEMBED_REQUEST_FOCUS 3 189# define XEMBED_REQUEST_FOCUS 3
198# define XEMBED_FOCUS_IN 4 190# define XEMBED_FOCUS_IN 4
199# define XEMBED_FOCUS_OUT 5 191# define XEMBED_FOCUS_OUT 5
200# define XEMBED_FOCUS_NEXT 6 192# define XEMBED_FOCUS_NEXT 6
201# define XEMBED_FOCUS_PREV 7 193# define XEMBED_FOCUS_PREV 7
202 194
203# define XEMBED_MODALITY_ON 10 195# define XEMBED_MODALITY_ON 10
204# define XEMBED_MODALITY_OFF 11 196# define XEMBED_MODALITY_OFF 11
205# define XEMBED_REGISTER_ACCELERATOR 12 197# define XEMBED_REGISTER_ACCELERATOR 12
206# define XEMBED_UNREGISTER_ACCELERATOR 13 198# define XEMBED_UNREGISTER_ACCELERATOR 13
207# define XEMBED_ACTIVATE_ACCELERATOR 14 199# define XEMBED_ACTIVATE_ACCELERATOR 14
208 200
209// XEMBED detail code 201// XEMBED detail code
210# define XEMBED_FOCUS_CURRENT 0 202# define XEMBED_FOCUS_CURRENT 0
211# define XEMBED_FOCUS_FIRST 1 203# define XEMBED_FOCUS_FIRST 1
212# define XEMBED_FOCUS_LAST 2 204# define XEMBED_FOCUS_LAST 2
213 205
214# define XEMBED_MAPPED (1 << 0) 206# define XEMBED_MAPPED (1 << 0)
215#endif 207#endif
216 208
… …
231# define TERMENV "rxvt-unicode" 223# define TERMENV "rxvt-unicode"
232#endif 224#endif
233 225
234#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 226#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
235# define NO_MOUSE_REPORT_SCROLLBAR 1 227# define NO_MOUSE_REPORT_SCROLLBAR 1
236#endif
237
238/* now look for other badly set stuff */
239
240#if !defined (EACCESS) && defined(EAGAIN)
241# define EACCESS EAGAIN
242#endif
243
244#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
245# define EXIT_SUCCESS 0 /* exit function success */
246# define EXIT_FAILURE 1 /* exit function failure */
247#endif 228#endif
248 229
249#define scrollBar_esc 30 230#define scrollBar_esc 30
250 231
251#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR) 232#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR) || defined(PLAIN_SCROLLBAR)
… …
429 C0_NUL = 0x00, 410 C0_NUL = 0x00,
430 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 411 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
431 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 412 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
432 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB, 413 C0_DLE, C0_DC1, C0_DC2, D0_DC3, C0_DC4, C0_NAK, C0_SYN, C0_ETB,
433 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1, 414 C0_CAN, C0_EM , C0_SUB, C0_ESC, C0_IS4, C0_IS3, C0_IS2, C0_IS1,
434}; 415};
435#define CHAR_ST 0x9c /* 0234 */ 416#define CHAR_ST 0x9c /* 0234 */
436 417
437/* 418/*
438 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL) 419 * XTerm Operating System Commands: ESC ] Ps;Pt (ST|BEL)
439 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net> 420 * colour extensions by Christian W. Zuckschwerdt <zany@triq.net>
… …
600#define PrivMode_smoothScroll (1UL<<17) 581#define PrivMode_smoothScroll (1UL<<17)
601#define PrivMode_vt52 (1UL<<18) 582#define PrivMode_vt52 (1UL<<18)
602#define PrivMode_LFNL (1UL<<19) 583#define PrivMode_LFNL (1UL<<19)
603#define PrivMode_MouseBtnEvent (1UL<<20) 584#define PrivMode_MouseBtnEvent (1UL<<20)
604#define PrivMode_MouseAnyEvent (1UL<<21) 585#define PrivMode_MouseAnyEvent (1UL<<21)
605/* too annoying to implement X11 highlight tracking */
606/* #define PrivMode_MouseX11Track (1LU<<20) */
607 586
608#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 587#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
609 588
610#ifdef ALLOW_132_MODE 589#ifdef ALLOW_132_MODE
611# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 590# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
617#define IMBUFSIZ 128 // input modifier buffer sizes 596#define IMBUFSIZ 128 // input modifier buffer sizes
618#define KBUFSZ 512 // size of keyboard mapping buffer 597#define KBUFSZ 512 // size of keyboard mapping buffer
619#define CBUFSIZ 2048 // size of command buffer 598#define CBUFSIZ 2048 // size of command buffer
620#define UBUFSIZ 2048 // character buffer 599#define UBUFSIZ 2048 // character buffer
621 600
622#ifndef PATH_MAX 601#if ENABLE_FRILLS
623# define PATH_MAX 16384 602# include <X11/Xmd.h>
603typedef struct _mwmhints {
604 CARD32 flags;
605 CARD32 functions;
606 CARD32 decorations;
607 INT32 input_mode;
608 CARD32 status;
609} MWMHints;
624#endif 610#endif
625 611
626/* Motif window hints */ 612/* Motif window hints */
627#define MWM_HINTS_FUNCTIONS (1L << 0) 613#define MWM_HINTS_FUNCTIONS (1L << 0)
628#define MWM_HINTS_DECORATIONS (1L << 1) 614#define MWM_HINTS_DECORATIONS (1L << 1)
… …
669#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 655#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
670#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 656#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
671#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 657#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
672#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 658#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
673 659
674// for m >= -n, ensure remainder lies between 0..n-1
675#define MOD(m,n) (((m) + (n)) % (n))
676
677#define LINENO(n) MOD (term_start + int(n), total_rows) 660#define LINENO(n) MOD (term_start + int(n), total_rows)
678#define ROW(n) row_buf [LINENO (n)] 661#define ROW(n) row_buf [LINENO (n)]
679 662
680/* how to build & extract colors and attributes */ 663/* how to build & extract colors and attributes */
681#define GET_BASEFG(x) (((x) & RS_fgMask)) 664#define GET_BASEFG(x) (((x) & RS_fgMask))
… …
794 } 777 }
795}; 778};
796 779
797/****************************************************************************/ 780/****************************************************************************/
798 781
799// primivite wrapper around mbstate_t to ensure initialisation 782// primitive wrapper around mbstate_t to ensure initialisation
800struct mbstate { 783struct mbstate {
801 mbstate_t mbs; 784 mbstate_t mbs;
802 785
803 operator mbstate_t *() { return &mbs; } 786 operator mbstate_t *() { return &mbs; }
804 void reset () { memset (&mbs, 0, sizeof (mbs)); } 787 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
861 844
862 // special markers with magic addresses 845 // special markers with magic addresses
863 static const char resval_undef []; // options specifically unset 846 static const char resval_undef []; // options specifically unset
864 static const char resval_on []; // boolean options switched on 847 static const char resval_on []; // boolean options switched on
865 static const char resval_off []; // or off 848 static const char resval_off []; // or off
866 849
867 log_callback *log_hook; // log error messages through this hook, if != 0 850 log_callback *log_hook; // log error messages through this hook, if != 0
868 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 851 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
869#if ENABLE_PERL 852#if ENABLE_PERL
870 rxvt_perl_term perl; 853 rxvt_perl_term perl;
871#endif 854#endif
… …
1019 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1002 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1020 1003
1021#ifdef KEYSYM_RESOURCE 1004#ifdef KEYSYM_RESOURCE
1022 keyboard_manager *keyboard; 1005 keyboard_manager *keyboard;
1023#endif 1006#endif
1007#ifndef NO_RESOURCES
1008 XrmDatabase option_db;
1009#endif
1024 1010
1025 const char *rs[NUM_RESOURCES]; 1011 const char *rs[NUM_RESOURCES];
1026 /* command input buffering */ 1012 /* command input buffering */
1027 char *cmdbuf_ptr, *cmdbuf_endp; 1013 char *cmdbuf_ptr, *cmdbuf_endp;
1028 char cmdbuf_base[CBUFSIZ]; 1014 char cmdbuf_base[CBUFSIZ];
… …
1056 void rootwin_cb (XEvent &xev); 1042 void rootwin_cb (XEvent &xev);
1057 xevent_watcher rootwin_ev; 1043 xevent_watcher rootwin_ev;
1058#endif 1044#endif
1059#ifdef HAVE_BG_PIXMAP 1045#ifdef HAVE_BG_PIXMAP
1060 int update_background (); 1046 int update_background ();
1047#if TRACE_PIXMAPS
1048 int trace_update_background (const char *file, int line);
1049# define update_background() trace_update_background (__FILE__, __LINE__)
1050#endif
1061 void update_background_cb (time_watcher &w); 1051 void update_background_cb (ev::timer &w, int revents);
1062 time_watcher update_background_ev; 1052 ev::timer update_background_ev;
1063#endif 1053#endif
1064 1054
1065 void x_cb (XEvent &xev); 1055 void x_cb (XEvent &xev);
1066 xevent_watcher termwin_ev; 1056 xevent_watcher termwin_ev;
1067 xevent_watcher vt_ev; 1057 xevent_watcher vt_ev;
1068#ifdef HAVE_SCROLLBARS 1058#ifdef HAVE_SCROLLBARS
1069 xevent_watcher scrollbar_ev; 1059 xevent_watcher scrollbar_ev;
1070#endif 1060#endif
1071 1061
1072 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1062 void child_cb (ev::child &w, int revents); ev::child child_ev;
1073 void check_cb (check_watcher &w); check_watcher check_ev; 1063 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1074 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1064 void refresh_check ();
1075 void flush (); 1065 void flush ();
1076 void flush_cb (time_watcher &w); time_watcher flush_ev; 1066 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1077 bool pty_fill (); 1067 bool pty_fill ();
1078 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1068 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1079 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1069 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1080 1070
1081#ifdef CURSOR_BLINK 1071#ifdef CURSOR_BLINK
1082 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1072 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1083#endif 1073#endif
1084#ifdef TEXT_BLINK 1074#ifdef TEXT_BLINK
1085 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1075 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1086#endif 1076#endif
1087#ifndef NO_BELL 1077#ifndef NO_BELL
1088 void bell_cb (time_watcher &w); time_watcher bell_ev; 1078 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1089#endif 1079#endif
1090 1080
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1082 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1093#endif 1083#endif
1094#ifdef SELECTION_SCROLLING 1084#ifdef SELECTION_SCROLLING
1095 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1085 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1096#endif 1086#endif
1097#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1087#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1098 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1088 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1099#endif 1089#endif
1100 1090
1101#ifdef POINTER_BLANK 1091#ifdef POINTER_BLANK
1102 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1092 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1103 void pointer_blank (); 1093 void pointer_blank ();
1104#endif 1094#endif
1105 void pointer_unblank (); 1095 void pointer_unblank ();
1106 1096
1107 void tt_printf (const char *fmt,...); 1097 void tt_printf (const char *fmt,...);
1108 void tt_write (const char *data, unsigned int len); 1098 void tt_write (const char *data, unsigned int len);
1109 void pty_write (); 1099 void pty_write ();
1110 1100
1111 bool init (stringvec *argv, stringvec *envv) 1101 void init (stringvec *argv, stringvec *envv)
1112 { 1102 {
1113 this->argv = argv; 1103 this->argv = argv;
1114 return init (argv->size (), argv->begin (), envv); 1104 init (argv->size (), argv->begin (), envv);
1115 } 1105 }
1116 1106
1117 void make_current () const // make this the "currently active" urxvt instance 1107 void make_current () const // make this the "currently active" urxvt instance
1118 { 1108 {
1119 SET_R (this); 1109 SET_R (this);
… …
1175 int privcases (int mode, unsigned long bit); 1165 int privcases (int mode, unsigned long bit);
1176 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1166 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1177 void process_sgr_mode (unsigned int nargs, const int *arg); 1167 void process_sgr_mode (unsigned int nargs, const int *arg);
1178 void process_graphics (); 1168 void process_graphics ();
1179 // init.C 1169 // init.C
1180 bool init_vars (); 1170 void init_vars ();
1181 void init_secondary (); 1171 void init_secondary ();
1182 const char **init_resources (int argc, const char *const *argv); 1172 const char **init_resources (int argc, const char *const *argv);
1183 void init_env (); 1173 void init_env ();
1184 void set_locale (const char *locale); 1174 void set_locale (const char *locale);
1185 void init_xlocale (); 1175 void init_xlocale ();
… …
1194 void tt_winch (); 1184 void tt_winch ();
1195 rxvt_term (); 1185 rxvt_term ();
1196 ~rxvt_term (); 1186 ~rxvt_term ();
1197 void destroy (); 1187 void destroy ();
1198 void emergency_cleanup (); 1188 void emergency_cleanup ();
1199 bool init (int argc, const char *const *argv, stringvec *envv); 1189 void init (int argc, const char *const *argv, stringvec *envv);
1200 void recolour_cursor (); 1190 void recolour_cursor ();
1201 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1191 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1202 void window_calc (unsigned int newwidth, unsigned int newheight); 1192 void window_calc (unsigned int newwidth, unsigned int newheight);
1203 bool set_fonts (); 1193 bool set_fonts ();
1204 void set_string_property (Atom prop, const char *str, int len = -1); 1194 void set_string_property (Atom prop, const char *str, int len = -1);
… …
1271 return base; 1261 return base;
1272 } 1262 }
1273 1263
1274 bool option (uint8_t opt) const NOTHROW 1264 bool option (uint8_t opt) const NOTHROW
1275 { 1265 {
1266 if (!opt)
1267 return 0;
1268
1269 --opt;
1276 return options[opt >> 3] & (1 << (opt & 7)); 1270 return options[opt >> 3] & (1 << (opt & 7));
1277 } 1271 }
1278 1272
1279 void set_option (uint8_t opt, bool set = true) NOTHROW 1273 void set_option (uint8_t opt, bool set = true) NOTHROW
1280 { 1274 {
1275 if (!opt)
1276 return;
1277
1278 --opt;
1281 if (set) 1279 if (set)
1282 options[opt >> 3] |= (1 << (opt & 7)); 1280 options[opt >> 3] |= (1 << (opt & 7));
1283 else 1281 else
1284 options[opt >> 3] &= ~(1 << (opt & 7)); 1282 options[opt >> 3] &= ~(1 << (opt & 7));
1285 } 1283 }
… …
1404 int parse_keysym (const char *str, const char *arg); 1402 int parse_keysym (const char *str, const char *arg);
1405 const char *x_resource (const char *name); 1403 const char *x_resource (const char *name);
1406 void extract_resources (); 1404 void extract_resources ();
1407}; 1405};
1408 1406
1409#endif /* _RXVT_H_ */ 1407#endif /* _RXVT_H_ */
1410 1408

Diff Legend

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