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.280 by ayin, Sun Jul 29 08:56:36 2007 UTC vs.
Revision 1.281 by ayin, Thu Aug 2 15:01:30 2007 UTC

… …
77 77
78#ifdef HAVE_AFTERIMAGE 78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h> 79# include <afterimage.h>
80#undef min 80#undef min
81#undef max 81#undef max
82#elif defined(XPM_BACKGROUND)
83# ifdef XPM_INC_X11
84# include <X11/xpm.h>
85# else
86# include <xpm.h>
87# endif
88#endif 82#endif
89 83
90#ifndef STDIN_FILENO 84#ifndef STDIN_FILENO
91# define STDIN_FILENO 0 85# define STDIN_FILENO 0
92# define STDOUT_FILENO 1 86# define STDOUT_FILENO 1
… …
756#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 750#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
757#define scrollbar_position(y) ((y) - scrollBar.beg) 751#define scrollbar_position(y) ((y) - scrollBar.beg)
758#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 752#define scrollbar_size() (scrollBar.end - scrollBar.beg \
759 - scrollbar_minheight ()) 753 - scrollbar_minheight ())
760 754
761#ifdef XPM_BACKGROUND
762# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
763#else
764# define XPMClearArea(a, b, c, d, e, f, g)
765#endif
766
767typedef callback<void (const char *)> log_callback; 755typedef callback<void (const char *)> log_callback;
768typedef callback<int (int)> getfd_callback; 756typedef callback<int (int)> getfd_callback;
769 757
770#define SET_LOCALE(locale) rxvt_set_locale (locale) 758#define SET_LOCALE(locale) rxvt_set_locale (locale)
771extern bool rxvt_set_locale (const char *locale) NOTHROW; 759extern bool rxvt_set_locale (const char *locale) NOTHROW;
… …
1018 XComposeStatus compose; 1006 XComposeStatus compose;
1019 ttymode_t tio; 1007 ttymode_t tio;
1020 row_col_t oldcursor; 1008 row_col_t oldcursor;
1021#ifdef XPM_BACKGROUND 1009#ifdef XPM_BACKGROUND
1022 bgPixmap_t bgPixmap; 1010 bgPixmap_t bgPixmap;
1023#ifdef HAVE_AFTERIMAGE
1024 struct ASVisual *asv; 1011 struct ASVisual *asv;
1025 ASImageManager *asimman; 1012 ASImageManager *asimman;
1026 ASImage *original_asim; 1013 ASImage *original_asim;
1027 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */ 1014 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1028#else
1029 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1030#endif
1031#endif 1015#endif
1032 1016
1033#if ENABLE_OVERLAY 1017#if ENABLE_OVERLAY
1034 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1018 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1035 text_t **ov_text; 1019 text_t **ov_text;

Diff Legend

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