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.247 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.257 by root, Wed May 31 00:35:56 2006 UTC

… …
32#if ENABLE_FRILLS 32#if ENABLE_FRILLS
33# include <X11/Xmd.h> 33# include <X11/Xmd.h>
34#endif 34#endif
35 35
36#include "encoding.h" 36#include "encoding.h"
37#include "rxvtutil.h"
37#include "rxvtfont.h" 38#include "rxvtfont.h"
38#include "rxvttoolkit.h" 39#include "rxvttoolkit.h"
39#include "iom.h" 40#include "iom.h"
40#include "salloc.h" 41#include "salloc.h"
41#include "libptytty.h" 42#include "libptytty.h"
… …
97# define STDOUT_FILENO 1 98# define STDOUT_FILENO 1
98# define STDERR_FILENO 2 99# define STDERR_FILENO 2
99#endif 100#endif
100 101
101/****************************************************************************/ 102/****************************************************************************/
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 103
124// exception thrown on fatal (per-instance) errors 104// exception thrown on fatal (per-instance) errors
125class rxvt_failure_exception { }; 105class rxvt_failure_exception { };
126 106
127// exception thrown when the command parser runs out of input data 107// exception thrown when the command parser runs out of input data
… …
608#endif 588#endif
609}; 589};
610 590
611#define Color_Bits 7 // 0 .. maxTermCOLOR 591#define Color_Bits 7 // 0 .. maxTermCOLOR
612 592
613#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
614#define NPIXCLR_BITS 32
615
616/* 593/*
617 * Resource list 594 * Resource list
618 */ 595 */
619enum { 596enum {
620# define def(name) Rs_ ## name, 597# define def(name) Rs_ ## name,
… …
751#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 728#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
752#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 729#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
753 730
754#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 731#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
755 732
756#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 733#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
757#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 734#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
758 735
759#if ENABLE_STYLES 736#if ENABLE_STYLES
760# define FONTSET(style) fontset[GET_STYLE (style)] 737# define FONTSET(style) fontset[GET_STYLE (style)]
761#else 738#else
762# define FONTSET(style) fontset[0] 739# define FONTSET(style) fontset[0]
… …
796# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g)) 773# define XPMClearArea(a, b, c, d, e, f, g) XClearArea((a), (b), (c), (d), (e), (f), (g))
797#else 774#else
798# define XPMClearArea(a, b, c, d, e, f, g) 775# define XPMClearArea(a, b, c, d, e, f, g)
799#endif 776#endif
800 777
801typedef callback1<void, const char *> log_callback; 778typedef callback<void (const char *)> log_callback;
802typedef callback1<int, int> getfd_callback; 779typedef callback<int (int)> getfd_callback;
803 780
804#define SET_LOCALE(locale) rxvt_set_locale (locale) 781#define SET_LOCALE(locale) rxvt_set_locale (locale)
805extern bool rxvt_set_locale (const char *locale) NOTHROW; 782extern bool rxvt_set_locale (const char *locale) NOTHROW;
806extern void rxvt_push_locale (const char *locale) NOTHROW; 783extern void rxvt_push_locale (const char *locale) NOTHROW;
807extern void rxvt_pop_locale () NOTHROW; 784extern void rxvt_pop_locale () NOTHROW;
… …
872# define COMPOSE_LO 0x40000000UL 849# define COMPOSE_LO 0x40000000UL
873# define COMPOSE_HI 0x400fffffUL 850# define COMPOSE_HI 0x400fffffUL
874# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 851# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
875#else 852#else
876# if ENABLE_PERL 853# if ENABLE_PERL
877# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 854# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
878# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 855# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
879# else 856# else
880# define COMPOSE_LO 0xd800UL 857# define COMPOSE_LO 0xd800UL
881# define COMPOSE_HI 0xf8ffUL 858# define COMPOSE_HI 0xf8ffUL
882# endif 859# endif
… …
911#endif 888#endif
912 889
913/****************************************************************************/ 890/****************************************************************************/
914 891
915#ifdef KEYSYM_RESOURCE 892#ifdef KEYSYM_RESOURCE
916 class keyboard_manager; 893class keyboard_manager;
917#endif 894#endif
918 895
919struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen { 896struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
897
898 // special markers with magic addresses
899 static const char resval_undef []; // options specifically unset
900 static const char resval_on []; // boolean options switched on
901 static const char resval_off []; // or off
902
920 log_callback *log_hook; // log error messages through this hook, if != 0 903 log_callback *log_hook; // log error messages through this hook, if != 0
921 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 904 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
922#if ENABLE_PERL 905#if ENABLE_PERL
923 rxvt_perl_term perl; 906 rxvt_perl_term perl;
924#endif 907#endif
925 struct mbstate mbstate; // current input multibyte state 908 struct mbstate mbstate; // current input multibyte state
… …
964 int num_scr; /* screen: number lines scrolled */ 947 int num_scr; /* screen: number lines scrolled */
965 int prev_ncol, /* screen: previous number of columns */ 948 int prev_ncol, /* screen: previous number of columns */
966 prev_nrow; /* screen: previous number of rows */ 949 prev_nrow; /* screen: previous number of rows */
967/* ---------- */ 950/* ---------- */
968 rend_t rstyle; 951 rend_t rstyle;
969/* ---------- */
970 uint32_t pixcolor_set[NPIXCLR_SETS];
971/* ---------- */ 952/* ---------- */
972#ifdef SELECTION_SCROLLING 953#ifdef SELECTION_SCROLLING
973 int scroll_selection_lines; 954 int scroll_selection_lines;
974 enum page_dirn scroll_selection_dir; 955 enum page_dirn scroll_selection_dir;
975 int selection_save_x, 956 int selection_save_x,
… …
1114 1095
1115 long vt_emask, vt_emask_perl, vt_emask_xim; 1096 long vt_emask, vt_emask_perl, vt_emask_xim;
1116 1097
1117 void vt_select_input () const NOTHROW 1098 void vt_select_input () const NOTHROW
1118 { 1099 {
1119 XSelectInput (xdisp, vt, vt_emask | vt_emask_perl | vt_emask_xim); 1100 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1120 } 1101 }
1121 1102
1122#if TRANSPARENT 1103#if TRANSPARENT
1123 void rootwin_cb (XEvent &xev); 1104 void rootwin_cb (XEvent &xev);
1124 xevent_watcher rootwin_ev; 1105 xevent_watcher rootwin_ev;
… …
1225 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1206 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1226 1207
1227 bool IMisRunning (); 1208 bool IMisRunning ();
1228 void IMSendSpot (); 1209 void IMSendSpot ();
1229 bool IM_get_IC (const char *modifiers); 1210 bool IM_get_IC (const char *modifiers);
1230 void IMSetStatusPosition (); 1211 void IMSetPosition ();
1231#endif 1212#endif
1232 1213
1233 void resize_scrollbar (); 1214 void resize_scrollbar ();
1234 1215
1235 // command.C 1216 // command.C
1236 void lookup_key (XKeyEvent &ev); 1217 void key_press (XKeyEvent &ev);
1218 void key_release (XKeyEvent &ev);
1237 unsigned int cmd_write (const char *str, unsigned int count); 1219 unsigned int cmd_write (const char *str, unsigned int count);
1238 1220
1239 wchar_t next_char () NOTHROW; 1221 wchar_t next_char () NOTHROW;
1240 wchar_t cmd_getc () THROW ((class out_of_input)); 1222 wchar_t cmd_getc () THROW ((class out_of_input));
1241 uint32_t next_octet () NOTHROW; 1223 uint32_t next_octet () NOTHROW;
… …
1276 void set_utf8_property (Atom prop, const char *str, int len = -1); 1258 void set_utf8_property (Atom prop, const char *str, int len = -1);
1277 void set_title (const char *str); 1259 void set_title (const char *str);
1278 void set_icon_name (const char *str); 1260 void set_icon_name (const char *str);
1279 void set_window_color (int idx, const char *color); 1261 void set_window_color (int idx, const char *color);
1280 void set_colorfgbg (); 1262 void set_colorfgbg ();
1281 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1263 bool set_color (rxvt_color &color, const char *name);
1264 void alias_color (int dst, int src);
1282 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1265 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1283 1266
1284 // screen.C 1267 // screen.C
1285 1268
1286 void lalloc (line_t &l) const 1269 void lalloc (line_t &l) const

Diff Legend

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