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.263 by root, Thu Nov 2 17:23:50 2006 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>
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 520 * 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 521 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 522 */
522 523
523enum colour_list { 524enum colour_list {
525 Color_none = -2,
526 Color_transparent = -1,
524 Color_fg = 0, 527 Color_fg = 0,
525 Color_bg, 528 Color_bg,
526 minCOLOR, /* 2 */ 529 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 530 Color_Black = minCOLOR,
528 Color_Red3, 531 Color_Red3,
… …
587 TOTAL_COLORS = NRS_COLORS 590 TOTAL_COLORS = NRS_COLORS
588#endif 591#endif
589}; 592};
590 593
591#define Color_Bits 7 // 0 .. maxTermCOLOR 594#define Color_Bits 7 // 0 .. maxTermCOLOR
592
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595 595
596/* 596/*
597 * Resource list 597 * Resource list
598 */ 598 */
599enum { 599enum {
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 733
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 735
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 736#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 737#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 738
739#if ENABLE_STYLES 739#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 740# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 741#else
742# define FONTSET(style) fontset[0] 742# define FONTSET(style) fontset[0]
… …
776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
777#else 777#else
778# define XPMClearArea(a, b, c, d, e, f, g) 778# define XPMClearArea(a, b, c, d, e, f, g)
779#endif 779#endif
780 780
781typedef callback1<void, const char *> log_callback; 781typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 782typedef callback<int (int)> getfd_callback;
783 783
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 784#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 785extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 786extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 787extern void rxvt_pop_locale () NOTHROW;
… …
789/****************************************************************************/ 789/****************************************************************************/
790 790
791#define LINE_LONGER 0x0001 // line is continued on the next row 791#define LINE_LONGER 0x0001 // line is continued on the next row
792#define LINE_FILTERED 0x0002 // line has been filtered 792#define LINE_FILTERED 0x0002 // line has been filtered
793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
794#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
795#define LINE_BIDI 0x0010 // line needs bidi (NYI)
794 796
795struct line_t { 797struct line_t {
796 text_t *t; // terminal the text 798 text_t *t; // terminal the text
797 rend_t *r; // rendition, uses RS_ flags 799 rend_t *r; // rendition, uses RS_ flags
798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 800 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
852# define COMPOSE_LO 0x40000000UL 854# define COMPOSE_LO 0x40000000UL
853# define COMPOSE_HI 0x400fffffUL 855# define COMPOSE_HI 0x400fffffUL
854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 856# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
855#else 857#else
856# if ENABLE_PERL 858# if ENABLE_PERL
857# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 859# 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 860# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
859# else 861# else
860# define COMPOSE_LO 0xd800UL 862# define COMPOSE_LO 0xd800UL
861# define COMPOSE_HI 0xf8ffUL 863# define COMPOSE_HI 0xf8ffUL
862# endif 864# endif
… …
891#endif 893#endif
892 894
893/****************************************************************************/ 895/****************************************************************************/
894 896
895#ifdef KEYSYM_RESOURCE 897#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 898class keyboard_manager;
897#endif 899#endif
898 900
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 901struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
902
903 // special markers with magic addresses
904 static const char resval_undef []; // options specifically unset
905 static const char resval_on []; // boolean options switched on
906 static const char resval_off []; // or off
907
900 log_callback *log_hook; // log error messages through this hook, if != 0 908 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 909 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 910#if ENABLE_PERL
903 rxvt_perl_term perl; 911 rxvt_perl_term perl;
904#endif 912#endif
905 struct mbstate mbstate; // current input multibyte state 913 struct mbstate mbstate; // current input multibyte state
… …
944 int num_scr; /* screen: number lines scrolled */ 952 int num_scr; /* screen: number lines scrolled */
945 int prev_ncol, /* screen: previous number of columns */ 953 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 954 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 955/* ---------- */
948 rend_t rstyle; 956 rend_t rstyle;
949/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */ 957/* ---------- */
952#ifdef SELECTION_SCROLLING 958#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 959 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 960 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 961 int selection_save_x,
… …
1094 1100
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1101 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1102
1097 void vt_select_input () const NOTHROW 1103 void vt_select_input () const NOTHROW
1098 { 1104 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1105 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1106 }
1101 1107
1102#if TRANSPARENT 1108#if TRANSPARENT || ENABLE_PERL
1103 void rootwin_cb (XEvent &xev); 1109 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1110 xevent_watcher rootwin_ev;
1105#endif 1111#endif
1106 1112
1107 void x_cb (XEvent &xev); 1113 void x_cb (XEvent &xev);
… …
1169 bool pty_fill (); 1175 bool pty_fill ();
1170 1176
1171 void make_current () const // make this the "currently active" urxvt instance 1177 void make_current () const // make this the "currently active" urxvt instance
1172 { 1178 {
1173 SET_R (this); 1179 SET_R (this);
1180 set_environ (envv);
1174 rxvt_set_locale (locale); 1181 rxvt_set_locale (locale);
1175 set_environ (envv);
1176 } 1182 }
1177 1183
1178 void init_secondary (); 1184 void init_secondary ();
1179 const char **init_resources (int argc, const char *const *argv); 1185 const char **init_resources (int argc, const char *const *argv);
1180 const char *x_resource (const char *name); 1186 const char *x_resource (const char *name);
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1211 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1212
1207 bool IMisRunning (); 1213 bool IMisRunning ();
1208 void IMSendSpot (); 1214 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1215 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1216 void IMSetPosition ();
1211#endif 1217#endif
1212 1218
1213 void resize_scrollbar (); 1219 void resize_scrollbar ();
1214 1220
1215 // command.C 1221 // command.C
1216 void lookup_key (XKeyEvent &ev); 1222 void key_press (XKeyEvent &ev);
1223 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1224 unsigned int cmd_write (const char *str, unsigned int count);
1218 1225
1219 wchar_t next_char () NOTHROW; 1226 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1227 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1228 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1232 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1233 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1234 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1235 void focus_in ();
1229 void focus_out (); 1236 void focus_out ();
1237 void update_fade_color (unsigned int idx);
1230 int check_our_parents (); 1238 int check_our_parents ();
1231#ifdef PRINTPIPE 1239#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1240 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1241 int pclose_printer (FILE *stream);
1234#endif 1242#endif
… …
1256 void set_utf8_property (Atom prop, const char *str, int len = -1); 1264 void set_utf8_property (Atom prop, const char *str, int len = -1);
1257 void set_title (const char *str); 1265 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1266 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1267 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1268 void set_colorfgbg ();
1261 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1269 bool set_color (rxvt_color &color, const char *name);
1270 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1271 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1263 1272
1264 // screen.C 1273 // screen.C
1265 1274
1266 void lalloc (line_t &l) const 1275 void lalloc (line_t &l) const

Diff Legend

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