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.348 by sasha, Thu Aug 16 21:26:20 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,
… …
1475 && ev.xfocus.mode != NotifyGrab) 1474 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1475 focus_out ();
1477 break; 1476 break;
1478 1477
1479 case ConfigureNotify: 1478 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/
1480 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1481 { 1483 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1485 ;
1484 1486
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1488 {
1487 seen_resize = 1; 1489 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1491 }
1497 1492 else
1493 {
1494#ifdef ENABLE_TRANSPARENCY
1495 if (option (Opt_transparent))
1496 update_background ();
1497#endif
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#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 check_our_parents ();
1503#endif
1504 } 1500 }
1505 break; 1501 break;
1506 1502
1507 case PropertyNotify: 1503 case PropertyNotify:
1508 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1576 if (isScrollbarWindow (ev.xany.window)) 1572 if (isScrollbarWindow (ev.xany.window))
1577 { 1573 {
1578 scrollBar.setIdle (); 1574 scrollBar.setIdle ();
1579 scrollbar_show (0); 1575 scrollbar_show (0);
1580 } 1576 }
1581
1582#ifdef ENABLE_TRANSPARENCY
1583 if (am_transparent && ev.xany.window == parent[0])
1584 XClearWindow (dpy, ev.xany.window);
1585#endif
1586 } 1577 }
1587 break; 1578 break;
1588 1579
1589 case MotionNotify: 1580 case MotionNotify:
1590#ifdef POINTER_BLANK 1581#ifdef POINTER_BLANK
… …
1834 case PropertyNotify: 1825 case PropertyNotify:
1835 /* 1826 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1827 * 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. 1828 * use the property to determine the pixmap. We use it later on.
1838 */ 1829 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1832 {
1842 1833 bgPixmap.set_root_pixmap ();
1843 /* FALLTHROUGH */ 1834 update_background ();
1844 case ReparentNotify: 1835 }
1845 if (option (Opt_transparent))
1846 check_our_parents ();
1847 break; 1836 break;
1848 } 1837 }
1849# endif 1838# endif
1850} 1839}
1851#endif 1840#endif
… …
3431 break; 3420 break;
3432 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3433 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3434 break; 3423 break;
3435#endif 3424#endif
3436#if ENABLE_TRANSPARENCY && TINTING 3425#if ENABLE_TRANSPARENCY
3437 case URxvt_Color_tint: 3426 case URxvt_Color_tint:
3438 process_color_seq (op, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3439 3428 {
3440 check_our_parents (); 3429 bool changed = false;
3441 3430 if (ISSET_PIXCOLOR (Color_tint))
3442 if (am_transparent) 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3443 want_full_refresh = want_refresh = 1; 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3444 3437
3445 break; 3438 break;
3446#endif 3439#endif
3447 3440
3448#if XPM_BACKGROUND 3441#if XPM_BACKGROUND
3449 case Rxvt_Pixmap: 3442 case Rxvt_Pixmap:
3450 { 3443 if (!strcmp (str, "?"))
3451 if (*str != ';')
3452 { 3444 {
3453 scale_pixmap (""); /* reset to default scaling */ 3445 char str[256];
3454 set_bgPixmap (str); /* change pixmap */ 3446
3455 scr_touch (true); 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3456 } 3451 }
3457 3452 else
3453 {
3458 int changed = 0; 3454 int changed = 0;
3459 3455
3460 while ((str = strchr (str, ';')) != NULL) 3456 if (*str != ';')
3461 { 3457 {
3458 /* reset to default scaling :*/
3459 bgPixmap.unset_geometry ();
3460 if (bgPixmap.set_file (str)) /* change pixmap */
3461 changed++;
3462 str = strchr (str, ';');
3463 if (str == NULL)
3464 bgPixmap.set_defaultGeometry ();
3465 }
3466 while (str)
3467 {
3462 str++; 3468 str++;
3463 changed += scale_pixmap (str); 3469 if (bgPixmap.set_geometry (str))
3470 changed++;
3471 str = strchr (str, ';');
3464 } 3472 }
3465
3466 if (changed) 3473 if (changed)
3467 { 3474 update_background ();
3468 resize_pixmap ();
3469 scr_touch (true);
3470 } 3475 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3475 }
3476 break; 3476 break;
3477#endif 3477#endif
3478 3478
3479 case Rxvt_restoreFG: 3479 case Rxvt_restoreFG:
3480 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
… …
3604{ 3604{
3605 unsigned int i, j; 3605 unsigned int i, j;
3606 int state; 3606 int state;
3607 3607
3608 static const struct 3608 static const struct
3609 { 3609 {
3610 const int argval; 3610 const int argval;
3611 const unsigned long bit; 3611 const unsigned long bit;
3612 }
3613
3614 argtopriv[] = { 3612 } argtopriv[] = {
3615 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
3616 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
3617 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
3618 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
3619 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },

Diff Legend

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