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.330 by ayin, Wed Dec 12 11:35:57 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
… …
168 int clicks; 166 int clicks;
169 Time time; /* milliseconds */ 167 Time time; /* milliseconds */
170 unsigned int state; /* key or button mask */ 168 unsigned int state; /* key or button mask */
171 unsigned int button; /* detail */ 169 unsigned int button; /* detail */
172}; 170};
173
174#if ENABLE_FRILLS
175typedef struct _mwmhints {
176 CARD32 flags;
177 CARD32 functions;
178 CARD32 decorations;
179 INT32 input_mode;
180 CARD32 status;
181} MWMHints;
182#endif
183 171
184#if ENABLE_XEMBED 172#if ENABLE_XEMBED
185// XEMBED messages 173// XEMBED messages
186# define XEMBED_EMBEDDED_NOTIFY 0 174# define XEMBED_EMBEDDED_NOTIFY 0
187# define XEMBED_WINDOW_ACTIVATE 1 175# define XEMBED_WINDOW_ACTIVATE 1
… …
592#define PrivMode_smoothScroll (1UL<<17) 580#define PrivMode_smoothScroll (1UL<<17)
593#define PrivMode_vt52 (1UL<<18) 581#define PrivMode_vt52 (1UL<<18)
594#define PrivMode_LFNL (1UL<<19) 582#define PrivMode_LFNL (1UL<<19)
595#define PrivMode_MouseBtnEvent (1UL<<20) 583#define PrivMode_MouseBtnEvent (1UL<<20)
596#define PrivMode_MouseAnyEvent (1UL<<21) 584#define PrivMode_MouseAnyEvent (1UL<<21)
597/* too annoying to implement X11 highlight tracking */
598/* #define PrivMode_MouseX11Track (1LU<<20) */
599 585
600#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent) 586#define PrivMode_mouse_report (PrivMode_MouseX10|PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent)
601 587
602#ifdef ALLOW_132_MODE 588#ifdef ALLOW_132_MODE
603# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK) 589# define PrivMode_Default (PrivMode_Autowrap|PrivMode_ShiftKeys|PrivMode_VisibleCursor|PrivMode_132OK)
… …
611#define CBUFSIZ 2048 // size of command buffer 597#define CBUFSIZ 2048 // size of command buffer
612#define UBUFSIZ 2048 // character buffer 598#define UBUFSIZ 2048 // character buffer
613 599
614#ifndef PATH_MAX 600#ifndef PATH_MAX
615# define PATH_MAX 16384 601# define PATH_MAX 16384
602#endif
603
604#if ENABLE_FRILLS
605# include <X11/Xmd.h>
606typedef struct _mwmhints {
607 CARD32 flags;
608 CARD32 functions;
609 CARD32 decorations;
610 INT32 input_mode;
611 CARD32 status;
612} MWMHints;
616#endif 613#endif
617 614
618/* Motif window hints */ 615/* Motif window hints */
619#define MWM_HINTS_FUNCTIONS (1L << 0) 616#define MWM_HINTS_FUNCTIONS (1L << 0)
620#define MWM_HINTS_DECORATIONS (1L << 1) 617#define MWM_HINTS_DECORATIONS (1L << 1)
… …
786 } 783 }
787}; 784};
788 785
789/****************************************************************************/ 786/****************************************************************************/
790 787
791// primivite wrapper around mbstate_t to ensure initialisation 788// primitive wrapper around mbstate_t to ensure initialisation
792struct mbstate { 789struct mbstate {
793 mbstate_t mbs; 790 mbstate_t mbs;
794 791
795 operator mbstate_t *() { return &mbs; } 792 operator mbstate_t *() { return &mbs; }
796 void reset () { memset (&mbs, 0, sizeof (mbs)); } 793 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
1011 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1008 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1012 1009
1013#ifdef KEYSYM_RESOURCE 1010#ifdef KEYSYM_RESOURCE
1014 keyboard_manager *keyboard; 1011 keyboard_manager *keyboard;
1015#endif 1012#endif
1013#ifndef NO_RESOURCES
1014 XrmDatabase option_db;
1015#endif
1016 1016
1017 const char *rs[NUM_RESOURCES]; 1017 const char *rs[NUM_RESOURCES];
1018 /* command input buffering */ 1018 /* command input buffering */
1019 char *cmdbuf_ptr, *cmdbuf_endp; 1019 char *cmdbuf_ptr, *cmdbuf_endp;
1020 char cmdbuf_base[CBUFSIZ]; 1020 char cmdbuf_base[CBUFSIZ];
… …
1048 void rootwin_cb (XEvent &xev); 1048 void rootwin_cb (XEvent &xev);
1049 xevent_watcher rootwin_ev; 1049 xevent_watcher rootwin_ev;
1050#endif 1050#endif
1051#ifdef HAVE_BG_PIXMAP 1051#ifdef HAVE_BG_PIXMAP
1052 int update_background (); 1052 int update_background ();
1053#if TRACE_PIXMAPS
1054 int trace_update_background (const char *file, int line);
1055# define update_background() trace_update_background (__FILE__, __LINE__)
1056#endif
1053 void update_background_cb (time_watcher &w); 1057 void update_background_cb (ev::timer &w, int revents);
1054 time_watcher update_background_ev; 1058 ev::timer update_background_ev;
1055#endif 1059#endif
1056 1060
1057 void x_cb (XEvent &xev); 1061 void x_cb (XEvent &xev);
1058 xevent_watcher termwin_ev; 1062 xevent_watcher termwin_ev;
1059 xevent_watcher vt_ev; 1063 xevent_watcher vt_ev;
1060#ifdef HAVE_SCROLLBARS 1064#ifdef HAVE_SCROLLBARS
1061 xevent_watcher scrollbar_ev; 1065 xevent_watcher scrollbar_ev;
1062#endif 1066#endif
1063 1067
1064 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1068 void child_cb (ev::child &w, int revents); ev::child child_ev;
1065 void check_cb (check_watcher &w); check_watcher check_ev; 1069 void prepare_cb (ev::prepare &w, int revents); ev::prepare prepare_ev;
1066 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1070 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1067 void flush (); 1071 void flush ();
1068 void flush_cb (time_watcher &w); time_watcher flush_ev; 1072 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1069 bool pty_fill (); 1073 bool pty_fill ();
1070 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1074 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1071 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1075 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1072 1076
1073#ifdef CURSOR_BLINK 1077#ifdef CURSOR_BLINK
1074 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1078 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1075#endif 1079#endif
1076#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1077 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1081 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1078#endif 1082#endif
1079#ifndef NO_BELL 1083#ifndef NO_BELL
1080 void bell_cb (time_watcher &w); time_watcher bell_ev; 1084 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1081#endif 1085#endif
1082 1086
1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1084 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1088 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1085#endif 1089#endif
1086#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1087 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1091 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1088#endif 1092#endif
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1094 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1091#endif 1095#endif
1092 1096
1093#ifdef POINTER_BLANK 1097#ifdef POINTER_BLANK
1094 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1098 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1095 void pointer_blank (); 1099 void pointer_blank ();
1096#endif 1100#endif
1097 void pointer_unblank (); 1101 void pointer_unblank ();
1098 1102
1099 void tt_printf (const char *fmt,...); 1103 void tt_printf (const char *fmt,...);
1100 void tt_write (const char *data, unsigned int len); 1104 void tt_write (const char *data, unsigned int len);
1101 void pty_write (); 1105 void pty_write ();
1102 1106
1103 bool init (stringvec *argv, stringvec *envv) 1107 void init (stringvec *argv, stringvec *envv)
1104 { 1108 {
1105 this->argv = argv; 1109 this->argv = argv;
1106 return init (argv->size (), argv->begin (), envv); 1110 init (argv->size (), argv->begin (), envv);
1107 } 1111 }
1108 1112
1109 void make_current () const // make this the "currently active" urxvt instance 1113 void make_current () const // make this the "currently active" urxvt instance
1110 { 1114 {
1111 SET_R (this); 1115 SET_R (this);
… …
1167 int privcases (int mode, unsigned long bit); 1171 int privcases (int mode, unsigned long bit);
1168 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1172 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1169 void process_sgr_mode (unsigned int nargs, const int *arg); 1173 void process_sgr_mode (unsigned int nargs, const int *arg);
1170 void process_graphics (); 1174 void process_graphics ();
1171 // init.C 1175 // init.C
1172 bool init_vars (); 1176 void init_vars ();
1173 void init_secondary (); 1177 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv); 1178 const char **init_resources (int argc, const char *const *argv);
1175 void init_env (); 1179 void init_env ();
1176 void set_locale (const char *locale); 1180 void set_locale (const char *locale);
1177 void init_xlocale (); 1181 void init_xlocale ();
… …
1186 void tt_winch (); 1190 void tt_winch ();
1187 rxvt_term (); 1191 rxvt_term ();
1188 ~rxvt_term (); 1192 ~rxvt_term ();
1189 void destroy (); 1193 void destroy ();
1190 void emergency_cleanup (); 1194 void emergency_cleanup ();
1191 bool init (int argc, const char *const *argv, stringvec *envv); 1195 void init (int argc, const char *const *argv, stringvec *envv);
1192 void recolour_cursor (); 1196 void recolour_cursor ();
1193 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1197 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1194 void window_calc (unsigned int newwidth, unsigned int newheight); 1198 void window_calc (unsigned int newwidth, unsigned int newheight);
1195 bool set_fonts (); 1199 bool set_fonts ();
1196 void set_string_property (Atom prop, const char *str, int len = -1); 1200 void set_string_property (Atom prop, const char *str, int len = -1);
… …
1263 return base; 1267 return base;
1264 } 1268 }
1265 1269
1266 bool option (uint8_t opt) const NOTHROW 1270 bool option (uint8_t opt) const NOTHROW
1267 { 1271 {
1272 if (!opt)
1273 return 0;
1274
1275 --opt;
1268 return options[opt >> 3] & (1 << (opt & 7)); 1276 return options[opt >> 3] & (1 << (opt & 7));
1269 } 1277 }
1270 1278
1271 void set_option (uint8_t opt, bool set = true) NOTHROW 1279 void set_option (uint8_t opt, bool set = true) NOTHROW
1272 { 1280 {
1281 if (!opt)
1282 return;
1283
1284 --opt;
1273 if (set) 1285 if (set)
1274 options[opt >> 3] |= (1 << (opt & 7)); 1286 options[opt >> 3] |= (1 << (opt & 7));
1275 else 1287 else
1276 options[opt >> 3] &= ~(1 << (opt & 7)); 1288 options[opt >> 3] &= ~(1 << (opt & 7));
1277 } 1289 }
… …
1396 int parse_keysym (const char *str, const char *arg); 1408 int parse_keysym (const char *str, const char *arg);
1397 const char *x_resource (const char *name); 1409 const char *x_resource (const char *name);
1398 void extract_resources (); 1410 void extract_resources ();
1399}; 1411};
1400 1412
1401#endif /* _RXVT_H_ */ 1413#endif /* _RXVT_H_ */
1402 1414

Diff Legend

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