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.248 by root, Mon Jan 30 16:12:58 2006 UTC vs.
Revision 1.269 by root, Tue May 1 21:30:01 2007 UTC

… …
8#if defined (ISO_14755) || defined (ENABLE_PERL) 8#if defined (ISO_14755) || defined (ENABLE_PERL)
9# define ENABLE_OVERLAY 1 9# define ENABLE_OVERLAY 1
10#endif 10#endif
11 11
12#if ENABLE_PERL 12#if ENABLE_PERL
13# define ENABLE_FRILLS 1 13# define ENABLE_FRILLS 1
14# define ENABLE_COMBINING 1 14# define ENABLE_COMBINING 1
15#endif 15#endif
16 16
17#if ENABLE_FRILLS 17#if ENABLE_FRILLS
18# define ENABLE_XEMBED 1 18# define ENABLE_XEMBED 1
19# define ENABLE_EWMH 1 19# define ENABLE_EWMH 1
20# define ENABLE_XIM_ONTHESPOT 1 20# define ENABLE_XIM_ONTHESPOT 1
21# define CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
22#else 23#else
23# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
24#endif 25#endif
25 26
26#include <limits.h> 27#include <limits.h>
… …
69 70
70#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
71typedef char *XPointer; 72typedef char *XPointer;
72#endif 73#endif
73 74
74#ifdef HAVE_TERMIOS_H
75# include <termios.h> 75#include <termios.h>
76typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
77#else
78# include <sgtty.h>
79typedef struct {
80 struct sgttyb sg;
81 struct tchars tc;
82 struct ltchars lc;
83 int line;
84 int local;
85} ttymode_t;
86#endif
87 77
88#ifdef XPM_BACKGROUND 78#ifdef XPM_BACKGROUND
89# ifdef XPM_INC_X11 79# ifdef XPM_INC_X11
90# include <X11/xpm.h> 80# include <X11/xpm.h>
91# else 81# else
… …
519 * 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
520 * 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
521 */ 511 */
522 512
523enum colour_list { 513enum colour_list {
514 Color_none = -2,
515 Color_transparent = -1,
524 Color_fg = 0, 516 Color_fg = 0,
525 Color_bg, 517 Color_bg,
526 minCOLOR, /* 2 */ 518 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 519 Color_Black = minCOLOR,
528 Color_Red3, 520 Color_Red3,
… …
587 TOTAL_COLORS = NRS_COLORS 579 TOTAL_COLORS = NRS_COLORS
588#endif 580#endif
589}; 581};
590 582
591#define Color_Bits 7 // 0 .. maxTermCOLOR 583#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 584
596/* 585/*
597 * Resource list 586 * Resource list
598 */ 587 */
599enum { 588enum {
… …
684 * MACRO DEFINES 673 * MACRO DEFINES
685 ***************************************************************************** 674 *****************************************************************************
686 */ 675 */
687#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
688 677
689// for speed reasons, we assume that all latin1 characters 678// for speed reasons, we assume that all codepoints 32 to 126 are
690// are single-width (the first unicode combining character 679// single-width.
691// is actually 0x300, but ascii is what matters most). 680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
692#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
693 681
694/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
695#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
696#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
697#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
699#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
700#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
701#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
702#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
703 691
704#define OPTION(opt) (options & (opt))
705#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
706 | Opt_jumpScroll | Opt_secondaryScreen \
707 | Opt_pastableTabs | Opt_intensityStyles)
708
709// for m >= -n, ensure remainder lies between 0..n-1 692// for m >= -n, ensure remainder lies between 0..n-1
710#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
711 694
712#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
713#define ROW(n) row_buf [LINENO (n)] 696#define ROW(n) row_buf [LINENO (n)]
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 714#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 715#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 716
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 717#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 718
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 719#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 720#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 721
739#if ENABLE_STYLES 722#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 723# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 724#else
742# define FONTSET(style) fontset[0] 725# define FONTSET(style) fontset[0]
… …
776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 759# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
777#else 760#else
778# define XPMClearArea(a, b, c, d, e, f, g) 761# define XPMClearArea(a, b, c, d, e, f, g)
779#endif 762#endif
780 763
781typedef callback1<void, const char *> log_callback; 764typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 765typedef callback<int (int)> getfd_callback;
783 766
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 767#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 768extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 769extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 770extern void rxvt_pop_locale () NOTHROW;
… …
789/****************************************************************************/ 772/****************************************************************************/
790 773
791#define LINE_LONGER 0x0001 // line is continued on the next row 774#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 775#define LINE_FILTERED 0x0002 // line has been filtered
793#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)
794 779
795struct line_t { 780struct line_t {
796 text_t *t; // terminal the text 781 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 782 rend_t *r; // rendition, uses RS_ flags
798 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
… …
852# define COMPOSE_LO 0x40000000UL 837# define COMPOSE_LO 0x40000000UL
853# define COMPOSE_HI 0x400fffffUL 838# define COMPOSE_HI 0x400fffffUL
854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 839# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
855#else 840#else
856# if ENABLE_PERL 841# if ENABLE_PERL
857# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 842# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
858# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 843# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
859# else 844# else
860# define COMPOSE_LO 0xd800UL 845# define COMPOSE_LO 0xd800UL
861# define COMPOSE_HI 0xf8ffUL 846# define COMPOSE_HI 0xf8ffUL
862# endif 847# endif
… …
891#endif 876#endif
892 877
893/****************************************************************************/ 878/****************************************************************************/
894 879
895#ifdef KEYSYM_RESOURCE 880#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 881class keyboard_manager;
897#endif 882#endif
898 883
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 884struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
885
886 // special markers with magic addresses
887 static const char resval_undef []; // options specifically unset
888 static const char resval_on []; // boolean options switched on
889 static const char resval_off []; // or off
890
900 log_callback *log_hook; // log error messages through this hook, if != 0 891 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 892 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 893#if ENABLE_PERL
903 rxvt_perl_term perl; 894 rxvt_perl_term perl;
904#endif 895#endif
905 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
906 897
907 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
908#ifdef TRANSPARENT 899#ifdef TRANSPARENT
909 want_full_refresh:1, /* awaiting full screen refresh */ 900 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 */ 901 am_transparent:1, /* is a transparent term */
913 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
914#endif 903#endif
915 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
916 num_scr_allow:1, 905 num_scr_allow:1,
… …
944 int num_scr; /* screen: number lines scrolled */ 933 int num_scr; /* screen: number lines scrolled */
945 int prev_ncol, /* screen: previous number of columns */ 934 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 935 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 936/* ---------- */
948 rend_t rstyle; 937 rend_t rstyle;
949/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */ 938/* ---------- */
952#ifdef SELECTION_SCROLLING 939#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 940 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 941 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 942 int selection_save_x,
… …
1094 1081
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1082 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1083
1097 void vt_select_input () const NOTHROW 1084 void vt_select_input () const NOTHROW
1098 { 1085 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1087 }
1101 1088
1102#if TRANSPARENT 1089#if TRANSPARENT || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1090 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1091 xevent_watcher rootwin_ev;
1105#endif 1092#endif
1106 1093
1107 void x_cb (XEvent &xev); 1094 void x_cb (XEvent &xev);
… …
1169 bool pty_fill (); 1156 bool pty_fill ();
1170 1157
1171 void make_current () const // make this the "currently active" urxvt instance 1158 void make_current () const // make this the "currently active" urxvt instance
1172 { 1159 {
1173 SET_R (this); 1160 SET_R (this);
1161 set_environ (envv);
1174 rxvt_set_locale (locale); 1162 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1163 }
1177 1164
1178 void init_secondary (); 1165 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1166 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name); 1167 const char *x_resource (const char *name);
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1192 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1193
1207 bool IMisRunning (); 1194 bool IMisRunning ();
1208 void IMSendSpot (); 1195 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1196 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1197 void IMSetPosition ();
1211#endif 1198#endif
1212 1199
1213 void resize_scrollbar (); 1200 void resize_scrollbar ();
1214 1201
1215 // command.C 1202 // command.C
1216 void lookup_key (XKeyEvent &ev); 1203 void key_press (XKeyEvent &ev);
1204 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1205 unsigned int cmd_write (const char *str, unsigned int count);
1218 1206
1219 wchar_t next_char () NOTHROW; 1207 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1208 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1209 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1213 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1214 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1215 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1216 void focus_in ();
1229 void focus_out (); 1217 void focus_out ();
1218 void update_fade_color (unsigned int idx);
1230 int check_our_parents (); 1219 int check_our_parents ();
1231#ifdef PRINTPIPE 1220#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1221 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1222 int pclose_printer (FILE *stream);
1234#endif 1223#endif
… …
1256 void set_utf8_property (Atom prop, const char *str, int len = -1); 1245 void set_utf8_property (Atom prop, const char *str, int len = -1);
1257 void set_title (const char *str); 1246 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1247 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1248 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1249 void set_colorfgbg ();
1261 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1250 bool set_color (rxvt_color &color, const char *name);
1251 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1252 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1263 1253
1264 // screen.C 1254 // screen.C
1265 1255
1266 void lalloc (line_t &l) const 1256 void lalloc (line_t &l) const
… …
1295 { 1285 {
1296 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1297#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1298 if (r & RS_Bold 1288 if (r & RS_Bold
1299# if ENABLE_STYLES 1289# if ENABLE_STYLES
1300 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1301# endif 1291# endif
1302 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1303 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1304#endif 1294#endif
1305 return base; 1295 return base;
… …
1309 { 1299 {
1310 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1311#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1312 if (r & RS_Blink 1302 if (r & RS_Blink
1313# if ENABLE_STYLES 1303# if ENABLE_STYLES
1314 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1315# endif 1305# endif
1316 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1317 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1318#endif 1308#endif
1319 return base; 1309 return base;
1320 } 1310 }
1321 1311
1322 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1323 { 1313 {
1324 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1325 } 1315 }
1326 1316
1327 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1328 { 1318 {
1329 if (set) 1319 if (set)
1330 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1331 else 1321 else
1332 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1333 } 1323 }
1334 1324
1335 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;
1336 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;
1337 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