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.477 by sf-exg, Thu May 17 10:48:56 2012 UTC vs.
Revision 1.494 by sf-exg, Fri Jun 1 15:49:49 2012 UTC

… …
78 78
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1 80# define HAVE_BG_PIXMAP 1
81#endif 81#endif
82 82
83#include <ecb.h>
83#include "encoding.h" 84#include "encoding.h"
84#include "rxvtutil.h" 85#include "rxvtutil.h"
85#include "rxvtfont.h" 86#include "rxvtfont.h"
86#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
87#include "scrollbar.h" 88#include "scrollbar.h"
88#include "ev_cpp.h" 89#include "ev_cpp.h"
89#include "salloc.h"
90#include "libptytty.h" 90#include "libptytty.h"
91 91
92#include "rxvtperl.h" 92#include "rxvtperl.h"
93 93
94// 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
… …
147 147
148const char * rxvt_basename (const char *str) NOTHROW; 148const char * rxvt_basename (const char *str) NOTHROW;
149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
150void rxvt_log (const char *fmt,...) NOTHROW; 150void rxvt_log (const char *fmt,...) NOTHROW;
151void rxvt_warn (const char *fmt,...) NOTHROW; 151void rxvt_warn (const char *fmt,...) NOTHROW;
152void 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;
153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; 153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
154 154
155char * rxvt_strtrim (char *str) NOTHROW; 155char * rxvt_strtrim (char *str) NOTHROW;
156char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 156char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
157 157
158static inline void 158static inline void
… …
209 environ = orig_env; 209 environ = orig_env;
210 } 210 }
211}; 211};
212 212
213#ifdef HAVE_BG_PIXMAP 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
214# ifdef BG_IMAGE_FROM_FILE 244# ifdef BG_IMAGE_FROM_FILE
215enum { 245enum {
216 IM_IS_SET = 1 << 0, 246 IM_IS_SET = 1 << 0,
217 IM_IS_SIZE_SENSITIVE = 1 << 1, 247 IM_IS_SIZE_SENSITIVE = 1 << 1,
218 IM_KEEP_ASPECT = 1 << 2, 248 IM_KEEP_ASPECT = 1 << 2,
… …
227 defaultScale = windowScale, 257 defaultScale = windowScale,
228 centerAlign = 50, 258 centerAlign = 50,
229 defaultAlign = centerAlign, 259 defaultAlign = centerAlign,
230}; 260};
231 261
232struct rxvt_image 262struct rxvt_image : image_effects
233{ 263{
264 unsigned short alpha;
234 uint8_t flags; 265 uint8_t flags;
235 unsigned int h_scale, v_scale; /* percents of the window size */ 266 unsigned int h_scale, v_scale; /* percents of the window size */
236 int h_align, v_align; /* percents of the window size: 267 int h_align, v_align; /* percents of the window size:
237 0 - left align, 50 - center, 100 - right */ 268 0 - left align, 50 - center, 100 - right */
238 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
239# ifdef HAVE_PIXBUF 277# ifdef HAVE_PIXBUF
240 GdkPixbuf *pixbuf; 278 GdkPixbuf *pixbuf;
241# endif
242 279
243 ~rxvt_image () 280 void destroy ()
244 { 281 {
245# ifdef HAVE_PIXBUF
246 if (pixbuf) 282 if (pixbuf)
247 g_object_unref (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 }
248# endif 294# endif
249 }
250 295
251 int width () 296 rxvt_image ();
252 { 297 bool set_file_geometry (const char *file);
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); 298 bool set_file (const char *file);
264 bool set_geometry (const char *geom, bool update = false); 299 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}; 300};
272# endif 301# endif
273#endif 302#endif
274 303
275/* 304/*
… …
758 text_t *t; // terminal the text 787 text_t *t; // terminal the text
759 rend_t *r; // rendition, uses RS_ flags 788 rend_t *r; // rendition, uses RS_ flags
760 tlen_t_ l; // length of each text line 789 tlen_t_ l; // length of each text line
761 uint32_t f; // flags 790 uint32_t f; // flags
762 791
792 bool valid ()
793 {
794 return l >= 0;
795 }
796
797 void alloc ()
798 {
799 l = 0;
800 }
801
763 bool is_longer () 802 bool is_longer ()
764 { 803 {
765 return f & LINE_LONGER; 804 return f & LINE_LONGER;
766 } 805 }
767 806
… …
831// that are not representable in unicode, as well as characters 870// that are not representable in unicode, as well as characters
832// not fitting in the BMP. 871// not fitting in the BMP.
833struct compose_char 872struct compose_char
834{ 873{
835 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
836 compose_char (unicode_t c1, unicode_t c2) 878 compose_char (unicode_t c1, unicode_t c2)
837 : c1(c1), c2(c2) 879 : c1(c1), c2(c2)
838 { } 880 { }
839}; 881};
840 882
… …
1034 scrollBar_t scrollBar; 1076 scrollBar_t scrollBar;
1035 uint8_t options[(Opt_count + 7) >> 3]; 1077 uint8_t options[(Opt_count + 7) >> 3];
1036 XSizeHints szHint; 1078 XSizeHints szHint;
1037 rxvt_color *pix_colors; 1079 rxvt_color *pix_colors;
1038 Cursor TermWin_cursor; /* cursor for vt window */ 1080 Cursor TermWin_cursor; /* cursor for vt window */
1081
1039 line_t *row_buf; // all lines, scrollback + terminal, circular 1082 line_t *row_buf; // all lines, scrollback + terminal, circular
1040 line_t *drawn_buf; // text on screen 1083 line_t *drawn_buf; // text on screen
1041 line_t *swap_buf; // lines for swap buffer 1084 line_t *swap_buf; // lines for swap buffer
1042 char *tabs; /* per location: 1 == tab-stop */ 1085 char *tabs; /* per location: 1 == tab-stop */
1043 screen_t screen; 1086 screen_t screen;
… …
1151 BG_IS_TRANSPARENT = 1 << 1, 1194 BG_IS_TRANSPARENT = 1 << 1,
1152 BG_NEEDS_REFRESH = 1 << 2, 1195 BG_NEEDS_REFRESH = 1 << 2,
1153 1196
1154 BG_HAS_RENDER = 1 << 3, 1197 BG_HAS_RENDER = 1 << 3,
1155 BG_HAS_RENDER_CONV = 1 << 4, 1198 BG_HAS_RENDER_CONV = 1 << 4,
1156 BG_CLIENT_RENDER = 1 << 5,
1157
1158 BG_TINT_SET = 1 << 6,
1159 BG_TINT_BITAND = 1 << 7,
1160 }; 1199 };
1161 1200
1162 uint8_t bg_flags; 1201 uint8_t bg_flags;
1163 1202
1164# ifdef BG_IMAGE_FROM_FILE 1203# ifdef BG_IMAGE_FROM_FILE
1204 vector<rxvt_image> image_vec;
1165 rxvt_image bg_image; 1205 rxvt_image *new_image ()
1206 {
1207 image_vec.resize (image_vec.size () + 1);
1208 return &image_vec.back ();
1209 }
1166 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1210 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1167 bool render_image (rxvt_image &image); 1211 bool render_image (rxvt_image &image);
1212 void parse_image (int id, const char *type, const char *arg);
1168# endif 1213# endif
1169 1214
1170# ifdef ENABLE_TRANSPARENCY 1215# ifdef ENABLE_TRANSPARENCY
1171 Pixmap root_pixmap; /* current root pixmap set */ 1216 Pixmap root_pixmap; /* current root pixmap set */
1172 rxvt_color tint; 1217 image_effects root_effects;
1173 int shade;
1174 int h_blurRadius, v_blurRadius;
1175 1218
1176 void bg_set_transparent () 1219 void bg_set_transparent ()
1177 { 1220 {
1178 bg_flags |= BG_IS_TRANSPARENT; 1221 bg_flags |= BG_IS_TRANSPARENT;
1179 } 1222 }
1180 void bg_set_root_pixmap (); 1223 void bg_set_root_pixmap ();
1181 bool bg_set_tint (rxvt_color &new_tint); 1224 bool render_root_image ();
1182 bool bg_set_shade (const char *shade_str);
1183 bool bg_set_blur (const char *geom);
1184
1185 bool blur_pixmap (Pixmap pixmap, int width, int height);
1186 bool tint_pixmap (Pixmap pixmap, int width, int height);
1187 void tint_ximage (XImage *ximage);
1188 bool make_transparency_pixmap ();
1189# 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);
1190 1230
1191 ev_tstamp bg_valid_since; 1231 ev_tstamp bg_valid_since;
1192 1232
1193 Pixmap bg_pixmap; 1233 Pixmap bg_pixmap;
1194 unsigned int bg_pmap_width, bg_pmap_height; 1234 unsigned int bg_pmap_width, bg_pmap_height;
… …
1206 } 1246 }
1207#endif 1247#endif
1208#ifdef HAVE_PIXBUF 1248#ifdef HAVE_PIXBUF
1209 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1249 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1210 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,
1211 unsigned int width, unsigned int height); 1251 unsigned int width, unsigned int height, bool argb);
1212#endif 1252#endif
1213 1253
1214#if ENABLE_OVERLAY 1254#if ENABLE_OVERLAY
1215 overlay_base ov; 1255 overlay_base ov;
1216 1256
… …
1244 char *cmdbuf_ptr, *cmdbuf_endp; 1284 char *cmdbuf_ptr, *cmdbuf_endp;
1245 char cmdbuf_base[CBUFSIZ]; 1285 char cmdbuf_base[CBUFSIZ];
1246 1286
1247 ptytty *pty; 1287 ptytty *pty;
1248 1288
1249 rxvt_salloc *talloc; // text line allocator 1289 // chunk contains all line_t's as well as rend_t and text_t buffers
1250 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;
1251 1293
1252 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
1253 1295
1254#if ENABLE_FRILLS || ISO_14755 1296#if ENABLE_FRILLS || ISO_14755
1255 // ISO 14755 entry support 1297 // ISO 14755 entry support
… …
1429 void get_window_origin (int &x, int &y); 1471 void get_window_origin (int &x, int &y);
1430 Pixmap get_pixmap_property (Atom property); 1472 Pixmap get_pixmap_property (Atom property);
1431 1473
1432 // screen.C 1474 // screen.C
1433 1475
1434 void lalloc (line_t &l) const
1435 {
1436 l.t = (text_t *)talloc->alloc ();
1437 l.r = (rend_t *)ralloc->alloc ();
1438 }
1439
1440#if 0
1441 void lfree (line_t &l)
1442 {
1443 talloc->free (l.t);
1444 ralloc->free (l.r);
1445 }
1446#endif
1447
1448 void lresize (line_t &l) const
1449 {
1450 if (!l.t)
1451 return;
1452
1453 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1454 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1455
1456 l.l = min (l.l, ncol);
1457
1458 if (ncol > prev_ncol)
1459 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1460 }
1461
1462 int fgcolor_of (rend_t r) const NOTHROW 1476 int fgcolor_of (rend_t r) const NOTHROW
1463 { 1477 {
1464 int base = GET_BASEFG (r); 1478 int base = GET_BASEFG (r);
1465#ifndef NO_BRIGHTCOLOR 1479#ifndef NO_BRIGHTCOLOR
1466 if (r & RS_Bold 1480 if (r & RS_Bold
… …
1495 void set_option (uint8_t opt, bool set = true) NOTHROW; 1509 void set_option (uint8_t opt, bool set = true) NOTHROW;
1496 1510
1497 // modifies first argument(!) 1511 // modifies first argument(!)
1498 void tt_paste (char *data, unsigned int len) NOTHROW; 1512 void tt_paste (char *data, unsigned int len) NOTHROW;
1499 void paste (char *data, unsigned int len) NOTHROW; 1513 void paste (char *data, unsigned int len) NOTHROW;
1514 void scr_alloc () NOTHROW;
1500 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;
1501 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;
1502 void scr_kill_char (line_t &l, int col) const NOTHROW; 1517 void scr_kill_char (line_t &l, int col) const NOTHROW;
1503 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1518 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1504 void scr_reset (); 1519 void scr_reset ();
… …
1576 const char **get_options (int argc, const char *const *argv); 1591 const char **get_options (int argc, const char *const *argv);
1577 int parse_keysym (const char *str, const char *arg); 1592 int parse_keysym (const char *str, const char *arg);
1578 const char *x_resource (const char *name); 1593 const char *x_resource (const char *name);
1579 void extract_resources (); 1594 void extract_resources ();
1580 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 }
1581}; 1605};
1582 1606
1583#endif /* _RXVT_H_ */ 1607#endif /* _RXVT_H_ */
1584 1608

Diff Legend

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