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.249 by root, Mon Jan 30 19:46:13 2006 UTC vs.
Revision 1.257 by root, Wed May 31 00:35:56 2006 UTC

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

Diff Legend

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