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.446 by sf-exg, Tue Aug 9 18:41:31 2011 UTC vs.
Revision 1.487 by root, Mon May 28 14:25:16 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"
… …
217 ~localise_env () 208 ~localise_env ()
218 { 209 {
219 environ = orig_env; 210 environ = orig_env;
220 } 211 }
221}; 212};
213
214#ifdef HAVE_BG_PIXMAP
215# ifdef BG_IMAGE_FROM_FILE
216enum {
217 IM_IS_SET = 1 << 0,
218 IM_IS_SIZE_SENSITIVE = 1 << 1,
219 IM_KEEP_ASPECT = 1 << 2,
220 IM_ROOT_ALIGN = 1 << 3,
221 IM_TILE = 1 << 4,
222 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
223};
224
225enum {
226 noScale = 0,
227 windowScale = 100,
228 defaultScale = windowScale,
229 centerAlign = 50,
230 defaultAlign = centerAlign,
231};
232
233struct rxvt_image
234{
235 unsigned short alpha;
236 uint8_t flags;
237 unsigned int h_scale, v_scale; /* percents of the window size */
238 int h_align, v_align; /* percents of the window size:
239 0 - left align, 50 - center, 100 - right */
240
241# ifdef HAVE_PIXBUF
242 GdkPixbuf *pixbuf;
243
244 void destroy ()
245 {
246 if (pixbuf)
247 g_object_unref (pixbuf);
248 }
249
250 int width ()
251 {
252 return gdk_pixbuf_get_width (pixbuf);
253 }
254 int height ()
255 {
256 return gdk_pixbuf_get_height (pixbuf);
257 }
258# endif
259
260 rxvt_image ();
261 bool set_file_geometry (const char *file);
262 bool set_file (const char *file);
263 bool set_geometry (const char *geom, bool update = false);
264};
265# endif
266#endif
222 267
223/* 268/*
224 ***************************************************************************** 269 *****************************************************************************
225 * STRUCTURES AND TYPEDEFS 270 * STRUCTURES AND TYPEDEFS
226 ***************************************************************************** 271 *****************************************************************************
… …
706 text_t *t; // terminal the text 751 text_t *t; // terminal the text
707 rend_t *r; // rendition, uses RS_ flags 752 rend_t *r; // rendition, uses RS_ flags
708 tlen_t_ l; // length of each text line 753 tlen_t_ l; // length of each text line
709 uint32_t f; // flags 754 uint32_t f; // flags
710 755
756 bool valid ()
757 {
758 return l >= 0;
759 }
760
761 void alloc ()
762 {
763 l = 0;
764 }
765
711 bool is_longer () 766 bool is_longer ()
712 { 767 {
713 return f & LINE_LONGER; 768 return f & LINE_LONGER;
714 } 769 }
715 770
… …
779// that are not representable in unicode, as well as characters 834// that are not representable in unicode, as well as characters
780// not fitting in the BMP. 835// not fitting in the BMP.
781struct compose_char 836struct compose_char
782{ 837{
783 unicode_t c1, c2; // any chars != NOCHAR are valid 838 unicode_t c1, c2; // any chars != NOCHAR are valid
839 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
840 compose_char () = default;
841 #endif
784 compose_char (unicode_t c1, unicode_t c2) 842 compose_char (unicode_t c1, unicode_t c2)
785 : c1(c1), c2(c2) 843 : c1(c1), c2(c2)
786 { } 844 { }
787}; 845};
788 846
… …
870 * END······················= total_rows 928 * END······················= total_rows
871 */ 929 */
872 930
873struct TermWin_t 931struct TermWin_t
874{ 932{
933 int vt_width; /* actual window width [pixels] */
934 int vt_height; /* actual window height [pixels] */
875 int width; /* window width [pixels] */ 935 int width; /* window width [pixels] */
876 int height; /* window height [pixels] */ 936 int height; /* window height [pixels] */
877 int fwidth; /* font width [pixels] */ 937 int fwidth; /* font width [pixels] */
878 int fheight; /* font height [pixels] */ 938 int fheight; /* font height [pixels] */
879 int fbase; /* font ascent (baseline) [pixels] */ 939 int fbase; /* font ascent (baseline) [pixels] */
… …
891 int view_start; /* scrollback view starts here */ 951 int view_start; /* scrollback view starts here */
892 int top_row; /* topmost row index of scrollback */ 952 int top_row; /* topmost row index of scrollback */
893 Window parent; /* parent identifier */ 953 Window parent; /* parent identifier */
894 Window vt; /* vt100 window */ 954 Window vt; /* vt100 window */
895 GC gc; /* GC for drawing */ 955 GC gc; /* GC for drawing */
896 Pixmap pixmap;
897 rxvt_drawable *drawable; 956 rxvt_drawable *drawable;
898 rxvt_fontset *fontset[4]; 957 rxvt_fontset *fontset[4];
899}; 958};
900 959
901/* 960/*
… …
981 scrollBar_t scrollBar; 1040 scrollBar_t scrollBar;
982 uint8_t options[(Opt_count + 7) >> 3]; 1041 uint8_t options[(Opt_count + 7) >> 3];
983 XSizeHints szHint; 1042 XSizeHints szHint;
984 rxvt_color *pix_colors; 1043 rxvt_color *pix_colors;
985 Cursor TermWin_cursor; /* cursor for vt window */ 1044 Cursor TermWin_cursor; /* cursor for vt window */
1045
986 line_t *row_buf; // all lines, scrollback + terminal, circular 1046 line_t *row_buf; // all lines, scrollback + terminal, circular
987 line_t *drawn_buf; // text on screen 1047 line_t *drawn_buf; // text on screen
988 line_t *swap_buf; // lines for swap buffer 1048 line_t *swap_buf; // lines for swap buffer
989 char *tabs; /* per location: 1 == tab-stop */ 1049 char *tabs; /* per location: 1 == tab-stop */
990 screen_t screen; 1050 screen_t screen;
… …
1028 hidden_pointer:1, 1088 hidden_pointer:1,
1029#endif 1089#endif
1030 enc_utf8:1, /* whether locale uses utf-8 */ 1090 enc_utf8:1, /* whether locale uses utf-8 */
1031 seen_input:1, /* whether we have seen some program output yet */ 1091 seen_input:1, /* whether we have seen some program output yet */
1032 seen_resize:1, /* whether we had a resize event */ 1092 seen_resize:1, /* whether we had a resize event */
1093 init_done:1,
1033 parsed_geometry:1; 1094 parsed_geometry:1;
1034 1095
1035 unsigned char refresh_type, 1096 unsigned char refresh_type,
1036#ifdef META8_OPTION 1097#ifdef META8_OPTION
1037 meta_char; /* Alt-key prefix */ 1098 meta_char; /* Alt-key prefix */
… …
1071 allowedxerror; 1132 allowedxerror;
1072/* ---------- */ 1133/* ---------- */
1073 unsigned int ModLevel3Mask, 1134 unsigned int ModLevel3Mask,
1074 ModMetaMask, 1135 ModMetaMask,
1075 ModNumLockMask; 1136 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, 1137 unsigned long priv_modes,
1079 SavedModes; 1138 SavedModes;
1080/* ---------- */ 1139/* ---------- */
1081 Atom *xa; 1140 Atom *xa;
1082/* ---------- */ 1141/* ---------- */
… …
1092#ifdef HAVE_BG_PIXMAP 1151#ifdef HAVE_BG_PIXMAP
1093 void bg_init (); 1152 void bg_init ();
1094 void bg_destroy (); 1153 void bg_destroy ();
1095 1154
1096 enum { 1155 enum {
1097 //subset returned by make_transparency_pixmap
1098 BG_IS_VALID = 1 << 0, 1156 BG_IS_VALID = 1 << 0,
1099 BG_NEEDS_TINT = 1 << 1,
1100 BG_NEEDS_BLUR = 1 << 2,
1101 1157
1102 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1103
1104 BG_PROP_SCALE = 1 << 3,
1105 BG_ROOT_ALIGN = 1 << 4,
1106 BG_TILE = 1 << 14,
1107 BG_GEOMETRY_FLAGS = BG_PROP_SCALE | 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, 1158 BG_IS_TRANSPARENT = 1 << 1,
1118 BG_NEEDS_REFRESH = 1 << 11, 1159 BG_NEEDS_REFRESH = 1 << 2,
1119 BG_IS_SIZE_SENSITIVE = 1 << 12, 1160
1120 BG_IS_FROM_FILE = 1 << 13, 1161 BG_HAS_RENDER = 1 << 3,
1162 BG_HAS_RENDER_CONV = 1 << 4,
1163 BG_CLIENT_RENDER = 1 << 5,
1164
1165 BG_TINT_SET = 1 << 6,
1166 BG_TINT_BITAND = 1 << 7,
1121 }; 1167 };
1122 1168
1123 unsigned int bg_flags; 1169 uint8_t bg_flags;
1124 1170
1125# ifdef BG_IMAGE_FROM_FILE 1171# ifdef BG_IMAGE_FROM_FILE
1126 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1172 vector<rxvt_image> image_vec;
1127 bool render_image (unsigned long tr_flags); 1173 rxvt_image *new_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 { 1174 {
1144 h_scale = v_scale = defaultScale; 1175 image_vec.resize (image_vec.size () + 1);
1145 h_align = v_align = defaultAlign; 1176 return &image_vec.back ();
1146 } 1177 }
1147 1178 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1148 bool bg_set_file (const char *file); 1179 bool render_image (rxvt_image &image);
1180 void parse_image (int id, const char *type, const char *arg);
1149# endif 1181# endif
1150 1182
1151# ifdef ENABLE_TRANSPARENCY 1183# ifdef ENABLE_TRANSPARENCY
1152 Pixmap root_pixmap; /* current root pixmap set */ 1184 Pixmap root_pixmap; /* current root pixmap set */
1153 rxvt_color tint; 1185 rxvt_color tint;
1154 int shade; 1186 int shade;
1155 int h_blurRadius, v_blurRadius; 1187 int h_blurRadius, v_blurRadius;
1156 1188
1157 bool bg_set_transparent (); 1189 void bg_set_transparent ()
1190 {
1191 bg_flags |= BG_IS_TRANSPARENT;
1192 }
1158 void bg_set_root_pixmap (); 1193 void bg_set_root_pixmap ();
1159 void set_tint_shade_flags ();
1160 bool bg_set_tint (rxvt_color &new_tint); 1194 bool bg_set_tint (rxvt_color &new_tint);
1161 bool bg_set_shade (const char *shade_str); 1195 bool bg_set_shade (const char *shade_str);
1162 bool bg_set_blur (const char *geom); 1196 bool bg_set_blur (const char *geom);
1163 1197
1164 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1198 bool blur_pixmap (Pixmap pixmap, int width, int height);
1165 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1199 bool tint_pixmap (Pixmap pixmap, int width, int height);
1200 void tint_ximage (XImage *ximage);
1166 unsigned long make_transparency_pixmap (); 1201 bool make_transparency_pixmap ();
1167# endif 1202# endif
1168 1203
1169 ev_tstamp bg_valid_since; 1204 ev_tstamp bg_valid_since;
1170 1205
1171 Pixmap bg_pixmap; 1206 Pixmap bg_pixmap;
… …
1181 void bg_invalidate () 1216 void bg_invalidate ()
1182 { 1217 {
1183 bg_flags &= ~BG_IS_VALID; 1218 bg_flags &= ~BG_IS_VALID;
1184 } 1219 }
1185#endif 1220#endif
1186#ifdef HAVE_AFTERIMAGE
1187 ASImage *original_asim;
1188 ASVisual *asv;
1189 ASImageManager *asimman;
1190
1191 void init_asv ()
1192 {
1193 if (!asv)
1194 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1195 }
1196#endif
1197#ifdef HAVE_PIXBUF 1221#ifdef HAVE_PIXBUF
1198 GdkPixbuf *pixbuf;
1199 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1222 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1200 int src_x, int src_y, int dst_x, int dst_y, 1223 int src_x, int src_y, int dst_x, int dst_y,
1201 unsigned int width, unsigned int height); 1224 unsigned int width, unsigned int height, bool argb);
1202#endif 1225#endif
1203 1226
1204#if ENABLE_OVERLAY 1227#if ENABLE_OVERLAY
1205 overlay_base ov; 1228 overlay_base ov;
1206 1229
… …
1214 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1237 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1215#endif 1238#endif
1216 1239
1217 vector<void *> allocated; // free these memory blocks with free() 1240 vector<void *> allocated; // free these memory blocks with free()
1218 1241
1219 char env_windowid[21]; /* environmental variable WINDOWID */
1220 char env_colorfgbg[sizeof ("COLORFGBG=default;default;bg") + 1];
1221 char *env_display; /* environmental variable DISPLAY */
1222 char *env_term; /* environmental variable TERM */
1223
1224 char *locale; 1242 char *locale;
1225 char charsets[4]; 1243 char charsets[4];
1226 char *v_buffer; /* pointer to physical buffer */ 1244 char *v_buffer; /* pointer to physical buffer */
1227 unsigned int v_buflen; /* size of area to write */ 1245 unsigned int v_buflen; /* size of area to write */
1228 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1246 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1239 char *cmdbuf_ptr, *cmdbuf_endp; 1257 char *cmdbuf_ptr, *cmdbuf_endp;
1240 char cmdbuf_base[CBUFSIZ]; 1258 char cmdbuf_base[CBUFSIZ];
1241 1259
1242 ptytty *pty; 1260 ptytty *pty;
1243 1261
1244 rxvt_salloc *talloc; // text line allocator 1262 // chunk contains all line_t's as well as rend_t and text_t buffers
1245 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;
1246 1266
1247 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
1248 1268
1249#if ENABLE_FRILLS || ISO_14755 1269#if ENABLE_FRILLS || ISO_14755
1250 // ISO 14755 entry support 1270 // ISO 14755 entry support
… …
1287 void cmdbuf_append (const char *str, size_t count); 1307 void cmdbuf_append (const char *str, size_t count);
1288 bool pty_fill (); 1308 bool pty_fill ();
1289 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;
1290 1310
1291#ifdef CURSOR_BLINK 1311#ifdef CURSOR_BLINK
1312 void cursor_blink_reset ();
1292 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;
1293#endif 1314#endif
1294#ifdef TEXT_BLINK 1315#ifdef TEXT_BLINK
1295 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;
1296#endif 1317#endif
… …
1315 void pointer_unblank (); 1336 void pointer_unblank ();
1316 1337
1317 void tt_printf (const char *fmt,...); 1338 void tt_printf (const char *fmt,...);
1318 void tt_write (const char *data, unsigned int len); 1339 void tt_write (const char *data, unsigned int len);
1319 void pty_write (); 1340 void pty_write ();
1320
1321 void init (stringvec *argv, stringvec *envv)
1322 {
1323 this->argv = argv;
1324 init (argv->size (), argv->begin (), envv);
1325 }
1326 1341
1327 void make_current () const // make this the "currently active" urxvt instance 1342 void make_current () const // make this the "currently active" urxvt instance
1328 { 1343 {
1329 SET_R (this); 1344 SET_R (this);
1330 set_environ (envv); 1345 set_environ (envv);
… …
1388 void process_xterm_seq (int op, char *str, char resp); 1403 void process_xterm_seq (int op, char *str, char resp);
1389 int privcases (int mode, unsigned long bit); 1404 int privcases (int mode, unsigned long bit);
1390 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg); 1405 void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
1391 void process_sgr_mode (unsigned int nargs, const int *arg); 1406 void process_sgr_mode (unsigned int nargs, const int *arg);
1392 // init.C 1407 // init.C
1408 void init (stringvec *argv, stringvec *envv);
1409 void init (int argc, const char *const *argv, const char *const *envv);
1410 void init2 (int argc, const char *const *argv);
1393 void init_vars (); 1411 void init_vars ();
1394 const char **init_resources (int argc, const char *const *argv); 1412 const char **init_resources (int argc, const char *const *argv);
1395 void init (int argc, const char *const *argv, stringvec *envv);
1396 void init_env (); 1413 void init_env ();
1397 void set_locale (const char *locale); 1414 void set_locale (const char *locale);
1398 void init_xlocale (); 1415 void init_xlocale ();
1399 void init_command (const char *const *argv); 1416 void init_command (const char *const *argv);
1400 void run_command (const char *const *argv); 1417 void run_command (const char *const *argv);
… …
1418 void set_mbstring_property (Atom prop, const char *str, int len = -1); 1435 void set_mbstring_property (Atom prop, const char *str, int len = -1);
1419 void set_utf8_property (Atom prop, const char *str, int len = -1); 1436 void set_utf8_property (Atom prop, const char *str, int len = -1);
1420 void set_title (const char *str); 1437 void set_title (const char *str);
1421 void set_icon_name (const char *str); 1438 void set_icon_name (const char *str);
1422 void set_window_color (int idx, const char *color); 1439 void set_window_color (int idx, const char *color);
1423 void set_colorfgbg (); 1440 char *get_colorfgbg ();
1424 bool set_color (rxvt_color &color, const char *name); 1441 bool set_color (rxvt_color &color, const char *name);
1425 void alias_color (int dst, int src); 1442 void alias_color (int dst, int src);
1426 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1443 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1427 void get_window_origin (int &x, int &y); 1444 void get_window_origin (int &x, int &y);
1428 Pixmap get_pixmap_property (Atom property); 1445 Pixmap get_pixmap_property (Atom property);
1429 1446
1430 // screen.C 1447 // screen.C
1431
1432 void lalloc (line_t &l) const
1433 {
1434 l.t = (text_t *)talloc->alloc ();
1435 l.r = (rend_t *)ralloc->alloc ();
1436 }
1437
1438#if 0
1439 void lfree (line_t &l)
1440 {
1441 talloc->free (l.t);
1442 ralloc->free (l.r);
1443 }
1444#endif
1445
1446 void lresize (line_t &l) const
1447 {
1448 if (!l.t)
1449 return;
1450
1451 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1452 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1453
1454 l.l = min (l.l, ncol);
1455
1456 if (ncol > prev_ncol)
1457 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1458 }
1459 1448
1460 int fgcolor_of (rend_t r) const NOTHROW 1449 int fgcolor_of (rend_t r) const NOTHROW
1461 { 1450 {
1462 int base = GET_BASEFG (r); 1451 int base = GET_BASEFG (r);
1463#ifndef NO_BRIGHTCOLOR 1452#ifndef NO_BRIGHTCOLOR
1464 if (r & RS_Bold 1453 if (r & RS_Bold
1465# if ENABLE_STYLES 1454# if ENABLE_STYLES
1466 && option (Opt_intensityStyles) 1455 && option (Opt_intensityStyles)
1467# endif 1456# endif
1468 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1457 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1469 base += minBrightCOLOR - minCOLOR; 1458 base += minBrightCOLOR - minCOLOR;
1470#endif 1459#endif
1471 return base; 1460 return base;
1472 } 1461 }
1473 1462
… …
1477#ifndef NO_BRIGHTCOLOR 1466#ifndef NO_BRIGHTCOLOR
1478 if (r & RS_Blink 1467 if (r & RS_Blink
1479# if ENABLE_STYLES 1468# if ENABLE_STYLES
1480 && option (Opt_intensityStyles) 1469 && option (Opt_intensityStyles)
1481# endif 1470# endif
1482 && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR)) 1471 && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
1483 base += minBrightCOLOR - minCOLOR; 1472 base += minBrightCOLOR - minCOLOR;
1484#endif 1473#endif
1485 return base; 1474 return base;
1486 } 1475 }
1487 1476
… …
1490 return options[opt >> 3] & (1 << (opt & 7)); 1479 return options[opt >> 3] & (1 << (opt & 7));
1491 } 1480 }
1492 1481
1493 void set_option (uint8_t opt, bool set = true) NOTHROW; 1482 void set_option (uint8_t opt, bool set = true) NOTHROW;
1494 1483
1495 void set_privmode (unsigned bit, int set) NOTHROW
1496 {
1497 if (set)
1498 priv_modes |= bit;
1499 else
1500 priv_modes &= ~bit;
1501 }
1502
1503 // modifies first argument(!) 1484 // modifies first argument(!)
1504 void tt_paste (char *data, unsigned int len) NOTHROW; 1485 void tt_paste (char *data, unsigned int len) NOTHROW;
1505 void paste (char *data, unsigned int len) NOTHROW; 1486 void paste (char *data, unsigned int len) NOTHROW;
1487 void scr_alloc () NOTHROW;
1506 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;
1507 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1489 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1508 void scr_kill_char (line_t &l, int col) const NOTHROW; 1490 void scr_kill_char (line_t &l, int col) const NOTHROW;
1509 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1491 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1510 void scr_reset (); 1492 void scr_reset ();
… …
1577 void selection_click (int clicks, int x, int y) NOTHROW; 1559 void selection_click (int clicks, int x, int y) NOTHROW;
1578 void selection_extend (int x, int y, int flag) NOTHROW; 1560 void selection_extend (int x, int y, int flag) NOTHROW;
1579 void selection_rotate (int x, int y) NOTHROW; 1561 void selection_rotate (int x, int y) NOTHROW;
1580 1562
1581 // xdefaults.C 1563 // xdefaults.C
1582 void get_options (int argc, const char *const *argv); 1564 const char **get_options (int argc, const char *const *argv);
1583 int parse_keysym (const char *str, const char *arg); 1565 int parse_keysym (const char *str, const char *arg);
1584 const char *x_resource (const char *name); 1566 const char *x_resource (const char *name);
1585 void extract_resources (); 1567 void extract_resources ();
1568 void extract_keysym_resources ();
1569 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1570 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1571 bool parse_bool_resource (const char *str)
1572 {
1573 return (!strcasecmp (str, "TRUE")
1574 || !strcasecmp (str, "YES")
1575 || !strcasecmp (str, "ON")
1576 || !strcasecmp (str, "1"));
1577 }
1586}; 1578};
1587 1579
1588#endif /* _RXVT_H_ */ 1580#endif /* _RXVT_H_ */
1589 1581

Diff Legend

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