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.321 by root, Sun Nov 18 02:45:26 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"
… …
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)
… …
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];
… …
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 ();
1053#if TRACE_PIXMAPS 1055#if TRACE_PIXMAPS
1054 int trace_update_background (const char* file, int line); 1056 int trace_update_background (const char *file, int line);
1055# define update_background() trace_update_background (__FILE__, __LINE__) 1057# define update_background() trace_update_background (__FILE__, __LINE__)
1056#endif 1058#endif
1057 void update_background_cb (ev::timer &w, int revents); 1059 void update_background_cb (ev::timer &w, int revents);
1058 ev::timer update_background_ev; 1060 ev::timer update_background_ev;
1059#endif 1061#endif
… …
1267 return base; 1269 return base;
1268 } 1270 }
1269 1271
1270 bool option (uint8_t opt) const NOTHROW 1272 bool option (uint8_t opt) const NOTHROW
1271 { 1273 {
1274 if (!opt)
1275 return 0;
1276
1277 --opt;
1272 return options[opt >> 3] & (1 << (opt & 7)); 1278 return options[opt >> 3] & (1 << (opt & 7));
1273 } 1279 }
1274 1280
1275 void set_option (uint8_t opt, bool set = true) NOTHROW 1281 void set_option (uint8_t opt, bool set = true) NOTHROW
1276 { 1282 {
1283 if (!opt)
1284 return;
1285
1286 --opt;
1277 if (set) 1287 if (set)
1278 options[opt >> 3] |= (1 << (opt & 7)); 1288 options[opt >> 3] |= (1 << (opt & 7));
1279 else 1289 else
1280 options[opt >> 3] &= ~(1 << (opt & 7)); 1290 options[opt >> 3] &= ~(1 << (opt & 7));
1281 } 1291 }

Diff Legend

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