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.498 by root, Mon Jun 4 15:18:52 2012 UTC vs.
Revision 1.502 by sf-exg, Wed Jun 6 22:00:20 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
… …
1197 }; 1198 };
1198 1199
1199 uint8_t bg_flags; 1200 uint8_t bg_flags;
1200 1201
1201# if BG_IMAGE_FROM_FILE 1202# if BG_IMAGE_FROM_FILE
1202 vector<rxvt_image> image_vec;
1203 rxvt_image *new_image () 1203 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); 1204 void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y);
1209 bool render_image (rxvt_image &image); 1205 bool render_image (rxvt_image &image);
1210 void parse_image (int id, const char *type, const char *arg);
1211# endif 1206# endif
1212 1207
1213# if ENABLE_TRANSPARENCY 1208# if ENABLE_TRANSPARENCY
1214 Pixmap root_pixmap; /* current root pixmap set */ 1209 Pixmap root_pixmap; /* current root pixmap set */
1215 image_effects root_effects; 1210 image_effects root_effects;
… …
1262 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW; 1257 void scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW;
1263#endif 1258#endif
1264 1259
1265 vector<void *> allocated; // free these memory blocks with free() 1260 vector<void *> allocated; // free these memory blocks with free()
1266 1261
1262 int parent_x, parent_y; // parent window position relative to root, only updated on demand
1263
1267 char *locale; 1264 char *locale;
1268 char charsets[4]; 1265 char charsets[4];
1269 char *v_buffer; /* pointer to physical buffer */ 1266 char *v_buffer; /* pointer to physical buffer */
1270 unsigned int v_buflen; /* size of area to write */ 1267 unsigned int v_buflen; /* size of area to write */
1271 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */ 1268 stringvec *argv, *envv; /* if != 0, will be freed at destroy time */
… …
1294#if ENABLE_FRILLS || ISO_14755 1291#if ENABLE_FRILLS || ISO_14755
1295 // ISO 14755 entry support 1292 // ISO 14755 entry support
1296 unicode_t iso14755buf; 1293 unicode_t iso14755buf;
1297 void commit_iso14755 (); 1294 void commit_iso14755 ();
1298# if ISO_14755 1295# if ISO_14755
1299 void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); 1296 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); 1297 void iso14755_54 (int x, int y);
1301# endif 1298# endif
1302#endif 1299#endif
1303 1300
1304 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse; 1301 long vt_emask, vt_emask_perl, vt_emask_xim, vt_emask_mouse;
… …
1583 void selection_click (int clicks, int x, int y) NOTHROW; 1580 void selection_click (int clicks, int x, int y) NOTHROW;
1584 void selection_extend (int x, int y, int flag) NOTHROW; 1581 void selection_extend (int x, int y, int flag) NOTHROW;
1585 void selection_rotate (int x, int y) NOTHROW; 1582 void selection_rotate (int x, int y) NOTHROW;
1586 1583
1587 // xdefaults.C 1584 // xdefaults.C
1585 void rxvt_usage (int type);
1588 const char **get_options (int argc, const char *const *argv); 1586 const char **get_options (int argc, const char *const *argv);
1589 int parse_keysym (const char *str, const char *arg); 1587 int parse_keysym (const char *str, const char *arg);
1590 const char *x_resource (const char *name); 1588 const char *x_resource (const char *name);
1591 void extract_resources (); 1589 void extract_resources ();
1592 void extract_keysym_resources (); 1590 void extract_keysym_resources ();

Diff Legend

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