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.268 by ayin, Tue May 1 21:10:04 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/*
… …
687#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 691#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
688#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 692#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 693#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 694#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
691 695
692#define OPTION(opt) option(opt)
693
694// for m >= -n, ensure remainder lies between 0..n-1 696// for m >= -n, ensure remainder lies between 0..n-1
695#define MOD(m,n) (((m) + (n)) % (n)) 697#define MOD(m,n) (((m) + (n)) % (n))
696 698
697#define LINENO(n) MOD (term_start + int(n), total_rows) 699#define LINENO(n) MOD (term_start + int(n), total_rows)
698#define ROW(n) row_buf [LINENO (n)] 700#define ROW(n) row_buf [LINENO (n)]
… …
881 883
882#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
883class keyboard_manager; 885class keyboard_manager;
884#endif 886#endif
885 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
886struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 892struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
887 893
888 // special markers with magic addresses 894 // special markers with magic addresses
889 static const char resval_undef []; // options specifically unset 895 static const char resval_undef []; // options specifically unset
890 static const char resval_on []; // boolean options switched on 896 static const char resval_on []; // boolean options switched on
… …
896 rxvt_perl_term perl; 902 rxvt_perl_term perl;
897#endif 903#endif
898 struct mbstate mbstate; // current input multibyte state 904 struct mbstate mbstate; // current input multibyte state
899 905
900 unsigned char want_refresh:1, 906 unsigned char want_refresh:1,
901#ifdef TRANSPARENT 907#ifdef ENABLE_TRANSPARENCY
902 want_full_refresh:1, /* awaiting full screen refresh */ 908 want_full_refresh:1, /* awaiting full screen refresh */
903 am_transparent:1, /* is a transparent term */ 909 am_transparent:1, /* is a transparent term */
904 am_pixmap_trans:1, /* transparency w/known root pixmap */ 910 am_pixmap_trans:1, /* transparency w/known root pixmap */
905#endif 911#endif
906 current_screen:1, /* primary or secondary */ 912 current_screen:1, /* primary or secondary */
… …
950 /* give proper Scroll behaviour */ 956 /* give proper Scroll behaviour */
951#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 957#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
952 mouse_slip_wheel_speed, 958 mouse_slip_wheel_speed,
953#endif 959#endif
954 refresh_count, 960 refresh_count,
955 refresh_limit,
956 last_bot, /* scrollbar last bottom position */ 961 last_bot, /* scrollbar last bottom position */
957 last_top, /* scrollbar last top position */ 962 last_top, /* scrollbar last top position */
958 last_state, /* scrollbar last state */ 963 last_state, /* scrollbar last state */
959 scrollbar_len, 964 scrollbar_len,
960 window_vt_x, 965 window_vt_x,
… …
1018 XComposeStatus compose; 1023 XComposeStatus compose;
1019 ttymode_t tio; 1024 ttymode_t tio;
1020 row_col_t oldcursor; 1025 row_col_t oldcursor;
1021#ifdef XPM_BACKGROUND 1026#ifdef XPM_BACKGROUND
1022 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
1023 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1035#endif
1024#endif 1036#endif
1025 1037
1026#if ENABLE_OVERLAY 1038#if ENABLE_OVERLAY
1027 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1039 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1028 text_t **ov_text; 1040 text_t **ov_text;
… …
1086 void vt_select_input () const NOTHROW 1098 void vt_select_input () const NOTHROW
1087 { 1099 {
1088 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1089 } 1101 }
1090 1102
1091#if TRANSPARENT || ENABLE_PERL 1103#if ENABLE_TRANSPARENCY || ENABLE_PERL
1092 void rootwin_cb (XEvent &xev); 1104 void rootwin_cb (XEvent &xev);
1093 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;
1094#endif 1111#endif
1095 1112
1096 void x_cb (XEvent &xev); 1113 void x_cb (XEvent &xev);
1097 void flush (); 1114 void flush ();
1098 xevent_watcher termwin_ev; 1115 xevent_watcher termwin_ev;
… …
1216 void button_press (XButtonEvent &ev); 1233 void button_press (XButtonEvent &ev);
1217 void button_release (XButtonEvent &ev); 1234 void button_release (XButtonEvent &ev);
1218 void focus_in (); 1235 void focus_in ();
1219 void focus_out (); 1236 void focus_out ();
1220 void update_fade_color (unsigned int idx); 1237 void update_fade_color (unsigned int idx);
1221 int check_our_parents ();
1222#ifdef PRINTPIPE 1238#ifdef PRINTPIPE
1223 FILE *popen_printer (); 1239 FILE *popen_printer ();
1224 int pclose_printer (FILE *stream); 1240 int pclose_printer (FILE *stream);
1225#endif 1241#endif
1226 void process_print_pipe (); 1242 void process_print_pipe ();
… …
1287 { 1303 {
1288 int base = GET_BASEFG (r); 1304 int base = GET_BASEFG (r);
1289#ifndef NO_BRIGHTCOLOR 1305#ifndef NO_BRIGHTCOLOR
1290 if (r & RS_Bold 1306 if (r & RS_Bold
1291# if ENABLE_STYLES 1307# if ENABLE_STYLES
1292 && OPTION (Opt_intensityStyles) 1308 && option (Opt_intensityStyles)
1293# endif 1309# endif
1294 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1310 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1295 base += minBrightCOLOR - minCOLOR; 1311 base += minBrightCOLOR - minCOLOR;
1296#endif 1312#endif
1297 return base; 1313 return base;
… …
1301 { 1317 {
1302 int base = GET_BASEBG (r); 1318 int base = GET_BASEBG (r);
1303#ifndef NO_BRIGHTCOLOR 1319#ifndef NO_BRIGHTCOLOR
1304 if (r & RS_Blink 1320 if (r & RS_Blink
1305# if ENABLE_STYLES 1321# if ENABLE_STYLES
1306 && OPTION (Opt_intensityStyles) 1322 && option (Opt_intensityStyles)
1307# endif 1323# endif
1308 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1324 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1309 base += minBrightCOLOR - minCOLOR; 1325 base += minBrightCOLOR - minCOLOR;
1310#endif 1326#endif
1311 return base; 1327 return base;
… …
1314 bool option (uint8_t opt) const NOTHROW 1330 bool option (uint8_t opt) const NOTHROW
1315 { 1331 {
1316 return options[opt >> 3] & (1 << (opt & 7)); 1332 return options[opt >> 3] & (1 << (opt & 7));
1317 } 1333 }
1318 1334
1319 void set_option (uint8_t opt, bool set) NOTHROW 1335 void set_option (uint8_t opt, bool set = true) NOTHROW
1320 { 1336 {
1321 if (set) 1337 if (set)
1322 options[opt >> 3] |= (1 << (opt & 7)); 1338 options[opt >> 3] |= (1 << (opt & 7));
1323 else 1339 else
1324 options[opt >> 3] &= ~(1 << (opt & 7)); 1340 options[opt >> 3] &= ~(1 << (opt & 7));

Diff Legend

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