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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.45 by ayin, Sat Jun 30 23:58:29 2007 UTC vs.
Revision 1.70 by sasha, Thu Aug 16 21:26:20 2007 UTC

24 *---------------------------------------------------------------------*/ 24 *---------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#ifdef XPM_BACKGROUND
30
31#ifndef HAVE_AFTERIMAGE
32/* 29/*
33 * search for FILE in the current working directory, and within the 30 * Pixmap geometry string interpretation :
34 * colon-delimited PATHLIST, adding the file extension EXT if required. 31 * Each geometry string contains zero or one scale/position
32 * adjustment and may optionally be followed by a colon and one or more
33 * colon-delimited pixmap operations.
34 * The following table shows the valid geometry strings and their
35 * affects on the background image :
35 * 36 *
36 * FILE is either semi-colon or zero terminated 37 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
38 * W and H are percentages of the terminal window size.
39 * X and Y are also percentages; e.g., +50+50 centers
40 * the image in the window.
41 * WxH+X Assumes Y == X
42 * WxH Assumes Y == X == 50 (centers the image)
43 * W+X+Y Assumes H == W
44 * W+X Assumes H == W and Y == X
45 * W Assumes H == W and Y == X == 50
46 *
47 * Adjusting position only :
48 * =+X+Y Set position to X% by Y% (absolute).
49 * =+X Set position to X% by X%.
50 * +X+Y Adjust position horizontally X% and vertically Y%
51 * from current position (relative).
52 * +X Adjust position horizontally X% and vertically X%
53 * from current position.
54 *
55 * Adjusting scale only :
56 * Wx0 Multiply horizontal scaling factor by W%
57 * 0xH Multiply vertical scaling factor by H%
58 * 0x0 No scaling (show image at normal size).
59 *
60 * Pixmap Operations : (should be prepended by a colon)
61 * tile Tile image. Scaling/position modifiers above will affect
62 * the tile size and origin.
63 * propscale When scaling, scale proportionally. That is, maintain the
64 * proper aspect ratio for the image. Any portion of the
65 * background not covered by the image is filled with the
66 * current background color.
67 * hscale Scale horizontally, tile vertically ?
68 * vscale Tile horizontally, scale vertically ?
69 * scale Scale both up and down
70 * auto Same as 100x100+50+50
37 */ 71 */
38static char *
39rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
40{
41 int maxpath, len;
42 const char *p, *path;
43 char name[256];
44 72
45 if (!access (file, R_OK)) /* found (plain name) in current directory */ 73#ifdef HAVE_BG_PIXMAP
46 return strdup (file); 74bool
47 75bgPixmap_t::window_size_sensitive ()
48 /* semi-colon delimited */ 76{
49 if ((p = strchr (file, ';'))) 77# ifdef XPM_BACKGROUND
50 len = (p - file); 78# ifdef HAVE_AFTERIMAGE
51 else 79 if (original_asim != NULL)
52 len = strlen (file); 80# endif
53
54 /* leave room for an extra '/' and trailing '\0' */
55 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
56 if (maxpath <= 0)
57 return NULL;
58
59 /* check if we can find it now */
60 strncpy (name, file, len);
61 name[len] = '\0';
62
63 if (!access (name, R_OK))
64 return strdup (name);
65 if (ext)
66 { 81 {
67 strcat (name, ext); 82 if (h_scale != 0 || v_scale != 0)
68 if (!access (name, R_OK))
69 return strdup (name); 83 return true;
70 }
71 for (path = pathlist; path != NULL && *path != '\0'; path = p)
72 { 84 }
73 int n; 85# endif
74 86# ifdef ENABLE_TRANSPARENCY
75 /* colon delimited */ 87 if (flags & isTransparent)
76 if ((p = strchr (path, ':')) == NULL) 88 return true;
77 p = strchr (path, '\0'); 89# endif
78 90 return false;
79 n = (p - path);
80 if (*p != '\0')
81 p++;
82
83 if (n > 0 && n <= maxpath)
84 {
85 strncpy (name, path, n);
86 if (name[n - 1] != '/')
87 name[n++] = '/';
88 name[n] = '\0';
89 strncat (name, file, len);
90
91 if (!access (name, R_OK))
92 return strdup (name);
93 if (ext)
94 {
95 strcat (name, ext);
96 if (!access (name, R_OK))
97 return strdup (name);
98 }
99 }
100 }
101 return NULL;
102} 91}
103 92
104/* 93bool bgPixmap_t::need_client_side_rendering ()
105 * Calculate tiling sizes and increments
106 * At start, p == 0, incr == xpmwidthheight
107 */
108static void
109rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
110{ 94{
111 unsigned int cwh, cxy; 95# ifdef HAVE_AFTERIMAGE
112 float cincr, cp; 96 if (original_asim != NULL)
113 97 return true;
114 cp = 0;
115 cincr = (float)xpmwidthheight;
116 cxy = *xy;
117 cwh = *wh;
118 if (cwh == 1)
119 { /* display one image, no horizontal/vertical scaling */
120 cincr = (float)widthheight;
121 if (xpmwidthheight <= widthheight)
122 {
123 cwh = xpmwidthheight;
124 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
125 cwh += cxy;
126 }
127 else
128 {
129 cxy = 0;
130 cwh = widthheight;
131 }
132 }
133 else if (cwh < 10)
134 { /* fit WH images across/down screen */
135 cincr *= cwh;
136 cxy = 0;
137 cwh = widthheight;
138 }
139 else
140 {
141 cincr *= 100.0 / cwh;
142 if (cwh < 100)
143 { /* contract */
144 float pos;
145
146 cwh = (cwh * widthheight) / 100;
147 pos = (float)cxy / 100 * widthheight - (cwh / 2);
148
149 cxy = (widthheight - cwh);
150 if (pos <= 0)
151 cxy = 0;
152 else if (pos < cxy)
153 cxy = (int) pos;
154 cwh += cxy;
155 }
156 else
157 { /* expand */
158 if (cxy > 0)
159 { /* position */
160 float pos;
161
162 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
163 cp = xpmwidthheight - cincr;
164 if (pos <= 0)
165 cp = 0;
166 else if (pos < cp)
167 cp = pos;
168 }
169 cxy = 0;
170 cwh = widthheight;
171 }
172 }
173 cincr /= widthheight;
174 *wh = cwh;
175 *xy = cxy;
176 *incr = cincr;
177 *p = cp;
178}
179#endif 98#endif
99# ifdef ENABLE_TRANSPARENCY
100 if (flags & isTransparent)
101 {
102 if ((flags & blurNeeded)
103 || ((flags & tintNeeded) && !(flags & tintServerSide)))
104 return true;
105 }
106# endif
107 return false;
108}
180 109
181/* 110# ifdef XPM_BACKGROUND
182 * These GEOM strings indicate absolute size/position: 111static inline bool
183 * @ `WxH+X+Y' 112check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
184 * @ `WxH+X' -> Y = X
185 * @ `WxH' -> Y = X = 50
186 * @ `W+X+Y' -> H = W
187 * @ `W+X' -> H = W, Y = X
188 * @ `W' -> H = W, X = Y = 50
189 * @ `0xH' -> H *= H/100, X = Y = 50 (W unchanged)
190 * @ `Wx0' -> W *= W/100, X = Y = 50 (H unchanged)
191 * @ `=+X+Y' -> (H, W unchanged)
192 * @ `=+X' -> Y = X (H, W unchanged)
193 *
194 * These GEOM strings adjust position relative to current position:
195 * @ `+X+Y'
196 * @ `+X' -> Y = X
197 *
198 * And this GEOM string is for querying current scale/position:
199 * @ `?'
200 */
201int
202rxvt_term::scale_pixmap (const char *geom)
203{ 113{
114 if (geom_flags & flag)
115 {
116 if (new_value > 1000)
117 new_value = 1000;
118 if (new_value != scale)
119 {
120 scale = new_value;
121 return true;
122 }
123 }
124 return false;
125}
126
127static inline bool
128check_set_align_value (int geom_flags, int flag, int &align, int new_value)
129{
130 if (geom_flags & flag)
131 {
132 if (new_value < -100)
133 new_value = -100;
134 else if (new_value > 200)
135 new_value = 200;
136 if (new_value != align)
137 {
138 align = new_value;
139 return true;
140 }
141 }
142 return false;
143}
144
145static inline int
146make_align_position (int align, int window_size, int image_size)
147{
148 int diff = window_size - image_size;
149 int smaller = MIN (image_size,window_size);
150
151 if (align >= 0 && align <= 50)
152 return diff * align / 100;
153 else if (align > 50 && align <= 100)
154 return window_size - image_size - diff * (100 - align) / 100;
155 else if (align > 100 && align <= 200 )
156 return ((align - 100) * smaller / 100) + window_size - smaller;
157 else if (align > -100 && align < 0)
158 return ((align + 100) * smaller / 100) - image_size;
159 return 0;
160}
161
162static inline int
163make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
164{
165 int src_pos = 0;
166 dst_pos = 0;
167 dst_size = size;
168 if (pos < 0 && size > target_size)
169 {
170 src_pos = -pos;
171 dst_size += pos;
172 }
173 else if (pos > 0)
174 dst_pos = pos;
175
176 if (dst_pos + dst_size > target_size)
177 dst_size = target_size - dst_pos;
178 return src_pos;
179}
180
181bool
182bgPixmap_t::set_geometry (const char *geom)
183{
204 int flags, changed = 0; 184 int geom_flags = 0, changed = 0;
205 int x = 0, y = 0; 185 int x = 0, y = 0;
206 unsigned int w = 0, h = 0; 186 unsigned int w = 0, h = 0;
207 unsigned int n; 187 unsigned int n;
188 unsigned long new_flags = (flags & (~geometryFlags));
208 char *p; 189 char *p;
209 bgPixmap_t *bgpixmap = &bgPixmap; 190# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
210
211#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
212 191
213 if (geom == NULL) 192 if (geom == NULL)
214 return 0; 193 return false;
215 194
216 char str[MAXLEN_GEOM]; 195 char str[MAXLEN_GEOM];
217 196
218 if (!strcmp (geom, "?")) 197 while (isspace(*geom)) ++geom;
219 {
220 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
221 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
222 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
223 process_xterm_seq (XTerm_title, str, CHAR_ST);
224 return 0;
225 }
226
227 if ((p = strchr (geom, ';')) == NULL) 198 if ((p = strchr (geom, ';')) == NULL)
228 p = strchr (geom, '\0'); 199 p = strchr (geom, '\0');
229 200
230 n = (p - geom); 201 n = (p - geom);
231 if (n < MAXLEN_GEOM) 202 if (n < MAXLEN_GEOM)
232 { 203 {
204 char *ops;
205 new_flags |= geometrySet;
206
233 strncpy (str, geom, n); 207 strncpy (str, geom, n);
234 str[n] = '\0'; 208 str[n] = '\0';
235 209 if (str[0] == ':')
236 if (strcmp(str, "auto") == 0) 210 ops = &str[0];
237 { 211 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
238 if (!bgpixmap->auto_resize) 212 ops = &str[0];
239 changed++;
240 bgpixmap->auto_resize = True ;
241 w = szHint.width ;
242 h = szHint.height ;
243 flags = WidthValue|HeightValue ;
244 }
245 else 213 else
246 { 214 {
247 bgpixmap->auto_resize = False ; 215 char *tmp;
216 ops = strchr (str, ':');
217 if (ops != NULL)
218 {
219 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
220 *(++tmp) = '\0';
221 if (ops == tmp) ++ops;
222 }
223 }
224
225 if (ops > str || ops == NULL)
226 {
227 /* we have geometry string - let's handle it prior to applying ops */
248 flags = XParseGeometry (str, &x, &y, &w, &h); 228 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
249 }
250 229
251 if (!flags) 230 if ((geom_flags & XValue) && !(geom_flags & YValue))
252 {
253 flags |= WidthValue;
254 w = 0;
255 } /* default is tile */
256
257 if (flags & WidthValue)
258 {
259 if (!(flags & XValue))
260 x = 50;
261
262 if (!(flags & HeightValue))
263 h = w;
264
265 if (w && !h)
266 {
267 w = (bgpixmap->w * w) / 100;
268 h = bgpixmap->h;
269 } 231 {
270 else if (h && !w) 232 y = x;
233 geom_flags |= YValue;
271 { 234 }
272 w = bgpixmap->w; 235
273 h = (bgpixmap->h * h) / 100; 236 if (flags & geometrySet)
237 {/* new geometry is an adjustment to the old one ! */
238 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
239 {
240 if (w == 0 && h != 0)
241 {
242 w = h_scale;
243 h = (v_scale * h) / 100;
244 }
245 else if (h == 0 && w != 0)
246 {
247 w = (h_scale * w) / 100;
248 h = v_scale;
249 }
274 } 250 }
275 251 if (geom_flags & XValue)
276 min_it (w, 32767); 252 {
277 min_it (h, 32767); 253 if (str[0] != '=')
278 254 {
279 if (bgpixmap->w != (short)w) 255 y += v_align;
256 x += h_align;
257 }
258 }
280 { 259 }
281 bgpixmap->w = (short)w; 260 else /* setting up geometry from scratch */
282 changed++;
283 } 261 {
262 if (!(geom_flags & XValue))
263 {/* use default geometry - centered */
264 x = y = defaultAlign;
265 }
266 else if (!(geom_flags & YValue))
267 y = x;
284 268
285 if (bgpixmap->h != (short)h) 269 if ((geom_flags & (WidthValue|HeightValue)) == 0)
270 {/* use default geometry - scaled */
271 w = h = defaultScale;
272 }
273 else if (geom_flags & WidthValue)
274 {
275 if (!(geom_flags & HeightValue))
276 h = w;
277 }
278 else
279 w = h;
286 { 280 }
287 bgpixmap->h = (short)h; 281 } /* done parsing geometry string */
288 changed++; 282 else if (!(flags & geometrySet))
289 } 283 { /* default geometry - scaled and centered */
290 } 284 x = y = defaultAlign;
291 285 w = h = defaultScale;
292 if (!(flags & YValue))
293 {
294 if (flags & XNegative)
295 flags |= YNegative;
296
297 y = x;
298 }
299
300 if (!(flags & WidthValue) && geom[0] != '=')
301 {
302 x += bgpixmap->x;
303 y += bgpixmap->y;
304 }
305
306 if (xpmAttr.width && xpmAttr.height)
307 {
308 x = MOD(x, xpmAttr.width);
309 y = MOD(y, xpmAttr.height);
310 }
311
312 if (bgpixmap->x != x)
313 {
314 bgpixmap->x = x;
315 changed++;
316 }
317
318 if (bgpixmap->y != y)
319 {
320 bgpixmap->y = y;
321 changed++;
322 }
323 }
324
325 return changed;
326}
327
328void
329rxvt_term::resize_pixmap ()
330{
331 XGCValues gcvalue;
332 GC gc;
333
334 if (pixmap != None)
335 {
336 XFreePixmap (dpy, pixmap);
337 pixmap = None ;
338 }
339
340 if (bgPixmap.pixmap == None)
341 { /* So be it: I'm not using pixmaps */
342 pixmap = None;
343
344#ifdef ENABLE_TRANSPARENCY
345 if (!option (Opt_transparent) || !am_transparent)
346#endif
347 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
348
349 return;
350 }
351
352 gcvalue.foreground = pix_colors[Color_bg];
353 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
354
355 if (bgPixmap.pixmap != None)
356 { /* we have a specified pixmap */
357 unsigned int w = bgPixmap.w, h = bgPixmap.h,
358 x = bgPixmap.x, y = bgPixmap.y;
359 unsigned int xpmh = xpmAttr.height,
360 xpmw = xpmAttr.width;
361
362 if (bgPixmap.auto_resize)
363 {
364 w = szHint.width ;
365 h = szHint.height ;
366 } 286 }
367 /*
368 * don't zoom pixmap too much nor expand really small pixmaps
369 */
370 if (w > 32767 || h > 32767)
371 w = 1;
372 else if (width > (10 * xpmw)
373 || height > (10 * xpmh))
374 w = 0; /* tile */
375
376 if (!w)
377 { 287
378 /* basic X tiling - let the X server do it */ 288 if (!(flags & geometrySet))
379 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth); 289 geom_flags |= WidthValue|HeightValue|XValue|YValue;
380 290
381 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0); 291 if (ops)
382 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y); 292 {
383 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0); 293 while (*ops)
384 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y); 294 {
295 while (*ops == ':' || isspace(*ops)) ++ops;
296# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
297 if (CHECK_GEOM_OPS("tile"))
298 {
299 w = h = 0;
300 geom_flags |= WidthValue|HeightValue;
301 }
302 else if (CHECK_GEOM_OPS("propscale"))
303 {
304 if (w == 0 && h == 0)
305 {
306 w = 100;
307 geom_flags |= WidthValue;
308 }
309 new_flags |= propScale;
310 }
311 else if (CHECK_GEOM_OPS("hscale"))
312 {
313 if (w == 0)
314 w = 100;
315 h = 0;
316 geom_flags |= WidthValue|HeightValue;
317 }
318 else if (CHECK_GEOM_OPS("vscale"))
319 {
320 if (h == 0)
321 h = 100;
322 w = 0;
323 geom_flags |= WidthValue|HeightValue;
324 }
325 else if (CHECK_GEOM_OPS("scale"))
326 {
327 if (h == 0)
328 h = 100;
329 if (w == 0)
330 w = 100;
331 geom_flags |= WidthValue|HeightValue;
332 }
333 else if (CHECK_GEOM_OPS("auto"))
334 {
335 w = h = 100;
336 x = y = 50;
337 geom_flags |= WidthValue|HeightValue|XValue|YValue;
338 }
339# undef CHECK_GEOM_OPS
340 while (*ops != ':' && *ops != '\0') ++ops;
341 } /* done parsing ops */
342 }
343
344 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))
345 ++changed;
346 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h))
347 ++changed;
348 if (check_set_align_value (geom_flags, XValue, h_align, x))
349 ++changed;
350 if (check_set_align_value (geom_flags, YValue, v_align, y))
351 ++changed;
352 }
353
354 if (new_flags != flags)
355 {
356 flags = new_flags;
357 changed++;
358 }
359//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
360// flags, h_scale, v_scale, h_align, v_align);
361 return (changed > 0);
362}
363
364# ifdef HAVE_AFTERIMAGE
365bool
366bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
367{
368 if (target == NULL)
369 return false;
370
371 int target_width = (int)target->szHint.width;
372 int target_height = (int)target->szHint.height;
373 int new_pmap_width = target_width, new_pmap_height = target_height;
374 ASImage *result = NULL;
375
376 int x = 0;
377 int y = 0;
378 int w = h_scale * target_width / 100;
379 int h = v_scale * target_height / 100;
380
381 if (original_asim)
382 {
383 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
384 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
385 }
386
387 if (original_asim == NULL
388 || x >= target_width
389 || y >= target_height
390 || (w > 0 && x + w <= 0)
391 || (h > 0 && y + h <= 0))
392 {
393 if (background)
394 {
395 new_pmap_width = background->width;
396 new_pmap_height = background->height;
397 result = background;
398 if (background_tint != TINT_LEAVE_SAME)
399 {
400 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
401 target_width, target_height, background_tint,
402 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
403 if (tmp)
404 result = tmp;
405 }
385 } 406 }
386 else 407 else
387#ifdef HAVE_AFTERIMAGE 408 new_pmap_width = new_pmap_height = 0;
388#ifdef ENABLE_TRANSPARENCY 409 }
389 if (!option(Opt_transparent) || !am_transparent) 410 else
390 /* will do that in check_our_parents otherwise */ 411 {
391#endif 412 result = original_asim;
413 if ((w > 0 && w != original_asim->width)
414 || (h > 0 && h != original_asim->height))
415 {
416 result = scale_asimage (target->asv, original_asim,
417 w > 0 ? w : original_asim->width,
418 h > 0 ? h : original_asim->height,
419 background ? ASA_ASImage : ASA_XImage,
420 100, ASIMAGE_QUALITY_DEFAULT);
392 { 421 }
393 ASImage *scaled_im = scale_asimage( display->asv, original_asim, w, h, ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT ); 422 if (background == NULL)
423 {/* if tiling - pixmap has to be sized exactly as the image */
394 if (scaled_im) 424 if (h_scale == 0)
395 { 425 new_pmap_width = result->width;
396 pixmap = asimage2pixmap( display->asv, display->root, scaled_im, gc, True ); 426 if (v_scale == 0)
397 destroy_asimage( &scaled_im ); 427 new_pmap_height = result->height;
428 /* we also need to tile our image in one or both directions */
429 if (h_scale == 0 || v_scale == 0)
398 } 430 {
399 } 431 ASImage *tmp = tile_asimage (target->asv, result,
400#else /* HAVE_AFTERIMAGE */ 432 (h_scale > 0) ? 0 : (int)result->width - x,
401 { 433 (v_scale > 0) ? 0 : (int)result->height - y,
402 float incr, p; 434 result->width, result->height,
403 Pixmap tmp; 435 TINT_LEAVE_SAME, ASA_XImage,
404 436 100, ASIMAGE_QUALITY_DEFAULT);
405 pixmap = XCreatePixmap (dpy, vt, width, height, depth); 437 if (tmp)
406 /* 438 {
407 * horizontal scaling 439 if (result != original_asim)
408 */ 440 destroy_asimage (&result);
409 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw); 441 result = tmp;
410 442 }
411 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
412 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
413
414 for ( /*nil */ ; x < w; x++, p += incr)
415 { 443 }
416 if (p >= xpmw)
417 p = 0;
418
419 /* copy one column from the original pixmap to the tmp pixmap */
420 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
421 } 444 }
445 else
446 {/* if blending background and image - pixmap has to be sized same as target window */
447 ASImageLayer *layers = create_image_layers (2);
448 ASImage *merged_im = NULL;
422 449
423 /* 450 layers[0].im = background;
424 * vertical scaling 451 layers[0].clip_width = target_width;
425 */ 452 layers[0].clip_height = target_height;
426 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh); 453 layers[0].tint = background_tint;
427 454 layers[1].im = result;
428 if (y > 0) 455 if (w <= 0)
429 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y); 456 {/* tile horizontally */
430 457 while (x > 0) x -= (int)result->width;
431 if (h < height) 458 layers[1].dst_x = x;
432 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1); 459 layers[1].clip_width = result->width+target_width;
433
434 for ( /*nil */ ; y < h; y++, p += incr)
435 { 460 }
436 if (p >= xpmh) 461 else
437 p = 0; 462 {/* clip horizontally */
438 463 layers[1].dst_x = x;
439 /* copy one row from the tmp pixmap to the main pixmap */ 464 layers[1].clip_width = result->width;
440 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y); 465 }
466 if (h <= 0)
441 } 467 {
468 while (y > 0) y -= (int)result->height;
469 layers[1].dst_y = y;
470 layers[1].clip_height = result->height + target_height;
471 }
472 else
473 {
474 layers[1].dst_y = y;
475 layers[1].clip_height = result->height;
476 }
477 if (target->rs[Rs_blendtype])
478 {
479 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
480 if (layers[1].merge_scanlines == NULL)
481 layers[1].merge_scanlines = alphablend_scanlines;
482 }
483 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
484 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
485 if (tmp)
486 {
487 if (result != original_asim)
488 destroy_asimage (&result);
489 result = tmp;
490 }
491 free (layers);
492 }
493 }
442 494
443 XFreePixmap (dpy, tmp); 495 if (pixmap)
496 {
497 if (result == NULL
498 || pmap_width != new_pmap_width
499 || pmap_height != new_pmap_height
500 || pmap_depth != target->depth)
444 } 501 {
502 XFreePixmap (target->dpy, pixmap);
503 pixmap = None;
504 }
505 }
506
507 if (result)
508 {
509 XGCValues gcv;
510 GC gc;
511
512 /* create Pixmap */
513 if (pixmap == None)
514 {
515 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
516 pmap_width = new_pmap_width;
517 pmap_height = new_pmap_height;
518 pmap_depth = target->depth;
519 }
520 /* fill with background color ( if result's not completely overlapping it)*/
521 gcv.foreground = target->pix_colors[Color_bg];
522 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
523
524 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
525 int dst_width = result->width, dst_height = result->height;
526 if (background == NULL)
527 {
528 if (h_scale > 0)
529 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width);
530 if (v_scale > 0)
531 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
532
533 if (dst_x > 0 || dst_y > 0
534 || dst_x + dst_width < new_pmap_width
535 || dst_y + dst_height < new_pmap_height)
536 {
537 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
538 }
539 }
540
541 /* put result on pixmap */
542 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
543 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
544
545 if (result != background && result != original_asim)
546 destroy_asimage (&result);
547
548 XFreeGC (target->dpy, gc);
549 }
550
551 return true;
552}
445#endif /* HAVE_AFTERIMAGE */ 553# endif /* HAVE_AFTERIMAGE */
446 }
447 554
448 XSetWindowBackgroundPixmap (dpy, vt, pixmap); 555bool
449 556bgPixmap_t::set_file (const char *file)
450 XFreeGC (dpy, gc);
451#ifdef ENABLE_TRANSPARENCY
452 am_transparent = 0;
453#endif
454}
455
456Pixmap
457rxvt_term::set_bgPixmap (const char *file)
458{ 557{
459 char *f; 558 char *f;
460 559
461 assert (file != NULL); 560 assert (file != NULL);
462 561
463 if (bgPixmap.pixmap != None)
464 {
465 XFreePixmap (dpy, bgPixmap.pixmap);
466 bgPixmap.pixmap = None;
467 }
468
469 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
470
471 if (*file != '\0') 562 if (*file != '\0')
472 { 563 {
473 /* XWindowAttributes attr; */
474
475 /*
476 * we already have the required attributes
477 */
478 /* XGetWindowAttributes (dpy, vt, &attr); */
479
480#ifdef HAVE_AFTERIMAGE 564# ifdef HAVE_AFTERIMAGE
481 if (asimman == NULL) 565 if (target->asimman == NULL)
482 asimman = create_generic_imageman(rs[Rs_path]); 566 target->asimman = create_generic_imageman(target->rs[Rs_path]);
483 if ((f = strchr (file, ';')) == NULL) 567 if ((f = strchr (file, ';')) == NULL)
484 original_asim = get_asimage( asimman, file, 0xFFFFFFFF, 100 ); 568 original_asim = get_asimage( target->asimman, file, 0xFFFFFFFF, 100 );
485 else 569 else
486 { 570 {
487 size_t len = f - file; 571 size_t len = f - file;
488 f = (char *)malloc (len + 1); 572 f = (char *)malloc (len + 1);
489 strncpy (f, file, len); 573 strncpy (f, file, len);
490 f[len] = '\0'; 574 f[len] = '\0';
491 original_asim = get_asimage( asimman, f, 0xFFFFFFFF, 100 ); 575 original_asim = get_asimage( target->asimman, f, 0xFFFFFFFF, 100 );
492 free( f ); 576 free( f );
493 } 577 }
494 if (original_asim) 578 return (original_asim != NULL);
495 { 579# endif
496 bgPixmap.pixmap = asimage2pixmap( display->asv, display->root, original_asim, NULL, True );
497 xpmAttr.width = original_asim->width ;
498 xpmAttr.height = original_asim->height ;
499 }
500#else /* HAVE_AFTERIMAGE */
501 xpmAttr.closeness = 30000;
502 xpmAttr.colormap = cmap;
503 xpmAttr.visual = visual;
504 xpmAttr.depth = depth;
505 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
506 | XpmDepth | XpmSize | XpmReturnPixels);
507
508 /* search environment variables here too */
509 f = rxvt_File_search_path (rs[Rs_path], file, ".xpm");
510 if (f == NULL
511 || XpmReadFileToPixmap (dpy, display->root, f,
512 &bgPixmap.pixmap, NULL,
513 &xpmAttr))
514 {
515 char *p;
516
517 /* semi-colon delimited */
518 if ((p = strchr (file, ';')) == NULL)
519 p = strchr (file, '\0');
520
521 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
522 }
523 free (f);
524#endif /* HAVE_AFTERIMAGE */
525 } 580 }
526 581 return false;
527 resize_pixmap ();
528 return bgPixmap.pixmap;
529} 582}
530 583
531#endif /* XPM_BACKGROUND */ 584# endif /* XPM_BACKGROUND */
585
586# ifdef ENABLE_TRANSPARENCY
587bool
588bgPixmap_t::set_transparent ()
589{
590 if (!(flags & isTransparent))
591 {
592 flags |= isTransparent;
593 return true;
594 }
595}
596
597bool
598bgPixmap_t::set_blur_radius (const char *geom)
599{
600 int changed = 0;
601 unsigned int hr, vr;
602 int junk;
603 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
604 if (!(geom_flags&WidthValue))
605 hr = 1;
606 if (!(geom_flags&HeightValue))
607 vr = hr;
608
609 if (h_blurRadius != hr)
610 {
611 ++changed;
612 h_blurRadius = hr;
613 }
614 if (v_blurRadius != vr)
615 {
616 ++changed;
617 v_blurRadius = vr;
618 }
619 if (v_blurRadius == 0 && h_blurRadius == 0)
620 flags &= ~blurNeeded;
621 else
622 flags |= blurNeeded;
623 return (changed>0);
624}
625
626static inline unsigned long
627compute_tint_shade_flags (rxvt_color *tint, int shade)
628{
629 unsigned long flags = 0;
630
631 if (shade > 0 && shade <100)
632 flags |= bgPixmap_t::tintNeeded;
633 else if (tint)
634 {
635 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
636 tint->get (c);
637
638 flags |= bgPixmap_t::tintNeeded;
639 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
640 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
641 {
642 flags |= bgPixmap_t::tintNeeded;
643#define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
644 if (IS_COMPONENT_WHOLESOME (c.r)
645 && IS_COMPONENT_WHOLESOME (c.g)
646 && IS_COMPONENT_WHOLESOME (c.b))
647 flags |= bgPixmap_t::tintServerSide;
648#undef IS_COMPONENT_WHOLESOME
649 }
650 }
651 return flags;
652}
653
654bool
655bgPixmap_t::set_tint (rxvt_color &new_tint)
656{
657 if (tint != new_tint)
658 {
659 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
660 tint = new_tint;
661 flags = (flags & ~tintFlags) | new_flags | tintSet;
662 return true;
663 }
664 return false;
665}
666
667bool
668bgPixmap_t::unset_tint ()
669{
670 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
671
672 if (new_flags != (flags & tintFlags))
673 {
674 flags = (flags&~tintFlags)|new_flags;
675 return true;
676 }
677 return false;
678}
679
680bool
681bgPixmap_t::set_shade (const char *shade_str)
682{
683 int new_shade = (shade_str) ? atoi (shade_str) : 0;
684
685 if (new_shade == 100)
686 new_shade = 0;
687
688 if (new_shade != shade)
689 {
690 unsigned long new_flags = compute_tint_shade_flags (&tint, new_shade);
691 shade = new_shade;
692 flags = (flags & ~tintFlags) | new_flags;
693 return true;
694 }
695 return false;
696}
697
698
699/* make_transparency_pixmap()
700 * Builds a pixmap sized the same as terminal window, with depth same as the root window
701 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
702 * our window.
703 */
704unsigned long
705bgPixmap_t::make_transparency_pixmap ()
706{
707 unsigned long result = 0;
708
709 if (target == NULL)
710 return 0;
711
712 /* root dimentions may change from call to call - but Display structure should
713 * be always up-to-date, so let's use it :
714 */
715 Window root = target->display->root;
716 int screen = target->display->screen;
717 Display *dpy = target->dpy;
718 int root_width = DisplayWidth (dpy, screen);
719 int root_height = DisplayHeight (dpy, screen);
720 unsigned int root_pmap_width, root_pmap_height;
721 int window_width = target->szHint.width;
722 int window_height = target->szHint.height;
723 int sx, sy;
724 XGCValues gcv;
725
726 target->get_window_origin (sx, sy);
727
728 /* check if we are outside of the visible part of the virtual screen : */
729 if (sx + window_width <= 0 || sy + window_height <= 0
730 || sx >= root_width || sy >= root_height)
731 return 0;
732
733 if (root_pixmap != None)
734 {/* we want to validate the pixmap and get it's size at the same time : */
735 int junk;
736 unsigned int ujunk;
737 /* root pixmap may be bad - allow a error */
738 target->allowedxerror = -1;
739 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk))
740 root_pixmap = None;
741 target->allowedxerror = 0;
742 }
743
744 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
745 GC gc = NULL;
746
747 if (tiled_root_pmap == None) /* something really bad happened - abort */
748 return 0;
749
750 if (root_pixmap == None)
751 { /* use tricks to obtain the root background image :*/
752 /* we want to create Overrideredirect window overlapping out window
753 with background type of Parent Relative and then grab it */
754 XSetWindowAttributes attr;
755 Window src;
756 bool success = false;
757
758 attr.background_pixmap = ParentRelative;
759 attr.backing_store = Always;
760 attr.event_mask = ExposureMask;
761 attr.override_redirect = True;
762 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
763 CopyFromParent, CopyFromParent, CopyFromParent,
764 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
765 &attr);
766
767 if (src != None)
768 {
769 XEvent event;
770 int ev_count = 0;
771 XGrabServer (dpy);
772 XMapRaised (dpy, src);
773 XSync (dpy, False);
774 /* XSync should get window where it's properly exposed,
775 * but to be on the safe side - let's check for the actuall event to arrive : */
776 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
777 ++ev_count;
778 if (ev_count > 0);
779 { /* hooray! - we can grab the image! */
780 gc = XCreateGC (dpy, root, 0, NULL);
781 if (gc)
782 {
783 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
784 success = true;
785 }
786 }
787 XDestroyWindow (dpy, src);
788 XUngrabServer (dpy);
789 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
790 }
791 if (!success)
792 {
793 XFreePixmap (dpy, tiled_root_pmap);
794 tiled_root_pmap = None;
795 }
796 else
797 result |= transpPmapTiled;
798 }
799 else
800 {/* strightforward pixmap copy */
801 gcv.tile = root_pixmap;
802 gcv.fill_style = FillTiled;
803 while (sx < 0) sx += (int)window_width;
804 while (sy < 0) sy += (int)window_height;
805 gcv.ts_x_origin = -sx;
806 gcv.ts_y_origin = -sy;
807 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
808 if (gc)
809 {
810 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
811 result |= transpPmapTiled;
812 }
813 }
814
815 if (tiled_root_pmap != None)
816 {
817 if (flags & tintNeeded)
818 {
819 if ((flags & tintServerSide)
820 && h_blurRadius <= 1 && v_blurRadius <= 1
821# ifdef HAVE_AFTERIMAGE
822 && original_asim == NULL
823# endif
824 )
825 { /* In this case we can tint image server-side getting significant
826 * performance improvements, as we eliminate XImage transfer
827 */
828 gcv.foreground = Pixel (tint);
829 gcv.function = GXand;
830 gcv.fill_style = FillSolid;
831 if (gc)
832 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
833 else
834 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
835 if (gc)
836 {
837 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
838 result |= transpPmapTinted;
839 }
840 }
841 }
842 if (pixmap)
843 XFreePixmap (dpy, pixmap);
844 pixmap = tiled_root_pmap;
845 pmap_width = window_width;
846 pmap_height = window_height;
847 pmap_depth = root_depth;
848 }
849
850 if (gc)
851 XFreeGC (dpy, gc);
852
853 return result;
854}
855
856bool
857bgPixmap_t::set_root_pixmap ()
858{
859 Pixmap new_root_pixmap = None;
860
861 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
862 if (new_root_pixmap == None)
863 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
864
865 if (new_root_pixmap != root_pixmap)
866 {
867 root_pixmap = new_root_pixmap;
868 return true;
869 }
870 return false;
871}
872# endif /* ENABLE_TRANSPARENCY */
873
874# ifndef HAVE_AFTERIMAGE
875static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
876#endif
877
878
879bool
880bgPixmap_t::render ()
881{
882 unsigned long background_flags = 0;
883
884 if (target == NULL)
885 return false;
886
887 invalidate();
888# ifdef ENABLE_TRANSPARENCY
889 if (flags & isTransparent)
890 {
891 /* we need to re-generate transparency pixmap in that case ! */
892 background_flags = make_transparency_pixmap ();
893 if (background_flags == 0)
894 return false;
895 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
896 && pmap_depth == target->depth)
897 flags = flags & ~isInvalid;
898 }
899# endif
900
901 XImage *result = NULL;
902# ifdef HAVE_AFTERIMAGE
903 if (original_asim
904 || (background_flags & transpTransformations) != (flags & transpTransformations))
905 {
906 ASImage *background = NULL;
907 ARGB32 as_tint = TINT_LEAVE_SAME;
908 if (background_flags)
909 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
910
911 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
912 {
913 ShadingInfo as_shade;
914 as_shade.shading = (shade == 0) ? 100 : shade;
915
916 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
917 if (flags & tintSet)
918 tint.get (c);
919 as_shade.tintColor.red = c.r;
920 as_shade.tintColor.green = c.g;
921 as_shade.tintColor.blue = c.b;
922
923 as_tint = shading2tint32 (&as_shade);
924 }
925
926 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
927 {
928 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
929 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
930 100, ASIMAGE_QUALITY_DEFAULT);
931 if (tmp)
932 {
933 destroy_asimage (&background);
934 background = tmp;
935 }
936 }
937
938 if (render_asim (background, as_tint))
939 flags = flags & ~isInvalid;
940 if (background)
941 destroy_asimage (&background);
942 }
943 else if (background_flags && pmap_depth != target->depth)
944 {
945 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
946 }
947# else /* our own client-side tinting */
948 if (background_flags && (flags & isInvalid))
949 {
950 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
951 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
952 {
953 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
954 if (flags & tintSet)
955 tint.get (c);
956 ShadeXImage (target, result, shade, c.r, c.g, c.b);
957 }
958 }
959# endif
960 if (result != NULL)
961 {
962 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
963 if (gc)
964 {
965 if (pmap_depth != target->depth && pixmap != None)
966 {
967 XFreePixmap (target->dpy, pixmap);
968 pixmap = None;
969 }
970 if (pixmap == None)
971 {
972 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
973 pmap_width = result->width;
974 pmap_height = result->height;
975 pmap_depth = target->depth;
976 }
977 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
978 XFreeGC (target->dpy, gc);
979 flags = flags & ~isInvalid;
980 }
981 XDestroyImage (result);
982 }
983
984 if (flags & isInvalid)
985 {
986 if (pixmap != None)
987 {
988 XFreePixmap (target->dpy, pixmap);
989 pixmap = None;
990 }
991// TODO : we need to get rid of that garbadge :
992 target->am_transparent = target->am_pixmap_trans = 0;
993 }
994 else
995 target->am_transparent = target->am_pixmap_trans = 1;
996
997 apply ();
998
999 return true;
1000}
1001
1002bool
1003bgPixmap_t::set_target (rxvt_term *new_target)
1004{
1005 if (new_target)
1006 if (target != new_target)
1007 {
1008 target = new_target;
1009# ifdef ENABLE_TRANSPARENCY
1010 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1011# endif
1012 return true;
1013 }
1014 return false;
1015}
1016
1017void
1018bgPixmap_t::apply()
1019{
1020 if (target)
1021 {
1022 if (pixmap != None)
1023 { /* set target's background to pixmap */
1024# ifdef ENABLE_TRANSPARENCY
1025 if (flags & isTransparent)
1026 {
1027 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1028 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1029# if HAVE_SCROLLBARS
1030 if (target->scrollBar.win)
1031 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1032# endif
1033 }
1034 else
1035# endif
1036 {
1037 /* force old pixmap dereference in case it was transparent before :*/
1038 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1039 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1040 /* do we also need to set scrollbar's background here ? */
1041# if HAVE_SCROLLBARS
1042 if (target->scrollBar.win)
1043 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1044# endif
1045 }
1046 }
1047 else
1048 { /* set target background to a pixel */
1049 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1050 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1051 /* do we also need to set scrollbar's background here ? */
1052# if HAVE_SCROLLBARS
1053 if (target->scrollBar.win)
1054 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1055# endif
1056 }
1057 /* don't want Expose on the parent */
1058 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
1059 /* do want Expose on the vt */
1060 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True);
1061#if HAVE_SCROLLBARS
1062 if (target->scrollBar.win)
1063 {
1064 target->scrollBar.setIdle ();
1065 target->scrollbar_show (0);
1066 }
1067#endif
1068 /* Is that really neccessary? we did a XClearArea to generate Expose events alreday ! */
1069 target->want_refresh = target->want_full_refresh = 1;
1070 /* TODO: why do we need a flush here ??? It causes segfault on resize ! */
1071// target->flush ();
1072 }
1073}
1074#endif /* HAVE_BG_PIXMAP */
1075
1076
1077void
1078rxvt_term::get_window_origin (int &x, int &y)
1079{
1080 Window cr;
1081 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1082/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1083}
1084
1085Pixmap
1086rxvt_term::get_pixmap_property (int prop_id)
1087{
1088 if (prop_id > 0 && prop_id < NUM_XA)
1089 if (xa[prop_id])
1090 {
1091 int aformat, rootdepth;
1092 unsigned long nitems, bytes_after;
1093 Atom atype;
1094 unsigned char *prop = NULL;
1095 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1096 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1097 &nitems, &bytes_after, &prop);
1098 if (result == Success && prop && atype == XA_PIXMAP)
1099 {
1100 return *(Pixmap *)prop;
1101 }
1102 }
1103 return None;
1104}
1105
532 1106
533#ifdef ENABLE_TRANSPARENCY 1107#ifdef ENABLE_TRANSPARENCY
534#if TINTING && !defined(HAVE_AFTERIMAGE) 1108#ifndef HAVE_AFTERIMAGE
535/* taken from aterm-0.4.2 */ 1109/* taken from aterm-0.4.2 */
536 1110
537typedef uint32_t RUINT32T; 1111typedef uint32_t RUINT32T;
538 1112
539static void 1113static void
546 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1120 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
547 int i; 1121 int i;
548 1122
549 Visual *visual = term->visual; 1123 Visual *visual = term->visual;
550 1124
551 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 1125 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
552 1126
1127 if (shade == 0)
1128 shade = 100;
1129
553 /* for convenience */ 1130 /* for convenience */
554 mask_r = visual->red_mask; 1131 mask_r = visual->red_mask;
555 mask_g = visual->green_mask; 1132 mask_g = visual->green_mask;
556 mask_b = visual->blue_mask; 1133 mask_b = visual->blue_mask;
557 1134
766/* 1343/*
767 * Check our parents are still who we think they are. 1344 * Check our parents are still who we think they are.
768 * Do transparency updates if required 1345 * Do transparency updates if required
769 */ 1346 */
770int 1347int
771rxvt_term::check_our_parents () 1348rxvt_term::update_background ()
772{ 1349{
773 check_our_parents_ev.stop (); 1350 bgPixmap.invalidate();
774 check_our_parents_ev.start (NOW + .1); 1351 /* no chance of real time refresh if we are blurring ! */
1352 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1353 bgPixmap.render();
1354 else
1355 {
1356 update_background_ev.stop ();
1357 if (!bgPixmap.need_client_side_rendering())
1358 update_background_ev.start (NOW + .05);
1359 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1360 update_background_ev.start (NOW + .2); /* very slow !!! */
1361 else
1362 update_background_ev.start (NOW + .07);
1363 }
775 return 0; 1364 return 0;
776} 1365}
777 1366
1367void
1368rxvt_term::update_background_cb (time_watcher &w)
1369{
1370 bgPixmap.render ();
1371}
1372#endif /* HAVE_BG_PIXMAP */
1373
1374
1375#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */
778void 1376void
779rxvt_term::check_our_parents_cb (time_watcher &w) 1377rxvt_term::check_our_parents_cb (time_watcher &w)
780{ 1378{
781 int i, pchanged, aformat, have_pixmap, rootdepth; 1379
1380 int i, aformat, rootdepth;
782 unsigned long nitems, bytes_after; 1381 unsigned long nitems, bytes_after;
783 Atom atype; 1382 Atom atype;
784 unsigned char *prop = NULL; 1383 unsigned char *prop = NULL;
785 Window root, oldp, *list; 1384 Window root, oldp, *list;
786 Pixmap rootpixmap = None; 1385 Pixmap rootpixmap = None;
787 XWindowAttributes wattr, wrootattr; 1386 XWindowAttributes wattr, wrootattr;
788 int sx, sy; 1387 int sx, sy;
789 Window cr; 1388 Window cr;
790 1389 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
791 pchanged = 0;
792 1390
793 if (!option (Opt_transparent)) 1391 if (!option (Opt_transparent))
794 return /*pchanged*/; /* Don't try any more */ 1392 return; /* Don't try any more */
1393#if 0
1394 struct timeval stv;
1395 gettimeofday (&stv,NULL);
1396#define PRINT_BACKGROUND_OP_TIME do{ struct timeval tv;gettimeofday (&tv,NULL); tv.tv_sec-= stv.tv_sec;\
1397 fprintf (stderr,"%d: elapsed %ld usec\n",__LINE__,\
1398 tv.tv_sec*1000000+tv.tv_usec-stv.tv_usec );}while(0)
1399#else
1400#define PRINT_BACKGROUND_OP_TIME do{}while(0)
1401#endif
1402
795 1403
796 XGetWindowAttributes (dpy, display->root, &wrootattr); 1404 XGetWindowAttributes (dpy, display->root, &wrootattr);
797 rootdepth = wrootattr.depth; 1405 rootdepth = wrootattr.depth;
798 1406
799 XGetWindowAttributes (dpy, parent[0], &wattr); 1407 XGetWindowAttributes (dpy, parent[0], &wattr);
800 1408
801 if (rootdepth != wattr.depth) 1409 if (rootdepth != wattr.depth)
802 { 1410 {
803 if (am_transparent) 1411 if (am_transparent)
804 { 1412 {
805 pchanged = 1;
806 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); 1413 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
807 am_transparent = am_pixmap_trans = 0; 1414 am_transparent = am_pixmap_trans = 0;
808 } 1415 }
809 1416
810 return /*pchanged*/; /* Don't try any more */ 1417 return; /* Don't try any more */
811 } 1418 }
812 1419
813 /* Get all X ops out of the queue so that our information is up-to-date. */ 1420 /* Get all X ops out of the queue so that our information is up-to-date. */
814 XSync (dpy, False); 1421 XSync (dpy, False);
815 1422
816 XTranslateCoordinates (dpy, parent[0], display->root, 1423 XTranslateCoordinates (dpy, parent[0], display->root,
817 0, 0, &sx, &sy, &cr); 1424 0, 0, &sx, &sy, &cr);
818
819 /* check if we are outside of the visible part of the virtual screen : */ 1425 /* check if we are outside of the visible part of the virtual screen : */
820 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0 1426 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
821 || sx >= wrootattr.width || sy >= wrootattr.height ) 1427 || sx >= wrootattr.width || sy >= wrootattr.height )
822 return /* 0 */ ; 1428 return /* 0 */ ;
823 /* 1429 /*
824 * Make the frame window set by the window manager have 1430 * Make the frame window set by the window manager have
825 * the root background. Some window managers put multiple nested frame 1431 * the root background. Some window managers put multiple nested frame
826 * windows for each client, so we have to take care about that. 1432 * windows for each client, so we have to take care about that.
834 i = (xa[XA_ESETROOT_PMAP_ID] 1440 i = (xa[XA_ESETROOT_PMAP_ID]
835 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], 1441 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
836 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1442 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
837 &nitems, &bytes_after, &prop) == Success); 1443 &nitems, &bytes_after, &prop) == Success);
838 1444
839 if (!i || prop == NULL 1445 if (!i || prop == NULL)
840#if TINTING 1446 rootpixmap = None;
841 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
842#ifdef HAVE_AFTERIMAGE
843 && original_asim == NULL && rs[Rs_blurradius] == NULL
844#endif
845 )
846#endif
847 )
848 have_pixmap = 0;
849 else 1447 else
850 { 1448 {
851 have_pixmap = 1; 1449 int junk;
1450 unsigned int ujunk;
1451 /* root pixmap may be bad - allow a error */
1452 allowedxerror = -1;
852 rootpixmap = *(Pixmap *)prop; 1453 if ((rootpixmap = *(Pixmap *)prop) != None)
1454 if (!XGetGeometry (dpy, rootpixmap, &root, &junk, &junk, &rootpixmap_w, &rootpixmap_h, &ujunk, &ujunk))
1455 rootpixmap = None;
1456 allowedxerror = 0;
1457 }
1458
1459 if (prop != NULL)
853 XFree (prop); 1460 XFree (prop);
1461
1462 if (rootpixmap != None)
854 } 1463 {
855
856 if (have_pixmap)
857 {
858 Bool success = False ; 1464 Bool success = False;
859 GC gc = NULL; 1465 GC gc = NULL;
860 XGCValues gcvalue; 1466 XGCValues gcvalue;
1467 int shade = 100;
1468 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1469 Bool whole_tint = False, no_tint = True;
1470
1471 while (sx < 0) sx += (int)wrootattr.width;
1472 while (sy < 0) sy += (int)wrootattr.height;
1473
1474 if (rs[Rs_shade])
1475 shade = atoi (rs[Rs_shade]);
1476 if (ISSET_PIXCOLOR (Color_tint))
1477 pix_colors_focused [Color_tint].get (c);
1478#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
1479 if (shade >= 100)
1480 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
1481 && IS_COMPONENT_WHOLESOME(c.g)
1482 && IS_COMPONENT_WHOLESOME(c.b));
1483 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
1484#undef IS_COMPONENT_WHOLESOME
1485
1486 bgPixmap.make_transparency_pixmap();
1487
1488 if (whole_tint && !no_tint)
1489 {
1490 }
1491 success = True;
861#ifdef HAVE_AFTERIMAGE 1492#ifdef HAVE_AFTERIMAGE
1493 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
862 { 1494 {
863 Pixmap tmp_pmap = None ; 1495 ARGB32 tint = TINT_LEAVE_SAME;
864 ShadingInfo shade; 1496 ASImage *back_im = NULL;
865 ARGB32 tint ;
866 unsigned int pmap_w = 0, pmap_h = 0;
867 1497
868 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h )) 1498 back_im = pixmap2ximage (asv, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
869 { 1499 if (back_im != NULL)
870 int root_x = 0, root_y = 0;
871
872 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
873 if (ISSET_PIXCOLOR (Color_tint))
874 { 1500 {
875 rgba c; 1501 if (!whole_tint && (!no_tint || shade !=100))
876 pix_colors_focused [Color_tint].get (c);
877 shade.tintColor.red = c.r;
878 shade.tintColor.green = c.g;
879 shade.tintColor.blue = c.b;
880 }
881 else
882 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
883 tint = shading2tint32( &shade );
884 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
885 if (GetWinPosition (parent[0], &root_x, &root_y) )
886 {
887 ASImageLayer *layers = create_image_layers( 2 );
888 ASImage *merged_im = NULL;
889 int back_x, back_y, back_w, back_h;
890 /* merge_layers does good job at tiling background appropriately,
891 so all we need is to cut out smallest possible piece : */
892#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
893 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
894 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
895 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
896 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
897 else \
898 { /* small background - need the whole of it for successfull tiling :*/ \
899 back_##xy = 0; \
900 back_##wh = pmap_##wh; \
901 }}while(0)
902
903 MAKE_ROOTPMAP_GEOM(x,w,width);
904 MAKE_ROOTPMAP_GEOM(y,h,height);
905
906 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
907 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
908 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
909 layers[0].clip_width = szHint.width;
910 layers[0].clip_height = szHint.height;
911 layers[0].tint = tint;
912 if (rs[Rs_blurradius] && layers[0].im)
913 { 1502 {
914 double r = atof(rs[Rs_blurradius]); 1503 ShadingInfo as_shade;
915 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT ); 1504 as_shade.shading = shade;
1505 as_shade.tintColor.red = c.r;
1506 as_shade.tintColor.green = c.g;
1507 as_shade.tintColor.blue = c.b;
1508 tint = shading2tint32 (&as_shade);
1509 }
1510
1511 if (rs[Rs_blurradius] && back_im)
1512 {
1513 ASImage* tmp;
1514 int junk;
1515 unsigned int hr = 1, vr = 1;
1516 int flags = XParseGeometry (rs[Rs_blurradius], &junk, &junk, &hr, &vr);
1517 if (!(flags&WidthValue))
1518 hr = 1;
1519 if (!(flags&HeightValue))
1520 vr = hr;
1521 tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF,
1522 (bgPixmap.original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1523 100, ASIMAGE_QUALITY_DEFAULT);
916 if( tmp ) 1524 if (tmp)
917 { 1525 {
918 destroy_asimage( &layers[0].im ); 1526 destroy_asimage (&back_im);
919 layers[0].im = tmp; 1527 back_im = tmp;
920 } 1528 }
921 } 1529 }
922 if (original_asim != NULL) 1530 /* TODO: temporary fix - redo the logic, so that same function can do both
923 { 1531 transparency and non-transparency */
924 int fore_w, fore_h; 1532 bgPixmap.render_asim (back_im, tint);
925 layers[1].im = original_asim;
926 if( bgPixmap.auto_resize )
927 {
928 fore_w = szHint.width;
929 fore_h = szHint.height;
930 }
931 else
932 {
933 fore_w = bgPixmap.w;
934 fore_h = bgPixmap.h;
935 }
936 if (fore_w != original_asim->width
937 || fore_h != original_asim->height)
938 {
939 layers[1].im = scale_asimage( display->asv,
940 original_asim,
941 fore_w, fore_h,
942 ASA_ASImage, 100,
943 ASIMAGE_QUALITY_DEFAULT );
944 }
945
946 layers[1].clip_width = szHint.width;
947 layers[1].clip_height = szHint.height;
948
949 if (rs[Rs_blendtype])
950 {
951 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
952 if( layers[1].merge_scanlines == NULL )
953 layers[1].merge_scanlines = alphablend_scanlines;
954 }
955 }
956 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
957 szHint.width, szHint.height,
958 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
959 if (layers[1].im != original_asim)
960 destroy_asimage( &(layers[1].im) );
961 destroy_asimage( &(layers[0].im) );
962 if (merged_im != NULL)
963 {
964 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
965 destroy_asimage( &merged_im ); 1533 destroy_asimage (&back_im);
966 } 1534
967 free( layers ); 1535 } /* back_im != NULL */
968 } 1536 else
1537 success = False;
969 } 1538 }
970 if (tmp_pmap != None)
971 {
972 success = True;
973 if (pixmap != None)
974 XFreePixmap (dpy, pixmap);
975 pixmap = tmp_pmap;
976 }
977 }
978#else /* HAVE_AFTERIMAGE */ 1539#else /* HAVE_AFTERIMAGE */
979 { 1540 if (!whole_tint && (!no_tint || shade !=100))
980 /*
981 * Copy display->root pixmap transparency
982 */
983 int nx, ny;
984 unsigned int nw, nh;
985 XImage *image;
986
987 nw = (unsigned int)szHint.width;
988 nh = (unsigned int)szHint.height;
989 nx = ny = 0;
990
991 if (sx < 0)
992 { 1541 {
993 nw += sx; 1542 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
994 nx = -sx; 1543 success = False;
995 sx = 0;
996 }
997
998 if (sy < 0)
999 {
1000 nh += sy;
1001 ny = -sy;
1002 sy = 0;
1003 }
1004
1005 min_it (nw, (unsigned int) (wrootattr.width - sx));
1006 min_it (nh, (unsigned int) (wrootattr.height - sy));
1007
1008 XSync (dpy, False);
1009 allowedxerror = -1;
1010 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
1011
1012 /* XXX: handle BadMatch - usually because we're outside the pixmap */
1013 /* XXX: may need a delay here? */
1014 allowedxerror = 0;
1015 if (image != NULL) 1544 if (image != NULL)
1016 {
1017 if (pixmap != None)
1018 XFreePixmap (dpy, pixmap);
1019
1020#if TINTING
1021 if (ISSET_PIXCOLOR (Color_tint))
1022 { 1545 {
1023 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 1546 PRINT_BACKGROUND_OP_TIME;
1024 1547 if (gc == NULL)
1025 rgba c; 1548 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1026 pix_colors_focused [Color_tint].get (c); 1549 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1027 ShadeXImage (this, image, shade, c.r, c.g, c.b); 1550 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1028 } 1551 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1029#endif
1030
1031 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
1032 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1033 XPutImage (dpy, pixmap, gc, image, 0, 0,
1034 nx, ny, image->width, image->height);
1035 XDestroyImage (image); 1552 XDestroyImage (image);
1036 success = True ; 1553 success = True;
1037 } 1554 }
1038 } 1555 }
1039#endif /* HAVE_AFTERIMAGE */ 1556#endif /* HAVE_AFTERIMAGE */
1557 PRINT_BACKGROUND_OP_TIME;
1558
1040 if (gc != NULL) 1559 if (gc != NULL)
1041 XFreeGC (dpy, gc); 1560 XFreeGC (dpy, gc);
1042 1561
1562 bgPixmap.apply();
1043 if (!success) 1563 if (!success)
1044 {
1045 if (am_transparent && am_pixmap_trans)
1046 {
1047 pchanged = 1;
1048 if (pixmap != None)
1049 {
1050 XFreePixmap (dpy, pixmap);
1051 pixmap = None;
1052 }
1053 }
1054
1055 am_pixmap_trans = 0; 1564 am_pixmap_trans = 0;
1056 }
1057 else 1565 else
1058 { 1566 {
1059 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
1060 XClearWindow (dpy, parent[0]);
1061
1062 if (!am_transparent || !am_pixmap_trans)
1063 pchanged = 1;
1064
1065 am_transparent = am_pixmap_trans = 1; 1567 am_transparent = am_pixmap_trans = 1;
1066 } 1568 }
1067 } 1569 } /* rootpixmap != None */
1068 1570
1069 if (am_pixmap_trans) 1571 if (am_pixmap_trans)
1070 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
1071 else
1072 {
1073 unsigned int n;
1074 /*
1075 * InheritPixmap transparency
1076 */
1077 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1078 {
1079 oldp = parent[i];
1080 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
1081 XFree (list);
1082
1083 if (parent[i] == display->root)
1084 {
1085 if (oldp != None)
1086 pchanged = 1;
1087
1088 break;
1089 }
1090
1091 if (oldp != parent[i])
1092 pchanged = 1;
1093 }
1094
1095 n = 0;
1096
1097 if (pchanged)
1098 for (; n < (unsigned int)i; n++)
1099 {
1100 XGetWindowAttributes (dpy, parent[n], &wattr);
1101
1102 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
1103 {
1104 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
1105 break;
1106 }
1107 }
1108
1109 if (n > (sizeof (parent) / sizeof (parent[0])))
1110 {
1111 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
1112 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1113 am_transparent = 0;
1114 /* XXX: also turn off Opt_transparent? */
1115 }
1116 else
1117 {
1118 for (n = 0; n < (unsigned int)i; n++)
1119 {
1120 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
1121 XClearWindow (dpy, parent[n]);
1122 }
1123
1124 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
1125 am_transparent = 1;
1126 }
1127
1128 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
1129 parent[i] = None;
1130 } 1572 {
1131
1132 if (scrollBar.win) 1573 if (scrollBar.win)
1133 { 1574 {
1134 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
1135 scrollBar.setIdle (); 1575 scrollBar.setIdle ();
1136 scrollbar_show (0); 1576 scrollbar_show (0);
1137 } 1577 }
1138 1578
1139 if (am_transparent) 1579 if (am_transparent)
1140 { 1580 {
1141 want_refresh = want_full_refresh = 1; 1581 want_refresh = want_full_refresh = 1;
1142 if (am_pixmap_trans) 1582 if (am_pixmap_trans)
1143 flush (); 1583 flush ();
1584 }
1144 } 1585 }
1145
1146// return pchanged;
1147} 1586}
1148#endif 1587#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines