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

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 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ()) 1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 { 1492 {
1493 resize_pixmap (); 1493 bgPixmap.render_background ();
1494 scr_touch (true); 1494 scr_touch (true);
1495 } 1495 }
1496#endif 1496#endif
1497 } 1497 }
1498 1498
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 1500
1501#ifdef ENABLE_TRANSPARENCY 1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent)) 1502 if (option (Opt_transparent))
1503 check_our_parents (); 1503 bgPixmap.render_background ();
1504#endif 1504#endif
1505 } 1505 }
1506 break; 1506 break;
1507 1507
1508 case PropertyNotify: 1508 case PropertyNotify:
1835 case PropertyNotify: 1835 case PropertyNotify:
1836 /* 1836 /*
1837 * 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,
1838 * 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.
1839 */ 1839 */
1840 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1840 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1841 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1842 return; 1842 {
1843 1843 bgPixmap.set_root_pixmap ();
1844 /* FALLTHROUGH */ 1844 bgPixmap.render_background ();
1845 case ReparentNotify: 1845 }
1846 if (option (Opt_transparent))
1847 check_our_parents ();
1848 break; 1846 break;
1849 } 1847 }
1850# endif 1848# endif
1851} 1849}
1852#endif 1850#endif
3435 break; 3433 break;
3436#endif 3434#endif
3437#if ENABLE_TRANSPARENCY 3435#if ENABLE_TRANSPARENCY
3438 case URxvt_Color_tint: 3436 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3440 3438 {
3441 check_our_parents (); 3439 bool changed = false;
3442 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 ();
3443 if (am_transparent) 3447 if (am_transparent)
3444 want_full_refresh = want_refresh = 1; 3448 want_full_refresh = want_refresh = 1;
3449 }
3450 }
3445 3451
3446 break; 3452 break;
3447#endif 3453#endif
3448 3454
3449#if XPM_BACKGROUND 3455#if XPM_BACKGROUND
3450 case Rxvt_Pixmap: 3456 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?"))
3451 { 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
3452 if (*str != ';') 3470 if (*str != ';')
3453 { 3471 {
3454 bgPixmap.handle_geometry (""); /* reset to default scaling */ 3472 /* reset to default scaling :*/
3473 bgPixmap.unset_geometry ();
3455 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 ();
3456 scr_touch (true); 3490 scr_touch (true);
3457 } 3491 }
3458
3459 int changed = 0;
3460
3461 while ((str = strchr (str, ';')) != NULL)
3462 {
3463 str++;
3464 changed += bgPixmap.handle_geometry (str);
3465 } 3492 }
3466
3467 if (changed)
3468 {
3469 resize_pixmap ();
3470 scr_touch (true);
3471 }
3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473 if (option (Opt_transparent))
3474 check_our_parents ();
3475#endif
3476 }
3477 break; 3493 break;
3478#endif 3494#endif
3479 3495
3480 case Rxvt_restoreFG: 3496 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3497 set_window_color (Color_fg, str);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines