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.266 by root, Sat Jan 20 00:45:30 2007 UTC vs.
Revision 1.279 by sasha, Thu Jul 26 16:17:50 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) (options & (opt))
693#define DEFAULT_OPTIONS (Opt_scrollBar \
694 | Opt_scrollTtyOutput \
695 | Opt_jumpScroll \
696 | Opt_secondaryScreen \
697 | Opt_secondaryScroll \
698 | Opt_pastableTabs \
699 | Opt_intensityStyles)
700
701// for m >= -n, ensure remainder lies between 0..n-1 696// for m >= -n, ensure remainder lies between 0..n-1
702#define MOD(m,n) (((m) + (n)) % (n)) 697#define MOD(m,n) (((m) + (n)) % (n))
703 698
704#define LINENO(n) MOD (term_start + int(n), total_rows) 699#define LINENO(n) MOD (term_start + int(n), total_rows)
705#define ROW(n) row_buf [LINENO (n)] 700#define ROW(n) row_buf [LINENO (n)]
… …
903 rxvt_perl_term perl; 898 rxvt_perl_term perl;
904#endif 899#endif
905 struct mbstate mbstate; // current input multibyte state 900 struct mbstate mbstate; // current input multibyte state
906 901
907 unsigned char want_refresh:1, 902 unsigned char want_refresh:1,
908#ifdef TRANSPARENT 903#ifdef ENABLE_TRANSPARENCY
909 want_full_refresh:1, /* awaiting full screen refresh */ 904 want_full_refresh:1, /* awaiting full screen refresh */
910#endif
911#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
912 am_transparent:1, /* is a transparent term */ 905 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */ 906 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif 907#endif
915 current_screen:1, /* primary or secondary */ 908 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 909 num_scr_allow:1,
… …
959 /* give proper Scroll behaviour */ 952 /* give proper Scroll behaviour */
960#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 953#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
961 mouse_slip_wheel_speed, 954 mouse_slip_wheel_speed,
962#endif 955#endif
963 refresh_count, 956 refresh_count,
964 refresh_limit,
965 last_bot, /* scrollbar last bottom position */ 957 last_bot, /* scrollbar last bottom position */
966 last_top, /* scrollbar last top position */ 958 last_top, /* scrollbar last top position */
967 last_state, /* scrollbar last state */ 959 last_state, /* scrollbar last state */
968 scrollbar_len, 960 scrollbar_len,
969 window_vt_x, 961 window_vt_x,
… …
1027 XComposeStatus compose; 1019 XComposeStatus compose;
1028 ttymode_t tio; 1020 ttymode_t tio;
1029 row_col_t oldcursor; 1021 row_col_t oldcursor;
1030#ifdef XPM_BACKGROUND 1022#ifdef XPM_BACKGROUND
1031 bgPixmap_t bgPixmap; 1023 bgPixmap_t bgPixmap;
1024#ifdef HAVE_AFTERIMAGE
1025 struct ASVisual *asv;
1026 ASImageManager *asimman;
1027 ASImage *original_asim;
1028 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1029#else
1032 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1030 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1031#endif
1033#endif 1032#endif
1034 1033
1035#if ENABLE_OVERLAY 1034#if ENABLE_OVERLAY
1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1035 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1037 text_t **ov_text; 1036 text_t **ov_text;
… …
1095 void vt_select_input () const NOTHROW 1094 void vt_select_input () const NOTHROW
1096 { 1095 {
1097 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1096 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1098 } 1097 }
1099 1098
1100#if TRANSPARENT || ENABLE_PERL 1099#if ENABLE_TRANSPARENCY || ENABLE_PERL
1101 void rootwin_cb (XEvent &xev); 1100 void rootwin_cb (XEvent &xev);
1102 xevent_watcher rootwin_ev; 1101 xevent_watcher rootwin_ev;
1102#endif
1103#if ENABLE_TRANSPARENCY
1104 int check_our_parents ();
1105 void check_our_parents_cb (time_watcher &w);
1106 time_watcher check_our_parents_ev;
1103#endif 1107#endif
1104 1108
1105 void x_cb (XEvent &xev); 1109 void x_cb (XEvent &xev);
1106 void flush (); 1110 void flush ();
1107 xevent_watcher termwin_ev; 1111 xevent_watcher termwin_ev;
… …
1225 void button_press (XButtonEvent &ev); 1229 void button_press (XButtonEvent &ev);
1226 void button_release (XButtonEvent &ev); 1230 void button_release (XButtonEvent &ev);
1227 void focus_in (); 1231 void focus_in ();
1228 void focus_out (); 1232 void focus_out ();
1229 void update_fade_color (unsigned int idx); 1233 void update_fade_color (unsigned int idx);
1230 int check_our_parents ();
1231#ifdef PRINTPIPE 1234#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1235 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1236 int pclose_printer (FILE *stream);
1234#endif 1237#endif
1235 void process_print_pipe (); 1238 void process_print_pipe ();
… …
1296 { 1299 {
1297 int base = GET_BASEFG (r); 1300 int base = GET_BASEFG (r);
1298#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1299 if (r & RS_Bold 1302 if (r & RS_Bold
1300# if ENABLE_STYLES 1303# if ENABLE_STYLES
1301 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1302# endif 1305# endif
1303 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1304 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1305#endif 1308#endif
1306 return base; 1309 return base;
… …
1310 { 1313 {
1311 int base = GET_BASEBG (r); 1314 int base = GET_BASEBG (r);
1312#ifndef NO_BRIGHTCOLOR 1315#ifndef NO_BRIGHTCOLOR
1313 if (r & RS_Blink 1316 if (r & RS_Blink
1314# if ENABLE_STYLES 1317# if ENABLE_STYLES
1315 && OPTION (Opt_intensityStyles) 1318 && option (Opt_intensityStyles)
1316# endif 1319# endif
1317 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1320 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1318 base += minBrightCOLOR - minCOLOR; 1321 base += minBrightCOLOR - minCOLOR;
1319#endif 1322#endif
1320 return base; 1323 return base;
1321 } 1324 }
1322 1325
1323 bool option (uint32_t opt) const NOTHROW 1326 bool option (uint8_t opt) const NOTHROW
1324 { 1327 {
1325 return OPTION (opt); 1328 return options[opt >> 3] & (1 << (opt & 7));
1326 } 1329 }
1327 1330
1328 void set_option (uint32_t opt, bool set) NOTHROW 1331 void set_option (uint8_t opt, bool set = true) NOTHROW
1329 { 1332 {
1330 if (set) 1333 if (set)
1331 options |= opt; 1334 options[opt >> 3] |= (1 << (opt & 7));
1332 else 1335 else
1333 options &= ~opt; 1336 options[opt >> 3] &= ~(1 << (opt & 7));
1334 } 1337 }
1335 1338
1336 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1339 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1337 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1340 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1338 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1341 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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