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.244 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.260 by root, Thu Jul 6 23:48:11 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
… …
432// fake styles 413// fake styles
433#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
434#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
435#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
436 417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
420
437// 5 custom bits for extensions 421// 5 custom bits for extensions
438#define RS_customCount 32 422#define RS_customCount 32
439#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
440#define RS_customShift 19 424#define RS_customShift 19
441 425
… …
510 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
511 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
512 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
513 497
514 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
515 500
516 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
517 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
518 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
519 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
604#endif 589#endif
605}; 590};
606 591
607#define Color_Bits 7 // 0 .. maxTermCOLOR 592#define Color_Bits 7 // 0 .. maxTermCOLOR
608 593
609#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
610#define NPIXCLR_BITS 32
611
612/* 594/*
613 * Resource list 595 * Resource list
614 */ 596 */
615enum { 597enum {
616# define def(name) Rs_ ## name, 598# define def(name) Rs_ ## name,
… …
699 ***************************************************************************** 681 *****************************************************************************
700 * MACRO DEFINES 682 * MACRO DEFINES
701 ***************************************************************************** 683 *****************************************************************************
702 */ 684 */
703#define dLocal(type,name) type const name = this->name 685#define dLocal(type,name) type const name = this->name
704#define dDisp Display *disp = this->display->display
705 686
706// for speed reasons, we assume that all latin1 characters 687// for speed reasons, we assume that all latin1 characters
707// are single-width (the first unicode combining character 688// are single-width (the first unicode combining character
708// is actually 0x300, but ascii is what matters most). 689// is actually 0x300, but ascii is what matters most).
709#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1) 690#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
… …
748#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
749#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 730#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
750 731
751#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 732#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
752 733
753#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
754#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
755 736
756#if ENABLE_STYLES 737#if ENABLE_STYLES
757# define FONTSET(style) fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
758#else 739#else
759# define FONTSET(style) fontset[0] 740# define FONTSET(style) fontset[0]
… …
793# 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))
794#else 775#else
795# define XPMClearArea(a, b, c, d, e, f, g) 776# define XPMClearArea(a, b, c, d, e, f, g)
796#endif 777#endif
797 778
798typedef callback1<void, const char *> log_callback; 779typedef callback<void (const char *)> log_callback;
799typedef callback1<int, int> getfd_callback; 780typedef callback<int (int)> getfd_callback;
800 781
801#define SET_LOCALE(locale) rxvt_set_locale (locale) 782#define SET_LOCALE(locale) rxvt_set_locale (locale)
802extern bool rxvt_set_locale (const char *locale) NOTHROW; 783extern bool rxvt_set_locale (const char *locale) NOTHROW;
803extern void rxvt_push_locale (const char *locale) NOTHROW; 784extern void rxvt_push_locale (const char *locale) NOTHROW;
804extern void rxvt_pop_locale () NOTHROW; 785extern void rxvt_pop_locale () NOTHROW;
… …
869# define COMPOSE_LO 0x40000000UL 850# define COMPOSE_LO 0x40000000UL
870# define COMPOSE_HI 0x400fffffUL 851# define COMPOSE_HI 0x400fffffUL
871# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 852# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
872#else 853#else
873# if ENABLE_PERL 854# if ENABLE_PERL
874# 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
875# 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
876# else 857# else
877# define COMPOSE_LO 0xd800UL 858# define COMPOSE_LO 0xd800UL
878# define COMPOSE_HI 0xf8ffUL 859# define COMPOSE_HI 0xf8ffUL
879# endif 860# endif
… …
908#endif 889#endif
909 890
910/****************************************************************************/ 891/****************************************************************************/
911 892
912#ifdef KEYSYM_RESOURCE 893#ifdef KEYSYM_RESOURCE
913 class keyboard_manager; 894class keyboard_manager;
914#endif 895#endif
915 896
916struct rxvt_term : zero_initialized, rxvt_vars { 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
917 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
918 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 905 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
919#if ENABLE_PERL 906#if ENABLE_PERL
920 rxvt_perl_term perl; 907 rxvt_perl_term perl;
921#endif 908#endif
922 struct mbstate mbstate; // current input multibyte state 909 struct mbstate mbstate; // current input multibyte state
… …
961 int num_scr; /* screen: number lines scrolled */ 948 int num_scr; /* screen: number lines scrolled */
962 int prev_ncol, /* screen: previous number of columns */ 949 int prev_ncol, /* screen: previous number of columns */
963 prev_nrow; /* screen: previous number of rows */ 950 prev_nrow; /* screen: previous number of rows */
964/* ---------- */ 951/* ---------- */
965 rend_t rstyle; 952 rend_t rstyle;
966/* ---------- */
967 uint32_t pixcolor_set[NPIXCLR_SETS];
968/* ---------- */ 953/* ---------- */
969#ifdef SELECTION_SCROLLING 954#ifdef SELECTION_SCROLLING
970 int scroll_selection_lines; 955 int scroll_selection_lines;
971 enum page_dirn scroll_selection_dir; 956 enum page_dirn scroll_selection_dir;
972 int selection_save_x, 957 int selection_save_x,
… …
1111 1096
1112 long vt_emask, vt_emask_perl, vt_emask_xim; 1097 long vt_emask, vt_emask_perl, vt_emask_xim;
1113 1098
1114 void vt_select_input () const NOTHROW 1099 void vt_select_input () const NOTHROW
1115 { 1100 {
1116 XSelectInput (display->display, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1101 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1117 } 1102 }
1118 1103
1119#if TRANSPARENT 1104#if TRANSPARENT || ENABLE_PERL
1120 void rootwin_cb (XEvent &xev); 1105 void rootwin_cb (XEvent &xev);
1121 xevent_watcher rootwin_ev; 1106 xevent_watcher rootwin_ev;
1122#endif 1107#endif
1123 1108
1124 void x_cb (XEvent &xev); 1109 void x_cb (XEvent &xev);
… …
1222 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);
1223 1208
1224 bool IMisRunning (); 1209 bool IMisRunning ();
1225 void IMSendSpot (); 1210 void IMSendSpot ();
1226 bool IM_get_IC (const char *modifiers); 1211 bool IM_get_IC (const char *modifiers);
1227 void IMSetStatusPosition (); 1212 void IMSetPosition ();
1228#endif 1213#endif
1229 1214
1230 void resize_scrollbar (); 1215 void resize_scrollbar ();
1231 1216
1232 // command.C 1217 // command.C
1233 void lookup_key (XKeyEvent &ev); 1218 void key_press (XKeyEvent &ev);
1219 void key_release (XKeyEvent &ev);
1234 unsigned int cmd_write (const char *str, unsigned int count); 1220 unsigned int cmd_write (const char *str, unsigned int count);
1235 1221
1236 wchar_t next_char () NOTHROW; 1222 wchar_t next_char () NOTHROW;
1237 wchar_t cmd_getc () THROW ((class out_of_input)); 1223 wchar_t cmd_getc () THROW ((class out_of_input));
1238 uint32_t next_octet () NOTHROW; 1224 uint32_t next_octet () NOTHROW;
… …
1242 void mouse_report (XButtonEvent &ev); 1228 void mouse_report (XButtonEvent &ev);
1243 void button_press (XButtonEvent &ev); 1229 void button_press (XButtonEvent &ev);
1244 void button_release (XButtonEvent &ev); 1230 void button_release (XButtonEvent &ev);
1245 void focus_in (); 1231 void focus_in ();
1246 void focus_out (); 1232 void focus_out ();
1233 void update_fade_color (unsigned int idx);
1247 int check_our_parents (); 1234 int check_our_parents ();
1248#ifdef PRINTPIPE 1235#ifdef PRINTPIPE
1249 FILE *popen_printer (); 1236 FILE *popen_printer ();
1250 int pclose_printer (FILE *stream); 1237 int pclose_printer (FILE *stream);
1251#endif 1238#endif
… …
1273 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);
1274 void set_title (const char *str); 1261 void set_title (const char *str);
1275 void set_icon_name (const char *str); 1262 void set_icon_name (const char *str);
1276 void set_window_color (int idx, const char *color); 1263 void set_window_color (int idx, const char *color);
1277 void set_colorfgbg (); 1264 void set_colorfgbg ();
1278 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);
1279 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1267 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1280 1268
1281 // screen.C 1269 // screen.C
1282 1270
1283 void lalloc (line_t &l) const 1271 void lalloc (line_t &l) const

Diff Legend

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