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.316 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.325 by root, Mon Nov 26 12:19:38 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>
… …
36 37
37#include "encoding.h" 38#include "encoding.h"
38#include "rxvtutil.h" 39#include "rxvtutil.h"
39#include "rxvtfont.h" 40#include "rxvtfont.h"
40#include "rxvttoolkit.h" 41#include "rxvttoolkit.h"
41#include "iom.h" 42#include "ev_cpp.h"
42#include "salloc.h" 43#include "salloc.h"
43#include "libptytty.h" 44#include "libptytty.h"
44 45
45#include "rxvtperl.h" 46#include "rxvtperl.h"
46 47
… …
786 } 787 }
787}; 788};
788 789
789/****************************************************************************/ 790/****************************************************************************/
790 791
791// primivite wrapper around mbstate_t to ensure initialisation 792// primitive wrapper around mbstate_t to ensure initialisation
792struct mbstate { 793struct mbstate {
793 mbstate_t mbs; 794 mbstate_t mbs;
794 795
795 operator mbstate_t *() { return &mbs; } 796 operator mbstate_t *() { return &mbs; }
796 void reset () { memset (&mbs, 0, sizeof (mbs)); } 797 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
1011 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1012 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1012 1013
1013#ifdef KEYSYM_RESOURCE 1014#ifdef KEYSYM_RESOURCE
1014 keyboard_manager *keyboard; 1015 keyboard_manager *keyboard;
1015#endif 1016#endif
1017#ifndef NO_RESOURCES
1018 XrmDatabase option_db;
1019#endif
1016 1020
1017 const char *rs[NUM_RESOURCES]; 1021 const char *rs[NUM_RESOURCES];
1018 /* command input buffering */ 1022 /* command input buffering */
1019 char *cmdbuf_ptr, *cmdbuf_endp; 1023 char *cmdbuf_ptr, *cmdbuf_endp;
1020 char cmdbuf_base[CBUFSIZ]; 1024 char cmdbuf_base[CBUFSIZ];
… …
1048 void rootwin_cb (XEvent &xev); 1052 void rootwin_cb (XEvent &xev);
1049 xevent_watcher rootwin_ev; 1053 xevent_watcher rootwin_ev;
1050#endif 1054#endif
1051#ifdef HAVE_BG_PIXMAP 1055#ifdef HAVE_BG_PIXMAP
1052 int update_background (); 1056 int update_background ();
1057#if TRACE_PIXMAPS
1058 int trace_update_background (const char* file, int line);
1059# define update_background() trace_update_background (__FILE__, __LINE__)
1060#endif
1053 void update_background_cb (time_watcher &w); 1061 void update_background_cb (ev::timer &w, int revents);
1054 time_watcher update_background_ev; 1062 ev::timer update_background_ev;
1055#endif 1063#endif
1056 1064
1057 void x_cb (XEvent &xev); 1065 void x_cb (XEvent &xev);
1058 xevent_watcher termwin_ev; 1066 xevent_watcher termwin_ev;
1059 xevent_watcher vt_ev; 1067 xevent_watcher vt_ev;
1060#ifdef HAVE_SCROLLBARS 1068#ifdef HAVE_SCROLLBARS
1061 xevent_watcher scrollbar_ev; 1069 xevent_watcher scrollbar_ev;
1062#endif 1070#endif
1063 1071
1064 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1072 void child_cb (ev::child &w, int revents); ev::child child_ev;
1065 void check_cb (check_watcher &w); check_watcher check_ev; 1073 void prepare_cb (ev::prepare &w, int revents); ev::prepare prepare_ev;
1066 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1074 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1067 void flush (); 1075 void flush ();
1068 void flush_cb (time_watcher &w); time_watcher flush_ev; 1076 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1069 bool pty_fill (); 1077 bool pty_fill ();
1070 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1078 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1071 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1079 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1072 1080
1073#ifdef CURSOR_BLINK 1081#ifdef CURSOR_BLINK
1074 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1082 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1075#endif 1083#endif
1076#ifdef TEXT_BLINK 1084#ifdef TEXT_BLINK
1077 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1085 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1078#endif 1086#endif
1079#ifndef NO_BELL 1087#ifndef NO_BELL
1080 void bell_cb (time_watcher &w); time_watcher bell_ev; 1088 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1081#endif 1089#endif
1082 1090
1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1084 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1092 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1085#endif 1093#endif
1086#ifdef SELECTION_SCROLLING 1094#ifdef SELECTION_SCROLLING
1087 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1095 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1088#endif 1096#endif
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1097#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1098 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1091#endif 1099#endif
1092 1100
1093#ifdef POINTER_BLANK 1101#ifdef POINTER_BLANK
1094 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1102 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1095 void pointer_blank (); 1103 void pointer_blank ();
1096#endif 1104#endif
1097 void pointer_unblank (); 1105 void pointer_unblank ();
1098 1106
1099 void tt_printf (const char *fmt,...); 1107 void tt_printf (const char *fmt,...);
… …
1263 return base; 1271 return base;
1264 } 1272 }
1265 1273
1266 bool option (uint8_t opt) const NOTHROW 1274 bool option (uint8_t opt) const NOTHROW
1267 { 1275 {
1276 if (!opt)
1277 return 0;
1278
1279 --opt;
1268 return options[opt >> 3] & (1 << (opt & 7)); 1280 return options[opt >> 3] & (1 << (opt & 7));
1269 } 1281 }
1270 1282
1271 void set_option (uint8_t opt, bool set = true) NOTHROW 1283 void set_option (uint8_t opt, bool set = true) NOTHROW
1272 { 1284 {
1285 if (!opt)
1286 return;
1287
1288 --opt;
1273 if (set) 1289 if (set)
1274 options[opt >> 3] |= (1 << (opt & 7)); 1290 options[opt >> 3] |= (1 << (opt & 7));
1275 else 1291 else
1276 options[opt >> 3] &= ~(1 << (opt & 7)); 1292 options[opt >> 3] &= ~(1 << (opt & 7));
1277 } 1293 }
… …
1396 int parse_keysym (const char *str, const char *arg); 1412 int parse_keysym (const char *str, const char *arg);
1397 const char *x_resource (const char *name); 1413 const char *x_resource (const char *name);
1398 void extract_resources (); 1414 void extract_resources ();
1399}; 1415};
1400 1416
1401#endif /* _RXVT_H_ */ 1417#endif /* _RXVT_H_ */
1402 1418

Diff Legend

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