ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cvsroot/rxvt-unicode/src/rxvt.h
(Generate patch)

Comparing cvsroot/rxvt-unicode/src/rxvt.h (file contents):
Revision 1.247 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.261 by root, Sat Jul 29 21:44:44 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>
… …
32#if ENABLE_FRILLS 33#if ENABLE_FRILLS
33# include <X11/Xmd.h> 34# include <X11/Xmd.h>
34#endif 35#endif
35 36
36#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
37#include "rxvtfont.h" 39#include "rxvtfont.h"
38#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
39#include "iom.h" 41#include "iom.h"
40#include "salloc.h" 42#include "salloc.h"
41#include "libptytty.h" 43#include "libptytty.h"
… …
97# define STDOUT_FILENO 1 99# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 100# define STDERR_FILENO 2
99#endif 101#endif
100 102
101/****************************************************************************/ 103/****************************************************************************/
102
103#ifndef __attribute__
104# if __GNUC__
105# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
106# define __attribute__(x)
107# endif
108# endif
109# define __attribute__(x)
110#endif
111
112#define NORETURN __attribute__ ((noreturn))
113#define UNUSED __attribute__ ((unused))
114
115// increases code size unless -fno-enforce-eh-specs
116#if __GNUC__
117# define NOTHROW
118# define THROW(x)
119#else
120# define NOTHROW throw()
121# define THROW(x) throw x
122#endif
123 104
124// exception thrown on fatal (per-instance) errors 105// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 106class rxvt_failure_exception { };
126 107
127// exception thrown when the command parser runs out of input data 108// exception thrown when the command parser runs out of input data
… …
608#endif 589#endif
609}; 590};
610 591
611#define Color_Bits 7 // 0 .. maxTermCOLOR 592#define Color_Bits 7 // 0 .. maxTermCOLOR
612 593
613#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
614#define NPIXCLR_BITS 32
615
616/* 594/*
617 * Resource list 595 * Resource list
618 */ 596 */
619enum { 597enum {
620# define def(name) Rs_ ## name, 598# define def(name) Rs_ ## name,
… …
751#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
752#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 730#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
753 731
754#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 732#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
755 733
756#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
757#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
758 736
759#if ENABLE_STYLES 737#if ENABLE_STYLES
760# define FONTSET(style) fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
761#else 739#else
762# define FONTSET(style) fontset[0] 740# define FONTSET(style) fontset[0]
… …
796# 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))
797#else 775#else
798# define XPMClearArea(a, b, c, d, e, f, g) 776# define XPMClearArea(a, b, c, d, e, f, g)
799#endif 777#endif
800 778
801typedef callback1<void, const char *> log_callback; 779typedef callback<void (const char *)> log_callback;
802typedef callback1<int, int> getfd_callback; 780typedef callback<int (int)> getfd_callback;
803 781
804#define SET_LOCALE(locale) rxvt_set_locale (locale) 782#define SET_LOCALE(locale) rxvt_set_locale (locale)
805extern bool rxvt_set_locale (const char *locale) NOTHROW; 783extern bool rxvt_set_locale (const char *locale) NOTHROW;
806extern void rxvt_push_locale (const char *locale) NOTHROW; 784extern void rxvt_push_locale (const char *locale) NOTHROW;
807extern void rxvt_pop_locale () NOTHROW; 785extern void rxvt_pop_locale () NOTHROW;
… …
872# define COMPOSE_LO 0x40000000UL 850# define COMPOSE_LO 0x40000000UL
873# define COMPOSE_HI 0x400fffffUL 851# define COMPOSE_HI 0x400fffffUL
874# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 852# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
875#else 853#else
876# if ENABLE_PERL 854# if ENABLE_PERL
877# 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
878# 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
879# else 857# else
880# define COMPOSE_LO 0xd800UL 858# define COMPOSE_LO 0xd800UL
881# define COMPOSE_HI 0xf8ffUL 859# define COMPOSE_HI 0xf8ffUL
882# endif 860# endif
… …
911#endif 889#endif
912 890
913/****************************************************************************/ 891/****************************************************************************/
914 892
915#ifdef KEYSYM_RESOURCE 893#ifdef KEYSYM_RESOURCE
916 class keyboard_manager; 894class keyboard_manager;
917#endif 895#endif
918 896
919struct 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
920 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
921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 905 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
922#if ENABLE_PERL 906#if ENABLE_PERL
923 rxvt_perl_term perl; 907 rxvt_perl_term perl;
924#endif 908#endif
925 struct mbstate mbstate; // current input multibyte state 909 struct mbstate mbstate; // current input multibyte state
… …
964 int num_scr; /* screen: number lines scrolled */ 948 int num_scr; /* screen: number lines scrolled */
965 int prev_ncol, /* screen: previous number of columns */ 949 int prev_ncol, /* screen: previous number of columns */
966 prev_nrow; /* screen: previous number of rows */ 950 prev_nrow; /* screen: previous number of rows */
967/* ---------- */ 951/* ---------- */
968 rend_t rstyle; 952 rend_t rstyle;
969/* ---------- */
970 uint32_t pixcolor_set[NPIXCLR_SETS];
971/* ---------- */ 953/* ---------- */
972#ifdef SELECTION_SCROLLING 954#ifdef SELECTION_SCROLLING
973 int scroll_selection_lines; 955 int scroll_selection_lines;
974 enum page_dirn scroll_selection_dir; 956 enum page_dirn scroll_selection_dir;
975 int selection_save_x, 957 int selection_save_x,
… …
1114 1096
1115 long vt_emask, vt_emask_perl, vt_emask_xim; 1097 long vt_emask, vt_emask_perl, vt_emask_xim;
1116 1098
1117 void vt_select_input () const NOTHROW 1099 void vt_select_input () const NOTHROW
1118 { 1100 {
1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1101 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1120 } 1102 }
1121 1103
1122#if TRANSPARENT 1104#if TRANSPARENT || ENABLE_PERL
1123 void rootwin_cb (XEvent &xev); 1105 void rootwin_cb (XEvent &xev);
1124 xevent_watcher rootwin_ev; 1106 xevent_watcher rootwin_ev;
1125#endif 1107#endif
1126 1108
1127 void x_cb (XEvent &xev); 1109 void x_cb (XEvent &xev);
… …
1189 bool pty_fill (); 1171 bool pty_fill ();
1190 1172
1191 void make_current () const // make this the "currently active" urxvt instance 1173 void make_current () const // make this the "currently active" urxvt instance
1192 { 1174 {
1193 SET_R (this); 1175 SET_R (this);
1176 set_environ (envv);
1194 rxvt_set_locale (locale); 1177 rxvt_set_locale (locale);
1195 set_environ (envv);
1196 } 1178 }
1197 1179
1198 void init_secondary (); 1180 void init_secondary ();
1199 const char **init_resources (int argc, const char *const *argv); 1181 const char **init_resources (int argc, const char *const *argv);
1200 const char *x_resource (const char *name); 1182 const char *x_resource (const char *name);
… …
1225 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);
1226 1208
1227 bool IMisRunning (); 1209 bool IMisRunning ();
1228 void IMSendSpot (); 1210 void IMSendSpot ();
1229 bool IM_get_IC (const char *modifiers); 1211 bool IM_get_IC (const char *modifiers);
1230 void IMSetStatusPosition (); 1212 void IMSetPosition ();
1231#endif 1213#endif
1232 1214
1233 void resize_scrollbar (); 1215 void resize_scrollbar ();
1234 1216
1235 // command.C 1217 // command.C
1236 void lookup_key (XKeyEvent &ev); 1218 void key_press (XKeyEvent &ev);
1219 void key_release (XKeyEvent &ev);
1237 unsigned int cmd_write (const char *str, unsigned int count); 1220 unsigned int cmd_write (const char *str, unsigned int count);
1238 1221
1239 wchar_t next_char () NOTHROW; 1222 wchar_t next_char () NOTHROW;
1240 wchar_t cmd_getc () THROW ((class out_of_input)); 1223 wchar_t cmd_getc () THROW ((class out_of_input));
1241 uint32_t next_octet () NOTHROW; 1224 uint32_t next_octet () NOTHROW;
… …
1245 void mouse_report (XButtonEvent &ev); 1228 void mouse_report (XButtonEvent &ev);
1246 void button_press (XButtonEvent &ev); 1229 void button_press (XButtonEvent &ev);
1247 void button_release (XButtonEvent &ev); 1230 void button_release (XButtonEvent &ev);
1248 void focus_in (); 1231 void focus_in ();
1249 void focus_out (); 1232 void focus_out ();
1233 void update_fade_color (unsigned int idx);
1250 int check_our_parents (); 1234 int check_our_parents ();
1251#ifdef PRINTPIPE 1235#ifdef PRINTPIPE
1252 FILE *popen_printer (); 1236 FILE *popen_printer ();
1253 int pclose_printer (FILE *stream); 1237 int pclose_printer (FILE *stream);
1254#endif 1238#endif
… …
1276 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);
1277 void set_title (const char *str); 1261 void set_title (const char *str);
1278 void set_icon_name (const char *str); 1262 void set_icon_name (const char *str);
1279 void set_window_color (int idx, const char *color); 1263 void set_window_color (int idx, const char *color);
1280 void set_colorfgbg (); 1264 void set_colorfgbg ();
1281 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);
1282 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1267 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1283 1268
1284 // screen.C 1269 // screen.C
1285 1270
1286 void lalloc (line_t &l) const 1271 void lalloc (line_t &l) const

Diff Legend

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