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.205 by sf-exg, Wed Apr 11 10:06:45 2012 UTC vs.
Revision 1.218 by sf-exg, Mon May 21 12:29:22 2012 UTC

3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it> 8 * Copyright (c) 2010-2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 13 * (at your option) any later version.
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;
123 120
124# ifdef BG_IMAGE_FROM_FILE 121# ifdef BG_IMAGE_FROM_FILE
125static inline int 122static inline int
126make_align_position (int align, int window_size, int image_size) 123make_align_position (int align, int window_size, int image_size)
127{ 124{
128 int diff = window_size - image_size;
129 int smaller = min (image_size, window_size);
130
131 if (align >= 0 && align <= 100) 125 if (align >= 0 && align <= 100)
132 return diff * align / 100; 126 return lerp (0, window_size - image_size, align);
133 else if (align > 100) 127 else if (align > 100)
134 return (align - 100) * smaller / 100 + window_size - smaller; 128 return lerp (window_size - image_size, window_size, align - 100);
135 else 129 else
136 return (align + 100) * smaller / 100 - image_size; 130 return lerp (-image_size, 0, align + 100);
137} 131}
138 132
139static inline int 133static inline int
140make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 134make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
141{ 135{
152 min_it (dst_size, target_size - dst_pos); 146 min_it (dst_size, target_size - dst_pos);
153 return src_pos; 147 return src_pos;
154} 148}
155 149
156bool 150bool
157rxvt_term::bg_set_geometry (const char *geom, bool update) 151rxvt_image::set_geometry (const char *geom, bool update)
158{ 152{
159 bool changed = false; 153 bool changed = false;
160 int geom_flags = 0; 154 int geom_flags = 0;
161 int x = h_align; 155 int x = h_align;
162 int y = v_align; 156 int y = v_align;
173 167
174 for (int i = 0; arr[i]; i++) 168 for (int i = 0; arr[i]; i++)
175 { 169 {
176 if (!strcasecmp (arr[i], "style=tiled")) 170 if (!strcasecmp (arr[i], "style=tiled"))
177 { 171 {
178 new_flags = BG_TILE; 172 new_flags = IM_TILE;
179 w = h = noScale; 173 w = h = noScale;
180 x = y = 0; 174 x = y = 0;
181 geom_flags = WidthValue|HeightValue|XValue|YValue; 175 geom_flags = WidthValue|HeightValue|XValue|YValue;
182 } 176 }
183 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 177 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
184 { 178 {
185 new_flags = BG_KEEP_ASPECT; 179 new_flags = IM_KEEP_ASPECT;
186 w = h = windowScale; 180 w = h = windowScale;
187 x = y = centerAlign; 181 x = y = centerAlign;
188 geom_flags = WidthValue|HeightValue|XValue|YValue; 182 geom_flags = WidthValue|HeightValue|XValue|YValue;
189 } 183 }
190 else if (!strcasecmp (arr[i], "style=stretched")) 184 else if (!strcasecmp (arr[i], "style=stretched"))
200 x = y = centerAlign; 194 x = y = centerAlign;
201 geom_flags = WidthValue|HeightValue|XValue|YValue; 195 geom_flags = WidthValue|HeightValue|XValue|YValue;
202 } 196 }
203 else if (!strcasecmp (arr[i], "style=root-tiled")) 197 else if (!strcasecmp (arr[i], "style=root-tiled"))
204 { 198 {
205 new_flags = BG_TILE|BG_ROOT_ALIGN; 199 new_flags = IM_TILE|IM_ROOT_ALIGN;
206 w = h = noScale; 200 w = h = noScale;
207 geom_flags = WidthValue|HeightValue; 201 geom_flags = WidthValue|HeightValue;
208 } 202 }
209 else if (!strcasecmp (arr[i], "op=tile")) 203 else if (!strcasecmp (arr[i], "op=tile"))
210 new_flags |= BG_TILE; 204 new_flags |= IM_TILE;
211 else if (!strcasecmp (arr[i], "op=keep-aspect")) 205 else if (!strcasecmp (arr[i], "op=keep-aspect"))
212 new_flags |= BG_KEEP_ASPECT; 206 new_flags |= IM_KEEP_ASPECT;
213 else if (!strcasecmp (arr[i], "op=root-align")) 207 else if (!strcasecmp (arr[i], "op=root-align"))
214 new_flags |= BG_ROOT_ALIGN; 208 new_flags |= IM_ROOT_ALIGN;
215 209
216 // deprecated 210 // deprecated
217 else if (!strcasecmp (arr[i], "tile")) 211 else if (!strcasecmp (arr[i], "tile"))
218 { 212 {
219 new_flags |= BG_TILE; 213 new_flags |= IM_TILE;
220 w = h = noScale; 214 w = h = noScale;
221 geom_flags |= WidthValue|HeightValue; 215 geom_flags |= WidthValue|HeightValue;
222 } 216 }
223 else if (!strcasecmp (arr[i], "propscale")) 217 else if (!strcasecmp (arr[i], "propscale"))
224 { 218 {
225 new_flags |= BG_KEEP_ASPECT; 219 new_flags |= IM_KEEP_ASPECT;
226 w = h = windowScale; 220 w = h = windowScale;
227 geom_flags |= WidthValue|HeightValue; 221 geom_flags |= WidthValue|HeightValue;
228 } 222 }
229 else if (!strcasecmp (arr[i], "hscale")) 223 else if (!strcasecmp (arr[i], "hscale"))
230 { 224 {
231 new_flags |= BG_TILE; 225 new_flags |= IM_TILE;
232 w = windowScale; 226 w = windowScale;
233 h = noScale; 227 h = noScale;
234 geom_flags |= WidthValue|HeightValue; 228 geom_flags |= WidthValue|HeightValue;
235 } 229 }
236 else if (!strcasecmp (arr[i], "vscale")) 230 else if (!strcasecmp (arr[i], "vscale"))
237 { 231 {
238 new_flags |= BG_TILE; 232 new_flags |= IM_TILE;
239 h = windowScale; 233 h = windowScale;
240 w = noScale; 234 w = noScale;
241 geom_flags |= WidthValue|HeightValue; 235 geom_flags |= WidthValue|HeightValue;
242 } 236 }
243 else if (!strcasecmp (arr[i], "scale")) 237 else if (!strcasecmp (arr[i], "scale"))
251 x = y = centerAlign; 245 x = y = centerAlign;
252 geom_flags |= WidthValue|HeightValue|XValue|YValue; 246 geom_flags |= WidthValue|HeightValue|XValue|YValue;
253 } 247 }
254 else if (!strcasecmp (arr[i], "root")) 248 else if (!strcasecmp (arr[i], "root"))
255 { 249 {
256 new_flags |= BG_TILE|BG_ROOT_ALIGN; 250 new_flags |= IM_TILE|IM_ROOT_ALIGN;
257 w = h = noScale; 251 w = h = noScale;
258 geom_flags |= WidthValue|HeightValue; 252 geom_flags |= WidthValue|HeightValue;
259 } 253 }
260 254
261 else 255 else
263 } /* done parsing ops */ 257 } /* done parsing ops */
264 258
265 rxvt_free_strsplit (arr); 259 rxvt_free_strsplit (arr);
266 } 260 }
267 261
268 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; 262 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
269 263
270 if (!update) 264 if (!update)
271 { 265 {
272 if (!(geom_flags & XValue)) 266 if (!(geom_flags & XValue))
273 x = y = defaultAlign; 267 x = y = defaultAlign;
280 h = w; 274 h = w;
281 else if (!(geom_flags & WidthValue)) 275 else if (!(geom_flags & WidthValue))
282 w = h; 276 w = h;
283 } 277 }
284 278
285 min_it (w, 1000);
286 min_it (h, 1000);
287 clamp_it (x, -100, 200); 279 clamp_it (x, -100, 200);
288 clamp_it (y, -100, 200); 280 clamp_it (y, -100, 200);
289 281
290 if (bg_flags != new_flags 282 if (flags != new_flags
291 || h_scale != w 283 || h_scale != w
292 || v_scale != h 284 || v_scale != h
293 || h_align != x 285 || h_align != x
294 || v_align != y) 286 || v_align != y)
295 { 287 {
296 bg_flags = new_flags; 288 flags = new_flags;
297 h_scale = w; 289 h_scale = w;
298 v_scale = h; 290 v_scale = h;
299 h_align = x; 291 h_align = x;
300 v_align = y; 292 v_align = y;
301 changed = true; 293 changed = true;
302 } 294 }
303 295
296 if (!(flags & IM_TILE)
297 || h_scale || v_scale
298 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)))
299 flags |= IM_IS_SIZE_SENSITIVE;
300 else
301 flags &= ~IM_IS_SIZE_SENSITIVE;
302
304 return changed; 303 return changed;
305} 304}
306 305
307void 306void
308rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 307rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
309{ 308{
309 int image_width = image.width ();
310 int image_height = image.height ();
310 int target_width = szHint.width; 311 int target_width = szHint.width;
311 int target_height = szHint.height; 312 int target_height = szHint.height;
313 int h_scale = min (image.h_scale, 32767 * 100 / target_width);
314 int v_scale = min (image.v_scale, 32767 * 100 / target_height);
312 315
313 w = h_scale * target_width / 100; 316 w = h_scale * target_width / 100;
314 h = v_scale * target_height / 100; 317 h = v_scale * target_height / 100;
315 318
316 if (bg_flags & BG_KEEP_ASPECT) 319 if (image.flags & IM_KEEP_ASPECT)
317 { 320 {
318 float scale = (float)w / image_width; 321 float scale = (float)w / image_width;
319 min_it (scale, (float)h / image_height); 322 min_it (scale, (float)h / image_height);
320 w = image_width * scale + 0.5; 323 w = image_width * scale + 0.5;
321 h = image_height * scale + 0.5; 324 h = image_height * scale + 0.5;
322 } 325 }
323 326
324 if (!w) w = image_width; 327 if (!w) w = image_width;
325 if (!h) h = image_height; 328 if (!h) h = image_height;
326 329
327 if (bg_flags & BG_ROOT_ALIGN) 330 if (image.flags & IM_ROOT_ALIGN)
328 { 331 {
329 x = -target_x; 332 x = -target_x;
330 y = -target_y; 333 y = -target_y;
331 } 334 }
332 else 335 else
333 { 336 {
334 x = make_align_position (h_align, target_width, w); 337 x = make_align_position (image.h_align, target_width, w);
335 y = make_align_position (v_align, target_height, h); 338 y = make_align_position (image.v_align, target_height, h);
336 } 339 }
337
338 if (!(bg_flags & BG_TILE)
339 || h_scale || v_scale
340 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
341 || image_width > target_width || image_height > target_height)
342 bg_flags |= BG_IS_SIZE_SENSITIVE;
343 else
344 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
345} 340}
346 341
347# ifdef HAVE_PIXBUF 342# ifdef HAVE_PIXBUF
348bool 343bool
349rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 344rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
350 int src_x, int src_y, int dst_x, int dst_y, 345 int src_x, int src_y, int dst_x, int dst_y,
351 unsigned int width, unsigned int height) 346 unsigned int width, unsigned int height, bool argb)
352{ 347{
353 XImage *ximage; 348 XImage *ximage;
354 char *data, *line; 349 char *line;
355 int bytes_per_pixel;
356 int width_r, width_g, width_b; 350 int width_r, width_g, width_b, width_a;
357 int sh_r, sh_g, sh_b; 351 int sh_r, sh_g, sh_b, sh_a;
352 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
358 int rowstride; 353 int rowstride;
359 int channels; 354 int channels;
360 unsigned char *row; 355 unsigned char *row;
361 356
362 if (visual->c_class != TrueColor) 357 if (visual->c_class != TrueColor)
363 return false; 358 return false;
364 359
365 if (depth == 24 || depth == 32) 360 if (argb)
366 bytes_per_pixel = 4; 361 {
367 else if (depth == 15 || depth == 16) 362 red_mask = 0xff << 16;
368 bytes_per_pixel = 2; 363 green_mask = 0xff << 8;
364 blue_mask = 0xff;
365 alpha_mask = 0xff << 24;
366 }
369 else 367 else
368 {
369 red_mask = visual->red_mask;
370 green_mask = visual->green_mask;
371 blue_mask = visual->blue_mask;
372#if XRENDER
373 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
374 if (format)
375 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
376 else
377#endif
378 alpha_mask = 0;
379 }
380
381 width_r = ecb_popcount32 (red_mask);
382 width_g = ecb_popcount32 (green_mask);
383 width_b = ecb_popcount32 (blue_mask);
384 width_a = ecb_popcount32 (alpha_mask);
385
386 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
370 return false; 387 return false;
371 388
372 width_r = ecb_popcount32 (visual->red_mask); 389 sh_r = ecb_ctz32 (red_mask);
373 width_g = ecb_popcount32 (visual->green_mask); 390 sh_g = ecb_ctz32 (green_mask);
374 width_b = ecb_popcount32 (visual->blue_mask); 391 sh_b = ecb_ctz32 (blue_mask);
392 sh_a = ecb_ctz32 (alpha_mask);
375 393
376 if (width_r > 8 || width_g > 8 || width_b > 8) 394 if (width > 32767 || height > 32767)
377 return false; 395 return false;
378 396
379 sh_r = ecb_ctz32 (visual->red_mask); 397 ximage = XCreateImage (dpy, visual, argb ? 32 : depth, ZPixmap, 0, 0,
380 sh_g = ecb_ctz32 (visual->green_mask); 398 width, height, 32, 0);
381 sh_b = ecb_ctz32 (visual->blue_mask); 399 if (!ximage)
382
383 if (width > INT_MAX / height / bytes_per_pixel)
384 return false; 400 return false;
385 401
386 data = (char *)malloc (width * height * bytes_per_pixel); 402 if (height > INT_MAX / ximage->bytes_per_line
387 if (!data) 403 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
388 return false;
389
390 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
391 width, height, bytes_per_pixel * 8, 0);
392 if (!ximage)
393 { 404 {
394 free (data); 405 XDestroyImage (ximage);
395 return false; 406 return false;
396 } 407 }
397 408
398 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 409 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
399 410
400 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 411 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
401 channels = gdk_pixbuf_get_n_channels (pixbuf); 412 channels = gdk_pixbuf_get_n_channels (pixbuf);
402 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 413 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
403 line = data; 414 line = ximage->data;
415
416 rgba c (0, 0, 0);
417
418 if (channels == 4 && alpha_mask == 0)
419 {
420 pix_colors[Color_bg].get (c);
421 c.r >>= 8;
422 c.g >>= 8;
423 c.b >>= 8;
424 }
404 425
405 for (int y = 0; y < height; y++) 426 for (int y = 0; y < height; y++)
406 { 427 {
407 for (int x = 0; x < width; x++) 428 for (int x = 0; x < width; x++)
408 { 429 {
409 unsigned char *pixel = row + x * channels; 430 unsigned char *pixel = row + x * channels;
410 uint32_t value; 431 uint32_t value;
432 unsigned char r, g, b, a;
411 433
434 if (channels == 4)
435 {
436 a = pixel[3];
437 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
438 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
439 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
440 }
441 else
442 {
443 a = 0xff;
444 r = pixel[0];
445 g = pixel[1];
446 b = pixel[2];
447 }
448
412 value = ((pixel[0] >> (8 - width_r)) << sh_r) 449 value = ((r >> (8 - width_r)) << sh_r)
413 | ((pixel[1] >> (8 - width_g)) << sh_g) 450 | ((g >> (8 - width_g)) << sh_g)
414 | ((pixel[2] >> (8 - width_b)) << sh_b); 451 | ((b >> (8 - width_b)) << sh_b)
452 | ((a >> (8 - width_a)) << sh_a);
415 453
416 if (bytes_per_pixel == 4) 454 if (ximage->bits_per_pixel == 32)
417 ((uint32_t *)line)[x] = value; 455 ((uint32_t *)line)[x] = value;
418 else 456 else
419 ((uint16_t *)line)[x] = value; 457 XPutPixel (ximage, x, y, value);
420 } 458 }
421 459
422 row += rowstride; 460 row += rowstride;
423 line += ximage->bytes_per_line; 461 line += ximage->bytes_per_line;
424 } 462 }
427 XDestroyImage (ximage); 465 XDestroyImage (ximage);
428 return true; 466 return true;
429} 467}
430 468
431bool 469bool
432rxvt_term::render_image (bool transparent) 470rxvt_term::render_image (rxvt_image &image)
433{ 471{
472 GdkPixbuf *pixbuf = image.pixbuf;
434 if (!pixbuf) 473 if (!pixbuf)
435 return false; 474 return false;
436 475
437 if (transparent 476 bool need_blend = bg_flags & BG_IS_VALID;
477
478 if (need_blend
438 && !(bg_flags & BG_HAS_RENDER)) 479 && !(bg_flags & BG_HAS_RENDER))
439 return false; 480 return false;
440 481
441 GdkPixbuf *result; 482 GdkPixbuf *result;
442 483
451 int x = 0; 492 int x = 0;
452 int y = 0; 493 int y = 0;
453 int w = 0; 494 int w = 0;
454 int h = 0; 495 int h = 0;
455 496
456 get_image_geometry (image_width, image_height, w, h, x, y); 497 get_image_geometry (image, w, h, x, y);
457 498
458 if (!(bg_flags & BG_ROOT_ALIGN) 499 if (!(image.flags & IM_ROOT_ALIGN)
459 && (x >= target_width 500 && (x >= target_width
460 || y >= target_height 501 || y >= target_height
461 || x + w <= 0 502 || x + w <= 0
462 || y + h <= 0)) 503 || y + h <= 0))
463 return false; 504 return false;
477 518
478 bool ret = false; 519 bool ret = false;
479 520
480 XGCValues gcv; 521 XGCValues gcv;
481 GC gc; 522 GC gc;
482 Pixmap root_pmap; 523 Pixmap tmp_pixmap;
483 524
484 image_width = gdk_pixbuf_get_width (result); 525 image_width = gdk_pixbuf_get_width (result);
485 image_height = gdk_pixbuf_get_height (result); 526 image_height = gdk_pixbuf_get_height (result);
486 527
487 if (transparent) 528 if (need_blend)
488 { 529 tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);
489 root_pmap = bg_pixmap;
490 bg_pixmap = None;
491 }
492 else 530 else
493 { 531 {
494 if (bg_flags & BG_TILE) 532 if (image.flags & IM_TILE)
495 { 533 {
496 new_pmap_width = min (image_width, target_width); 534 new_pmap_width = min (image_width, target_width);
497 new_pmap_height = min (image_height, target_height); 535 new_pmap_height = min (image_height, target_height);
498 } 536 }
499 }
500 537
501 if (bg_pixmap == None 538 if (bg_pixmap == None
502 || bg_pmap_width != new_pmap_width 539 || bg_pmap_width != new_pmap_width
503 || bg_pmap_height != new_pmap_height) 540 || bg_pmap_height != new_pmap_height)
504 { 541 {
505 if (bg_pixmap) 542 if (bg_pixmap)
506 XFreePixmap (dpy, bg_pixmap); 543 XFreePixmap (dpy, bg_pixmap);
507 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 544 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
508 bg_pmap_width = new_pmap_width; 545 bg_pmap_width = new_pmap_width;
509 bg_pmap_height = new_pmap_height; 546 bg_pmap_height = new_pmap_height;
547 }
548
549 tmp_pixmap = bg_pixmap;
510 } 550 }
511 551
512 gcv.foreground = pix_colors[Color_bg]; 552 gcv.foreground = pix_colors[Color_bg];
513 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 553 gc = XCreateGC (dpy, tmp_pixmap, GCForeground, &gcv);
514 554
515 if (gc) 555 if (gc)
516 { 556 {
517 if (bg_flags & BG_TILE) 557 if (image.flags & IM_TILE)
518 { 558 {
519 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 559 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, need_blend ? 32 : depth);
520 pixbuf_to_pixmap (result, tile, gc, 560 pixbuf_to_pixmap (result, tile, gc,
521 0, 0, 561 0, 0,
522 0, 0, 562 0, 0,
523 image_width, image_height); 563 image_width, image_height, need_blend);
524 564
525 gcv.tile = tile; 565 gcv.tile = tile;
526 gcv.fill_style = FillTiled; 566 gcv.fill_style = FillTiled;
527 gcv.ts_x_origin = x; 567 gcv.ts_x_origin = x;
528 gcv.ts_y_origin = y; 568 gcv.ts_y_origin = y;
529 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 569 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
530 570
531 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 571 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
532 XFreePixmap (dpy, tile); 572 XFreePixmap (dpy, tile);
533 } 573 }
534 else 574 else
535 { 575 {
536 int src_x, src_y, dst_x, dst_y; 576 int src_x, src_y, dst_x, dst_y;
540 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 580 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
541 581
542 if (dst_x > 0 || dst_y > 0 582 if (dst_x > 0 || dst_y > 0
543 || dst_x + dst_width < new_pmap_width 583 || dst_x + dst_width < new_pmap_width
544 || dst_y + dst_height < new_pmap_height) 584 || dst_y + dst_height < new_pmap_height)
545 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 585 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
546 586
547 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 587 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
548 pixbuf_to_pixmap (result, bg_pixmap, gc, 588 pixbuf_to_pixmap (result, tmp_pixmap, gc,
549 src_x, src_y, 589 src_x, src_y,
550 dst_x, dst_y, 590 dst_x, dst_y,
551 dst_width, dst_height); 591 dst_width, dst_height, need_blend);
552 } 592 }
553 593
554#if XRENDER 594#if XRENDER
555 if (transparent) 595 if (need_blend)
556 { 596 {
597 XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
557 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 598 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
558 599
559 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 600 Picture src = XRenderCreatePicture (dpy, tmp_pixmap, argb_format, 0, 0);
560 601
561 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0); 602 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
562 603
563 Picture mask = create_xrender_mask (dpy, vt, False, False); 604 Picture mask = create_xrender_mask (dpy, vt, False, False);
564 605
584 } 625 }
585 626
586 if (result != pixbuf) 627 if (result != pixbuf)
587 g_object_unref (result); 628 g_object_unref (result);
588 629
589 if (transparent) 630 if (need_blend)
590 XFreePixmap (dpy, root_pmap); 631 XFreePixmap (dpy, tmp_pixmap);
591 632
592 return ret; 633 return ret;
593} 634}
594# endif /* HAVE_PIXBUF */ 635# endif /* HAVE_PIXBUF */
595 636
596bool 637bool
597rxvt_term::bg_set_file (const char *file) 638rxvt_image::set_file (const char *file)
598{ 639{
599 if (!file || !*file) 640 if (!file || !*file)
600 return false; 641 return false;
601 642
602 bool ret = false; 643 bool ret = false;
616 if (image) 657 if (image)
617 { 658 {
618 if (pixbuf) 659 if (pixbuf)
619 g_object_unref (pixbuf); 660 g_object_unref (pixbuf);
620 pixbuf = image; 661 pixbuf = image;
621 bg_flags |= BG_IS_FROM_FILE;
622 ret = true; 662 ret = true;
623 } 663 }
624# endif 664# endif
625 665
626 if (ret) 666 if (ret)
627 { 667 {
668 flags = IM_IS_SET | IM_IS_SIZE_SENSITIVE;
669 h_scale = v_scale = defaultScale;
670 h_align = v_align = defaultAlign;
671
628 if (p) 672 if (p)
629 bg_set_geometry (p + 1); 673 set_geometry (p + 1);
630 else
631 bg_set_default_geometry ();
632 } 674 }
633 675
634 return ret; 676 return ret;
635} 677}
636 678
637# endif /* BG_IMAGE_FROM_FILE */ 679# endif /* BG_IMAGE_FROM_FILE */
638 680
639# ifdef ENABLE_TRANSPARENCY 681# ifdef ENABLE_TRANSPARENCY
640bool
641rxvt_term::bg_set_transparent ()
642{
643 if (!(bg_flags & BG_IS_TRANSPARENT))
644 {
645 bg_flags |= BG_IS_TRANSPARENT;
646 return true;
647 }
648
649 return false;
650}
651
652bool 682bool
653rxvt_term::bg_set_blur (const char *geom) 683rxvt_term::bg_set_blur (const char *geom)
654{ 684{
655 bool changed = false; 685 bool changed = false;
656 unsigned int hr, vr; 686 unsigned int hr, vr;
675 { 705 {
676 changed = true; 706 changed = true;
677 v_blurRadius = vr; 707 v_blurRadius = vr;
678 } 708 }
679 709
680 if (h_blurRadius && v_blurRadius)
681 bg_flags |= BG_NEEDS_BLUR;
682 else
683 bg_flags &= ~BG_NEEDS_BLUR;
684
685 return changed; 710 return changed;
686}
687
688void
689rxvt_term::set_tint_shade_flags ()
690{
691 if (shade != 100 || (bg_flags & BG_TINT_SET))
692 bg_flags |= BG_NEEDS_TINT;
693 else
694 bg_flags &= ~BG_NEEDS_TINT;
695} 711}
696 712
697bool 713bool
698rxvt_term::bg_set_tint (rxvt_color &new_tint) 714rxvt_term::bg_set_tint (rxvt_color &new_tint)
699{ 715{
709 && (c.b <= 0x00ff || c.b >= 0xff00)) 725 && (c.b <= 0x00ff || c.b >= 0xff00))
710 bg_flags |= BG_TINT_BITAND; 726 bg_flags |= BG_TINT_BITAND;
711 else 727 else
712 bg_flags &= ~BG_TINT_BITAND; 728 bg_flags &= ~BG_TINT_BITAND;
713 729
714 set_tint_shade_flags ();
715 return true; 730 return true;
716 } 731 }
717 732
718 return false; 733 return false;
719} 734}
728 new_shade = 200 - (100 + new_shade); 743 new_shade = 200 - (100 + new_shade);
729 744
730 if (new_shade != shade) 745 if (new_shade != shade)
731 { 746 {
732 shade = new_shade; 747 shade = new_shade;
733 set_tint_shade_flags ();
734 return true; 748 return true;
735 } 749 }
736 750
737 return false; 751 return false;
738} 752}
759 params[i+2] = XDoubleToFixed (kernel[i] / sum); 773 params[i+2] = XDoubleToFixed (kernel[i] / sum);
760} 774}
761#endif 775#endif
762 776
763bool 777bool
764rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth) 778rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
765{ 779{
766 bool ret = false; 780 bool ret = false;
767#if XRENDER 781#if XRENDER
768 if (!(bg_flags & BG_HAS_RENDER_CONV)) 782 if (!(bg_flags & BG_HAS_RENDER_CONV))
769 return false; 783 return false;
824#endif 838#endif
825 return ret; 839 return ret;
826} 840}
827 841
828bool 842bool
829rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 843rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
830{ 844{
831 bool ret = false; 845 bool ret = false;
832 846
833 if (shade == 100 && (bg_flags & BG_TINT_BITAND)) 847 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
834 { 848 {
1014 1028
1015 if (gc) 1029 if (gc)
1016 { 1030 {
1017 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1031 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1018 ret = true; 1032 ret = true;
1019 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS; 1033 bool need_blur = h_blurRadius && v_blurRadius;
1034 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1020 1035
1021 if (!(bg_flags & BG_CLIENT_RENDER)) 1036 if (!(bg_flags & BG_CLIENT_RENDER))
1022 { 1037 {
1023 if (bg_flags & BG_NEEDS_BLUR) 1038 if (need_blur)
1024 {
1025 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1026 tr_flags &= ~BG_NEEDS_BLUR;
1027 } 1039 {
1028 if (bg_flags & BG_NEEDS_TINT) 1040 if (blur_pixmap (bg_pixmap, window_width, window_height))
1041 need_blur = false;
1029 { 1042 }
1043 if (need_tint)
1044 {
1030 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1045 if (tint_pixmap (bg_pixmap, window_width, window_height))
1031 tr_flags &= ~BG_NEEDS_TINT; 1046 need_tint = false;
1032 } 1047 }
1033 if (tr_flags & BG_NEEDS_TINT) 1048 if (need_tint)
1034 { 1049 {
1035 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1050 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1036 if (ximage) 1051 if (ximage)
1037 { 1052 {
1038 /* our own client-side tinting */ 1053 /* our own client-side tinting */
1039 tint_ximage (DefaultVisual (dpy, display->screen), ximage); 1054 tint_ximage (ximage);
1040 1055
1041 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height); 1056 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1042 XDestroyImage (ximage); 1057 XDestroyImage (ximage);
1043 } 1058 }
1044 } 1059 }
1065# endif /* ENABLE_TRANSPARENCY */ 1080# endif /* ENABLE_TRANSPARENCY */
1066 1081
1067bool 1082bool
1068rxvt_term::bg_render () 1083rxvt_term::bg_render ()
1069{ 1084{
1070 bool transparent = false;
1071
1072 bg_invalidate (); 1085 bg_invalidate ();
1073# ifdef ENABLE_TRANSPARENCY 1086# ifdef ENABLE_TRANSPARENCY
1074 if (bg_flags & BG_IS_TRANSPARENT) 1087 if (bg_flags & BG_IS_TRANSPARENT)
1075 { 1088 {
1076 /* we need to re-generate transparency pixmap in that case ! */ 1089 /* we need to re-generate transparency pixmap in that case ! */
1077 transparent = make_transparency_pixmap (); 1090 if (make_transparency_pixmap ())
1078 if (transparent)
1079 bg_flags |= BG_IS_VALID; 1091 bg_flags |= BG_IS_VALID;
1080 } 1092 }
1081# endif 1093# endif
1082 1094
1083# ifdef BG_IMAGE_FROM_FILE 1095# ifdef BG_IMAGE_FROM_FILE
1084 if (bg_flags & BG_IS_FROM_FILE) 1096 if (bg_image.flags & IM_IS_SET)
1085 { 1097 {
1086 if (render_image (transparent)) 1098 if (render_image (bg_image))
1087 bg_flags |= BG_IS_VALID; 1099 bg_flags |= BG_IS_VALID;
1088 } 1100 }
1089# endif 1101# endif
1090 1102
1091 if (!(bg_flags & BG_IS_VALID)) 1103 if (!(bg_flags & BG_IS_VALID))
1145 lookup[i] = (tmp / 0xffff) << sh; 1157 lookup[i] = (tmp / 0xffff) << sh;
1146 } 1158 }
1147} 1159}
1148 1160
1149void 1161void
1150rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1162rxvt_term::tint_ximage (XImage *ximage)
1151{ 1163{
1164 unsigned int size_r, size_g, size_b;
1152 int sh_r, sh_g, sh_b; 1165 int sh_r, sh_g, sh_b;
1153 uint32_t mask_r, mask_g, mask_b; 1166 uint32_t mask_r, mask_g, mask_b;
1154 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1167 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1155 unsigned short low; 1168 unsigned short low;
1156 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1169 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1161 mask_r = visual->red_mask; 1174 mask_r = visual->red_mask;
1162 mask_g = visual->green_mask; 1175 mask_g = visual->green_mask;
1163 mask_b = visual->blue_mask; 1176 mask_b = visual->blue_mask;
1164 1177
1165 /* boring lookup table pre-initialization */ 1178 /* boring lookup table pre-initialization */
1166 switch (ximage->depth) 1179 sh_r = ecb_ctz32 (mask_r);
1167 { 1180 sh_g = ecb_ctz32 (mask_g);
1168 case 15: 1181 sh_b = ecb_ctz32 (mask_b);
1169 if ((mask_r != 0x7c00) || 1182
1170 (mask_g != 0x03e0) || 1183 size_r = mask_r >> sh_r;
1171 (mask_b != 0x001f)) 1184 size_g = mask_g >> sh_g;
1185 size_b = mask_b >> sh_b;
1186
1187 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1172 return; 1188 return;
1173 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1189
1190 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1174 lookup_r = lookup; 1191 lookup_r = lookup;
1175 lookup_g = lookup+32; 1192 lookup_g = lookup + size_r;
1176 lookup_b = lookup+32+32; 1193 lookup_b = lookup + size_r + size_g;
1177 sh_r = 10;
1178 sh_g = 5;
1179 sh_b = 0;
1180 break;
1181 case 16:
1182 if ((mask_r != 0xf800) ||
1183 (mask_g != 0x07e0) ||
1184 (mask_b != 0x001f))
1185 return;
1186 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1187 lookup_r = lookup;
1188 lookup_g = lookup+32;
1189 lookup_b = lookup+32+64;
1190 sh_r = 11;
1191 sh_g = 5;
1192 sh_b = 0;
1193 break;
1194 case 24:
1195 if ((mask_r != 0xff0000) ||
1196 (mask_g != 0x00ff00) ||
1197 (mask_b != 0x0000ff))
1198 return;
1199 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1200 lookup_r = lookup;
1201 lookup_g = lookup+256;
1202 lookup_b = lookup+256+256;
1203 sh_r = 16;
1204 sh_g = 8;
1205 sh_b = 0;
1206 break;
1207 case 32:
1208 if ((mask_r != 0xff0000) ||
1209 (mask_g != 0x00ff00) ||
1210 (mask_b != 0x0000ff))
1211 return;
1212 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1213 lookup_r = lookup;
1214 lookup_g = lookup+256;
1215 lookup_b = lookup+256+256;
1216 sh_r = 16;
1217 sh_g = 8;
1218 sh_b = 0;
1219 break;
1220 default:
1221 return; /* we do not support this color depth */
1222 }
1223 1194
1224 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1195 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1225 1196
1226 if (bg_flags & BG_TINT_SET) 1197 if (bg_flags & BG_TINT_SET)
1227 tint.get (c); 1198 tint.get (c);
1249 fill_lut (lookup_g, mask_g, sh_g, low, c.g); 1220 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1250 fill_lut (lookup_b, mask_b, sh_b, low, c.b); 1221 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1251 1222
1252 /* apply table to input image (replacing colors by newly calculated ones) */ 1223 /* apply table to input image (replacing colors by newly calculated ones) */
1253 if (ximage->bits_per_pixel == 32 1224 if (ximage->bits_per_pixel == 32
1254 && (ximage->depth == 24 || ximage->depth == 32)
1255 && ximage->byte_order == host_byte_order) 1225 && ximage->byte_order == host_byte_order)
1256 { 1226 {
1257 uint32_t *p1, *pf, *p, *pl; 1227 char *line = ximage->data;
1258 p1 = (uint32_t *) ximage->data;
1259 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1260 1228
1261 while (p1 < pf) 1229 for (int y = 0; y < ximage->height; y++)
1262 {
1263 p = p1;
1264 pl = p1 + ximage->width;
1265 for (; p < pl; p++)
1266 { 1230 {
1267 *p = lookup_r[(*p & 0xff0000) >> 16] | 1231 uint32_t *p = (uint32_t *)line;
1268 lookup_g[(*p & 0x00ff00) >> 8] | 1232 for (int x = 0; x < ximage->width; x++)
1269 lookup_b[(*p & 0x0000ff)] |
1270 (*p & 0xff000000);
1271 } 1233 {
1272 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1234 *p = lookup_r[(*p & mask_r) >> sh_r] |
1235 lookup_g[(*p & mask_g) >> sh_g] |
1236 lookup_b[(*p & mask_b) >> sh_b];
1237 p++;
1238 }
1239 line += ximage->bytes_per_line;
1273 } 1240 }
1274 } 1241 }
1275 else 1242 else
1276 { 1243 {
1277 for (int y = 0; y < ximage->height; y++) 1244 for (int y = 0; y < ximage->height; y++)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines