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.428 by sf-exg, Thu Jan 20 17:39:29 2011 UTC vs.
Revision 1.466 by sf-exg, Thu Jan 19 13:33:43 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
… …
74#include <X11/cursorfont.h> 72#include <X11/cursorfont.h>
75#include <X11/keysym.h> 73#include <X11/keysym.h>
76#include <X11/keysymdef.h> 74#include <X11/keysymdef.h>
77#include <X11/Xatom.h> 75#include <X11/Xatom.h>
78 76
77#ifdef HAVE_AFTERIMAGE
78# include <afterimage.h>
79# undef min
80# undef max
81#endif
82
83#ifdef HAVE_PIXBUF
84# include <gdk-pixbuf/gdk-pixbuf.h>
85#endif
86
87#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
88# define HAVE_BG_PIXMAP 1
89#endif
90
79#include "encoding.h" 91#include "encoding.h"
80#include "rxvtutil.h" 92#include "rxvtutil.h"
81#include "rxvtfont.h" 93#include "rxvtfont.h"
82#include "rxvttoolkit.h" 94#include "rxvttoolkit.h"
83#include "scrollbar.h" 95#include "scrollbar.h"
… …
102 ***************************************************************************** 114 *****************************************************************************
103 */ 115 */
104 116
105#include <termios.h> 117#include <termios.h>
106 118
107#include "background.h"
108
109#ifndef STDIN_FILENO 119#ifndef STDIN_FILENO
110# define STDIN_FILENO 0 120# define STDIN_FILENO 0
111# define STDOUT_FILENO 1 121# define STDOUT_FILENO 1
112# define STDERR_FILENO 2 122# define STDERR_FILENO 2
113#endif 123#endif
114 124
115#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 125#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
116# define EXIT_SUCCESS 0 /* exit function success */ 126# define EXIT_SUCCESS 0 /* exit function success */
117# define EXIT_FAILURE 1 /* exit function failure */ 127# define EXIT_FAILURE 1 /* exit function failure */
118#endif
119
120#ifndef PATH_MAX
121# define PATH_MAX 16384
122#endif 128#endif
123 129
124/****************************************************************************/ 130/****************************************************************************/
125 131
126// exception thrown on fatal (per-instance) errors 132// exception thrown on fatal (per-instance) errors
… …
149 155
150const char * rxvt_basename (const char *str) NOTHROW; 156const char * rxvt_basename (const char *str) NOTHROW;
151void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
152void rxvt_log (const char *fmt,...) NOTHROW; 158void rxvt_log (const char *fmt,...) NOTHROW;
153void rxvt_warn (const char *fmt,...) NOTHROW; 159void rxvt_warn (const char *fmt,...) NOTHROW;
154void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 160void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
155void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
156 162
157char * rxvt_strtrim (char *str) NOTHROW; 163char * rxvt_strtrim (char *str) NOTHROW;
158char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 164char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
159 165
160static inline void 166static inline void
… …
296# define NSCREENS 0 302# define NSCREENS 0
297#else 303#else
298# define NSCREENS 1 304# define NSCREENS 1
299#endif 305#endif
300 306
301/* special (internal) prefix for font commands */
302#define FONT_CMD '#'
303#define FONT_DN "#-"
304#define FONT_UP "#+"
305
306/* flags for rxvt_scr_gotorc () */ 307/* flags for rxvt_term::scr_gotorc () */
307enum { 308enum {
308 C_RELATIVE = 1, /* col movement is relative */ 309 C_RELATIVE = 1, /* col movement is relative */
309 R_RELATIVE = 2, /* row movement is relative */ 310 R_RELATIVE = 2, /* row movement is relative */
310 RELATIVE = C_RELATIVE | R_RELATIVE, 311 RELATIVE = C_RELATIVE | R_RELATIVE,
311}; 312};
312 313
313/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 314/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
314enum { 315enum {
315 INSERT = -1, /* don't change these values */ 316 INSERT = -1, /* don't change these values */
316 DELETE = +1, 317 DELETE = +1,
317 ERASE = +2, 318 ERASE = +2,
318}; 319};
319 320
320/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 321/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
321enum page_dirn { 322enum page_dirn {
322 UP, 323 UP,
323 DN, 324 DN,
324 NO_DIR, 325 NO_DIR,
325}; 326};
326 327
327/* arguments for rxvt_scr_change_screen () */ 328/* arguments for rxvt_term::scr_change_screen () */
328enum { 329enum {
329 PRIMARY = 0, 330 PRIMARY = 0,
330 SECONDARY, 331 SECONDARY,
331}; 332};
332 333
… …
374#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline) 375#define RS_baseattrMask (RS_Italic | RS_Bold | RS_Blink | RS_RVid | RS_Uline)
375#define RS_attrMask (RS_baseattrMask | RS_fontMask) 376#define RS_attrMask (RS_baseattrMask | RS_fontMask)
376 377
377#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift)) 378#define DEFAULT_RSTYLE (RS_None | (Color_fg << RS_fgShift) | (Color_bg << RS_bgShift))
378#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift)) 379#define OVERLAY_RSTYLE (RS_None | (Color_Black << RS_fgShift) | (Color_Yellow << RS_bgShift))
379
380#define Sel_none 0 /* Not waiting */
381#define Sel_normal 0x01 /* normal selection */
382#define Sel_incr 0x02 /* incremental selection */
383#define Sel_direct 0x00
384#define Sel_Primary 0x01
385#define Sel_Secondary 0x02
386#define Sel_Clipboard 0x03
387#define Sel_whereMask 0x0f
388#define Sel_CompoundText 0x10 /* last request was COMPOUND_TEXT */
389#define Sel_UTF8String 0x20 /* last request was UTF8_STRING */
390 380
391enum { 381enum {
392 C0_NUL = 0x00, 382 C0_NUL = 0x00,
393 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL, 383 C0_SOH, C0_STX, C0_ETX, C0_EOT, C0_ENQ, C0_ACK, C0_BEL,
394 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI , 384 C0_BS , C0_HT , C0_LF , C0_VT , C0_FF , C0_CR , C0_SO , C0_SI ,
… …
675 665
676#define GET_ATTR(x) (((x) & RS_attrMask)) 666#define GET_ATTR(x) (((x) & RS_attrMask))
677// return attributes defining the background, encoding doesn't matter 667// return attributes defining the background, encoding doesn't matter
678// depends on RS_fgShift > RS_bgShift 668// depends on RS_fgShift > RS_bgShift
679#define GET_BGATTR(x) \ 669#define GET_BGATTR(x) \
680 (expect_false ((x) & RS_RVid) \ 670 (ecb_unlikely ((x) & RS_RVid) \
681 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 671 ? (((x) & (RS_attrMask & ~RS_RVid)) \
682 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 672 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
683 : ((x) & (RS_attrMask | RS_bgMask))) 673 : ((x) & (RS_attrMask | RS_bgMask)))
684#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 674#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
685#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 675#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
878 * END······················= total_rows 868 * END······················= total_rows
879 */ 869 */
880 870
881struct TermWin_t 871struct TermWin_t
882{ 872{
873 int vt_width; /* actual window width [pixels] */
874 int vt_height; /* actual window height [pixels] */
883 int width; /* window width [pixels] */ 875 int width; /* window width [pixels] */
884 int height; /* window height [pixels] */ 876 int height; /* window height [pixels] */
885 int fwidth; /* font width [pixels] */ 877 int fwidth; /* font width [pixels] */
886 int fheight; /* font height [pixels] */ 878 int fheight; /* font height [pixels] */
887 int fbase; /* font ascent (baseline) [pixels] */ 879 int fbase; /* font ascent (baseline) [pixels] */
… …
896 int saveLines; /* number of lines that fit in scrollback */ 888 int saveLines; /* number of lines that fit in scrollback */
897 int total_rows; /* total number of rows in this terminal */ 889 int total_rows; /* total number of rows in this terminal */
898 int term_start; /* term lines start here */ 890 int term_start; /* term lines start here */
899 int view_start; /* scrollback view starts here */ 891 int view_start; /* scrollback view starts here */
900 int top_row; /* topmost row index of scrollback */ 892 int top_row; /* topmost row index of scrollback */
901 Window parent[6]; /* parent identifiers - we're parent[0] */ 893 Window parent; /* parent identifier */
902 Window vt; /* vt100 window */ 894 Window vt; /* vt100 window */
903 GC gc; /* GC for drawing */ 895 GC gc; /* GC for drawing */
904 Pixmap pixmap;
905 rxvt_drawable *drawable; 896 rxvt_drawable *drawable;
906 rxvt_fontset *fontset[4]; 897 rxvt_fontset *fontset[4];
907}; 898};
908 899
909/* 900/*
… …
989 scrollBar_t scrollBar; 980 scrollBar_t scrollBar;
990 uint8_t options[(Opt_count + 7) >> 3]; 981 uint8_t options[(Opt_count + 7) >> 3];
991 XSizeHints szHint; 982 XSizeHints szHint;
992 rxvt_color *pix_colors; 983 rxvt_color *pix_colors;
993 Cursor TermWin_cursor; /* cursor for vt window */ 984 Cursor TermWin_cursor; /* cursor for vt window */
994 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 985 line_t *row_buf; // all lines, scrollback + terminal, circular
995 line_t *drawn_buf; // text on screen 986 line_t *drawn_buf; // text on screen
996 line_t *swap_buf; // lines for swap buffer 987 line_t *swap_buf; // lines for swap buffer
997 char *tabs; /* per location: 1 == tab-stop */ 988 char *tabs; /* per location: 1 == tab-stop */
998 screen_t screen; 989 screen_t screen;
999 screen_t swap; 990 screen_t swap;
… …
1036 hidden_pointer:1, 1027 hidden_pointer:1,
1037#endif 1028#endif
1038 enc_utf8:1, /* whether locale uses utf-8 */ 1029 enc_utf8:1, /* whether locale uses utf-8 */
1039 seen_input:1, /* whether we have seen some program output yet */ 1030 seen_input:1, /* whether we have seen some program output yet */
1040 seen_resize:1, /* whether we had a resize event */ 1031 seen_resize:1, /* whether we had a resize event */
1032 init_done:1,
1041 parsed_geometry:1; 1033 parsed_geometry:1;
1042 1034
1043 unsigned char refresh_type, 1035 unsigned char refresh_type,
1044#ifdef META8_OPTION 1036#ifdef META8_OPTION
1045 meta_char, /* Alt-key prefix */ 1037 meta_char; /* Alt-key prefix */
1046#endif 1038#endif
1047 selection_wait,
1048 selection_type;
1049/* ---------- */ 1039/* ---------- */
1050 bool rvideo_state, rvideo_mode; 1040 bool rvideo_state, rvideo_mode;
1051#ifndef NO_BELL 1041#ifndef NO_BELL
1052 bool rvideo_bell; 1042 bool rvideo_bell;
1053#endif 1043#endif
… …
1081 allowedxerror; 1071 allowedxerror;
1082/* ---------- */ 1072/* ---------- */
1083 unsigned int ModLevel3Mask, 1073 unsigned int ModLevel3Mask,
1084 ModMetaMask, 1074 ModMetaMask,
1085 ModNumLockMask; 1075 ModNumLockMask;
1086 int old_width, /* last used width in screen resize */
1087 old_height; /* last used height in screen resize */
1088 unsigned long priv_modes, 1076 unsigned long priv_modes,
1089 SavedModes; 1077 SavedModes;
1090/* ---------- */ 1078/* ---------- */
1091 Atom *xa; 1079 Atom *xa;
1092/* ---------- */ 1080/* ---------- */
1093 Time selection_time, 1081 Time selection_time,
1094 selection_request_time,
1095 clipboard_time; 1082 clipboard_time;
1083 rxvt_selection *selection_req;
1096 pid_t cmd_pid; /* process id of child */ 1084 pid_t cmd_pid; /* process id of child */
1097 char * incr_buf;
1098 size_t incr_buf_size, incr_buf_fill;
1099/* ---------- */ 1085/* ---------- */
1100 struct mouse_event MEvent; 1086 struct mouse_event MEvent;
1101 XComposeStatus compose; 1087 XComposeStatus compose;
1102 static struct termios def_tio; 1088 static struct termios def_tio;
1103 row_col_t oldcursor; 1089 row_col_t oldcursor;
1104#ifdef HAVE_BG_PIXMAP 1090#ifdef HAVE_BG_PIXMAP
1105 bgPixmap_t bgPixmap; 1091 void bg_init ();
1092 void bg_destroy ();
1093
1094 enum {
1095 //subset returned by make_transparency_pixmap
1096 BG_IS_VALID = 1 << 0,
1097 BG_NEEDS_TINT = 1 << 1,
1098 BG_NEEDS_BLUR = 1 << 2,
1099
1100 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1101
1102 BG_KEEP_ASPECT = 1 << 3,
1103 BG_ROOT_ALIGN = 1 << 4,
1104 BG_TILE = 1 << 14,
1105 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1106
1107 BG_TINT_SET = 1 << 5,
1108 BG_TINT_BITAND = 1 << 6,
1109 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1110
1111 BG_HAS_RENDER = 1 << 7,
1112 BG_HAS_RENDER_CONV = 1 << 8,
1113 BG_CLIENT_RENDER = 1 << 9,
1114
1115 BG_IS_TRANSPARENT = 1 << 10,
1116 BG_NEEDS_REFRESH = 1 << 11,
1117 BG_IS_SIZE_SENSITIVE = 1 << 12,
1118 BG_IS_FROM_FILE = 1 << 13,
1119 };
1120
1121 unsigned int bg_flags;
1122
1123# ifdef BG_IMAGE_FROM_FILE
1124 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
1125 bool render_image (unsigned long tr_flags);
1126
1127 enum {
1128 noScale = 0,
1129 windowScale = 100,
1130 defaultScale = windowScale,
1131 centerAlign = 50,
1132 defaultAlign = centerAlign,
1133 };
1134
1135 unsigned int h_scale, v_scale; /* percents of the window size */
1136 int h_align, v_align; /* percents of the window size:
1137 0 - left align, 50 - center, 100 - right */
1138
1139 bool bg_set_geometry (const char *geom, bool update = false);
1140 void bg_set_default_geometry ()
1141 {
1142 h_scale = v_scale = defaultScale;
1143 h_align = v_align = defaultAlign;
1144 }
1145
1146 bool bg_set_file (const char *file);
1147# endif
1148
1149# ifdef ENABLE_TRANSPARENCY
1150 Pixmap root_pixmap; /* current root pixmap set */
1151 rxvt_color tint;
1152 int shade;
1153 int h_blurRadius, v_blurRadius;
1154
1155 bool bg_set_transparent ();
1156 void bg_set_root_pixmap ();
1157 void set_tint_shade_flags ();
1158 bool bg_set_tint (rxvt_color &new_tint);
1159 bool bg_set_shade (const char *shade_str);
1160 bool bg_set_blur (const char *geom);
1161
1162 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1163 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1164 void tint_ximage (Visual *visual, XImage *ximage);
1165 unsigned long make_transparency_pixmap ();
1166# endif
1167
1168 ev_tstamp bg_valid_since;
1169
1170 Pixmap bg_pixmap;
1171 unsigned int bg_pmap_width, bg_pmap_height;
1172
1173 int target_x;
1174 int target_y;
1175 bool bg_set_position (int x, int y);
1176 bool bg_window_size_sensitive ();
1177 bool bg_window_position_sensitive ();
1178
1179 bool bg_render ();
1180 void bg_invalidate ()
1181 {
1182 bg_flags &= ~BG_IS_VALID;
1183 }
1106#endif 1184#endif
1107#ifdef HAVE_AFTERIMAGE 1185#ifdef HAVE_AFTERIMAGE
1186 ASImage *original_asim;
1108 ASVisual *asv; 1187 ASVisual *asv;
1109 ASImageManager *asimman; 1188 ASImageManager *asimman;
1110 1189
1111 void init_asv () 1190 void init_asv ()
1112 { 1191 {
1113 if (!asv) 1192 if (!asv)
1114 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL); 1193 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1115 } 1194 }
1195#endif
1196#ifdef HAVE_PIXBUF
1197 GdkPixbuf *pixbuf;
1198 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1199 int src_x, int src_y, int dst_x, int dst_y,
1200 unsigned int width, unsigned int height);
1116#endif 1201#endif
1117 1202
1118#if ENABLE_OVERLAY 1203#if ENABLE_OVERLAY
1119 overlay_base ov; 1204 overlay_base ov;
1120 1205
… …
1128 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1213 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1129#endif 1214#endif
1130 1215
1131 vector<void *> allocated; // free these memory blocks with free() 1216 vector<void *> allocated; // free these memory blocks with free()
1132 1217
1133 char env_windowid[21]; /* environmental variable WINDOWID */
1134 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1135 char *env_display; /* environmental variable DISPLAY */
1136 char *env_term; /* environmental variable TERM */
1137
1138 char *locale; 1218 char *locale;
1139 char charsets[4]; 1219 char charsets[4];
1140 char *v_buffer; /* pointer to physical buffer */ 1220 char *v_buffer; /* pointer to physical buffer */
1141 unsigned int v_buflen; /* size of area to write */ 1221 unsigned int v_buflen; /* size of area to write */
1142 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1222 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1195 void child_cb (ev::child &w, int revents); ev::child child_ev; 1275 void child_cb (ev::child &w, int revents); ev::child child_ev;
1196 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev; 1276 void destroy_cb (ev::idle &w, int revents); ev::idle destroy_ev;
1197 void refresh_check (); 1277 void refresh_check ();
1198 void flush (); 1278 void flush ();
1199 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev; 1279 void flush_cb (ev::timer &w, int revents); ev::timer flush_ev;
1280 void cmdbuf_reify ();
1281 void cmdbuf_append (const char *str, size_t count);
1200 bool pty_fill (); 1282 bool pty_fill ();
1201 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1283 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1202 void incr_cb (ev::timer &w, int revents) NOTHROW; ev::timer incr_ev;
1203 1284
1204#ifdef CURSOR_BLINK 1285#ifdef CURSOR_BLINK
1205 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1286 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1206#endif 1287#endif
1207#ifdef TEXT_BLINK 1288#ifdef TEXT_BLINK
… …
1228 void pointer_unblank (); 1309 void pointer_unblank ();
1229 1310
1230 void tt_printf (const char *fmt,...); 1311 void tt_printf (const char *fmt,...);
1231 void tt_write (const char *data, unsigned int len); 1312 void tt_write (const char *data, unsigned int len);
1232 void pty_write (); 1313 void pty_write ();
1233
1234 void init (stringvec *argv, stringvec *envv)
1235 {
1236 this->argv = argv;
1237 init (argv->size (), argv->begin (), envv);
1238 }
1239 1314
1240 void make_current () const // make this the "currently active" urxvt instance 1315 void make_current () const // make this the "currently active" urxvt instance
1241 { 1316 {
1242 SET_R (this); 1317 SET_R (this);
1243 set_environ (envv); 1318 set_environ (envv);
… …
1255 void im_set_size (XRectangle &size); 1330 void im_set_size (XRectangle &size);
1256 void im_set_position (XPoint &pos) NOTHROW; 1331 void im_set_position (XPoint &pos) NOTHROW;
1257 void im_set_color (unsigned long &fg, unsigned long &bg); 1332 void im_set_color (unsigned long &fg, unsigned long &bg);
1258 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1333 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1259 1334
1260 bool IMisRunning (); 1335 bool im_is_running ();
1261 void IMSendSpot (); 1336 void im_send_spot ();
1262 bool IM_get_IC (const char *modifiers); 1337 bool im_get_ic (const char *modifiers);
1263 void IMSetPosition (); 1338 void im_set_position ();
1264#endif 1339#endif
1265 1340
1266 // command.C 1341 // command.C
1267 void key_press (XKeyEvent &ev); 1342 void key_press (XKeyEvent &ev);
1268 void key_release (XKeyEvent &ev); 1343 void key_release (XKeyEvent &ev);
1269 unsigned int cmd_write (const char *str, unsigned int count);
1270 1344
1271 wchar_t next_char () NOTHROW; 1345 wchar_t next_char () NOTHROW;
1272 wchar_t cmd_getc () THROW ((class out_of_input)); 1346 wchar_t cmd_getc () THROW ((class out_of_input));
1273 uint32_t next_octet () NOTHROW; 1347 uint32_t next_octet () NOTHROW;
1274 uint32_t cmd_get8 () THROW ((class out_of_input)); 1348 uint32_t cmd_get8 () THROW ((class out_of_input));
… …
1301 void process_color_seq (int report, int color, const char *str, char resp); 1375 void process_color_seq (int report, int color, const char *str, char resp);
1302 void process_xterm_seq (int op, char *str, char resp); 1376 void process_xterm_seq (int op, char *str, char resp);
1303 int privcases (int mode, unsigned long bit); 1377 int privcases (int mode, unsigned long bit);
1304 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1378 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1305 void process_sgr_mode (unsigned int nargs, const int *arg); 1379 void process_sgr_mode (unsigned int nargs, const int *arg);
1306 void process_graphics ();
1307 // init.C 1380 // init.C
1381 void init (stringvec *argv, stringvec *envv);
1382 void init (int argc, const char *const *argv, const char *const *envv);
1383 void init2 (int argc, const char *const *argv);
1308 void init_vars (); 1384 void init_vars ();
1309 const char **init_resources (int argc, const char *const *argv); 1385 const char **init_resources (int argc, const char *const *argv);
1310 void init (int argc, const char *const *argv, stringvec *envv);
1311 void init_env (); 1386 void init_env ();
1312 void set_locale (const char *locale); 1387 void set_locale (const char *locale);
1313 void init_xlocale (); 1388 void init_xlocale ();
1314 void init_command (const char *const *argv); 1389 void init_command (const char *const *argv);
1315 void run_command (const char *const *argv); 1390 void run_command (const char *const *argv);
… …
1333 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1408 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1334 void set_utf8_property (Atom prop, const char *str, int len = -1); 1409 void set_utf8_property (Atom prop, const char *str, int len = -1);
1335 void set_title (const char *str); 1410 void set_title (const char *str);
1336 void set_icon_name (const char *str); 1411 void set_icon_name (const char *str);
1337 void set_window_color (int idx, const char *color); 1412 void set_window_color (int idx, const char *color);
1338 void set_colorfgbg (); 1413 char *get_colorfgbg ();
1339 bool set_color (rxvt_color &color, const char *name); 1414 bool set_color (rxvt_color &color, const char *name);
1340 void alias_color (int dst, int src); 1415 void alias_color (int dst, int src);
1341 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1416 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1342 void get_window_origin (int &x, int &y); 1417 void get_window_origin (int &x, int &y);
1343 Pixmap get_pixmap_property (Atom property); 1418 Pixmap get_pixmap_property (Atom property);
… …
1378#ifndef NO_BRIGHTCOLOR 1453#ifndef NO_BRIGHTCOLOR
1379 if (r & RS_Bold 1454 if (r & RS_Bold
1380# if ENABLE_STYLES 1455# if ENABLE_STYLES
1381 && option (Opt_intensityStyles) 1456 && option (Opt_intensityStyles)
1382# endif 1457# endif
1383 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1458 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1384 base += minBrightCOLOR - minCOLOR; 1459 base += minBrightCOLOR - minCOLOR;
1385#endif 1460#endif
1386 return base; 1461 return base;
1387 } 1462 }
1388 1463
… …
1392#ifndef NO_BRIGHTCOLOR 1467#ifndef NO_BRIGHTCOLOR
1393 if (r & RS_Blink 1468 if (r & RS_Blink
1394# if ENABLE_STYLES 1469# if ENABLE_STYLES
1395 && option (Opt_intensityStyles) 1470 && option (Opt_intensityStyles)
1396# endif 1471# endif
1397 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1472 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1398 base += minBrightCOLOR - minCOLOR; 1473 base += minBrightCOLOR - minCOLOR;
1399#endif 1474#endif
1400 return base; 1475 return base;
1401 } 1476 }
1402 1477
… …
1404 { 1479 {
1405 return options[opt >> 3] & (1 << (opt & 7)); 1480 return options[opt >> 3] & (1 << (opt & 7));
1406 } 1481 }
1407 1482
1408 void set_option (uint8_t opt, bool set = true) NOTHROW; 1483 void set_option (uint8_t opt, bool set = true) NOTHROW;
1409
1410 void set_privmode (unsigned bit, int set) NOTHROW
1411 {
1412 if (set)
1413 priv_modes |= bit;
1414 else
1415 priv_modes &= ~bit;
1416 }
1417 1484
1418 // modifies first argument(!) 1485 // modifies first argument(!)
1419 void tt_paste (char *data, unsigned int len) NOTHROW; 1486 void tt_paste (char *data, unsigned int len) NOTHROW;
1420 void paste (char *data, unsigned int len) NOTHROW; 1487 void paste (char *data, unsigned int len) NOTHROW;
1421 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1488 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1478 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW; 1545 void scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW;
1479 void scr_reverse_selection () NOTHROW; 1546 void scr_reverse_selection () NOTHROW;
1480 void scr_dump (int fd) NOTHROW; 1547 void scr_dump (int fd) NOTHROW;
1481 1548
1482 void selection_check (int check_more) NOTHROW; 1549 void selection_check (int check_more) NOTHROW;
1483 void selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW;
1484 void selection_property (Window win, Atom prop) NOTHROW;
1485 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW; 1550 void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
1486 int selection_request_other (Atom target, int selnum) NOTHROW;
1487 void selection_clear (bool clipboard = false) NOTHROW; 1551 void selection_clear (bool clipboard = false) NOTHROW;
1488 void selection_make (Time tm); 1552 void selection_make (Time tm);
1489 bool selection_grab (Time tm, bool clipboard = false) NOTHROW; 1553 bool selection_grab (Time tm, bool clipboard = false) NOTHROW;
1490 void selection_start_colrow (int col, int row) NOTHROW; 1554 void selection_start_colrow (int col, int row) NOTHROW;
1491 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW; 1555 void selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW;
… …
1495 void selection_click (int clicks, int x, int y) NOTHROW; 1559 void selection_click (int clicks, int x, int y) NOTHROW;
1496 void selection_extend (int x, int y, int flag) NOTHROW; 1560 void selection_extend (int x, int y, int flag) NOTHROW;
1497 void selection_rotate (int x, int y) NOTHROW; 1561 void selection_rotate (int x, int y) NOTHROW;
1498 1562
1499 // xdefaults.C 1563 // xdefaults.C
1500 void get_options (int argc, const char *const *argv); 1564 const char **get_options (int argc, const char *const *argv);
1501 int parse_keysym (const char *str, const char *arg); 1565 int parse_keysym (const char *str, const char *arg);
1502 const char *x_resource (const char *name); 1566 const char *x_resource (const char *name);
1503 void extract_resources (); 1567 void extract_resources ();
1568 void extract_keysym_resources ();
1504}; 1569};
1505 1570
1506#endif /* _RXVT_H_ */ 1571#endif /* _RXVT_H_ */
1507 1572

Diff Legend

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