--- rxvt-unicode/src/rxvt.h 2012/06/05 19:32:29 1.500 +++ rxvt-unicode/src/rxvt.h 2012/06/06 22:00:20 1.502 @@ -47,6 +47,7 @@ #if defined (ISO_14755) || defined (ENABLE_PERL) # define ENABLE_OVERLAY 1 +# undef NO_RESOURCES #endif #if ENABLE_PERL @@ -1199,15 +1200,9 @@ uint8_t bg_flags; # if BG_IMAGE_FROM_FILE - vector image_vec; - rxvt_image *new_image () - { - image_vec.resize (image_vec.size () + 1); - return &image_vec.back (); - } + rxvt_image fimage; void get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y); bool render_image (rxvt_image &image); - void parse_image (int id, const char *type, const char *arg); # endif # if ENABLE_TRANSPARENCY @@ -1298,7 +1293,7 @@ unicode_t iso14755buf; void commit_iso14755 (); # if ISO_14755 - void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1); + void iso14755_51 (unicode_t ch, rend_t r = DEFAULT_RSTYLE, int x = 0, int y = -1, int y2 = -1); void iso14755_54 (int x, int y); # endif #endif