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.423 by sf-exg, Sun Dec 19 00:49:32 2010 UTC vs.
Revision 1.481 by sf-exg, Sun May 20 16:23:42 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
83#include <ecb.h>
77#include "encoding.h" 84#include "encoding.h"
78#include "rxvtutil.h" 85#include "rxvtutil.h"
79#include "rxvtfont.h" 86#include "rxvtfont.h"
80#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
81#include "scrollbar.h" 88#include "scrollbar.h"
… …
98 ***************************************************************************** 105 *****************************************************************************
99 * SYSTEM HACKS 106 * SYSTEM HACKS
100 ***************************************************************************** 107 *****************************************************************************
101 */ 108 */
102 109
103#ifndef HAVE_XPOINTER
104typedef char *XPointer;
105#endif
106
107#include <termios.h> 110#include <termios.h>
108
109#include "background.h"
110 111
111#ifndef STDIN_FILENO 112#ifndef STDIN_FILENO
112# define STDIN_FILENO 0 113# define STDIN_FILENO 0
113# define STDOUT_FILENO 1 114# define STDOUT_FILENO 1
114# define STDERR_FILENO 2 115# define STDERR_FILENO 2
115#endif 116#endif
116 117
117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 118#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
118# define EXIT_SUCCESS 0 /* exit function success */ 119# define EXIT_SUCCESS 0 /* exit function success */
119# define EXIT_FAILURE 1 /* exit function failure */ 120# define EXIT_FAILURE 1 /* exit function failure */
120#endif
121
122#ifndef PATH_MAX
123# define PATH_MAX 16384
124#endif 121#endif
125 122
126/****************************************************************************/ 123/****************************************************************************/
127 124
128// exception thrown on fatal (per-instance) errors 125// exception thrown on fatal (per-instance) errors
… …
151 148
152const char * rxvt_basename (const char *str) NOTHROW; 149const char * rxvt_basename (const char *str) NOTHROW;
153void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
154void rxvt_log (const char *fmt,...) NOTHROW; 151void rxvt_log (const char *fmt,...) NOTHROW;
155void rxvt_warn (const char *fmt,...) NOTHROW; 152void rxvt_warn (const char *fmt,...) NOTHROW;
156void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
157void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
158 155
159char * rxvt_strtrim (char *str) NOTHROW; 156char * rxvt_strtrim (char *str) NOTHROW;
160char ** rxvt_splitcommastring (const char *cs) NOTHROW; 157char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
161void rxvt_freecommastring (char **cs) NOTHROW; 158
159static inline void
160rxvt_free_strsplit (char **ptr) NOTHROW
161{
162 free (ptr[0]);
163 free (ptr);
164}
162 165
163void * rxvt_malloc (size_t size); 166void * rxvt_malloc (size_t size);
164void * rxvt_calloc (size_t number, size_t size); 167void * rxvt_calloc (size_t number, size_t size);
165void * rxvt_realloc (void *ptr, size_t size); 168void * rxvt_realloc (void *ptr, size_t size);
166 169
… …
205 ~localise_env () 208 ~localise_env ()
206 { 209 {
207 environ = orig_env; 210 environ = orig_env;
208 } 211 }
209}; 212};
213
214#ifdef HAVE_BG_PIXMAP
215# ifdef BG_IMAGE_FROM_FILE
216enum {
217 IM_IS_SET = 1 << 0,
218 IM_IS_SIZE_SENSITIVE = 1 << 1,
219 IM_KEEP_ASPECT = 1 << 2,
220 IM_ROOT_ALIGN = 1 << 3,
221 IM_TILE = 1 << 4,
222 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
223};
224
225enum {
226 noScale = 0,
227 windowScale = 100,
228 defaultScale = windowScale,
229 centerAlign = 50,
230 defaultAlign = centerAlign,
231};
232
233struct rxvt_image
234{
235 uint8_t flags;
236 unsigned int h_scale, v_scale; /* percents of the window size */
237 int h_align, v_align; /* percents of the window size:
238 0 - left align, 50 - center, 100 - right */
239
240# ifdef HAVE_PIXBUF
241 GdkPixbuf *pixbuf;
242
243 ~rxvt_image ()
244 {
245 if (pixbuf)
246 g_object_unref (pixbuf);
247 }
248
249 int width ()
250 {
251 return gdk_pixbuf_get_width (pixbuf);
252 }
253 int height ()
254 {
255 return gdk_pixbuf_get_height (pixbuf);
256 }
257# endif
258
259 bool set_file (const char *file);
260 bool set_geometry (const char *geom, bool update = false);
261};
262# endif
263#endif
210 264
211/* 265/*
212 ***************************************************************************** 266 *****************************************************************************
213 * STRUCTURES AND TYPEDEFS 267 * STRUCTURES AND TYPEDEFS
214 ***************************************************************************** 268 *****************************************************************************
… …
292# define NSCREENS 0 346# define NSCREENS 0
293#else 347#else
294# define NSCREENS 1 348# define NSCREENS 1
295#endif 349#endif
296 350
297/* special (internal) prefix for font commands */
298#define FONT_CMD '#'
299#define FONT_DN "#-"
300#define FONT_UP "#+"
301
302/* flags for rxvt_scr_gotorc () */ 351/* flags for rxvt_term::scr_gotorc () */
303enum { 352enum {
304 C_RELATIVE = 1, /* col movement is relative */ 353 C_RELATIVE = 1, /* col movement is relative */
305 R_RELATIVE = 2, /* row movement is relative */ 354 R_RELATIVE = 2, /* row movement is relative */
306 RELATIVE = C_RELATIVE | R_RELATIVE, 355 RELATIVE = C_RELATIVE | R_RELATIVE,
307}; 356};
308 357
309/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 358/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
310enum { 359enum {
311 INSERT = -1, /* don't change these values */ 360 INSERT = -1, /* don't change these values */
312 DELETE = +1, 361 DELETE = +1,
313 ERASE = +2, 362 ERASE = +2,
314}; 363};
315 364
316/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 365/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
317enum page_dirn { 366enum page_dirn {
318 UP, 367 UP,
319 DN, 368 DN,
320 NO_DIR, 369 NO_DIR,
321}; 370};
322 371
323/* arguments for rxvt_scr_change_screen () */ 372/* arguments for rxvt_term::scr_change_screen () */
324enum { 373enum {
325 PRIMARY = 0, 374 PRIMARY = 0,
326 SECONDARY, 375 SECONDARY,
327}; 376};
328 377
… …
370#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 419#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
371#define RS_attrMask (RS_baseattrMask | RS_fontMask) 420#define RS_attrMask (RS_baseattrMask | RS_fontMask)
372 421
373#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 422#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
374#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 423#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
375
376#define Sel_none 0 /* Not waiting */
377#define Sel_normal 0x01 /* normal selection */
378#define Sel_incr 0x02 /* incremental selection */
379#define Sel_direct 0x00
380#define Sel_Primary 0x01
381#define Sel_Secondary 0x02
382#define Sel_Clipboard 0x03
383#define Sel_whereMask 0x0f
384#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
385#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
386 424
387enum { 425enum {
388 C0_NUL = 0x00, 426 C0_NUL = 0x00,
389 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 427 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
390 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 428 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
671 709
672#define GET_ATTR(x) (((x) & RS_attrMask)) 710#define GET_ATTR(x) (((x) & RS_attrMask))
673// return attributes defining the background, encoding doesn't matter 711// return attributes defining the background, encoding doesn't matter
674// depends on RS_fgShift > RS_bgShift 712// depends on RS_fgShift > RS_bgShift
675#define GET_BGATTR(x) \ 713#define GET_BGATTR(x) \
676 (expect_false ((x) & RS_RVid) \ 714 (ecb_unlikely ((x) & RS_RVid) \
677 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 715 ? (((x) & (RS_attrMask & ~RS_RVid)) \
678 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 716 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
679 : ((x) & (RS_attrMask | RS_bgMask))) 717 : ((x) & (RS_attrMask | RS_bgMask)))
680#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 718#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
681#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 719#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
783// that are not representable in unicode, as well as characters 821// that are not representable in unicode, as well as characters
784// not fitting in the BMP. 822// not fitting in the BMP.
785struct compose_char 823struct compose_char
786{ 824{
787 unicode_t c1, c2; // any chars != NOCHAR are valid 825 unicode_t c1, c2; // any chars != NOCHAR are valid
826 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
827 compose_char () = default;
828 #endif
788 compose_char (unicode_t c1, unicode_t c2) 829 compose_char (unicode_t c1, unicode_t c2)
789 : c1(c1), c2(c2) 830 : c1(c1), c2(c2)
790 { } 831 { }
791}; 832};
792 833
… …
874 * END······················= total_rows 915 * END······················= total_rows
875 */ 916 */
876 917
877struct TermWin_t 918struct TermWin_t
878{ 919{
920 int vt_width; /* actual window width [pixels] */
921 int vt_height; /* actual window height [pixels] */
879 int width; /* window width [pixels] */ 922 int width; /* window width [pixels] */
880 int height; /* window height [pixels] */ 923 int height; /* window height [pixels] */
881 int fwidth; /* font width [pixels] */ 924 int fwidth; /* font width [pixels] */
882 int fheight; /* font height [pixels] */ 925 int fheight; /* font height [pixels] */
883 int fbase; /* font ascent (baseline) [pixels] */ 926 int fbase; /* font ascent (baseline) [pixels] */
… …
892 int saveLines; /* number of lines that fit in scrollback */ 935 int saveLines; /* number of lines that fit in scrollback */
893 int total_rows; /* total number of rows in this terminal */ 936 int total_rows; /* total number of rows in this terminal */
894 int term_start; /* term lines start here */ 937 int term_start; /* term lines start here */
895 int view_start; /* scrollback view starts here */ 938 int view_start; /* scrollback view starts here */
896 int top_row; /* topmost row index of scrollback */ 939 int top_row; /* topmost row index of scrollback */
897 Window parent[6]; /* parent identifiers - we're parent[0] */ 940 Window parent; /* parent identifier */
898 Window vt; /* vt100 window */ 941 Window vt; /* vt100 window */
899 GC gc; /* GC for drawing */ 942 GC gc; /* GC for drawing */
900 Pixmap pixmap;
901 rxvt_drawable *drawable; 943 rxvt_drawable *drawable;
902 rxvt_fontset *fontset[4]; 944 rxvt_fontset *fontset[4];
903}; 945};
904 946
905/* 947/*
… …
985 scrollBar_t scrollBar; 1027 scrollBar_t scrollBar;
986 uint8_t options[(Opt_count + 7) >> 3]; 1028 uint8_t options[(Opt_count + 7) >> 3];
987 XSizeHints szHint; 1029 XSizeHints szHint;
988 rxvt_color *pix_colors; 1030 rxvt_color *pix_colors;
989 Cursor TermWin_cursor; /* cursor for vt window */ 1031 Cursor TermWin_cursor; /* cursor for vt window */
990 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1032 line_t *row_buf; // all lines, scrollback + terminal, circular
991 line_t *drawn_buf; // text on screen 1033 line_t *drawn_buf; // text on screen
992 line_t *swap_buf; // lines for swap buffer 1034 line_t *swap_buf; // lines for swap buffer
993 char *tabs; /* per location: 1 == tab-stop */ 1035 char *tabs; /* per location: 1 == tab-stop */
994 screen_t screen; 1036 screen_t screen;
995 screen_t swap; 1037 screen_t swap;
… …
1032 hidden_pointer:1, 1074 hidden_pointer:1,
1033#endif 1075#endif
1034 enc_utf8:1, /* whether locale uses utf-8 */ 1076 enc_utf8:1, /* whether locale uses utf-8 */
1035 seen_input:1, /* whether we have seen some program output yet */ 1077 seen_input:1, /* whether we have seen some program output yet */
1036 seen_resize:1, /* whether we had a resize event */ 1078 seen_resize:1, /* whether we had a resize event */
1079 init_done:1,
1037 parsed_geometry:1; 1080 parsed_geometry:1;
1038 1081
1039 unsigned char refresh_type, 1082 unsigned char refresh_type,
1040#ifdef META8_OPTION 1083#ifdef META8_OPTION
1041 meta_char, /* Alt-key prefix */ 1084 meta_char; /* Alt-key prefix */
1042#endif 1085#endif
1043 selection_wait,
1044 selection_type;
1045/* ---------- */ 1086/* ---------- */
1046 bool rvideo_state, rvideo_mode; 1087 bool rvideo_state, rvideo_mode;
1047#ifndef NO_BELL 1088#ifndef NO_BELL
1048 bool rvideo_bell; 1089 bool rvideo_bell;
1049#endif 1090#endif
… …
1077 allowedxerror; 1118 allowedxerror;
1078/* ---------- */ 1119/* ---------- */
1079 unsigned int ModLevel3Mask, 1120 unsigned int ModLevel3Mask,
1080 ModMetaMask, 1121 ModMetaMask,
1081 ModNumLockMask; 1122 ModNumLockMask;
1082 int old_width, /* last used width in screen resize */
1083 old_height; /* last used height in screen resize */
1084 unsigned long priv_modes, 1123 unsigned long priv_modes,
1085 SavedModes; 1124 SavedModes;
1086/* ---------- */ 1125/* ---------- */
1087 Atom *xa; 1126 Atom *xa;
1088/* ---------- */ 1127/* ---------- */
1089 Time selection_time, 1128 Time selection_time,
1090 selection_request_time,
1091 clipboard_time; 1129 clipboard_time;
1130 rxvt_selection *selection_req;
1092 pid_t cmd_pid; /* process id of child */ 1131 pid_t cmd_pid; /* process id of child */
1093 char * incr_buf;
1094 size_t incr_buf_size, incr_buf_fill;
1095/* ---------- */ 1132/* ---------- */
1096 struct mouse_event MEvent; 1133 struct mouse_event MEvent;
1097 XComposeStatus compose; 1134 XComposeStatus compose;
1098 static struct termios def_tio; 1135 static struct termios def_tio;
1099 row_col_t oldcursor; 1136 row_col_t oldcursor;
1100#ifdef HAVE_BG_PIXMAP 1137#ifdef HAVE_BG_PIXMAP
1101 bgPixmap_t bgPixmap; 1138 void bg_init ();
1139 void bg_destroy ();
1140
1141 enum {
1142 BG_IS_VALID = 1 << 0,
1143
1144 BG_IS_TRANSPARENT = 1 << 1,
1145 BG_NEEDS_REFRESH = 1 << 2,
1146
1147 BG_HAS_RENDER = 1 << 3,
1148 BG_HAS_RENDER_CONV = 1 << 4,
1149 BG_CLIENT_RENDER = 1 << 5,
1150
1151 BG_TINT_SET = 1 << 6,
1152 BG_TINT_BITAND = 1 << 7,
1153 };
1154
1155 uint8_t bg_flags;
1156
1157# ifdef BG_IMAGE_FROM_FILE
1158 rxvt_image bg_image;
1159 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1160 bool render_image (rxvt_image &image);
1102#endif 1161# endif
1103#ifdef HAVE_AFTERIMAGE
1104 ASVisual *asv;
1105 ASImageManager *asimman;
1106 1162
1107 void init_asv () 1163# ifdef ENABLE_TRANSPARENCY
1164 Pixmap root_pixmap; /* current root pixmap set */
1165 rxvt_color tint;
1166 int shade;
1167 int h_blurRadius, v_blurRadius;
1168
1169 void bg_set_transparent ()
1108 { 1170 {
1109 if (!asv) 1171 bg_flags |= BG_IS_TRANSPARENT;
1110 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1111 } 1172 }
1173 void bg_set_root_pixmap ();
1174 bool bg_set_tint (rxvt_color &new_tint);
1175 bool bg_set_shade (const char *shade_str);
1176 bool bg_set_blur (const char *geom);
1177
1178 bool blur_pixmap (Pixmap pixmap, int width, int height);
1179 bool tint_pixmap (Pixmap pixmap, int width, int height);
1180 void tint_ximage (XImage *ximage);
1181 bool make_transparency_pixmap ();
1182# endif
1183
1184 ev_tstamp bg_valid_since;
1185
1186 Pixmap bg_pixmap;
1187 unsigned int bg_pmap_width, bg_pmap_height;
1188
1189 int target_x;
1190 int target_y;
1191 bool bg_set_position (int x, int y);
1192 bool bg_window_size_sensitive ();
1193 bool bg_window_position_sensitive ();
1194
1195 bool bg_render ();
1196 void bg_invalidate ()
1197 {
1198 bg_flags &= ~BG_IS_VALID;
1199 }
1200#endif
1201#ifdef HAVE_PIXBUF
1202 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1203 int src_x, int src_y, int dst_x, int dst_y,
1204 unsigned int width, unsigned int height);
1112#endif 1205#endif
1113 1206
1114#if ENABLE_OVERLAY 1207#if ENABLE_OVERLAY
1115 overlay_base ov; 1208 overlay_base ov;
1116 1209
… …
1124 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1217 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1125#endif 1218#endif
1126 1219
1127 vector<void *> allocated; // free these memory blocks with free() 1220 vector<void *> allocated; // free these memory blocks with free()
1128 1221
1129 char env_windowid[21]; /* environmental variable WINDOWID */
1130 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1131 char *env_display; /* environmental variable DISPLAY */
1132 char *env_term; /* environmental variable TERM */
1133
1134 char *locale; 1222 char *locale;
1135 char charsets[4]; 1223 char charsets[4];
1136 char *v_buffer; /* pointer to physical buffer */ 1224 char *v_buffer; /* pointer to physical buffer */
1137 unsigned int v_buflen; /* size of area to write */ 1225 unsigned int v_buflen; /* size of area to write */
1138 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1226 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1191 void child_cb (ev::child &w, int revents); ev::child child_ev; 1279 void child_cb (ev::child &w, int revents); ev::child child_ev;
1192 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1280 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1193 void refresh_check (); 1281 void refresh_check ();
1194 void flush (); 1282 void flush ();
1195 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1283 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1284 void cmdbuf_reify ();
1285 void cmdbuf_append (const char *str, size_t count);
1196 bool pty_fill (); 1286 bool pty_fill ();
1197 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1287 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1198 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1199 1288
1200#ifdef CURSOR_BLINK 1289#ifdef CURSOR_BLINK
1290 void cursor_blink_reset ();
1201 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1291 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1202#endif 1292#endif
1203#ifdef TEXT_BLINK 1293#ifdef TEXT_BLINK
1204 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1294 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1205#endif 1295#endif
… …
1224 void pointer_unblank (); 1314 void pointer_unblank ();
1225 1315
1226 void tt_printf (const char *fmt,...); 1316 void tt_printf (const char *fmt,...);
1227 void tt_write (const char *data, unsigned int len); 1317 void tt_write (const char *data, unsigned int len);
1228 void pty_write (); 1318 void pty_write ();
1229
1230 void init (stringvec *argv, stringvec *envv)
1231 {
1232 this->argv = argv;
1233 init (argv->size (), argv->begin (), envv);
1234 }
1235 1319
1236 void make_current () const // make this the "currently active" urxvt instance 1320 void make_current () const // make this the "currently active" urxvt instance
1237 { 1321 {
1238 SET_R (this); 1322 SET_R (this);
1239 set_environ (envv); 1323 set_environ (envv);
… …
1251 void im_set_size (XRectangle &size); 1335 void im_set_size (XRectangle &size);
1252 void im_set_position (XPoint &pos) NOTHROW; 1336 void im_set_position (XPoint &pos) NOTHROW;
1253 void im_set_color (unsigned long &fg, unsigned long &bg); 1337 void im_set_color (unsigned long &fg, unsigned long &bg);
1254 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1338 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1255 1339
1256 bool IMisRunning (); 1340 bool im_is_running ();
1257 void IMSendSpot (); 1341 void im_send_spot ();
1258 bool IM_get_IC (const char *modifiers); 1342 bool im_get_ic (const char *modifiers);
1259 void IMSetPosition (); 1343 void im_set_position ();
1260#endif 1344#endif
1261 1345
1262 // command.C 1346 // command.C
1263 void key_press (XKeyEvent &ev); 1347 void key_press (XKeyEvent &ev);
1264 void key_release (XKeyEvent &ev); 1348 void key_release (XKeyEvent &ev);
1265 unsigned int cmd_write (const char *str, unsigned int count);
1266 1349
1267 wchar_t next_char () NOTHROW; 1350 wchar_t next_char () NOTHROW;
1268 wchar_t cmd_getc () THROW ((class out_of_input)); 1351 wchar_t cmd_getc () THROW ((class out_of_input));
1269 uint32_t next_octet () NOTHROW; 1352 uint32_t next_octet () NOTHROW;
1270 uint32_t cmd_get8 () THROW ((class out_of_input)); 1353 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1297 void process_color_seq (int report, int color, const char *str, char resp); 1380 void process_color_seq (int report, int color, const char *str, char resp);
1298 void process_xterm_seq (int op, char *str, char resp); 1381 void process_xterm_seq (int op, char *str, char resp);
1299 int privcases (int mode, unsigned long bit); 1382 int privcases (int mode, unsigned long bit);
1300 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1383 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1301 void process_sgr_mode (unsigned int nargs, const int *arg); 1384 void process_sgr_mode (unsigned int nargs, const int *arg);
1302 void process_graphics ();
1303 // init.C 1385 // init.C
1386 void init (stringvec *argv, stringvec *envv);
1387 void init (int argc, const char *const *argv, const char *const *envv);
1388 void init2 (int argc, const char *const *argv);
1304 void init_vars (); 1389 void init_vars ();
1305 const char **init_resources (int argc, const char *const *argv); 1390 const char **init_resources (int argc, const char *const *argv);
1306 void init (int argc, const char *const *argv, stringvec *envv);
1307 void init_env (); 1391 void init_env ();
1308 void set_locale (const char *locale); 1392 void set_locale (const char *locale);
1309 void init_xlocale (); 1393 void init_xlocale ();
1310 void init_command (const char *const *argv); 1394 void init_command (const char *const *argv);
1311 void run_command (const char *const *argv); 1395 void run_command (const char *const *argv);
… …
1329 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1413 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1330 void set_utf8_property (Atom prop, const char *str, int len = -1); 1414 void set_utf8_property (Atom prop, const char *str, int len = -1);
1331 void set_title (const char *str); 1415 void set_title (const char *str);
1332 void set_icon_name (const char *str); 1416 void set_icon_name (const char *str);
1333 void set_window_color (int idx, const char *color); 1417 void set_window_color (int idx, const char *color);
1334 void set_colorfgbg (); 1418 char *get_colorfgbg ();
1335 bool set_color (rxvt_color &color, const char *name); 1419 bool set_color (rxvt_color &color, const char *name);
1336 void alias_color (int dst, int src); 1420 void alias_color (int dst, int src);
1337 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1421 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1338 void get_window_origin (int &x, int &y); 1422 void get_window_origin (int &x, int &y);
1339 Pixmap get_pixmap_property (Atom property); 1423 Pixmap get_pixmap_property (Atom property);
… …
1374#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
1375 if (r & RS_Bold 1459 if (r & RS_Bold
1376# if ENABLE_STYLES 1460# if ENABLE_STYLES
1377 && option (Opt_intensityStyles) 1461 && option (Opt_intensityStyles)
1378# endif 1462# endif
1379 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1463 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1380 base += minBrightCOLOR - minCOLOR; 1464 base += minBrightCOLOR - minCOLOR;
1381#endif 1465#endif
1382 return base; 1466 return base;
1383 } 1467 }
1384 1468
… …
1388#ifndef NO_BRIGHTCOLOR 1472#ifndef NO_BRIGHTCOLOR
1389 if (r & RS_Blink 1473 if (r & RS_Blink
1390# if ENABLE_STYLES 1474# if ENABLE_STYLES
1391 && option (Opt_intensityStyles) 1475 && option (Opt_intensityStyles)
1392# endif 1476# endif
1393 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1477 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1394 base += minBrightCOLOR - minCOLOR; 1478 base += minBrightCOLOR - minCOLOR;
1395#endif 1479#endif
1396 return base; 1480 return base;
1397 } 1481 }
1398 1482
… …
1400 { 1484 {
1401 return options[opt >> 3] & (1 << (opt & 7)); 1485 return options[opt >> 3] & (1 << (opt & 7));
1402 } 1486 }
1403 1487
1404 void set_option (uint8_t opt, bool set = true) NOTHROW; 1488 void set_option (uint8_t opt, bool set = true) NOTHROW;
1405
1406 void set_privmode (unsigned bit, int set) NOTHROW
1407 {
1408 if (set)
1409 priv_modes |= bit;
1410 else
1411 priv_modes &= ~bit;
1412 }
1413 1489
1414 // modifies first argument(!) 1490 // modifies first argument(!)
1415 void tt_paste (char *data, unsigned int len) NOTHROW; 1491 void tt_paste (char *data, unsigned int len) NOTHROW;
1416 void paste (char *data, unsigned int len) NOTHROW; 1492 void paste (char *data, unsigned int len) NOTHROW;
1417 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1493 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1429 void scr_backindex () NOTHROW; 1505 void scr_backindex () NOTHROW;
1430 void scr_forwardindex () NOTHROW; 1506 void scr_forwardindex () NOTHROW;
1431#endif 1507#endif
1432 void scr_touch (bool refresh) NOTHROW; 1508 void scr_touch (bool refresh) NOTHROW;
1433 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW; 1509 void scr_expose (int x, int y, int width, int height, bool refresh) NOTHROW;
1434 void scr_recolour () NOTHROW; 1510 void scr_recolour (bool refresh = true) NOTHROW;
1435 void scr_remap_chars () NOTHROW; 1511 void scr_remap_chars () NOTHROW;
1436 void scr_remap_chars (line_t &l) NOTHROW; 1512 void scr_remap_chars (line_t &l) NOTHROW;
1437 1513
1438 enum cursor_mode { SAVE, RESTORE }; 1514 enum cursor_mode { SAVE, RESTORE };
1439 1515
… …
1474 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1550 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1475 void scr_reverse_selection () NOTHROW; 1551 void scr_reverse_selection () NOTHROW;
1476 void scr_dump (int fd) NOTHROW; 1552 void scr_dump (int fd) NOTHROW;
1477 1553
1478 void selection_check (int check_more) NOTHROW; 1554 void selection_check (int check_more) NOTHROW;
1479 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1480 void selection_property (Window win, Atom prop) NOTHROW;
1481 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1555 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1482 int selection_request_other (Atom target, int selnum) NOTHROW;
1483 void selection_clear (bool clipboard = false) NOTHROW; 1556 void selection_clear (bool clipboard = false) NOTHROW;
1484 void selection_make (Time tm); 1557 void selection_make (Time tm);
1485 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1558 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1486 void selection_start_colrow (int col, int row) NOTHROW; 1559 void selection_start_colrow (int col, int row) NOTHROW;
1487 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1560 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
… …
1491 void selection_click (int clicks, int x, int y) NOTHROW; 1564 void selection_click (int clicks, int x, int y) NOTHROW;
1492 void selection_extend (int x, int y, int flag) NOTHROW; 1565 void selection_extend (int x, int y, int flag) NOTHROW;
1493 void selection_rotate (int x, int y) NOTHROW; 1566 void selection_rotate (int x, int y) NOTHROW;
1494 1567
1495 // xdefaults.C 1568 // xdefaults.C
1496 void get_options (int argc, const char *const *argv); 1569 const char **get_options (int argc, const char *const *argv);
1497 int parse_keysym (const char *str, const char *arg); 1570 int parse_keysym (const char *str, const char *arg);
1498 const char *x_resource (const char *name); 1571 const char *x_resource (const char *name);
1499 void extract_resources (); 1572 void extract_resources ();
1573 void extract_keysym_resources ();
1500}; 1574};
1501 1575
1502#endif /* _RXVT_H_ */ 1576#endif /* _RXVT_H_ */
1503 1577

Diff Legend

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