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.247 by root, Mon Jan 30 04:27:17 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>
… …
32#if ENABLE_FRILLS 33#if ENABLE_FRILLS
33# include <X11/Xmd.h> 34# include <X11/Xmd.h>
34#endif 35#endif
35 36
36#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
37#include "rxvtfont.h" 39#include "rxvtfont.h"
38#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
39#include "iom.h" 41#include "iom.h"
40#include "salloc.h" 42#include "salloc.h"
41#include "libptytty.h" 43#include "libptytty.h"
… …
68 70
69#ifndef HAVE_XPOINTER 71#ifndef HAVE_XPOINTER
70typedef char *XPointer; 72typedef char *XPointer;
71#endif 73#endif
72 74
73#ifdef HAVE_TERMIOS_H
74# include <termios.h> 75#include <termios.h>
75typedef struct termios ttymode_t; 76typedef struct termios ttymode_t;
76#else
77# include <sgtty.h>
78typedef struct {
79 struct sgttyb sg;
80 struct tchars tc;
81 struct ltchars lc;
82 int line;
83 int local;
84} ttymode_t;
85#endif
86 77
87#ifdef XPM_BACKGROUND 78#ifdef XPM_BACKGROUND
88# ifdef XPM_INC_X11 79# ifdef XPM_INC_X11
89# include <X11/xpm.h> 80# include <X11/xpm.h>
90# else 81# else
… …
97# define STDOUT_FILENO 1 88# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 89# define STDERR_FILENO 2
99#endif 90#endif
100 91
101/****************************************************************************/ 92/****************************************************************************/
102
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123 93
124// exception thrown on fatal (per-instance) errors 94// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 95class rxvt_failure_exception { };
126 96
127// exception thrown when the command parser runs out of input data 97// exception thrown when the command parser runs out of input data
… …
539 * 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
540 * 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
541 */ 511 */
542 512
543enum colour_list { 513enum colour_list {
514 Color_none = -2,
515 Color_transparent = -1,
544 Color_fg = 0, 516 Color_fg = 0,
545 Color_bg, 517 Color_bg,
546 minCOLOR, /* 2 */ 518 minCOLOR, /* 2 */
547 Color_Black = minCOLOR, 519 Color_Black = minCOLOR,
548 Color_Red3, 520 Color_Red3,
… …
607 TOTAL_COLORS = NRS_COLORS 579 TOTAL_COLORS = NRS_COLORS
608#endif 580#endif
609}; 581};
610 582
611#define Color_Bits 7 // 0 .. maxTermCOLOR 583#define Color_Bits 7 // 0 .. maxTermCOLOR
612
613#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
614#define NPIXCLR_BITS 32
615 584
616/* 585/*
617 * Resource list 586 * Resource list
618 */ 587 */
619enum { 588enum {
… …
704 * MACRO DEFINES 673 * MACRO DEFINES
705 ***************************************************************************** 674 *****************************************************************************
706 */ 675 */
707#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
708 677
709// for speed reasons, we assume that all latin1 characters 678// for speed reasons, we assume that all codepoints 32 to 126 are
710// are single-width (the first unicode combining character 679// single-width.
711// is actually 0x300, but ascii is what matters most). 680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
712#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
713 681
714/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
715#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
716#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
717#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
719#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
720#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
721#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
722#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
723 691
724#define OPTION(opt) (options & (opt))
725#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
726 | Opt_jumpScroll | Opt_secondaryScreen \
727 | Opt_pastableTabs | Opt_intensityStyles)
728
729// for m >= -n, ensure remainder lies between 0..n-1 692// for m >= -n, ensure remainder lies between 0..n-1
730#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
731 694
732#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
733#define ROW(n) row_buf [LINENO (n)] 696#define ROW(n) row_buf [LINENO (n)]
… …
751#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 714#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
752#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 715#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
753 716
754#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 717#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
755 718
756#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 719#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
757#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 720#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
758 721
759#if ENABLE_STYLES 722#if ENABLE_STYLES
760# define FONTSET(style) fontset[GET_STYLE (style)] 723# define FONTSET(style) fontset[GET_STYLE (style)]
761#else 724#else
762# define FONTSET(style) fontset[0] 725# define FONTSET(style) fontset[0]
… …
796# 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))
797#else 760#else
798# define XPMClearArea(a, b, c, d, e, f, g) 761# define XPMClearArea(a, b, c, d, e, f, g)
799#endif 762#endif
800 763
801typedef callback1<void, const char *> log_callback; 764typedef callback<void (const char *)> log_callback;
802typedef callback1<int, int> getfd_callback; 765typedef callback<int (int)> getfd_callback;
803 766
804#define SET_LOCALE(locale) rxvt_set_locale (locale) 767#define SET_LOCALE(locale) rxvt_set_locale (locale)
805extern bool rxvt_set_locale (const char *locale) NOTHROW; 768extern bool rxvt_set_locale (const char *locale) NOTHROW;
806extern void rxvt_push_locale (const char *locale) NOTHROW; 769extern void rxvt_push_locale (const char *locale) NOTHROW;
807extern void rxvt_pop_locale () NOTHROW; 770extern void rxvt_pop_locale () NOTHROW;
… …
809/****************************************************************************/ 772/****************************************************************************/
810 773
811#define LINE_LONGER 0x0001 // line is continued on the next row 774#define LINE_LONGER 0x0001 // line is continued on the next row
812#define LINE_FILTERED 0x0002 // line has been filtered 775#define LINE_FILTERED 0x0002 // line has been filtered
813#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)
814 779
815struct line_t { 780struct line_t {
816 text_t *t; // terminal the text 781 text_t *t; // terminal the text
817 rend_t *r; // rendition, uses RS_ flags 782 rend_t *r; // rendition, uses RS_ flags
818 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
… …
872# define COMPOSE_LO 0x40000000UL 837# define COMPOSE_LO 0x40000000UL
873# define COMPOSE_HI 0x400fffffUL 838# define COMPOSE_HI 0x400fffffUL
874# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 839# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
875#else 840#else
876# if ENABLE_PERL 841# if ENABLE_PERL
877# 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
878# 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
879# else 844# else
880# define COMPOSE_LO 0xd800UL 845# define COMPOSE_LO 0xd800UL
881# define COMPOSE_HI 0xf8ffUL 846# define COMPOSE_HI 0xf8ffUL
882# endif 847# endif
… …
911#endif 876#endif
912 877
913/****************************************************************************/ 878/****************************************************************************/
914 879
915#ifdef KEYSYM_RESOURCE 880#ifdef KEYSYM_RESOURCE
916 class keyboard_manager; 881class keyboard_manager;
917#endif 882#endif
918 883
919struct 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
920 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
921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 892 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
922#if ENABLE_PERL 893#if ENABLE_PERL
923 rxvt_perl_term perl; 894 rxvt_perl_term perl;
924#endif 895#endif
925 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
926 897
927 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
928#ifdef TRANSPARENT 899#ifdef TRANSPARENT
929 want_full_refresh:1, /* awaiting full screen refresh */ 900 want_full_refresh:1, /* awaiting full screen refresh */
930#endif
931#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
932 am_transparent:1, /* is a transparent term */ 901 am_transparent:1, /* is a transparent term */
933 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
934#endif 903#endif
935 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
936 num_scr_allow:1, 905 num_scr_allow:1,
… …
964 int num_scr; /* screen: number lines scrolled */ 933 int num_scr; /* screen: number lines scrolled */
965 int prev_ncol, /* screen: previous number of columns */ 934 int prev_ncol, /* screen: previous number of columns */
966 prev_nrow; /* screen: previous number of rows */ 935 prev_nrow; /* screen: previous number of rows */
967/* ---------- */ 936/* ---------- */
968 rend_t rstyle; 937 rend_t rstyle;
969/* ---------- */
970 uint32_t pixcolor_set[NPIXCLR_SETS];
971/* ---------- */ 938/* ---------- */
972#ifdef SELECTION_SCROLLING 939#ifdef SELECTION_SCROLLING
973 int scroll_selection_lines; 940 int scroll_selection_lines;
974 enum page_dirn scroll_selection_dir; 941 enum page_dirn scroll_selection_dir;
975 int selection_save_x, 942 int selection_save_x,
… …
1114 1081
1115 long vt_emask, vt_emask_perl, vt_emask_xim; 1082 long vt_emask, vt_emask_perl, vt_emask_xim;
1116 1083
1117 void vt_select_input () const NOTHROW 1084 void vt_select_input () const NOTHROW
1118 { 1085 {
1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1120 } 1087 }
1121 1088
1122#if TRANSPARENT 1089#if TRANSPARENT || ENABLE_PERL
1123 void rootwin_cb (XEvent &xev); 1090 void rootwin_cb (XEvent &xev);
1124 xevent_watcher rootwin_ev; 1091 xevent_watcher rootwin_ev;
1125#endif 1092#endif
1126 1093
1127 void x_cb (XEvent &xev); 1094 void x_cb (XEvent &xev);
… …
1189 bool pty_fill (); 1156 bool pty_fill ();
1190 1157
1191 void make_current () const // make this the "currently active" urxvt instance 1158 void make_current () const // make this the "currently active" urxvt instance
1192 { 1159 {
1193 SET_R (this); 1160 SET_R (this);
1161 set_environ (envv);
1194 rxvt_set_locale (locale); 1162 rxvt_set_locale (locale);
1195 set_environ (envv);
1196 } 1163 }
1197 1164
1198 void init_secondary (); 1165 void init_secondary ();
1199 const char **init_resources (int argc, const char *const *argv); 1166 const char **init_resources (int argc, const char *const *argv);
1200 const char *x_resource (const char *name); 1167 const char *x_resource (const char *name);
… …
1225 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);
1226 1193
1227 bool IMisRunning (); 1194 bool IMisRunning ();
1228 void IMSendSpot (); 1195 void IMSendSpot ();
1229 bool IM_get_IC (const char *modifiers); 1196 bool IM_get_IC (const char *modifiers);
1230 void IMSetStatusPosition (); 1197 void IMSetPosition ();
1231#endif 1198#endif
1232 1199
1233 void resize_scrollbar (); 1200 void resize_scrollbar ();
1234 1201
1235 // command.C 1202 // command.C
1236 void lookup_key (XKeyEvent &ev); 1203 void key_press (XKeyEvent &ev);
1204 void key_release (XKeyEvent &ev);
1237 unsigned int cmd_write (const char *str, unsigned int count); 1205 unsigned int cmd_write (const char *str, unsigned int count);
1238 1206
1239 wchar_t next_char () NOTHROW; 1207 wchar_t next_char () NOTHROW;
1240 wchar_t cmd_getc () THROW ((class out_of_input)); 1208 wchar_t cmd_getc () THROW ((class out_of_input));
1241 uint32_t next_octet () NOTHROW; 1209 uint32_t next_octet () NOTHROW;
… …
1245 void mouse_report (XButtonEvent &ev); 1213 void mouse_report (XButtonEvent &ev);
1246 void button_press (XButtonEvent &ev); 1214 void button_press (XButtonEvent &ev);
1247 void button_release (XButtonEvent &ev); 1215 void button_release (XButtonEvent &ev);
1248 void focus_in (); 1216 void focus_in ();
1249 void focus_out (); 1217 void focus_out ();
1218 void update_fade_color (unsigned int idx);
1250 int check_our_parents (); 1219 int check_our_parents ();
1251#ifdef PRINTPIPE 1220#ifdef PRINTPIPE
1252 FILE *popen_printer (); 1221 FILE *popen_printer ();
1253 int pclose_printer (FILE *stream); 1222 int pclose_printer (FILE *stream);
1254#endif 1223#endif
… …
1276 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);
1277 void set_title (const char *str); 1246 void set_title (const char *str);
1278 void set_icon_name (const char *str); 1247 void set_icon_name (const char *str);
1279 void set_window_color (int idx, const char *color); 1248 void set_window_color (int idx, const char *color);
1280 void set_colorfgbg (); 1249 void set_colorfgbg ();
1281 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);
1282 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1252 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1283 1253
1284 // screen.C 1254 // screen.C
1285 1255
1286 void lalloc (line_t &l) const 1256 void lalloc (line_t &l) const
… …
1315 { 1285 {
1316 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1317#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1318 if (r & RS_Bold 1288 if (r & RS_Bold
1319# if ENABLE_STYLES 1289# if ENABLE_STYLES
1320 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1321# endif 1291# endif
1322 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1323 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1324#endif 1294#endif
1325 return base; 1295 return base;
… …
1329 { 1299 {
1330 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1331#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1332 if (r & RS_Blink 1302 if (r & RS_Blink
1333# if ENABLE_STYLES 1303# if ENABLE_STYLES
1334 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1335# endif 1305# endif
1336 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1337 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1338#endif 1308#endif
1339 return base; 1309 return base;
1340 } 1310 }
1341 1311
1342 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1343 { 1313 {
1344 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1345 } 1315 }
1346 1316
1347 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1348 { 1318 {
1349 if (set) 1319 if (set)
1350 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1351 else 1321 else
1352 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1353 } 1323 }
1354 1324
1355 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;
1356 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;
1357 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