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.466 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.490 by sf-exg, Wed May 30 21:20:05 2012 UTC

… …
23#if HAVE_WCHAR_H 23#if HAVE_WCHAR_H
24# include <wchar.h> 24# include <wchar.h>
25#else 25#else
26// stdlib.h might provide it 26// stdlib.h might provide it
27#endif 27#endif
28
29using namespace std;
30 28
31// 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...
32 30
33extern "C" { 31extern "C" {
34#include <X11/Xlib.h> 32#include <X11/Xlib.h>
… …
72#include <X11/cursorfont.h> 70#include <X11/cursorfont.h>
73#include <X11/keysym.h> 71#include <X11/keysym.h>
74#include <X11/keysymdef.h> 72#include <X11/keysymdef.h>
75#include <X11/Xatom.h> 73#include <X11/Xatom.h>
76 74
77#ifdef HAVE_AFTERIMAGE
78# include <afterimage.h>
79# undef min
80# undef max
81#endif
82
83#ifdef HAVE_PIXBUF 75#ifdef HAVE_PIXBUF
84# include <gdk-pixbuf/gdk-pixbuf.h> 76# include <gdk-pixbuf/gdk-pixbuf.h>
85#endif 77#endif
86 78
87#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY) 79#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
88# define HAVE_BG_PIXMAP 1 80# define HAVE_BG_PIXMAP 1
89#endif 81#endif
90 82
83#include <ecb.h>
91#include "encoding.h" 84#include "encoding.h"
92#include "rxvtutil.h" 85#include "rxvtutil.h"
93#include "rxvtfont.h" 86#include "rxvtfont.h"
94#include "rxvttoolkit.h" 87#include "rxvttoolkit.h"
95#include "scrollbar.h" 88#include "scrollbar.h"
96#include "ev_cpp.h" 89#include "ev_cpp.h"
97#include "salloc.h"
98#include "libptytty.h" 90#include "libptytty.h"
99 91
100#include "rxvtperl.h" 92#include "rxvtperl.h"
101 93
102// 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
… …
155 147
156const char * rxvt_basename (const char *str) NOTHROW; 148const char * rxvt_basename (const char *str) NOTHROW;
157void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 149void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
158void rxvt_log (const char *fmt,...) NOTHROW; 150void rxvt_log (const char *fmt,...) NOTHROW;
159void rxvt_warn (const char *fmt,...) NOTHROW; 151void rxvt_warn (const char *fmt,...) NOTHROW;
160void 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;
161void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; 153void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
162 154
163char * rxvt_strtrim (char *str) NOTHROW; 155char * rxvt_strtrim (char *str) NOTHROW;
164char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 156char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
165 157
166static inline void 158static inline void
… …
215 ~localise_env () 207 ~localise_env ()
216 { 208 {
217 environ = orig_env; 209 environ = orig_env;
218 } 210 }
219}; 211};
212
213#ifdef HAVE_BG_PIXMAP
214# ifdef BG_IMAGE_FROM_FILE
215enum {
216 IM_IS_SET = 1 << 0,
217 IM_IS_SIZE_SENSITIVE = 1 << 1,
218 IM_KEEP_ASPECT = 1 << 2,
219 IM_ROOT_ALIGN = 1 << 3,
220 IM_TILE = 1 << 4,
221 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
222};
223
224enum {
225 noScale = 0,
226 windowScale = 100,
227 defaultScale = windowScale,
228 centerAlign = 50,
229 defaultAlign = centerAlign,
230};
231
232struct rxvt_image
233{
234 unsigned short alpha;
235 uint8_t flags;
236 unsigned int h_scale, v_scale; /* percents of the window size */
237 int h_align, v_align; /* percents of the window size:
238 0 - left align, 50 - center, 100 - right */
239
240 bool is_size_sensitive ()
241 {
242 return (!(flags & IM_TILE)
243 || h_scale || v_scale
244 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
245 }
246
247# ifdef HAVE_PIXBUF
248 GdkPixbuf *pixbuf;
249
250 void destroy ()
251 {
252 if (pixbuf)
253 g_object_unref (pixbuf);
254 }
255
256 int width ()
257 {
258 return gdk_pixbuf_get_width (pixbuf);
259 }
260 int height ()
261 {
262 return gdk_pixbuf_get_height (pixbuf);
263 }
264# endif
265
266 rxvt_image ();
267 bool set_file_geometry (const char *file);
268 bool set_file (const char *file);
269 bool set_geometry (const char *geom, bool update = false);
270};
271# endif
272#endif
220 273
221/* 274/*
222 ***************************************************************************** 275 *****************************************************************************
223 * STRUCTURES AND TYPEDEFS 276 * STRUCTURES AND TYPEDEFS
224 ***************************************************************************** 277 *****************************************************************************
… …
704 text_t *t; // terminal the text 757 text_t *t; // terminal the text
705 rend_t *r; // rendition, uses RS_ flags 758 rend_t *r; // rendition, uses RS_ flags
706 tlen_t_ l; // length of each text line 759 tlen_t_ l; // length of each text line
707 uint32_t f; // flags 760 uint32_t f; // flags
708 761
762 bool valid ()
763 {
764 return l >= 0;
765 }
766
767 void alloc ()
768 {
769 l = 0;
770 }
771
709 bool is_longer () 772 bool is_longer ()
710 { 773 {
711 return f & LINE_LONGER; 774 return f & LINE_LONGER;
712 } 775 }
713 776
… …
777// that are not representable in unicode, as well as characters 840// that are not representable in unicode, as well as characters
778// not fitting in the BMP. 841// not fitting in the BMP.
779struct compose_char 842struct compose_char
780{ 843{
781 unicode_t c1, c2; // any chars != NOCHAR are valid 844 unicode_t c1, c2; // any chars != NOCHAR are valid
845 #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
846 compose_char () = default;
847 #endif
782 compose_char (unicode_t c1, unicode_t c2) 848 compose_char (unicode_t c1, unicode_t c2)
783 : c1(c1), c2(c2) 849 : c1(c1), c2(c2)
784 { } 850 { }
785}; 851};
786 852
… …
980 scrollBar_t scrollBar; 1046 scrollBar_t scrollBar;
981 uint8_t options[(Opt_count + 7) >> 3]; 1047 uint8_t options[(Opt_count + 7) >> 3];
982 XSizeHints szHint; 1048 XSizeHints szHint;
983 rxvt_color *pix_colors; 1049 rxvt_color *pix_colors;
984 Cursor TermWin_cursor; /* cursor for vt window */ 1050 Cursor TermWin_cursor; /* cursor for vt window */
1051
985 line_t *row_buf; // all lines, scrollback + terminal, circular 1052 line_t *row_buf; // all lines, scrollback + terminal, circular
986 line_t *drawn_buf; // text on screen 1053 line_t *drawn_buf; // text on screen
987 line_t *swap_buf; // lines for swap buffer 1054 line_t *swap_buf; // lines for swap buffer
988 char *tabs; /* per location: 1 == tab-stop */ 1055 char *tabs; /* per location: 1 == tab-stop */
989 screen_t screen; 1056 screen_t screen;
… …
1090#ifdef HAVE_BG_PIXMAP 1157#ifdef HAVE_BG_PIXMAP
1091 void bg_init (); 1158 void bg_init ();
1092 void bg_destroy (); 1159 void bg_destroy ();
1093 1160
1094 enum { 1161 enum {
1095 //subset returned by make_transparency_pixmap
1096 BG_IS_VALID = 1 << 0, 1162 BG_IS_VALID = 1 << 0,
1097 BG_NEEDS_TINT = 1 << 1,
1098 BG_NEEDS_BLUR = 1 << 2,
1099 1163
1100 BG_EFFECTS_FLAGS = BG_NEEDS_TINT | BG_NEEDS_BLUR,
1101
1102 BG_KEEP_ASPECT = 1 << 3,
1103 BG_ROOT_ALIGN = 1 << 4,
1104 BG_TILE = 1 << 14,
1105 BG_GEOMETRY_FLAGS = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
1106
1107 BG_TINT_SET = 1 << 5,
1108 BG_TINT_BITAND = 1 << 6,
1109 BG_TINT_FLAGS = BG_NEEDS_TINT | BG_TINT_BITAND,
1110
1111 BG_HAS_RENDER = 1 << 7,
1112 BG_HAS_RENDER_CONV = 1 << 8,
1113 BG_CLIENT_RENDER = 1 << 9,
1114
1115 BG_IS_TRANSPARENT = 1 << 10, 1164 BG_IS_TRANSPARENT = 1 << 1,
1116 BG_NEEDS_REFRESH = 1 << 11, 1165 BG_NEEDS_REFRESH = 1 << 2,
1117 BG_IS_SIZE_SENSITIVE = 1 << 12, 1166
1118 BG_IS_FROM_FILE = 1 << 13, 1167 BG_HAS_RENDER = 1 << 3,
1168 BG_HAS_RENDER_CONV = 1 << 4,
1169 BG_CLIENT_RENDER = 1 << 5,
1170
1171 BG_TINT_SET = 1 << 6,
1172 BG_TINT_BITAND = 1 << 7,
1119 }; 1173 };
1120 1174
1121 unsigned int bg_flags; 1175 uint8_t bg_flags;
1122 1176
1123# ifdef BG_IMAGE_FROM_FILE 1177# ifdef BG_IMAGE_FROM_FILE
1124 void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y); 1178 vector<rxvt_image> image_vec;
1125 bool render_image (unsigned long tr_flags); 1179 rxvt_image *new_image ()
1126
1127 enum {
1128 noScale = 0,
1129 windowScale = 100,
1130 defaultScale = windowScale,
1131 centerAlign = 50,
1132 defaultAlign = centerAlign,
1133 };
1134
1135 unsigned int h_scale, v_scale; /* percents of the window size */
1136 int h_align, v_align; /* percents of the window size:
1137 0 - left align, 50 - center, 100 - right */
1138
1139 bool bg_set_geometry (const char *geom, bool update = false);
1140 void bg_set_default_geometry ()
1141 { 1180 {
1142 h_scale = v_scale = defaultScale; 1181 image_vec.resize (image_vec.size () + 1);
1143 h_align = v_align = defaultAlign; 1182 return &image_vec.back ();
1144 } 1183 }
1145 1184 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1146 bool bg_set_file (const char *file); 1185 bool render_image (rxvt_image &image);
1186 void parse_image (int id, const char *type, const char *arg);
1147# endif 1187# endif
1148 1188
1149# ifdef ENABLE_TRANSPARENCY 1189# ifdef ENABLE_TRANSPARENCY
1150 Pixmap root_pixmap; /* current root pixmap set */ 1190 Pixmap root_pixmap; /* current root pixmap set */
1151 rxvt_color tint; 1191 rxvt_color tint;
1152 int shade; 1192 int shade;
1153 int h_blurRadius, v_blurRadius; 1193 int h_blurRadius, v_blurRadius;
1154 1194
1155 bool bg_set_transparent (); 1195 void bg_set_transparent ()
1196 {
1197 bg_flags |= BG_IS_TRANSPARENT;
1198 }
1156 void bg_set_root_pixmap (); 1199 void bg_set_root_pixmap ();
1157 void set_tint_shade_flags ();
1158 bool bg_set_tint (rxvt_color &new_tint); 1200 bool bg_set_tint (rxvt_color &new_tint);
1159 bool bg_set_shade (const char *shade_str); 1201 bool bg_set_shade (const char *shade_str);
1160 bool bg_set_blur (const char *geom); 1202 bool bg_set_blur (const char *geom);
1161 1203
1162 bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth); 1204 bool blur_pixmap (Pixmap pixmap, int width, int height);
1163 bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height); 1205 bool tint_pixmap (Pixmap pixmap, int width, int height);
1164 void tint_ximage (Visual *visual, XImage *ximage); 1206 void tint_ximage (XImage *ximage);
1165 unsigned long make_transparency_pixmap (); 1207 bool make_transparency_pixmap ();
1166# endif 1208# endif
1167 1209
1168 ev_tstamp bg_valid_since; 1210 ev_tstamp bg_valid_since;
1169 1211
1170 Pixmap bg_pixmap; 1212 Pixmap bg_pixmap;
… …
1180 void bg_invalidate () 1222 void bg_invalidate ()
1181 { 1223 {
1182 bg_flags &= ~BG_IS_VALID; 1224 bg_flags &= ~BG_IS_VALID;
1183 } 1225 }
1184#endif 1226#endif
1185#ifdef HAVE_AFTERIMAGE
1186 ASImage *original_asim;
1187 ASVisual *asv;
1188 ASImageManager *asimman;
1189
1190 void init_asv ()
1191 {
1192 if (!asv)
1193 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
1194 }
1195#endif
1196#ifdef HAVE_PIXBUF 1227#ifdef HAVE_PIXBUF
1197 GdkPixbuf *pixbuf;
1198 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 1228 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1199 int src_x, int src_y, int dst_x, int dst_y, 1229 int src_x, int src_y, int dst_x, int dst_y,
1200 unsigned int width, unsigned int height); 1230 unsigned int width, unsigned int height, bool argb);
1201#endif 1231#endif
1202 1232
1203#if ENABLE_OVERLAY 1233#if ENABLE_OVERLAY
1204 overlay_base ov; 1234 overlay_base ov;
1205 1235
… …
1233 char *cmdbuf_ptr, *cmdbuf_endp; 1263 char *cmdbuf_ptr, *cmdbuf_endp;
1234 char cmdbuf_base[CBUFSIZ]; 1264 char cmdbuf_base[CBUFSIZ];
1235 1265
1236 ptytty *pty; 1266 ptytty *pty;
1237 1267
1238 rxvt_salloc *talloc; // text line allocator 1268 // chunk contains all line_t's as well as rend_t and text_t buffers
1239 rxvt_salloc *ralloc; // rend line allocator 1269 // for drawn_buf, swap_buf and row_buf, in this order
1270 void *chunk;
1271 size_t chunk_size;
1240 1272
1241 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1273 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1242 1274
1243#if ENABLE_FRILLS || ISO_14755 1275#if ENABLE_FRILLS || ISO_14755
1244 // ISO 14755 entry support 1276 // ISO 14755 entry support
… …
1281 void cmdbuf_append (const char *str, size_t count); 1313 void cmdbuf_append (const char *str, size_t count);
1282 bool pty_fill (); 1314 bool pty_fill ();
1283 void pty_cb (ev::io &w, int revents); ev::io pty_ev; 1315 void pty_cb (ev::io &w, int revents); ev::io pty_ev;
1284 1316
1285#ifdef CURSOR_BLINK 1317#ifdef CURSOR_BLINK
1318 void cursor_blink_reset ();
1286 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev; 1319 void cursor_blink_cb (ev::timer &w, int revents); ev::timer cursor_blink_ev;
1287#endif 1320#endif
1288#ifdef TEXT_BLINK 1321#ifdef TEXT_BLINK
1289 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev; 1322 void text_blink_cb (ev::timer &w, int revents); ev::timer text_blink_ev;
1290#endif 1323#endif
… …
1417 void get_window_origin (int &x, int &y); 1450 void get_window_origin (int &x, int &y);
1418 Pixmap get_pixmap_property (Atom property); 1451 Pixmap get_pixmap_property (Atom property);
1419 1452
1420 // screen.C 1453 // screen.C
1421 1454
1422 void lalloc (line_t &l) const
1423 {
1424 l.t = (text_t *)talloc->alloc ();
1425 l.r = (rend_t *)ralloc->alloc ();
1426 }
1427
1428#if 0
1429 void lfree (line_t &l)
1430 {
1431 talloc->free (l.t);
1432 ralloc->free (l.r);
1433 }
1434#endif
1435
1436 void lresize (line_t &l) const
1437 {
1438 if (!l.t)
1439 return;
1440
1441 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1442 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1443
1444 l.l = min (l.l, ncol);
1445
1446 if (ncol > prev_ncol)
1447 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1448 }
1449
1450 int fgcolor_of (rend_t r) const NOTHROW 1455 int fgcolor_of (rend_t r) const NOTHROW
1451 { 1456 {
1452 int base = GET_BASEFG (r); 1457 int base = GET_BASEFG (r);
1453#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
1454 if (r & RS_Bold 1459 if (r & RS_Bold
… …
1483 void set_option (uint8_t opt, bool set = true) NOTHROW; 1488 void set_option (uint8_t opt, bool set = true) NOTHROW;
1484 1489
1485 // modifies first argument(!) 1490 // modifies first argument(!)
1486 void tt_paste (char *data, unsigned int len) NOTHROW; 1491 void tt_paste (char *data, unsigned int len) NOTHROW;
1487 void paste (char *data, unsigned int len) NOTHROW; 1492 void paste (char *data, unsigned int len) NOTHROW;
1493 void scr_alloc () NOTHROW;
1488 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1494 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1489 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1495 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1490 void scr_kill_char (line_t &l, int col) const NOTHROW; 1496 void scr_kill_char (line_t &l, int col) const NOTHROW;
1491 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1497 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1492 void scr_reset (); 1498 void scr_reset ();
… …
1564 const char **get_options (int argc, const char *const *argv); 1570 const char **get_options (int argc, const char *const *argv);
1565 int parse_keysym (const char *str, const char *arg); 1571 int parse_keysym (const char *str, const char *arg);
1566 const char *x_resource (const char *name); 1572 const char *x_resource (const char *name);
1567 void extract_resources (); 1573 void extract_resources ();
1568 void extract_keysym_resources (); 1574 void extract_keysym_resources ();
1575 void find_resources (const char *n_prefix, const char *c_prefix, int mode,
1576 Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
1577 bool parse_bool_resource (const char *str)
1578 {
1579 return (!strcasecmp (str, "TRUE")
1580 || !strcasecmp (str, "YES")
1581 || !strcasecmp (str, "ON")
1582 || !strcasecmp (str, "1"));
1583 }
1569}; 1584};
1570 1585
1571#endif /* _RXVT_H_ */ 1586#endif /* _RXVT_H_ */
1572 1587

Diff Legend

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