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.439 by sf-exg, Thu Apr 7 12:19:41 2011 UTC vs.
Revision 1.476 by sf-exg, Thu May 17 10:31:26 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
31using namespace std;
32 28
33// we assume that Xlib.h defines XPointer, and it does since at least 1994... 29// we assume that Xlib.h defines XPointer, and it does since at least 1994...
34 30
35extern "C" { 31extern "C" {
36#include <X11/Xlib.h> 32#include <X11/Xlib.h>
… …
74#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
75#include <X11/keysym.h> 71#include <X11/keysym.h>
76#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
77#include <X11/Xatom.h> 73#include <X11/Xatom.h>
78 74
79#ifdef HAVE_AFTERIMAGE
80# include <afterimage.h>
81# undef min
82# undef max
83#endif
84
85#ifdef HAVE_PIXBUF 75#ifdef HAVE_PIXBUF
86# include <gdk-pixbuf/gdk-pixbuf.h> 76# include <gdk-pixbuf/gdk-pixbuf.h>
87#endif 77#endif
88 78
89#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
… …
125#endif 115#endif
126 116
127#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */ 117#ifndef EXIT_SUCCESS /* missing from <stdlib.h> */
128# define EXIT_SUCCESS 0 /* exit function success */ 118# define EXIT_SUCCESS 0 /* exit function success */
129# define EXIT_FAILURE 1 /* exit function failure */ 119# define EXIT_FAILURE 1 /* exit function failure */
130#endif
131
132#ifndef PATH_MAX
133# define PATH_MAX 16384
134#endif 120#endif
135 121
136/****************************************************************************/ 122/****************************************************************************/
137 123
138// exception thrown on fatal (per-instance) errors 124// exception thrown on fatal (per-instance) errors
… …
161 147
162const char * rxvt_basename (const char *str) NOTHROW; 148const char * rxvt_basename (const char *str) NOTHROW;
163void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
164void rxvt_log (const char *fmt,...) NOTHROW; 150void rxvt_log (const char *fmt,...) NOTHROW;
165void rxvt_warn (const char *fmt,...) NOTHROW; 151void rxvt_warn (const char *fmt,...) NOTHROW;
166void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN; 152void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
167void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) NORETURN; 153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn;
168 154
169char * rxvt_strtrim (char *str) NOTHROW; 155char * rxvt_strtrim (char *str) NOTHROW;
170char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 156char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
171 157
172static inline void 158static inline void
… …
221 ~localise_env () 207 ~localise_env ()
222 { 208 {
223 environ = orig_env; 209 environ = orig_env;
224 } 210 }
225}; 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
226 274
227/* 275/*
228 ***************************************************************************** 276 *****************************************************************************
229 * STRUCTURES AND TYPEDEFS 277 * STRUCTURES AND TYPEDEFS
230 ***************************************************************************** 278 *****************************************************************************
… …
308# define NSCREENS 0 356# define NSCREENS 0
309#else 357#else
310# define NSCREENS 1 358# define NSCREENS 1
311#endif 359#endif
312 360
313/* special (internal) prefix for font commands */
314#define FONT_CMD '#'
315#define FONT_DN "#-"
316#define FONT_UP "#+"
317
318/* flags for rxvt_scr_gotorc () */ 361/* flags for rxvt_term::scr_gotorc () */
319enum { 362enum {
320 C_RELATIVE = 1, /* col movement is relative */ 363 C_RELATIVE = 1, /* col movement is relative */
321 R_RELATIVE = 2, /* row movement is relative */ 364 R_RELATIVE = 2, /* row movement is relative */
322 RELATIVE = C_RELATIVE | R_RELATIVE, 365 RELATIVE = C_RELATIVE | R_RELATIVE,
323}; 366};
324 367
325/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */ 368/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
326enum { 369enum {
327 INSERT = -1, /* don't change these values */ 370 INSERT = -1, /* don't change these values */
328 DELETE = +1, 371 DELETE = +1,
329 ERASE = +2, 372 ERASE = +2,
330}; 373};
331 374
332/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */ 375/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
333enum page_dirn { 376enum page_dirn {
334 UP, 377 UP,
335 DN, 378 DN,
336 NO_DIR, 379 NO_DIR,
337}; 380};
338 381
339/* arguments for rxvt_scr_change_screen () */ 382/* arguments for rxvt_term::scr_change_screen () */
340enum { 383enum {
341 PRIMARY = 0, 384 PRIMARY = 0,
342 SECONDARY, 385 SECONDARY,
343}; 386};
344 387
… …
676 719
677#define GET_ATTR(x) (((x) & RS_attrMask)) 720#define GET_ATTR(x) (((x) & RS_attrMask))
678// return attributes defining the background, encoding doesn't matter 721// return attributes defining the background, encoding doesn't matter
679// depends on RS_fgShift > RS_bgShift 722// depends on RS_fgShift > RS_bgShift
680#define GET_BGATTR(x) \ 723#define GET_BGATTR(x) \
681 (expect_false ((x) & RS_RVid) \ 724 (ecb_unlikely ((x) & RS_RVid) \
682 ? (((x) & (RS_attrMask & ~RS_RVid)) \ 725 ? (((x) & (RS_attrMask & ~RS_RVid)) \
683 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \ 726 | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift))) \
684 : ((x) & (RS_attrMask | RS_bgMask))) 727 : ((x) & (RS_attrMask | RS_bgMask)))
685#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift)) 728#define SET_FGCOLOR(x,fg) (((x) & ~RS_fgMask) | ((fg) << RS_fgShift))
686#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift)) 729#define SET_BGCOLOR(x,bg) (((x) & ~RS_bgMask) | ((bg) << RS_bgShift))
… …
879 * END······················= total_rows 922 * END······················= total_rows
880 */ 923 */
881 924
882struct TermWin_t 925struct TermWin_t
883{ 926{
927 int vt_width; /* actual window width [pixels] */
928 int vt_height; /* actual window height [pixels] */
884 int width; /* window width [pixels] */ 929 int width; /* window width [pixels] */
885 int height; /* window height [pixels] */ 930 int height; /* window height [pixels] */
886 int fwidth; /* font width [pixels] */ 931 int fwidth; /* font width [pixels] */
887 int fheight; /* font height [pixels] */ 932 int fheight; /* font height [pixels] */
888 int fbase; /* font ascent (baseline) [pixels] */ 933 int fbase; /* font ascent (baseline) [pixels] */
… …
900 int view_start; /* scrollback view starts here */ 945 int view_start; /* scrollback view starts here */
901 int top_row; /* topmost row index of scrollback */ 946 int top_row; /* topmost row index of scrollback */
902 Window parent; /* parent identifier */ 947 Window parent; /* parent identifier */
903 Window vt; /* vt100 window */ 948 Window vt; /* vt100 window */
904 GC gc; /* GC for drawing */ 949 GC gc; /* GC for drawing */
905 Pixmap pixmap;
906 rxvt_drawable *drawable; 950 rxvt_drawable *drawable;
907 rxvt_fontset *fontset[4]; 951 rxvt_fontset *fontset[4];
908}; 952};
909 953
910/* 954/*
… …
990 scrollBar_t scrollBar; 1034 scrollBar_t scrollBar;
991 uint8_t options[(Opt_count + 7) >> 3]; 1035 uint8_t options[(Opt_count + 7) >> 3];
992 XSizeHints szHint; 1036 XSizeHints szHint;
993 rxvt_color *pix_colors; 1037 rxvt_color *pix_colors;
994 Cursor TermWin_cursor; /* cursor for vt window */ 1038 Cursor TermWin_cursor; /* cursor for vt window */
995 line_t *row_buf; // all lines, scrollback + terminal, circular, followed by temp_buf 1039 line_t *row_buf; // all lines, scrollback + terminal, circular
996 line_t *drawn_buf; // text on screen 1040 line_t *drawn_buf; // text on screen
997 line_t *swap_buf; // lines for swap buffer 1041 line_t *swap_buf; // lines for swap buffer
998 char *tabs; /* per location: 1 == tab-stop */ 1042 char *tabs; /* per location: 1 == tab-stop */
999 screen_t screen; 1043 screen_t screen;
1000 screen_t swap; 1044 screen_t swap;
… …
1037 hidden_pointer:1, 1081 hidden_pointer:1,
1038#endif 1082#endif
1039 enc_utf8:1, /* whether locale uses utf-8 */ 1083 enc_utf8:1, /* whether locale uses utf-8 */
1040 seen_input:1, /* whether we have seen some program output yet */ 1084 seen_input:1, /* whether we have seen some program output yet */
1041 seen_resize:1, /* whether we had a resize event */ 1085 seen_resize:1, /* whether we had a resize event */
1086 init_done:1,
1042 parsed_geometry:1; 1087 parsed_geometry:1;
1043 1088
1044 unsigned char refresh_type, 1089 unsigned char refresh_type,
1045#ifdef META8_OPTION 1090#ifdef META8_OPTION
1046 meta_char; /* Alt-key prefix */ 1091 meta_char; /* Alt-key prefix */
… …
1080 allowedxerror; 1125 allowedxerror;
1081/* ---------- */ 1126/* ---------- */
1082 unsigned int ModLevel3Mask, 1127 unsigned int ModLevel3Mask,
1083 ModMetaMask, 1128 ModMetaMask,
1084 ModNumLockMask; 1129 ModNumLockMask;
1085 int old_width, /* last used width in screen resize */
1086 old_height; /* last used height in screen resize */
1087 unsigned long priv_modes, 1130 unsigned long priv_modes,
1088 SavedModes; 1131 SavedModes;
1089/* ---------- */ 1132/* ---------- */
1090 Atom *xa; 1133 Atom *xa;
1091/* ---------- */ 1134/* ---------- */
… …
1101#ifdef HAVE_BG_PIXMAP 1144#ifdef HAVE_BG_PIXMAP
1102 void bg_init (); 1145 void bg_init ();
1103 void bg_destroy (); 1146 void bg_destroy ();
1104 1147
1105 enum { 1148 enum {
1106 //subset returned by make_transparency_pixmap
1107 BG_IS_VALID = 1 << 0, 1149 BG_IS_VALID = 1 << 0,
1108 BG_NEEDS_TINT = 1 << 1,
1109 BG_NEEDS_BLUR = 1 << 2,
1110
1111 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1112
1113 BG_PROP_SCALE = 1 << 3,
1114 BG_ROOT_ALIGN = 1 << 4,
1115 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | BG_ROOT_ALIGN,
1116 1150
1117 BG_TINT_SET = 1 << 5, 1151 BG_TINT_SET = 1 << 5,
1118 BG_TINT_BITAND = 1 << 6, 1152 BG_TINT_BITAND = 1 << 6,
1119 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1120 1153
1121 BG_HAS_RENDER = 1 << 7, 1154 BG_HAS_RENDER = 1 << 7,
1122 BG_HAS_RENDER_CONV = 1 << 8, 1155 BG_HAS_RENDER_CONV = 1 << 8,
1123 BG_CLIENT_RENDER = 1 << 9, 1156 BG_CLIENT_RENDER = 1 << 9,
1124 1157
1125 BG_IS_TRANSPARENT = 1 << 10, 1158 BG_IS_TRANSPARENT = 1 << 10,
1126 BG_NEEDS_REFRESH = 1 << 11, 1159 BG_NEEDS_REFRESH = 1 << 11,
1127 BG_IS_SIZE_SENSITIVE = 1 << 12,
1128 BG_IS_FROM_FILE = 1 << 13,
1129 }; 1160 };
1130 1161
1131 unsigned int bg_flags; 1162 unsigned int bg_flags;
1132 1163
1133# ifdef BG_IMAGE_FROM_FILE 1164# ifdef BG_IMAGE_FROM_FILE
1165 rxvt_image bg_image;
1134 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1166 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1135 bool render_image (unsigned long tr_flags); 1167 bool render_image (rxvt_image &image);
1136
1137 enum {
1138 noScale = 0,
1139 windowScale = 100,
1140 defaultScale = windowScale,
1141 centerAlign = 50,
1142 defaultAlign = centerAlign,
1143 };
1144
1145 unsigned int h_scale, v_scale; /* percents of the window size */
1146 int h_align, v_align; /* percents of the window size:
1147 0 - left align, 50 - center, 100 - right */
1148
1149 bool bg_set_geometry (const char *geom, bool update = false);
1150 void bg_set_default_geometry ()
1151 {
1152 h_scale = v_scale = defaultScale;
1153 h_align = v_align = defaultAlign;
1154 }
1155
1156 bool bg_set_file (const char *file);
1157# endif 1168# endif
1158 1169
1159# ifdef ENABLE_TRANSPARENCY 1170# ifdef ENABLE_TRANSPARENCY
1160 Pixmap root_pixmap; /* current root pixmap set */ 1171 Pixmap root_pixmap; /* current root pixmap set */
1161 rxvt_color tint; 1172 rxvt_color tint;
1162 int shade; 1173 int shade;
1163 int h_blurRadius, v_blurRadius; 1174 int h_blurRadius, v_blurRadius;
1164 1175
1165 bool bg_set_transparent (); 1176 void bg_set_transparent ()
1177 {
1178 bg_flags |= BG_IS_TRANSPARENT;
1179 }
1166 void bg_set_root_pixmap (); 1180 void bg_set_root_pixmap ();
1167 void set_tint_shade_flags ();
1168 bool bg_set_tint (rxvt_color &new_tint); 1181 bool bg_set_tint (rxvt_color &new_tint);
1169 bool bg_set_shade (const char *shade_str); 1182 bool bg_set_shade (const char *shade_str);
1170 bool bg_set_blur (const char *geom); 1183 bool bg_set_blur (const char *geom);
1171 1184
1172 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1185 bool blur_pixmap (Pixmap pixmap, int width, int height);
1173 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1186 bool tint_pixmap (Pixmap pixmap, int width, int height);
1187 void tint_ximage (XImage *ximage);
1174 unsigned long make_transparency_pixmap (); 1188 bool make_transparency_pixmap ();
1175# endif 1189# endif
1176 1190
1177 ev_tstamp bg_valid_since; 1191 ev_tstamp bg_valid_since;
1178 1192
1179 Pixmap bg_pixmap; 1193 Pixmap bg_pixmap;
… …
1189 void bg_invalidate () 1203 void bg_invalidate ()
1190 { 1204 {
1191 bg_flags &= ~BG_IS_VALID; 1205 bg_flags &= ~BG_IS_VALID;
1192 } 1206 }
1193#endif 1207#endif
1194#ifdef HAVE_AFTERIMAGE
1195 ASImage *original_asim;
1196 ASVisual *asv;
1197 ASImageManager *asimman;
1198
1199 void init_asv ()
1200 {
1201 if (!asv)
1202 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1203 }
1204#endif
1205#ifdef HAVE_PIXBUF 1208#ifdef HAVE_PIXBUF
1206 GdkPixbuf *pixbuf;
1207 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1209 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1208 int src_x, int src_y, int dst_x, int dst_y, 1210 int src_x, int src_y, int dst_x, int dst_y,
1209 unsigned int width, unsigned int height); 1211 unsigned int width, unsigned int height);
1210#endif 1212#endif
1211 1213
… …
1221 void scr_overlay_set (int x, int y, const char *s) NOTHROW; 1223 void scr_overlay_set (int x, int y, const char *s) NOTHROW;
1222 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1224 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1223#endif 1225#endif
1224 1226
1225 vector<void *> allocated; // free these memory blocks with free() 1227 vector<void *> allocated; // free these memory blocks with free()
1226
1227 char env_windowid[21]; /* environmental variable WINDOWID */
1228 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1229 char *env_display; /* environmental variable DISPLAY */
1230 char *env_term; /* environmental variable TERM */
1231 1228
1232 char *locale; 1229 char *locale;
1233 char charsets[4]; 1230 char charsets[4];
1234 char *v_buffer; /* pointer to physical buffer */ 1231 char *v_buffer; /* pointer to physical buffer */
1235 unsigned int v_buflen; /* size of area to write */ 1232 unsigned int v_buflen; /* size of area to write */
… …
1295 void cmdbuf_append (const char *str, size_t count); 1292 void cmdbuf_append (const char *str, size_t count);
1296 bool pty_fill (); 1293 bool pty_fill ();
1297 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1294 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1298 1295
1299#ifdef CURSOR_BLINK 1296#ifdef CURSOR_BLINK
1297 void cursor_blink_reset ();
1300 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1298 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1301#endif 1299#endif
1302#ifdef TEXT_BLINK 1300#ifdef TEXT_BLINK
1303 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1301 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1304#endif 1302#endif
… …
1323 void pointer_unblank (); 1321 void pointer_unblank ();
1324 1322
1325 void tt_printf (const char *fmt,...); 1323 void tt_printf (const char *fmt,...);
1326 void tt_write (const char *data, unsigned int len); 1324 void tt_write (const char *data, unsigned int len);
1327 void pty_write (); 1325 void pty_write ();
1328
1329 void init (stringvec *argv, stringvec *envv)
1330 {
1331 this->argv = argv;
1332 init (argv->size (), argv->begin (), envv);
1333 }
1334 1326
1335 void make_current () const // make this the "currently active" urxvt instance 1327 void make_current () const // make this the "currently active" urxvt instance
1336 { 1328 {
1337 SET_R (this); 1329 SET_R (this);
1338 set_environ (envv); 1330 set_environ (envv);
… …
1350 void im_set_size (XRectangle &size); 1342 void im_set_size (XRectangle &size);
1351 void im_set_position (XPoint &pos) NOTHROW; 1343 void im_set_position (XPoint &pos) NOTHROW;
1352 void im_set_color (unsigned long &fg, unsigned long &bg); 1344 void im_set_color (unsigned long &fg, unsigned long &bg);
1353 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect); 1345 void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
1354 1346
1355 bool IMisRunning (); 1347 bool im_is_running ();
1356 void IMSendSpot (); 1348 void im_send_spot ();
1357 bool IM_get_IC (const char *modifiers); 1349 bool im_get_ic (const char *modifiers);
1358 void IMSetPosition (); 1350 void im_set_position ();
1359#endif 1351#endif
1360 1352
1361 // command.C 1353 // command.C
1362 void key_press (XKeyEvent &ev); 1354 void key_press (XKeyEvent &ev);
1363 void key_release (XKeyEvent &ev); 1355 void key_release (XKeyEvent &ev);
… …
1396 void process_xterm_seq (int op, char *str, char resp); 1388 void process_xterm_seq (int op, char *str, char resp);
1397 int privcases (int mode, unsigned long bit); 1389 int privcases (int mode, unsigned long bit);
1398 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1390 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1399 void process_sgr_mode (unsigned int nargs, const int *arg); 1391 void process_sgr_mode (unsigned int nargs, const int *arg);
1400 // init.C 1392 // init.C
1393 void init (stringvec *argv, stringvec *envv);
1394 void init (int argc, const char *const *argv, const char *const *envv);
1395 void init2 (int argc, const char *const *argv);
1401 void init_vars (); 1396 void init_vars ();
1402 const char **init_resources (int argc, const char *const *argv); 1397 const char **init_resources (int argc, const char *const *argv);
1403 void init (int argc, const char *const *argv, stringvec *envv);
1404 void init_env (); 1398 void init_env ();
1405 void set_locale (const char *locale); 1399 void set_locale (const char *locale);
1406 void init_xlocale (); 1400 void init_xlocale ();
1407 void init_command (const char *const *argv); 1401 void init_command (const char *const *argv);
1408 void run_command (const char *const *argv); 1402 void run_command (const char *const *argv);
… …
1426 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1420 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1427 void set_utf8_property (Atom prop, const char *str, int len = -1); 1421 void set_utf8_property (Atom prop, const char *str, int len = -1);
1428 void set_title (const char *str); 1422 void set_title (const char *str);
1429 void set_icon_name (const char *str); 1423 void set_icon_name (const char *str);
1430 void set_window_color (int idx, const char *color); 1424 void set_window_color (int idx, const char *color);
1431 void set_colorfgbg (); 1425 char *get_colorfgbg ();
1432 bool set_color (rxvt_color &color, const char *name); 1426 bool set_color (rxvt_color &color, const char *name);
1433 void alias_color (int dst, int src); 1427 void alias_color (int dst, int src);
1434 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1428 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1435 void get_window_origin (int &x, int &y); 1429 void get_window_origin (int &x, int &y);
1436 Pixmap get_pixmap_property (Atom property); 1430 Pixmap get_pixmap_property (Atom property);
… …
1471#ifndef NO_BRIGHTCOLOR 1465#ifndef NO_BRIGHTCOLOR
1472 if (r & RS_Bold 1466 if (r & RS_Bold
1473# if ENABLE_STYLES 1467# if ENABLE_STYLES
1474 && option (Opt_intensityStyles) 1468 && option (Opt_intensityStyles)
1475# endif 1469# endif
1476 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1470 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1477 base += minBrightCOLOR - minCOLOR; 1471 base += minBrightCOLOR - minCOLOR;
1478#endif 1472#endif
1479 return base; 1473 return base;
1480 } 1474 }
1481 1475
… …
1485#ifndef NO_BRIGHTCOLOR 1479#ifndef NO_BRIGHTCOLOR
1486 if (r & RS_Blink 1480 if (r & RS_Blink
1487# if ENABLE_STYLES 1481# if ENABLE_STYLES
1488 && option (Opt_intensityStyles) 1482 && option (Opt_intensityStyles)
1489# endif 1483# endif
1490 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1484 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1491 base += minBrightCOLOR - minCOLOR; 1485 base += minBrightCOLOR - minCOLOR;
1492#endif 1486#endif
1493 return base; 1487 return base;
1494 } 1488 }
1495 1489
… …
1497 { 1491 {
1498 return options[opt >> 3] & (1 << (opt & 7)); 1492 return options[opt >> 3] & (1 << (opt & 7));
1499 } 1493 }
1500 1494
1501 void set_option (uint8_t opt, bool set = true) NOTHROW; 1495 void set_option (uint8_t opt, bool set = true) NOTHROW;
1502
1503 void set_privmode (unsigned bit, int set) NOTHROW
1504 {
1505 if (set)
1506 priv_modes |= bit;
1507 else
1508 priv_modes &= ~bit;
1509 }
1510 1496
1511 // modifies first argument(!) 1497 // modifies first argument(!)
1512 void tt_paste (char *data, unsigned int len) NOTHROW; 1498 void tt_paste (char *data, unsigned int len) NOTHROW;
1513 void paste (char *data, unsigned int len) NOTHROW; 1499 void paste (char *data, unsigned int len) NOTHROW;
1514 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1500 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
… …
1585 void selection_click (int clicks, int x, int y) NOTHROW; 1571 void selection_click (int clicks, int x, int y) NOTHROW;
1586 void selection_extend (int x, int y, int flag) NOTHROW; 1572 void selection_extend (int x, int y, int flag) NOTHROW;
1587 void selection_rotate (int x, int y) NOTHROW; 1573 void selection_rotate (int x, int y) NOTHROW;
1588 1574
1589 // xdefaults.C 1575 // xdefaults.C
1590 void get_options (int argc, const char *const *argv); 1576 const char **get_options (int argc, const char *const *argv);
1591 int parse_keysym (const char *str, const char *arg); 1577 int parse_keysym (const char *str, const char *arg);
1592 const char *x_resource (const char *name); 1578 const char *x_resource (const char *name);
1593 void extract_resources (); 1579 void extract_resources ();
1580 void extract_keysym_resources ();
1594}; 1581};
1595 1582
1596#endif /* _RXVT_H_ */ 1583#endif /* _RXVT_H_ */
1597 1584

Diff Legend

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