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.339 by ayin, Fri Aug 3 14:03:28 2007 UTC vs.
Revision 1.343 by sasha, Fri Aug 10 22:10:36 2007 UTC

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 XPM_BACKGROUND
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 bgPixmap.render_background ();
1493 scr_touch (true); 1494 scr_touch (true);
1494 } 1495 }
1495#endif 1496#endif
1496 } 1497 }
1497 1498
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 1500
1500#ifdef ENABLE_TRANSPARENCY 1501#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent)) 1502 if (option (Opt_transparent))
1502 check_our_parents (); 1503 bgPixmap.render_background ();
1503#endif 1504#endif
1504 } 1505 }
1505 break; 1506 break;
1506 1507
1507 case PropertyNotify: 1508 case PropertyNotify:
1834 case PropertyNotify: 1835 case PropertyNotify:
1835 /* 1836 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1837 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1838 * use the property to determine the pixmap. We use it later on.
1838 */ 1839 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1840 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1841 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1842 {
1842 1843 bgPixmap.set_root_pixmap ();
1843 /* FALLTHROUGH */ 1844 bgPixmap.render_background ();
1844 case ReparentNotify: 1845 }
1845 if (option (Opt_transparent))
1846 check_our_parents ();
1847 break; 1846 break;
1848 } 1847 }
1849# endif 1848# endif
1850} 1849}
1851#endif 1850#endif
3431 break; 3430 break;
3432 case URxvt_Color_IT: 3431 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3432 process_color_seq (op, Color_IT, str, resp);
3434 break; 3433 break;
3435#endif 3434#endif
3436#if ENABLE_TRANSPARENCY && TINTING 3435#if ENABLE_TRANSPARENCY
3437 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3439 3438 {
3440 check_our_parents (); 3439 bool changed = false;
3441 3440 if (ISSET_PIXCOLOR (Color_tint))
3441 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3442 else
3443 changed = bgPixmap.unset_tint ();
3444 if (changed)
3445 {
3446 bgPixmap.render_background ();
3442 if (am_transparent) 3447 if (am_transparent)
3443 want_full_refresh = want_refresh = 1; 3448 want_full_refresh = want_refresh = 1;
3449 }
3450 }
3444 3451
3445 break; 3452 break;
3446#endif 3453#endif
3447 3454
3448#if XPM_BACKGROUND 3455#if XPM_BACKGROUND
3449 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?"))
3450 { 3458 {
3459 char str[256];
3460
3461 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 }
3466 else
3467 {
3468 int changed = 0;
3469
3451 if (*str != ';') 3470 if (*str != ';')
3452 { 3471 {
3453 scale_pixmap (""); /* reset to default scaling */ 3472 /* reset to default scaling :*/
3473 bgPixmap.unset_geometry ();
3454 set_bgPixmap (str); /* change pixmap */ 3474 if (bgPixmap.set_file (str)) /* change pixmap */
3475 changed++;
3476 str = strchr (str, ';');
3477 if (str == NULL)
3478 bgPixmap.set_defaultGeometry ();
3479 }
3480 while (str)
3481 {
3482 str++;
3483 if (bgPixmap.set_geometry (str))
3484 changed++;
3485 str = strchr (str, ';');
3486 }
3487 if (changed)
3488 {
3489 bgPixmap.render_background ();
3455 scr_touch (true); 3490 scr_touch (true);
3456 } 3491 }
3457
3458 int changed = 0;
3459
3460 while ((str = strchr (str, ';')) != NULL)
3461 {
3462 str++;
3463 changed += scale_pixmap (str);
3464 } 3492 }
3465
3466 if (changed)
3467 {
3468 resize_pixmap ();
3469 scr_touch (true);
3470 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3475 }
3476 break; 3493 break;
3477#endif 3494#endif
3478 3495
3479 case Rxvt_restoreFG: 3496 case Rxvt_restoreFG:
3480 set_window_color (Color_fg, str); 3497 set_window_color (Color_fg, str);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines