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.269 by root, Tue May 1 21:30:01 2007 UTC vs.
Revision 1.271 by root, Sat Jun 9 13:04:27 2007 UTC

73#endif 73#endif
74 74
75#include <termios.h> 75#include <termios.h>
76typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
77 77
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
78#ifdef XPM_BACKGROUND 82#elif defined(XPM_BACKGROUND)
79# ifdef XPM_INC_X11 83# ifdef XPM_INC_X11
80# include <X11/xpm.h> 84# include <X11/xpm.h>
81# else 85# else
82# include <xpm.h> 86# include <xpm.h>
83# endif 87# endif
177#endif 181#endif
178 182
179#ifdef XPM_BACKGROUND 183#ifdef XPM_BACKGROUND
180typedef struct { 184typedef struct {
181 short w, h, x, y; 185 short w, h, x, y;
186 bool auto_resize ;
182 Pixmap pixmap; 187 Pixmap pixmap;
183} bgPixmap_t; 188} bgPixmap_t;
184#endif 189#endif
185 190
186/* 191/*
1016 XComposeStatus compose; 1021 XComposeStatus compose;
1017 ttymode_t tio; 1022 ttymode_t tio;
1018 row_col_t oldcursor; 1023 row_col_t oldcursor;
1019#ifdef XPM_BACKGROUND 1024#ifdef XPM_BACKGROUND
1020 bgPixmap_t bgPixmap; 1025 bgPixmap_t bgPixmap;
1026#ifdef HAVE_AFTERIMAGE
1027 ASImageManager *asimman;
1028 ASImage *original_asim;
1029 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1030#else
1021 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1031 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1032#endif
1022#endif 1033#endif
1023 1034
1024#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1025 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1026 text_t **ov_text; 1037 text_t **ov_text;
1087 } 1098 }
1088 1099
1089#if TRANSPARENT || ENABLE_PERL 1100#if TRANSPARENT || ENABLE_PERL
1090 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1091 xevent_watcher rootwin_ev; 1102 xevent_watcher rootwin_ev;
1103 void check_our_parents_cb (time_watcher &w);
1104 time_watcher check_our_parents_ev;
1092#endif 1105#endif
1093 1106
1094 void x_cb (XEvent &xev); 1107 void x_cb (XEvent &xev);
1095 void flush (); 1108 void flush ();
1096 xevent_watcher termwin_ev; 1109 xevent_watcher termwin_ev;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines