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.232 by root, Sat Jan 21 23:50:33 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 { };
… …
141// misc.C 124// misc.C
142char * rxvt_wcstombs (const wchar_t *str, int len = -1); 125char * rxvt_wcstombs (const wchar_t *str, int len = -1);
143wchar_t * rxvt_mbstowcs (const char *str, int len = -1); 126wchar_t * rxvt_mbstowcs (const char *str, int len = -1);
144char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1); 127char * rxvt_wcstoutf8 (const wchar_t *str, int len = -1);
145wchar_t * rxvt_utf8towcs (const char *str, int len = -1); 128wchar_t * rxvt_utf8towcs (const char *str, int len = -1);
129char * rxvt_strdup_cpp (const char *str);
146 130
147#define rxvt_strdup(s) ((s) ? strdup(s) : 0) 131#define rxvt_strdup(s) ((s) ? strdup(s) : 0)
148 132
149char * rxvt_r_basename (const char *str) NOTHROW; 133char * rxvt_r_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 134void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
… …
167extern char **environ; 151extern char **environ;
168extern char **rxvt_environ; // the original environ pointer 152extern char **rxvt_environ; // the original environ pointer
169 153
170inline void set_environ (stringvec *envv) 154inline void set_environ (stringvec *envv)
171{ 155{
156#if ENABLE_PERL
157 assert (envv);
158#else
172 if (envv) 159 if (envv)
160#endif
173 environ = (char **)envv->begin (); 161 environ = (char **)envv->begin ();
174} 162}
175 163
176inline void set_environ (char **envv) 164inline void set_environ (char **envv)
177{ 165{
166#if ENABLE_PERL
167 assert (envv);
168#else
178 if (envv) 169 if (envv)
170#endif
179 environ = envv; 171 environ = envv;
180} 172}
181 173
182/* 174/*
183 ***************************************************************************** 175 *****************************************************************************
… …
199typedef struct { 191typedef struct {
200 short w, h, x, y; 192 short w, h, x, y;
201 Pixmap pixmap; 193 Pixmap pixmap;
202} bgPixmap_t; 194} bgPixmap_t;
203#endif 195#endif
204
205struct rxvt_ptytty {
206 int pty; // pty file descriptor; connected to rxvt
207 int tty; // tty file descriptor; connected to child
208
209 rxvt_ptytty ()
210 : pty(-1), tty(-1)
211 {
212 }
213
214 virtual ~rxvt_ptytty ()
215 {
216 }
217
218 virtual bool get () = 0;
219#if UTMP_SUPPORT
220 virtual void login (int cmd_pid, bool login_shell, const char *hostname) = 0;
221#endif
222
223 void close_tty ();
224 bool make_controlling_tty ();
225 void set_utf8_mode (bool on);
226};
227
228rxvt_ptytty *rxvt_new_ptytty (); // create a new pty object
229void rxvt_ptytty_server (); // start the ptytty server process
230 196
231/* 197/*
232 * the 'essential' information for reporting Mouse Events 198 * the 'essential' information for reporting Mouse Events
233 * pared down from XButtonEvent 199 * pared down from XButtonEvent
234 */ 200 */
… …
447// fake styles 413// fake styles
448#define RS_Blink 0x00010000UL // blink 414#define RS_Blink 0x00010000UL // blink
449#define RS_RVid 0x00020000UL // reverse video 415#define RS_RVid 0x00020000UL // reverse video
450#define RS_Uline 0x00040000UL // underline 416#define RS_Uline 0x00040000UL // underline
451 417
418// toggle this to force redraw, must be != RS_Careful
419#define RS_redraw 0x01000000UL
420
452// 5 custom bits for extensions 421// 5 custom bits for extensions
453#define RS_customCount 32 422#define RS_customCount 32
454#define RS_customMask 0x00f80000UL 423#define RS_customMask 0x00f80000UL
455#define RS_customShift 19 424#define RS_customShift 19
456 425
… …
525 Rxvt_restoreFG = 39, // change default fg color 494 Rxvt_restoreFG = 39, // change default fg color
526 Rxvt_restoreBG = 49, // change default bg color 495 Rxvt_restoreBG = 49, // change default bg color
527 Rxvt_dumpscreen = 55, // dump scrollback and all of screen 496 Rxvt_dumpscreen = 55, // dump scrollback and all of screen
528 497
529 URxvt_locale = 701, // change locale 498 URxvt_locale = 701, // change locale
499 URxvt_version = 702, // request version
530 500
531 URxvt_Color_IT = 704, // change actual 'Italic' colour 501 URxvt_Color_IT = 704, // change actual 'Italic' colour
532 URxvt_Color_tint = 705, // change actual tint colour 502 URxvt_Color_tint = 705, // change actual tint colour
533 URxvt_Color_BD = 706, 503 URxvt_Color_BD = 706,
534 URxvt_Color_UL = 707, 504 URxvt_Color_UL = 707,
… …
619#endif 589#endif
620}; 590};
621 591
622#define Color_Bits 7 // 0 .. maxTermCOLOR 592#define Color_Bits 7 // 0 .. maxTermCOLOR
623 593
624#define NPIXCLR_SETS ((TOTAL_COLORS + 31) / 32)
625#define NPIXCLR_BITS 32
626
627/* 594/*
628 * Resource list 595 * Resource list
629 */ 596 */
630enum { 597enum {
631# define def(name) Rs_ ## name, 598# define def(name) Rs_ ## name,
632# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1, 599# define reserve(name,count) Rs_ ## name ## _ = Rs_ ## name + (count) - 1,
633# include "rsinc.h" 600# include "rsinc.h"
634# undef def 601# undef def
635# undef reserve 602# undef reserve
636 NUM_RESOURCES 603 NUM_RESOURCES
637};
638
639// see init.C:xa_names, which must be kept in sync
640enum {
641 XA_TEXT = 0,
642 XA_COMPOUND_TEXT,
643 XA_UTF8_STRING,
644 XA_MULTIPLE,
645 XA_TARGETS,
646 XA_TIMESTAMP,
647 XA_VT_SELECTION,
648 XA_INCR,
649 XA_WM_PROTOCOLS,
650 XA_WM_DELETE_WINDOW,
651 XA_CLIPBOARD,
652#if ENABLE_FRILLS
653 XA_MOTIF_WM_HINTS,
654#endif
655#if ENABLE_EWMH
656 XA_NET_WM_PID,
657 XA_NET_WM_NAME,
658 XA_NET_WM_ICON_NAME,
659 XA_NET_WM_PING,
660#endif
661#if USE_XIM
662 XA_WM_LOCALE_NAME,
663#endif
664#if TRANSPARENT
665 XA_XROOTPMAP_ID,
666 XA_ESETROOT_PMAP_ID,
667#endif
668#if ENABLE_XEMBED
669 XA_XEMBED,
670 XA_XEMBED_INFO,
671#endif
672 NUM_XA
673}; 604};
674 605
675/* DEC private modes */ 606/* DEC private modes */
676#define PrivMode_132 (1UL<<0) 607#define PrivMode_132 (1UL<<0)
677#define PrivMode_132OK (1UL<<1) 608#define PrivMode_132OK (1UL<<1)
… …
750 ***************************************************************************** 681 *****************************************************************************
751 * MACRO DEFINES 682 * MACRO DEFINES
752 ***************************************************************************** 683 *****************************************************************************
753 */ 684 */
754#define dLocal(type,name) type const name = this->name 685#define dLocal(type,name) type const name = this->name
755#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)
756 691
757/* convert pixel dimensions to row/column values. Everything as int32_t */ 692/* convert pixel dimensions to row/column values. Everything as int32_t */
758#define Pixel2Col(x) Pixel2Width((int32_t)(x)) 693#define Pixel2Col(x) Pixel2Width((int32_t)(x))
759#define Pixel2Row(y) Pixel2Height((int32_t)(y)) 694#define Pixel2Row(y) Pixel2Height((int32_t)(y))
760#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth) 695#define Pixel2Width(x) ((int32_t)(x) / (int32_t)fwidth)
… …
794#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg)<<Color_Bits))
795#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a)) 730#define SET_ATTR(x,a) (((x) & ~RS_attrMask) | (a))
796 731
797#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful)) 732#define RS_SAME(a,b) (!(((a) ^ (b)) & ~RS_Careful))
798 733
799#define SET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] |= (1 << ((x) % NPIXCLR_BITS))) 734#define PIXCOLOR_NAME(idx) rs[Rs_color + (idx)]
800#define ISSET_PIXCOLOR(x) (pixcolor_set[(x) / NPIXCLR_BITS] & (1 << ((x) % NPIXCLR_BITS))) 735#define ISSET_PIXCOLOR(idx) (!!rs[Rs_color + (idx)])
801 736
802#if ENABLE_STYLES 737#if ENABLE_STYLES
803# define FONTSET(style) fontset[GET_STYLE (style)] 738# define FONTSET(style) fontset[GET_STYLE (style)]
804#else 739#else
805# define FONTSET(style) fontset[0] 740# define FONTSET(style) fontset[0]
… …
839# 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))
840#else 775#else
841# define XPMClearArea(a, b, c, d, e, f, g) 776# define XPMClearArea(a, b, c, d, e, f, g)
842#endif 777#endif
843 778
844#ifdef DEBUG_CMD
845# define D_CMD(x) fprintf x ; fputc('\n', stderr)
846#else
847# define D_CMD(x)
848#endif
849#ifdef DEBUG_INIT
850# define D_INIT(x) fprintf x ; fputc('\n', stderr)
851#else
852# define D_INIT(x)
853#endif
854#ifdef DEBUG_MAIN
855# define D_MAIN(x) fprintf x ; fputc('\n', stderr)
856#else
857# define D_MAIN(x)
858#endif
859#ifdef DEBUG_SIZE
860# define D_SIZE(x) fprintf x ; fputc('\n', stderr)
861#else
862# define D_SIZE(x)
863#endif
864
865typedef callback1<void, const char *> log_callback; 779typedef callback<void (const char *)> log_callback;
866typedef callback1<int, int> getfd_callback; 780typedef callback<int (int)> getfd_callback;
867 781
868#define SET_LOCALE(locale) rxvt_set_locale (locale) 782#define SET_LOCALE(locale) rxvt_set_locale (locale)
869extern bool rxvt_set_locale (const char *locale) NOTHROW; 783extern bool rxvt_set_locale (const char *locale) NOTHROW;
870extern void rxvt_push_locale (const char *locale) NOTHROW; 784extern void rxvt_push_locale (const char *locale) NOTHROW;
871extern void rxvt_pop_locale () NOTHROW; 785extern void rxvt_pop_locale () NOTHROW;
… …
873/****************************************************************************/ 787/****************************************************************************/
874 788
875#define LINE_LONGER 0x0001 // line is continued on the next row 789#define LINE_LONGER 0x0001 // line is continued on the next row
876#define LINE_FILTERED 0x0002 // line has been filtered 790#define LINE_FILTERED 0x0002 // line has been filtered
877#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)
878 794
879struct line_t { 795struct line_t {
880 text_t *t; // terminal the text 796 text_t *t; // terminal the text
881 rend_t *r; // rendition, uses RS_ flags 797 rend_t *r; // rendition, uses RS_ flags
882 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
… …
936# define COMPOSE_LO 0x40000000UL 852# define COMPOSE_LO 0x40000000UL
937# define COMPOSE_HI 0x400fffffUL 853# define COMPOSE_HI 0x400fffffUL
938# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO) 854# define IS_COMPOSE(n) ((int32_t)(n) >= COMPOSE_LO)
939#else 855#else
940# if ENABLE_PERL 856# if ENABLE_PERL
941# 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
942# 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
943# else 859# else
944# define COMPOSE_LO 0xd800UL 860# define COMPOSE_LO 0xd800UL
945# define COMPOSE_HI 0xf8ffUL 861# define COMPOSE_HI 0xf8ffUL
946# endif 862# endif
… …
975#endif 891#endif
976 892
977/****************************************************************************/ 893/****************************************************************************/
978 894
979#ifdef KEYSYM_RESOURCE 895#ifdef KEYSYM_RESOURCE
980 class keyboard_manager; 896class keyboard_manager;
981#endif 897#endif
982 898
983struct 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
984 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
985 getfd_callback *getfd_hook; // convert remote to local fd, if != 0 907 getfd_callback *getfd_hook; // convert remote to local fd, if != 0
986#if ENABLE_PERL 908#if ENABLE_PERL
987 rxvt_perl_term perl; 909 rxvt_perl_term perl;
988#endif 910#endif
989 struct mbstate mbstate; // current input multibyte state 911 struct mbstate mbstate; // current input multibyte state
… …
1028 int num_scr; /* screen: number lines scrolled */ 950 int num_scr; /* screen: number lines scrolled */
1029 int prev_ncol, /* screen: previous number of columns */ 951 int prev_ncol, /* screen: previous number of columns */
1030 prev_nrow; /* screen: previous number of rows */ 952 prev_nrow; /* screen: previous number of rows */
1031/* ---------- */ 953/* ---------- */
1032 rend_t rstyle; 954 rend_t rstyle;
1033/* ---------- */
1034 uint32_t pixcolor_set[NPIXCLR_SETS];
1035/* ---------- */ 955/* ---------- */
1036#ifdef SELECTION_SCROLLING 956#ifdef SELECTION_SCROLLING
1037 int scroll_selection_lines; 957 int scroll_selection_lines;
1038 enum page_dirn scroll_selection_dir; 958 enum page_dirn scroll_selection_dir;
1039 int selection_save_x, 959 int selection_save_x,
… …
1066 int old_width, /* last used width in screen resize */ 986 int old_width, /* last used width in screen resize */
1067 old_height; /* last used height in screen resize */ 987 old_height; /* last used height in screen resize */
1068 unsigned long priv_modes, 988 unsigned long priv_modes,
1069 SavedModes; 989 SavedModes;
1070/* ---------- */ 990/* ---------- */
1071 Atom xa[NUM_XA]; 991 Atom *xa;
1072/* ---------- */ 992/* ---------- */
1073#ifdef RXVT_SCROLLBAR 993#ifdef RXVT_SCROLLBAR
1074 GC scrollbarGC, 994 GC scrollbarGC,
1075 topShadowGC, 995 topShadowGC,
1076 botShadowGC; 996 botShadowGC;
… …
1133 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;
1134#endif 1054#endif
1135 1055
1136 vector<void *> allocated; // free these memory blocks with free() 1056 vector<void *> allocated; // free these memory blocks with free()
1137 1057
1138 char *env_windowid; /* environmental variable WINDOWID */ 1058 char env_windowid[21]; /* environmental variable WINDOWID */
1059 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1139 char *env_display; /* environmental variable DISPLAY */ 1060 char *env_display; /* environmental variable DISPLAY */
1140 char *env_term; /* environmental variable TERM */ 1061 char *env_term; /* environmental variable TERM */
1141 char *env_colorfgbg; 1062
1142 char *locale; 1063 char *locale;
1143 char charsets[4]; 1064 char charsets[4];
1144 char *v_buffer; /* pointer to physical buffer */ 1065 char *v_buffer; /* pointer to physical buffer */
1145 unsigned int v_buflen; /* size of area to write */ 1066 unsigned int v_buflen; /* size of area to write */
1146 stringvec *argv, *envv; /* if != 0, will be freed on destroy time */ 1067 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
1147 1068
1148#ifdef KEYSYM_RESOURCE 1069#ifdef KEYSYM_RESOURCE
1149 keyboard_manager *keyboard; 1070 keyboard_manager *keyboard;
1150#endif 1071#endif
1151 1072
1152 const char *rs[NUM_RESOURCES]; 1073 const char *rs[NUM_RESOURCES];
1153 /* command input buffering */ 1074 /* command input buffering */
1154 char *cmdbuf_ptr, *cmdbuf_endp; 1075 char *cmdbuf_ptr, *cmdbuf_endp;
1155 char cmdbuf_base[CBUFSIZ]; 1076 char cmdbuf_base[CBUFSIZ];
1156 1077
1157 rxvt_ptytty *pty; 1078 ptytty *pty;
1158 1079
1159 rxvt_salloc *talloc; // text line allocator 1080 rxvt_salloc *talloc; // text line allocator
1160 rxvt_salloc *ralloc; // rend line allocator 1081 rxvt_salloc *ralloc; // rend line allocator
1161 1082
1162 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
… …
1173#endif 1094#endif
1174 1095
1175 // modifies first argument(!) 1096 // modifies first argument(!)
1176 void paste (char *data, unsigned int len) NOTHROW; 1097 void paste (char *data, unsigned int len) NOTHROW;
1177 1098
1178 long vt_emask, vt_emask_perl; 1099 long vt_emask, vt_emask_perl, vt_emask_xim;
1179 1100
1180 void vt_select_input () const NOTHROW 1101 void vt_select_input () const NOTHROW
1181 { 1102 {
1182 XSelectInput (display->display, vt, vt_emask | vt_emask_perl); 1103 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim);
1183 } 1104 }
1184 1105
1185#if TRANSPARENT 1106#if TRANSPARENT || ENABLE_PERL
1186 void rootwin_cb (XEvent &xev); 1107 void rootwin_cb (XEvent &xev);
1187 xevent_watcher rootwin_ev; 1108 xevent_watcher rootwin_ev;
1188#endif 1109#endif
1189 1110
1190 void x_cb (XEvent &xev); 1111 void x_cb (XEvent &xev);
… …
1237 rxvt_term (); 1158 rxvt_term ();
1238 ~rxvt_term (); 1159 ~rxvt_term ();
1239 void destroy (); 1160 void destroy ();
1240 void emergency_cleanup (); 1161 void emergency_cleanup ();
1241 1162
1242 bool init (int argc, const char *const *argv); 1163 bool init (int argc, const char *const *argv, stringvec *envv);
1164
1165 bool init (stringvec *argv, stringvec *envv)
1166 {
1167 this->argv = argv;
1168 return init (argv->size (), argv->begin (), envv);
1169 }
1170
1243 bool init_vars (); 1171 bool init_vars ();
1244 1172
1245 bool pty_fill (); 1173 bool pty_fill ();
1246 1174
1247 void make_current () const // make this the "currently active" urxvt instance 1175 void make_current () const // make this the "currently active" urxvt instance
1248 { 1176 {
1249 SET_R (this); 1177 SET_R (this);
1178 set_environ (envv);
1250 rxvt_set_locale (locale); 1179 rxvt_set_locale (locale);
1251 set_environ (envv);
1252 } 1180 }
1253 1181
1254 void init_secondary (); 1182 void init_secondary ();
1255 const char **init_resources (int argc, const char *const *argv); 1183 const char **init_resources (int argc, const char *const *argv);
1256 const char *x_resource (const char *name); 1184 const char *x_resource (const char *name);
… …
1266 void create_windows (int argc, const char *const *argv); 1194 void create_windows (int argc, const char *const *argv);
1267 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);
1268 void window_calc (unsigned int newwidth, unsigned int newheight); 1196 void window_calc (unsigned int newwidth, unsigned int newheight);
1269 1197
1270#if USE_XIM 1198#if USE_XIM
1271 rxvt_xim *input_method; 1199 rxvt_xim *input_method;
1272 XIC Input_Context; 1200 XIC Input_Context;
1273 XIMStyle input_style; 1201 XIMStyle input_style;
1274 XPoint spot; // most recently sent spot position 1202 XPoint spot; // most recently sent spot position
1275 1203
1276 void im_destroy (); 1204 void im_destroy ();
1277 void im_cb (); im_watcher im_ev; 1205 void im_cb (); im_watcher im_ev;
1278 void im_set_size (XRectangle &size); 1206 void im_set_size (XRectangle &size);
1279 void im_set_position (XPoint &pos) NOTHROW; 1207 void im_set_position (XPoint &pos) NOTHROW;
… …
1281 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);
1282 1210
1283 bool IMisRunning (); 1211 bool IMisRunning ();
1284 void IMSendSpot (); 1212 void IMSendSpot ();
1285 bool IM_get_IC (const char *modifiers); 1213 bool IM_get_IC (const char *modifiers);
1286 void IMSetStatusPosition (); 1214 void IMSetPosition ();
1287#endif 1215#endif
1288 1216
1289 void resize_scrollbar (); 1217 void resize_scrollbar ();
1290 1218
1291 // command.C 1219 // command.C
1292 void lookup_key (XKeyEvent &ev); 1220 void key_press (XKeyEvent &ev);
1221 void key_release (XKeyEvent &ev);
1293 unsigned int cmd_write (const char *str, unsigned int count); 1222 unsigned int cmd_write (const char *str, unsigned int count);
1294 1223
1295 wchar_t next_char () NOTHROW; 1224 wchar_t next_char () NOTHROW;
1296 wchar_t cmd_getc () THROW ((class out_of_input)); 1225 wchar_t cmd_getc () THROW ((class out_of_input));
1297 uint32_t next_octet () NOTHROW; 1226 uint32_t next_octet () NOTHROW;
… …
1301 void mouse_report (XButtonEvent &ev); 1230 void mouse_report (XButtonEvent &ev);
1302 void button_press (XButtonEvent &ev); 1231 void button_press (XButtonEvent &ev);
1303 void button_release (XButtonEvent &ev); 1232 void button_release (XButtonEvent &ev);
1304 void focus_in (); 1233 void focus_in ();
1305 void focus_out (); 1234 void focus_out ();
1235 void update_fade_color (unsigned int idx);
1306 int check_our_parents (); 1236 int check_our_parents ();
1307#ifdef PRINTPIPE 1237#ifdef PRINTPIPE
1308 FILE *popen_printer (); 1238 FILE *popen_printer ();
1309 int pclose_printer (FILE *stream); 1239 int pclose_printer (FILE *stream);
1310#endif 1240#endif
… …
1332 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);
1333 void set_title (const char *str); 1263 void set_title (const char *str);
1334 void set_icon_name (const char *str); 1264 void set_icon_name (const char *str);
1335 void set_window_color (int idx, const char *color); 1265 void set_window_color (int idx, const char *color);
1336 void set_colorfgbg (); 1266 void set_colorfgbg ();
1337 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);
1338 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1269 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1339 1270
1340 // screen.C 1271 // screen.C
1341 1272
1342 void lalloc (line_t &l) const NOTHROW 1273 void lalloc (line_t &l) const
1343 { 1274 {
1344 l.t = (text_t *)talloc->alloc (); 1275 l.t = (text_t *)talloc->alloc ();
1345 l.r = (rend_t *)ralloc->alloc (); 1276 l.r = (rend_t *)ralloc->alloc ();
1346 } 1277 }
1347 1278
… …
1351 talloc->free (l.t); 1282 talloc->free (l.t);
1352 ralloc->free (l.r); 1283 ralloc->free (l.r);
1353 } 1284 }
1354#endif 1285#endif
1355 1286
1356 void lresize (line_t &l) const NOTHROW 1287 void lresize (line_t &l) const
1357 { 1288 {
1358 if (!l.t) 1289 if (!l.t)
1359 return; 1290 return;
1360 1291
1361 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));
… …
1429 void scr_remap_chars () NOTHROW; 1360 void scr_remap_chars () NOTHROW;
1430 void scr_remap_chars (line_t &l) NOTHROW; 1361 void scr_remap_chars (line_t &l) NOTHROW;
1431 1362
1432 enum cursor_mode { SAVE, RESTORE }; 1363 enum cursor_mode { SAVE, RESTORE };
1433 1364
1434 void scr_poweron () NOTHROW; 1365 void scr_poweron ();
1435 void scr_cursor (cursor_mode mode) NOTHROW; 1366 void scr_cursor (cursor_mode mode) NOTHROW;
1436 void scr_do_wrap () NOTHROW; 1367 void scr_do_wrap () NOTHROW;
1368 void scr_swap_screen () NOTHROW;
1437 int scr_change_screen (int scrn) NOTHROW; 1369 void scr_change_screen (int scrn);
1438 void scr_color (unsigned int color, int fgbg) NOTHROW; 1370 void scr_color (unsigned int color, int fgbg) NOTHROW;
1439 void scr_rendition (int set, int style) NOTHROW; 1371 void scr_rendition (int set, int style) NOTHROW;
1440 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;
1441 void scr_backspace () NOTHROW; 1373 void scr_backspace () NOTHROW;
1442 void scr_tab (int count, bool ht = false) NOTHROW; 1374 void scr_tab (int count, bool ht = false) NOTHROW;
… …
1534# define __PROTO(p) p 1466# define __PROTO(p) p
1535#else 1467#else
1536# define __PROTO(p) () 1468# define __PROTO(p) ()
1537#endif 1469#endif
1538 1470
1539#ifdef DEBUG_malloc
1540# include "dmalloc.h" /* This comes last */
1541#endif
1542
1543#endif /* _RXVT_H_ */ 1471#endif /* _RXVT_H_ */
1544 1472

Diff Legend

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