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.206 by sf-exg, Thu Apr 12 10:22:50 2012 UTC vs.
Revision 1.232 by root, Mon Jun 4 15:18:52 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 63# if BG_IMAGE_FROM_FILE
64 if (pixbuf) 64 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
65 g_object_unref (pixbuf); 65 bg_image->destroy ();
66#endif 66# endif
67 67
68 if (bg_pixmap) 68 if (bg_pixmap)
69 XFreePixmap (dpy, bg_pixmap); 69 XFreePixmap (dpy, bg_pixmap);
70} 70}
71 71
… …
84} 84}
85 85
86bool 86bool
87rxvt_term::bg_window_size_sensitive () 87rxvt_term::bg_window_size_sensitive ()
88{ 88{
89# ifdef ENABLE_TRANSPARENCY 89# if ENABLE_TRANSPARENCY
90 if (bg_flags & BG_IS_TRANSPARENT) 90 if (bg_flags & BG_IS_TRANSPARENT)
91 return true; 91 return true;
92# endif 92# endif
93 93
94# ifdef BG_IMAGE_FROM_FILE 94# if BG_IMAGE_FROM_FILE
95 if (bg_flags & BG_IS_FROM_FILE) 95 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
96 { 96 {
97 if (bg_flags & BG_IS_SIZE_SENSITIVE) 97 if ((bg_image->flags & IM_IS_SIZE_SENSITIVE)
98 || bg_image->width () > szHint.width
99 || bg_image->height () > szHint.height)
98 return true; 100 return true;
99 } 101 }
100# endif 102# endif
101 103
102 return false; 104 return false;
103} 105}
104 106
105bool 107bool
106rxvt_term::bg_window_position_sensitive () 108rxvt_term::bg_window_position_sensitive ()
107{ 109{
108# ifdef ENABLE_TRANSPARENCY 110# if ENABLE_TRANSPARENCY
109 if (bg_flags & BG_IS_TRANSPARENT) 111 if (bg_flags & BG_IS_TRANSPARENT)
110 return true; 112 return true;
111# endif 113# endif
112 114
113# ifdef BG_IMAGE_FROM_FILE 115# if BG_IMAGE_FROM_FILE
114 if (bg_flags & BG_IS_FROM_FILE) 116 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
115 { 117 {
116 if (bg_flags & BG_ROOT_ALIGN) 118 if (bg_image->flags & IM_ROOT_ALIGN)
117 return true; 119 return true;
118 } 120 }
119# endif 121# endif
120 122
121 return false; 123 return false;
122} 124}
123 125
124# ifdef BG_IMAGE_FROM_FILE 126# if BG_IMAGE_FROM_FILE
125static inline int 127static inline int
126make_align_position (int align, int window_size, int image_size) 128make_align_position (int align, int window_size, int image_size)
127{ 129{
128 if (align >= 0 && align <= 100) 130 if (align >= 0 && align <= 100)
129 return lerp (0, window_size - image_size, align); 131 return lerp (0, window_size - image_size, align);
… …
148 150
149 min_it (dst_size, target_size - dst_pos); 151 min_it (dst_size, target_size - dst_pos);
150 return src_pos; 152 return src_pos;
151} 153}
152 154
155static void
156parse_style (const char *style, int &x, int &y, unsigned int &w, unsigned int &h, uint8_t &flags)
157{
158 if (!strcasecmp (style, "tiled"))
159 {
160 flags = IM_TILE;
161 w = h = noScale;
162 x = y = 0;
163 }
164 else if (!strcasecmp (style, "aspect-stretched"))
165 {
166 flags = IM_KEEP_ASPECT;
167 w = h = windowScale;
168 x = y = centerAlign;
169 }
170 else if (!strcasecmp (style, "stretched"))
171 {
172 flags = 0;
173 w = h = windowScale;
174 x = y = centerAlign;
175 }
176 else if (!strcasecmp (style, "centered"))
177 {
178 flags = 0;
179 w = h = noScale;
180 x = y = centerAlign;
181 }
182 else if (!strcasecmp (style, "root-tiled"))
183 {
184 flags = IM_TILE|IM_ROOT_ALIGN;
185 w = h = noScale;
186 x = y = 0;
187 }
188}
189
153bool 190bool
154rxvt_term::bg_set_geometry (const char *geom, bool update) 191rxvt_image::set_geometry (const char *geom, bool update)
155{ 192{
156 bool changed = false; 193 bool changed = false;
157 int geom_flags = 0; 194 int geom_flags = 0;
158 int x = h_align; 195 int x = h_align;
159 int y = v_align; 196 int y = v_align;
160 unsigned int w = h_scale; 197 unsigned int w = h_scale;
161 unsigned int h = v_scale; 198 unsigned int h = v_scale;
162 unsigned long new_flags = 0; 199 uint8_t new_flags = 0;
163 200
164 if (geom == NULL) 201 if (geom == NULL)
165 return false; 202 return false;
166 203
167 if (geom[0]) 204 if (geom[0])
168 { 205 {
169 char **arr = rxvt_strsplit (':', geom); 206 char **arr = rxvt_strsplit (':', geom);
170 207
171 for (int i = 0; arr[i]; i++) 208 for (int i = 0; arr[i]; i++)
172 { 209 {
173 if (!strcasecmp (arr[i], "style=tiled")) 210 if (!strncasecmp (arr[i], "style=", 6))
174 { 211 {
175 new_flags = BG_TILE; 212 parse_style (arr[i] + 6, x, y, w, h, new_flags);
176 w = h = noScale;
177 x = y = 0;
178 geom_flags = WidthValue|HeightValue|XValue|YValue; 213 geom_flags = WidthValue|HeightValue|XValue|YValue;
179 } 214 }
180 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
181 {
182 new_flags = BG_KEEP_ASPECT;
183 w = h = windowScale;
184 x = y = centerAlign;
185 geom_flags = WidthValue|HeightValue|XValue|YValue;
186 }
187 else if (!strcasecmp (arr[i], "style=stretched"))
188 {
189 new_flags = 0;
190 w = h = windowScale;
191 geom_flags = WidthValue|HeightValue;
192 }
193 else if (!strcasecmp (arr[i], "style=centered"))
194 {
195 new_flags = 0;
196 w = h = noScale;
197 x = y = centerAlign;
198 geom_flags = WidthValue|HeightValue|XValue|YValue;
199 }
200 else if (!strcasecmp (arr[i], "style=root-tiled"))
201 {
202 new_flags = BG_TILE|BG_ROOT_ALIGN;
203 w = h = noScale;
204 geom_flags = WidthValue|HeightValue;
205 }
206 else if (!strcasecmp (arr[i], "op=tile")) 215 else if (!strcasecmp (arr[i], "op=tile"))
207 new_flags |= BG_TILE; 216 new_flags |= IM_TILE;
208 else if (!strcasecmp (arr[i], "op=keep-aspect")) 217 else if (!strcasecmp (arr[i], "op=keep-aspect"))
209 new_flags |= BG_KEEP_ASPECT; 218 new_flags |= IM_KEEP_ASPECT;
210 else if (!strcasecmp (arr[i], "op=root-align")) 219 else if (!strcasecmp (arr[i], "op=root-align"))
211 new_flags |= BG_ROOT_ALIGN; 220 new_flags |= IM_ROOT_ALIGN;
212 221
213 // deprecated 222 // deprecated
214 else if (!strcasecmp (arr[i], "tile")) 223 else if (!strcasecmp (arr[i], "tile"))
215 { 224 {
216 new_flags |= BG_TILE; 225 new_flags |= IM_TILE;
217 w = h = noScale; 226 w = h = noScale;
218 geom_flags |= WidthValue|HeightValue; 227 geom_flags |= WidthValue|HeightValue;
219 } 228 }
220 else if (!strcasecmp (arr[i], "propscale")) 229 else if (!strcasecmp (arr[i], "propscale"))
221 { 230 {
222 new_flags |= BG_KEEP_ASPECT; 231 new_flags |= IM_KEEP_ASPECT;
223 w = h = windowScale; 232 w = h = windowScale;
224 geom_flags |= WidthValue|HeightValue; 233 geom_flags |= WidthValue|HeightValue;
225 } 234 }
226 else if (!strcasecmp (arr[i], "hscale")) 235 else if (!strcasecmp (arr[i], "hscale"))
227 { 236 {
228 new_flags |= BG_TILE; 237 new_flags |= IM_TILE;
229 w = windowScale; 238 w = windowScale;
230 h = noScale; 239 h = noScale;
231 geom_flags |= WidthValue|HeightValue; 240 geom_flags |= WidthValue|HeightValue;
232 } 241 }
233 else if (!strcasecmp (arr[i], "vscale")) 242 else if (!strcasecmp (arr[i], "vscale"))
234 { 243 {
235 new_flags |= BG_TILE; 244 new_flags |= IM_TILE;
236 h = windowScale; 245 h = windowScale;
237 w = noScale; 246 w = noScale;
238 geom_flags |= WidthValue|HeightValue; 247 geom_flags |= WidthValue|HeightValue;
239 } 248 }
240 else if (!strcasecmp (arr[i], "scale")) 249 else if (!strcasecmp (arr[i], "scale"))
… …
248 x = y = centerAlign; 257 x = y = centerAlign;
249 geom_flags |= WidthValue|HeightValue|XValue|YValue; 258 geom_flags |= WidthValue|HeightValue|XValue|YValue;
250 } 259 }
251 else if (!strcasecmp (arr[i], "root")) 260 else if (!strcasecmp (arr[i], "root"))
252 { 261 {
253 new_flags |= BG_TILE|BG_ROOT_ALIGN; 262 new_flags |= IM_TILE|IM_ROOT_ALIGN;
254 w = h = noScale; 263 w = h = noScale;
255 geom_flags |= WidthValue|HeightValue; 264 geom_flags |= WidthValue|HeightValue;
256 } 265 }
257 266
258 else 267 else
… …
260 } /* done parsing ops */ 269 } /* done parsing ops */
261 270
262 rxvt_free_strsplit (arr); 271 rxvt_free_strsplit (arr);
263 } 272 }
264 273
265 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; 274 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
266 275
267 if (!update) 276 if (!update)
268 { 277 {
269 if (!(geom_flags & XValue)) 278 if (!(geom_flags & XValue))
270 x = y = defaultAlign; 279 x = y = defaultAlign;
… …
277 h = w; 286 h = w;
278 else if (!(geom_flags & WidthValue)) 287 else if (!(geom_flags & WidthValue))
279 w = h; 288 w = h;
280 } 289 }
281 290
282 min_it (w, 1000);
283 min_it (h, 1000);
284 clamp_it (x, -100, 200); 291 clamp_it (x, -100, 200);
285 clamp_it (y, -100, 200); 292 clamp_it (y, -100, 200);
286 293
287 if (bg_flags != new_flags 294 if (flags != new_flags
288 || h_scale != w 295 || h_scale != w
289 || v_scale != h 296 || v_scale != h
290 || h_align != x 297 || h_align != x
291 || v_align != y) 298 || v_align != y)
292 { 299 {
293 bg_flags = new_flags; 300 flags = new_flags;
294 h_scale = w; 301 h_scale = w;
295 v_scale = h; 302 v_scale = h;
296 h_align = x; 303 h_align = x;
297 v_align = y; 304 v_align = y;
298 changed = true; 305 changed = true;
299 } 306 }
300 307
308 if (is_size_sensitive ())
309 flags |= IM_IS_SIZE_SENSITIVE;
310 else
311 flags &= ~IM_IS_SIZE_SENSITIVE;
312
301 return changed; 313 return changed;
302} 314}
303 315
304void 316void
305rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 317rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
306{ 318{
319 int image_width = image.width ();
320 int image_height = image.height ();
307 int target_width = szHint.width; 321 int target_width = szHint.width;
308 int target_height = szHint.height; 322 int target_height = szHint.height;
323 int h_scale = min (image.h_scale, 32767 * 100 / target_width);
324 int v_scale = min (image.v_scale, 32767 * 100 / target_height);
309 325
310 w = h_scale * target_width / 100; 326 w = h_scale * target_width / 100;
311 h = v_scale * target_height / 100; 327 h = v_scale * target_height / 100;
312 328
313 if (bg_flags & BG_KEEP_ASPECT) 329 if (image.flags & IM_KEEP_ASPECT)
314 { 330 {
315 float scale = (float)w / image_width; 331 float scale = (float)w / image_width;
316 min_it (scale, (float)h / image_height); 332 min_it (scale, (float)h / image_height);
317 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
318 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
319 } 335 }
320 336
321 if (!w) w = image_width; 337 if (!w) w = image_width;
322 if (!h) h = image_height; 338 if (!h) h = image_height;
323 339
324 if (bg_flags & BG_ROOT_ALIGN) 340 if (image.flags & IM_ROOT_ALIGN)
325 { 341 {
326 x = -target_x; 342 x = -target_x;
327 y = -target_y; 343 y = -target_y;
328 } 344 }
329 else 345 else
330 { 346 {
331 x = make_align_position (h_align, target_width, w); 347 x = make_align_position (image.h_align, target_width, w);
332 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (image.v_align, target_height, h);
333 } 349 }
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} 350}
343 351
344# ifdef HAVE_PIXBUF 352# if HAVE_PIXBUF
345bool 353bool
346rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 354rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
347 int src_x, int src_y, int dst_x, int dst_y, 355 int src_x, int src_y, int dst_x, int dst_y,
348 unsigned int width, unsigned int height) 356 unsigned int width, unsigned int height, bool argb)
349{ 357{
350 XImage *ximage; 358 XImage *ximage;
351 char *data, *line; 359 char *line;
352 int bytes_per_pixel;
353 int width_r, width_g, width_b; 360 int width_r, width_g, width_b, width_a;
354 int sh_r, sh_g, sh_b; 361 int sh_r, sh_g, sh_b, sh_a;
362 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
355 int rowstride; 363 int rowstride;
356 int channels; 364 int channels;
357 unsigned char *row; 365 unsigned char *row;
358 366
359 if (visual->c_class != TrueColor) 367 if (visual->c_class != TrueColor)
360 return false; 368 return false;
361 369
362 if (depth == 24 || depth == 32) 370 if (argb)
363 bytes_per_pixel = 4; 371 {
364 else if (depth == 15 || depth == 16) 372 red_mask = 0xff << 16;
365 bytes_per_pixel = 2; 373 green_mask = 0xff << 8;
374 blue_mask = 0xff;
375 alpha_mask = 0xff << 24;
376 }
366 else 377 else
378 {
379 red_mask = visual->red_mask;
380 green_mask = visual->green_mask;
381 blue_mask = visual->blue_mask;
382#if XRENDER
383 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
384 if (format)
385 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
386 else
387#endif
388 alpha_mask = 0;
389 }
390
391 width_r = ecb_popcount32 (red_mask);
392 width_g = ecb_popcount32 (green_mask);
393 width_b = ecb_popcount32 (blue_mask);
394 width_a = ecb_popcount32 (alpha_mask);
395
396 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
367 return false; 397 return false;
368 398
369 width_r = ecb_popcount32 (visual->red_mask); 399 sh_r = ecb_ctz32 (red_mask);
370 width_g = ecb_popcount32 (visual->green_mask); 400 sh_g = ecb_ctz32 (green_mask);
371 width_b = ecb_popcount32 (visual->blue_mask); 401 sh_b = ecb_ctz32 (blue_mask);
402 sh_a = ecb_ctz32 (alpha_mask);
372 403
373 if (width_r > 8 || width_g > 8 || width_b > 8) 404 if (width > 32767 || height > 32767)
374 return false; 405 return false;
375 406
376 sh_r = ecb_ctz32 (visual->red_mask); 407 ximage = XCreateImage (dpy, visual, argb ? 32 : depth, ZPixmap, 0, 0,
377 sh_g = ecb_ctz32 (visual->green_mask); 408 width, height, 32, 0);
378 sh_b = ecb_ctz32 (visual->blue_mask); 409 if (!ximage)
379
380 if (width > INT_MAX / height / bytes_per_pixel)
381 return false; 410 return false;
382 411
383 data = (char *)malloc (width * height * bytes_per_pixel); 412 if (height > INT_MAX / ximage->bytes_per_line
384 if (!data) 413 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
385 return false;
386
387 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
388 width, height, bytes_per_pixel * 8, 0);
389 if (!ximage)
390 { 414 {
391 free (data); 415 XDestroyImage (ximage);
392 return false; 416 return false;
393 } 417 }
394 418
395 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 419 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
396 420
397 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 421 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
398 channels = gdk_pixbuf_get_n_channels (pixbuf); 422 channels = gdk_pixbuf_get_n_channels (pixbuf);
399 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 423 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
400 line = data; 424 line = ximage->data;
425
426 rgba c (0, 0, 0);
427
428 if (channels == 4 && alpha_mask == 0)
429 {
430 pix_colors[Color_bg].get (c);
431 c.r >>= 8;
432 c.g >>= 8;
433 c.b >>= 8;
434 }
401 435
402 for (int y = 0; y < height; y++) 436 for (int y = 0; y < height; y++)
403 { 437 {
404 for (int x = 0; x < width; x++) 438 for (int x = 0; x < width; x++)
405 { 439 {
406 unsigned char *pixel = row + x * channels; 440 unsigned char *pixel = row + x * channels;
407 uint32_t value; 441 uint32_t value;
442 unsigned char r, g, b, a;
408 443
444 if (channels == 4)
445 {
446 a = pixel[3];
447 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
448 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
449 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
450 }
451 else
452 {
453 a = 0xff;
454 r = pixel[0];
455 g = pixel[1];
456 b = pixel[2];
457 }
458
409 value = ((pixel[0] >> (8 - width_r)) << sh_r) 459 value = ((r >> (8 - width_r)) << sh_r)
410 | ((pixel[1] >> (8 - width_g)) << sh_g) 460 | ((g >> (8 - width_g)) << sh_g)
411 | ((pixel[2] >> (8 - width_b)) << sh_b); 461 | ((b >> (8 - width_b)) << sh_b)
462 | ((a >> (8 - width_a)) << sh_a);
412 463
413 if (bytes_per_pixel == 4) 464 if (ximage->bits_per_pixel == 32)
414 ((uint32_t *)line)[x] = value; 465 ((uint32_t *)line)[x] = value;
415 else 466 else
416 ((uint16_t *)line)[x] = value; 467 XPutPixel (ximage, x, y, value);
417 } 468 }
418 469
419 row += rowstride; 470 row += rowstride;
420 line += ximage->bytes_per_line; 471 line += ximage->bytes_per_line;
421 } 472 }
… …
424 XDestroyImage (ximage); 475 XDestroyImage (ximage);
425 return true; 476 return true;
426} 477}
427 478
428bool 479bool
429rxvt_term::render_image (bool transparent) 480rxvt_term::render_image (rxvt_image &image)
430{ 481{
482 GdkPixbuf *pixbuf = image.pixbuf;
431 if (!pixbuf) 483 if (!pixbuf)
432 return false; 484 return false;
433 485
434 if (transparent 486 bool need_blend = bg_flags & BG_IS_VALID;
487
488 if (need_blend
435 && !(bg_flags & BG_HAS_RENDER)) 489 && !(display->flags & DISPLAY_HAS_RENDER))
436 return false; 490 return false;
437 491
438 GdkPixbuf *result; 492 GdkPixbuf *result;
439 493
440 int image_width = gdk_pixbuf_get_width (pixbuf); 494 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
448 int x = 0; 502 int x = 0;
449 int y = 0; 503 int y = 0;
450 int w = 0; 504 int w = 0;
451 int h = 0; 505 int h = 0;
452 506
453 get_image_geometry (image_width, image_height, w, h, x, y); 507 get_image_geometry (image, w, h, x, y);
454 508
455 if (!(bg_flags & BG_ROOT_ALIGN) 509 if (!(image.flags & IM_ROOT_ALIGN)
456 && (x >= target_width 510 && (x >= target_width
457 || y >= target_height 511 || y >= target_height
458 || x + w <= 0 512 || x + w <= 0
459 || y + h <= 0)) 513 || y + h <= 0))
460 return false; 514 return false;
… …
474 528
475 bool ret = false; 529 bool ret = false;
476 530
477 XGCValues gcv; 531 XGCValues gcv;
478 GC gc; 532 GC gc;
479 Pixmap root_pmap; 533 Pixmap tmp_pixmap;
480 534
481 image_width = gdk_pixbuf_get_width (result); 535 image_width = gdk_pixbuf_get_width (result);
482 image_height = gdk_pixbuf_get_height (result); 536 image_height = gdk_pixbuf_get_height (result);
483 537
484 if (transparent) 538 if (need_blend)
485 { 539 tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);
486 root_pmap = bg_pixmap;
487 bg_pixmap = None;
488 }
489 else 540 else
490 { 541 {
542 // optimise bg pixmap size when tiling, but only if there are no
543 // other pixbufs to render. Otherwise, the bg pixmap size must
544 // be equal to the window size.
491 if (bg_flags & BG_TILE) 545 if ((image.flags & IM_TILE)
546 && image_vec.size () == 1)
492 { 547 {
493 new_pmap_width = min (image_width, target_width); 548 new_pmap_width = min (image_width, target_width);
494 new_pmap_height = min (image_height, target_height); 549 new_pmap_height = min (image_height, target_height);
495 } 550 }
496 }
497 551
498 if (bg_pixmap == None 552 if (bg_pixmap == None
499 || bg_pmap_width != new_pmap_width 553 || bg_pmap_width != new_pmap_width
500 || bg_pmap_height != new_pmap_height) 554 || bg_pmap_height != new_pmap_height)
501 { 555 {
502 if (bg_pixmap) 556 if (bg_pixmap)
503 XFreePixmap (dpy, bg_pixmap); 557 XFreePixmap (dpy, bg_pixmap);
504 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 558 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
505 bg_pmap_width = new_pmap_width; 559 bg_pmap_width = new_pmap_width;
506 bg_pmap_height = new_pmap_height; 560 bg_pmap_height = new_pmap_height;
561 }
562
563 tmp_pixmap = bg_pixmap;
507 } 564 }
508 565
509 gcv.foreground = pix_colors[Color_bg]; 566 gcv.foreground = pix_colors[Color_bg];
510 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 567 gc = XCreateGC (dpy, tmp_pixmap, GCForeground, &gcv);
511 568
512 if (gc) 569 if (gc)
513 { 570 {
514 if (bg_flags & BG_TILE) 571 if (image.flags & IM_TILE)
515 { 572 {
516 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 573 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, need_blend ? 32 : depth);
517 pixbuf_to_pixmap (result, tile, gc, 574 pixbuf_to_pixmap (result, tile, gc,
518 0, 0, 575 0, 0,
519 0, 0, 576 0, 0,
520 image_width, image_height); 577 image_width, image_height, need_blend);
521 578
522 gcv.tile = tile; 579 gcv.tile = tile;
523 gcv.fill_style = FillTiled; 580 gcv.fill_style = FillTiled;
524 gcv.ts_x_origin = x; 581 gcv.ts_x_origin = x;
525 gcv.ts_y_origin = y; 582 gcv.ts_y_origin = y;
526 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 583 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
527 584
528 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);
529 XFreePixmap (dpy, tile); 586 XFreePixmap (dpy, tile);
530 } 587 }
531 else 588 else
532 { 589 {
533 int src_x, src_y, dst_x, dst_y; 590 int src_x, src_y, dst_x, dst_y;
… …
537 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 594 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
538 595
539 if (dst_x > 0 || dst_y > 0 596 if (dst_x > 0 || dst_y > 0
540 || dst_x + dst_width < new_pmap_width 597 || dst_x + dst_width < new_pmap_width
541 || dst_y + dst_height < new_pmap_height) 598 || dst_y + dst_height < new_pmap_height)
542 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 599 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
543 600
544 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 601 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
545 pixbuf_to_pixmap (result, bg_pixmap, gc, 602 pixbuf_to_pixmap (result, tmp_pixmap, gc,
546 src_x, src_y, 603 src_x, src_y,
547 dst_x, dst_y, 604 dst_x, dst_y,
548 dst_width, dst_height); 605 dst_width, dst_height, need_blend);
549 } 606 }
607
608 if (image.need_blur ())
609 blur_pixmap (tmp_pixmap, new_pmap_width, new_pmap_height, need_blend, image.h_blurRadius, image.v_blurRadius);
610 if (image.need_tint ())
611 tint_pixmap (tmp_pixmap, new_pmap_width, new_pmap_height, need_blend, image.tint, image.tint_set, image.shade);
550 612
551#if XRENDER 613#if XRENDER
552 if (transparent) 614 if (need_blend)
553 { 615 {
616 XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
554 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 617 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
555 618
556 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0); 619 Picture src = XRenderCreatePicture (dpy, tmp_pixmap, argb_format, 0, 0);
557 620
558 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0); 621 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
559 622
560 Picture mask = create_xrender_mask (dpy, vt, False, False); 623 Picture mask = create_xrender_mask (dpy, vt, False, False);
561 624
562 XRenderColor mask_c; 625 XRenderColor mask_c;
563 626
564 mask_c.alpha = 0x8000; 627 mask_c.alpha = image.alpha;
565 mask_c.red = 628 mask_c.red =
566 mask_c.green = 629 mask_c.green =
567 mask_c.blue = 0; 630 mask_c.blue = 0;
568 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 631 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
569 632
… …
581 } 644 }
582 645
583 if (result != pixbuf) 646 if (result != pixbuf)
584 g_object_unref (result); 647 g_object_unref (result);
585 648
586 if (transparent) 649 if (need_blend)
587 XFreePixmap (dpy, root_pmap); 650 XFreePixmap (dpy, tmp_pixmap);
588 651
589 return ret; 652 return ret;
590} 653}
591# endif /* HAVE_PIXBUF */ 654# endif /* HAVE_PIXBUF */
592 655
656# ifndef NO_RESOURCES
657static int
658rxvt_define_image (XrmDatabase *database ecb_unused,
659 XrmBindingList bindings ecb_unused,
660 XrmQuarkList quarks,
661 XrmRepresentation *type ecb_unused,
662 XrmValue *value,
663 XPointer closure ecb_unused)
664{
665 int size;
666
667 for (size = 0; quarks[size] != NULLQUARK; size++)
668 ;
669
670 if (size >= 2)
671 {
672 int id = strtol (XrmQuarkToString (quarks[size-2]), 0, 0);
673 if (id >= 1)
674 GET_R->parse_image (id, XrmQuarkToString (quarks[size-1]), (char *)value->addr);
675 }
676 return False;
677}
678# endif
679
680void
681rxvt_term::parse_image (int id, const char *type, const char *arg)
682{
683 if (image_vec.size () < id + 1)
684 image_vec.resize (id + 1);
685
686 rxvt_image *image = &image_vec[id];
687}
688
689rxvt_image::rxvt_image ()
690{
691 alpha = 0xffff;
692 flags = 0;
693 h_scale =
694 v_scale = defaultScale;
695 h_align =
696 v_align = defaultAlign;
697
698# if HAVE_PIXBUF
699 pixbuf = 0;
700# endif
701}
702
593bool 703bool
594rxvt_term::bg_set_file (const char *file) 704rxvt_image::set_file_geometry (const char *file)
595{ 705{
596 if (!file || !*file) 706 if (!file || !*file)
597 return false; 707 return false;
598 708
599 bool ret = false;
600 const char *p = strchr (file, ';'); 709 const char *p = strchr (file, ';');
601 710
602 if (p) 711 if (p)
603 { 712 {
604 size_t len = p - file; 713 size_t len = p - file;
… …
606 memcpy (f, file, len); 715 memcpy (f, file, len);
607 f[len] = '\0'; 716 f[len] = '\0';
608 file = f; 717 file = f;
609 } 718 }
610 719
720 bool ret = set_file (file);
721 alpha = 0x8000;
722 if (ret)
723 set_geometry (p ? p + 1 : "");
724 return ret;
725}
726
727bool
728rxvt_image::set_file (const char *file)
729{
730 bool ret = false;
731
611# ifdef HAVE_PIXBUF 732# if HAVE_PIXBUF
612 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 733 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
613 if (image) 734 if (image)
614 { 735 {
615 if (pixbuf) 736 if (pixbuf)
616 g_object_unref (pixbuf); 737 g_object_unref (pixbuf);
617 pixbuf = image; 738 pixbuf = image;
618 bg_flags |= BG_IS_FROM_FILE;
619 ret = true; 739 ret = true;
620 } 740 }
621# endif 741# endif
622 742
623 if (ret) 743 if (ret)
624 { 744 flags |= IM_IS_SET;
625 if (p)
626 bg_set_geometry (p + 1);
627 else
628 bg_set_default_geometry ();
629 }
630 745
631 return ret; 746 return ret;
632} 747}
633 748
634# endif /* BG_IMAGE_FROM_FILE */ 749# endif /* BG_IMAGE_FROM_FILE */
635 750
636# ifdef ENABLE_TRANSPARENCY
637bool 751bool
638rxvt_term::bg_set_transparent () 752image_effects::set_blur (const char *geom)
639{
640 if (!(bg_flags & BG_IS_TRANSPARENT))
641 {
642 bg_flags |= BG_IS_TRANSPARENT;
643 return true;
644 }
645
646 return false;
647}
648
649bool
650rxvt_term::bg_set_blur (const char *geom)
651{ 753{
652 bool changed = false; 754 bool changed = false;
653 unsigned int hr, vr; 755 unsigned int hr, vr;
654 int junk; 756 int junk;
655 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 757 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
… …
672 { 774 {
673 changed = true; 775 changed = true;
674 v_blurRadius = vr; 776 v_blurRadius = vr;
675 } 777 }
676 778
677 if (h_blurRadius && v_blurRadius)
678 bg_flags |= BG_NEEDS_BLUR;
679 else
680 bg_flags &= ~BG_NEEDS_BLUR;
681
682 return changed; 779 return changed;
683} 780}
684 781
685void
686rxvt_term::set_tint_shade_flags ()
687{
688 if (shade != 100 || (bg_flags & BG_TINT_SET))
689 bg_flags |= BG_NEEDS_TINT;
690 else
691 bg_flags &= ~BG_NEEDS_TINT;
692}
693
694bool 782bool
695rxvt_term::bg_set_tint (rxvt_color &new_tint) 783image_effects::set_tint (const rxvt_color &new_tint)
696{ 784{
697 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 785 if (!tint_set || tint != new_tint)
698 { 786 {
699 tint = new_tint; 787 tint = new_tint;
700 bg_flags |= BG_TINT_SET; 788 tint_set = true;
701 789
702 rgba c;
703 tint.get (c);
704 if ((c.r <= 0x00ff || c.r >= 0xff00)
705 && (c.g <= 0x00ff || c.g >= 0xff00)
706 && (c.b <= 0x00ff || c.b >= 0xff00))
707 bg_flags |= BG_TINT_BITAND;
708 else
709 bg_flags &= ~BG_TINT_BITAND;
710
711 set_tint_shade_flags ();
712 return true; 790 return true;
713 } 791 }
714 792
715 return false; 793 return false;
716} 794}
717 795
718bool 796bool
719rxvt_term::bg_set_shade (const char *shade_str) 797image_effects::set_shade (const char *shade_str)
720{ 798{
721 int new_shade = atoi (shade_str); 799 int new_shade = atoi (shade_str);
722 800
723 clamp_it (new_shade, -100, 200); 801 clamp_it (new_shade, -100, 200);
724 if (new_shade < 0) 802 if (new_shade < 0)
725 new_shade = 200 - (100 + new_shade); 803 new_shade = 200 - (100 + new_shade);
726 804
727 if (new_shade != shade) 805 if (new_shade != shade)
728 { 806 {
729 shade = new_shade; 807 shade = new_shade;
730 set_tint_shade_flags ();
731 return true; 808 return true;
732 } 809 }
733 810
734 return false; 811 return false;
735} 812}
… …
756 params[i+2] = XDoubleToFixed (kernel[i] / sum); 833 params[i+2] = XDoubleToFixed (kernel[i] / sum);
757} 834}
758#endif 835#endif
759 836
760bool 837bool
761rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth) 838rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius)
762{ 839{
763 bool ret = false; 840 bool ret = false;
764#if XRENDER 841#if XRENDER
765 if (!(bg_flags & BG_HAS_RENDER_CONV)) 842 if (!(display->flags & DISPLAY_HAS_RENDER_CONV))
766 return false; 843 return false;
767 844
768 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 845 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
769 double *kernel = (double *)malloc (size * sizeof (double)); 846 double *kernel = (double *)malloc (size * sizeof (double));
770 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 847 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
771 848
772 XRenderPictureAttributes pa; 849 XRenderPictureAttributes pa;
773 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 850 XRenderPictFormat *format = argb ? XRenderFindStandardFormat (dpy, PictStandardARGB32)
851 : XRenderFindVisualFormat (dpy, visual);
774 852
775 pa.repeat = RepeatPad; 853 pa.repeat = RepeatPad;
776 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa); 854 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
777 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth); 855 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
778 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa); 856 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
… …
821#endif 899#endif
822 return ret; 900 return ret;
823} 901}
824 902
825bool 903bool
826rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 904rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade)
827{ 905{
828 bool ret = false; 906 bool ret = false;
829 907
830 if (shade == 100 && (bg_flags & BG_TINT_BITAND)) 908 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
909
910 if (tint_set)
911 tint.get (c);
912
913 if (shade == 100
914 && (c.r <= 0x00ff || c.r >= 0xff00)
915 && (c.g <= 0x00ff || c.g >= 0xff00)
916 && (c.b <= 0x00ff || c.b >= 0xff00))
831 { 917 {
832 XGCValues gcv; 918 XGCValues gcv;
833 GC gc; 919 GC gc;
834 920
835 /* In this case we can tint image server-side getting significant 921 /* In this case we can tint image server-side getting significant
… …
845 ret = true; 931 ret = true;
846 XFreeGC (dpy, gc); 932 XFreeGC (dpy, gc);
847 } 933 }
848 } 934 }
849# if XRENDER 935# if XRENDER
850 else if (bg_flags & BG_HAS_RENDER) 936 else if (display->flags & DISPLAY_HAS_RENDER)
851 { 937 {
852 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
853
854 if (bg_flags & BG_TINT_SET)
855 tint.get (c);
856
857 if (shade <= 100) 938 if (shade <= 100)
858 { 939 {
859 c.r = c.r * shade / 100; 940 c.r = c.r * shade / 100;
860 c.g = c.g * shade / 100; 941 c.g = c.g * shade / 100;
861 c.b = c.b * shade / 100; 942 c.b = c.b * shade / 100;
… …
865 c.r = c.r * (200 - shade) / 100; 946 c.r = c.r * (200 - shade) / 100;
866 c.g = c.g * (200 - shade) / 100; 947 c.g = c.g * (200 - shade) / 100;
867 c.b = c.b * (200 - shade) / 100; 948 c.b = c.b * (200 - shade) / 100;
868 } 949 }
869 950
870 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 951 XRenderPictFormat *format = argb ? XRenderFindStandardFormat (dpy, PictStandardARGB32)
952 : XRenderFindVisualFormat (dpy, visual);
871 953
872 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0); 954 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
873 955
874 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False); 956 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
875 957
… …
911# endif 993# endif
912 994
913 return ret; 995 return ret;
914} 996}
915 997
998# if ENABLE_TRANSPARENCY
916/* 999/*
917 * Builds a pixmap of the same size as the terminal window that contains 1000 * Builds a pixmap of the same size as the terminal window that contains
918 * the tiled portion of the root pixmap that is supposed to be covered by 1001 * the tiled portion of the root pixmap that is supposed to be covered by
919 * our window. 1002 * our window.
920 */ 1003 */
921bool 1004bool
922rxvt_term::make_transparency_pixmap () 1005rxvt_term::render_root_image ()
923{ 1006{
924 bool ret = false; 1007 bool ret = false;
925 1008
926 /* root dimensions may change from call to call - but Display structure should 1009 /* root dimensions may change from call to call - but Display structure should
927 * be always up-to-date, so let's use it : 1010 * be always up-to-date, so let's use it :
… …
963 Pixmap recoded_root_pmap = root_pixmap; 1046 Pixmap recoded_root_pmap = root_pixmap;
964 1047
965 if (root_pixmap != None && root_depth != depth) 1048 if (root_pixmap != None && root_depth != depth)
966 { 1049 {
967#if XRENDER 1050#if XRENDER
968 if (bg_flags & BG_HAS_RENDER) 1051 if (display->flags & DISPLAY_HAS_RENDER)
969 { 1052 {
970 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1053 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
971 1054
972 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1055 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
973 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0); 1056 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
… …
1011 1094
1012 if (gc) 1095 if (gc)
1013 { 1096 {
1014 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1097 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1015 ret = true; 1098 ret = true;
1016 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS; 1099 bool need_blur = root_effects.need_blur ();
1100 bool need_tint = root_effects.need_tint ();
1017 1101
1018 if (!(bg_flags & BG_CLIENT_RENDER)) 1102 if (need_blur)
1103 {
1104 if (blur_pixmap (bg_pixmap, window_width, window_height, false,
1105 root_effects.h_blurRadius, root_effects.v_blurRadius))
1106 need_blur = false;
1019 { 1107 }
1020 if (bg_flags & BG_NEEDS_BLUR) 1108 if (need_tint)
1109 {
1110 if (tint_pixmap (bg_pixmap, window_width, window_height, false,
1111 root_effects.tint, root_effects.tint_set, root_effects.shade))
1112 need_tint = false;
1113 }
1114 if (need_tint)
1115 {
1116 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1117 if (ximage)
1021 { 1118 {
1022 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth)) 1119 /* our own client-side tinting */
1023 tr_flags &= ~BG_NEEDS_BLUR; 1120 tint_ximage (ximage, root_effects.tint, root_effects.tint_set, root_effects.shade);
1121
1122 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1123 XDestroyImage (ximage);
1024 } 1124 }
1025 if (bg_flags & BG_NEEDS_TINT)
1026 {
1027 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1028 tr_flags &= ~BG_NEEDS_TINT;
1029 } 1125 }
1030 if (tr_flags & BG_NEEDS_TINT)
1031 {
1032 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1033 if (ximage)
1034 {
1035 /* our own client-side tinting */
1036 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1037
1038 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1039 XDestroyImage (ximage);
1040 }
1041 }
1042 } /* server side rendering completed */
1043 1126
1044 XFreeGC (dpy, gc); 1127 XFreeGC (dpy, gc);
1045 } 1128 }
1046 1129
1047 if (recoded_root_pmap != root_pixmap) 1130 if (recoded_root_pmap != root_pixmap)
… …
1051} 1134}
1052 1135
1053void 1136void
1054rxvt_term::bg_set_root_pixmap () 1137rxvt_term::bg_set_root_pixmap ()
1055{ 1138{
1056 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]); 1139 Pixmap new_root_pixmap = display->get_pixmap_property (xa[XA_XROOTPMAP_ID]);
1057 if (new_root_pixmap == None) 1140 if (new_root_pixmap == None)
1058 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1141 new_root_pixmap = display->get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1059 1142
1060 root_pixmap = new_root_pixmap; 1143 root_pixmap = new_root_pixmap;
1061} 1144}
1062# endif /* ENABLE_TRANSPARENCY */ 1145# endif /* ENABLE_TRANSPARENCY */
1063 1146
1064bool 1147bool
1065rxvt_term::bg_render () 1148rxvt_term::bg_render ()
1066{ 1149{
1067 bool transparent = false;
1068
1069 bg_invalidate (); 1150 bg_invalidate ();
1070# ifdef ENABLE_TRANSPARENCY 1151# if ENABLE_TRANSPARENCY
1071 if (bg_flags & BG_IS_TRANSPARENT) 1152 if (bg_flags & BG_IS_TRANSPARENT)
1072 { 1153 {
1073 /* we need to re-generate transparency pixmap in that case ! */ 1154 /* we need to re-generate transparency pixmap in that case ! */
1074 transparent = make_transparency_pixmap (); 1155 if (render_root_image ())
1075 if (transparent)
1076 bg_flags |= BG_IS_VALID; 1156 bg_flags |= BG_IS_VALID;
1077 } 1157 }
1078# endif 1158# endif
1079 1159
1080# ifdef BG_IMAGE_FROM_FILE 1160# if BG_IMAGE_FROM_FILE
1081 if (bg_flags & BG_IS_FROM_FILE) 1161 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
1082 { 1162 {
1083 if (render_image (transparent)) 1163 if (render_image (*bg_image))
1084 bg_flags |= BG_IS_VALID; 1164 bg_flags |= BG_IS_VALID;
1085 } 1165 }
1086# endif 1166# endif
1087 1167
1088 if (!(bg_flags & BG_IS_VALID)) 1168 if (!(bg_flags & BG_IS_VALID))
… …
1103} 1183}
1104 1184
1105void 1185void
1106rxvt_term::bg_init () 1186rxvt_term::bg_init ()
1107{ 1187{
1108#ifdef ENABLE_TRANSPARENCY 1188#if BG_IMAGE_FROM_FILE
1109 shade = 100; 1189 if (rs[Rs_backgroundPixmap])
1190 {
1191 rxvt_image *image = new_image ();
1192 if (!image->set_file_geometry (rs[Rs_backgroundPixmap]))
1193 image_vec.pop_back ();
1194 }
1195
1196# ifndef NO_RESOURCES
1197 find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image);
1198# endif
1199
1200 vector<rxvt_image>::iterator bg_image = image_vec.begin ();
1201 while (bg_image != image_vec.end ())
1202 {
1203 if (!(bg_image->flags & IM_IS_SET))
1204 bg_image = image_vec.erase (bg_image);
1205 else
1206 {
1207 if (bg_image->is_size_sensitive ())
1208 bg_image->flags |= IM_IS_SIZE_SENSITIVE;
1209
1210 bg_image++;
1211 }
1212 }
1213
1214 if (image_vec.size () > 0
1215 && !bg_window_position_sensitive ())
1216 update_background ();
1110#endif 1217#endif
1111
1112 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1113#if XRENDER
1114 int major, minor;
1115 if (XRenderQueryVersion (dpy, &major, &minor))
1116 bg_flags |= BG_HAS_RENDER;
1117 XFilters *filters = XRenderQueryFilters (dpy, vt);
1118 if (filters)
1119 {
1120 for (int i = 0; i < filters->nfilter; i++)
1121 if (!strcmp (filters->filter[i], FilterConvolution))
1122 bg_flags |= BG_HAS_RENDER_CONV;
1123
1124 XFree (filters);
1125 }
1126#endif
1127} 1218}
1128 1219
1129#endif /* HAVE_BG_PIXMAP */
1130
1131#ifdef ENABLE_TRANSPARENCY
1132/* based on code from aterm-0.4.2 */ 1220/* based on code from aterm-0.4.2 */
1133 1221
1134static inline void 1222static inline void
1135fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1223fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1136{ 1224{
… …
1142 lookup[i] = (tmp / 0xffff) << sh; 1230 lookup[i] = (tmp / 0xffff) << sh;
1143 } 1231 }
1144} 1232}
1145 1233
1146void 1234void
1147rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1235rxvt_term::tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade)
1148{ 1236{
1237 unsigned int size_r, size_g, size_b;
1149 int sh_r, sh_g, sh_b; 1238 int sh_r, sh_g, sh_b;
1150 uint32_t mask_r, mask_g, mask_b; 1239 uint32_t mask_r, mask_g, mask_b;
1151 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1240 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1152 unsigned short low; 1241 unsigned short low;
1153 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1242 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
… …
1158 mask_r = visual->red_mask; 1247 mask_r = visual->red_mask;
1159 mask_g = visual->green_mask; 1248 mask_g = visual->green_mask;
1160 mask_b = visual->blue_mask; 1249 mask_b = visual->blue_mask;
1161 1250
1162 /* boring lookup table pre-initialization */ 1251 /* boring lookup table pre-initialization */
1163 switch (ximage->depth) 1252 sh_r = ecb_ctz32 (mask_r);
1164 { 1253 sh_g = ecb_ctz32 (mask_g);
1165 case 15: 1254 sh_b = ecb_ctz32 (mask_b);
1166 if ((mask_r != 0x7c00) || 1255
1167 (mask_g != 0x03e0) || 1256 size_r = mask_r >> sh_r;
1168 (mask_b != 0x001f)) 1257 size_g = mask_g >> sh_g;
1258 size_b = mask_b >> sh_b;
1259
1260 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1169 return; 1261 return;
1170 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1262
1263 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1171 lookup_r = lookup; 1264 lookup_r = lookup;
1172 lookup_g = lookup+32; 1265 lookup_g = lookup + size_r;
1173 lookup_b = lookup+32+32; 1266 lookup_b = lookup + size_r + size_g;
1174 sh_r = 10;
1175 sh_g = 5;
1176 sh_b = 0;
1177 break;
1178 case 16:
1179 if ((mask_r != 0xf800) ||
1180 (mask_g != 0x07e0) ||
1181 (mask_b != 0x001f))
1182 return;
1183 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1184 lookup_r = lookup;
1185 lookup_g = lookup+32;
1186 lookup_b = lookup+32+64;
1187 sh_r = 11;
1188 sh_g = 5;
1189 sh_b = 0;
1190 break;
1191 case 24:
1192 if ((mask_r != 0xff0000) ||
1193 (mask_g != 0x00ff00) ||
1194 (mask_b != 0x0000ff))
1195 return;
1196 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1197 lookup_r = lookup;
1198 lookup_g = lookup+256;
1199 lookup_b = lookup+256+256;
1200 sh_r = 16;
1201 sh_g = 8;
1202 sh_b = 0;
1203 break;
1204 case 32:
1205 if ((mask_r != 0xff0000) ||
1206 (mask_g != 0x00ff00) ||
1207 (mask_b != 0x0000ff))
1208 return;
1209 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1210 lookup_r = lookup;
1211 lookup_g = lookup+256;
1212 lookup_b = lookup+256+256;
1213 sh_r = 16;
1214 sh_g = 8;
1215 sh_b = 0;
1216 break;
1217 default:
1218 return; /* we do not support this color depth */
1219 }
1220 1267
1221 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1268 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1222 1269
1223 if (bg_flags & BG_TINT_SET) 1270 if (tint_set)
1224 tint.get (c); 1271 tint.get (c);
1225 1272
1226 /* prepare limits for color transformation (each channel is handled separately) */ 1273 /* prepare limits for color transformation (each channel is handled separately) */
1227 if (shade > 100) 1274 if (shade > 100)
1228 { 1275 {
… …
1246 fill_lut (lookup_g, mask_g, sh_g, low, c.g); 1293 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1247 fill_lut (lookup_b, mask_b, sh_b, low, c.b); 1294 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1248 1295
1249 /* apply table to input image (replacing colors by newly calculated ones) */ 1296 /* apply table to input image (replacing colors by newly calculated ones) */
1250 if (ximage->bits_per_pixel == 32 1297 if (ximage->bits_per_pixel == 32
1251 && (ximage->depth == 24 || ximage->depth == 32)
1252 && ximage->byte_order == host_byte_order) 1298 && ximage->byte_order == host_byte_order)
1253 { 1299 {
1254 uint32_t *p1, *pf, *p, *pl; 1300 char *line = ximage->data;
1255 p1 = (uint32_t *) ximage->data;
1256 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1257 1301
1258 while (p1 < pf) 1302 for (int y = 0; y < ximage->height; y++)
1259 { 1303 {
1260 p = p1; 1304 uint32_t *p = (uint32_t *)line;
1261 pl = p1 + ximage->width; 1305 for (int x = 0; x < ximage->width; x++)
1262 for (; p < pl; p++)
1263 { 1306 {
1264 *p = lookup_r[(*p & 0xff0000) >> 16] | 1307 *p = lookup_r[(*p & mask_r) >> sh_r] |
1265 lookup_g[(*p & 0x00ff00) >> 8] | 1308 lookup_g[(*p & mask_g) >> sh_g] |
1266 lookup_b[(*p & 0x0000ff)] | 1309 lookup_b[(*p & mask_b) >> sh_b];
1267 (*p & 0xff000000); 1310 p++;
1268 } 1311 }
1269 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1312 line += ximage->bytes_per_line;
1270 } 1313 }
1271 } 1314 }
1272 else 1315 else
1273 { 1316 {
1274 for (int y = 0; y < ximage->height; y++) 1317 for (int y = 0; y < ximage->height; y++)
… …
1282 } 1325 }
1283 } 1326 }
1284 1327
1285 free (lookup); 1328 free (lookup);
1286} 1329}
1287#endif /* ENABLE_TRANSPARENCY */ 1330
1331#endif /* HAVE_BG_PIXMAP */

Diff Legend

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