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

Diff Legend

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