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.465 by sf-exg, Tue Jan 10 18:50:14 2012 UTC vs.
Revision 1.517 by sf-exg, Mon Dec 31 12:05:46 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>
… …
49 45
50#include "feature.h" 46#include "feature.h"
51 47
52#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
53# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
54#endif 51#endif
55 52
56#if ENABLE_PERL 53#if ENABLE_PERL
57# define ENABLE_FRILLS 1 54# define ENABLE_FRILLS 1
58# define ENABLE_COMBINING 1 55# define ENABLE_COMBINING 1
… …
74#include <X11/cursorfont.h> 71#include <X11/cursorfont.h>
75#include <X11/keysym.h> 72#include <X11/keysym.h>
76#include <X11/keysymdef.h> 73#include <X11/keysymdef.h>
77#include <X11/Xatom.h> 74#include <X11/Xatom.h>
78 75
79#ifdef HAVE_AFTERIMAGE
80# include <afterimage.h>
81# undef min
82# undef max
83#endif
84
85#ifdef HAVE_PIXBUF 76#if HAVE_PIXBUF
86# include <gdk-pixbuf/gdk-pixbuf.h> 77# include <gdk-pixbuf/gdk-pixbuf.h>
87#endif 78#endif
88 79
89#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 80#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
90# define HAVE_BG_PIXMAP 1 81# define HAVE_BG_PIXMAP 1
91#endif 82#endif
92 83
84#if HAVE_BG_PIXMAP
85# if HAVE_PIXBUF
86# define BG_IMAGE_FROM_FILE 1
87# endif
88# if ENABLE_TRANSPARENCY
89# define BG_IMAGE_FROM_ROOT 1
90# endif
91#endif
92
93#include <ecb.h>
93#include "encoding.h" 94#include "encoding.h"
94#include "rxvtutil.h" 95#include "rxvtutil.h"
95#include "rxvtfont.h" 96#include "rxvtfont.h"
96#include "rxvttoolkit.h" 97#include "rxvttoolkit.h"
98#include "rxvtimg.h"
97#include "scrollbar.h" 99#include "scrollbar.h"
98#include "ev_cpp.h" 100#include "ev_cpp.h"
99#include "salloc.h"
100#include "libptytty.h" 101#include "libptytty.h"
101 102
102#include "rxvtperl.h" 103#include "rxvtperl.h"
103 104
104// try to avoid some macros to decrease code size, on some systems 105// try to avoid some macros to decrease code size, on some systems
… …
157 158
158const char * rxvt_basename (const char *str) NOTHROW; 159const char * rxvt_basename (const char *str) NOTHROW;
159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 160void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
160void rxvt_log (const char *fmt,...) NOTHROW; 161void rxvt_log (const char *fmt,...) NOTHROW;
161void rxvt_warn (const char *fmt,...) NOTHROW; 162void rxvt_warn (const char *fmt,...) NOTHROW;
162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn; 163void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
163void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; 164void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
164 165
165char * rxvt_strtrim (char *str) NOTHROW; 166char * rxvt_strtrim (char *str) NOTHROW;
166char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 167char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
167 168
168static inline void 169static inline void
… …
217 ~localise_env () 218 ~localise_env ()
218 { 219 {
219 environ = orig_env; 220 environ = orig_env;
220 } 221 }
221}; 222};
223
224#ifdef HAVE_BG_PIXMAP
225struct image_effects
226{
227 bool tint_set;
228 rxvt_color tint;
229 int shade;
230 int h_blurRadius, v_blurRadius;
231
232 image_effects ()
233 {
234 tint_set =
235 h_blurRadius =
236 v_blurRadius = 0;
237 shade = 100;
238 }
239
240 bool need_tint ()
241 {
242 return shade != 100 || tint_set;
243 }
244
245 bool need_blur ()
246 {
247 return h_blurRadius && v_blurRadius;
248 }
249
250 bool set_tint (const rxvt_color &new_tint);
251 bool set_shade (const char *shade_str);
252 bool set_blur (const char *geom);
253};
254
255# if BG_IMAGE_FROM_FILE
256enum {
257 IM_IS_SIZE_SENSITIVE = 1 << 1,
258 IM_KEEP_ASPECT = 1 << 2,
259 IM_ROOT_ALIGN = 1 << 3,
260 IM_TILE = 1 << 4,
261 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
262};
263
264enum {
265 noScale = 0,
266 windowScale = 100,
267 defaultScale = windowScale,
268 centerAlign = 50,
269 defaultAlign = centerAlign,
270};
271
272struct rxvt_image : image_effects
273{
274 unsigned short alpha;
275 uint8_t flags;
276 unsigned int h_scale, v_scale; /* percents of the window size */
277 int h_align, v_align; /* percents of the window size:
278 0 - left align, 50 - center, 100 - right */
279
280 bool is_size_sensitive ()
281 {
282 return (!(flags & IM_TILE)
283 || h_scale || v_scale
284 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
285 }
286
287 rxvt_img *img;
288
289 void destroy ()
290 {
291 delete img;
292 img = 0;
293 }
294
295 rxvt_image ();
296 void set_file_geometry (rxvt_screen *s, const char *file);
297 void set_file (rxvt_screen *s, const char *file);
298 bool set_geometry (const char *geom, bool update = false);
299};
300# endif
301#endif
222 302
223/* 303/*
224 ***************************************************************************** 304 *****************************************************************************
225 * STRUCTURES AND TYPEDEFS 305 * STRUCTURES AND TYPEDEFS
226 ***************************************************************************** 306 *****************************************************************************
… …
269 ***************************************************************************** 349 *****************************************************************************
270 */ 350 */
271 351
272/* COLORTERM, TERM environment variables */ 352/* COLORTERM, TERM environment variables */
273#define COLORTERMENV "rxvt" 353#define COLORTERMENV "rxvt"
274#ifdef BG_IMAGE_FROM_FILE 354#if BG_IMAGE_FROM_FILE
275# define COLORTERMENVFULL COLORTERMENV "-xpm" 355# define COLORTERMENVFULL COLORTERMENV "-xpm"
276#else 356#else
277# define COLORTERMENVFULL COLORTERMENV 357# define COLORTERMENVFULL COLORTERMENV
278#endif 358#endif
279#ifndef TERMENV 359#ifndef TERMENV
… …
509#endif 589#endif
510 Color_scroll, 590 Color_scroll,
511#ifdef RXVT_SCROLLBAR 591#ifdef RXVT_SCROLLBAR
512 Color_trough, 592 Color_trough,
513#endif 593#endif
514#if ENABLE_TRANSPARENCY 594#if BG_IMAGE_FROM_ROOT
515 Color_tint, 595 Color_tint,
516#endif 596#endif
517#if OFF_FOCUS_FADING 597#if OFF_FOCUS_FADING
518 Color_fade, 598 Color_fade,
519#endif 599#endif
… …
706 text_t *t; // terminal the text 786 text_t *t; // terminal the text
707 rend_t *r; // rendition, uses RS_ flags 787 rend_t *r; // rendition, uses RS_ flags
708 tlen_t_ l; // length of each text line 788 tlen_t_ l; // length of each text line
709 uint32_t f; // flags 789 uint32_t f; // flags
710 790
791 bool valid ()
792 {
793 return l >= 0;
794 }
795
796 void alloc ()
797 {
798 l = 0;
799 }
800
711 bool is_longer () 801 bool is_longer ()
712 { 802 {
713 return f & LINE_LONGER; 803 return f & LINE_LONGER;
714 } 804 }
715 805
… …
779// that are not representable in unicode, as well as characters 869// that are not representable in unicode, as well as characters
780// not fitting in the BMP. 870// not fitting in the BMP.
781struct compose_char 871struct compose_char
782{ 872{
783 unicode_t c1, c2; // any chars != NOCHAR are valid 873 unicode_t c1, c2; // any chars != NOCHAR are valid
874 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
875 compose_char () = default;
876 #endif
784 compose_char (unicode_t c1, unicode_t c2) 877 compose_char (unicode_t c1, unicode_t c2)
785 : c1(c1), c2(c2) 878 : c1(c1), c2(c2)
786 { } 879 { }
787}; 880};
788 881
… …
982 scrollBar_t scrollBar; 1075 scrollBar_t scrollBar;
983 uint8_t options[(Opt_count + 7) >> 3]; 1076 uint8_t options[(Opt_count + 7) >> 3];
984 XSizeHints szHint; 1077 XSizeHints szHint;
985 rxvt_color *pix_colors; 1078 rxvt_color *pix_colors;
986 Cursor TermWin_cursor; /* cursor for vt window */ 1079 Cursor TermWin_cursor; /* cursor for vt window */
1080
987 line_t *row_buf; // all lines, scrollback + terminal, circular 1081 line_t *row_buf; // all lines, scrollback + terminal, circular
988 line_t *drawn_buf; // text on screen 1082 line_t *drawn_buf; // text on screen
989 line_t *swap_buf; // lines for swap buffer 1083 line_t *swap_buf; // lines for swap buffer
990 char *tabs; /* per location: 1 == tab-stop */ 1084 char *tabs; /* per location: 1 == tab-stop */
991 screen_t screen; 1085 screen_t screen;
… …
1087/* ---------- */ 1181/* ---------- */
1088 struct mouse_event MEvent; 1182 struct mouse_event MEvent;
1089 XComposeStatus compose; 1183 XComposeStatus compose;
1090 static struct termios def_tio; 1184 static struct termios def_tio;
1091 row_col_t oldcursor; 1185 row_col_t oldcursor;
1186
1092#ifdef HAVE_BG_PIXMAP 1187#ifdef HAVE_BG_PIXMAP
1093 void bg_init (); 1188 void bg_init ();
1094 void bg_destroy (); 1189 void bg_destroy ();
1095 1190
1096 enum {
1097 //subset returned by make_transparency_pixmap
1098 BG_IS_VALID = 1 << 0,
1099 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2,
1101
1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1103
1104 BG_KEEP_ASPECT = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14,
1107 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1108
1109 BG_TINT_SET = 1 << 5,
1110 BG_TINT_BITAND = 1 << 6,
1111 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1112
1113 BG_HAS_RENDER = 1 << 7,
1114 BG_HAS_RENDER_CONV = 1 << 8,
1115 BG_CLIENT_RENDER = 1 << 9,
1116
1117 BG_IS_TRANSPARENT = 1 << 10,
1118 BG_NEEDS_REFRESH = 1 << 11,
1119 BG_IS_SIZE_SENSITIVE = 1 << 12,
1120 BG_IS_FROM_FILE = 1 << 13,
1121 };
1122
1123 unsigned int bg_flags;
1124
1125# ifdef BG_IMAGE_FROM_FILE 1191# if BG_IMAGE_FROM_FILE
1126 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1192 rxvt_image fimage;
1127 bool render_image (unsigned long tr_flags); 1193 void render_image (rxvt_image &image);
1128
1129 enum {
1130 noScale = 0,
1131 windowScale = 100,
1132 defaultScale = windowScale,
1133 centerAlign = 50,
1134 defaultAlign = centerAlign,
1135 };
1136
1137 unsigned int h_scale, v_scale; /* percents of the window size */
1138 int h_align, v_align; /* percents of the window size:
1139 0 - left align, 50 - center, 100 - right */
1140
1141 bool bg_set_geometry (const char *geom, bool update = false);
1142 void bg_set_default_geometry ()
1143 {
1144 h_scale = v_scale = defaultScale;
1145 h_align = v_align = defaultAlign;
1146 }
1147
1148 bool bg_set_file (const char *file);
1149# endif 1194# endif
1150 1195
1151# ifdef ENABLE_TRANSPARENCY 1196# if BG_IMAGE_FROM_ROOT
1152 Pixmap root_pixmap; /* current root pixmap set */ 1197 rxvt_img *root_img;
1153 rxvt_color tint; 1198 image_effects root_effects;
1154 int shade;
1155 int h_blurRadius, v_blurRadius;
1156 1199
1157 bool bg_set_transparent (); 1200 void render_root_image ();
1158 void bg_set_root_pixmap ();
1159 void set_tint_shade_flags ();
1160 bool bg_set_tint (rxvt_color &new_tint);
1161 bool bg_set_shade (const char *shade_str);
1162 bool bg_set_blur (const char *geom);
1163
1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth);
1165 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
1166 void tint_ximage (Visual *visual, XImage *ximage);
1167 unsigned long make_transparency_pixmap ();
1168# endif 1201# endif
1169 1202
1203 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1204
1170 ev_tstamp bg_valid_since; 1205 ev_tstamp bg_valid_since;
1171 1206
1172 Pixmap bg_pixmap;
1173 unsigned int bg_pmap_width, bg_pmap_height;
1174
1175 int target_x;
1176 int target_y;
1177 bool bg_set_position (int x, int y);
1178 bool bg_window_size_sensitive (); 1207 bool bg_window_size_sensitive ();
1179 bool bg_window_position_sensitive (); 1208 bool bg_window_position_sensitive ();
1180 1209
1181 bool bg_render (); 1210 void bg_render ();
1182 void bg_invalidate () 1211#endif
1183 { 1212
1184 bg_flags &= ~BG_IS_VALID; 1213#ifdef HAVE_IMG
1214 enum {
1215 BG_IS_TRANSPARENT = 1 << 1,
1216 BG_NEEDS_REFRESH = 1 << 2,
1217 BG_INHIBIT_RENDER = 1 << 3,
1185 } 1218 };
1186#endif
1187#ifdef HAVE_AFTERIMAGE
1188 ASImage *original_asim;
1189 ASVisual *asv;
1190 ASImageManager *asimman;
1191 1219
1192 void init_asv () 1220 uint8_t bg_flags;
1193 { 1221
1194 if (!asv) 1222 rxvt_img *bg_img;
1195 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1196 }
1197#endif
1198#ifdef HAVE_PIXBUF
1199 GdkPixbuf *pixbuf;
1200 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1201 int src_x, int src_y, int dst_x, int dst_y,
1202 unsigned int width, unsigned int height);
1203#endif 1223#endif
1204 1224
1205#if ENABLE_OVERLAY 1225#if ENABLE_OVERLAY
1206 overlay_base ov; 1226 overlay_base ov;
1207 1227
… …
1215 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1235 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1216#endif 1236#endif
1217 1237
1218 vector<void *> allocated; // free these memory blocks with free() 1238 vector<void *> allocated; // free these memory blocks with free()
1219 1239
1240 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1241
1220 char *locale; 1242 char *locale;
1221 char charsets[4]; 1243 char charsets[4];
1222 char *v_buffer; /* pointer to physical buffer */ 1244 char *v_buffer; /* pointer to physical buffer */
1223 unsigned int v_buflen; /* size of area to write */ 1245 unsigned int v_buflen; /* size of area to write */
1224 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1246 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1235 char *cmdbuf_ptr, *cmdbuf_endp; 1257 char *cmdbuf_ptr, *cmdbuf_endp;
1236 char cmdbuf_base[CBUFSIZ]; 1258 char cmdbuf_base[CBUFSIZ];
1237 1259
1238 ptytty *pty; 1260 ptytty *pty;
1239 1261
1240 rxvt_salloc *talloc; // text line allocator 1262 // chunk contains all line_t's as well as rend_t and text_t buffers
1241 rxvt_salloc *ralloc; // rend line allocator 1263 // for drawn_buf, swap_buf and row_buf, in this order
1264 void *chunk;
1265 size_t chunk_size;
1242 1266
1243 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1267 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1244 1268
1245#if ENABLE_FRILLS || ISO_14755 1269#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 entry support 1270 // ISO 14755 entry support
1247 unicode_t iso14755buf; 1271 unicode_t iso14755buf;
1248 void commit_iso14755 (); 1272 void commit_iso14755 ();
1249# if ISO_14755 1273# if ISO_14755
1250 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1274 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1251 void iso14755_54 (int x, int y); 1275 void iso14755_54 (int x, int y);
1252# endif 1276# endif
1253#endif 1277#endif
1254 1278
1255 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1279 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1257 void vt_select_input () const NOTHROW 1281 void vt_select_input () const NOTHROW
1258 { 1282 {
1259 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse); 1283 XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
1260 } 1284 }
1261 1285
1262#if ENABLE_TRANSPARENCY || ENABLE_PERL 1286#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1263 void rootwin_cb (XEvent &xev); 1287 void rootwin_cb (XEvent &xev);
1264 xevent_watcher rootwin_ev; 1288 xevent_watcher rootwin_ev;
1265#endif 1289#endif
1266#ifdef HAVE_BG_PIXMAP 1290#ifdef HAVE_BG_PIXMAP
1267 void update_background (); 1291 void update_background ();
… …
1283 void cmdbuf_append (const char *str, size_t count); 1307 void cmdbuf_append (const char *str, size_t count);
1284 bool pty_fill (); 1308 bool pty_fill ();
1285 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1309 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1286 1310
1287#ifdef CURSOR_BLINK 1311#ifdef CURSOR_BLINK
1312 void cursor_blink_reset ();
1288 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1313 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1289#endif 1314#endif
1290#ifdef TEXT_BLINK 1315#ifdef TEXT_BLINK
1291 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1316 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1292#endif 1317#endif
… …
1415 char *get_colorfgbg (); 1440 char *get_colorfgbg ();
1416 bool set_color (rxvt_color &color, const char *name); 1441 bool set_color (rxvt_color &color, const char *name);
1417 void alias_color (int dst, int src); 1442 void alias_color (int dst, int src);
1418 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1443 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1419 void get_window_origin (int &x, int &y); 1444 void get_window_origin (int &x, int &y);
1420 Pixmap get_pixmap_property (Atom property);
1421 1445
1422 // screen.C 1446 // screen.C
1423 1447
1424 void lalloc (line_t &l) const 1448 bool option (uint8_t opt) const NOTHROW
1425 { 1449 {
1426 l.t = (text_t *)talloc->alloc (); 1450 return options[opt >> 3] & (1 << (opt & 7));
1427 l.r = (rend_t *)ralloc->alloc ();
1428 } 1451 }
1429 1452
1430#if 0 1453 void set_option (uint8_t opt, bool set = true) NOTHROW;
1431 void lfree (line_t &l)
1432 {
1433 talloc->free (l.t);
1434 ralloc->free (l.r);
1435 }
1436#endif
1437
1438 void lresize (line_t &l) const
1439 {
1440 if (!l.t)
1441 return;
1442
1443 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1444 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1445
1446 l.l = min (l.l, ncol);
1447
1448 if (ncol > prev_ncol)
1449 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1450 }
1451 1454
1452 int fgcolor_of (rend_t r) const NOTHROW 1455 int fgcolor_of (rend_t r) const NOTHROW
1453 { 1456 {
1454 int base = GET_BASEFG (r); 1457 int base = GET_BASEFG (r);
1455#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
… …
1475 base += minBrightCOLOR - minCOLOR; 1478 base += minBrightCOLOR - minCOLOR;
1476#endif 1479#endif
1477 return base; 1480 return base;
1478 } 1481 }
1479 1482
1480 bool option (uint8_t opt) const NOTHROW
1481 {
1482 return options[opt >> 3] & (1 << (opt & 7));
1483 }
1484
1485 void set_option (uint8_t opt, bool set = true) NOTHROW;
1486
1487 // modifies first argument(!) 1483 // modifies first argument(!)
1488 void tt_paste (char *data, unsigned int len) NOTHROW; 1484 void tt_paste (char *data, unsigned int len) NOTHROW;
1489 void paste (char *data, unsigned int len) NOTHROW; 1485 void paste (char *data, unsigned int len) NOTHROW;
1486 void scr_alloc () NOTHROW;
1490 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1487 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1491 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1488 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1492 void scr_kill_char (line_t &l, int col) const NOTHROW; 1489 void scr_kill_char (line_t &l, int col) const NOTHROW;
1493 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1490 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1494 void scr_reset (); 1491 void scr_reset ();
… …
1561 void selection_click (int clicks, int x, int y) NOTHROW; 1558 void selection_click (int clicks, int x, int y) NOTHROW;
1562 void selection_extend (int x, int y, int flag) NOTHROW; 1559 void selection_extend (int x, int y, int flag) NOTHROW;
1563 void selection_rotate (int x, int y) NOTHROW; 1560 void selection_rotate (int x, int y) NOTHROW;
1564 1561
1565 // xdefaults.C 1562 // xdefaults.C
1563 void rxvt_usage (int type);
1566 const char **get_options (int argc, const char *const *argv); 1564 const char **get_options (int argc, const char *const *argv);
1567 int parse_keysym (const char *str, const char *arg); 1565 int parse_keysym (const char *str, const char *arg);
1568 const char *x_resource (const char *name); 1566 const char *x_resource (const char *name);
1569 void extract_resources (); 1567 void extract_resources ();
1570 void extract_keysym_resources (); 1568 void extract_keysym_resources ();

Diff Legend

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