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

Diff Legend

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