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.119 by sf-exg, Thu Nov 18 17:28:12 2010 UTC vs.
Revision 1.122 by sf-exg, Sat Nov 20 11:30:58 2010 UTC

… …
103#endif 103#endif
104 flags = 0; 104 flags = 0;
105 pixmap = None; 105 pixmap = None;
106 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
107 target = 0; 107 target = 0;
108 target_x = target_y = 0;
108} 109}
109 110
110void 111void
111bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
112{ 113{
… …
120 g_object_unref (pixbuf); 121 g_object_unref (pixbuf);
121#endif 122#endif
122 123
123 if (pixmap && target) 124 if (pixmap && target)
124 XFreePixmap (target->dpy, pixmap); 125 XFreePixmap (target->dpy, pixmap);
126}
127
128bool
129bgPixmap_t::set_position (int x, int y)
130{
131
132 if (target_x != x
133 || target_y != y)
134 {
135 target_x = x;
136 target_y = y;
137 return true;
138 }
139 return false;
125} 140}
126 141
127bool 142bool
128bgPixmap_t::window_size_sensitive () 143bgPixmap_t::window_size_sensitive ()
129{ 144{
… …
246 int geom_flags = 0; 261 int geom_flags = 0;
247 int x = 0, y = 0; 262 int x = 0, y = 0;
248 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
249 unsigned int n; 264 unsigned int n;
250 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
251 const char *p; 266 const char *ops;
252# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
253 268
254 if (geom == NULL) 269 if (geom == NULL)
255 return false; 270 return false;
256 271
257 char str[MAXLEN_GEOM]; 272 char str[MAXLEN_GEOM];
258 273
259 while (isspace(*geom)) ++geom;
260 if ((p = strchr (geom, ';')) == NULL)
261 p = strchr (geom, '\0'); 274 ops = strchr (geom, ':');
262 275 if (ops == NULL)
276 n = strlen (geom);
277 else
263 n = (p - geom); 278 n = ops - geom;
279
264 if (n < MAXLEN_GEOM) 280 if (n >= MAXLEN_GEOM)
265 { 281 return false;
266 char *ops;
267 282
268 memcpy (str, geom, n); 283 memcpy (str, geom, n);
269 str[n] = '\0'; 284 str[n] = '\0';
270 if (str[0] == ':') 285 rxvt_strtrim (str);
271 ops = &str[0];
272 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
273 ops = &str[0];
274 else
275 {
276 char *tmp;
277 ops = strchr (str, ':');
278 if (ops != NULL)
279 {
280 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
281 *(++tmp) = '\0';
282 if (ops == tmp) ++ops;
283 }
284 }
285 286
286 if (ops > str || ops == NULL) 287 if (str[0])
287 { 288 {
288 /* we have geometry string - let's handle it prior to applying ops */ 289 /* we have geometry string - let's handle it prior to applying ops */
289 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 290 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
290
291 if (!update) /* setting up geometry from scratch */
292 {
293 if (!(geom_flags & XValue))
294 {
295 /* use default geometry - centered */
296 x = y = defaultAlign;
297 }
298 else if (!(geom_flags & YValue))
299 y = x;
300
301 if ((geom_flags & (WidthValue|HeightValue)) == 0)
302 {
303 /* use default geometry - scaled */
304 w = h = defaultScale;
305 }
306 else if (geom_flags & WidthValue)
307 {
308 if (!(geom_flags & HeightValue))
309 h = w;
310 }
311 else
312 w = h;
313 }
314 } /* done parsing geometry string */ 291 } /* done parsing geometry string */
292
315 else if (!update) 293 if (!update)
316 { 294 {
317 /* default geometry - scaled and centered */ 295 if (!(geom_flags & XValue))
318 x = y = defaultAlign; 296 x = y = defaultAlign;
297 else if (!(geom_flags & YValue))
298 y = x;
299
300 if (!(geom_flags & (WidthValue|HeightValue)))
319 w = h = defaultScale; 301 w = h = defaultScale;
320 } 302 else if (!(geom_flags & HeightValue))
303 h = w;
304 else if (!(geom_flags & WidthValue))
305 w = h;
321 306
322 if (!update)
323 geom_flags |= WidthValue|HeightValue|XValue|YValue; 307 geom_flags |= WidthValue|HeightValue|XValue|YValue;
308 }
324 309
325 if (ops) 310 if (ops)
326 { 311 {
327 while (*ops) 312 while (*ops)
328 { 313 {
329 while (*ops == ':' || isspace(*ops)) ++ops; 314 while (*ops == ':' || isspace(*ops)) ++ops;
330 315
331# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0) 316# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
332 if (CHECK_GEOM_OPS ("tile")) 317 if (CHECK_GEOM_OPS ("tile"))
333 { 318 {
334 w = h = noScale; 319 w = h = noScale;
335 geom_flags |= WidthValue|HeightValue; 320 geom_flags |= WidthValue|HeightValue;
336 } 321 }
337 else if (CHECK_GEOM_OPS ("propscale")) 322 else if (CHECK_GEOM_OPS ("propscale"))
338 { 323 {
339 new_flags |= propScale; 324 new_flags |= propScale;
340 } 325 }
341 else if (CHECK_GEOM_OPS ("hscale")) 326 else if (CHECK_GEOM_OPS ("hscale"))
342 { 327 {
343 if (w == 0) w = windowScale; 328 if (w == 0) w = windowScale;
344 329
345 h = noScale; 330 h = noScale;
346 geom_flags |= WidthValue|HeightValue; 331 geom_flags |= WidthValue|HeightValue;
347 } 332 }
348 else if (CHECK_GEOM_OPS ("vscale")) 333 else if (CHECK_GEOM_OPS ("vscale"))
349 { 334 {
350 if (h == 0) h = windowScale; 335 if (h == 0) h = windowScale;
351 336
352 w = noScale; 337 w = noScale;
353 geom_flags |= WidthValue|HeightValue; 338 geom_flags |= WidthValue|HeightValue;
354 } 339 }
355 else if (CHECK_GEOM_OPS ("scale")) 340 else if (CHECK_GEOM_OPS ("scale"))
356 { 341 {
357 if (h == 0) h = windowScale; 342 if (h == 0) h = windowScale;
358 if (w == 0) w = windowScale; 343 if (w == 0) w = windowScale;
359 344
360 geom_flags |= WidthValue|HeightValue; 345 geom_flags |= WidthValue|HeightValue;
361 } 346 }
362 else if (CHECK_GEOM_OPS ("auto")) 347 else if (CHECK_GEOM_OPS ("auto"))
363 { 348 {
364 w = h = windowScale; 349 w = h = windowScale;
365 x = y = centerAlign; 350 x = y = centerAlign;
366 geom_flags |= WidthValue|HeightValue|XValue|YValue; 351 geom_flags |= WidthValue|HeightValue|XValue|YValue;
367 } 352 }
368 else if (CHECK_GEOM_OPS ("root")) 353 else if (CHECK_GEOM_OPS ("root"))
369 { 354 {
370 new_flags |= rootAlign; 355 new_flags |= rootAlign;
371 w = h = noScale; 356 w = h = noScale;
372 geom_flags |= WidthValue|HeightValue; 357 geom_flags |= WidthValue|HeightValue;
373 } 358 }
374# undef CHECK_GEOM_OPS 359# undef CHECK_GEOM_OPS
375 360
376 while (*ops != ':' && *ops != '\0') ++ops; 361 while (*ops != ':' && *ops != '\0') ++ops;
377 } /* done parsing ops */ 362 } /* done parsing ops */
378 } 363 }
379 364
380 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 365 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
381 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 366 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
382 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 367 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
383 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 368 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
384 }
385 369
386 if (new_flags != flags) 370 if (new_flags != flags)
387 { 371 {
388 flags = new_flags; 372 flags = new_flags;
389 changed = true; 373 changed = true;
… …
414 if (!w) w = image_width; 398 if (!w) w = image_width;
415 if (!h) h = image_height; 399 if (!h) h = image_height;
416 400
417 if (flags & rootAlign) 401 if (flags & rootAlign)
418 { 402 {
419 target->get_window_origin (x, y);
420 x = -x; 403 x = -target_x;
421 y = -y; 404 y = -target_y;
422 } 405 }
423 else 406 else
424 { 407 {
425 x = make_align_position (h_align, target_width, w); 408 x = make_align_position (h_align, target_width, w);
426 y = make_align_position (v_align, target_height, h); 409 y = make_align_position (v_align, target_height, h);
… …
958 941
959 if (tint) 942 if (tint)
960 { 943 {
961 tint->get (c); 944 tint->get (c);
962# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 945# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
946 if (!has_shade
963 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 947 && IS_COMPONENT_WHOLESOME (c.r)
964 && IS_COMPONENT_WHOLESOME (c.g) 948 && IS_COMPONENT_WHOLESOME (c.g)
965 && IS_COMPONENT_WHOLESOME (c.b)) 949 && IS_COMPONENT_WHOLESOME (c.b))
966 flags |= bgPixmap_t::tintWholesome; 950 flags |= bgPixmap_t::tintWholesome;
967# undef IS_COMPONENT_WHOLESOME 951# undef IS_COMPONENT_WHOLESOME
968 } 952 }
… …
1231 int window_height = target->szHint.height; 1215 int window_height = target->szHint.height;
1232 int sx, sy; 1216 int sx, sy;
1233 XGCValues gcv; 1217 XGCValues gcv;
1234 GC gc; 1218 GC gc;
1235 1219
1236 target->get_window_origin (sx, sy); 1220 sx = target_x;
1221 sy = target_y;
1237 1222
1238 /* check if we are outside of the visible part of the virtual screen : */ 1223 /* check if we are outside of the visible part of the virtual screen : */
1239 if (sx + window_width <= 0 || sy + window_height <= 0 1224 if (sx + window_width <= 0 || sy + window_height <= 0
1240 || sx >= root_width || sy >= root_height) 1225 || sx >= root_width || sy >= root_height)
1241 return 0; 1226 return 0;
… …
1294 1279
1295 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1280 if (tiled_root_pmap == None) /* something really bad happened - abort */
1296 return 0; 1281 return 0;
1297 1282
1298 /* straightforward pixmap copy */ 1283 /* straightforward pixmap copy */
1284 while (sx < 0) sx += (int)root_width;
1285 while (sy < 0) sy += (int)root_height;
1286
1299 gcv.tile = recoded_root_pmap; 1287 gcv.tile = recoded_root_pmap;
1300 gcv.fill_style = FillTiled; 1288 gcv.fill_style = FillTiled;
1301
1302 while (sx < 0) sx += (int)root_width;
1303 while (sy < 0) sy += (int)root_height;
1304
1305 gcv.ts_x_origin = -sx; 1289 gcv.ts_x_origin = -sx;
1306 gcv.ts_y_origin = -sy; 1290 gcv.ts_y_origin = -sy;
1307 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1291 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1308 1292
1309 if (gc) 1293 if (gc)
… …
1375 /* we need to re-generate transparency pixmap in that case ! */ 1359 /* we need to re-generate transparency pixmap in that case ! */
1376 background_flags = make_transparency_pixmap (); 1360 background_flags = make_transparency_pixmap ();
1377 if (background_flags == 0) 1361 if (background_flags == 0)
1378 return false; 1362 return false;
1379 else if ((background_flags & transpTransformations) == (flags & transpTransformations)) 1363 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1380 flags = flags & ~isInvalid; 1364 flags &= ~isInvalid;
1381 } 1365 }
1382# endif 1366# endif
1383 1367
1384# ifdef BG_IMAGE_FROM_FILE 1368# ifdef BG_IMAGE_FROM_FILE
1385 if (have_image 1369 if (have_image
1386 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1370 || (background_flags & transpTransformations) != (flags & transpTransformations))
1387 { 1371 {
1388 if (render_image (background_flags)) 1372 if (render_image (background_flags))
1389 flags = flags & ~isInvalid; 1373 flags &= ~isInvalid;
1390 } 1374 }
1391# endif 1375# endif
1392 1376
1393# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1377# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1394 XImage *result = NULL; 1378 XImage *result = NULL;
… …
1414 if (gc) 1398 if (gc)
1415 { 1399 {
1416 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1400 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1417 1401
1418 XFreeGC (target->dpy, gc); 1402 XFreeGC (target->dpy, gc);
1419 flags = flags & ~isInvalid; 1403 flags &= ~isInvalid;
1420 } 1404 }
1421 1405
1422 XDestroyImage (result); 1406 XDestroyImage (result);
1423 } 1407 }
1424# endif 1408# endif

Diff Legend

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