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.278 by root, Tue Jul 24 14:38:59 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
… …
117// misc.C 111// misc.C
118char * rxvt_wcstombs (const wchar_t *str, int len = -1); 112char * rxvt_wcstombs (const wchar_t *str, int len = -1);
119wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 113wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
120char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 114char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
121wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 115wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
122char * rxvt_strdup_cpp (const char *str);
123 116
124#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 117#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
125 118
126char * rxvt_r_basename (const char *str) NOTHROW; 119char * rxvt_r_basename (const char *str) NOTHROW;
127void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 120void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
757#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 750#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
758#define scrollbar_position(y) ((y) - scrollBar.beg) 751#define scrollbar_position(y) ((y) - scrollBar.beg)
759#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 752#define scrollbar_size() (scrollBar.end - scrollBar.beg \
760 - scrollbar_minheight ()) 753 - scrollbar_minheight ())
761 754
762#ifdef XPM_BACKGROUND
763# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
764#else
765# define XPMClearArea(a, b, c, d, e, f, g)
766#endif
767
768typedef callback<void (const char *)> log_callback; 755typedef callback<void (const char *)> log_callback;
769typedef callback<int (int)> getfd_callback; 756typedef callback<int (int)> getfd_callback;
770 757
771#define SET_LOCALE(locale) rxvt_set_locale (locale) 758#define SET_LOCALE(locale) rxvt_set_locale (locale)
772extern bool rxvt_set_locale (const char *locale) NOTHROW; 759extern bool rxvt_set_locale (const char *locale) NOTHROW;
… …
882/****************************************************************************/ 869/****************************************************************************/
883 870
884#ifdef KEYSYM_RESOURCE 871#ifdef KEYSYM_RESOURCE
885class keyboard_manager; 872class keyboard_manager;
886#endif 873#endif
887
888/* to get libAfterImage to work with multiple displays we use that hack : */
889/* should not need that with libAfterImage version >= 1.15 */
890#define AFTERIMAGE_DPY_OP(op) ((::dpy = dpy), (op))
891 874
892struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 875struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
893 876
894 // special markers with magic addresses 877 // special markers with magic addresses
895 static const char resval_undef []; // options specifically unset 878 static const char resval_undef []; // options specifically unset
… …
1023 XComposeStatus compose; 1006 XComposeStatus compose;
1024 ttymode_t tio; 1007 ttymode_t tio;
1025 row_col_t oldcursor; 1008 row_col_t oldcursor;
1026#ifdef XPM_BACKGROUND 1009#ifdef XPM_BACKGROUND
1027 bgPixmap_t bgPixmap; 1010 bgPixmap_t bgPixmap;
1028#ifdef HAVE_AFTERIMAGE
1029 struct ASVisual *asv; 1011 struct ASVisual *asv;
1030 ASImageManager *asimman; 1012 ASImageManager *asimman;
1031 ASImage *original_asim; 1013 ASImage *original_asim;
1032 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 */
1033#else
1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1035#endif
1036#endif 1015#endif
1037 1016
1038#if ENABLE_OVERLAY 1017#if ENABLE_OVERLAY
1039 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1018 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1040 text_t **ov_text; 1019 text_t **ov_text;

Diff Legend

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