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.479 by root, Sat May 19 02:23:07 2012 UTC vs.
Revision 1.510 by root, Fri Nov 30 07:02:12 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
… …
83#include <ecb.h> 84#include <ecb.h>
84#include "encoding.h" 85#include "encoding.h"
85#include "rxvtutil.h" 86#include "rxvtutil.h"
86#include "rxvtfont.h" 87#include "rxvtfont.h"
87#include "rxvttoolkit.h" 88#include "rxvttoolkit.h"
89#include "rxvtimg.h"
88#include "scrollbar.h" 90#include "scrollbar.h"
89#include "ev_cpp.h" 91#include "ev_cpp.h"
90#include "salloc.h"
91#include "libptytty.h" 92#include "libptytty.h"
92 93
93#include "rxvtperl.h" 94#include "rxvtperl.h"
94 95
95// 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
… …
148 149
149const char * rxvt_basename (const char *str) NOTHROW; 150const char * rxvt_basename (const char *str) NOTHROW;
150void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW; 151void rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW;
151void rxvt_log (const char *fmt,...) NOTHROW; 152void rxvt_log (const char *fmt,...) NOTHROW;
152void rxvt_warn (const char *fmt,...) NOTHROW; 153void rxvt_warn (const char *fmt,...) NOTHROW;
153void 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;
154void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn; 155void rxvt_exit_failure () THROW ((class rxvt_failure_exception)) ecb_noreturn ecb_cold;
155 156
156char * rxvt_strtrim (char *str) NOTHROW; 157char * rxvt_strtrim (char *str) NOTHROW;
157char ** rxvt_strsplit (char delim, const char *str) NOTHROW; 158char ** rxvt_strsplit (char delim, const char *str) NOTHROW;
158 159
159static inline void 160static inline void
… …
210 environ = orig_env; 211 environ = orig_env;
211 } 212 }
212}; 213};
213 214
214#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
215# ifdef BG_IMAGE_FROM_FILE 246# if BG_IMAGE_FROM_FILE
216enum { 247enum {
217 IM_IS_SET = 1 << 0,
218 IM_IS_SIZE_SENSITIVE = 1 << 1, 248 IM_IS_SIZE_SENSITIVE = 1 << 1,
219 IM_KEEP_ASPECT = 1 << 2, 249 IM_KEEP_ASPECT = 1 << 2,
220 IM_ROOT_ALIGN = 1 << 3, 250 IM_ROOT_ALIGN = 1 << 3,
221 IM_TILE = 1 << 4, 251 IM_TILE = 1 << 4,
222 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE, 252 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
… …
228 defaultScale = windowScale, 258 defaultScale = windowScale,
229 centerAlign = 50, 259 centerAlign = 50,
230 defaultAlign = centerAlign, 260 defaultAlign = centerAlign,
231}; 261};
232 262
233struct rxvt_image 263struct rxvt_image : image_effects
234{ 264{
265 unsigned short alpha;
235 uint8_t flags; 266 uint8_t flags;
236 unsigned int h_scale, v_scale; /* percents of the window size */ 267 unsigned int h_scale, v_scale; /* percents of the window size */
237 int h_align, v_align; /* percents of the window size: 268 int h_align, v_align; /* percents of the window size:
238 0 - left align, 50 - center, 100 - right */ 269 0 - left align, 50 - center, 100 - right */
239 270
240# ifdef HAVE_PIXBUF 271 bool is_size_sensitive ()
241 GdkPixbuf *pixbuf;
242# endif
243
244 ~rxvt_image ()
245 { 272 {
246# ifdef HAVE_PIXBUF 273 return (!(flags & IM_TILE)
247 if (pixbuf) 274 || h_scale || v_scale
248 g_object_unref (pixbuf); 275 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
249# endif
250 } 276 }
251 277
252 int width () 278 rxvt_img *img;
279
280 void destroy ()
253 { 281 {
254# ifdef HAVE_PIXBUF 282 delete img;
255 return gdk_pixbuf_get_width (pixbuf); 283 img = 0;
256# endif
257 } 284 }
258 int height () 285
259 { 286 rxvt_image ();
260# ifdef HAVE_PIXBUF 287 void set_file_geometry (rxvt_screen *s, const char *file);
261 return gdk_pixbuf_get_height (pixbuf); 288 void set_file (rxvt_screen *s, const char *file);
262# endif
263 }
264 bool set_file (const char *file);
265 bool set_geometry (const char *geom, bool update = false); 289 bool set_geometry (const char *geom, bool update = false);
266 void set_default_geometry ()
267 {
268 h_scale = v_scale = defaultScale;
269 h_align = v_align = defaultAlign;
270 flags |= IM_IS_SIZE_SENSITIVE;
271 }
272}; 290};
273# endif 291# endif
274#endif 292#endif
275 293
276/* 294/*
… …
322 ***************************************************************************** 340 *****************************************************************************
323 */ 341 */
324 342
325/* COLORTERM, TERM environment variables */ 343/* COLORTERM, TERM environment variables */
326#define COLORTERMENV "rxvt" 344#define COLORTERMENV "rxvt"
327#ifdef BG_IMAGE_FROM_FILE 345#if BG_IMAGE_FROM_FILE
328# define COLORTERMENVFULL COLORTERMENV "-xpm" 346# define COLORTERMENVFULL COLORTERMENV "-xpm"
329#else 347#else
330# define COLORTERMENVFULL COLORTERMENV 348# define COLORTERMENVFULL COLORTERMENV
331#endif 349#endif
332#ifndef TERMENV 350#ifndef TERMENV
… …
758{ 776{
759 text_t *t; // terminal the text 777 text_t *t; // terminal the text
760 rend_t *r; // rendition, uses RS_ flags 778 rend_t *r; // rendition, uses RS_ flags
761 tlen_t_ l; // length of each text line 779 tlen_t_ l; // length of each text line
762 uint32_t f; // flags 780 uint32_t f; // flags
781
782 bool valid ()
783 {
784 return l >= 0;
785 }
786
787 void alloc ()
788 {
789 l = 0;
790 }
763 791
764 bool is_longer () 792 bool is_longer ()
765 { 793 {
766 return f & LINE_LONGER; 794 return f & LINE_LONGER;
767 } 795 }
… …
1038 scrollBar_t scrollBar; 1066 scrollBar_t scrollBar;
1039 uint8_t options[(Opt_count + 7) >> 3]; 1067 uint8_t options[(Opt_count + 7) >> 3];
1040 XSizeHints szHint; 1068 XSizeHints szHint;
1041 rxvt_color *pix_colors; 1069 rxvt_color *pix_colors;
1042 Cursor TermWin_cursor; /* cursor for vt window */ 1070 Cursor TermWin_cursor; /* cursor for vt window */
1071
1043 line_t *row_buf; // all lines, scrollback + terminal, circular 1072 line_t *row_buf; // all lines, scrollback + terminal, circular
1044 line_t *drawn_buf; // text on screen 1073 line_t *drawn_buf; // text on screen
1045 line_t *swap_buf; // lines for swap buffer 1074 line_t *swap_buf; // lines for swap buffer
1046 char *tabs; /* per location: 1 == tab-stop */ 1075 char *tabs; /* per location: 1 == tab-stop */
1047 screen_t screen; 1076 screen_t screen;
… …
1152 enum { 1181 enum {
1153 BG_IS_VALID = 1 << 0, 1182 BG_IS_VALID = 1 << 0,
1154 1183
1155 BG_IS_TRANSPARENT = 1 << 1, 1184 BG_IS_TRANSPARENT = 1 << 1,
1156 BG_NEEDS_REFRESH = 1 << 2, 1185 BG_NEEDS_REFRESH = 1 << 2,
1157
1158 BG_HAS_RENDER = 1 << 3,
1159 BG_HAS_RENDER_CONV = 1 << 4,
1160 BG_CLIENT_RENDER = 1 << 5, 1186 BG_INHIBIT_RENDER = 1 << 3,
1161
1162 BG_TINT_SET = 1 << 6,
1163 BG_TINT_BITAND = 1 << 7,
1164 }; 1187 };
1165 1188
1166 uint8_t bg_flags; 1189 uint8_t bg_flags;
1167 1190
1168# ifdef BG_IMAGE_FROM_FILE 1191# if BG_IMAGE_FROM_FILE
1169 rxvt_image bg_image; 1192 rxvt_image fimage;
1170 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1193 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1171 bool render_image (rxvt_image &image); 1194 bool render_image (rxvt_image &image);
1172# endif 1195# endif
1173 1196
1174# ifdef ENABLE_TRANSPARENCY 1197# if ENABLE_TRANSPARENCY
1175 Pixmap root_pixmap; /* current root pixmap set */ 1198 rxvt_img *root_img;
1176 rxvt_color tint; 1199 image_effects root_effects;
1177 int shade;
1178 int h_blurRadius, v_blurRadius;
1179 1200
1180 void bg_set_transparent () 1201 void bg_set_transparent ()
1181 { 1202 {
1182 bg_flags |= BG_IS_TRANSPARENT; 1203 bg_flags |= BG_IS_TRANSPARENT;
1183 } 1204 }
1184 void bg_set_root_pixmap (); 1205 void bg_set_root_pixmap ();
1185 bool bg_set_tint (rxvt_color &new_tint); 1206 bool render_root_image ();
1186 bool bg_set_shade (const char *shade_str);
1187 bool bg_set_blur (const char *geom);
1188
1189 bool blur_pixmap (Pixmap pixmap, int width, int height);
1190 bool tint_pixmap (Pixmap pixmap, int width, int height);
1191 void tint_ximage (XImage *ximage);
1192 bool make_transparency_pixmap ();
1193# endif 1207# endif
1194 1208
1209 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1210
1195 ev_tstamp bg_valid_since; 1211 ev_tstamp bg_valid_since;
1196 1212
1197 Pixmap bg_pixmap; 1213 rxvt_img *bg_img;
1198 unsigned int bg_pmap_width, bg_pmap_height;
1199 1214
1200 int target_x;
1201 int target_y;
1202 bool bg_set_position (int x, int y);
1203 bool bg_window_size_sensitive (); 1215 bool bg_window_size_sensitive ();
1204 bool bg_window_position_sensitive (); 1216 bool bg_window_position_sensitive ();
1205 1217
1206 bool bg_render (); 1218 void bg_render ();
1207 void bg_invalidate () 1219 void bg_invalidate ()
1208 { 1220 {
1209 bg_flags &= ~BG_IS_VALID; 1221 bg_flags &= ~BG_IS_VALID;
1210 } 1222 }
1211#endif
1212#ifdef HAVE_PIXBUF
1213 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1214 int src_x, int src_y, int dst_x, int dst_y,
1215 unsigned int width, unsigned int height);
1216#endif 1223#endif
1217 1224
1218#if ENABLE_OVERLAY 1225#if ENABLE_OVERLAY
1219 overlay_base ov; 1226 overlay_base ov;
1220 1227
… …
1228 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1235 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1229#endif 1236#endif
1230 1237
1231 vector<void *> allocated; // free these memory blocks with free() 1238 vector<void *> allocated; // free these memory blocks with free()
1232 1239
1240 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1241
1233 char *locale; 1242 char *locale;
1234 char charsets[4]; 1243 char charsets[4];
1235 char *v_buffer; /* pointer to physical buffer */ 1244 char *v_buffer; /* pointer to physical buffer */
1236 unsigned int v_buflen; /* size of area to write */ 1245 unsigned int v_buflen; /* size of area to write */
1237 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1246 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1248 char *cmdbuf_ptr, *cmdbuf_endp; 1257 char *cmdbuf_ptr, *cmdbuf_endp;
1249 char cmdbuf_base[CBUFSIZ]; 1258 char cmdbuf_base[CBUFSIZ];
1250 1259
1251 ptytty *pty; 1260 ptytty *pty;
1252 1261
1253 rxvt_salloc *talloc; // text line allocator 1262 // chunk contains all line_t's as well as rend_t and text_t buffers
1254 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;
1255 1266
1256 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
1257 1268
1258#if ENABLE_FRILLS || ISO_14755 1269#if ENABLE_FRILLS || ISO_14755
1259 // ISO 14755 entry support 1270 // ISO 14755 entry support
1260 unicode_t iso14755buf; 1271 unicode_t iso14755buf;
1261 void commit_iso14755 (); 1272 void commit_iso14755 ();
1262# if ISO_14755 1273# if ISO_14755
1263 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1274 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1264 void iso14755_54 (int x, int y); 1275 void iso14755_54 (int x, int y);
1265# endif 1276# endif
1266#endif 1277#endif
1267 1278
1268 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1279 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1429 char *get_colorfgbg (); 1440 char *get_colorfgbg ();
1430 bool set_color (rxvt_color &color, const char *name); 1441 bool set_color (rxvt_color &color, const char *name);
1431 void alias_color (int dst, int src); 1442 void alias_color (int dst, int src);
1432 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1443 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1433 void get_window_origin (int &x, int &y); 1444 void get_window_origin (int &x, int &y);
1434 Pixmap get_pixmap_property (Atom property);
1435 1445
1436 // screen.C 1446 // screen.C
1437 1447
1438 void lalloc (line_t &l) const 1448 bool option (uint8_t opt) const NOTHROW
1439 { 1449 {
1440 l.t = (text_t *)talloc->alloc (); 1450 return options[opt >> 3] & (1 << (opt & 7));
1441 l.r = (rend_t *)ralloc->alloc ();
1442 } 1451 }
1443 1452
1444#if 0 1453 void set_option (uint8_t opt, bool set = true) NOTHROW;
1445 void lfree (line_t &l)
1446 {
1447 talloc->free (l.t);
1448 ralloc->free (l.r);
1449 }
1450#endif
1451
1452 void lresize (line_t &l) const
1453 {
1454 if (!l.t)
1455 return;
1456
1457 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1458 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1459
1460 l.l = min (l.l, ncol);
1461
1462 if (ncol > prev_ncol)
1463 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1464 }
1465 1454
1466 int fgcolor_of (rend_t r) const NOTHROW 1455 int fgcolor_of (rend_t r) const NOTHROW
1467 { 1456 {
1468 int base = GET_BASEFG (r); 1457 int base = GET_BASEFG (r);
1469#ifndef NO_BRIGHTCOLOR 1458#ifndef NO_BRIGHTCOLOR
… …
1489 base += minBrightCOLOR - minCOLOR; 1478 base += minBrightCOLOR - minCOLOR;
1490#endif 1479#endif
1491 return base; 1480 return base;
1492 } 1481 }
1493 1482
1494 bool option (uint8_t opt) const NOTHROW
1495 {
1496 return options[opt >> 3] & (1 << (opt & 7));
1497 }
1498
1499 void set_option (uint8_t opt, bool set = true) NOTHROW;
1500
1501 // modifies first argument(!) 1483 // modifies first argument(!)
1502 void tt_paste (char *data, unsigned int len) NOTHROW; 1484 void tt_paste (char *data, unsigned int len) NOTHROW;
1503 void paste (char *data, unsigned int len) NOTHROW; 1485 void paste (char *data, unsigned int len) NOTHROW;
1486 void scr_alloc () NOTHROW;
1504 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1487 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1505 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1488 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1506 void scr_kill_char (line_t &l, int col) const NOTHROW; 1489 void scr_kill_char (line_t &l, int col) const NOTHROW;
1507 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1490 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1508 void scr_reset (); 1491 void scr_reset ();
… …
1575 void selection_click (int clicks, int x, int y) NOTHROW; 1558 void selection_click (int clicks, int x, int y) NOTHROW;
1576 void selection_extend (int x, int y, int flag) NOTHROW; 1559 void selection_extend (int x, int y, int flag) NOTHROW;
1577 void selection_rotate (int x, int y) NOTHROW; 1560 void selection_rotate (int x, int y) NOTHROW;
1578 1561
1579 // xdefaults.C 1562 // xdefaults.C
1563 void rxvt_usage (int type);
1580 const char **get_options (int argc, const char *const *argv); 1564 const char **get_options (int argc, const char *const *argv);
1581 int parse_keysym (const char *str, const char *arg); 1565 int parse_keysym (const char *str, const char *arg);
1582 const char *x_resource (const char *name); 1566 const char *x_resource (const char *name);
1583 void extract_resources (); 1567 void extract_resources ();
1584 void extract_keysym_resources (); 1568 void extract_keysym_resources ();

Diff Legend

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