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.332 by root, Tue Jun 26 00:40:18 2007 UTC vs.
Revision 1.347 by sasha, Wed Aug 15 22:41:52 2007 UTC

… …
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, 99 XK_ISO_Lock, 0x21eb,
100 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,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
519# endif 518# endif
520 return; 519 return;
521 } 520 }
522 else 521 else
523 { 522 {
524# if ENABLE_OVERLAY 523# if ISO_14755
525 scr_overlay_off (); 524 scr_overlay_off ();
526# endif 525# endif
527 iso14755buf = 0; 526 iso14755buf = 0;
528 } 527 }
529 } 528 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
533 { 532 {
534 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 534# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 537# endif
539 } 538 }
540#endif 539#endif
… …
728 727
729 case XK_Find: 728 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 729 strcpy (kbuf, "\033[1~");
731 break; 730 break;
732 731
733#ifdef XK_KP_End 732#ifdef XK_KP_Insert
734 case XK_KP_Insert: 733 case XK_KP_Insert:
735 /* allow shift to override */ 734 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 { 736 {
738 strcpy (kbuf, "\033Op"); 737 strcpy (kbuf, "\033Op");
… …
934#if ENABLE_FRILLS || ISO_14755 933#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 934 // ISO 14755 support
936 if (iso14755buf) 935 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 936 if (iso14755buf & ISO_14755_52)
938 { 937 {
939# if ENABLE_OVERLAY 938# if ISO_14755
940 scr_overlay_off (); 939 scr_overlay_off ();
941# endif 940# endif
942# if ISO_14755 941# if ISO_14755
943 // iso14755 part 5.2 handling: release time 942 // iso14755 part 5.2 handling: release time
944 // first: controls 943 // first: controls
… …
967 966
968 return; 967 return;
969 } 968 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 969 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 970 {
972# if ENABLE_OVERLAY 971# if ISO_14755
973 scr_overlay_off (); 972 scr_overlay_off ();
974# endif 973# endif
975 if (iso14755buf & ISO_14755_51) 974 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 975 commit_iso14755 ();
977#if ISO_14755 976#if ISO_14755
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1433 focus_out ();
1435 } 1434 }
1436#endif 1435#endif
1437 } 1436 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1437 break;
1443 1438
1444 /* 1439 /*
1445 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1488 1483
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1485 {
1491 seen_resize = 1; 1486 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1500 } 1488 }
1501 1489 else
1490 {
1491#ifdef ENABLE_TRANSPARENCY
1492 if (option (Opt_transparent))
1493 if (bgPixmap.render ())
1494 scr_touch (false);
1495#endif
1496 }
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1498 }
1509 break; 1499 break;
1510 1500
1511 case PropertyNotify: 1501 case PropertyNotify:
1512 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)))
… …
1580 if (isScrollbarWindow (ev.xany.window)) 1570 if (isScrollbarWindow (ev.xany.window))
1581 { 1571 {
1582 scrollBar.setIdle (); 1572 scrollBar.setIdle ();
1583 scrollbar_show (0); 1573 scrollbar_show (0);
1584 } 1574 }
1585
1586#ifdef ENABLE_TRANSPARENCY
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1575 }
1591 break; 1576 break;
1592 1577
1593 case MotionNotify: 1578 case MotionNotify:
1594#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
… …
1783 1768
1784#if ENABLE_FRILLS || ISO_14755 1769#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1770 if (iso14755buf)
1786 { 1771 {
1787 iso14755buf = 0; 1772 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1773# if ISO_14755
1789 scr_overlay_off (); 1774 scr_overlay_off ();
1790# endif 1775# endif
1791 } 1776 }
1792#endif 1777#endif
1793#if USE_XIM 1778#if USE_XIM
… …
1838 case PropertyNotify: 1823 case PropertyNotify:
1839 /* 1824 /*
1840 * 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,
1841 * 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.
1842 */ 1827 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1828 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1829 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1830 {
1846 1831 bgPixmap.set_root_pixmap ();
1847 /* FALLTHROUGH */ 1832 bgPixmap.render ();
1848 case ReparentNotify: 1833 }
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1834 break;
1852 } 1835 }
1853# endif 1836# endif
1854} 1837}
1855#endif 1838#endif
… …
2574 process_dcs_seq (); 2557 process_dcs_seq ();
2575 break; 2558 break;
2576 case 0x9b: /* CSI */ 2559 case 0x9b: /* CSI */
2577 process_csi_seq (); 2560 process_csi_seq ();
2578 break; 2561 break;
2579 case 0x9d: /* CSI */ 2562 case 0x9d: /* OSC */
2580 process_osc_seq (); 2563 process_osc_seq ();
2581 break; 2564 break;
2582#endif 2565#endif
2583 } 2566 }
2584} 2567}
… …
2812 unicode_t ch, priv, i; 2795 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2796 unsigned int nargs, p;
2814 int n, ndef; 2797 int n, ndef;
2815 int arg[ESC_ARGS]; 2798 int arg[ESC_ARGS];
2816 2799
2817 for (nargs = ESC_ARGS; nargs > 0;) 2800 memset (arg, 0, sizeof (arg));
2818 arg[--nargs] = 0; 2801 nargs = 0;
2819 2802
2820 priv = 0; 2803 priv = 0;
2821 ch = cmd_getc (); 2804 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2805 if (ch >= '<' && ch <= '?')
2823 { /* '<' '=' '>' '?' */ 2806 { /* '<' '=' '>' '?' */
… …
2867 switch (priv) 2850 switch (priv)
2868 { 2851 {
2869 case '>': 2852 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2853 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2854 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2855 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2856 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2857 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2858 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2859 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2860 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3435 break; 3418 break;
3436 case URxvt_Color_IT: 3419 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3420 process_color_seq (op, Color_IT, str, resp);
3438 break; 3421 break;
3439#endif 3422#endif
3440#if ENABLE_TRANSPARENCY && TINTING 3423#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3424 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3425 process_color_seq (op, Color_tint, str, resp);
3426 {
3427 bool changed = false;
3428 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3430 else
3431 changed = bgPixmap.unset_tint ();
3432 if (changed)
3433 bgPixmap.render ();
3434 }
3443 3435
3444 check_our_parents ();
3445
3446 if (am_transparent)
3447 want_full_refresh = want_refresh = 1;
3448
3449 break; 3436 break;
3450#endif 3437#endif
3451 3438
3439#if XPM_BACKGROUND
3452 case Rxvt_Pixmap: 3440 case Rxvt_Pixmap:
3441 if (!strcmp (str, "?"))
3453 { 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
3454 if (*str != ';') 3454 if (*str != ';')
3455 { 3455 {
3456#if XPM_BACKGROUND
3457 scale_pixmap (""); /* reset to default scaling */ 3456 /* reset to default scaling :*/
3457 bgPixmap.unset_geometry ();
3458 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 ();
3459 scr_touch (true); 3474 scr_touch (true);
3460#endif
3461 } 3475 }
3462
3463 int changed = 0;
3464
3465 while ((str = strchr (str, ';')) != NULL)
3466 {
3467 str++;
3468#if XPM_BACKGROUND
3469 changed += scale_pixmap (str);
3470#endif
3471 } 3476 }
3472
3473 if (changed)
3474 {
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap ();
3477 scr_touch (true);
3478#endif
3479 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3485 break; 3477 break;
3478#endif
3486 3479
3487 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3489 break; 3482 break;
3490 case Rxvt_restoreBG: 3483 case Rxvt_restoreBG:
… …
3612{ 3605{
3613 unsigned int i, j; 3606 unsigned int i, j;
3614 int state; 3607 int state;
3615 3608
3616 static const struct 3609 static const struct
3617 { 3610 {
3618 const int argval; 3611 const int argval;
3619 const unsigned long bit; 3612 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3613 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3614 { 1, PrivMode_aplCUR },
3624 { 2, PrivMode_vt52 }, 3615 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3616 { 3, PrivMode_132 },
3626 { 4, PrivMode_smoothScroll }, 3617 { 4, PrivMode_smoothScroll },
3627 { 5, PrivMode_rVideo }, 3618 { 5, PrivMode_rVideo },

Diff Legend

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