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.277 by sasha, Thu Jul 12 22:33:16 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
… …
130const char * rxvt_Str_skip_space (const char *str) NOTHROW; 134const char * rxvt_Str_skip_space (const char *str) NOTHROW;
131char * rxvt_Str_trim (char *str) NOTHROW; 135char * rxvt_Str_trim (char *str) NOTHROW;
132int rxvt_Str_escaped (char *str) NOTHROW; 136int rxvt_Str_escaped (char *str) NOTHROW;
133char ** rxvt_splitcommastring (const char *cs) NOTHROW; 137char ** rxvt_splitcommastring (const char *cs) NOTHROW;
134void rxvt_freecommastring (char **cs) NOTHROW; 138void rxvt_freecommastring (char **cs) NOTHROW;
135char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
136 139
137///////////////////////////////////////////////////////////////////////////// 140/////////////////////////////////////////////////////////////////////////////
138 141
139// temporarily replace the process environment 142// temporarily replace the process environment
140extern char **environ; 143extern char **environ;
… …
177#endif 180#endif
178 181
179#ifdef XPM_BACKGROUND 182#ifdef XPM_BACKGROUND
180typedef struct { 183typedef struct {
181 short w, h, x, y; 184 short w, h, x, y;
185 bool auto_resize ;
182 Pixmap pixmap; 186 Pixmap pixmap;
183} bgPixmap_t; 187} bgPixmap_t;
184#endif 188#endif
185 189
186/* 190/*
… …
894 rxvt_perl_term perl; 898 rxvt_perl_term perl;
895#endif 899#endif
896 struct mbstate mbstate; // current input multibyte state 900 struct mbstate mbstate; // current input multibyte state
897 901
898 unsigned char want_refresh:1, 902 unsigned char want_refresh:1,
899#ifdef TRANSPARENT 903#ifdef ENABLE_TRANSPARENCY
900 want_full_refresh:1, /* awaiting full screen refresh */ 904 want_full_refresh:1, /* awaiting full screen refresh */
901 am_transparent:1, /* is a transparent term */ 905 am_transparent:1, /* is a transparent term */
902 am_pixmap_trans:1, /* transparency w/known root pixmap */ 906 am_pixmap_trans:1, /* transparency w/known root pixmap */
903#endif 907#endif
904 current_screen:1, /* primary or secondary */ 908 current_screen:1, /* primary or secondary */
… …
948 /* give proper Scroll behaviour */ 952 /* give proper Scroll behaviour */
949#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 953#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
950 mouse_slip_wheel_speed, 954 mouse_slip_wheel_speed,
951#endif 955#endif
952 refresh_count, 956 refresh_count,
953 refresh_limit,
954 last_bot, /* scrollbar last bottom position */ 957 last_bot, /* scrollbar last bottom position */
955 last_top, /* scrollbar last top position */ 958 last_top, /* scrollbar last top position */
956 last_state, /* scrollbar last state */ 959 last_state, /* scrollbar last state */
957 scrollbar_len, 960 scrollbar_len,
958 window_vt_x, 961 window_vt_x,
… …
1016 XComposeStatus compose; 1019 XComposeStatus compose;
1017 ttymode_t tio; 1020 ttymode_t tio;
1018 row_col_t oldcursor; 1021 row_col_t oldcursor;
1019#ifdef XPM_BACKGROUND 1022#ifdef XPM_BACKGROUND
1020 bgPixmap_t bgPixmap; 1023 bgPixmap_t bgPixmap;
1024#ifdef HAVE_AFTERIMAGE
1025 struct ASVisual *asv;
1026 /* to get libAfterImage to work with multiple displays we use that hack : */
1027 /* should not need that with libAfterImage version >= 1.15 */
1028#define AFTERIMAGE_DPY_OP(_op) ({::dpy = dpy; _op;})
1029 ASImageManager *asimman;
1030 ASImage *original_asim;
1031 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1032#else
1021 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1033 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1034#endif
1022#endif 1035#endif
1023 1036
1024#if ENABLE_OVERLAY 1037#if ENABLE_OVERLAY
1025 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1038 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1026 text_t **ov_text; 1039 text_t **ov_text;
… …
1084 void vt_select_input () const NOTHROW 1097 void vt_select_input () const NOTHROW
1085 { 1098 {
1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1099 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1087 } 1100 }
1088 1101
1089#if TRANSPARENT || ENABLE_PERL 1102#if ENABLE_TRANSPARENCY || ENABLE_PERL
1090 void rootwin_cb (XEvent &xev); 1103 void rootwin_cb (XEvent &xev);
1091 xevent_watcher rootwin_ev; 1104 xevent_watcher rootwin_ev;
1105#endif
1106#if ENABLE_TRANSPARENCY
1107 int check_our_parents ();
1108 void check_our_parents_cb (time_watcher &w);
1109 time_watcher check_our_parents_ev;
1092#endif 1110#endif
1093 1111
1094 void x_cb (XEvent &xev); 1112 void x_cb (XEvent &xev);
1095 void flush (); 1113 void flush ();
1096 xevent_watcher termwin_ev; 1114 xevent_watcher termwin_ev;
… …
1214 void button_press (XButtonEvent &ev); 1232 void button_press (XButtonEvent &ev);
1215 void button_release (XButtonEvent &ev); 1233 void button_release (XButtonEvent &ev);
1216 void focus_in (); 1234 void focus_in ();
1217 void focus_out (); 1235 void focus_out ();
1218 void update_fade_color (unsigned int idx); 1236 void update_fade_color (unsigned int idx);
1219 int check_our_parents ();
1220#ifdef PRINTPIPE 1237#ifdef PRINTPIPE
1221 FILE *popen_printer (); 1238 FILE *popen_printer ();
1222 int pclose_printer (FILE *stream); 1239 int pclose_printer (FILE *stream);
1223#endif 1240#endif
1224 void process_print_pipe (); 1241 void process_print_pipe ();

Diff Legend

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