ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.228 by sf-exg, Thu May 31 20:23:51 2012 UTC vs.
Revision 1.229 by sf-exg, Fri Jun 1 16:07:35 2012 UTC

673 if (id >= 1) 673 if (id >= 1)
674 GET_R->parse_image (id, XrmQuarkToString (quarks[size-1]), (char *)value->addr); 674 GET_R->parse_image (id, XrmQuarkToString (quarks[size-1]), (char *)value->addr);
675 } 675 }
676 return False; 676 return False;
677} 677}
678# endif
678 679
679void 680void
680rxvt_term::parse_image (int id, const char *type, const char *arg) 681rxvt_term::parse_image (int id, const char *type, const char *arg)
681{ 682{
682 if (image_vec.size () < id + 1) 683 if (image_vec.size () < id + 1)
683 image_vec.resize (id + 1); 684 image_vec.resize (id + 1);
684 685
685 rxvt_image *image = &image_vec[id]; 686 rxvt_image *image = &image_vec[id];
686} 687}
687# endif
688 688
689rxvt_image::rxvt_image () 689rxvt_image::rxvt_image ()
690{ 690{
691 alpha = 0xffff; 691 alpha = 0xffff;
692 flags = 0; 692 flags = 0;
1209 image_vec.pop_back (); 1209 image_vec.pop_back ();
1210 } 1210 }
1211 1211
1212# ifndef NO_RESOURCES 1212# ifndef NO_RESOURCES
1213 find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image); 1213 find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image);
1214# endif
1215
1214 vector<rxvt_image>::iterator bg_image = image_vec.begin (); 1216 vector<rxvt_image>::iterator bg_image = image_vec.begin ();
1215 while (bg_image != image_vec.end ()) 1217 while (bg_image != image_vec.end ())
1216 { 1218 {
1217 if (!(bg_image->flags & IM_IS_SET)) 1219 if (!(bg_image->flags & IM_IS_SET))
1218 bg_image = image_vec.erase (bg_image); 1220 bg_image = image_vec.erase (bg_image);
1222 bg_image->flags |= IM_IS_SIZE_SENSITIVE; 1224 bg_image->flags |= IM_IS_SIZE_SENSITIVE;
1223 1225
1224 bg_image++; 1226 bg_image++;
1225 } 1227 }
1226 } 1228 }
1227# endif
1228 1229
1229 if (image_vec.size () > 0 1230 if (image_vec.size () > 0
1230 && !bg_window_position_sensitive ()) 1231 && !bg_window_position_sensitive ())
1231 update_background (); 1232 update_background ();
1232#endif 1233#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines