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.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

… …
94 XK_ISO_Left_Tab, 0x21e6, 94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
… …
1484 1483
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1485 {
1487 seen_resize = 1; 1486 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 resize_pixmap ();
1494 scr_touch (true);
1495 }
1496#endif
1497 } 1488 }
1498 1489 else
1490 {
1491#ifdef ENABLE_TRANSPARENCY
1492 if (option (Opt_transparent))
1493 if (bgPixmap.render ())
1494 scr_touch (false);
1495#endif
1496 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 check_our_parents ();
1504#endif
1505 } 1498 }
1506 break; 1499 break;
1507 1500
1508 case PropertyNotify: 1501 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1502 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1577 if (isScrollbarWindow (ev.xany.window)) 1570 if (isScrollbarWindow (ev.xany.window))
1578 { 1571 {
1579 scrollBar.setIdle (); 1572 scrollBar.setIdle ();
1580 scrollbar_show (0); 1573 scrollbar_show (0);
1581 } 1574 }
1582
1583#ifdef ENABLE_TRANSPARENCY
1584 if (am_transparent && ev.xany.window == parent[0])
1585 XClearWindow (dpy, ev.xany.window);
1586#endif
1587 } 1575 }
1588 break; 1576 break;
1589 1577
1590 case MotionNotify: 1578 case MotionNotify:
1591#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
… …
1835 case PropertyNotify: 1823 case PropertyNotify:
1836 /* 1824 /*
1837 * if user used some Esetroot compatible prog to set the root bg, 1825 * 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. 1826 * use the property to determine the pixmap. We use it later on.
1839 */ 1827 */
1840 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1842 return; 1830 {
1843 1831 bgPixmap.set_root_pixmap ();
1844 /* FALLTHROUGH */ 1832 bgPixmap.render ();
1845 case ReparentNotify: 1833 }
1846 if (option (Opt_transparent))
1847 check_our_parents ();
1848 break; 1834 break;
1849 } 1835 }
1850# endif 1836# endif
1851} 1837}
1852#endif 1838#endif
… …
3435 break; 3421 break;
3436#endif 3422#endif
3437#if ENABLE_TRANSPARENCY 3423#if ENABLE_TRANSPARENCY
3438 case URxvt_Color_tint: 3424 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3425 process_color_seq (op, Color_tint, str, resp);
3440 3426 {
3441 check_our_parents (); 3427 bool changed = false;
3442 3428 if (ISSET_PIXCOLOR (Color_tint))
3443 if (am_transparent) 3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3444 want_full_refresh = want_refresh = 1; 3430 else
3431 changed = bgPixmap.unset_tint ();
3432 if (changed)
3433 bgPixmap.render ();
3434 }
3445 3435
3446 break; 3436 break;
3447#endif 3437#endif
3448 3438
3449#if XPM_BACKGROUND 3439#if XPM_BACKGROUND
3450 case Rxvt_Pixmap: 3440 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?"))
3451 { 3442 {
3443 char str[256];
3444
3445 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3446 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3447 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3448 process_xterm_seq (XTerm_title, str, CHAR_ST);
3449 }
3450 else
3451 {
3452 int changed = 0;
3453
3452 if (*str != ';') 3454 if (*str != ';')
3453 { 3455 {
3454 bgPixmap.handle_geometry (""); /* reset to default scaling */ 3456 /* reset to default scaling :*/
3457 bgPixmap.unset_geometry ();
3455 set_bgPixmap (str); /* change pixmap */ 3458 if (bgPixmap.set_file (str)) /* change pixmap */
3459 changed++;
3460 str = strchr (str, ';');
3461 if (str == NULL)
3462 bgPixmap.set_defaultGeometry ();
3463 }
3464 while (str)
3465 {
3466 str++;
3467 if (bgPixmap.set_geometry (str))
3468 changed++;
3469 str = strchr (str, ';');
3470 }
3471 if (changed)
3472 {
3473 bgPixmap.render ();
3456 scr_touch (true); 3474 scr_touch (true);
3457 } 3475 }
3458
3459 int changed = 0;
3460
3461 while ((str = strchr (str, ';')) != NULL)
3462 {
3463 str++;
3464 changed += bgPixmap.handle_geometry (str);
3465 } 3476 }
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; 3477 break;
3478#endif 3478#endif
3479 3479
3480 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
… …
3605{ 3605{
3606 unsigned int i, j; 3606 unsigned int i, j;
3607 int state; 3607 int state;
3608 3608
3609 static const struct 3609 static const struct
3610 { 3610 {
3611 const int argval; 3611 const int argval;
3612 const unsigned long bit; 3612 const unsigned long bit;
3613 }
3614
3615 argtopriv[] = { 3613 } argtopriv[] = {
3616 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR },
3617 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 },
3618 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 },
3619 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll },
3620 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo },

Diff Legend

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