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.213 by sf-exg, Sun May 13 21:12:01 2012 UTC vs.
Revision 1.214 by sf-exg, Thu May 17 10:18:32 2012 UTC

… …
58# endif 58# endif
59 59
60void 60void
61rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
62{ 62{
63#ifdef HAVE_PIXBUF
64 if (pixbuf)
65 g_object_unref (pixbuf);
66#endif
67
68 if (bg_pixmap) 63 if (bg_pixmap)
69 XFreePixmap (dpy, bg_pixmap); 64 XFreePixmap (dpy, bg_pixmap);
70} 65}
71 66
72bool 67bool
… …
90 if (bg_flags & BG_IS_TRANSPARENT) 85 if (bg_flags & BG_IS_TRANSPARENT)
91 return true; 86 return true;
92# endif 87# endif
93 88
94# ifdef BG_IMAGE_FROM_FILE 89# ifdef BG_IMAGE_FROM_FILE
95 if (bg_flags & BG_IS_FROM_FILE) 90 if (bg_image.flags & IM_IS_SET)
96 { 91 {
97 if (bg_flags & BG_IS_SIZE_SENSITIVE) 92 if ((bg_image.flags & IM_IS_SIZE_SENSITIVE)
93 || bg_image.width () > szHint.width
94 || bg_image.height () > szHint.height)
98 return true; 95 return true;
99 } 96 }
100# endif 97# endif
101 98
102 return false; 99 return false;
… …
109 if (bg_flags & BG_IS_TRANSPARENT) 106 if (bg_flags & BG_IS_TRANSPARENT)
110 return true; 107 return true;
111# endif 108# endif
112 109
113# ifdef BG_IMAGE_FROM_FILE 110# ifdef BG_IMAGE_FROM_FILE
114 if (bg_flags & BG_IS_FROM_FILE) 111 if (bg_image.flags & IM_IS_SET)
115 { 112 {
116 if (bg_flags & BG_ROOT_ALIGN) 113 if (bg_image.flags & IM_ROOT_ALIGN)
117 return true; 114 return true;
118 } 115 }
119# endif 116# endif
120 117
121 return false; 118 return false;
… …
149 min_it (dst_size, target_size - dst_pos); 146 min_it (dst_size, target_size - dst_pos);
150 return src_pos; 147 return src_pos;
151} 148}
152 149
153bool 150bool
154rxvt_term::bg_set_geometry (const char *geom, bool update) 151rxvt_image::set_geometry (const char *geom, bool update)
155{ 152{
156 bool changed = false; 153 bool changed = false;
157 int geom_flags = 0; 154 int geom_flags = 0;
158 int x = h_align; 155 int x = h_align;
159 int y = v_align; 156 int y = v_align;
… …
170 167
171 for (int i = 0; arr[i]; i++) 168 for (int i = 0; arr[i]; i++)
172 { 169 {
173 if (!strcasecmp (arr[i], "style=tiled")) 170 if (!strcasecmp (arr[i], "style=tiled"))
174 { 171 {
175 new_flags = BG_TILE; 172 new_flags = IM_TILE;
176 w = h = noScale; 173 w = h = noScale;
177 x = y = 0; 174 x = y = 0;
178 geom_flags = WidthValue|HeightValue|XValue|YValue; 175 geom_flags = WidthValue|HeightValue|XValue|YValue;
179 } 176 }
180 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 177 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
181 { 178 {
182 new_flags = BG_KEEP_ASPECT; 179 new_flags = IM_KEEP_ASPECT;
183 w = h = windowScale; 180 w = h = windowScale;
184 x = y = centerAlign; 181 x = y = centerAlign;
185 geom_flags = WidthValue|HeightValue|XValue|YValue; 182 geom_flags = WidthValue|HeightValue|XValue|YValue;
186 } 183 }
187 else if (!strcasecmp (arr[i], "style=stretched")) 184 else if (!strcasecmp (arr[i], "style=stretched"))
… …
197 x = y = centerAlign; 194 x = y = centerAlign;
198 geom_flags = WidthValue|HeightValue|XValue|YValue; 195 geom_flags = WidthValue|HeightValue|XValue|YValue;
199 } 196 }
200 else if (!strcasecmp (arr[i], "style=root-tiled")) 197 else if (!strcasecmp (arr[i], "style=root-tiled"))
201 { 198 {
202 new_flags = BG_TILE|BG_ROOT_ALIGN; 199 new_flags = IM_TILE|IM_ROOT_ALIGN;
203 w = h = noScale; 200 w = h = noScale;
204 geom_flags = WidthValue|HeightValue; 201 geom_flags = WidthValue|HeightValue;
205 } 202 }
206 else if (!strcasecmp (arr[i], "op=tile")) 203 else if (!strcasecmp (arr[i], "op=tile"))
207 new_flags |= BG_TILE; 204 new_flags |= IM_TILE;
208 else if (!strcasecmp (arr[i], "op=keep-aspect")) 205 else if (!strcasecmp (arr[i], "op=keep-aspect"))
209 new_flags |= BG_KEEP_ASPECT; 206 new_flags |= IM_KEEP_ASPECT;
210 else if (!strcasecmp (arr[i], "op=root-align")) 207 else if (!strcasecmp (arr[i], "op=root-align"))
211 new_flags |= BG_ROOT_ALIGN; 208 new_flags |= IM_ROOT_ALIGN;
212 209
213 // deprecated 210 // deprecated
214 else if (!strcasecmp (arr[i], "tile")) 211 else if (!strcasecmp (arr[i], "tile"))
215 { 212 {
216 new_flags |= BG_TILE; 213 new_flags |= IM_TILE;
217 w = h = noScale; 214 w = h = noScale;
218 geom_flags |= WidthValue|HeightValue; 215 geom_flags |= WidthValue|HeightValue;
219 } 216 }
220 else if (!strcasecmp (arr[i], "propscale")) 217 else if (!strcasecmp (arr[i], "propscale"))
221 { 218 {
222 new_flags |= BG_KEEP_ASPECT; 219 new_flags |= IM_KEEP_ASPECT;
223 w = h = windowScale; 220 w = h = windowScale;
224 geom_flags |= WidthValue|HeightValue; 221 geom_flags |= WidthValue|HeightValue;
225 } 222 }
226 else if (!strcasecmp (arr[i], "hscale")) 223 else if (!strcasecmp (arr[i], "hscale"))
227 { 224 {
228 new_flags |= BG_TILE; 225 new_flags |= IM_TILE;
229 w = windowScale; 226 w = windowScale;
230 h = noScale; 227 h = noScale;
231 geom_flags |= WidthValue|HeightValue; 228 geom_flags |= WidthValue|HeightValue;
232 } 229 }
233 else if (!strcasecmp (arr[i], "vscale")) 230 else if (!strcasecmp (arr[i], "vscale"))
234 { 231 {
235 new_flags |= BG_TILE; 232 new_flags |= IM_TILE;
236 h = windowScale; 233 h = windowScale;
237 w = noScale; 234 w = noScale;
238 geom_flags |= WidthValue|HeightValue; 235 geom_flags |= WidthValue|HeightValue;
239 } 236 }
240 else if (!strcasecmp (arr[i], "scale")) 237 else if (!strcasecmp (arr[i], "scale"))
… …
248 x = y = centerAlign; 245 x = y = centerAlign;
249 geom_flags |= WidthValue|HeightValue|XValue|YValue; 246 geom_flags |= WidthValue|HeightValue|XValue|YValue;
250 } 247 }
251 else if (!strcasecmp (arr[i], "root")) 248 else if (!strcasecmp (arr[i], "root"))
252 { 249 {
253 new_flags |= BG_TILE|BG_ROOT_ALIGN; 250 new_flags |= IM_TILE|IM_ROOT_ALIGN;
254 w = h = noScale; 251 w = h = noScale;
255 geom_flags |= WidthValue|HeightValue; 252 geom_flags |= WidthValue|HeightValue;
256 } 253 }
257 254
258 else 255 else
… …
260 } /* done parsing ops */ 257 } /* done parsing ops */
261 258
262 rxvt_free_strsplit (arr); 259 rxvt_free_strsplit (arr);
263 } 260 }
264 261
265 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; 262 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
266 263
267 if (!update) 264 if (!update)
268 { 265 {
269 if (!(geom_flags & XValue)) 266 if (!(geom_flags & XValue))
270 x = y = defaultAlign; 267 x = y = defaultAlign;
… …
282 min_it (w, 1000); 279 min_it (w, 1000);
283 min_it (h, 1000); 280 min_it (h, 1000);
284 clamp_it (x, -100, 200); 281 clamp_it (x, -100, 200);
285 clamp_it (y, -100, 200); 282 clamp_it (y, -100, 200);
286 283
287 if (bg_flags != new_flags 284 if (flags != new_flags
288 || h_scale != w 285 || h_scale != w
289 || v_scale != h 286 || v_scale != h
290 || h_align != x 287 || h_align != x
291 || v_align != y) 288 || v_align != y)
292 { 289 {
293 bg_flags = new_flags; 290 flags = new_flags;
294 h_scale = w; 291 h_scale = w;
295 v_scale = h; 292 v_scale = h;
296 h_align = x; 293 h_align = x;
297 v_align = y; 294 v_align = y;
298 changed = true; 295 changed = true;
299 } 296 }
300 297
298 if (!(flags & IM_TILE)
299 || h_scale || v_scale
300 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)))
301 flags |= IM_IS_SIZE_SENSITIVE;
302 else
303 flags &= ~IM_IS_SIZE_SENSITIVE;
304
301 return changed; 305 return changed;
302} 306}
303 307
304void 308void
305rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 309rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
306{ 310{
311 int image_width = image.width ();
312 int image_height = image.height ();
307 int target_width = szHint.width; 313 int target_width = szHint.width;
308 int target_height = szHint.height; 314 int target_height = szHint.height;
309 315
310 w = h_scale * target_width / 100; 316 w = image.h_scale * target_width / 100;
311 h = v_scale * target_height / 100; 317 h = image.v_scale * target_height / 100;
312 318
313 if (bg_flags & BG_KEEP_ASPECT) 319 if (image.flags & IM_KEEP_ASPECT)
314 { 320 {
315 float scale = (float)w / image_width; 321 float scale = (float)w / image_width;
316 min_it (scale, (float)h / image_height); 322 min_it (scale, (float)h / image_height);
317 w = image_width * scale + 0.5; 323 w = image_width * scale + 0.5;
318 h = image_height * scale + 0.5; 324 h = image_height * scale + 0.5;
319 } 325 }
320 326
321 if (!w) w = image_width; 327 if (!w) w = image_width;
322 if (!h) h = image_height; 328 if (!h) h = image_height;
323 329
324 if (bg_flags & BG_ROOT_ALIGN) 330 if (image.flags & IM_ROOT_ALIGN)
325 { 331 {
326 x = -target_x; 332 x = -target_x;
327 y = -target_y; 333 y = -target_y;
328 } 334 }
329 else 335 else
330 { 336 {
331 x = make_align_position (h_align, target_width, w); 337 x = make_align_position (image.h_align, target_width, w);
332 y = make_align_position (v_align, target_height, h); 338 y = make_align_position (image.v_align, target_height, h);
333 } 339 }
334
335 if (!(bg_flags & BG_TILE)
336 || h_scale || v_scale
337 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
338 || image_width > target_width || image_height > target_height)
339 bg_flags |= BG_IS_SIZE_SENSITIVE;
340 else
341 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
342} 340}
343 341
344# ifdef HAVE_PIXBUF 342# ifdef HAVE_PIXBUF
345bool 343bool
346rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 344rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
… …
454 XDestroyImage (ximage); 452 XDestroyImage (ximage);
455 return true; 453 return true;
456} 454}
457 455
458bool 456bool
459rxvt_term::render_image (bool transparent) 457rxvt_term::render_image (rxvt_image &image, bool transparent)
460{ 458{
459 GdkPixbuf *pixbuf = image.pixbuf;
461 if (!pixbuf) 460 if (!pixbuf)
462 return false; 461 return false;
463 462
464 if (transparent 463 if (transparent
465 && !(bg_flags & BG_HAS_RENDER)) 464 && !(bg_flags & BG_HAS_RENDER))
… …
478 int x = 0; 477 int x = 0;
479 int y = 0; 478 int y = 0;
480 int w = 0; 479 int w = 0;
481 int h = 0; 480 int h = 0;
482 481
483 get_image_geometry (image_width, image_height, w, h, x, y); 482 get_image_geometry (image, w, h, x, y);
484 483
485 if (!(bg_flags & BG_ROOT_ALIGN) 484 if (!(image.flags & IM_ROOT_ALIGN)
486 && (x >= target_width 485 && (x >= target_width
487 || y >= target_height 486 || y >= target_height
488 || x + w <= 0 487 || x + w <= 0
489 || y + h <= 0)) 488 || y + h <= 0))
490 return false; 489 return false;
… …
516 root_pmap = bg_pixmap; 515 root_pmap = bg_pixmap;
517 bg_pixmap = None; 516 bg_pixmap = None;
518 } 517 }
519 else 518 else
520 { 519 {
521 if (bg_flags & BG_TILE) 520 if (image.flags & IM_TILE)
522 { 521 {
523 new_pmap_width = min (image_width, target_width); 522 new_pmap_width = min (image_width, target_width);
524 new_pmap_height = min (image_height, target_height); 523 new_pmap_height = min (image_height, target_height);
525 } 524 }
526 } 525 }
… …
539 gcv.foreground = pix_colors[Color_bg]; 538 gcv.foreground = pix_colors[Color_bg];
540 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 539 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
541 540
542 if (gc) 541 if (gc)
543 { 542 {
544 if (bg_flags & BG_TILE) 543 if (image.flags & IM_TILE)
545 { 544 {
546 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 545 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
547 pixbuf_to_pixmap (result, tile, gc, 546 pixbuf_to_pixmap (result, tile, gc,
548 0, 0, 547 0, 0,
549 0, 0, 548 0, 0,
… …
619 return ret; 618 return ret;
620} 619}
621# endif /* HAVE_PIXBUF */ 620# endif /* HAVE_PIXBUF */
622 621
623bool 622bool
624rxvt_term::bg_set_file (const char *file) 623rxvt_image::set_file (const char *file)
625{ 624{
626 if (!file || !*file) 625 if (!file || !*file)
627 return false; 626 return false;
628 627
629 bool ret = false; 628 bool ret = false;
… …
643 if (image) 642 if (image)
644 { 643 {
645 if (pixbuf) 644 if (pixbuf)
646 g_object_unref (pixbuf); 645 g_object_unref (pixbuf);
647 pixbuf = image; 646 pixbuf = image;
648 bg_flags |= BG_IS_FROM_FILE; 647 flags |= IM_IS_SET;
649 ret = true; 648 ret = true;
650 } 649 }
651# endif 650# endif
652 651
653 if (ret) 652 if (ret)
654 { 653 {
655 if (p) 654 if (p)
656 bg_set_geometry (p + 1); 655 set_geometry (p + 1);
657 else 656 else
658 bg_set_default_geometry (); 657 set_default_geometry ();
659 } 658 }
660 659
661 return ret; 660 return ret;
662} 661}
663 662
… …
1079 bg_flags |= BG_IS_VALID; 1078 bg_flags |= BG_IS_VALID;
1080 } 1079 }
1081# endif 1080# endif
1082 1081
1083# ifdef BG_IMAGE_FROM_FILE 1082# ifdef BG_IMAGE_FROM_FILE
1084 if (bg_flags & BG_IS_FROM_FILE) 1083 if (bg_image.flags & IM_IS_SET)
1085 { 1084 {
1086 if (render_image (transparent)) 1085 if (render_image (bg_image, transparent))
1087 bg_flags |= BG_IS_VALID; 1086 bg_flags |= BG_IS_VALID;
1088 } 1087 }
1089# endif 1088# endif
1090 1089
1091 if (!(bg_flags & BG_IS_VALID)) 1090 if (!(bg_flags & BG_IS_VALID))

Diff Legend

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