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.265 by root, Thu Dec 7 03:30:01 2006 UTC vs.
Revision 1.270 by sasha, Fri Jun 8 20:04:12 2007 UTC

… …
70 70
71#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
72typedef char *XPointer; 72typedef char *XPointer;
73#endif 73#endif
74 74
75#ifdef HAVE_TERMIOS_H
76# include <termios.h> 75#include <termios.h>
77typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
78#else
79# include <sgtty.h>
80typedef struct {
81 struct sgttyb sg;
82 struct tchars tc;
83 struct ltchars lc;
84 int line;
85 int local;
86} ttymode_t;
87#endif
88 77
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
89#ifdef XPM_BACKGROUND 82#elif defined(XPM_BACKGROUND)
90# ifdef XPM_INC_X11 83# ifdef XPM_INC_X11
91# include <X11/xpm.h> 84# include <X11/xpm.h>
92# else 85# else
93# include <xpm.h> 86# include <xpm.h>
94# endif 87# endif
… …
188#endif 181#endif
189 182
190#ifdef XPM_BACKGROUND 183#ifdef XPM_BACKGROUND
191typedef struct { 184typedef struct {
192 short w, h, x, y; 185 short w, h, x, y;
186 bool auto_resize ;
193 Pixmap pixmap; 187 Pixmap pixmap;
194} bgPixmap_t; 188} bgPixmap_t;
195#endif 189#endif
196 190
197/* 191/*
… …
698#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 692#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
699#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 693#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
700#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 694#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
701#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 695#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
702 696
703#define OPTION(opt) (options & (opt))
704#define DEFAULT_OPTIONS (Opt_scrollBar \
705 | Opt_scrollTtyOutput \
706 | Opt_jumpScroll \
707 | Opt_secondaryScreen \
708 | Opt_secondaryScroll \
709 | Opt_pastableTabs \
710 | Opt_intensityStyles)
711
712// for m >= -n, ensure remainder lies between 0..n-1 697// for m >= -n, ensure remainder lies between 0..n-1
713#define MOD(m,n) (((m) + (n)) % (n)) 698#define MOD(m,n) (((m) + (n)) % (n))
714 699
715#define LINENO(n) MOD (term_start + int(n), total_rows) 700#define LINENO(n) MOD (term_start + int(n), total_rows)
716#define ROW(n) row_buf [LINENO (n)] 701#define ROW(n) row_buf [LINENO (n)]
… …
916 struct mbstate mbstate; // current input multibyte state 901 struct mbstate mbstate; // current input multibyte state
917 902
918 unsigned char want_refresh:1, 903 unsigned char want_refresh:1,
919#ifdef TRANSPARENT 904#ifdef TRANSPARENT
920 want_full_refresh:1, /* awaiting full screen refresh */ 905 want_full_refresh:1, /* awaiting full screen refresh */
921#endif
922#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
923 am_transparent:1, /* is a transparent term */ 906 am_transparent:1, /* is a transparent term */
924 am_pixmap_trans:1, /* transparency w/known root pixmap */ 907 am_pixmap_trans:1, /* transparency w/known root pixmap */
925#endif 908#endif
926 current_screen:1, /* primary or secondary */ 909 current_screen:1, /* primary or secondary */
927 num_scr_allow:1, 910 num_scr_allow:1,
… …
1038 XComposeStatus compose; 1021 XComposeStatus compose;
1039 ttymode_t tio; 1022 ttymode_t tio;
1040 row_col_t oldcursor; 1023 row_col_t oldcursor;
1041#ifdef XPM_BACKGROUND 1024#ifdef XPM_BACKGROUND
1042 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
1043 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1031 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1032#endif
1044#endif 1033#endif
1045 1034
1046#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1047 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1048 text_t **ov_text; 1037 text_t **ov_text;
… …
1109 } 1098 }
1110 1099
1111#if TRANSPARENT || ENABLE_PERL 1100#if TRANSPARENT || ENABLE_PERL
1112 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1113 xevent_watcher rootwin_ev; 1102 xevent_watcher rootwin_ev;
1103 void check_our_parents_cb (time_watcher &w);
1104 time_watcher check_our_aprents_ev;
1114#endif 1105#endif
1115 1106
1116 void x_cb (XEvent &xev); 1107 void x_cb (XEvent &xev);
1117 void flush (); 1108 void flush ();
1118 xevent_watcher termwin_ev; 1109 xevent_watcher termwin_ev;
… …
1307 { 1298 {
1308 int base = GET_BASEFG (r); 1299 int base = GET_BASEFG (r);
1309#ifndef NO_BRIGHTCOLOR 1300#ifndef NO_BRIGHTCOLOR
1310 if (r & RS_Bold 1301 if (r & RS_Bold
1311# if ENABLE_STYLES 1302# if ENABLE_STYLES
1312 && OPTION (Opt_intensityStyles) 1303 && option (Opt_intensityStyles)
1313# endif 1304# endif
1314 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1305 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1315 base += minBrightCOLOR - minCOLOR; 1306 base += minBrightCOLOR - minCOLOR;
1316#endif 1307#endif
1317 return base; 1308 return base;
… …
1321 { 1312 {
1322 int base = GET_BASEBG (r); 1313 int base = GET_BASEBG (r);
1323#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1324 if (r & RS_Blink 1315 if (r & RS_Blink
1325# if ENABLE_STYLES 1316# if ENABLE_STYLES
1326 && OPTION (Opt_intensityStyles) 1317 && option (Opt_intensityStyles)
1327# endif 1318# endif
1328 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1329 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1330#endif 1321#endif
1331 return base; 1322 return base;
1332 } 1323 }
1333 1324
1334 bool option (uint32_t opt) const NOTHROW 1325 bool option (uint8_t opt) const NOTHROW
1335 { 1326 {
1336 return OPTION (opt); 1327 return options[opt >> 3] & (1 << (opt & 7));
1337 } 1328 }
1338 1329
1339 void set_option (uint32_t opt, bool set) NOTHROW 1330 void set_option (uint8_t opt, bool set = true) NOTHROW
1340 { 1331 {
1341 if (set) 1332 if (set)
1342 options |= opt; 1333 options[opt >> 3] |= (1 << (opt & 7));
1343 else 1334 else
1344 options &= ~opt; 1335 options[opt >> 3] &= ~(1 << (opt & 7));
1345 } 1336 }
1346 1337
1347 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1338 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1348 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1339 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1349 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1340 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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