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.494 by sf-exg, Fri Jun 1 15:49:49 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 "libptytty.h" 92#include "libptytty.h"
91 93
92#include "rxvtperl.h" 94#include "rxvtperl.h"
… …
239 bool set_tint (const rxvt_color &new_tint); 241 bool set_tint (const rxvt_color &new_tint);
240 bool set_shade (const char *shade_str); 242 bool set_shade (const char *shade_str);
241 bool set_blur (const char *geom); 243 bool set_blur (const char *geom);
242}; 244};
243 245
244# ifdef BG_IMAGE_FROM_FILE 246# if BG_IMAGE_FROM_FILE
245enum { 247enum {
246 IM_IS_SET = 1 << 0,
247 IM_IS_SIZE_SENSITIVE = 1 << 1, 248 IM_IS_SIZE_SENSITIVE = 1 << 1,
248 IM_KEEP_ASPECT = 1 << 2, 249 IM_KEEP_ASPECT = 1 << 2,
249 IM_ROOT_ALIGN = 1 << 3, 250 IM_ROOT_ALIGN = 1 << 3,
250 IM_TILE = 1 << 4, 251 IM_TILE = 1 << 4,
251 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE, 252 IM_GEOMETRY_FLAGS = IM_KEEP_ASPECT | IM_ROOT_ALIGN | IM_TILE,
… …
272 return (!(flags & IM_TILE) 273 return (!(flags & IM_TILE)
273 || h_scale || v_scale 274 || h_scale || v_scale
274 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align))); 275 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
275 } 276 }
276 277
277# ifdef HAVE_PIXBUF 278 rxvt_img *img;
278 GdkPixbuf *pixbuf;
279 279
280 void destroy () 280 void destroy ()
281 { 281 {
282 if (pixbuf) 282 delete img;
283 g_object_unref (pixbuf);
284 } 283 }
285 284
286 int width ()
287 {
288 return gdk_pixbuf_get_width (pixbuf);
289 }
290 int height ()
291 {
292 return gdk_pixbuf_get_height (pixbuf);
293 }
294# endif
295
296 rxvt_image (); 285 rxvt_image ();
297 bool set_file_geometry (const char *file); 286 void set_file_geometry (rxvt_screen *s, const char *file);
298 bool set_file (const char *file); 287 void set_file (rxvt_screen *s, const char *file);
299 bool set_geometry (const char *geom, bool update = false); 288 bool set_geometry (const char *geom, bool update = false);
300}; 289};
301# endif 290# endif
302#endif 291#endif
303 292
… …
350 ***************************************************************************** 339 *****************************************************************************
351 */ 340 */
352 341
353/* COLORTERM, TERM environment variables */ 342/* COLORTERM, TERM environment variables */
354#define COLORTERMENV "rxvt" 343#define COLORTERMENV "rxvt"
355#ifdef BG_IMAGE_FROM_FILE 344#if BG_IMAGE_FROM_FILE
356# define COLORTERMENVFULL COLORTERMENV "-xpm" 345# define COLORTERMENVFULL COLORTERMENV "-xpm"
357#else 346#else
358# define COLORTERMENVFULL COLORTERMENV 347# define COLORTERMENVFULL COLORTERMENV
359#endif 348#endif
360#ifndef TERMENV 349#ifndef TERMENV
… …
1191 enum { 1180 enum {
1192 BG_IS_VALID = 1 << 0, 1181 BG_IS_VALID = 1 << 0,
1193 1182
1194 BG_IS_TRANSPARENT = 1 << 1, 1183 BG_IS_TRANSPARENT = 1 << 1,
1195 BG_NEEDS_REFRESH = 1 << 2, 1184 BG_NEEDS_REFRESH = 1 << 2,
1196
1197 BG_HAS_RENDER = 1 << 3, 1185 BG_INHIBIT_RENDER = 1 << 3,
1198 BG_HAS_RENDER_CONV = 1 << 4,
1199 }; 1186 };
1200 1187
1201 uint8_t bg_flags; 1188 uint8_t bg_flags;
1202 1189
1203# ifdef BG_IMAGE_FROM_FILE 1190# if BG_IMAGE_FROM_FILE
1204 vector<rxvt_image> image_vec;
1205 rxvt_image *new_image () 1191 rxvt_image fimage;
1206 {
1207 image_vec.resize (image_vec.size () + 1);
1208 return &image_vec.back ();
1209 }
1210 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);
1211 bool render_image (rxvt_image &image); 1193 bool render_image (rxvt_image &image);
1212 void parse_image (int id, const char *type, const char *arg);
1213# endif 1194# endif
1214 1195
1215# ifdef ENABLE_TRANSPARENCY 1196# if ENABLE_TRANSPARENCY
1216 Pixmap root_pixmap; /* current root pixmap set */ 1197 rxvt_img *root_img;
1217 image_effects root_effects; 1198 image_effects root_effects;
1218 1199
1219 void bg_set_transparent () 1200 void bg_set_transparent ()
1220 { 1201 {
1221 bg_flags |= BG_IS_TRANSPARENT; 1202 bg_flags |= BG_IS_TRANSPARENT;
1222 } 1203 }
1223 void bg_set_root_pixmap (); 1204 void bg_set_root_pixmap ();
1224 bool render_root_image (); 1205 bool render_root_image ();
1225# endif 1206# endif
1226 1207
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); 1208 void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
1230 1209
1231 ev_tstamp bg_valid_since; 1210 ev_tstamp bg_valid_since;
1232 1211
1233 Pixmap bg_pixmap; 1212 rxvt_img *bg_img;
1234 unsigned int bg_pmap_width, bg_pmap_height;
1235 1213
1236 int target_x;
1237 int target_y;
1238 bool bg_set_position (int x, int y);
1239 bool bg_window_size_sensitive (); 1214 bool bg_window_size_sensitive ();
1240 bool bg_window_position_sensitive (); 1215 bool bg_window_position_sensitive ();
1241 1216
1242 bool bg_render (); 1217 void bg_render ();
1243 void bg_invalidate () 1218 void bg_invalidate ()
1244 { 1219 {
1245 bg_flags &= ~BG_IS_VALID; 1220 bg_flags &= ~BG_IS_VALID;
1246 } 1221 }
1247#endif
1248#ifdef HAVE_PIXBUF
1249 bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
1250 int src_x, int src_y, int dst_x, int dst_y,
1251 unsigned int width, unsigned int height, bool argb);
1252#endif 1222#endif
1253 1223
1254#if ENABLE_OVERLAY 1224#if ENABLE_OVERLAY
1255 overlay_base ov; 1225 overlay_base ov;
1256 1226
… …
1264 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;
1265#endif 1235#endif
1266 1236
1267 vector<void *> allocated; // free these memory blocks with free() 1237 vector<void *> allocated; // free these memory blocks with free()
1268 1238
1239 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1240
1269 char *locale; 1241 char *locale;
1270 char charsets[4]; 1242 char charsets[4];
1271 char *v_buffer; /* pointer to physical buffer */ 1243 char *v_buffer; /* pointer to physical buffer */
1272 unsigned int v_buflen; /* size of area to write */ 1244 unsigned int v_buflen; /* size of area to write */
1273 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1245 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1296#if ENABLE_FRILLS || ISO_14755 1268#if ENABLE_FRILLS || ISO_14755
1297 // ISO 14755 entry support 1269 // ISO 14755 entry support
1298 unicode_t iso14755buf; 1270 unicode_t iso14755buf;
1299 void commit_iso14755 (); 1271 void commit_iso14755 ();
1300# if ISO_14755 1272# if ISO_14755
1301 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);
1302 void iso14755_54 (int x, int y); 1274 void iso14755_54 (int x, int y);
1303# endif 1275# endif
1304#endif 1276#endif
1305 1277
1306 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;
… …
1467 char *get_colorfgbg (); 1439 char *get_colorfgbg ();
1468 bool set_color (rxvt_color &color, const char *name); 1440 bool set_color (rxvt_color &color, const char *name);
1469 void alias_color (int dst, int src); 1441 void alias_color (int dst, int src);
1470 void set_widthheight (unsigned int newwidth, unsigned int newheight); 1442 void set_widthheight (unsigned int newwidth, unsigned int newheight);
1471 void get_window_origin (int &x, int &y); 1443 void get_window_origin (int &x, int &y);
1472 Pixmap get_pixmap_property (Atom property);
1473 1444
1474 // screen.C 1445 // screen.C
1475 1446
1476 int fgcolor_of (rend_t r) const NOTHROW 1447 int fgcolor_of (rend_t r) const NOTHROW
1477 { 1448 {
… …
1586 void selection_click (int clicks, int x, int y) NOTHROW; 1557 void selection_click (int clicks, int x, int y) NOTHROW;
1587 void selection_extend (int x, int y, int flag) NOTHROW; 1558 void selection_extend (int x, int y, int flag) NOTHROW;
1588 void selection_rotate (int x, int y) NOTHROW; 1559 void selection_rotate (int x, int y) NOTHROW;
1589 1560
1590 // xdefaults.C 1561 // xdefaults.C
1562 void rxvt_usage (int type);
1591 const char **get_options (int argc, const char *const *argv); 1563 const char **get_options (int argc, const char *const *argv);
1592 int parse_keysym (const char *str, const char *arg); 1564 int parse_keysym (const char *str, const char *arg);
1593 const char *x_resource (const char *name); 1565 const char *x_resource (const char *name);
1594 void extract_resources (); 1566 void extract_resources ();
1595 void extract_keysym_resources (); 1567 void extract_keysym_resources ();

Diff Legend

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