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.253 by root, Wed Feb 1 21:15:33 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,
… …
681 * MACRO DEFINES 673 * MACRO DEFINES
682 ***************************************************************************** 674 *****************************************************************************
683 */ 675 */
684#define dLocal(type,name) type const name = this->name 676#define dLocal(type,name) type const name = this->name
685 677
686// for speed reasons, we assume that all latin1 characters 678// for speed reasons, we assume that all codepoints 32 to 126 are
687// are single-width (the first unicode combining character 679// single-width.
688// is actually 0x300, but ascii is what matters most). 680#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
690 681
691/* convert pixel dimensions to row/column values. Everything as int32_t */ 682/* convert pixel dimensions to row/column values. Everything as int32_t */
692#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 683#define Pixel2Col(x) Pixel2Width((int32_t)(x))
693#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 684#define Pixel2Row(y) Pixel2Height((int32_t)(y))
694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 685#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
696#define Col2Pixel(col) ((int32_t)Width2Pixel(col)) 687#define Col2Pixel(col) ((int32_t)Width2Pixel(col))
697#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 688#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
698#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 689#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
699#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 690#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
700 691
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 692// for m >= -n, ensure remainder lies between 0..n-1
707#define MOD(m,n) (((m) + (n)) % (n)) 693#define MOD(m,n) (((m) + (n)) % (n))
708 694
709#define LINENO(n) MOD (term_start + int(n), total_rows) 695#define LINENO(n) MOD (term_start + int(n), total_rows)
710#define ROW(n) row_buf [LINENO (n)] 696#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)) 759# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
774#else 760#else
775# define XPMClearArea(a, b, c, d, e, f, g) 761# define XPMClearArea(a, b, c, d, e, f, g)
776#endif 762#endif
777 763
778typedef callback1<void, const char *> log_callback; 764typedef callback<void (const char *)> log_callback;
779typedef callback1<int, int> getfd_callback; 765typedef callback<int (int)> getfd_callback;
780 766
781#define SET_LOCALE(locale) rxvt_set_locale (locale) 767#define SET_LOCALE(locale) rxvt_set_locale (locale)
782extern bool rxvt_set_locale (const char *locale) NOTHROW; 768extern bool rxvt_set_locale (const char *locale) NOTHROW;
783extern void rxvt_push_locale (const char *locale) NOTHROW; 769extern void rxvt_push_locale (const char *locale) NOTHROW;
784extern void rxvt_pop_locale () NOTHROW; 770extern void rxvt_pop_locale () NOTHROW;
… …
786/****************************************************************************/ 772/****************************************************************************/
787 773
788#define LINE_LONGER 0x0001 // line is continued on the next row 774#define LINE_LONGER 0x0001 // line is continued on the next row
789#define LINE_FILTERED 0x0002 // line has been filtered 775#define LINE_FILTERED 0x0002 // line has been filtered
790#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)
791 779
792struct line_t { 780struct line_t {
793 text_t *t; // terminal the text 781 text_t *t; // terminal the text
794 rend_t *r; // rendition, uses RS_ flags 782 rend_t *r; // rendition, uses RS_ flags
795 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
… …
908 struct mbstate mbstate; // current input multibyte state 896 struct mbstate mbstate; // current input multibyte state
909 897
910 unsigned char want_refresh:1, 898 unsigned char want_refresh:1,
911#ifdef TRANSPARENT 899#ifdef TRANSPARENT
912 want_full_refresh:1, /* awaiting full screen refresh */ 900 want_full_refresh:1, /* awaiting full screen refresh */
913#endif
914#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
915 am_transparent:1, /* is a transparent term */ 901 am_transparent:1, /* is a transparent term */
916 am_pixmap_trans:1, /* transparency w/known root pixmap */ 902 am_pixmap_trans:1, /* transparency w/known root pixmap */
917#endif 903#endif
918 current_screen:1, /* primary or secondary */ 904 current_screen:1, /* primary or secondary */
919 num_scr_allow:1, 905 num_scr_allow:1,
… …
1095 1081
1096 long vt_emask, vt_emask_perl, vt_emask_xim; 1082 long vt_emask, vt_emask_perl, vt_emask_xim;
1097 1083
1098 void vt_select_input () const NOTHROW 1084 void vt_select_input () const NOTHROW
1099 { 1085 {
1100 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1086 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1101 } 1087 }
1102 1088
1103#if TRANSPARENT 1089#if TRANSPARENT || ENABLE_PERL
1104 void rootwin_cb (XEvent &xev); 1090 void rootwin_cb (XEvent &xev);
1105 xevent_watcher rootwin_ev; 1091 xevent_watcher rootwin_ev;
1106#endif 1092#endif
1107 1093
1108 void x_cb (XEvent &xev); 1094 void x_cb (XEvent &xev);
… …
1170 bool pty_fill (); 1156 bool pty_fill ();
1171 1157
1172 void make_current () const // make this the "currently active" urxvt instance 1158 void make_current () const // make this the "currently active" urxvt instance
1173 { 1159 {
1174 SET_R (this); 1160 SET_R (this);
1161 set_environ (envv);
1175 rxvt_set_locale (locale); 1162 rxvt_set_locale (locale);
1176 set_environ (envv);
1177 } 1163 }
1178 1164
1179 void init_secondary (); 1165 void init_secondary ();
1180 const char **init_resources (int argc, const char *const *argv); 1166 const char **init_resources (int argc, const char *const *argv);
1181 const char *x_resource (const char *name); 1167 const char *x_resource (const char *name);
… …
1206 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);
1207 1193
1208 bool IMisRunning (); 1194 bool IMisRunning ();
1209 void IMSendSpot (); 1195 void IMSendSpot ();
1210 bool IM_get_IC (const char *modifiers); 1196 bool IM_get_IC (const char *modifiers);
1211 void IMSetStatusPosition (); 1197 void IMSetPosition ();
1212#endif 1198#endif
1213 1199
1214 void resize_scrollbar (); 1200 void resize_scrollbar ();
1215 1201
1216 // command.C 1202 // command.C
1217 void lookup_key (XKeyEvent &ev); 1203 void key_press (XKeyEvent &ev);
1204 void key_release (XKeyEvent &ev);
1218 unsigned int cmd_write (const char *str, unsigned int count); 1205 unsigned int cmd_write (const char *str, unsigned int count);
1219 1206
1220 wchar_t next_char () NOTHROW; 1207 wchar_t next_char () NOTHROW;
1221 wchar_t cmd_getc () THROW ((class out_of_input)); 1208 wchar_t cmd_getc () THROW ((class out_of_input));
1222 uint32_t next_octet () NOTHROW; 1209 uint32_t next_octet () NOTHROW;
… …
1226 void mouse_report (XButtonEvent &ev); 1213 void mouse_report (XButtonEvent &ev);
1227 void button_press (XButtonEvent &ev); 1214 void button_press (XButtonEvent &ev);
1228 void button_release (XButtonEvent &ev); 1215 void button_release (XButtonEvent &ev);
1229 void focus_in (); 1216 void focus_in ();
1230 void focus_out (); 1217 void focus_out ();
1218 void update_fade_color (unsigned int idx);
1231 int check_our_parents (); 1219 int check_our_parents ();
1232#ifdef PRINTPIPE 1220#ifdef PRINTPIPE
1233 FILE *popen_printer (); 1221 FILE *popen_printer ();
1234 int pclose_printer (FILE *stream); 1222 int pclose_printer (FILE *stream);
1235#endif 1223#endif
… …
1297 { 1285 {
1298 int base = GET_BASEFG (r); 1286 int base = GET_BASEFG (r);
1299#ifndef NO_BRIGHTCOLOR 1287#ifndef NO_BRIGHTCOLOR
1300 if (r & RS_Bold 1288 if (r & RS_Bold
1301# if ENABLE_STYLES 1289# if ENABLE_STYLES
1302 && OPTION (Opt_intensityStyles) 1290 && option (Opt_intensityStyles)
1303# endif 1291# endif
1304 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1292 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1305 base += minBrightCOLOR - minCOLOR; 1293 base += minBrightCOLOR - minCOLOR;
1306#endif 1294#endif
1307 return base; 1295 return base;
… …
1311 { 1299 {
1312 int base = GET_BASEBG (r); 1300 int base = GET_BASEBG (r);
1313#ifndef NO_BRIGHTCOLOR 1301#ifndef NO_BRIGHTCOLOR
1314 if (r & RS_Blink 1302 if (r & RS_Blink
1315# if ENABLE_STYLES 1303# if ENABLE_STYLES
1316 && OPTION (Opt_intensityStyles) 1304 && option (Opt_intensityStyles)
1317# endif 1305# endif
1318 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1306 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
1319 base += minBrightCOLOR - minCOLOR; 1307 base += minBrightCOLOR - minCOLOR;
1320#endif 1308#endif
1321 return base; 1309 return base;
1322 } 1310 }
1323 1311
1324 bool option (uint32_t opt) const NOTHROW 1312 bool option (uint8_t opt) const NOTHROW
1325 { 1313 {
1326 return OPTION (opt); 1314 return options[opt >> 3] & (1 << (opt & 7));
1327 } 1315 }
1328 1316
1329 void set_option (uint32_t opt, bool set) NOTHROW 1317 void set_option (uint8_t opt, bool set = true) NOTHROW
1330 { 1318 {
1331 if (set) 1319 if (set)
1332 options |= opt; 1320 options[opt >> 3] |= (1 << (opt & 7));
1333 else 1321 else
1334 options &= ~opt; 1322 options[opt >> 3] &= ~(1 << (opt & 7));
1335 } 1323 }
1336 1324
1337 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;
1338 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;
1339 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