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.274 by root, Mon Jun 18 12:53:26 2007 UTC vs.
Revision 1.278 by root, Tue Jul 24 14:38:59 2007 UTC

… …
134const char * rxvt_Str_skip_space (const char *str) NOTHROW; 134const char * rxvt_Str_skip_space (const char *str) NOTHROW;
135char * rxvt_Str_trim (char *str) NOTHROW; 135char * rxvt_Str_trim (char *str) NOTHROW;
136int rxvt_Str_escaped (char *str) NOTHROW; 136int rxvt_Str_escaped (char *str) NOTHROW;
137char ** rxvt_splitcommastring (const char *cs) NOTHROW; 137char ** rxvt_splitcommastring (const char *cs) NOTHROW;
138void rxvt_freecommastring (char **cs) NOTHROW; 138void rxvt_freecommastring (char **cs) NOTHROW;
139char * rxvt_File_find (const char *file, const char *ext, const char *path) NOTHROW;
140 139
141///////////////////////////////////////////////////////////////////////////// 140/////////////////////////////////////////////////////////////////////////////
142 141
143// temporarily replace the process environment 142// temporarily replace the process environment
144extern char **environ; 143extern char **environ;
… …
884 883
885#ifdef KEYSYM_RESOURCE 884#ifdef KEYSYM_RESOURCE
886class keyboard_manager; 885class keyboard_manager;
887#endif 886#endif
888 887
888/* to get libAfterImage to work with multiple displays we use that hack : */
889/* should not need that with libAfterImage version >= 1.15 */
890#define AFTERIMAGE_DPY_OP(op) ((::dpy = dpy), (op))
891
889struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 892struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
890 893
891 // special markers with magic addresses 894 // special markers with magic addresses
892 static const char resval_undef []; // options specifically unset 895 static const char resval_undef []; // options specifically unset
893 static const char resval_on []; // boolean options switched on 896 static const char resval_on []; // boolean options switched on
… …
899 rxvt_perl_term perl; 902 rxvt_perl_term perl;
900#endif 903#endif
901 struct mbstate mbstate; // current input multibyte state 904 struct mbstate mbstate; // current input multibyte state
902 905
903 unsigned char want_refresh:1, 906 unsigned char want_refresh:1,
904#ifdef TRANSPARENT 907#ifdef ENABLE_TRANSPARENCY
905 want_full_refresh:1, /* awaiting full screen refresh */ 908 want_full_refresh:1, /* awaiting full screen refresh */
906 am_transparent:1, /* is a transparent term */ 909 am_transparent:1, /* is a transparent term */
907 am_pixmap_trans:1, /* transparency w/known root pixmap */ 910 am_pixmap_trans:1, /* transparency w/known root pixmap */
908#endif 911#endif
909 current_screen:1, /* primary or secondary */ 912 current_screen:1, /* primary or secondary */
… …
1021 ttymode_t tio; 1024 ttymode_t tio;
1022 row_col_t oldcursor; 1025 row_col_t oldcursor;
1023#ifdef XPM_BACKGROUND 1026#ifdef XPM_BACKGROUND
1024 bgPixmap_t bgPixmap; 1027 bgPixmap_t bgPixmap;
1025#ifdef HAVE_AFTERIMAGE 1028#ifdef HAVE_AFTERIMAGE
1029 struct ASVisual *asv;
1026 ASImageManager *asimman; 1030 ASImageManager *asimman;
1027 ASImage *original_asim; 1031 ASImage *original_asim;
1028 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */ 1032 struct { unsigned int width, height; } xpmAttr; /* all we need is width/height */
1029#else 1033#else
1030 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */ 1034 XpmAttributes xpmAttr; /* originally loaded pixmap and its scaling */
… …
1094 void vt_select_input () const NOTHROW 1098 void vt_select_input () const NOTHROW
1095 { 1099 {
1096 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1097 } 1101 }
1098 1102
1099#if TRANSPARENT || ENABLE_PERL 1103#if ENABLE_TRANSPARENCY || ENABLE_PERL
1100 void rootwin_cb (XEvent &xev); 1104 void rootwin_cb (XEvent &xev);
1101 xevent_watcher rootwin_ev; 1105 xevent_watcher rootwin_ev;
1102#endif 1106#endif
1103#if TRANSPARENT 1107#if ENABLE_TRANSPARENCY
1104 int check_our_parents (); 1108 int check_our_parents ();
1105 void check_our_parents_cb (time_watcher &w); 1109 void check_our_parents_cb (time_watcher &w);
1106 time_watcher check_our_parents_ev; 1110 time_watcher check_our_parents_ev;
1107#endif 1111#endif
1108 1112

Diff Legend

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