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.254 by root, Thu Feb 2 18:04:46 2006 UTC vs.
Revision 1.265 by root, Thu Dec 7 03:30:01 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,
… …
681 * MACRO DEFINES 684 * MACRO DEFINES
682 ***************************************************************************** 685 *****************************************************************************
683 */ 686 */
684#define dLocal(type,name) type const name = this->name 687#define dLocal(type,name) type const name = this->name
685 688
686// for speed reasons, we assume that all latin1 characters 689// for speed reasons, we assume that all codepoints 32 to 126 are
687// are single-width (the first unicode combining character 690// single-width.
688// is actually 0x300, but ascii is what matters most). 691#define WCWIDTH(c) (IN_RANGE_INC (c, 0x20, 0x7e) ? 1 : wcwidth (c))
689#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
690 692
691/* convert pixel dimensions to row/column values. Everything as int32_t */ 693/* convert pixel dimensions to row/column values. Everything as int32_t */
692#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 694#define Pixel2Col(x) Pixel2Width((int32_t)(x))
693#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 695#define Pixel2Row(y) Pixel2Height((int32_t)(y))
694#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 696#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
697#define Row2Pixel(row) ((int32_t)Height2Pixel(row)) 699#define Row2Pixel(row) ((int32_t)Height2Pixel(row))
698#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth) 700#define Width2Pixel(n) ((int32_t)(n) * (int32_t)fwidth)
699#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight) 701#define Height2Pixel(n) ((int32_t)(n) * (int32_t)fheight)
700 702
701#define OPTION(opt) (options & (opt)) 703#define OPTION(opt) (options & (opt))
702#define DEFAULT_OPTIONS (Opt_scrollBar | Opt_scrollTtyOutput \ 704#define DEFAULT_OPTIONS (Opt_scrollBar \
703 | Opt_jumpScroll | Opt_secondaryScreen \ 705 | Opt_scrollTtyOutput \
704 | Opt_pastableTabs | Opt_intensityStyles) 706 | Opt_jumpScroll \
707 | Opt_secondaryScreen \
708 | Opt_secondaryScroll \
709 | Opt_pastableTabs \
710 | Opt_intensityStyles)
705 711
706// for m >= -n, ensure remainder lies between 0..n-1 712// for m >= -n, ensure remainder lies between 0..n-1
707#define MOD(m,n) (((m) + (n)) % (n)) 713#define MOD(m,n) (((m) + (n)) % (n))
708 714
709#define LINENO(n) MOD (term_start + int(n), total_rows) 715#define LINENO(n) MOD (term_start + int(n), total_rows)
… …
773# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 779# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
774#else 780#else
775# define XPMClearArea(a, b, c, d, e, f, g) 781# define XPMClearArea(a, b, c, d, e, f, g)
776#endif 782#endif
777 783
778typedef callback1<void, const char *> log_callback; 784typedef callback<void (const char *)> log_callback;
779typedef callback1<int, int> getfd_callback; 785typedef callback<int (int)> getfd_callback;
780 786
781#define SET_LOCALE(locale) rxvt_set_locale (locale) 787#define SET_LOCALE(locale) rxvt_set_locale (locale)
782extern bool rxvt_set_locale (const char *locale) NOTHROW; 788extern bool rxvt_set_locale (const char *locale) NOTHROW;
783extern void rxvt_push_locale (const char *locale) NOTHROW; 789extern void rxvt_push_locale (const char *locale) NOTHROW;
784extern void rxvt_pop_locale () NOTHROW; 790extern void rxvt_pop_locale () NOTHROW;
… …
786/****************************************************************************/ 792/****************************************************************************/
787 793
788#define LINE_LONGER 0x0001 // line is continued on the next row 794#define LINE_LONGER 0x0001 // line is continued on the next row
789#define LINE_FILTERED 0x0002 // line has been filtered 795#define LINE_FILTERED 0x0002 // line has been filtered
790#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 796#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
797#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
798#define LINE_BIDI 0x0010 // line needs bidi (NYI)
791 799
792struct line_t { 800struct line_t {
793 text_t *t; // terminal the text 801 text_t *t; // terminal the text
794 rend_t *r; // rendition, uses RS_ flags 802 rend_t *r; // rendition, uses RS_ flags
795 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 803 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
1098 void vt_select_input () const NOTHROW 1106 void vt_select_input () const NOTHROW
1099 { 1107 {
1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1108 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1101 } 1109 }
1102 1110
1103#if TRANSPARENT 1111#if TRANSPARENT || ENABLE_PERL
1104 void rootwin_cb (XEvent &xev); 1112 void rootwin_cb (XEvent &xev);
1105 xevent_watcher rootwin_ev; 1113 xevent_watcher rootwin_ev;
1106#endif 1114#endif
1107 1115
1108 void x_cb (XEvent &xev); 1116 void x_cb (XEvent &xev);
… …
1170 bool pty_fill (); 1178 bool pty_fill ();
1171 1179
1172 void make_current () const // make this the "currently active" urxvt instance 1180 void make_current () const // make this the "currently active" urxvt instance
1173 { 1181 {
1174 SET_R (this); 1182 SET_R (this);
1183 set_environ (envv);
1175 rxvt_set_locale (locale); 1184 rxvt_set_locale (locale);
1176 set_environ (envv);
1177 } 1185 }
1178 1186
1179 void init_secondary (); 1187 void init_secondary ();
1180 const char **init_resources (int argc, const char *const *argv); 1188 const char **init_resources (int argc, const char *const *argv);
1181 const char *x_resource (const char *name); 1189 const char *x_resource (const char *name);
… …
1206 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1214 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1207 1215
1208 bool IMisRunning (); 1216 bool IMisRunning ();
1209 void IMSendSpot (); 1217 void IMSendSpot ();
1210 bool IM_get_IC (const char *modifiers); 1218 bool IM_get_IC (const char *modifiers);
1211 void IMSetStatusPosition (); 1219 void IMSetPosition ();
1212#endif 1220#endif
1213 1221
1214 void resize_scrollbar (); 1222 void resize_scrollbar ();
1215 1223
1216 // command.C 1224 // command.C
1217 void lookup_key (XKeyEvent &ev); 1225 void key_press (XKeyEvent &ev);
1226 void key_release (XKeyEvent &ev);
1218 unsigned int cmd_write (const char *str, unsigned int count); 1227 unsigned int cmd_write (const char *str, unsigned int count);
1219 1228
1220 wchar_t next_char () NOTHROW; 1229 wchar_t next_char () NOTHROW;
1221 wchar_t cmd_getc () THROW ((class out_of_input)); 1230 wchar_t cmd_getc () THROW ((class out_of_input));
1222 uint32_t next_octet () NOTHROW; 1231 uint32_t next_octet () NOTHROW;
… …
1226 void mouse_report (XButtonEvent &ev); 1235 void mouse_report (XButtonEvent &ev);
1227 void button_press (XButtonEvent &ev); 1236 void button_press (XButtonEvent &ev);
1228 void button_release (XButtonEvent &ev); 1237 void button_release (XButtonEvent &ev);
1229 void focus_in (); 1238 void focus_in ();
1230 void focus_out (); 1239 void focus_out ();
1240 void update_fade_color (unsigned int idx);
1231 int check_our_parents (); 1241 int check_our_parents ();
1232#ifdef PRINTPIPE 1242#ifdef PRINTPIPE
1233 FILE *popen_printer (); 1243 FILE *popen_printer ();
1234 int pclose_printer (FILE *stream); 1244 int pclose_printer (FILE *stream);
1235#endif 1245#endif

Diff Legend

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