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.264 by root, Sat Dec 2 16:57:16 2006 UTC vs.
Revision 1.271 by root, Sat Jun 9 13:04:27 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/*
… …
684 * MACRO DEFINES 678 * MACRO DEFINES
685 ***************************************************************************** 679 *****************************************************************************
686 */ 680 */
687#define dLocal(type,name) type const name = this->name 681#define dLocal(type,name) type const name = this->name
688 682
689// for speed reasons, we assume that all latin1 characters 683// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 684// single-width.
691// is actually 0x300, but ascii is what matters most). 685#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 686
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 687/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 688#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 689#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 690#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
698#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight) 691#define Pixel2Height(y) ((int32_t)(y) / (int32_t)fheight)
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 692#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 693#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 694#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 695#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar \
706 | Opt_scrollTtyOutput \
707 | Opt_jumpScroll \
708 | Opt_secondaryScreen \
709 | Opt_secondaryScroll \
710 | Opt_pastableTabs \
711 | Opt_intensityStyles)
712 696
713// for m >= -n, ensure remainder lies between 0..n-1 697// for m >= -n, ensure remainder lies between 0..n-1
714#define MOD(m,n) (((m) + (n)) % (n)) 698#define MOD(m,n) (((m) + (n)) % (n))
715 699
716#define LINENO(n) MOD (term_start + int(n), total_rows) 700#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
917 struct mbstate mbstate; // current input multibyte state 901 struct mbstate mbstate; // current input multibyte state
918 902
919 unsigned char want_refresh:1, 903 unsigned char want_refresh:1,
920#ifdef TRANSPARENT 904#ifdef TRANSPARENT
921 want_full_refresh:1, /* awaiting full screen refresh */ 905 want_full_refresh:1, /* awaiting full screen refresh */
922#endif
923#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
924 am_transparent:1, /* is a transparent term */ 906 am_transparent:1, /* is a transparent term */
925 am_pixmap_trans:1, /* transparency w/known root pixmap */ 907 am_pixmap_trans:1, /* transparency w/known root pixmap */
926#endif 908#endif
927 current_screen:1, /* primary or secondary */ 909 current_screen:1, /* primary or secondary */
928 num_scr_allow:1, 910 num_scr_allow:1,
… …
1039 XComposeStatus compose; 1021 XComposeStatus compose;
1040 ttymode_t tio; 1022 ttymode_t tio;
1041 row_col_t oldcursor; 1023 row_col_t oldcursor;
1042#ifdef XPM_BACKGROUND 1024#ifdef XPM_BACKGROUND
1043 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
1044 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1031 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1032#endif
1045#endif 1033#endif
1046 1034
1047#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1048 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1049 text_t **ov_text; 1037 text_t **ov_text;
… …
1110 } 1098 }
1111 1099
1112#if TRANSPARENT || ENABLE_PERL 1100#if TRANSPARENT || ENABLE_PERL
1113 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1114 xevent_watcher rootwin_ev; 1102 xevent_watcher rootwin_ev;
1103 void check_our_parents_cb (time_watcher &w);
1104 time_watcher check_our_parents_ev;
1115#endif 1105#endif
1116 1106
1117 void x_cb (XEvent &xev); 1107 void x_cb (XEvent &xev);
1118 void flush (); 1108 void flush ();
1119 xevent_watcher termwin_ev; 1109 xevent_watcher termwin_ev;
… …
1308 { 1298 {
1309 int base = GET_BASEFG (r); 1299 int base = GET_BASEFG (r);
1310#ifndef NO_BRIGHTCOLOR 1300#ifndef NO_BRIGHTCOLOR
1311 if (r & RS_Bold 1301 if (r & RS_Bold
1312# if ENABLE_STYLES 1302# if ENABLE_STYLES
1313 && OPTION (Opt_intensityStyles) 1303 && option (Opt_intensityStyles)
1314# endif 1304# endif
1315 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1305 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1316 base += minBrightCOLOR - minCOLOR; 1306 base += minBrightCOLOR - minCOLOR;
1317#endif 1307#endif
1318 return base; 1308 return base;
… …
1322 { 1312 {
1323 int base = GET_BASEBG (r); 1313 int base = GET_BASEBG (r);
1324#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1325 if (r & RS_Blink 1315 if (r & RS_Blink
1326# if ENABLE_STYLES 1316# if ENABLE_STYLES
1327 && OPTION (Opt_intensityStyles) 1317 && option (Opt_intensityStyles)
1328# endif 1318# endif
1329 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1330 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1331#endif 1321#endif
1332 return base; 1322 return base;
1333 } 1323 }
1334 1324
1335 bool option (uint32_t opt) const NOTHROW 1325 bool option (uint8_t opt) const NOTHROW
1336 { 1326 {
1337 return OPTION (opt); 1327 return options[opt >> 3] & (1 << (opt & 7));
1338 } 1328 }
1339 1329
1340 void set_option (uint32_t opt, bool set) NOTHROW 1330 void set_option (uint8_t opt, bool set = true) NOTHROW
1341 { 1331 {
1342 if (set) 1332 if (set)
1343 options |= opt; 1333 options[opt >> 3] |= (1 << (opt & 7));
1344 else 1334 else
1345 options &= ~opt; 1335 options[opt >> 3] &= ~(1 << (opt & 7));
1346 } 1336 }
1347 1337
1348 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;
1349 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;
1350 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