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.345 by sasha, Mon Aug 13 22:41:34 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 ();
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 ();
1504#endif 1504#endif
1505 } 1505 }
1506 break; 1506 break;
1507 1507
1508 case PropertyNotify: 1508 case PropertyNotify:
… …
1577 if (isScrollbarWindow (ev.xany.window)) 1577 if (isScrollbarWindow (ev.xany.window))
1578 { 1578 {
1579 scrollBar.setIdle (); 1579 scrollBar.setIdle ();
1580 scrollbar_show (0); 1580 scrollbar_show (0);
1581 } 1581 }
1582
1583#ifdef ENABLE_TRANSPARENCY
1584 if (am_transparent && ev.xany.window == parent[0])
1585 XClearWindow (dpy, ev.xany.window);
1586#endif
1587 } 1582 }
1588 break; 1583 break;
1589 1584
1590 case MotionNotify: 1585 case MotionNotify:
1591#ifdef POINTER_BLANK 1586#ifdef POINTER_BLANK
… …
1835 case PropertyNotify: 1830 case PropertyNotify:
1836 /* 1831 /*
1837 * if user used some Esetroot compatible prog to set the root bg, 1832 * 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. 1833 * use the property to determine the pixmap. We use it later on.
1839 */ 1834 */
1840 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1842 return; 1837 {
1843 1838 bgPixmap.set_root_pixmap ();
1844 /* FALLTHROUGH */ 1839 bgPixmap.render ();
1845 case ReparentNotify: 1840 }
1846 if (option (Opt_transparent))
1847 check_our_parents ();
1848 break; 1841 break;
1849 } 1842 }
1850# endif 1843# endif
1851} 1844}
1852#endif 1845#endif
… …
3435 break; 3428 break;
3436#endif 3429#endif
3437#if ENABLE_TRANSPARENCY 3430#if ENABLE_TRANSPARENCY
3438 case URxvt_Color_tint: 3431 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3432 process_color_seq (op, Color_tint, str, resp);
3440 3433 {
3441 check_our_parents (); 3434 bool changed = false;
3442 3435 if (ISSET_PIXCOLOR (Color_tint))
3443 if (am_transparent) 3436 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3444 want_full_refresh = want_refresh = 1; 3437 else
3438 changed = bgPixmap.unset_tint ();
3439 if (changed)
3440 bgPixmap.render ();
3441 }
3445 3442
3446 break; 3443 break;
3447#endif 3444#endif
3448 3445
3449#if XPM_BACKGROUND 3446#if XPM_BACKGROUND
3450 case Rxvt_Pixmap: 3447 case Rxvt_Pixmap:
3448 if (!strcmp (str, "?"))
3451 { 3449 {
3450 char str[256];
3451
3452 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3453 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3454 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3455 process_xterm_seq (XTerm_title, str, CHAR_ST);
3456 }
3457 else
3458 {
3459 int changed = 0;
3460
3452 if (*str != ';') 3461 if (*str != ';')
3453 { 3462 {
3454 bgPixmap.handle_geometry (""); /* reset to default scaling */ 3463 /* reset to default scaling :*/
3464 bgPixmap.unset_geometry ();
3455 set_bgPixmap (str); /* change pixmap */ 3465 if (bgPixmap.set_file (str)) /* change pixmap */
3466 changed++;
3467 str = strchr (str, ';');
3468 if (str == NULL)
3469 bgPixmap.set_defaultGeometry ();
3470 }
3471 while (str)
3472 {
3473 str++;
3474 if (bgPixmap.set_geometry (str))
3475 changed++;
3476 str = strchr (str, ';');
3477 }
3478 if (changed)
3479 {
3480 bgPixmap.render ();
3456 scr_touch (true); 3481 scr_touch (true);
3457 } 3482 }
3458
3459 int changed = 0;
3460
3461 while ((str = strchr (str, ';')) != NULL)
3462 {
3463 str++;
3464 changed += bgPixmap.handle_geometry (str);
3465 } 3483 }
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; 3484 break;
3478#endif 3485#endif
3479 3486
3480 case Rxvt_restoreFG: 3487 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3488 set_window_color (Color_fg, str);
… …
3605{ 3612{
3606 unsigned int i, j; 3613 unsigned int i, j;
3607 int state; 3614 int state;
3608 3615
3609 static const struct 3616 static const struct
3610 { 3617 {
3611 const int argval; 3618 const int argval;
3612 const unsigned long bit; 3619 const unsigned long bit;
3613 }
3614
3615 argtopriv[] = { 3620 } argtopriv[] = {
3616 { 1, PrivMode_aplCUR }, 3621 { 1, PrivMode_aplCUR },
3617 { 2, PrivMode_vt52 }, 3622 { 2, PrivMode_vt52 },
3618 { 3, PrivMode_132 }, 3623 { 3, PrivMode_132 },
3619 { 4, PrivMode_smoothScroll }, 3624 { 4, PrivMode_smoothScroll },
3620 { 5, PrivMode_rVideo }, 3625 { 5, PrivMode_rVideo },

Diff Legend

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