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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.338 by ayin, Tue Jul 31 17:39:39 2007 UTC vs.
Revision 1.340 by sasha, Fri Aug 3 22:40:10 2007 UTC

1484 1484
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1486 {
1487 seen_resize = 1; 1487 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND 1489#ifdef HAVE_BG_PIXMAP
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1491 { 1492 {
1492 resize_pixmap (); 1493 resize_pixmap ();
1493 scr_touch (true); 1494 scr_touch (true);
1494 } 1495 }
1495#endif 1496#endif
3443 want_full_refresh = want_refresh = 1; 3444 want_full_refresh = want_refresh = 1;
3444 3445
3445 break; 3446 break;
3446#endif 3447#endif
3447 3448
3449#if XPM_BACKGROUND
3448 case Rxvt_Pixmap: 3450 case Rxvt_Pixmap:
3449 { 3451 {
3450 if (*str != ';') 3452 if (*str != ';')
3451 { 3453 {
3452#if XPM_BACKGROUND
3453 scale_pixmap (""); /* reset to default scaling */ 3454 bgPixmap.handle_geometry (""); /* reset to default scaling */
3454 set_bgPixmap (str); /* change pixmap */ 3455 set_bgPixmap (str); /* change pixmap */
3455 scr_touch (true); 3456 scr_touch (true);
3456#endif
3457 } 3457 }
3458 3458
3459 int changed = 0; 3459 int changed = 0;
3460 3460
3461 while ((str = strchr (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3462 { 3462 {
3463 str++; 3463 str++;
3464#if XPM_BACKGROUND 3464 changed += bgPixmap.handle_geometry (str);
3465 changed += scale_pixmap (str);
3466#endif
3467 } 3465 }
3468 3466
3469 if (changed) 3467 if (changed)
3470 { 3468 {
3471#ifdef XPM_BACKGROUND
3472 resize_pixmap (); 3469 resize_pixmap ();
3473 scr_touch (true); 3470 scr_touch (true);
3474#endif
3475 } 3471 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE) 3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent)) 3473 if (option (Opt_transparent))
3478 check_our_parents (); 3474 check_our_parents ();
3479#endif 3475#endif
3480 } 3476 }
3481 break; 3477 break;
3478#endif
3482 3479
3483 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3484 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3485 break; 3482 break;
3486 case Rxvt_restoreBG: 3483 case Rxvt_restoreBG:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines