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.278 by root, Tue Jul 24 14:38:59 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/*
… …
879 883
880#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
881class keyboard_manager; 885class keyboard_manager;
882#endif 886#endif
883 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
884struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 892struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
885 893
886 // special markers with magic addresses 894 // special markers with magic addresses
887 static const char resval_undef []; // options specifically unset 895 static const char resval_undef []; // options specifically unset
888 static const char resval_on []; // boolean options switched on 896 static const char resval_on []; // boolean options switched on
… …
894 rxvt_perl_term perl; 902 rxvt_perl_term perl;
895#endif 903#endif
896 struct mbstate mbstate; // current input multibyte state 904 struct mbstate mbstate; // current input multibyte state
897 905
898 unsigned char want_refresh:1, 906 unsigned char want_refresh:1,
899#ifdef TRANSPARENT 907#ifdef ENABLE_TRANSPARENCY
900 want_full_refresh:1, /* awaiting full screen refresh */ 908 want_full_refresh:1, /* awaiting full screen refresh */
901 am_transparent:1, /* is a transparent term */ 909 am_transparent:1, /* is a transparent term */
902 am_pixmap_trans:1, /* transparency w/known root pixmap */ 910 am_pixmap_trans:1, /* transparency w/known root pixmap */
903#endif 911#endif
904 current_screen:1, /* primary or secondary */ 912 current_screen:1, /* primary or secondary */
… …
948 /* give proper Scroll behaviour */ 956 /* give proper Scroll behaviour */
949#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 957#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
950 mouse_slip_wheel_speed, 958 mouse_slip_wheel_speed,
951#endif 959#endif
952 refresh_count, 960 refresh_count,
953 refresh_limit,
954 last_bot, /* scrollbar last bottom position */ 961 last_bot, /* scrollbar last bottom position */
955 last_top, /* scrollbar last top position */ 962 last_top, /* scrollbar last top position */
956 last_state, /* scrollbar last state */ 963 last_state, /* scrollbar last state */
957 scrollbar_len, 964 scrollbar_len,
958 window_vt_x, 965 window_vt_x,
… …
1016 XComposeStatus compose; 1023 XComposeStatus compose;
1017 ttymode_t tio; 1024 ttymode_t tio;
1018 row_col_t oldcursor; 1025 row_col_t oldcursor;
1019#ifdef XPM_BACKGROUND 1026#ifdef XPM_BACKGROUND
1020 bgPixmap_t bgPixmap; 1027 bgPixmap_t bgPixmap;
1028#ifdef HAVE_AFTERIMAGE
1029 struct ASVisual *asv;
1030 ASImageManager *asimman;
1031 ASImage *original_asim;
1032 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1033#else
1021 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1035#endif
1022#endif 1036#endif
1023 1037
1024#if ENABLE_OVERLAY 1038#if ENABLE_OVERLAY
1025 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1039 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1026 text_t **ov_text; 1040 text_t **ov_text;
… …
1084 void vt_select_input () const NOTHROW 1098 void vt_select_input () const NOTHROW
1085 { 1099 {
1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1087 } 1101 }
1088 1102
1089#if TRANSPARENT || ENABLE_PERL 1103#if ENABLE_TRANSPARENCY || ENABLE_PERL
1090 void rootwin_cb (XEvent &xev); 1104 void rootwin_cb (XEvent &xev);
1091 xevent_watcher rootwin_ev; 1105 xevent_watcher rootwin_ev;
1106#endif
1107#if ENABLE_TRANSPARENCY
1108 int check_our_parents ();
1109 void check_our_parents_cb (time_watcher &w);
1110 time_watcher check_our_parents_ev;
1092#endif 1111#endif
1093 1112
1094 void x_cb (XEvent &xev); 1113 void x_cb (XEvent &xev);
1095 void flush (); 1114 void flush ();
1096 xevent_watcher termwin_ev; 1115 xevent_watcher termwin_ev;
… …
1214 void button_press (XButtonEvent &ev); 1233 void button_press (XButtonEvent &ev);
1215 void button_release (XButtonEvent &ev); 1234 void button_release (XButtonEvent &ev);
1216 void focus_in (); 1235 void focus_in ();
1217 void focus_out (); 1236 void focus_out ();
1218 void update_fade_color (unsigned int idx); 1237 void update_fade_color (unsigned int idx);
1219 int check_our_parents ();
1220#ifdef PRINTPIPE 1238#ifdef PRINTPIPE
1221 FILE *popen_printer (); 1239 FILE *popen_printer ();
1222 int pclose_printer (FILE *stream); 1240 int pclose_printer (FILE *stream);
1223#endif 1241#endif
1224 void process_print_pipe (); 1242 void process_print_pipe ();

Diff Legend

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