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.251 by root, Tue Jan 31 18:36:35 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>
… …
773# 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))
774#else 775#else
775# define XPMClearArea(a, b, c, d, e, f, g) 776# define XPMClearArea(a, b, c, d, e, f, g)
776#endif 777#endif
777 778
778typedef callback1<void, const char *> log_callback; 779typedef callback<void (const char *)> log_callback;
779typedef callback1<int, int> getfd_callback; 780typedef callback<int (int)> getfd_callback;
780 781
781#define SET_LOCALE(locale) rxvt_set_locale (locale) 782#define SET_LOCALE(locale) rxvt_set_locale (locale)
782extern bool rxvt_set_locale (const char *locale) NOTHROW; 783extern bool rxvt_set_locale (const char *locale) NOTHROW;
783extern void rxvt_push_locale (const char *locale) NOTHROW; 784extern void rxvt_push_locale (const char *locale) NOTHROW;
784extern void rxvt_pop_locale () NOTHROW; 785extern void rxvt_pop_locale () NOTHROW;
… …
888#endif 889#endif
889 890
890/****************************************************************************/ 891/****************************************************************************/
891 892
892#ifdef KEYSYM_RESOURCE 893#ifdef KEYSYM_RESOURCE
893 class keyboard_manager; 894class keyboard_manager;
894#endif 895#endif
895 896
896struct 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
897 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
898 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 905 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
899#if ENABLE_PERL 906#if ENABLE_PERL
900 rxvt_perl_term perl; 907 rxvt_perl_term perl;
901#endif 908#endif
902 struct mbstate mbstate; // current input multibyte state 909 struct mbstate mbstate; // current input multibyte state
… …
1089 1096
1090 long vt_emask, vt_emask_perl, vt_emask_xim; 1097 long vt_emask, vt_emask_perl, vt_emask_xim;
1091 1098
1092 void vt_select_input () const NOTHROW 1099 void vt_select_input () const NOTHROW
1093 { 1100 {
1094 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1101 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1095 } 1102 }
1096 1103
1097#if TRANSPARENT 1104#if TRANSPARENT || ENABLE_PERL
1098 void rootwin_cb (XEvent &xev); 1105 void rootwin_cb (XEvent &xev);
1099 xevent_watcher rootwin_ev; 1106 xevent_watcher rootwin_ev;
1100#endif 1107#endif
1101 1108
1102 void x_cb (XEvent &xev); 1109 void x_cb (XEvent &xev);
… …
1164 bool pty_fill (); 1171 bool pty_fill ();
1165 1172
1166 void make_current () const // make this the "currently active" urxvt instance 1173 void make_current () const // make this the "currently active" urxvt instance
1167 { 1174 {
1168 SET_R (this); 1175 SET_R (this);
1176 set_environ (envv);
1169 rxvt_set_locale (locale); 1177 rxvt_set_locale (locale);
1170 set_environ (envv);
1171 } 1178 }
1172 1179
1173 void init_secondary (); 1180 void init_secondary ();
1174 const char **init_resources (int argc, const char *const *argv); 1181 const char **init_resources (int argc, const char *const *argv);
1175 const char *x_resource (const char *name); 1182 const char *x_resource (const char *name);
… …
1200 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);
1201 1208
1202 bool IMisRunning (); 1209 bool IMisRunning ();
1203 void IMSendSpot (); 1210 void IMSendSpot ();
1204 bool IM_get_IC (const char *modifiers); 1211 bool IM_get_IC (const char *modifiers);
1205 void IMSetStatusPosition (); 1212 void IMSetPosition ();
1206#endif 1213#endif
1207 1214
1208 void resize_scrollbar (); 1215 void resize_scrollbar ();
1209 1216
1210 // command.C 1217 // command.C
1211 void lookup_key (XKeyEvent &ev); 1218 void key_press (XKeyEvent &ev);
1219 void key_release (XKeyEvent &ev);
1212 unsigned int cmd_write (const char *str, unsigned int count); 1220 unsigned int cmd_write (const char *str, unsigned int count);
1213 1221
1214 wchar_t next_char () NOTHROW; 1222 wchar_t next_char () NOTHROW;
1215 wchar_t cmd_getc () THROW ((class out_of_input)); 1223 wchar_t cmd_getc () THROW ((class out_of_input));
1216 uint32_t next_octet () NOTHROW; 1224 uint32_t next_octet () NOTHROW;
… …
1220 void mouse_report (XButtonEvent &ev); 1228 void mouse_report (XButtonEvent &ev);
1221 void button_press (XButtonEvent &ev); 1229 void button_press (XButtonEvent &ev);
1222 void button_release (XButtonEvent &ev); 1230 void button_release (XButtonEvent &ev);
1223 void focus_in (); 1231 void focus_in ();
1224 void focus_out (); 1232 void focus_out ();
1233 void update_fade_color (unsigned int idx);
1225 int check_our_parents (); 1234 int check_our_parents ();
1226#ifdef PRINTPIPE 1235#ifdef PRINTPIPE
1227 FILE *popen_printer (); 1236 FILE *popen_printer ();
1228 int pclose_printer (FILE *stream); 1237 int pclose_printer (FILE *stream);
1229#endif 1238#endif
… …
1252 void set_title (const char *str); 1261 void set_title (const char *str);
1253 void set_icon_name (const char *str); 1262 void set_icon_name (const char *str);
1254 void set_window_color (int idx, const char *color); 1263 void set_window_color (int idx, const char *color);
1255 void set_colorfgbg (); 1264 void set_colorfgbg ();
1256 bool set_color (rxvt_color &color, const char *name); 1265 bool set_color (rxvt_color &color, const char *name);
1266 void alias_color (int dst, int src);
1257 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1267 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1258 1268
1259 // screen.C 1269 // screen.C
1260 1270
1261 void lalloc (line_t &l) const 1271 void lalloc (line_t &l) const

Diff Legend

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