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.258 by root, Wed Jul 5 22:46:14 2006 UTC vs.
Revision 1.263 by root, Thu Nov 2 17:23:50 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>
… …
519 * on the unnecessary items, e.g. Color_pointer, but won't bother 520 * on the unnecessary items, e.g. Color_pointer, but won't bother
520 * until we need to. Also, be aware of usage in pixcolor_set 521 * until we need to. Also, be aware of usage in pixcolor_set
521 */ 522 */
522 523
523enum colour_list { 524enum colour_list {
525 Color_none = -2,
526 Color_transparent = -1,
524 Color_fg = 0, 527 Color_fg = 0,
525 Color_bg, 528 Color_bg,
526 minCOLOR, /* 2 */ 529 minCOLOR, /* 2 */
527 Color_Black = minCOLOR, 530 Color_Black = minCOLOR,
528 Color_Red3, 531 Color_Red3,
… …
786/****************************************************************************/ 789/****************************************************************************/
787 790
788#define LINE_LONGER 0x0001 // line is continued on the next row 791#define LINE_LONGER 0x0001 // line is continued on the next row
789#define LINE_FILTERED 0x0002 // line has been filtered 792#define LINE_FILTERED 0x0002 // line has been filtered
790#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 793#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
794#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
795#define LINE_BIDI 0x0010 // line needs bidi (NYI)
791 796
792struct line_t { 797struct line_t {
793 text_t *t; // terminal the text 798 text_t *t; // terminal the text
794 rend_t *r; // rendition, uses RS_ flags 799 rend_t *r; // rendition, uses RS_ flags
795 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 800 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
1098 void vt_select_input () const NOTHROW 1103 void vt_select_input () const NOTHROW
1099 { 1104 {
1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1105 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1101 } 1106 }
1102 1107
1103#if TRANSPARENT 1108#if TRANSPARENT || ENABLE_PERL
1104 void rootwin_cb (XEvent &xev); 1109 void rootwin_cb (XEvent &xev);
1105 xevent_watcher rootwin_ev; 1110 xevent_watcher rootwin_ev;
1106#endif 1111#endif
1107 1112
1108 void x_cb (XEvent &xev); 1113 void x_cb (XEvent &xev);
… …
1170 bool pty_fill (); 1175 bool pty_fill ();
1171 1176
1172 void make_current () const // make this the "currently active" urxvt instance 1177 void make_current () const // make this the "currently active" urxvt instance
1173 { 1178 {
1174 SET_R (this); 1179 SET_R (this);
1180 set_environ (envv);
1175 rxvt_set_locale (locale); 1181 rxvt_set_locale (locale);
1176 set_environ (envv);
1177 } 1182 }
1178 1183
1179 void init_secondary (); 1184 void init_secondary ();
1180 const char **init_resources (int argc, const char *const *argv); 1185 const char **init_resources (int argc, const char *const *argv);
1181 const char *x_resource (const char *name); 1186 const char *x_resource (const char *name);

Diff Legend

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