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.327 by ayin, Fri Nov 30 01:26:32 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
… …
613 601
614#ifndef PATH_MAX 602#ifndef PATH_MAX
615# define PATH_MAX 16384 603# define PATH_MAX 16384
616#endif 604#endif
617 605
606#if ENABLE_FRILLS
607# include <X11/Xmd.h>
608typedef struct _mwmhints {
609 CARD32 flags;
610 CARD32 functions;
611 CARD32 decorations;
612 INT32 input_mode;
613 CARD32 status;
614} MWMHints;
615#endif
616
618/* Motif window hints */ 617/* Motif window hints */
619#define MWM_HINTS_FUNCTIONS (1L << 0) 618#define MWM_HINTS_FUNCTIONS (1L << 0)
620#define MWM_HINTS_DECORATIONS (1L << 1) 619#define MWM_HINTS_DECORATIONS (1L << 1)
621#define MWM_HINTS_INPUT_MODE (1L << 2) 620#define MWM_HINTS_INPUT_MODE (1L << 2)
622#define MWM_HINTS_STATUS (1L << 3) 621#define MWM_HINTS_STATUS (1L << 3)
… …
786 } 785 }
787}; 786};
788 787
789/****************************************************************************/ 788/****************************************************************************/
790 789
791// primivite wrapper around mbstate_t to ensure initialisation 790// primitive wrapper around mbstate_t to ensure initialisation
792struct mbstate { 791struct mbstate {
793 mbstate_t mbs; 792 mbstate_t mbs;
794 793
795 operator mbstate_t *() { return &mbs; } 794 operator mbstate_t *() { return &mbs; }
796 void reset () { memset (&mbs, 0, sizeof (mbs)); } 795 void reset () { memset (&mbs, 0, sizeof (mbs)); }
… …
1011 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1010 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1012 1011
1013#ifdef KEYSYM_RESOURCE 1012#ifdef KEYSYM_RESOURCE
1014 keyboard_manager *keyboard; 1013 keyboard_manager *keyboard;
1015#endif 1014#endif
1015#ifndef NO_RESOURCES
1016 XrmDatabase option_db;
1017#endif
1016 1018
1017 const char *rs[NUM_RESOURCES]; 1019 const char *rs[NUM_RESOURCES];
1018 /* command input buffering */ 1020 /* command input buffering */
1019 char *cmdbuf_ptr, *cmdbuf_endp; 1021 char *cmdbuf_ptr, *cmdbuf_endp;
1020 char cmdbuf_base[CBUFSIZ]; 1022 char cmdbuf_base[CBUFSIZ];
… …
1048 void rootwin_cb (XEvent &xev); 1050 void rootwin_cb (XEvent &xev);
1049 xevent_watcher rootwin_ev; 1051 xevent_watcher rootwin_ev;
1050#endif 1052#endif
1051#ifdef HAVE_BG_PIXMAP 1053#ifdef HAVE_BG_PIXMAP
1052 int update_background (); 1054 int update_background ();
1055#if TRACE_PIXMAPS
1056 int trace_update_background (const char *file, int line);
1057# define update_background() trace_update_background (__FILE__, __LINE__)
1058#endif
1053 void update_background_cb (time_watcher &w); 1059 void update_background_cb (ev::timer &w, int revents);
1054 time_watcher update_background_ev; 1060 ev::timer update_background_ev;
1055#endif 1061#endif
1056 1062
1057 void x_cb (XEvent &xev); 1063 void x_cb (XEvent &xev);
1058 xevent_watcher termwin_ev; 1064 xevent_watcher termwin_ev;
1059 xevent_watcher vt_ev; 1065 xevent_watcher vt_ev;
1060#ifdef HAVE_SCROLLBARS 1066#ifdef HAVE_SCROLLBARS
1061 xevent_watcher scrollbar_ev; 1067 xevent_watcher scrollbar_ev;
1062#endif 1068#endif
1063 1069
1064 void child_cb (child_watcher &w, int status); child_watcher child_ev; 1070 void child_cb (ev::child &w, int revents); ev::child child_ev;
1065 void check_cb (check_watcher &w); check_watcher check_ev; 1071 void prepare_cb (ev::prepare &w, int revents); ev::prepare prepare_ev;
1066 void destroy_cb (time_watcher &w); time_watcher destroy_ev; 1072 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1067 void flush (); 1073 void flush ();
1068 void flush_cb (time_watcher &w); time_watcher flush_ev; 1074 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1069 bool pty_fill (); 1075 bool pty_fill ();
1070 void pty_cb (io_watcher &w, short revents); io_watcher pty_ev; 1076 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1071 void incr_cb (time_watcher &w) NOTHROW; time_watcher incr_ev; 1077 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1072 1078
1073#ifdef CURSOR_BLINK 1079#ifdef CURSOR_BLINK
1074 void cursor_blink_cb (time_watcher &w); time_watcher cursor_blink_ev; 1080 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1075#endif 1081#endif
1076#ifdef TEXT_BLINK 1082#ifdef TEXT_BLINK
1077 void text_blink_cb (time_watcher &w); time_watcher text_blink_ev; 1083 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1078#endif 1084#endif
1079#ifndef NO_BELL 1085#ifndef NO_BELL
1080 void bell_cb (time_watcher &w); time_watcher bell_ev; 1086 void bell_cb (ev::timer &w, int revents); ev::timer bell_ev;
1081#endif 1087#endif
1082 1088
1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1084 void cont_scroll_cb (time_watcher &w); time_watcher cont_scroll_ev; 1090 void cont_scroll_cb (ev::timer &w, int revents); ev::timer cont_scroll_ev;
1085#endif 1091#endif
1086#ifdef SELECTION_SCROLLING 1092#ifdef SELECTION_SCROLLING
1087 void sel_scroll_cb (time_watcher &w); time_watcher sel_scroll_ev; 1093 void sel_scroll_cb (ev::timer &w, int revents); ev::timer sel_scroll_ev;
1088#endif 1094#endif
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1095#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090 void slip_wheel_cb (time_watcher &w); time_watcher slip_wheel_ev; 1096 void slip_wheel_cb (ev::timer &w, int revents); ev::timer slip_wheel_ev;
1091#endif 1097#endif
1092 1098
1093#ifdef POINTER_BLANK 1099#ifdef POINTER_BLANK
1094 void pointer_cb (time_watcher &w); time_watcher pointer_ev; 1100 void pointer_cb (ev::timer &w, int revents); ev::timer pointer_ev;
1095 void pointer_blank (); 1101 void pointer_blank ();
1096#endif 1102#endif
1097 void pointer_unblank (); 1103 void pointer_unblank ();
1098 1104
1099 void tt_printf (const char *fmt,...); 1105 void tt_printf (const char *fmt,...);
… …
1263 return base; 1269 return base;
1264 } 1270 }
1265 1271
1266 bool option (uint8_t opt) const NOTHROW 1272 bool option (uint8_t opt) const NOTHROW
1267 { 1273 {
1274 if (!opt)
1275 return 0;
1276
1277 --opt;
1268 return options[opt >> 3] & (1 << (opt & 7)); 1278 return options[opt >> 3] & (1 << (opt & 7));
1269 } 1279 }
1270 1280
1271 void set_option (uint8_t opt, bool set = true) NOTHROW 1281 void set_option (uint8_t opt, bool set = true) NOTHROW
1272 { 1282 {
1283 if (!opt)
1284 return;
1285
1286 --opt;
1273 if (set) 1287 if (set)
1274 options[opt >> 3] |= (1 << (opt & 7)); 1288 options[opt >> 3] |= (1 << (opt & 7));
1275 else 1289 else
1276 options[opt >> 3] &= ~(1 << (opt & 7)); 1290 options[opt >> 3] &= ~(1 << (opt & 7));
1277 } 1291 }
… …
1396 int parse_keysym (const char *str, const char *arg); 1410 int parse_keysym (const char *str, const char *arg);
1397 const char *x_resource (const char *name); 1411 const char *x_resource (const char *name);
1398 void extract_resources (); 1412 void extract_resources ();
1399}; 1413};
1400 1414
1401#endif /* _RXVT_H_ */ 1415#endif /* _RXVT_H_ */
1402 1416

Diff Legend

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