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.422 by root, Tue Oct 28 04:45:59 2008 UTC vs.
Revision 1.430 by root, Wed Nov 12 02:37:58 2008 UTC

… …
1684#endif 1684#endif
1685 1685
1686 refresh_check (); 1686 refresh_check ();
1687} 1687}
1688 1688
1689#if ENABLE_FRILLS
1689void 1690void
1690rxvt_term::set_urgency (bool enable) 1691rxvt_term::set_urgency (bool enable)
1691{ 1692{
1692 if (enable == urgency_hint) 1693 if (enable == urgency_hint)
1693 return; 1694 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1699 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1700 urgency_hint = enable;
1700 } 1701 }
1701} 1702}
1703#endif
1702 1704
1703void 1705void
1704rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1705{ 1707{
1706 if (!focus) 1708 if (!focus)
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
2692 2694
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2697 process_csi_seq ();
2696 break; 2698 break;
2697 2699
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2700 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2701 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2702 process_osc_seq ();
2701 break; 2703 break;
2702 2704
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2705 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2706 case 'c':
2705 mbstate.reset (); 2707 mbstate.reset ();
2706 scr_poweron (); 2708 scr_poweron ();
2707 scrollBar.show (1); 2709 scrollBar.show (1);
2708 break; 2710 break;
… …
2763 2765
2764 nargs = 0; 2766 nargs = 0;
2765 2767
2766 priv = 0; 2768 priv = 0;
2767 ch = cmd_getc (); 2769 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2770 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2771 {
2770 /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2773 priv = ch;
2772 ch = cmd_getc (); 2774 ch = cmd_getc ();
2773 } 2775 }
2774 2776
2775 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
2829 2831
2830 case '?': 2832 case '?':
2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2832 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
2833 break; 2835 break;
2836
2837 case '!':
2838 if (ch == CSI_70)
2839 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset ();
2842
2843 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2845
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2834 } 2848 }
2849 break;
2850 }
2851
2835 return; 2852 return;
2836 } 2853 }
2837 2854
2838 switch (ch) 2855 switch (ch)
2839 { 2856 {
… …
3385 break; 3402 break;
3386 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3388 break; 3405 break;
3389#endif 3406#endif
3407 case URxvt_Color_border:
3408 process_color_seq (op, Color_border, str, resp);
3409 break;
3390#if ENABLE_TRANSPARENCY 3410#if ENABLE_TRANSPARENCY
3391 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3393 { 3413 {
3394 bool changed = false; 3414 bool changed = false;
… …
3569 static const struct 3589 static const struct
3570 { 3590 {
3571 const int argval; 3591 const int argval;
3572 const unsigned long bit; 3592 const unsigned long bit;
3573 } argtopriv[] = { 3593 } argtopriv[] = {
3574 { 1, PrivMode_aplCUR }, 3594 { 1, PrivMode_aplCUR }, // DECCKM
3575 { 2, PrivMode_vt52 }, 3595 { 2, PrivMode_vt52 },
3576 { 3, PrivMode_132 }, 3596 { 3, PrivMode_132 }, // DECCOLM
3577 { 4, PrivMode_smoothScroll }, 3597 { 4, PrivMode_smoothScroll }, // DECSCLM
3578 { 5, PrivMode_rVideo }, 3598 { 5, PrivMode_rVideo }, // DECSCNM
3579 { 6, PrivMode_relOrigin }, 3599 { 6, PrivMode_relOrigin }, // DECOM
3580 { 7, PrivMode_Autowrap }, 3600 { 7, PrivMode_Autowrap }, // DECAWM
3581 // 8, bi-directional support mode 3601 // 8, auto-repeat keys // DECARM
3582 { 9, PrivMode_MouseX10 }, 3602 { 9, PrivMode_MouseX10 },
3583 // 18, 19 printing-related 3603 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region
3584 { 25, PrivMode_VisibleCursor }, 3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3585#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
3586 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
3587#endif 3608#endif
3588 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK
3589 { 40, PrivMode_132OK }, 3611 { 40, PrivMode_132OK },
3590 // 41 xterm more fixes NYI 3612 // 41 xterm more fixes NYI
3591 // 45 margin bell NYI 3613 // 45 margin bell NYI
3592 // 46 start logging 3614 // 46 start logging
3593 { 47, PrivMode_Screen }, 3615 { 47, PrivMode_Screen },
3594 { 66, PrivMode_aplKP }, 3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3595#ifndef NO_BACKSPACE_KEY 3617#ifndef NO_BACKSPACE_KEY
3596 { 67, PrivMode_BackSpace }, 3618 { 67, PrivMode_BackSpace }, // DECBKM
3597#endif 3619#endif
3598 { 1000, PrivMode_MouseX11 }, 3620 { 1000, PrivMode_MouseX11 },
3599 { 1002, PrivMode_MouseBtnEvent }, 3621 { 1002, PrivMode_MouseBtnEvent },
3600 { 1003, PrivMode_MouseAnyEvent }, 3622 { 1003, PrivMode_MouseAnyEvent },
3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3640 3662
3641 scr_touch (true); 3663 scr_touch (true);
3642 break; 3664 break;
3643#endif 3665#endif
3644 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3667 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3668 if (mode == 0)
3648 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3649 else if (mode == 1) 3670 else if (mode == 1)
3650 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
… …
3663 */ 3684 */
3664 set_privmode (PrivMode_vt52, 1); 3685 set_privmode (PrivMode_vt52, 1);
3665 break; 3686 break;
3666 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 }
3672 break; 3690 break;
3673 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3674 set_option (Opt_jumpScroll, !state); 3692 set_option (Opt_jumpScroll, !state);
3675 break; 3693 break;
3676 case 5: /* reverse video */ 3694 case 5: /* reverse video */
… …
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3719 vt_emask_mouse = PointerMotionMask; 3737 vt_emask_mouse = PointerMotionMask;
3720 } 3738 }
3721 else 3739 else
3722 vt_emask_mouse = NoEventMask; 3740 vt_emask_mouse = NoEventMask;
3741
3723 vt_select_input (); 3742 vt_select_input ();
3724 break; 3743 break;
3725 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
3726 set_option (Opt_scrollTtyOutput, !state); 3745 set_option (Opt_scrollTtyOutput, !state);
3727 break; 3746 break;
3728 case 1011: /* scroll to bottom on key press */ 3747 case 1011: /* scroll to bottom on key press */
3729 set_option (Opt_scrollTtyKeypress, state); 3748 set_option (Opt_scrollTtyKeypress, state);
3730 break; 3749 break;
3731 case 1047: /* secondary screen w/ clearing last */ 3750 case 1047: /* secondary screen w/ clearing last */
3732 if (option (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3752 if (!state)
3734 scr_erase_screen (2); 3753 scr_erase_screen (2);
3754
3735 scr_change_screen (state); 3755 scr_change_screen (state);
3736 break; 3756 break;
3737 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
3758 if (option (Opt_secondaryScreen))
3759 if (state)
3760 scr_cursor (SAVE);
3761
3738 scr_change_screen (state); 3762 scr_change_screen (state);
3763
3739 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3765 if (state)
3741 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767 else
3768 scr_cursor (RESTORE);
3742 break; 3769 break;
3743 default: 3770 default:
3744 break; 3771 break;
3745 } 3772 }
3746 } 3773 }

Diff Legend

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