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.436 by sf-exg, Sun Jan 24 21:53:13 2010 UTC

… …
579 } 579 }
580 } 580 }
581 581
582#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
583 // ISO 14755 support 583 // ISO 14755 support
584 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
585 { 585 {
586 int hv; 586 int hv;
587 587
588 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
589 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
619 scr_overlay_off (); 619 scr_overlay_off ();
620# endif 620# endif
621 iso14755buf = 0; 621 iso14755buf = 0;
622 } 622 }
623 } 623 }
624 else if (option (Opt_iso14755) &&
624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
626 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
627 { 628 {
628 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
629# if ISO_14755 630# if ISO_14755
630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
1461 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1462 1463
1463 break; 1464 break;
1464 1465
1465 case SelectionClear: 1466 case SelectionClear:
1466 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1467 break; 1468 break;
1468 1469
1469 case SelectionNotify: 1470 case SelectionNotify:
1470 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1684#endif 1685#endif
1685 1686
1686 refresh_check (); 1687 refresh_check ();
1687} 1688}
1688 1689
1690#if ENABLE_FRILLS
1689void 1691void
1690rxvt_term::set_urgency (bool enable) 1692rxvt_term::set_urgency (bool enable)
1691{ 1693{
1692 if (enable == urgency_hint) 1694 if (enable == urgency_hint)
1693 return; 1695 return;
… …
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h); 1700 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable; 1701 urgency_hint = enable;
1700 } 1702 }
1701} 1703}
1704#endif
1702 1705
1703void 1706void
1704rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1705{ 1708{
1706 if (!focus) 1709 if (!focus)
… …
2334 break; 2337 break;
2335 } 2338 }
2336 2339
2337 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2338 { 2341 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2342 mbstate.reset (); // reset now undefined conversion state
2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 } 2344 }
2342 2345
2343 // assume wchar == unicode 2346 // assume wchar == unicode
2344 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
… …
2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2689 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2691 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2692 2695
2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2694 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2695 process_csi_seq (); 2698 process_csi_seq ();
2696 break; 2699 break;
2697 2700
2698 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2699 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
2700 process_osc_seq (); 2703 process_osc_seq ();
2701 break; 2704 break;
2702 2705
2703 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2704 case 'c': 2707 case 'c':
2705 mbstate.reset (); 2708 mbstate.reset ();
2706 scr_poweron (); 2709 scr_poweron ();
2707 scrollBar.show (1); 2710 scrollBar.show (1);
2708 break; 2711 break;
… …
2763 2766
2764 nargs = 0; 2767 nargs = 0;
2765 2768
2766 priv = 0; 2769 priv = 0;
2767 ch = cmd_getc (); 2770 ch = cmd_getc ();
2768 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 { 2772 {
2770 /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
2771 priv = ch; 2774 priv = ch;
2772 ch = cmd_getc (); 2775 ch = cmd_getc ();
2773 } 2776 }
2774 2777
2775 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
2829 2832
2830 case '?': 2833 case '?':
2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2832 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
2833 break; 2836 break;
2837
2838 case '!':
2839 if (ch == CSI_70)
2840 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset ();
2843
2844 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2846
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2834 } 2849 }
2850 break;
2851 }
2852
2835 return; 2853 return;
2836 } 2854 }
2837 2855
2838 switch (ch) 2856 switch (ch)
2839 { 2857 {
… …
3268 3286
3269/* 3287/*
3270 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3271 */ 3289 */
3272void 3290void
3273rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3274{ 3292{
3275 int color; 3293 int color;
3276 char *buf, *name; 3294 char *buf, *name;
3277 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3278 int saveop = op; 3296 int saveop = op;
… …
3319 3337
3320 XFree (value); 3338 XFree (value);
3321 } 3339 }
3322 else 3340 else
3323 { 3341 {
3324 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3325 3343
3326 if (eq) 3344 if (eq)
3327 { 3345 {
3328 *eq = 0; 3346 *eq = 0;
3329 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
… …
3385 break; 3403 break;
3386 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3387 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3388 break; 3406 break;
3389#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3390#if ENABLE_TRANSPARENCY 3411#if ENABLE_TRANSPARENCY
3391 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3392 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3393 { 3414 {
3394 bool changed = false; 3415 bool changed = false;
… …
3569 static const struct 3590 static const struct
3570 { 3591 {
3571 const int argval; 3592 const int argval;
3572 const unsigned long bit; 3593 const unsigned long bit;
3573 } argtopriv[] = { 3594 } argtopriv[] = {
3574 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
3575 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3576 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
3577 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
3578 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
3579 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
3580 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
3581 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
3582 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3583 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
3584 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3585#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
3586 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
3587#endif 3609#endif
3588 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
3589 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
3590 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
3591 // 45 margin bell NYI 3614 // 45 margin bell NYI
3592 // 46 start logging 3615 // 46 start logging
3593 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
3594 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3595#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
3596 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
3597#endif 3620#endif
3598 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
3599 { 1002, PrivMode_MouseBtnEvent }, 3622 { 1002, PrivMode_MouseBtnEvent },
3600 { 1003, PrivMode_MouseAnyEvent }, 3623 { 1003, PrivMode_MouseAnyEvent },
3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3640 3663
3641 scr_touch (true); 3664 scr_touch (true);
3642 break; 3665 break;
3643#endif 3666#endif
3644 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3645 case 1049:
3646 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3647 if (mode == 0) 3669 if (mode == 0)
3648 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3649 else if (mode == 1) 3671 else if (mode == 1)
3650 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
… …
3663 */ 3685 */
3664 set_privmode (PrivMode_vt52, 1); 3686 set_privmode (PrivMode_vt52, 1);
3665 break; 3687 break;
3666 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3671 }
3672 break; 3691 break;
3673 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
3674 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
3675 break; 3694 break;
3676 case 5: /* reverse video */ 3695 case 5: /* reverse video */
… …
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3719 vt_emask_mouse = PointerMotionMask; 3738 vt_emask_mouse = PointerMotionMask;
3720 } 3739 }
3721 else 3740 else
3722 vt_emask_mouse = NoEventMask; 3741 vt_emask_mouse = NoEventMask;
3742
3723 vt_select_input (); 3743 vt_select_input ();
3724 break; 3744 break;
3725 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3726 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
3727 break; 3747 break;
3728 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3729 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3730 break; 3750 break;
3731 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3732 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3733 if (current_screen != PRIMARY) 3753 if (!state)
3734 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
3735 scr_change_screen (state); 3756 scr_change_screen (state);
3736 break; 3757 break;
3737 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
3759 if (option (Opt_secondaryScreen))
3760 if (state)
3761 scr_cursor (SAVE);
3762
3738 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3739 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3740 if (current_screen != PRIMARY) 3766 if (state)
3741 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3742 break; 3770 break;
3743 default: 3771 default:
3744 break; 3772 break;
3745 } 3773 }
3746 } 3774 }

Diff Legend

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