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.194 by root, Tue Jan 10 18:09:22 2006 UTC vs.
Revision 1.196 by root, Wed Jan 11 02:13:56 2006 UTC

… …
209# define TERMENV "rxvt-unicode" 209# define TERMENV "rxvt-unicode"
210#endif 210#endif
211 211
212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR) 212#if defined (NO_MOUSE_REPORT) && !defined (NO_MOUSE_REPORT_SCROLLBAR)
213# define NO_MOUSE_REPORT_SCROLLBAR 1 213# define NO_MOUSE_REPORT_SCROLLBAR 1
214#endif
215
216#ifdef NO_RESOURCES
217# undef USE_XGETDEFAULT
218#endif 214#endif
219 215
220#if defined (ISO_14755) || defined (ENABLE_PERL) 216#if defined (ISO_14755) || defined (ENABLE_PERL)
221# define ENABLE_OVERLAY 1 217# define ENABLE_OVERLAY 1
222#endif 218#endif
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 695#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 696#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 697#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 698#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 699
700#define TEMP_ENV temp_environ temp_environ (envv)
701
704#define OPTION(opt) (options & (opt)) 702#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 703#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \ 704 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles) 705 | Opt_pastableTabs | Opt_intensityStyles)
708 706
709// for m >= -n, ensure remainder lies between 0..n-1 707// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 708#define MOD(m,n) (((m) + (n)) % (n))
711 709
712#define LINENO(n) MOD (term_start + int(n), total_rows) 710#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
973#endif 971#endif
974 972
975struct rxvt_term : zero_initialized, rxvt_vars { 973struct rxvt_term : zero_initialized, rxvt_vars {
976 log_callback *log_hook; // log error messages through this hook, if != 0 974 log_callback *log_hook; // log error messages through this hook, if != 0
977 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 975 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
978
979#if ENABLE_PERL 976#if ENABLE_PERL
980 rxvt_perl_term perl; 977 rxvt_perl_term perl;
981#endif 978#endif
982#if USE_XGETDEFAULT
983 XrmDatabase xrmdatabase;
984#endif
985
986 struct mbstate mbstate; // current input multibyte state 979 struct mbstate mbstate; // current input multibyte state
987 980
988 unsigned char want_refresh:1, 981 unsigned char want_refresh:1,
989#ifdef TRANSPARENT 982#ifdef TRANSPARENT
990 want_full_refresh:1, /* awaiting full screen refresh */ 983 want_full_refresh:1, /* awaiting full screen refresh */
… …
1263 1256
1264 bool pty_fill (); 1257 bool pty_fill ();
1265 1258
1266 void init_secondary (); 1259 void init_secondary ();
1267 const char **init_resources (int argc, const char *const *argv); 1260 const char **init_resources (int argc, const char *const *argv);
1261 const char *x_resource (const char *name);
1268 void init_env (); 1262 void init_env ();
1269 void set_locale (const char *locale); 1263 void set_locale (const char *locale);
1270 void init_xlocale (); 1264 void init_xlocale ();
1271 void init_command (const char *const *argv); 1265 void init_command (const char *const *argv);
1272 void run_command (const char *const *argv); 1266 void run_command (const char *const *argv);

Diff Legend

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