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.251 by root, Tue Jan 31 18:36:35 2006 UTC vs.
Revision 1.271 by root, Sat Jun 9 13:04:27 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
78#ifdef HAVE_AFTERIMAGE
79# include <afterimage.h>
80#undef min
81#undef max
88#ifdef XPM_BACKGROUND 82#elif defined(XPM_BACKGROUND)
89# ifdef XPM_INC_X11 83# ifdef XPM_INC_X11
90# include <X11/xpm.h> 84# include <X11/xpm.h>
91# else 85# else
92# include <xpm.h> 86# include <xpm.h>
93# endif 87# endif
… …
187#endif 181#endif
188 182
189#ifdef XPM_BACKGROUND 183#ifdef XPM_BACKGROUND
190typedef struct { 184typedef struct {
191 short w, h, x, y; 185 short w, h, x, y;
186 bool auto_resize ;
192 Pixmap pixmap; 187 Pixmap pixmap;
193} bgPixmap_t; 188} bgPixmap_t;
194#endif 189#endif
195 190
196/* 191/*
… …
519 * 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
520 * 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
521 */ 516 */
522 517
523enum colour_list { 518enum colour_list {
519 Color_none = -2,
520 Color_transparent = -1,
524 Color_fg = 0, 521 Color_fg = 0,
525 Color_bg, 522 Color_bg,
526 minCOLOR, /* 2 */ 523 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 524 Color_Black = minCOLOR,
528 Color_Red3, 525 Color_Red3,
… …
681 * MACRO DEFINES 678 * MACRO DEFINES
682 ***************************************************************************** 679 *****************************************************************************
683 */ 680 */
684#define dLocal(type,name) type const name = this->name 681#define dLocal(type,name) type const name = this->name
685 682
686// for speed reasons, we assume that all latin1 characters 683// for speed reasons, we assume that all codepoints 32 to 126 are
687// are single-width (the first unicode combining character 684// single-width.
688// is actually 0x300, but ascii is what matters most). 685#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
690 686
691/* convert pixel dimensions to row/column values. Everything as int32_t */ 687/* convert pixel dimensions to row/column values. Everything as int32_t */
692#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 688#define Pixel2Col(x) Pixel2Width((int32_t)(x))
693#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 689#define Pixel2Row(y) Pixel2Height((int32_t)(y))
694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 690#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
696#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 692#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
697#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 693#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
698#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 694#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
699#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 695#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
700 696
701#define OPTION(opt) (options & (opt))
702#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \
703 | Opt_jumpScroll | Opt_secondaryScreen \
704 | Opt_pastableTabs | Opt_intensityStyles)
705
706// for m >= -n, ensure remainder lies between 0..n-1 697// for m >= -n, ensure remainder lies between 0..n-1
707#define MOD(m,n) (((m) + (n)) % (n)) 698#define MOD(m,n) (((m) + (n)) % (n))
708 699
709#define LINENO(n) MOD (term_start + int(n), total_rows) 700#define LINENO(n) MOD (term_start + int(n), total_rows)
710#define ROW(n) row_buf [LINENO (n)] 701#define ROW(n) row_buf [LINENO (n)]
… …
773# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 764# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
774#else 765#else
775# define XPMClearArea(a, b, c, d, e, f, g) 766# define XPMClearArea(a, b, c, d, e, f, g)
776#endif 767#endif
777 768
778typedef callback1<void, const char *> log_callback; 769typedef callback<void (const char *)> log_callback;
779typedef callback1<int, int> getfd_callback; 770typedef callback<int (int)> getfd_callback;
780 771
781#define SET_LOCALE(locale) rxvt_set_locale (locale) 772#define SET_LOCALE(locale) rxvt_set_locale (locale)
782extern bool rxvt_set_locale (const char *locale) NOTHROW; 773extern bool rxvt_set_locale (const char *locale) NOTHROW;
783extern void rxvt_push_locale (const char *locale) NOTHROW; 774extern void rxvt_push_locale (const char *locale) NOTHROW;
784extern void rxvt_pop_locale () NOTHROW; 775extern void rxvt_pop_locale () NOTHROW;
… …
786/****************************************************************************/ 777/****************************************************************************/
787 778
788#define LINE_LONGER 0x0001 // line is continued on the next row 779#define LINE_LONGER 0x0001 // line is continued on the next row
789#define LINE_FILTERED 0x0002 // line has been filtered 780#define LINE_FILTERED 0x0002 // line has been filtered
790#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)
791 784
792struct line_t { 785struct line_t {
793 text_t *t; // terminal the text 786 text_t *t; // terminal the text
794 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
795 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
… …
888#endif 881#endif
889 882
890/****************************************************************************/ 883/****************************************************************************/
891 884
892#ifdef KEYSYM_RESOURCE 885#ifdef KEYSYM_RESOURCE
893 class keyboard_manager; 886class keyboard_manager;
894#endif 887#endif
895 888
896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 889struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
890
891 // special markers with magic addresses
892 static const char resval_undef []; // options specifically unset
893 static const char resval_on []; // boolean options switched on
894 static const char resval_off []; // or off
895
897 log_callback *log_hook; // log error messages through this hook, if != 0 896 log_callback *log_hook; // log error messages through this hook, if != 0
898 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 897 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
899#if ENABLE_PERL 898#if ENABLE_PERL
900 rxvt_perl_term perl; 899 rxvt_perl_term perl;
901#endif 900#endif
902 struct mbstate mbstate; // current input multibyte state 901 struct mbstate mbstate; // current input multibyte state
903 902
904 unsigned char want_refresh:1, 903 unsigned char want_refresh:1,
905#ifdef TRANSPARENT 904#ifdef TRANSPARENT
906 want_full_refresh:1, /* awaiting full screen refresh */ 905 want_full_refresh:1, /* awaiting full screen refresh */
907#endif
908#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
909 am_transparent:1, /* is a transparent term */ 906 am_transparent:1, /* is a transparent term */
910 am_pixmap_trans:1, /* transparency w/known root pixmap */ 907 am_pixmap_trans:1, /* transparency w/known root pixmap */
911#endif 908#endif
912 current_screen:1, /* primary or secondary */ 909 current_screen:1, /* primary or secondary */
913 num_scr_allow:1, 910 num_scr_allow:1,
… …
1024 XComposeStatus compose; 1021 XComposeStatus compose;
1025 ttymode_t tio; 1022 ttymode_t tio;
1026 row_col_t oldcursor; 1023 row_col_t oldcursor;
1027#ifdef XPM_BACKGROUND 1024#ifdef XPM_BACKGROUND
1028 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
1029 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1031 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
1032#endif
1030#endif 1033#endif
1031 1034
1032#if ENABLE_OVERLAY 1035#if ENABLE_OVERLAY
1033 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions 1036 int ov_x, ov_y, ov_w, ov_h; // overlay dimensions
1034 text_t **ov_text; 1037 text_t **ov_text;
… …
1089 1092
1090 long vt_emask, vt_emask_perl, vt_emask_xim; 1093 long vt_emask, vt_emask_perl, vt_emask_xim;
1091 1094
1092 void vt_select_input () const NOTHROW 1095 void vt_select_input () const NOTHROW
1093 { 1096 {
1094 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1097 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1095 } 1098 }
1096 1099
1097#if TRANSPARENT 1100#if TRANSPARENT || ENABLE_PERL
1098 void rootwin_cb (XEvent &xev); 1101 void rootwin_cb (XEvent &xev);
1099 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;
1100#endif 1105#endif
1101 1106
1102 void x_cb (XEvent &xev); 1107 void x_cb (XEvent &xev);
1103 void flush (); 1108 void flush ();
1104 xevent_watcher termwin_ev; 1109 xevent_watcher termwin_ev;
… …
1164 bool pty_fill (); 1169 bool pty_fill ();
1165 1170
1166 void make_current () const // make this the "currently active" urxvt instance 1171 void make_current () const // make this the "currently active" urxvt instance
1167 { 1172 {
1168 SET_R (this); 1173 SET_R (this);
1174 set_environ (envv);
1169 rxvt_set_locale (locale); 1175 rxvt_set_locale (locale);
1170 set_environ (envv);
1171 } 1176 }
1172 1177
1173 void init_secondary (); 1178 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv); 1179 const char **init_resources (int argc, const char *const *argv);
1175 const char *x_resource (const char *name); 1180 const char *x_resource (const char *name);
… …
1200 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1201 1206
1202 bool IMisRunning (); 1207 bool IMisRunning ();
1203 void IMSendSpot (); 1208 void IMSendSpot ();
1204 bool IM_get_IC (const char *modifiers); 1209 bool IM_get_IC (const char *modifiers);
1205 void IMSetStatusPosition (); 1210 void IMSetPosition ();
1206#endif 1211#endif
1207 1212
1208 void resize_scrollbar (); 1213 void resize_scrollbar ();
1209 1214
1210 // command.C 1215 // command.C
1211 void lookup_key (XKeyEvent &ev); 1216 void key_press (XKeyEvent &ev);
1217 void key_release (XKeyEvent &ev);
1212 unsigned int cmd_write (const char *str, unsigned int count); 1218 unsigned int cmd_write (const char *str, unsigned int count);
1213 1219
1214 wchar_t next_char () NOTHROW; 1220 wchar_t next_char () NOTHROW;
1215 wchar_t cmd_getc () THROW ((class out_of_input)); 1221 wchar_t cmd_getc () THROW ((class out_of_input));
1216 uint32_t next_octet () NOTHROW; 1222 uint32_t next_octet () NOTHROW;
… …
1220 void mouse_report (XButtonEvent &ev); 1226 void mouse_report (XButtonEvent &ev);
1221 void button_press (XButtonEvent &ev); 1227 void button_press (XButtonEvent &ev);
1222 void button_release (XButtonEvent &ev); 1228 void button_release (XButtonEvent &ev);
1223 void focus_in (); 1229 void focus_in ();
1224 void focus_out (); 1230 void focus_out ();
1231 void update_fade_color (unsigned int idx);
1225 int check_our_parents (); 1232 int check_our_parents ();
1226#ifdef PRINTPIPE 1233#ifdef PRINTPIPE
1227 FILE *popen_printer (); 1234 FILE *popen_printer ();
1228 int pclose_printer (FILE *stream); 1235 int pclose_printer (FILE *stream);
1229#endif 1236#endif
… …
1252 void set_title (const char *str); 1259 void set_title (const char *str);
1253 void set_icon_name (const char *str); 1260 void set_icon_name (const char *str);
1254 void set_window_color (int idx, const char *color); 1261 void set_window_color (int idx, const char *color);
1255 void set_colorfgbg (); 1262 void set_colorfgbg ();
1256 bool set_color (rxvt_color &color, const char *name); 1263 bool set_color (rxvt_color &color, const char *name);
1264 void alias_color (int dst, int src);
1257 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1265 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1258 1266
1259 // screen.C 1267 // screen.C
1260 1268
1261 void lalloc (line_t &l) const 1269 void lalloc (line_t &l) const
… …
1290 { 1298 {
1291 int base = GET_BASEFG (r); 1299 int base = GET_BASEFG (r);
1292#ifndef NO_BRIGHTCOLOR 1300#ifndef NO_BRIGHTCOLOR
1293 if (r & RS_Bold 1301 if (r & RS_Bold
1294# if ENABLE_STYLES 1302# if ENABLE_STYLES
1295 && OPTION (Opt_intensityStyles) 1303 && option (Opt_intensityStyles)
1296# endif 1304# endif
1297 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1305 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1298 base += minBrightCOLOR - minCOLOR; 1306 base += minBrightCOLOR - minCOLOR;
1299#endif 1307#endif
1300 return base; 1308 return base;
… …
1304 { 1312 {
1305 int base = GET_BASEBG (r); 1313 int base = GET_BASEBG (r);
1306#ifndef NO_BRIGHTCOLOR 1314#ifndef NO_BRIGHTCOLOR
1307 if (r & RS_Blink 1315 if (r & RS_Blink
1308# if ENABLE_STYLES 1316# if ENABLE_STYLES
1309 && OPTION (Opt_intensityStyles) 1317 && option (Opt_intensityStyles)
1310# endif 1318# endif
1311 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1319 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1312 base += minBrightCOLOR - minCOLOR; 1320 base += minBrightCOLOR - minCOLOR;
1313#endif 1321#endif
1314 return base; 1322 return base;
1315 } 1323 }
1316 1324
1317 bool option (uint32_t opt) const NOTHROW 1325 bool option (uint8_t opt) const NOTHROW
1318 { 1326 {
1319 return OPTION (opt); 1327 return options[opt >> 3] & (1 << (opt & 7));
1320 } 1328 }
1321 1329
1322 void set_option (uint32_t opt, bool set) NOTHROW 1330 void set_option (uint8_t opt, bool set = true) NOTHROW
1323 { 1331 {
1324 if (set) 1332 if (set)
1325 options |= opt; 1333 options[opt >> 3] |= (1 << (opt & 7));
1326 else 1334 else
1327 options &= ~opt; 1335 options[opt >> 3] &= ~(1 << (opt & 7));
1328 } 1336 }
1329 1337
1330 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;
1331 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;
1332 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