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.259 by root, Thu Jul 6 18:56:10 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>
… …
588#endif 589#endif
589}; 590};
590 591
591#define Color_Bits 7 // 0 .. maxTermCOLOR 592#define Color_Bits 7 // 0 .. maxTermCOLOR
592 593
593#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
594#define NPIXCLR_BITS 32
595
596/* 594/*
597 * Resource list 595 * Resource list
598 */ 596 */
599enum { 597enum {
600# define def(name) Rs_ ## name, 598# define def(name) Rs_ ## name,
… …
731#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
732#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 730#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
733 731
734#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 732#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
735 733
736#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
737#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
738 736
739#if ENABLE_STYLES 737#if ENABLE_STYLES
740# define FONTSET(style) fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
741#else 739#else
742# define FONTSET(style) fontset[0] 740# define FONTSET(style) fontset[0]
… …
776# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 774# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
777#else 775#else
778# define XPMClearArea(a, b, c, d, e, f, g) 776# define XPMClearArea(a, b, c, d, e, f, g)
779#endif 777#endif
780 778
781typedef callback1<void, const char *> log_callback; 779typedef callback<void (const char *)> log_callback;
782typedef callback1<int, int> getfd_callback; 780typedef callback<int (int)> getfd_callback;
783 781
784#define SET_LOCALE(locale) rxvt_set_locale (locale) 782#define SET_LOCALE(locale) rxvt_set_locale (locale)
785extern bool rxvt_set_locale (const char *locale) NOTHROW; 783extern bool rxvt_set_locale (const char *locale) NOTHROW;
786extern void rxvt_push_locale (const char *locale) NOTHROW; 784extern void rxvt_push_locale (const char *locale) NOTHROW;
787extern void rxvt_pop_locale () NOTHROW; 785extern void rxvt_pop_locale () NOTHROW;
… …
852# define COMPOSE_LO 0x40000000UL 850# define COMPOSE_LO 0x40000000UL
853# define COMPOSE_HI 0x400fffffUL 851# define COMPOSE_HI 0x400fffffUL
854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 852# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
855#else 853#else
856# if ENABLE_PERL 854# if ENABLE_PERL
857# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 855# 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 856# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
859# else 857# else
860# define COMPOSE_LO 0xd800UL 858# define COMPOSE_LO 0xd800UL
861# define COMPOSE_HI 0xf8ffUL 859# define COMPOSE_HI 0xf8ffUL
862# endif 860# endif
… …
891#endif 889#endif
892 890
893/****************************************************************************/ 891/****************************************************************************/
894 892
895#ifdef KEYSYM_RESOURCE 893#ifdef KEYSYM_RESOURCE
896 class keyboard_manager; 894class keyboard_manager;
897#endif 895#endif
898 896
899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 897struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
898
899 // special markers with magic addresses
900 static const char resval_undef []; // options specifically unset
901 static const char resval_on []; // boolean options switched on
902 static const char resval_off []; // or off
903
900 log_callback *log_hook; // log error messages through this hook, if != 0 904 log_callback *log_hook; // log error messages through this hook, if != 0
901 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 905 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
902#if ENABLE_PERL 906#if ENABLE_PERL
903 rxvt_perl_term perl; 907 rxvt_perl_term perl;
904#endif 908#endif
905 struct mbstate mbstate; // current input multibyte state 909 struct mbstate mbstate; // current input multibyte state
… …
944 int num_scr; /* screen: number lines scrolled */ 948 int num_scr; /* screen: number lines scrolled */
945 int prev_ncol, /* screen: previous number of columns */ 949 int prev_ncol, /* screen: previous number of columns */
946 prev_nrow; /* screen: previous number of rows */ 950 prev_nrow; /* screen: previous number of rows */
947/* ---------- */ 951/* ---------- */
948 rend_t rstyle; 952 rend_t rstyle;
949/* ---------- */
950 uint32_t pixcolor_set[NPIXCLR_SETS];
951/* ---------- */ 953/* ---------- */
952#ifdef SELECTION_SCROLLING 954#ifdef SELECTION_SCROLLING
953 int scroll_selection_lines; 955 int scroll_selection_lines;
954 enum page_dirn scroll_selection_dir; 956 enum page_dirn scroll_selection_dir;
955 int selection_save_x, 957 int selection_save_x,
… …
1094 1096
1095 long vt_emask, vt_emask_perl, vt_emask_xim; 1097 long vt_emask, vt_emask_perl, vt_emask_xim;
1096 1098
1097 void vt_select_input () const NOTHROW 1099 void vt_select_input () const NOTHROW
1098 { 1100 {
1099 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1101 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1100 } 1102 }
1101 1103
1102#if TRANSPARENT 1104#if TRANSPARENT
1103 void rootwin_cb (XEvent &xev); 1105 void rootwin_cb (XEvent &xev);
1104 xevent_watcher rootwin_ev; 1106 xevent_watcher rootwin_ev;
… …
1205 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1207 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1206 1208
1207 bool IMisRunning (); 1209 bool IMisRunning ();
1208 void IMSendSpot (); 1210 void IMSendSpot ();
1209 bool IM_get_IC (const char *modifiers); 1211 bool IM_get_IC (const char *modifiers);
1210 void IMSetStatusPosition (); 1212 void IMSetPosition ();
1211#endif 1213#endif
1212 1214
1213 void resize_scrollbar (); 1215 void resize_scrollbar ();
1214 1216
1215 // command.C 1217 // command.C
1216 void lookup_key (XKeyEvent &ev); 1218 void key_press (XKeyEvent &ev);
1219 void key_release (XKeyEvent &ev);
1217 unsigned int cmd_write (const char *str, unsigned int count); 1220 unsigned int cmd_write (const char *str, unsigned int count);
1218 1221
1219 wchar_t next_char () NOTHROW; 1222 wchar_t next_char () NOTHROW;
1220 wchar_t cmd_getc () THROW ((class out_of_input)); 1223 wchar_t cmd_getc () THROW ((class out_of_input));
1221 uint32_t next_octet () NOTHROW; 1224 uint32_t next_octet () NOTHROW;
… …
1225 void mouse_report (XButtonEvent &ev); 1228 void mouse_report (XButtonEvent &ev);
1226 void button_press (XButtonEvent &ev); 1229 void button_press (XButtonEvent &ev);
1227 void button_release (XButtonEvent &ev); 1230 void button_release (XButtonEvent &ev);
1228 void focus_in (); 1231 void focus_in ();
1229 void focus_out (); 1232 void focus_out ();
1233 void update_fade_color (unsigned int idx);
1230 int check_our_parents (); 1234 int check_our_parents ();
1231#ifdef PRINTPIPE 1235#ifdef PRINTPIPE
1232 FILE *popen_printer (); 1236 FILE *popen_printer ();
1233 int pclose_printer (FILE *stream); 1237 int pclose_printer (FILE *stream);
1234#endif 1238#endif
… …
1256 void set_utf8_property (Atom prop, const char *str, int len = -1); 1260 void set_utf8_property (Atom prop, const char *str, int len = -1);
1257 void set_title (const char *str); 1261 void set_title (const char *str);
1258 void set_icon_name (const char *str); 1262 void set_icon_name (const char *str);
1259 void set_window_color (int idx, const char *color); 1263 void set_window_color (int idx, const char *color);
1260 void set_colorfgbg (); 1264 void set_colorfgbg ();
1261 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1265 bool set_color (rxvt_color &color, const char *name);
1266 void alias_color (int dst, int src);
1262 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1267 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1263 1268
1264 // screen.C 1269 // screen.C
1265 1270
1266 void lalloc (line_t &l) const 1271 void lalloc (line_t &l) const

Diff Legend

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