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.458 by sf-exg, Sun Jan 1 17:43:47 2012 UTC vs.
Revision 1.492 by sf-exg, Thu May 31 14:02:17 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)
90# define HAVE_BG_PIXMAP 1 80# define HAVE_BG_PIXMAP 1
91#endif 81#endif
92 82
83#include <ecb.h>
93#include "encoding.h" 84#include "encoding.h"
94#include "rxvtutil.h" 85#include "rxvtutil.h"
95#include "rxvtfont.h" 86#include "rxvtfont.h"
96#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
97#include "scrollbar.h" 88#include "scrollbar.h"
98#include "ev_cpp.h" 89#include "ev_cpp.h"
99#include "salloc.h"
100#include "libptytty.h" 90#include "libptytty.h"
101 91
102#include "rxvtperl.h" 92#include "rxvtperl.h"
103 93
104// try to avoid some macros to decrease code size, on some systems 94// try to avoid some macros to decrease code size, on some systems
… …
157 147
158const char * rxvt_basename (const char *str) NOTHROW; 148const char * rxvt_basename (const char *str) NOTHROW;
159void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
160void rxvt_log (const char *fmt,...) NOTHROW; 150void rxvt_log (const char *fmt,...) NOTHROW;
161void rxvt_warn (const char *fmt,...) NOTHROW; 151void rxvt_warn (const char *fmt,...) NOTHROW;
162void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn; 152void 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; 153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
164 154
165char * rxvt_strtrim (char *str) NOTHROW; 155char * rxvt_strtrim (char *str) NOTHROW;
166char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 156char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
167 157
168static inline void 158static inline void
… …
217 ~localise_env () 207 ~localise_env ()
218 { 208 {
219 environ = orig_env; 209 environ = orig_env;
220 } 210 }
221}; 211};
212
213#ifdef HAVE_BG_PIXMAP
214struct image_effects
215{
216 bool tint_set;
217 rxvt_color tint;
218 int shade;
219 int h_blurRadius, v_blurRadius;
220
221 image_effects ()
222 {
223 tint_set =
224 h_blurRadius =
225 v_blurRadius = 0;
226 shade = 100;
227 }
228
229 bool need_tint ()
230 {
231 return shade != 100 || tint_set;
232 }
233
234 bool need_blur ()
235 {
236 return h_blurRadius && v_blurRadius;
237 }
238
239 bool set_tint (const rxvt_color &new_tint);
240 bool set_shade (const char *shade_str);
241 bool set_blur (const char *geom);
242};
243
244# ifdef BG_IMAGE_FROM_FILE
245enum {
246 IM_IS_SET = 1 << 0,
247 IM_IS_SIZE_SENSITIVE = 1 << 1,
248 IM_KEEP_ASPECT = 1 << 2,
249 IM_ROOT_ALIGN = 1 << 3,
250 IM_TILE = 1 << 4,
251 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
252};
253
254enum {
255 noScale = 0,
256 windowScale = 100,
257 defaultScale = windowScale,
258 centerAlign = 50,
259 defaultAlign = centerAlign,
260};
261
262struct rxvt_image : image_effects
263{
264 unsigned short alpha;
265 uint8_t flags;
266 unsigned int h_scale, v_scale; /* percents of the window size */
267 int h_align, v_align; /* percents of the window size:
268 0 - left align, 50 - center, 100 - right */
269
270 bool is_size_sensitive ()
271 {
272 return (!(flags & IM_TILE)
273 || h_scale || v_scale
274 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
275 }
276
277# ifdef HAVE_PIXBUF
278 GdkPixbuf *pixbuf;
279
280 void destroy ()
281 {
282 if (pixbuf)
283 g_object_unref (pixbuf);
284 }
285
286 int width ()
287 {
288 return gdk_pixbuf_get_width (pixbuf);
289 }
290 int height ()
291 {
292 return gdk_pixbuf_get_height (pixbuf);
293 }
294# endif
295
296 rxvt_image ();
297 bool set_file_geometry (const char *file);
298 bool set_file (const char *file);
299 bool set_geometry (const char *geom, bool update = false);
300};
301# endif
302#endif
222 303
223/* 304/*
224 ***************************************************************************** 305 *****************************************************************************
225 * STRUCTURES AND TYPEDEFS 306 * STRUCTURES AND TYPEDEFS
226 ***************************************************************************** 307 *****************************************************************************
… …
706 text_t *t; // terminal the text 787 text_t *t; // terminal the text
707 rend_t *r; // rendition, uses RS_ flags 788 rend_t *r; // rendition, uses RS_ flags
708 tlen_t_ l; // length of each text line 789 tlen_t_ l; // length of each text line
709 uint32_t f; // flags 790 uint32_t f; // flags
710 791
792 bool valid ()
793 {
794 return l >= 0;
795 }
796
797 void alloc ()
798 {
799 l = 0;
800 }
801
711 bool is_longer () 802 bool is_longer ()
712 { 803 {
713 return f & LINE_LONGER; 804 return f & LINE_LONGER;
714 } 805 }
715 806
… …
779// that are not representable in unicode, as well as characters 870// that are not representable in unicode, as well as characters
780// not fitting in the BMP. 871// not fitting in the BMP.
781struct compose_char 872struct compose_char
782{ 873{
783 unicode_t c1, c2; // any chars != NOCHAR are valid 874 unicode_t c1, c2; // any chars != NOCHAR are valid
875 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
876 compose_char () = default;
877 #endif
784 compose_char (unicode_t c1, unicode_t c2) 878 compose_char (unicode_t c1, unicode_t c2)
785 : c1(c1), c2(c2) 879 : c1(c1), c2(c2)
786 { } 880 { }
787}; 881};
788 882
… …
870 * END······················= total_rows 964 * END······················= total_rows
871 */ 965 */
872 966
873struct TermWin_t 967struct TermWin_t
874{ 968{
969 int vt_width; /* actual window width [pixels] */
970 int vt_height; /* actual window height [pixels] */
875 int width; /* window width [pixels] */ 971 int width; /* window width [pixels] */
876 int height; /* window height [pixels] */ 972 int height; /* window height [pixels] */
877 int fwidth; /* font width [pixels] */ 973 int fwidth; /* font width [pixels] */
878 int fheight; /* font height [pixels] */ 974 int fheight; /* font height [pixels] */
879 int fbase; /* font ascent (baseline) [pixels] */ 975 int fbase; /* font ascent (baseline) [pixels] */
… …
891 int view_start; /* scrollback view starts here */ 987 int view_start; /* scrollback view starts here */
892 int top_row; /* topmost row index of scrollback */ 988 int top_row; /* topmost row index of scrollback */
893 Window parent; /* parent identifier */ 989 Window parent; /* parent identifier */
894 Window vt; /* vt100 window */ 990 Window vt; /* vt100 window */
895 GC gc; /* GC for drawing */ 991 GC gc; /* GC for drawing */
896 Pixmap pixmap;
897 rxvt_drawable *drawable; 992 rxvt_drawable *drawable;
898 rxvt_fontset *fontset[4]; 993 rxvt_fontset *fontset[4];
899}; 994};
900 995
901/* 996/*
… …
981 scrollBar_t scrollBar; 1076 scrollBar_t scrollBar;
982 uint8_t options[(Opt_count + 7) >> 3]; 1077 uint8_t options[(Opt_count + 7) >> 3];
983 XSizeHints szHint; 1078 XSizeHints szHint;
984 rxvt_color *pix_colors; 1079 rxvt_color *pix_colors;
985 Cursor TermWin_cursor; /* cursor for vt window */ 1080 Cursor TermWin_cursor; /* cursor for vt window */
1081
986 line_t *row_buf; // all lines, scrollback + terminal, circular 1082 line_t *row_buf; // all lines, scrollback + terminal, circular
987 line_t *drawn_buf; // text on screen 1083 line_t *drawn_buf; // text on screen
988 line_t *swap_buf; // lines for swap buffer 1084 line_t *swap_buf; // lines for swap buffer
989 char *tabs; /* per location: 1 == tab-stop */ 1085 char *tabs; /* per location: 1 == tab-stop */
990 screen_t screen; 1086 screen_t screen;
… …
1028 hidden_pointer:1, 1124 hidden_pointer:1,
1029#endif 1125#endif
1030 enc_utf8:1, /* whether locale uses utf-8 */ 1126 enc_utf8:1, /* whether locale uses utf-8 */
1031 seen_input:1, /* whether we have seen some program output yet */ 1127 seen_input:1, /* whether we have seen some program output yet */
1032 seen_resize:1, /* whether we had a resize event */ 1128 seen_resize:1, /* whether we had a resize event */
1129 init_done:1,
1033 parsed_geometry:1; 1130 parsed_geometry:1;
1034 1131
1035 unsigned char refresh_type, 1132 unsigned char refresh_type,
1036#ifdef META8_OPTION 1133#ifdef META8_OPTION
1037 meta_char; /* Alt-key prefix */ 1134 meta_char; /* Alt-key prefix */
… …
1071 allowedxerror; 1168 allowedxerror;
1072/* ---------- */ 1169/* ---------- */
1073 unsigned int ModLevel3Mask, 1170 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1171 ModMetaMask,
1075 ModNumLockMask; 1172 ModNumLockMask;
1076 int old_width, /* last used width in screen resize */
1077 old_height; /* last used height in screen resize */
1078 unsigned long priv_modes, 1173 unsigned long priv_modes,
1079 SavedModes; 1174 SavedModes;
1080/* ---------- */ 1175/* ---------- */
1081 Atom *xa; 1176 Atom *xa;
1082/* ---------- */ 1177/* ---------- */
… …
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 { 1191 enum {
1097 //subset returned by make_transparency_pixmap
1098 BG_IS_VALID = 1 << 0, 1192 BG_IS_VALID = 1 << 0,
1099 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2,
1101 1193
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, 1194 BG_IS_TRANSPARENT = 1 << 1,
1118 BG_NEEDS_REFRESH = 1 << 11, 1195 BG_NEEDS_REFRESH = 1 << 2,
1119 BG_IS_SIZE_SENSITIVE = 1 << 12, 1196
1120 BG_IS_FROM_FILE = 1 << 13, 1197 BG_HAS_RENDER = 1 << 3,
1198 BG_HAS_RENDER_CONV = 1 << 4,
1121 }; 1199 };
1122 1200
1123 unsigned int bg_flags; 1201 uint8_t bg_flags;
1124 1202
1125# ifdef BG_IMAGE_FROM_FILE 1203# ifdef BG_IMAGE_FROM_FILE
1126 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1204 vector<rxvt_image> image_vec;
1127 bool render_image (unsigned long tr_flags); 1205 rxvt_image *new_image ()
1128 1206 {
1129 enum { 1207 image_vec.resize (image_vec.size () + 1);
1130 noScale = 0, 1208 return &image_vec.back ();
1131 windowScale = 100,
1132 defaultScale = windowScale,
1133 centerAlign = 50,
1134 defaultAlign = centerAlign,
1135 }; 1209 }
1136 1210 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1137 unsigned int h_scale, v_scale; /* percents of the window size */ 1211 bool render_image (rxvt_image &image);
1138 int h_align, v_align; /* percents of the window size: 1212 void parse_image (int id, const char *type, const char *arg);
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 1213# endif
1150 1214
1151# ifdef ENABLE_TRANSPARENCY 1215# ifdef ENABLE_TRANSPARENCY
1152 Pixmap root_pixmap; /* current root pixmap set */ 1216 Pixmap root_pixmap; /* current root pixmap set */
1153 rxvt_color tint; 1217 image_effects root_effects;
1154 int shade;
1155 int h_blurRadius, v_blurRadius;
1156 1218
1157 bool bg_set_transparent (); 1219 void bg_set_transparent ()
1220 {
1221 bg_flags |= BG_IS_TRANSPARENT;
1222 }
1158 void bg_set_root_pixmap (); 1223 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);
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 (); 1224 bool make_transparency_pixmap ();
1168# endif 1225# endif
1226
1227 bool blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius);
1228 bool tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade);
1229 void tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade);
1169 1230
1170 ev_tstamp bg_valid_since; 1231 ev_tstamp bg_valid_since;
1171 1232
1172 Pixmap bg_pixmap; 1233 Pixmap bg_pixmap;
1173 unsigned int bg_pmap_width, bg_pmap_height; 1234 unsigned int bg_pmap_width, bg_pmap_height;
… …
1182 void bg_invalidate () 1243 void bg_invalidate ()
1183 { 1244 {
1184 bg_flags &= ~BG_IS_VALID; 1245 bg_flags &= ~BG_IS_VALID;
1185 } 1246 }
1186#endif 1247#endif
1187#ifdef HAVE_AFTERIMAGE
1188 ASImage *original_asim;
1189 ASVisual *asv;
1190 ASImageManager *asimman;
1191
1192 void init_asv ()
1193 {
1194 if (!asv)
1195 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1196 }
1197#endif
1198#ifdef HAVE_PIXBUF 1248#ifdef HAVE_PIXBUF
1199 GdkPixbuf *pixbuf;
1200 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1249 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1201 int src_x, int src_y, int dst_x, int dst_y, 1250 int src_x, int src_y, int dst_x, int dst_y,
1202 unsigned int width, unsigned int height); 1251 unsigned int width, unsigned int height, bool argb);
1203#endif 1252#endif
1204 1253
1205#if ENABLE_OVERLAY 1254#if ENABLE_OVERLAY
1206 overlay_base ov; 1255 overlay_base ov;
1207 1256
… …
1215 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1264 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1216#endif 1265#endif
1217 1266
1218 vector<void *> allocated; // free these memory blocks with free() 1267 vector<void *> allocated; // free these memory blocks with free()
1219 1268
1220 char env_windowid[21]; /* environmental variable WINDOWID */
1221 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1222 char *env_display; /* environmental variable DISPLAY */
1223 char *env_term; /* environmental variable TERM */
1224
1225 char *locale; 1269 char *locale;
1226 char charsets[4]; 1270 char charsets[4];
1227 char *v_buffer; /* pointer to physical buffer */ 1271 char *v_buffer; /* pointer to physical buffer */
1228 unsigned int v_buflen; /* size of area to write */ 1272 unsigned int v_buflen; /* size of area to write */
1229 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1273 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1240 char *cmdbuf_ptr, *cmdbuf_endp; 1284 char *cmdbuf_ptr, *cmdbuf_endp;
1241 char cmdbuf_base[CBUFSIZ]; 1285 char cmdbuf_base[CBUFSIZ];
1242 1286
1243 ptytty *pty; 1287 ptytty *pty;
1244 1288
1245 rxvt_salloc *talloc; // text line allocator 1289 // chunk contains all line_t's as well as rend_t and text_t buffers
1246 rxvt_salloc *ralloc; // rend line allocator 1290 // for drawn_buf, swap_buf and row_buf, in this order
1291 void *chunk;
1292 size_t chunk_size;
1247 1293
1248 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1294 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1249 1295
1250#if ENABLE_FRILLS || ISO_14755 1296#if ENABLE_FRILLS || ISO_14755
1251 // ISO 14755 entry support 1297 // ISO 14755 entry support
… …
1288 void cmdbuf_append (const char *str, size_t count); 1334 void cmdbuf_append (const char *str, size_t count);
1289 bool pty_fill (); 1335 bool pty_fill ();
1290 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1336 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1291 1337
1292#ifdef CURSOR_BLINK 1338#ifdef CURSOR_BLINK
1339 void cursor_blink_reset ();
1293 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1340 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1294#endif 1341#endif
1295#ifdef TEXT_BLINK 1342#ifdef TEXT_BLINK
1296 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1343 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1297#endif 1344#endif
… …
1415 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1462 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1416 void set_utf8_property (Atom prop, const char *str, int len = -1); 1463 void set_utf8_property (Atom prop, const char *str, int len = -1);
1417 void set_title (const char *str); 1464 void set_title (const char *str);
1418 void set_icon_name (const char *str); 1465 void set_icon_name (const char *str);
1419 void set_window_color (int idx, const char *color); 1466 void set_window_color (int idx, const char *color);
1420 void set_colorfgbg (); 1467 char *get_colorfgbg ();
1421 bool set_color (rxvt_color &color, const char *name); 1468 bool set_color (rxvt_color &color, const char *name);
1422 void alias_color (int dst, int src); 1469 void alias_color (int dst, int src);
1423 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1470 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1424 void get_window_origin (int &x, int &y); 1471 void get_window_origin (int &x, int &y);
1425 Pixmap get_pixmap_property (Atom property); 1472 Pixmap get_pixmap_property (Atom property);
1426 1473
1427 // screen.C 1474 // screen.C
1428
1429 void lalloc (line_t &l) const
1430 {
1431 l.t = (text_t *)talloc->alloc ();
1432 l.r = (rend_t *)ralloc->alloc ();
1433 }
1434
1435#if 0
1436 void lfree (line_t &l)
1437 {
1438 talloc->free (l.t);
1439 ralloc->free (l.r);
1440 }
1441#endif
1442
1443 void lresize (line_t &l) const
1444 {
1445 if (!l.t)
1446 return;
1447
1448 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1449 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1450
1451 l.l = min (l.l, ncol);
1452
1453 if (ncol > prev_ncol)
1454 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1455 }
1456 1475
1457 int fgcolor_of (rend_t r) const NOTHROW 1476 int fgcolor_of (rend_t r) const NOTHROW
1458 { 1477 {
1459 int base = GET_BASEFG (r); 1478 int base = GET_BASEFG (r);
1460#ifndef NO_BRIGHTCOLOR 1479#ifndef NO_BRIGHTCOLOR
… …
1490 void set_option (uint8_t opt, bool set = true) NOTHROW; 1509 void set_option (uint8_t opt, bool set = true) NOTHROW;
1491 1510
1492 // modifies first argument(!) 1511 // modifies first argument(!)
1493 void tt_paste (char *data, unsigned int len) NOTHROW; 1512 void tt_paste (char *data, unsigned int len) NOTHROW;
1494 void paste (char *data, unsigned int len) NOTHROW; 1513 void paste (char *data, unsigned int len) NOTHROW;
1514 void scr_alloc () NOTHROW;
1495 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1515 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1496 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1516 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1497 void scr_kill_char (line_t &l, int col) const NOTHROW; 1517 void scr_kill_char (line_t &l, int col) const NOTHROW;
1498 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1518 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1499 void scr_reset (); 1519 void scr_reset ();
… …
1571 const char **get_options (int argc, const char *const *argv); 1591 const char **get_options (int argc, const char *const *argv);
1572 int parse_keysym (const char *str, const char *arg); 1592 int parse_keysym (const char *str, const char *arg);
1573 const char *x_resource (const char *name); 1593 const char *x_resource (const char *name);
1574 void extract_resources (); 1594 void extract_resources ();
1575 void extract_keysym_resources (); 1595 void extract_keysym_resources ();
1596 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1597 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1598 bool parse_bool_resource (const char *str)
1599 {
1600 return (!strcasecmp (str, "TRUE")
1601 || !strcasecmp (str, "YES")
1602 || !strcasecmp (str, "ON")
1603 || !strcasecmp (str, "1"));
1604 }
1576}; 1605};
1577 1606
1578#endif /* _RXVT_H_ */ 1607#endif /* _RXVT_H_ */
1579 1608

Diff Legend

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