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.260 by root, Thu Jul 6 23:48:11 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/*
… …
520 * on the unnecessary items, e.g. Color_pointer, but won't bother 514 * on the unnecessary items, e.g. Color_pointer, but won't bother
521 * until we need to. Also, be aware of usage in pixcolor_set 515 * until we need to. Also, be aware of usage in pixcolor_set
522 */ 516 */
523 517
524enum colour_list { 518enum colour_list {
519 Color_none = -2,
520 Color_transparent = -1,
525 Color_fg = 0, 521 Color_fg = 0,
526 Color_bg, 522 Color_bg,
527 minCOLOR, /* 2 */ 523 minCOLOR, /* 2 */
528 Color_Black = minCOLOR, 524 Color_Black = minCOLOR,
529 Color_Red3, 525 Color_Red3,
… …
682 * MACRO DEFINES 678 * MACRO DEFINES
683 ***************************************************************************** 679 *****************************************************************************
684 */ 680 */
685#define dLocal(type,name) type const name = this->name 681#define dLocal(type,name) type const name = this->name
686 682
687// for speed reasons, we assume that all latin1 characters 683// for speed reasons, we assume that all codepoints 32 to 126 are
688// are single-width (the first unicode combining character 684// single-width.
689// is actually 0x300, but ascii is what matters most). 685#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
690#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
691 686
692/* convert pixel dimensions to row/column values. Everything as int32_t */ 687/* convert pixel dimensions to row/column values. Everything as int32_t */
693#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 688#define Pixel2Col(x) Pixel2Width((int32_t)(x))
694#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 689#define Pixel2Row(y) Pixel2Height((int32_t)(y))
695#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 690#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
697#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 692#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
698#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 693#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 694#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 695#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
701 696
702#define OPTION(opt) (options & (opt))
703#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
704 | Opt_jumpScroll | Opt_secondaryScreen \
705 | Opt_pastableTabs | Opt_intensityStyles)
706
707// for m >= -n, ensure remainder lies between 0..n-1 697// for m >= -n, ensure remainder lies between 0..n-1
708#define MOD(m,n) (((m) + (n)) % (n)) 698#define MOD(m,n) (((m) + (n)) % (n))
709 699
710#define LINENO(n) MOD (term_start + int(n), total_rows) 700#define LINENO(n) MOD (term_start + int(n), total_rows)
711#define ROW(n) row_buf [LINENO (n)] 701#define ROW(n) row_buf [LINENO (n)]
… …
787/****************************************************************************/ 777/****************************************************************************/
788 778
789#define LINE_LONGER 0x0001 // line is continued on the next row 779#define LINE_LONGER 0x0001 // line is continued on the next row
790#define LINE_FILTERED 0x0002 // line has been filtered 780#define LINE_FILTERED 0x0002 // line has been filtered
791#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 781#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
782#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
783#define LINE_BIDI 0x0010 // line needs bidi (NYI)
792 784
793struct line_t { 785struct line_t {
794 text_t *t; // terminal the text 786 text_t *t; // terminal the text
795 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
796 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 788 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
909 struct mbstate mbstate; // current input multibyte state 901 struct mbstate mbstate; // current input multibyte state
910 902
911 unsigned char want_refresh:1, 903 unsigned char want_refresh:1,
912#ifdef TRANSPARENT 904#ifdef TRANSPARENT
913 want_full_refresh:1, /* awaiting full screen refresh */ 905 want_full_refresh:1, /* awaiting full screen refresh */
914#endif
915#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
916 am_transparent:1, /* is a transparent term */ 906 am_transparent:1, /* is a transparent term */
917 am_pixmap_trans:1, /* transparency w/known root pixmap */ 907 am_pixmap_trans:1, /* transparency w/known root pixmap */
918#endif 908#endif
919 current_screen:1, /* primary or secondary */ 909 current_screen:1, /* primary or secondary */
920 num_scr_allow:1, 910 num_scr_allow:1,
… …
1031 XComposeStatus compose; 1021 XComposeStatus compose;
1032 ttymode_t tio; 1022 ttymode_t tio;
1033 row_col_t oldcursor; 1023 row_col_t oldcursor;
1034#ifdef XPM_BACKGROUND 1024#ifdef XPM_BACKGROUND
1035 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
1036 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1031 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1032#endif
1037#endif 1033#endif
1038 1034
1039#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1040 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1041 text_t **ov_text; 1037 text_t **ov_text;
… …
1102 } 1098 }
1103 1099
1104#if TRANSPARENT || ENABLE_PERL 1100#if TRANSPARENT || ENABLE_PERL
1105 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1106 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;
1107#endif 1105#endif
1108 1106
1109 void x_cb (XEvent &xev); 1107 void x_cb (XEvent &xev);
1110 void flush (); 1108 void flush ();
1111 xevent_watcher termwin_ev; 1109 xevent_watcher termwin_ev;
… …
1171 bool pty_fill (); 1169 bool pty_fill ();
1172 1170
1173 void make_current () const // make this the "currently active" urxvt instance 1171 void make_current () const // make this the "currently active" urxvt instance
1174 { 1172 {
1175 SET_R (this); 1173 SET_R (this);
1174 set_environ (envv);
1176 rxvt_set_locale (locale); 1175 rxvt_set_locale (locale);
1177 set_environ (envv);
1178 } 1176 }
1179 1177
1180 void init_secondary (); 1178 void init_secondary ();
1181 const char **init_resources (int argc, const char *const *argv); 1179 const char **init_resources (int argc, const char *const *argv);
1182 const char *x_resource (const char *name); 1180 const char *x_resource (const char *name);
… …
1300 { 1298 {
1301 int base = GET_BASEFG (r); 1299 int base = GET_BASEFG (r);
1302#ifndef NO_BRIGHTCOLOR 1300#ifndef NO_BRIGHTCOLOR
1303 if (r & RS_Bold 1301 if (r & RS_Bold
1304# if ENABLE_STYLES 1302# if ENABLE_STYLES
1305 && OPTION (Opt_intensityStyles) 1303 && option (Opt_intensityStyles)
1306# endif 1304# endif
1307 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1305 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1308 base += minBrightCOLOR - minCOLOR; 1306 base += minBrightCOLOR - minCOLOR;
1309#endif 1307#endif
1310 return base; 1308 return base;
… …
1314 { 1312 {
1315 int base = GET_BASEBG (r); 1313 int base = GET_BASEBG (r);
1316#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1317 if (r & RS_Blink 1315 if (r & RS_Blink
1318# if ENABLE_STYLES 1316# if ENABLE_STYLES
1319 && OPTION (Opt_intensityStyles) 1317 && option (Opt_intensityStyles)
1320# endif 1318# endif
1321 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1322 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1323#endif 1321#endif
1324 return base; 1322 return base;
1325 } 1323 }
1326 1324
1327 bool option (uint32_t opt) const NOTHROW 1325 bool option (uint8_t opt) const NOTHROW
1328 { 1326 {
1329 return OPTION (opt); 1327 return options[opt >> 3] & (1 << (opt & 7));
1330 } 1328 }
1331 1329
1332 void set_option (uint32_t opt, bool set) NOTHROW 1330 void set_option (uint8_t opt, bool set = true) NOTHROW
1333 { 1331 {
1334 if (set) 1332 if (set)
1335 options |= opt; 1333 options[opt >> 3] |= (1 << (opt & 7));
1336 else 1334 else
1337 options &= ~opt; 1335 options[opt >> 3] &= ~(1 << (opt & 7));
1338 } 1336 }
1339 1337
1340 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;
1341 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;
1342 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