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.484 by sf-exg, Fri May 25 08:27:47 2012 UTC vs.
Revision 1.507 by sf-exg, Mon Jun 11 14:45:53 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{
235 int id;
236 unsigned short alpha; 265 unsigned short alpha;
237 uint8_t flags; 266 uint8_t flags;
238 unsigned int h_scale, v_scale; /* percents of the window size */ 267 unsigned int h_scale, v_scale; /* percents of the window size */
239 int h_align, v_align; /* percents of the window size: 268 int h_align, v_align; /* percents of the window size:
240 0 - left align, 50 - center, 100 - right */ 269 0 - left align, 50 - center, 100 - right */
241 270
242# ifdef HAVE_PIXBUF 271 bool is_size_sensitive ()
243 auto_ptr<GdkPixbuf> pixbuf;
244
245 int width ()
246 { 272 {
247 return gdk_pixbuf_get_width (pixbuf); 273 return (!(flags & IM_TILE)
274 || h_scale || v_scale
275 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
248 } 276 }
249 int height () 277
278 rxvt_img *img;
279
280 void destroy ()
250 { 281 {
251 return gdk_pixbuf_get_height (pixbuf); 282 delete img;
252 } 283 }
253# endif
254 284
255 rxvt_image (); 285 rxvt_image ();
256 bool set_file_geometry (const char *file); 286 void set_file_geometry (rxvt_screen *s, const char *file);
257 bool set_file (const char *file); 287 void set_file (rxvt_screen *s, const char *file);
258 bool set_geometry (const char *geom, bool update = false); 288 bool set_geometry (const char *geom, bool update = false);
259}; 289};
260# endif 290# endif
261#endif 291#endif
262 292
… …
309 ***************************************************************************** 339 *****************************************************************************
310 */ 340 */
311 341
312/* COLORTERM, TERM environment variables */ 342/* COLORTERM, TERM environment variables */
313#define COLORTERMENV "rxvt" 343#define COLORTERMENV "rxvt"
314#ifdef BG_IMAGE_FROM_FILE 344#if BG_IMAGE_FROM_FILE
315# define COLORTERMENVFULL COLORTERMENV "-xpm" 345# define COLORTERMENVFULL COLORTERMENV "-xpm"
316#else 346#else
317# define COLORTERMENVFULL COLORTERMENV 347# define COLORTERMENVFULL COLORTERMENV
318#endif 348#endif
319#ifndef TERMENV 349#ifndef TERMENV
… …
745{ 775{
746 text_t *t; // terminal the text 776 text_t *t; // terminal the text
747 rend_t *r; // rendition, uses RS_ flags 777 rend_t *r; // rendition, uses RS_ flags
748 tlen_t_ l; // length of each text line 778 tlen_t_ l; // length of each text line
749 uint32_t f; // flags 779 uint32_t f; // flags
780
781 bool valid ()
782 {
783 return l >= 0;
784 }
785
786 void alloc ()
787 {
788 l = 0;
789 }
750 790
751 bool is_longer () 791 bool is_longer ()
752 { 792 {
753 return f & LINE_LONGER; 793 return f & LINE_LONGER;
754 } 794 }
… …
1025 scrollBar_t scrollBar; 1065 scrollBar_t scrollBar;
1026 uint8_t options[(Opt_count + 7) >> 3]; 1066 uint8_t options[(Opt_count + 7) >> 3];
1027 XSizeHints szHint; 1067 XSizeHints szHint;
1028 rxvt_color *pix_colors; 1068 rxvt_color *pix_colors;
1029 Cursor TermWin_cursor; /* cursor for vt window */ 1069 Cursor TermWin_cursor; /* cursor for vt window */
1070
1030 line_t *row_buf; // all lines, scrollback + terminal, circular 1071 line_t *row_buf; // all lines, scrollback + terminal, circular
1031 line_t *drawn_buf; // text on screen 1072 line_t *drawn_buf; // text on screen
1032 line_t *swap_buf; // lines for swap buffer 1073 line_t *swap_buf; // lines for swap buffer
1033 char *tabs; /* per location: 1 == tab-stop */ 1074 char *tabs; /* per location: 1 == tab-stop */
1034 screen_t screen; 1075 screen_t screen;
… …
1139 enum { 1180 enum {
1140 BG_IS_VALID = 1 << 0, 1181 BG_IS_VALID = 1 << 0,
1141 1182
1142 BG_IS_TRANSPARENT = 1 << 1, 1183 BG_IS_TRANSPARENT = 1 << 1,
1143 BG_NEEDS_REFRESH = 1 << 2, 1184 BG_NEEDS_REFRESH = 1 << 2,
1144
1145 BG_HAS_RENDER = 1 << 3,
1146 BG_HAS_RENDER_CONV = 1 << 4,
1147 BG_CLIENT_RENDER = 1 << 5, 1185 BG_INHIBIT_RENDER = 1 << 3,
1148
1149 BG_TINT_SET = 1 << 6,
1150 BG_TINT_BITAND = 1 << 7,
1151 }; 1186 };
1152 1187
1153 uint8_t bg_flags; 1188 uint8_t bg_flags;
1154 1189
1155# ifdef BG_IMAGE_FROM_FILE 1190# if BG_IMAGE_FROM_FILE
1156 vector<rxvt_image> image_vec;
1157 rxvt_image *new_image () 1191 rxvt_image fimage;
1158 {
1159 image_vec.resize (image_vec.size () + 1);
1160 return &image_vec.back ();
1161 }
1162 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); 1192 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1163 bool render_image (rxvt_image &image); 1193 bool render_image (rxvt_image &image);
1164 void parse_image (int id, const char *type, const char *arg);
1165# endif 1194# endif
1166 1195
1167# ifdef ENABLE_TRANSPARENCY 1196# if ENABLE_TRANSPARENCY
1168 Pixmap root_pixmap; /* current root pixmap set */ 1197 rxvt_img *root_img;
1169 rxvt_color tint; 1198 image_effects root_effects;
1170 int shade;
1171 int h_blurRadius, v_blurRadius;
1172 1199
1173 void bg_set_transparent () 1200 void bg_set_transparent ()
1174 { 1201 {
1175 bg_flags |= BG_IS_TRANSPARENT; 1202 bg_flags |= BG_IS_TRANSPARENT;
1176 } 1203 }
1177 void bg_set_root_pixmap (); 1204 void bg_set_root_pixmap ();
1178 bool bg_set_tint (rxvt_color &new_tint); 1205 bool render_root_image ();
1179 bool bg_set_shade (const char *shade_str);
1180 bool bg_set_blur (const char *geom);
1181
1182 bool blur_pixmap (Pixmap pixmap, int width, int height);
1183 bool tint_pixmap (Pixmap pixmap, int width, int height);
1184 void tint_ximage (XImage *ximage);
1185 bool make_transparency_pixmap ();
1186# endif 1206# endif
1187 1207
1208 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1209
1188 ev_tstamp bg_valid_since; 1210 ev_tstamp bg_valid_since;
1189 1211
1190 Pixmap bg_pixmap; 1212 rxvt_img *bg_img;
1191 unsigned int bg_pmap_width, bg_pmap_height;
1192 1213
1193 int target_x;
1194 int target_y;
1195 bool bg_set_position (int x, int y);
1196 bool bg_window_size_sensitive (); 1214 bool bg_window_size_sensitive ();
1197 bool bg_window_position_sensitive (); 1215 bool bg_window_position_sensitive ();
1198 1216
1199 bool bg_render (); 1217 void bg_render ();
1200 void bg_invalidate () 1218 void bg_invalidate ()
1201 { 1219 {
1202 bg_flags &= ~BG_IS_VALID; 1220 bg_flags &= ~BG_IS_VALID;
1203 } 1221 }
1204#endif
1205#ifdef HAVE_PIXBUF
1206 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1207 int src_x, int src_y, int dst_x, int dst_y,
1208 unsigned int width, unsigned int height, bool argb);
1209#endif 1222#endif
1210 1223
1211#if ENABLE_OVERLAY 1224#if ENABLE_OVERLAY
1212 overlay_base ov; 1225 overlay_base ov;
1213 1226
… …
1221 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1234 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1222#endif 1235#endif
1223 1236
1224 vector<void *> allocated; // free these memory blocks with free() 1237 vector<void *> allocated; // free these memory blocks with free()
1225 1238
1239 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1240
1226 char *locale; 1241 char *locale;
1227 char charsets[4]; 1242 char charsets[4];
1228 char *v_buffer; /* pointer to physical buffer */ 1243 char *v_buffer; /* pointer to physical buffer */
1229 unsigned int v_buflen; /* size of area to write */ 1244 unsigned int v_buflen; /* size of area to write */
1230 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1245 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1241 char *cmdbuf_ptr, *cmdbuf_endp; 1256 char *cmdbuf_ptr, *cmdbuf_endp;
1242 char cmdbuf_base[CBUFSIZ]; 1257 char cmdbuf_base[CBUFSIZ];
1243 1258
1244 ptytty *pty; 1259 ptytty *pty;
1245 1260
1246 rxvt_salloc *talloc; // text line allocator 1261 // chunk contains all line_t's as well as rend_t and text_t buffers
1247 rxvt_salloc *ralloc; // rend line allocator 1262 // for drawn_buf, swap_buf and row_buf, in this order
1263 void *chunk;
1264 size_t chunk_size;
1248 1265
1249 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's 1266 static vector<rxvt_term *> termlist; // a vector of all running rxvt_term's
1250 1267
1251#if ENABLE_FRILLS || ISO_14755 1268#if ENABLE_FRILLS || ISO_14755
1252 // ISO 14755 entry support 1269 // ISO 14755 entry support
1253 unicode_t iso14755buf; 1270 unicode_t iso14755buf;
1254 void commit_iso14755 (); 1271 void commit_iso14755 ();
1255# if ISO_14755 1272# if ISO_14755
1256 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1273 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1);
1257 void iso14755_54 (int x, int y); 1274 void iso14755_54 (int x, int y);
1258# endif 1275# endif
1259#endif 1276#endif
1260 1277
1261 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1278 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1422 char *get_colorfgbg (); 1439 char *get_colorfgbg ();
1423 bool set_color (rxvt_color &color, const char *name); 1440 bool set_color (rxvt_color &color, const char *name);
1424 void alias_color (int dst, int src); 1441 void alias_color (int dst, int src);
1425 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1442 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1426 void get_window_origin (int &x, int &y); 1443 void get_window_origin (int &x, int &y);
1427 Pixmap get_pixmap_property (Atom property);
1428 1444
1429 // screen.C 1445 // screen.C
1430
1431 void lalloc (line_t &l) const
1432 {
1433 l.t = (text_t *)talloc->alloc ();
1434 l.r = (rend_t *)ralloc->alloc ();
1435 }
1436
1437#if 0
1438 void lfree (line_t &l)
1439 {
1440 talloc->free (l.t);
1441 ralloc->free (l.r);
1442 }
1443#endif
1444
1445 void lresize (line_t &l) const
1446 {
1447 if (!l.t)
1448 return;
1449
1450 l.t = (text_t *)talloc->alloc (l.t, prev_ncol * sizeof (text_t));
1451 l.r = (rend_t *)ralloc->alloc (l.r, prev_ncol * sizeof (rend_t));
1452
1453 l.l = min (l.l, ncol);
1454
1455 if (ncol > prev_ncol)
1456 scr_blank_line (l, prev_ncol, ncol - prev_ncol, DEFAULT_RSTYLE);
1457 }
1458 1446
1459 int fgcolor_of (rend_t r) const NOTHROW 1447 int fgcolor_of (rend_t r) const NOTHROW
1460 { 1448 {
1461 int base = GET_BASEFG (r); 1449 int base = GET_BASEFG (r);
1462#ifndef NO_BRIGHTCOLOR 1450#ifndef NO_BRIGHTCOLOR
… …
1492 void set_option (uint8_t opt, bool set = true) NOTHROW; 1480 void set_option (uint8_t opt, bool set = true) NOTHROW;
1493 1481
1494 // modifies first argument(!) 1482 // modifies first argument(!)
1495 void tt_paste (char *data, unsigned int len) NOTHROW; 1483 void tt_paste (char *data, unsigned int len) NOTHROW;
1496 void paste (char *data, unsigned int len) NOTHROW; 1484 void paste (char *data, unsigned int len) NOTHROW;
1485 void scr_alloc () NOTHROW;
1497 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW; 1486 void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
1498 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW; 1487 void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
1499 void scr_kill_char (line_t &l, int col) const NOTHROW; 1488 void scr_kill_char (line_t &l, int col) const NOTHROW;
1500 int scr_scroll_text (int row1, int row2, int count) NOTHROW; 1489 int scr_scroll_text (int row1, int row2, int count) NOTHROW;
1501 void scr_reset (); 1490 void scr_reset ();
… …
1568 void selection_click (int clicks, int x, int y) NOTHROW; 1557 void selection_click (int clicks, int x, int y) NOTHROW;
1569 void selection_extend (int x, int y, int flag) NOTHROW; 1558 void selection_extend (int x, int y, int flag) NOTHROW;
1570 void selection_rotate (int x, int y) NOTHROW; 1559 void selection_rotate (int x, int y) NOTHROW;
1571 1560
1572 // xdefaults.C 1561 // xdefaults.C
1562 void rxvt_usage (int type);
1573 const char **get_options (int argc, const char *const *argv); 1563 const char **get_options (int argc, const char *const *argv);
1574 int parse_keysym (const char *str, const char *arg); 1564 int parse_keysym (const char *str, const char *arg);
1575 const char *x_resource (const char *name); 1565 const char *x_resource (const char *name);
1576 void extract_resources (); 1566 void extract_resources ();
1577 void extract_keysym_resources (); 1567 void extract_keysym_resources ();

Diff Legend

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