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.417 by root, Tue Nov 23 22:58:09 2010 UTC vs.
Revision 1.478 by root, Thu May 17 22:00:57 2012 UTC

1#ifndef RXVT_H_ /* include once only */ 1#ifndef RXVT_H_ /* include once only */
2#define RXVT_H_ 2#define RXVT_H_
3 3
4#include <cstdio> 4#include <stdio.h>
5#include <cctype> 5#include <ctype.h>
6#include <cerrno> 6#include <errno.h>
7#include <cstdarg> 7#include <stdarg.h>
8#include <cstdlib> 8#include <stdlib.h>
9#ifdef HAVE_STDINT_H 9#ifdef HAVE_STDINT_H
10#include <stdint.h> 10#include <stdint.h>
11#endif 11#endif
12#include <sys/types.h> 12#include <sys/types.h>
13#include <unistd.h> 13#include <unistd.h>
14#include <cstring> 14#include <string.h>
15#include <assert.h> 15#include <assert.h>
16#ifdef HAVE_SYS_IOCTL_H 16#ifdef HAVE_SYS_IOCTL_H
17#include <sys/ioctl.h> 17#include <sys/ioctl.h>
18#endif 18#endif
19#ifdef HAVE_SYS_STRREDIR_H 19#ifdef HAVE_SYS_STRREDIR_H
20#include <sys/strredir.h> 20#include <sys/strredir.h>
21#endif 21#endif
22 22
23#if HAVE_CWCHAR
24# include <cwchar>
25#elif HAVE_WCHAR_H 23#if HAVE_WCHAR_H
26# include <wchar.h> 24# include <wchar.h>
27#else 25#else
28// stdlib.h might provide it 26// stdlib.h might provide it
29#endif 27#endif
30 28
31using namespace std; 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
32 30
33extern "C" { 31extern "C" {
34#include <X11/Xlib.h> 32#include <X11/Xlib.h>
35#include <X11/Xutil.h> 33#include <X11/Xutil.h>
36#include <X11/Xresource.h> 34#include <X11/Xresource.h>
… …
72#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
73#include <X11/keysym.h> 71#include <X11/keysym.h>
74#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 73#include <X11/Xatom.h>
76 74
75#ifdef HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif
78
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1
81#endif
82
77#include "encoding.h" 83#include "encoding.h"
78#include "rxvtutil.h" 84#include "rxvtutil.h"
79#include "rxvtfont.h" 85#include "rxvtfont.h"
80#include "rxvttoolkit.h" 86#include "rxvttoolkit.h"
81#include "scrollbar.h" 87#include "scrollbar.h"
… …
98 ***************************************************************************** 104 *****************************************************************************
99 * SYSTEM HACKS 105 * SYSTEM HACKS
100 ***************************************************************************** 106 *****************************************************************************
101 */ 107 */
102 108
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 109#include <termios.h>
108
109#include "background.h"
110 110
111#ifndef STDIN_FILENO 111#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 112# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 113# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 114# define STDERR_FILENO 2
115#endif 115#endif
116 116
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 120#endif
125 121
126/****************************************************************************/ 122/****************************************************************************/
127 123
128// exception thrown on fatal (per-instance) errors 124// exception thrown on fatal (per-instance) errors
… …
151 147
152const char * rxvt_basename (const char *str) NOTHROW; 148const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 150void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 151void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 152void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
158 154
159char * rxvt_strtrim (char *str) NOTHROW; 155char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 156char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 157
158static inline void
159rxvt_free_strsplit (char **ptr) NOTHROW
160{
161 free (ptr[0]);
162 free (ptr);
163}
162 164
163void * rxvt_malloc (size_t size); 165void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 166void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 167void * rxvt_realloc (void *ptr, size_t size);
166 168
… …
189#else 191#else
190 if (envv) 192 if (envv)
191#endif 193#endif
192 environ = envv; 194 environ = envv;
193} 195}
196
197struct localise_env
198{
199 char **orig_env;
200
201 localise_env (char **new_env)
202 {
203 orig_env = environ;
204 environ = new_env;
205 }
206
207 ~localise_env ()
208 {
209 environ = orig_env;
210 }
211};
212
213#ifdef HAVE_BG_PIXMAP
214# ifdef BG_IMAGE_FROM_FILE
215enum {
216 IM_IS_SET = 1 << 0,
217 IM_IS_SIZE_SENSITIVE = 1 << 1,
218 IM_KEEP_ASPECT = 1 << 2,
219 IM_ROOT_ALIGN = 1 << 3,
220 IM_TILE = 1 << 4,
221 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
222};
223
224enum {
225 noScale = 0,
226 windowScale = 100,
227 defaultScale = windowScale,
228 centerAlign = 50,
229 defaultAlign = centerAlign,
230};
231
232struct rxvt_image
233{
234 uint8_t flags;
235 unsigned int h_scale, v_scale; /* percents of the window size */
236 int h_align, v_align; /* percents of the window size:
237 0 - left align, 50 - center, 100 - right */
238
239# ifdef HAVE_PIXBUF
240 GdkPixbuf *pixbuf;
241# endif
242
243 ~rxvt_image ()
244 {
245# ifdef HAVE_PIXBUF
246 if (pixbuf)
247 g_object_unref (pixbuf);
248# endif
249 }
250
251 int width ()
252 {
253# ifdef HAVE_PIXBUF
254 return gdk_pixbuf_get_width (pixbuf);
255# endif
256 }
257 int height ()
258 {
259# ifdef HAVE_PIXBUF
260 return gdk_pixbuf_get_height (pixbuf);
261# endif
262 }
263 bool set_file (const char *file);
264 bool set_geometry (const char *geom, bool update = false);
265 void set_default_geometry ()
266 {
267 h_scale = v_scale = defaultScale;
268 h_align = v_align = defaultAlign;
269 flags |= IM_IS_SIZE_SENSITIVE;
270 }
271};
272# endif
273#endif
194 274
195/* 275/*
196 ***************************************************************************** 276 *****************************************************************************
197 * STRUCTURES AND TYPEDEFS 277 * STRUCTURES AND TYPEDEFS
198 ***************************************************************************** 278 *****************************************************************************
… …
276# define NSCREENS 0 356# define NSCREENS 0
277#else 357#else
278# define NSCREENS 1 358# define NSCREENS 1
279#endif 359#endif
280 360
281/* special (internal) prefix for font commands */
282#define FONT_CMD '#'
283#define FONT_DN "#-"
284#define FONT_UP "#+"
285
286/* flags for rxvt_scr_gotorc () */ 361/* flags for rxvt_term::scr_gotorc () */
287enum { 362enum {
288 C_RELATIVE = 1, /* col movement is relative */ 363 C_RELATIVE = 1, /* col movement is relative */
289 R_RELATIVE = 2, /* row movement is relative */ 364 R_RELATIVE = 2, /* row movement is relative */
290 RELATIVE = C_RELATIVE | R_RELATIVE, 365 RELATIVE = C_RELATIVE | R_RELATIVE,
291}; 366};
292 367
293/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 368/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
294enum { 369enum {
295 INSERT = -1, /* don't change these values */ 370 INSERT = -1, /* don't change these values */
296 DELETE = +1, 371 DELETE = +1,
297 ERASE = +2, 372 ERASE = +2,
298}; 373};
299 374
300/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 375/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
301enum page_dirn { 376enum page_dirn {
302 UP, 377 UP,
303 DN, 378 DN,
304 NO_DIR, 379 NO_DIR,
305}; 380};
306 381
307/* arguments for rxvt_scr_change_screen () */ 382/* arguments for rxvt_term::scr_change_screen () */
308enum { 383enum {
309 PRIMARY = 0, 384 PRIMARY = 0,
310 SECONDARY, 385 SECONDARY,
311}; 386};
312 387
… …
354#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 429#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
355#define RS_attrMask (RS_baseattrMask | RS_fontMask) 430#define RS_attrMask (RS_baseattrMask | RS_fontMask)
356 431
357#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 432#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
358#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 433#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
359
360#define Sel_none 0 /* Not waiting */
361#define Sel_normal 0x01 /* normal selection */
362#define Sel_incr 0x02 /* incremental selection */
363#define Sel_direct 0x00
364#define Sel_Primary 0x01
365#define Sel_Secondary 0x02
366#define Sel_Clipboard 0x03
367#define Sel_whereMask 0x0f
368#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
369#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
370 434
371enum { 435enum {
372 C0_NUL = 0x00, 436 C0_NUL = 0x00,
373 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 437 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
374 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 438 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
655 719
656#define GET_ATTR(x) (((x) & RS_attrMask)) 720#define GET_ATTR(x) (((x) & RS_attrMask))
657// return attributes defining the background, encoding doesn't matter 721// return attributes defining the background, encoding doesn't matter
658// depends on RS_fgShift > RS_bgShift 722// depends on RS_fgShift > RS_bgShift
659#define GET_BGATTR(x) \ 723#define GET_BGATTR(x) \
660 (expect_false ((x) & RS_RVid) \ 724 (ecb_unlikely ((x) & RS_RVid) \
661 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 725 ? (((x) & (RS_attrMask & ~RS_RVid)) \
662 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 726 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
663 : ((x) & (RS_attrMask | RS_bgMask))) 727 : ((x) & (RS_attrMask | RS_bgMask)))
664#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 728#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
665#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
767// that are not representable in unicode, as well as characters 831// that are not representable in unicode, as well as characters
768// not fitting in the BMP. 832// not fitting in the BMP.
769struct compose_char 833struct compose_char
770{ 834{
771 unicode_t c1, c2; // any chars != NOCHAR are valid 835 unicode_t c1, c2; // any chars != NOCHAR are valid
836 #if __cplusplus >= 201103L
837 compose_char () = default;
838 #endif
772 compose_char (unicode_t c1, unicode_t c2) 839 compose_char (unicode_t c1, unicode_t c2)
773 : c1(c1), c2(c2) 840 : c1(c1), c2(c2)
774 { } 841 { }
775}; 842};
776 843
… …
858 * END······················= total_rows 925 * END······················= total_rows
859 */ 926 */
860 927
861struct TermWin_t 928struct TermWin_t
862{ 929{
930 int vt_width; /* actual window width [pixels] */
931 int vt_height; /* actual window height [pixels] */
863 int width; /* window width [pixels] */ 932 int width; /* window width [pixels] */
864 int height; /* window height [pixels] */ 933 int height; /* window height [pixels] */
865 int fwidth; /* font width [pixels] */ 934 int fwidth; /* font width [pixels] */
866 int fheight; /* font height [pixels] */ 935 int fheight; /* font height [pixels] */
867 int fbase; /* font ascent (baseline) [pixels] */ 936 int fbase; /* font ascent (baseline) [pixels] */
… …
876 int saveLines; /* number of lines that fit in scrollback */ 945 int saveLines; /* number of lines that fit in scrollback */
877 int total_rows; /* total number of rows in this terminal */ 946 int total_rows; /* total number of rows in this terminal */
878 int term_start; /* term lines start here */ 947 int term_start; /* term lines start here */
879 int view_start; /* scrollback view starts here */ 948 int view_start; /* scrollback view starts here */
880 int top_row; /* topmost row index of scrollback */ 949 int top_row; /* topmost row index of scrollback */
881 Window parent[6]; /* parent identifiers - we're parent[0] */ 950 Window parent; /* parent identifier */
882 Window vt; /* vt100 window */ 951 Window vt; /* vt100 window */
883 GC gc; /* GC for drawing */ 952 GC gc; /* GC for drawing */
884 Pixmap pixmap;
885 rxvt_drawable *drawable; 953 rxvt_drawable *drawable;
886 rxvt_fontset *fontset[4]; 954 rxvt_fontset *fontset[4];
887}; 955};
888 956
889/* 957/*
… …
951#define Screen_WrapNext (1<<4) /* need to wrap for next char? */ 1019#define Screen_WrapNext (1<<4) /* need to wrap for next char? */
952#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap) 1020#define Screen_DefaultFlags (Screen_VisibleCursor | Screen_Autowrap)
953 1021
954/* rxvt_vars.options */ 1022/* rxvt_vars.options */
955enum { 1023enum {
956# define def(name,idx) Opt_ ## name = idx,
957# define nodef(name) Opt_ ## name = 0, 1024# define def(name) Opt_ ## name,
1025# define nodef(name) Opt_prev_ ## name, Opt_ ## name = 0, Opt_next_ ## name = Opt_prev_ ## name - 1,
1026 Opt_0,
958# include "optinc.h" 1027# include "optinc.h"
959# undef nodef 1028# undef nodef
960# undef def 1029# undef def
961Opt_count 1030 Opt_count
962}; 1031};
963 1032
964/* ------------------------------------------------------------------------- */ 1033/* ------------------------------------------------------------------------- */
965 1034
966struct rxvt_vars : TermWin_t 1035struct rxvt_vars : TermWin_t
… …
968 scrollBar_t scrollBar; 1037 scrollBar_t scrollBar;
969 uint8_t options[(Opt_count + 7) >> 3]; 1038 uint8_t options[(Opt_count + 7) >> 3];
970 XSizeHints szHint; 1039 XSizeHints szHint;
971 rxvt_color *pix_colors; 1040 rxvt_color *pix_colors;
972 Cursor TermWin_cursor; /* cursor for vt window */ 1041 Cursor TermWin_cursor; /* cursor for vt window */
973 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1042 line_t *row_buf; // all lines, scrollback + terminal, circular
974 line_t *drawn_buf; // text on screen 1043 line_t *drawn_buf; // text on screen
975 line_t *swap_buf; // lines for swap buffer 1044 line_t *swap_buf; // lines for swap buffer
976 char *tabs; /* per location: 1 == tab-stop */ 1045 char *tabs; /* per location: 1 == tab-stop */
977 screen_t screen; 1046 screen_t screen;
978 screen_t swap; 1047 screen_t swap;
… …
1015 hidden_pointer:1, 1084 hidden_pointer:1,
1016#endif 1085#endif
1017 enc_utf8:1, /* whether locale uses utf-8 */ 1086 enc_utf8:1, /* whether locale uses utf-8 */
1018 seen_input:1, /* whether we have seen some program output yet */ 1087 seen_input:1, /* whether we have seen some program output yet */
1019 seen_resize:1, /* whether we had a resize event */ 1088 seen_resize:1, /* whether we had a resize event */
1089 init_done:1,
1020 parsed_geometry:1; 1090 parsed_geometry:1;
1021 1091
1022 unsigned char refresh_type, 1092 unsigned char refresh_type,
1023#ifdef META8_OPTION 1093#ifdef META8_OPTION
1024 meta_char, /* Alt-key prefix */ 1094 meta_char; /* Alt-key prefix */
1025#endif 1095#endif
1026 selection_wait,
1027 selection_type;
1028/* ---------- */ 1096/* ---------- */
1029 bool rvideo_state, rvideo_mode; 1097 bool rvideo_state, rvideo_mode;
1030#ifndef NO_BELL 1098#ifndef NO_BELL
1031 bool rvideo_bell; 1099 bool rvideo_bell;
1032#endif 1100#endif
… …
1060 allowedxerror; 1128 allowedxerror;
1061/* ---------- */ 1129/* ---------- */
1062 unsigned int ModLevel3Mask, 1130 unsigned int ModLevel3Mask,
1063 ModMetaMask, 1131 ModMetaMask,
1064 ModNumLockMask; 1132 ModNumLockMask;
1065 int old_width, /* last used width in screen resize */
1066 old_height; /* last used height in screen resize */
1067 unsigned long priv_modes, 1133 unsigned long priv_modes,
1068 SavedModes; 1134 SavedModes;
1069/* ---------- */ 1135/* ---------- */
1070 Atom *xa; 1136 Atom *xa;
1071/* ---------- */ 1137/* ---------- */
1072 Time selection_time, 1138 Time selection_time,
1073 selection_request_time,
1074 clipboard_time; 1139 clipboard_time;
1140 rxvt_selection *selection_req;
1075 pid_t cmd_pid; /* process id of child */ 1141 pid_t cmd_pid; /* process id of child */
1076 char * incr_buf;
1077 size_t incr_buf_size, incr_buf_fill;
1078/* ---------- */ 1142/* ---------- */
1079 struct mouse_event MEvent; 1143 struct mouse_event MEvent;
1080 XComposeStatus compose; 1144 XComposeStatus compose;
1081 static struct termios def_tio; 1145 static struct termios def_tio;
1082 row_col_t oldcursor; 1146 row_col_t oldcursor;
1083#ifdef HAVE_BG_PIXMAP 1147#ifdef HAVE_BG_PIXMAP
1084 bgPixmap_t bgPixmap; 1148 void bg_init ();
1149 void bg_destroy ();
1150
1151 enum {
1152 BG_IS_VALID = 1 << 0,
1153
1154 BG_IS_TRANSPARENT = 1 << 1,
1155 BG_NEEDS_REFRESH = 1 << 2,
1156
1157 BG_HAS_RENDER = 1 << 3,
1158 BG_HAS_RENDER_CONV = 1 << 4,
1159 BG_CLIENT_RENDER = 1 << 5,
1160
1161 BG_TINT_SET = 1 << 6,
1162 BG_TINT_BITAND = 1 << 7,
1163 };
1164
1165 uint8_t bg_flags;
1166
1167# ifdef BG_IMAGE_FROM_FILE
1168 rxvt_image bg_image;
1169 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1170 bool render_image (rxvt_image &image);
1085#endif 1171# endif
1086#ifdef HAVE_AFTERIMAGE
1087 ASVisual *asv;
1088 ASImageManager *asimman;
1089 1172
1090 void init_asv () 1173# ifdef ENABLE_TRANSPARENCY
1174 Pixmap root_pixmap; /* current root pixmap set */
1175 rxvt_color tint;
1176 int shade;
1177 int h_blurRadius, v_blurRadius;
1178
1179 void bg_set_transparent ()
1091 { 1180 {
1092 if (!asv) 1181 bg_flags |= BG_IS_TRANSPARENT;
1093 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1094 } 1182 }
1183 void bg_set_root_pixmap ();
1184 bool bg_set_tint (rxvt_color &new_tint);
1185 bool bg_set_shade (const char *shade_str);
1186 bool bg_set_blur (const char *geom);
1187
1188 bool blur_pixmap (Pixmap pixmap, int width, int height);
1189 bool tint_pixmap (Pixmap pixmap, int width, int height);
1190 void tint_ximage (XImage *ximage);
1191 bool make_transparency_pixmap ();
1192# endif
1193
1194 ev_tstamp bg_valid_since;
1195
1196 Pixmap bg_pixmap;
1197 unsigned int bg_pmap_width, bg_pmap_height;
1198
1199 int target_x;
1200 int target_y;
1201 bool bg_set_position (int x, int y);
1202 bool bg_window_size_sensitive ();
1203 bool bg_window_position_sensitive ();
1204
1205 bool bg_render ();
1206 void bg_invalidate ()
1207 {
1208 bg_flags &= ~BG_IS_VALID;
1209 }
1210#endif
1211#ifdef HAVE_PIXBUF
1212 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1213 int src_x, int src_y, int dst_x, int dst_y,
1214 unsigned int width, unsigned int height);
1095#endif 1215#endif
1096 1216
1097#if ENABLE_OVERLAY 1217#if ENABLE_OVERLAY
1098 overlay_base ov; 1218 overlay_base ov;
1099 1219
… …
1107 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1227 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1108#endif 1228#endif
1109 1229
1110 vector<void *> allocated; // free these memory blocks with free() 1230 vector<void *> allocated; // free these memory blocks with free()
1111 1231
1112 char env_windowid[21]; /* environmental variable WINDOWID */
1113 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1114 char *env_display; /* environmental variable DISPLAY */
1115 char *env_term; /* environmental variable TERM */
1116
1117 char *locale; 1232 char *locale;
1118 char charsets[4]; 1233 char charsets[4];
1119 char *v_buffer; /* pointer to physical buffer */ 1234 char *v_buffer; /* pointer to physical buffer */
1120 unsigned int v_buflen; /* size of area to write */ 1235 unsigned int v_buflen; /* size of area to write */
1121 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1236 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1174 void child_cb (ev::child &w, int revents); ev::child child_ev; 1289 void child_cb (ev::child &w, int revents); ev::child child_ev;
1175 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1290 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1176 void refresh_check (); 1291 void refresh_check ();
1177 void flush (); 1292 void flush ();
1178 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1293 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1294 void cmdbuf_reify ();
1295 void cmdbuf_append (const char *str, size_t count);
1179 bool pty_fill (); 1296 bool pty_fill ();
1180 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1297 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1181 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1182 1298
1183#ifdef CURSOR_BLINK 1299#ifdef CURSOR_BLINK
1300 void cursor_blink_reset ();
1184 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1301 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1185#endif 1302#endif
1186#ifdef TEXT_BLINK 1303#ifdef TEXT_BLINK
1187 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1304 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1188#endif 1305#endif
… …
1207 void pointer_unblank (); 1324 void pointer_unblank ();
1208 1325
1209 void tt_printf (const char *fmt,...); 1326 void tt_printf (const char *fmt,...);
1210 void tt_write (const char *data, unsigned int len); 1327 void tt_write (const char *data, unsigned int len);
1211 void pty_write (); 1328 void pty_write ();
1212
1213 void init (stringvec *argv, stringvec *envv)
1214 {
1215 this->argv = argv;
1216 init (argv->size (), argv->begin (), envv);
1217 }
1218 1329
1219 void make_current () const // make this the "currently active" urxvt instance 1330 void make_current () const // make this the "currently active" urxvt instance
1220 { 1331 {
1221 SET_R (this); 1332 SET_R (this);
1222 set_environ (envv); 1333 set_environ (envv);
… …
1234 void im_set_size (XRectangle &size); 1345 void im_set_size (XRectangle &size);
1235 void im_set_position (XPoint &pos) NOTHROW; 1346 void im_set_position (XPoint &pos) NOTHROW;
1236 void im_set_color (unsigned long &fg, unsigned long &bg); 1347 void im_set_color (unsigned long &fg, unsigned long &bg);
1237 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1348 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1238 1349
1239 bool IMisRunning (); 1350 bool im_is_running ();
1240 void IMSendSpot (); 1351 void im_send_spot ();
1241 bool IM_get_IC (const char *modifiers); 1352 bool im_get_ic (const char *modifiers);
1242 void IMSetPosition (); 1353 void im_set_position ();
1243#endif 1354#endif
1244 1355
1245 // command.C 1356 // command.C
1246 void key_press (XKeyEvent &ev); 1357 void key_press (XKeyEvent &ev);
1247 void key_release (XKeyEvent &ev); 1358 void key_release (XKeyEvent &ev);
1248 unsigned int cmd_write (const char *str, unsigned int count);
1249 1359
1250 wchar_t next_char () NOTHROW; 1360 wchar_t next_char () NOTHROW;
1251 wchar_t cmd_getc () THROW ((class out_of_input)); 1361 wchar_t cmd_getc () THROW ((class out_of_input));
1252 uint32_t next_octet () NOTHROW; 1362 uint32_t next_octet () NOTHROW;
1253 uint32_t cmd_get8 () THROW ((class out_of_input)); 1363 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1280 void process_color_seq (int report, int color, const char *str, char resp); 1390 void process_color_seq (int report, int color, const char *str, char resp);
1281 void process_xterm_seq (int op, char *str, char resp); 1391 void process_xterm_seq (int op, char *str, char resp);
1282 int privcases (int mode, unsigned long bit); 1392 int privcases (int mode, unsigned long bit);
1283 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1393 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1284 void process_sgr_mode (unsigned int nargs, const int *arg); 1394 void process_sgr_mode (unsigned int nargs, const int *arg);
1285 void process_graphics ();
1286 // init.C 1395 // init.C
1396 void init (stringvec *argv, stringvec *envv);
1397 void init (int argc, const char *const *argv, const char *const *envv);
1398 void init2 (int argc, const char *const *argv);
1287 void init_vars (); 1399 void init_vars ();
1288 const char **init_resources (int argc, const char *const *argv); 1400 const char **init_resources (int argc, const char *const *argv);
1289 void init (int argc, const char *const *argv, stringvec *envv);
1290 void init_env (); 1401 void init_env ();
1291 void set_locale (const char *locale); 1402 void set_locale (const char *locale);
1292 void init_xlocale (); 1403 void init_xlocale ();
1293 void init_command (const char *const *argv); 1404 void init_command (const char *const *argv);
1294 void run_command (const char *const *argv); 1405 void run_command (const char *const *argv);
… …
1312 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1423 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1313 void set_utf8_property (Atom prop, const char *str, int len = -1); 1424 void set_utf8_property (Atom prop, const char *str, int len = -1);
1314 void set_title (const char *str); 1425 void set_title (const char *str);
1315 void set_icon_name (const char *str); 1426 void set_icon_name (const char *str);
1316 void set_window_color (int idx, const char *color); 1427 void set_window_color (int idx, const char *color);
1317 void set_colorfgbg (); 1428 char *get_colorfgbg ();
1318 bool set_color (rxvt_color &color, const char *name); 1429 bool set_color (rxvt_color &color, const char *name);
1319 void alias_color (int dst, int src); 1430 void alias_color (int dst, int src);
1320 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1431 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1321 void get_window_origin (int &x, int &y); 1432 void get_window_origin (int &x, int &y);
1322 Pixmap get_pixmap_property (int prop_id); 1433 Pixmap get_pixmap_property (Atom property);
1323 1434
1324 // screen.C 1435 // screen.C
1325 1436
1326 void lalloc (line_t &l) const 1437 void lalloc (line_t &l) const
1327 { 1438 {
… …
1357#ifndef NO_BRIGHTCOLOR 1468#ifndef NO_BRIGHTCOLOR
1358 if (r & RS_Bold 1469 if (r & RS_Bold
1359# if ENABLE_STYLES 1470# if ENABLE_STYLES
1360 && option (Opt_intensityStyles) 1471 && option (Opt_intensityStyles)
1361# endif 1472# endif
1362 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1473 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1363 base += minBrightCOLOR - minCOLOR; 1474 base += minBrightCOLOR - minCOLOR;
1364#endif 1475#endif
1365 return base; 1476 return base;
1366 } 1477 }
1367 1478
… …
1371#ifndef NO_BRIGHTCOLOR 1482#ifndef NO_BRIGHTCOLOR
1372 if (r & RS_Blink 1483 if (r & RS_Blink
1373# if ENABLE_STYLES 1484# if ENABLE_STYLES
1374 && option (Opt_intensityStyles) 1485 && option (Opt_intensityStyles)
1375# endif 1486# endif
1376 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1487 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1377 base += minBrightCOLOR - minCOLOR; 1488 base += minBrightCOLOR - minCOLOR;
1378#endif 1489#endif
1379 return base; 1490 return base;
1380 } 1491 }
1381 1492
1382 bool option (uint8_t opt) const NOTHROW 1493 bool option (uint8_t opt) const NOTHROW
1383 { 1494 {
1384 if (!opt)
1385 return 0;
1386
1387 --opt;
1388 return options[opt >> 3] & (1 << (opt & 7)); 1495 return options[opt >> 3] & (1 << (opt & 7));
1389 } 1496 }
1390 1497
1391 void set_option (uint8_t opt, bool set = true) NOTHROW 1498 void set_option (uint8_t opt, bool set = true) NOTHROW;
1392 {
1393 if (!opt)
1394 return;
1395
1396 --opt;
1397 if (set)
1398 options[opt >> 3] |= (1 << (opt & 7));
1399 else
1400 options[opt >> 3] &= ~(1 << (opt & 7));
1401 }
1402
1403 void set_privmode (unsigned bit, int set) NOTHROW
1404 {
1405 if (set)
1406 priv_modes |= bit;
1407 else
1408 priv_modes &= ~bit;
1409 }
1410 1499
1411 // modifies first argument(!) 1500 // modifies first argument(!)
1412 void tt_paste (char *data, unsigned int len) NOTHROW; 1501 void tt_paste (char *data, unsigned int len) NOTHROW;
1413 void paste (char *data, unsigned int len) NOTHROW; 1502 void paste (char *data, unsigned int len) NOTHROW;
1414 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1503 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1426 void scr_backindex () NOTHROW; 1515 void scr_backindex () NOTHROW;
1427 void scr_forwardindex () NOTHROW; 1516 void scr_forwardindex () NOTHROW;
1428#endif 1517#endif
1429 void scr_touch (bool refresh) NOTHROW; 1518 void scr_touch (bool refresh) NOTHROW;
1430 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1519 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1431 void scr_recolour () NOTHROW; 1520 void scr_recolour (bool refresh = true) NOTHROW;
1432 void scr_remap_chars () NOTHROW; 1521 void scr_remap_chars () NOTHROW;
1433 void scr_remap_chars (line_t &l) NOTHROW; 1522 void scr_remap_chars (line_t &l) NOTHROW;
1434 1523
1435 enum cursor_mode { SAVE, RESTORE }; 1524 enum cursor_mode { SAVE, RESTORE };
1436 1525
… …
1471 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1560 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1472 void scr_reverse_selection () NOTHROW; 1561 void scr_reverse_selection () NOTHROW;
1473 void scr_dump (int fd) NOTHROW; 1562 void scr_dump (int fd) NOTHROW;
1474 1563
1475 void selection_check (int check_more) NOTHROW; 1564 void selection_check (int check_more) NOTHROW;
1476 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1477 void selection_property (Window win, Atom prop) NOTHROW;
1478 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1565 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1479 int selection_request_other (Atom target, int selnum) NOTHROW;
1480 void selection_clear (bool clipboard = false) NOTHROW; 1566 void selection_clear (bool clipboard = false) NOTHROW;
1481 void selection_make (Time tm); 1567 void selection_make (Time tm);
1482 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1568 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1483 void selection_start_colrow (int col, int row) NOTHROW; 1569 void selection_start_colrow (int col, int row) NOTHROW;
1484 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1570 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
… …
1488 void selection_click (int clicks, int x, int y) NOTHROW; 1574 void selection_click (int clicks, int x, int y) NOTHROW;
1489 void selection_extend (int x, int y, int flag) NOTHROW; 1575 void selection_extend (int x, int y, int flag) NOTHROW;
1490 void selection_rotate (int x, int y) NOTHROW; 1576 void selection_rotate (int x, int y) NOTHROW;
1491 1577
1492 // xdefaults.C 1578 // xdefaults.C
1493 void get_options (int argc, const char *const *argv); 1579 const char **get_options (int argc, const char *const *argv);
1494 int parse_keysym (const char *str, const char *arg); 1580 int parse_keysym (const char *str, const char *arg);
1495 const char *x_resource (const char *name); 1581 const char *x_resource (const char *name);
1496 void extract_resources (); 1582 void extract_resources ();
1583 void extract_keysym_resources ();
1497}; 1584};
1498 1585
1499#endif /* _RXVT_H_ */ 1586#endif /* _RXVT_H_ */
1500 1587

Diff Legend

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