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.259 by root, Thu Jul 6 18:56:10 2006 UTC vs.
Revision 1.269 by root, Tue May 1 21:30:01 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
89#ifdef XPM_BACKGROUND 78#ifdef XPM_BACKGROUND
90# ifdef XPM_INC_X11 79# ifdef XPM_INC_X11
91# include <X11/xpm.h> 80# include <X11/xpm.h>
92# else 81# else
… …
520 * on the unnecessary items, e.g. Color_pointer, but won't bother 509 * 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 510 * until we need to. Also, be aware of usage in pixcolor_set
522 */ 511 */
523 512
524enum colour_list { 513enum colour_list {
514 Color_none = -2,
515 Color_transparent = -1,
525 Color_fg = 0, 516 Color_fg = 0,
526 Color_bg, 517 Color_bg,
527 minCOLOR, /* 2 */ 518 minCOLOR, /* 2 */
528 Color_Black = minCOLOR, 519 Color_Black = minCOLOR,
529 Color_Red3, 520 Color_Red3,
… …
682 * MACRO DEFINES 673 * MACRO DEFINES
683 ***************************************************************************** 674 *****************************************************************************
684 */ 675 */
685#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
686 677
687// for speed reasons, we assume that all latin1 characters 678// for speed reasons, we assume that all codepoints 32 to 126 are
688// are single-width (the first unicode combining character 679// single-width.
689// is actually 0x300, but ascii is what matters most). 680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
690#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
691 681
692/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
693#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
694#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
695#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
697#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
698#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
699#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
700#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
701 691
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 692// for m >= -n, ensure remainder lies between 0..n-1
708#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
709 694
710#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
711#define ROW(n) row_buf [LINENO (n)] 696#define ROW(n) row_buf [LINENO (n)]
… …
787/****************************************************************************/ 772/****************************************************************************/
788 773
789#define LINE_LONGER 0x0001 // line is continued on the next row 774#define LINE_LONGER 0x0001 // line is continued on the next row
790#define LINE_FILTERED 0x0002 // line has been filtered 775#define LINE_FILTERED 0x0002 // line has been filtered
791#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 776#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
777#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
778#define LINE_BIDI 0x0010 // line needs bidi (NYI)
792 779
793struct line_t { 780struct line_t {
794 text_t *t; // terminal the text 781 text_t *t; // terminal the text
795 rend_t *r; // rendition, uses RS_ flags 782 rend_t *r; // rendition, uses RS_ flags
796 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 783 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
909 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
910 897
911 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
912#ifdef TRANSPARENT 899#ifdef TRANSPARENT
913 want_full_refresh:1, /* awaiting full screen refresh */ 900 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 */ 901 am_transparent:1, /* is a transparent term */
917 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
918#endif 903#endif
919 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
920 num_scr_allow:1, 905 num_scr_allow:1,
… …
1099 void vt_select_input () const NOTHROW 1084 void vt_select_input () const NOTHROW
1100 { 1085 {
1101 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1102 } 1087 }
1103 1088
1104#if TRANSPARENT 1089#if TRANSPARENT || ENABLE_PERL
1105 void rootwin_cb (XEvent &xev); 1090 void rootwin_cb (XEvent &xev);
1106 xevent_watcher rootwin_ev; 1091 xevent_watcher rootwin_ev;
1107#endif 1092#endif
1108 1093
1109 void x_cb (XEvent &xev); 1094 void x_cb (XEvent &xev);
… …
1171 bool pty_fill (); 1156 bool pty_fill ();
1172 1157
1173 void make_current () const // make this the "currently active" urxvt instance 1158 void make_current () const // make this the "currently active" urxvt instance
1174 { 1159 {
1175 SET_R (this); 1160 SET_R (this);
1161 set_environ (envv);
1176 rxvt_set_locale (locale); 1162 rxvt_set_locale (locale);
1177 set_environ (envv);
1178 } 1163 }
1179 1164
1180 void init_secondary (); 1165 void init_secondary ();
1181 const char **init_resources (int argc, const char *const *argv); 1166 const char **init_resources (int argc, const char *const *argv);
1182 const char *x_resource (const char *name); 1167 const char *x_resource (const char *name);
… …
1300 { 1285 {
1301 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1302#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1303 if (r & RS_Bold 1288 if (r & RS_Bold
1304# if ENABLE_STYLES 1289# if ENABLE_STYLES
1305 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1306# endif 1291# endif
1307 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1308 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1309#endif 1294#endif
1310 return base; 1295 return base;
… …
1314 { 1299 {
1315 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1316#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1317 if (r & RS_Blink 1302 if (r & RS_Blink
1318# if ENABLE_STYLES 1303# if ENABLE_STYLES
1319 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1320# endif 1305# endif
1321 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1322 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1323#endif 1308#endif
1324 return base; 1309 return base;
1325 } 1310 }
1326 1311
1327 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1328 { 1313 {
1329 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1330 } 1315 }
1331 1316
1332 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1333 { 1318 {
1334 if (set) 1319 if (set)
1335 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1336 else 1321 else
1337 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1338 } 1323 }
1339 1324
1340 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1325 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; 1326 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; 1327 int scr_scroll_text (int row1, int row2, int count) NOTHROW;

Diff Legend

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