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.233 by root, Sun Jan 22 00:36:59 2006 UTC vs.
Revision 1.262 by root, Sat Aug 26 06:37:10 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 CURSOR_BLINK 1 21# define CURSOR_BLINK 1
22# define OPTION_HC 1
21#else 23#else
22# define ENABLE_MINIMAL 1 24# define ENABLE_MINIMAL 1
23#endif 25#endif
24 26
25#include <limits.h> 27#include <limits.h>
… …
31#if ENABLE_FRILLS 33#if ENABLE_FRILLS
32# include <X11/Xmd.h> 34# include <X11/Xmd.h>
33#endif 35#endif
34 36
35#include "encoding.h" 37#include "encoding.h"
38#include "rxvtutil.h"
36#include "rxvtfont.h" 39#include "rxvtfont.h"
37#include "rxvttoolkit.h" 40#include "rxvttoolkit.h"
38#include "iom.h" 41#include "iom.h"
39#include "salloc.h" 42#include "salloc.h"
43#include "libptytty.h"
40 44
41#include "rxvtperl.h" 45#include "rxvtperl.h"
42 46
43// try to avoid some macros to decrease code size, on some systems 47// try to avoid some macros to decrease code size, on some systems
44#if ENABLE_MINIMAL 48#if ENABLE_MINIMAL
… …
96# define STDERR_FILENO 2 100# define STDERR_FILENO 2
97#endif 101#endif
98 102
99/****************************************************************************/ 103/****************************************************************************/
100 104
101#ifndef __attribute__
102# if __GNUC__
103# if (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || (__GNUC__ < 2)
104# define __attribute__(x)
105# endif
106# endif
107# define __attribute__(x)
108#endif
109
110#define NORETURN __attribute__ ((noreturn))
111#define UNUSED __attribute__ ((unused))
112
113// increases code size unless -fno-enforce-eh-specs
114#if __GNUC__
115# define NOTHROW
116# define THROW(x)
117#else
118# define NOTHROW throw()
119# define THROW(x) throw x
120#endif
121
122// exception thrown on fatal (per-instance) errors 105// exception thrown on fatal (per-instance) errors
123class rxvt_failure_exception { }; 106class rxvt_failure_exception { };
124 107
125// exception thrown when the command parser runs out of input data 108// exception thrown when the command parser runs out of input data
126class out_of_input { }; 109class out_of_input { };
… …
168extern char **environ; 151extern char **environ;
169extern char **rxvt_environ; // the original environ pointer 152extern char **rxvt_environ; // the original environ pointer
170 153
171inline void set_environ (stringvec *envv) 154inline void set_environ (stringvec *envv)
172{ 155{
156#if ENABLE_PERL
157 assert (envv);
158#else
173 if (envv) 159 if (envv)
160#endif
174 environ = (char **)envv->begin (); 161 environ = (char **)envv->begin ();
175} 162}
176 163
177inline void set_environ (char **envv) 164inline void set_environ (char **envv)
178{ 165{
166#if ENABLE_PERL
167 assert (envv);
168#else
179 if (envv) 169 if (envv)
170#endif
180 environ = envv; 171 environ = envv;
181} 172}
182 173
183/* 174/*
184 ***************************************************************************** 175 *****************************************************************************
… …
200typedef struct { 191typedef struct {
201 short w, h, x, y; 192 short w, h, x, y;
202 Pixmap pixmap; 193 Pixmap pixmap;
203} bgPixmap_t; 194} bgPixmap_t;
204#endif 195#endif
205
206struct rxvt_ptytty {
207 int pty; // pty file descriptor; connected to rxvt
208 int tty; // tty file descriptor; connected to child
209
210 rxvt_ptytty ()
211 : pty(-1), tty(-1)
212 {
213 }
214
215 virtual ~rxvt_ptytty ()
216 {
217 }
218
219 virtual bool get () = 0;
220 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
221
222 void close_tty ();
223 bool make_controlling_tty ();
224 void set_utf8_mode (bool on);
225};
226
227rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
228void rxvt_ptytty_server (); // start the ptytty server process
229 196
230/* 197/*
231 * the 'essential' information for reporting Mouse Events 198 * the 'essential' information for reporting Mouse Events
232 * pared down from XButtonEvent 199 * pared down from XButtonEvent
233 */ 200 */
… …
446// fake styles 413// fake styles
447#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
448#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
449#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
450 417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
420
451// 5 custom bits for extensions 421// 5 custom bits for extensions
452#define RS_customCount 32 422#define RS_customCount 32
453#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
454#define RS_customShift 19 424#define RS_customShift 19
455 425
… …
524 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
525 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
526 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
527 497
528 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
529 500
530 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
531 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
532 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
533 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
618#endif 589#endif
619}; 590};
620 591
621#define Color_Bits 7 // 0 .. maxTermCOLOR 592#define Color_Bits 7 // 0 .. maxTermCOLOR
622 593
623#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
624#define NPIXCLR_BITS 32
625
626/* 594/*
627 * Resource list 595 * Resource list
628 */ 596 */
629enum { 597enum {
630# define def(name) Rs_ ## name, 598# define def(name) Rs_ ## name,
631# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 599# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
632# include "rsinc.h" 600# include "rsinc.h"
633# undef def 601# undef def
634# undef reserve 602# undef reserve
635 NUM_RESOURCES 603 NUM_RESOURCES
636};
637
638// see init.C:xa_names, which must be kept in sync
639enum {
640 XA_TEXT = 0,
641 XA_COMPOUND_TEXT,
642 XA_UTF8_STRING,
643 XA_MULTIPLE,
644 XA_TARGETS,
645 XA_TIMESTAMP,
646 XA_VT_SELECTION,
647 XA_INCR,
648 XA_WM_PROTOCOLS,
649 XA_WM_DELETE_WINDOW,
650 XA_CLIPBOARD,
651#if ENABLE_FRILLS
652 XA_MOTIF_WM_HINTS,
653#endif
654#if ENABLE_EWMH
655 XA_NET_WM_PID,
656 XA_NET_WM_NAME,
657 XA_NET_WM_ICON_NAME,
658 XA_NET_WM_PING,
659#endif
660#if USE_XIM
661 XA_WM_LOCALE_NAME,
662#endif
663#if TRANSPARENT
664 XA_XROOTPMAP_ID,
665 XA_ESETROOT_PMAP_ID,
666#endif
667#if ENABLE_XEMBED
668 XA_XEMBED,
669 XA_XEMBED_INFO,
670#endif
671 NUM_XA
672}; 604};
673 605
674/* DEC private modes */ 606/* DEC private modes */
675#define PrivMode_132 (1UL<<0) 607#define PrivMode_132 (1UL<<0)
676#define PrivMode_132OK (1UL<<1) 608#define PrivMode_132OK (1UL<<1)
… …
749 ***************************************************************************** 681 *****************************************************************************
750 * MACRO DEFINES 682 * MACRO DEFINES
751 ***************************************************************************** 683 *****************************************************************************
752 */ 684 */
753#define dLocal(type,name) type const name = this->name 685#define dLocal(type,name) type const name = this->name
754#define dDisp Display *disp = this->display->display 686
687// for speed reasons, we assume that all latin1 characters
688// are single-width (the first unicode combining character
689// is actually 0x300, but ascii is what matters most).
690#define WCWIDTH(c) ((c) & ~0xff ? wcwidth (c) : 1)
755 691
756/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
757#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
758#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
759#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 695#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
793#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
794#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 730#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
795 731
796#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 732#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
797 733
798#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
799#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
800 736
801#if ENABLE_STYLES 737#if ENABLE_STYLES
802# define FONTSET(style) fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
803#else 739#else
804# define FONTSET(style) fontset[0] 740# define FONTSET(style) fontset[0]
… …
838# 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))
839#else 775#else
840# define XPMClearArea(a, b, c, d, e, f, g) 776# define XPMClearArea(a, b, c, d, e, f, g)
841#endif 777#endif
842 778
843#ifdef DEBUG_CMD
844# define D_CMD(x) fprintf x ; fputc('\n', stderr)
845#else
846# define D_CMD(x)
847#endif
848#ifdef DEBUG_INIT
849# define D_INIT(x) fprintf x ; fputc('\n', stderr)
850#else
851# define D_INIT(x)
852#endif
853#ifdef DEBUG_MAIN
854# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
855#else
856# define D_MAIN(x)
857#endif
858#ifdef DEBUG_SIZE
859# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
860#else
861# define D_SIZE(x)
862#endif
863
864typedef callback1<void, const char *> log_callback; 779typedef callback<void (const char *)> log_callback;
865typedef callback1<int, int> getfd_callback; 780typedef callback<int (int)> getfd_callback;
866 781
867#define SET_LOCALE(locale) rxvt_set_locale (locale) 782#define SET_LOCALE(locale) rxvt_set_locale (locale)
868extern bool rxvt_set_locale (const char *locale) NOTHROW; 783extern bool rxvt_set_locale (const char *locale) NOTHROW;
869extern void rxvt_push_locale (const char *locale) NOTHROW; 784extern void rxvt_push_locale (const char *locale) NOTHROW;
870extern void rxvt_pop_locale () NOTHROW; 785extern void rxvt_pop_locale () NOTHROW;
… …
872/****************************************************************************/ 787/****************************************************************************/
873 788
874#define LINE_LONGER 0x0001 // line is continued on the next row 789#define LINE_LONGER 0x0001 // line is continued on the next row
875#define LINE_FILTERED 0x0002 // line has been filtered 790#define LINE_FILTERED 0x0002 // line has been filtered
876#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI) 791#define LINE_COMPRESSED 0x0004 // line has been compressed (NYI)
792#define LINE_FILTER 0x0008 // line needs to be filtered before display (NYI)
793#define LINE_BIDI 0x0010 // line needs bidi (NYI)
877 794
878struct line_t { 795struct line_t {
879 text_t *t; // terminal the text 796 text_t *t; // terminal the text
880 rend_t *r; // rendition, uses RS_ flags 797 rend_t *r; // rendition, uses RS_ flags
881 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line 798 tlen_t_ l; // length of each text line, LINE_CONT == continued on next line
… …
935# define COMPOSE_LO 0x40000000UL 852# define COMPOSE_LO 0x40000000UL
936# define COMPOSE_HI 0x400fffffUL 853# define COMPOSE_HI 0x400fffffUL
937# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
938#else 855#else
939# if ENABLE_PERL 856# if ENABLE_PERL
940# define COMPOSE_LO 0xe000UL // our _own_ routiens don't like (illegal) surrogates 857# define COMPOSE_LO 0xe000UL // our _own_ functions don't like (illegal) surrogates
941# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only 858# define COMPOSE_HI 0xf8ffUL // in utf-8, so use private use area only
942# else 859# else
943# define COMPOSE_LO 0xd800UL 860# define COMPOSE_LO 0xd800UL
944# define COMPOSE_HI 0xf8ffUL 861# define COMPOSE_HI 0xf8ffUL
945# endif 862# endif
… …
974#endif 891#endif
975 892
976/****************************************************************************/ 893/****************************************************************************/
977 894
978#ifdef KEYSYM_RESOURCE 895#ifdef KEYSYM_RESOURCE
979 class keyboard_manager; 896class keyboard_manager;
980#endif 897#endif
981 898
982struct rxvt_term : zero_initialized, rxvt_vars { 899struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
900
901 // special markers with magic addresses
902 static const char resval_undef []; // options specifically unset
903 static const char resval_on []; // boolean options switched on
904 static const char resval_off []; // or off
905
983 log_callback *log_hook; // log error messages through this hook, if != 0 906 log_callback *log_hook; // log error messages through this hook, if != 0
984 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 907 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
985#if ENABLE_PERL 908#if ENABLE_PERL
986 rxvt_perl_term perl; 909 rxvt_perl_term perl;
987#endif 910#endif
988 struct mbstate mbstate; // current input multibyte state 911 struct mbstate mbstate; // current input multibyte state
… …
1027 int num_scr; /* screen: number lines scrolled */ 950 int num_scr; /* screen: number lines scrolled */
1028 int prev_ncol, /* screen: previous number of columns */ 951 int prev_ncol, /* screen: previous number of columns */
1029 prev_nrow; /* screen: previous number of rows */ 952 prev_nrow; /* screen: previous number of rows */
1030/* ---------- */ 953/* ---------- */
1031 rend_t rstyle; 954 rend_t rstyle;
1032/* ---------- */
1033 uint32_t pixcolor_set[NPIXCLR_SETS];
1034/* ---------- */ 955/* ---------- */
1035#ifdef SELECTION_SCROLLING 956#ifdef SELECTION_SCROLLING
1036 int scroll_selection_lines; 957 int scroll_selection_lines;
1037 enum page_dirn scroll_selection_dir; 958 enum page_dirn scroll_selection_dir;
1038 int selection_save_x, 959 int selection_save_x,
… …
1065 int old_width, /* last used width in screen resize */ 986 int old_width, /* last used width in screen resize */
1066 old_height; /* last used height in screen resize */ 987 old_height; /* last used height in screen resize */
1067 unsigned long priv_modes, 988 unsigned long priv_modes,
1068 SavedModes; 989 SavedModes;
1069/* ---------- */ 990/* ---------- */
1070 Atom xa[NUM_XA]; 991 Atom *xa;
1071/* ---------- */ 992/* ---------- */
1072#ifdef RXVT_SCROLLBAR 993#ifdef RXVT_SCROLLBAR
1073 GC scrollbarGC, 994 GC scrollbarGC,
1074 topShadowGC, 995 topShadowGC,
1075 botShadowGC; 996 botShadowGC;
… …
1132 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1053 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1133#endif 1054#endif
1134 1055
1135 vector<void *> allocated; // free these memory blocks with free() 1056 vector<void *> allocated; // free these memory blocks with free()
1136 1057
1137 char *env_windowid; /* environmental variable WINDOWID */ 1058 char env_windowid[21]; /* environmental variable WINDOWID */
1059 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1138 char *env_display; /* environmental variable DISPLAY */ 1060 char *env_display; /* environmental variable DISPLAY */
1139 char *env_term; /* environmental variable TERM */ 1061 char *env_term; /* environmental variable TERM */
1140 char *env_colorfgbg; 1062
1141 char *locale; 1063 char *locale;
1142 char charsets[4]; 1064 char charsets[4];
1143 char *v_buffer; /* pointer to physical buffer */ 1065 char *v_buffer; /* pointer to physical buffer */
1144 unsigned int v_buflen; /* size of area to write */ 1066 unsigned int v_buflen; /* size of area to write */
1145 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1067 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1146 1068
1147#ifdef KEYSYM_RESOURCE 1069#ifdef KEYSYM_RESOURCE
1148 keyboard_manager *keyboard; 1070 keyboard_manager *keyboard;
1149#endif 1071#endif
1150 1072
1151 const char *rs[NUM_RESOURCES]; 1073 const char *rs[NUM_RESOURCES];
1152 /* command input buffering */ 1074 /* command input buffering */
1153 char *cmdbuf_ptr, *cmdbuf_endp; 1075 char *cmdbuf_ptr, *cmdbuf_endp;
1154 char cmdbuf_base[CBUFSIZ]; 1076 char cmdbuf_base[CBUFSIZ];
1155 1077
1156 rxvt_ptytty *pty; 1078 ptytty *pty;
1157 1079
1158 rxvt_salloc *talloc; // text line allocator 1080 rxvt_salloc *talloc; // text line allocator
1159 rxvt_salloc *ralloc; // rend line allocator 1081 rxvt_salloc *ralloc; // rend line allocator
1160 1082
1161 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1083 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
… …
1172#endif 1094#endif
1173 1095
1174 // modifies first argument(!) 1096 // modifies first argument(!)
1175 void paste (char *data, unsigned int len) NOTHROW; 1097 void paste (char *data, unsigned int len) NOTHROW;
1176 1098
1177 long vt_emask, vt_emask_perl; 1099 long vt_emask, vt_emask_perl, vt_emask_xim;
1178 1100
1179 void vt_select_input () const NOTHROW 1101 void vt_select_input () const NOTHROW
1180 { 1102 {
1181 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1103 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1182 } 1104 }
1183 1105
1184#if TRANSPARENT 1106#if TRANSPARENT || ENABLE_PERL
1185 void rootwin_cb (XEvent &xev); 1107 void rootwin_cb (XEvent &xev);
1186 xevent_watcher rootwin_ev; 1108 xevent_watcher rootwin_ev;
1187#endif 1109#endif
1188 1110
1189 void x_cb (XEvent &xev); 1111 void x_cb (XEvent &xev);
… …
1251 bool pty_fill (); 1173 bool pty_fill ();
1252 1174
1253 void make_current () const // make this the "currently active" urxvt instance 1175 void make_current () const // make this the "currently active" urxvt instance
1254 { 1176 {
1255 SET_R (this); 1177 SET_R (this);
1178 set_environ (envv);
1256 rxvt_set_locale (locale); 1179 rxvt_set_locale (locale);
1257 set_environ (envv);
1258 } 1180 }
1259 1181
1260 void init_secondary (); 1182 void init_secondary ();
1261 const char **init_resources (int argc, const char *const *argv); 1183 const char **init_resources (int argc, const char *const *argv);
1262 const char *x_resource (const char *name); 1184 const char *x_resource (const char *name);
… …
1272 void create_windows (int argc, const char *const *argv); 1194 void create_windows (int argc, const char *const *argv);
1273 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent); 1195 void resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent);
1274 void window_calc (unsigned int newwidth, unsigned int newheight); 1196 void window_calc (unsigned int newwidth, unsigned int newheight);
1275 1197
1276#if USE_XIM 1198#if USE_XIM
1277 rxvt_xim *input_method; 1199 rxvt_xim *input_method;
1278 XIC Input_Context; 1200 XIC Input_Context;
1279 XIMStyle input_style; 1201 XIMStyle input_style;
1280 XPoint spot; // most recently sent spot position 1202 XPoint spot; // most recently sent spot position
1281 1203
1282 void im_destroy (); 1204 void im_destroy ();
1283 void im_cb (); im_watcher im_ev; 1205 void im_cb (); im_watcher im_ev;
1284 void im_set_size (XRectangle &size); 1206 void im_set_size (XRectangle &size);
1285 void im_set_position (XPoint &pos) NOTHROW; 1207 void im_set_position (XPoint &pos) NOTHROW;
… …
1287 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1209 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1288 1210
1289 bool IMisRunning (); 1211 bool IMisRunning ();
1290 void IMSendSpot (); 1212 void IMSendSpot ();
1291 bool IM_get_IC (const char *modifiers); 1213 bool IM_get_IC (const char *modifiers);
1292 void IMSetStatusPosition (); 1214 void IMSetPosition ();
1293#endif 1215#endif
1294 1216
1295 void resize_scrollbar (); 1217 void resize_scrollbar ();
1296 1218
1297 // command.C 1219 // command.C
1298 void lookup_key (XKeyEvent &ev); 1220 void key_press (XKeyEvent &ev);
1221 void key_release (XKeyEvent &ev);
1299 unsigned int cmd_write (const char *str, unsigned int count); 1222 unsigned int cmd_write (const char *str, unsigned int count);
1300 1223
1301 wchar_t next_char () NOTHROW; 1224 wchar_t next_char () NOTHROW;
1302 wchar_t cmd_getc () THROW ((class out_of_input)); 1225 wchar_t cmd_getc () THROW ((class out_of_input));
1303 uint32_t next_octet () NOTHROW; 1226 uint32_t next_octet () NOTHROW;
… …
1307 void mouse_report (XButtonEvent &ev); 1230 void mouse_report (XButtonEvent &ev);
1308 void button_press (XButtonEvent &ev); 1231 void button_press (XButtonEvent &ev);
1309 void button_release (XButtonEvent &ev); 1232 void button_release (XButtonEvent &ev);
1310 void focus_in (); 1233 void focus_in ();
1311 void focus_out (); 1234 void focus_out ();
1235 void update_fade_color (unsigned int idx);
1312 int check_our_parents (); 1236 int check_our_parents ();
1313#ifdef PRINTPIPE 1237#ifdef PRINTPIPE
1314 FILE *popen_printer (); 1238 FILE *popen_printer ();
1315 int pclose_printer (FILE *stream); 1239 int pclose_printer (FILE *stream);
1316#endif 1240#endif
… …
1338 void set_utf8_property (Atom prop, const char *str, int len = -1); 1262 void set_utf8_property (Atom prop, const char *str, int len = -1);
1339 void set_title (const char *str); 1263 void set_title (const char *str);
1340 void set_icon_name (const char *str); 1264 void set_icon_name (const char *str);
1341 void set_window_color (int idx, const char *color); 1265 void set_window_color (int idx, const char *color);
1342 void set_colorfgbg (); 1266 void set_colorfgbg ();
1343 int rXParseAllocColor (rxvt_color * screen_in_out, const char *colour); 1267 bool set_color (rxvt_color &color, const char *name);
1268 void alias_color (int dst, int src);
1344 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1269 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1345 1270
1346 // screen.C 1271 // screen.C
1347 1272
1348 void lalloc (line_t &l) const NOTHROW 1273 void lalloc (line_t &l) const
1349 { 1274 {
1350 l.t = (text_t *)talloc->alloc (); 1275 l.t = (text_t *)talloc->alloc ();
1351 l.r = (rend_t *)ralloc->alloc (); 1276 l.r = (rend_t *)ralloc->alloc ();
1352 } 1277 }
1353 1278
… …
1357 talloc->free (l.t); 1282 talloc->free (l.t);
1358 ralloc->free (l.r); 1283 ralloc->free (l.r);
1359 } 1284 }
1360#endif 1285#endif
1361 1286
1362 void lresize (line_t &l) const NOTHROW 1287 void lresize (line_t &l) const
1363 { 1288 {
1364 if (!l.t) 1289 if (!l.t)
1365 return; 1290 return;
1366 1291
1367 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t)); 1292 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
… …
1435 void scr_remap_chars () NOTHROW; 1360 void scr_remap_chars () NOTHROW;
1436 void scr_remap_chars (line_t &l) NOTHROW; 1361 void scr_remap_chars (line_t &l) NOTHROW;
1437 1362
1438 enum cursor_mode { SAVE, RESTORE }; 1363 enum cursor_mode { SAVE, RESTORE };
1439 1364
1440 void scr_poweron () NOTHROW; 1365 void scr_poweron ();
1441 void scr_cursor (cursor_mode mode) NOTHROW; 1366 void scr_cursor (cursor_mode mode) NOTHROW;
1442 void scr_do_wrap () NOTHROW; 1367 void scr_do_wrap () NOTHROW;
1368 void scr_swap_screen () NOTHROW;
1443 int scr_change_screen (int scrn) NOTHROW; 1369 void scr_change_screen (int scrn);
1444 void scr_color (unsigned int color, int fgbg) NOTHROW; 1370 void scr_color (unsigned int color, int fgbg) NOTHROW;
1445 void scr_rendition (int set, int style) NOTHROW; 1371 void scr_rendition (int set, int style) NOTHROW;
1446 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW; 1372 void scr_add_lines (const wchar_t *str, int len, int minlines = 0) NOTHROW;
1447 void scr_backspace () NOTHROW; 1373 void scr_backspace () NOTHROW;
1448 void scr_tab (int count, bool ht = false) NOTHROW; 1374 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1540# define __PROTO(p) p 1466# define __PROTO(p) p
1541#else 1467#else
1542# define __PROTO(p) () 1468# define __PROTO(p) ()
1543#endif 1469#endif
1544 1470
1545#ifdef DEBUG_malloc
1546# include "dmalloc.h" /* This comes last */
1547#endif
1548
1549#endif /* _RXVT_H_ */ 1471#endif /* _RXVT_H_ */
1550 1472

Diff Legend

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