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.282 by sasha, Fri Aug 3 05:33:04 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;
… …
177# define KEEP_SCROLLCOLOR 1 170# define KEEP_SCROLLCOLOR 1
178#else 171#else
179# undef KEEP_SCROLLCOLOR 172# undef KEEP_SCROLLCOLOR
180#endif 173#endif
181 174
182#ifdef XPM_BACKGROUND 175#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
183typedef struct { 176typedef struct {
177#ifdef XPM_BACKGROUND
178 ASImage *original_asim;
184 short w, h, x, y; 179 short w, h, x, y;
185 bool auto_resize ; 180 bool auto_resize;
181#endif
186 Pixmap pixmap; 182 Pixmap pixmap;
183 unsigned int pmap_width, pmap_height;
184 unsigned int pmap_depth;
187} bgPixmap_t; 185} bgPixmap_t;
188#endif 186#endif
189 187
190/* 188/*
191 * the 'essential' information for reporting Mouse Events 189 * the 'essential' information for reporting Mouse Events
… …
757#define scrollbar_below_slider(y) ((y) > scrollBar.bot) 755#define scrollbar_below_slider(y) ((y) > scrollBar.bot)
758#define scrollbar_position(y) ((y) - scrollBar.beg) 756#define scrollbar_position(y) ((y) - scrollBar.beg)
759#define scrollbar_size() (scrollBar.end - scrollBar.beg \ 757#define scrollbar_size() (scrollBar.end - scrollBar.beg \
760 - scrollbar_minheight ()) 758 - scrollbar_minheight ())
761 759
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; 760typedef callback<void (const char *)> log_callback;
769typedef callback<int (int)> getfd_callback; 761typedef callback<int (int)> getfd_callback;
770 762
771#define SET_LOCALE(locale) rxvt_set_locale (locale) 763#define SET_LOCALE(locale) rxvt_set_locale (locale)
772extern bool rxvt_set_locale (const char *locale) NOTHROW; 764extern bool rxvt_set_locale (const char *locale) NOTHROW;
… …
882/****************************************************************************/ 874/****************************************************************************/
883 875
884#ifdef KEYSYM_RESOURCE 876#ifdef KEYSYM_RESOURCE
885class keyboard_manager; 877class keyboard_manager;
886#endif 878#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 879
892struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 880struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
893 881
894 // special markers with magic addresses 882 // special markers with magic addresses
895 static const char resval_undef []; // options specifically unset 883 static const char resval_undef []; // options specifically unset
… …
1021#endif 1009#endif
1022 struct mouse_event MEvent; 1010 struct mouse_event MEvent;
1023 XComposeStatus compose; 1011 XComposeStatus compose;
1024 ttymode_t tio; 1012 ttymode_t tio;
1025 row_col_t oldcursor; 1013 row_col_t oldcursor;
1014#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
1015 bgPixmap_t bgPixmap;
1016#endif
1026#ifdef XPM_BACKGROUND 1017#ifdef XPM_BACKGROUND
1027 bgPixmap_t bgPixmap;
1028#ifdef HAVE_AFTERIMAGE
1029 struct ASVisual *asv; 1018 struct ASVisual *asv;
1030 ASImageManager *asimman; 1019 ASImageManager *asimman;
1031 ASImage *original_asim;
1032 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 1020#endif
1037 1021
1038#if ENABLE_OVERLAY 1022#if ENABLE_OVERLAY
1039 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1023 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1040 text_t **ov_text; 1024 text_t **ov_text;
… …
1453 void get_xdefaults (FILE *stream, const char *name); 1437 void get_xdefaults (FILE *stream, const char *name);
1454 void extract_resources (); 1438 void extract_resources ();
1455 // xpm.C 1439 // xpm.C
1456 int scale_pixmap (const char *geom); 1440 int scale_pixmap (const char *geom);
1457 void resize_pixmap (); 1441 void resize_pixmap ();
1458 Pixmap set_bgPixmap (const char *file); 1442 void set_bgPixmap (const char *file);
1459}; 1443};
1460 1444
1461/* 1445/*
1462 ***************************************************************************** 1446 *****************************************************************************
1463 * PROTOTYPES 1447 * PROTOTYPES

Diff Legend

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