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.475 by sf-exg, Thu May 17 10:18:32 2012 UTC vs.
Revision 1.502 by sf-exg, Wed Jun 6 22:00:20 2012 UTC

… …
45 45
46#include "feature.h" 46#include "feature.h"
47 47
48#if defined (ISO_14755) || defined (ENABLE_PERL) 48#if defined (ISO_14755) || defined (ENABLE_PERL)
49# define ENABLE_OVERLAY 1 49# define ENABLE_OVERLAY 1
50# undef NO_RESOURCES
50#endif 51#endif
51 52
52#if ENABLE_PERL 53#if ENABLE_PERL
53# define ENABLE_FRILLS 1 54# define ENABLE_FRILLS 1
54# define ENABLE_COMBINING 1 55# define ENABLE_COMBINING 1
… …
70#include <X11/cursorfont.h> 71#include <X11/cursorfont.h>
71#include <X11/keysym.h> 72#include <X11/keysym.h>
72#include <X11/keysymdef.h> 73#include <X11/keysymdef.h>
73#include <X11/Xatom.h> 74#include <X11/Xatom.h>
74 75
75#ifdef HAVE_PIXBUF 76#if HAVE_PIXBUF
76# include <gdk-pixbuf/gdk-pixbuf.h> 77# include <gdk-pixbuf/gdk-pixbuf.h>
77#endif 78#endif
78 79
79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 80#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
80# define HAVE_BG_PIXMAP 1 81# define HAVE_BG_PIXMAP 1
81#endif 82#endif
82 83
84#include <ecb.h>
83#include "encoding.h" 85#include "encoding.h"
84#include "rxvtutil.h" 86#include "rxvtutil.h"
85#include "rxvtfont.h" 87#include "rxvtfont.h"
86#include "rxvttoolkit.h" 88#include "rxvttoolkit.h"
89#include "rxvtimg.h"
87#include "scrollbar.h" 90#include "scrollbar.h"
88#include "ev_cpp.h" 91#include "ev_cpp.h"
89#include "salloc.h"
90#include "libptytty.h" 92#include "libptytty.h"
91 93
92#include "rxvtperl.h" 94#include "rxvtperl.h"
93 95
94// try to avoid some macros to decrease code size, on some systems 96// try to avoid some macros to decrease code size, on some systems
… …
147 149
148const char * rxvt_basename (const char *str) NOTHROW; 150const char * rxvt_basename (const char *str) NOTHROW;
149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 151void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
150void rxvt_log (const char *fmt,...) NOTHROW; 152void rxvt_log (const char *fmt,...) NOTHROW;
151void rxvt_warn (const char *fmt,...) NOTHROW; 153void rxvt_warn (const char *fmt,...) NOTHROW;
152void rxvt_fatal (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn; 154void 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; 155void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
154 156
155char * rxvt_strtrim (char *str) NOTHROW; 157char * rxvt_strtrim (char *str) NOTHROW;
156char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 158char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
157 159
158static inline void 160static inline void
… …
209 environ = orig_env; 211 environ = orig_env;
210 } 212 }
211}; 213};
212 214
213#ifdef HAVE_BG_PIXMAP 215#ifdef HAVE_BG_PIXMAP
216struct image_effects
217{
218 bool tint_set;
219 rxvt_color tint;
220 int shade;
221 int h_blurRadius, v_blurRadius;
222
223 image_effects ()
224 {
225 tint_set =
226 h_blurRadius =
227 v_blurRadius = 0;
228 shade = 100;
229 }
230
231 bool need_tint ()
232 {
233 return shade != 100 || tint_set;
234 }
235
236 bool need_blur ()
237 {
238 return h_blurRadius && v_blurRadius;
239 }
240
241 bool set_tint (const rxvt_color &new_tint);
242 bool set_shade (const char *shade_str);
243 bool set_blur (const char *geom);
244};
245
214# ifdef BG_IMAGE_FROM_FILE 246# if BG_IMAGE_FROM_FILE
215enum { 247enum {
216 IM_IS_SET = 1 << 0, 248 IM_IS_SET = 1 << 0,
217 IM_IS_SIZE_SENSITIVE = 1 << 1, 249 IM_IS_SIZE_SENSITIVE = 1 << 1,
218 IM_KEEP_ASPECT = 1 << 2, 250 IM_KEEP_ASPECT = 1 << 2,
219 IM_ROOT_ALIGN = 1 << 3, 251 IM_ROOT_ALIGN = 1 << 3,
… …
227 defaultScale = windowScale, 259 defaultScale = windowScale,
228 centerAlign = 50, 260 centerAlign = 50,
229 defaultAlign = centerAlign, 261 defaultAlign = centerAlign,
230}; 262};
231 263
232struct rxvt_image 264struct rxvt_image : image_effects
233{ 265{
266 unsigned short alpha;
234 uint8_t flags; 267 uint8_t flags;
235 unsigned int h_scale, v_scale; /* percents of the window size */ 268 unsigned int h_scale, v_scale; /* percents of the window size */
236 int h_align, v_align; /* percents of the window size: 269 int h_align, v_align; /* percents of the window size:
237 0 - left align, 50 - center, 100 - right */ 270 0 - left align, 50 - center, 100 - right */
238 271
272 bool is_size_sensitive ()
273 {
274 return (!(flags & IM_TILE)
275 || h_scale || v_scale
276 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
277 }
278
239# ifdef HAVE_PIXBUF 279# if HAVE_PIXBUF
240 GdkPixbuf *pixbuf; 280 GdkPixbuf *pixbuf;
241# endif
242 281
243 ~rxvt_image () 282 void destroy ()
244 { 283 {
245# ifdef HAVE_PIXBUF
246 if (pixbuf) 284 if (pixbuf)
247 g_object_unref (pixbuf); 285 g_object_unref (pixbuf);
286 }
287
288 int width ()
289 {
290 return gdk_pixbuf_get_width (pixbuf);
291 }
292 int height ()
293 {
294 return gdk_pixbuf_get_height (pixbuf);
295 }
248# endif 296# endif
249 }
250 297
251 int width () 298 rxvt_image ();
252 { 299 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); 300 bool set_file (const char *file);
264 bool set_geometry (const char *geom, bool update = false); 301 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}; 302};
272# endif 303# endif
273#endif 304#endif
274 305
275/* 306/*
… …
321 ***************************************************************************** 352 *****************************************************************************
322 */ 353 */
323 354
324/* COLORTERM, TERM environment variables */ 355/* COLORTERM, TERM environment variables */
325#define COLORTERMENV "rxvt" 356#define COLORTERMENV "rxvt"
326#ifdef BG_IMAGE_FROM_FILE 357#if BG_IMAGE_FROM_FILE
327# define COLORTERMENVFULL COLORTERMENV "-xpm" 358# define COLORTERMENVFULL COLORTERMENV "-xpm"
328#else 359#else
329# define COLORTERMENVFULL COLORTERMENV 360# define COLORTERMENVFULL COLORTERMENV
330#endif 361#endif
331#ifndef TERMENV 362#ifndef TERMENV
… …
758 text_t *t; // terminal the text 789 text_t *t; // terminal the text
759 rend_t *r; // rendition, uses RS_ flags 790 rend_t *r; // rendition, uses RS_ flags
760 tlen_t_ l; // length of each text line 791 tlen_t_ l; // length of each text line
761 uint32_t f; // flags 792 uint32_t f; // flags
762 793
794 bool valid ()
795 {
796 return l >= 0;
797 }
798
799 void alloc ()
800 {
801 l = 0;
802 }
803
763 bool is_longer () 804 bool is_longer ()
764 { 805 {
765 return f & LINE_LONGER; 806 return f & LINE_LONGER;
766 } 807 }
767 808
… …
831// that are not representable in unicode, as well as characters 872// that are not representable in unicode, as well as characters
832// not fitting in the BMP. 873// not fitting in the BMP.
833struct compose_char 874struct compose_char
834{ 875{
835 unicode_t c1, c2; // any chars != NOCHAR are valid 876 unicode_t c1, c2; // any chars != NOCHAR are valid
877 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
878 compose_char () = default;
879 #endif
836 compose_char (unicode_t c1, unicode_t c2) 880 compose_char (unicode_t c1, unicode_t c2)
837 : c1(c1), c2(c2) 881 : c1(c1), c2(c2)
838 { } 882 { }
839}; 883};
840 884
… …
1034 scrollBar_t scrollBar; 1078 scrollBar_t scrollBar;
1035 uint8_t options[(Opt_count + 7) >> 3]; 1079 uint8_t options[(Opt_count + 7) >> 3];
1036 XSizeHints szHint; 1080 XSizeHints szHint;
1037 rxvt_color *pix_colors; 1081 rxvt_color *pix_colors;
1038 Cursor TermWin_cursor; /* cursor for vt window */ 1082 Cursor TermWin_cursor; /* cursor for vt window */
1083
1039 line_t *row_buf; // all lines, scrollback + terminal, circular 1084 line_t *row_buf; // all lines, scrollback + terminal, circular
1040 line_t *drawn_buf; // text on screen 1085 line_t *drawn_buf; // text on screen
1041 line_t *swap_buf; // lines for swap buffer 1086 line_t *swap_buf; // lines for swap buffer
1042 char *tabs; /* per location: 1 == tab-stop */ 1087 char *tabs; /* per location: 1 == tab-stop */
1043 screen_t screen; 1088 screen_t screen;
… …
1144#ifdef HAVE_BG_PIXMAP 1189#ifdef HAVE_BG_PIXMAP
1145 void bg_init (); 1190 void bg_init ();
1146 void bg_destroy (); 1191 void bg_destroy ();
1147 1192
1148 enum { 1193 enum {
1149 BG_IS_VALID = 1 << 0, 1194 BG_IS_VALID = 1 << 0,
1150 1195
1151 BG_TINT_SET = 1 << 5,
1152 BG_TINT_BITAND = 1 << 6,
1153
1154 BG_HAS_RENDER = 1 << 7,
1155 BG_HAS_RENDER_CONV = 1 << 8,
1156 BG_CLIENT_RENDER = 1 << 9,
1157
1158 BG_IS_TRANSPARENT = 1 << 10, 1196 BG_IS_TRANSPARENT = 1 << 1,
1159 BG_NEEDS_REFRESH = 1 << 11, 1197 BG_NEEDS_REFRESH = 1 << 2,
1160 }; 1198 };
1161 1199
1162 unsigned int bg_flags; 1200 uint8_t bg_flags;
1163 1201
1164# ifdef BG_IMAGE_FROM_FILE 1202# if BG_IMAGE_FROM_FILE
1165 rxvt_image bg_image; 1203 rxvt_image fimage;
1166 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1204 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1167 bool render_image (rxvt_image &image, bool transparent); 1205 bool render_image (rxvt_image &image);
1168# endif 1206# endif
1169 1207
1170# ifdef ENABLE_TRANSPARENCY 1208# if ENABLE_TRANSPARENCY
1171 Pixmap root_pixmap; /* current root pixmap set */ 1209 Pixmap root_pixmap; /* current root pixmap set */
1172 rxvt_color tint; 1210 image_effects root_effects;
1173 int shade;
1174 int h_blurRadius, v_blurRadius;
1175 1211
1176 void bg_set_transparent () 1212 void bg_set_transparent ()
1177 { 1213 {
1178 bg_flags |= BG_IS_TRANSPARENT; 1214 bg_flags |= BG_IS_TRANSPARENT;
1179 } 1215 }
1180 void bg_set_root_pixmap (); 1216 void bg_set_root_pixmap ();
1181 bool bg_set_tint (rxvt_color &new_tint); 1217 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 1218# endif
1219
1220 bool blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius);
1221 bool tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade);
1222 void tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade);
1190 1223
1191 ev_tstamp bg_valid_since; 1224 ev_tstamp bg_valid_since;
1192 1225
1193 Pixmap bg_pixmap; 1226 Pixmap bg_pixmap;
1194 unsigned int bg_pmap_width, bg_pmap_height; 1227 unsigned int bg_pmap_width, bg_pmap_height;
… …
1203 void bg_invalidate () 1236 void bg_invalidate ()
1204 { 1237 {
1205 bg_flags &= ~BG_IS_VALID; 1238 bg_flags &= ~BG_IS_VALID;
1206 } 1239 }
1207#endif 1240#endif
1208#ifdef HAVE_PIXBUF 1241#if HAVE_PIXBUF
1209 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1242 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1210 int src_x, int src_y, int dst_x, int dst_y, 1243 int src_x, int src_y, int dst_x, int dst_y,
1211 unsigned int width, unsigned int height); 1244 unsigned int width, unsigned int height, bool argb);
1212#endif 1245#endif
1213 1246
1214#if ENABLE_OVERLAY 1247#if ENABLE_OVERLAY
1215 overlay_base ov; 1248 overlay_base ov;
1216 1249
… …
1224 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1257 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1225#endif 1258#endif
1226 1259
1227 vector<void *> allocated; // free these memory blocks with free() 1260 vector<void *> allocated; // free these memory blocks with free()
1228 1261
1262 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1263
1229 char *locale; 1264 char *locale;
1230 char charsets[4]; 1265 char charsets[4];
1231 char *v_buffer; /* pointer to physical buffer */ 1266 char *v_buffer; /* pointer to physical buffer */
1232 unsigned int v_buflen; /* size of area to write */ 1267 unsigned int v_buflen; /* size of area to write */
1233 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1268 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1244 char *cmdbuf_ptr, *cmdbuf_endp; 1279 char *cmdbuf_ptr, *cmdbuf_endp;
1245 char cmdbuf_base[CBUFSIZ]; 1280 char cmdbuf_base[CBUFSIZ];
1246 1281
1247 ptytty *pty; 1282 ptytty *pty;
1248 1283
1249 rxvt_salloc *talloc; // text line allocator 1284 // chunk contains all line_t's as well as rend_t and text_t buffers
1250 rxvt_salloc *ralloc; // rend line allocator 1285 // for drawn_buf, swap_buf and row_buf, in this order
1286 void *chunk;
1287 size_t chunk_size;
1251 1288
1252 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1289 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1253 1290
1254#if ENABLE_FRILLS || ISO_14755 1291#if ENABLE_FRILLS || ISO_14755
1255 // ISO 14755 entry support 1292 // ISO 14755 entry support
1256 unicode_t iso14755buf; 1293 unicode_t iso14755buf;
1257 void commit_iso14755 (); 1294 void commit_iso14755 ();
1258# if ISO_14755 1295# if ISO_14755
1259 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1296 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1260 void iso14755_54 (int x, int y); 1297 void iso14755_54 (int x, int y);
1261# endif 1298# endif
1262#endif 1299#endif
1263 1300
1264 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1301 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1425 char *get_colorfgbg (); 1462 char *get_colorfgbg ();
1426 bool set_color (rxvt_color &color, const char *name); 1463 bool set_color (rxvt_color &color, const char *name);
1427 void alias_color (int dst, int src); 1464 void alias_color (int dst, int src);
1428 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1465 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1429 void get_window_origin (int &x, int &y); 1466 void get_window_origin (int &x, int &y);
1430 Pixmap get_pixmap_property (Atom property);
1431 1467
1432 // screen.C 1468 // screen.C
1433
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 1469
1462 int fgcolor_of (rend_t r) const NOTHROW 1470 int fgcolor_of (rend_t r) const NOTHROW
1463 { 1471 {
1464 int base = GET_BASEFG (r); 1472 int base = GET_BASEFG (r);
1465#ifndef NO_BRIGHTCOLOR 1473#ifndef NO_BRIGHTCOLOR
… …
1495 void set_option (uint8_t opt, bool set = true) NOTHROW; 1503 void set_option (uint8_t opt, bool set = true) NOTHROW;
1496 1504
1497 // modifies first argument(!) 1505 // modifies first argument(!)
1498 void tt_paste (char *data, unsigned int len) NOTHROW; 1506 void tt_paste (char *data, unsigned int len) NOTHROW;
1499 void paste (char *data, unsigned int len) NOTHROW; 1507 void paste (char *data, unsigned int len) NOTHROW;
1508 void scr_alloc () NOTHROW;
1500 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1509 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; 1510 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; 1511 void scr_kill_char (line_t &l, int col) const NOTHROW;
1503 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1512 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1504 void scr_reset (); 1513 void scr_reset ();
… …
1571 void selection_click (int clicks, int x, int y) NOTHROW; 1580 void selection_click (int clicks, int x, int y) NOTHROW;
1572 void selection_extend (int x, int y, int flag) NOTHROW; 1581 void selection_extend (int x, int y, int flag) NOTHROW;
1573 void selection_rotate (int x, int y) NOTHROW; 1582 void selection_rotate (int x, int y) NOTHROW;
1574 1583
1575 // xdefaults.C 1584 // xdefaults.C
1585 void rxvt_usage (int type);
1576 const char **get_options (int argc, const char *const *argv); 1586 const char **get_options (int argc, const char *const *argv);
1577 int parse_keysym (const char *str, const char *arg); 1587 int parse_keysym (const char *str, const char *arg);
1578 const char *x_resource (const char *name); 1588 const char *x_resource (const char *name);
1579 void extract_resources (); 1589 void extract_resources ();
1580 void extract_keysym_resources (); 1590 void extract_keysym_resources ();
1591 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1592 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1593 bool parse_bool_resource (const char *str)
1594 {
1595 return (!strcasecmp (str, "TRUE")
1596 || !strcasecmp (str, "YES")
1597 || !strcasecmp (str, "ON")
1598 || !strcasecmp (str, "1"));
1599 }
1581}; 1600};
1582 1601
1583#endif /* _RXVT_H_ */ 1602#endif /* _RXVT_H_ */
1584 1603

Diff Legend

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