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.421 by root, Wed Oct 15 17:16:47 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);
… …
1191{ 1192{
1192 make_current (); 1193 make_current ();
1193 1194
1194 if (revents & ev::READ) 1195 if (revents & ev::READ)
1195 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1196 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1197 if (cmd_parse ()) 1198 cmd_parse ();
1198 break;
1199 1199
1200 if (revents & ev::WRITE) 1200 if (revents & ev::WRITE)
1201 pty_write (); 1201 pty_write ();
1202 1202
1203 refresh_check (); 1203 refresh_check ();
… …
1462 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1463 1463
1464 break; 1464 break;
1465 1465
1466 case SelectionClear: 1466 case SelectionClear:
1467 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1468 break; 1468 break;
1469 1469
1470 case SelectionNotify: 1470 case SelectionNotify:
1471 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1685#endif 1685#endif
1686 1686
1687 refresh_check (); 1687 refresh_check ();
1688} 1688}
1689 1689
1690#if ENABLE_FRILLS
1690void 1691void
1691rxvt_term::set_urgency (bool enable) 1692rxvt_term::set_urgency (bool enable)
1692{ 1693{
1693 if (enable == urgency_hint) 1694 if (enable == urgency_hint)
1694 return; 1695 return;
… …
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h); 1700 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable; 1701 urgency_hint = enable;
1701 } 1702 }
1702} 1703}
1704#endif
1703 1705
1704void 1706void
1705rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1706{ 1708{
1707 if (!focus) 1709 if (!focus)
… …
2185 } 2187 }
2186} 2188}
2187 2189
2188/*}}} */ 2190/*}}} */
2189 2191
2190bool 2192void
2191rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2192{ 2194{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2196 2197
2197 for (;;) 2198 for (;;)
2198 { 2199 {
… …
2292 * What the heck we'll cheat and only refresh less than every page-full. 2293 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2294 * if skipScroll is enabled.
2294 */ 2295 */
2295 if (refreshnow) 2296 if (refreshnow)
2296 { 2297 {
2297 flag = true;
2298 scr_refresh (); 2298 scr_refresh ();
2299 want_refresh = 1; 2299 want_refresh = 1;
2300 } 2300 }
2301
2302 } 2301 }
2303 else 2302 else
2304 { 2303 {
2305 try 2304 try
2306 { 2305 {
… …
2314 } 2313 }
2315 2314
2316 ch = NOCHAR; 2315 ch = NOCHAR;
2317 } 2316 }
2318 } 2317 }
2319
2320 return flag;
2321} 2318}
2322 2319
2323// read the next character 2320// read the next character
2324wchar_t 2321wchar_t
2325rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
… …
2340 break; 2337 break;
2341 } 2338 }
2342 2339
2343 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2344 { 2341 {
2345 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2342 mbstate.reset (); // reset now undefined conversion state
2346 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
2347 } 2344 }
2348 2345
2349 // assume wchar == unicode 2346 // assume wchar == unicode
2350 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
… …
2694 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2695 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2696 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2697 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2698 2695
2699 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2700 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2701 process_csi_seq (); 2698 process_csi_seq ();
2702 break; 2699 break;
2703 2700
2704 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2705 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
2706 process_osc_seq (); 2703 process_osc_seq ();
2707 break; 2704 break;
2708 2705
2709 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2710 case 'c': 2707 case 'c':
2711 mbstate.reset (); 2708 mbstate.reset ();
2712 scr_poweron (); 2709 scr_poweron ();
2713 scrollBar.show (1); 2710 scrollBar.show (1);
2714 break; 2711 break;
… …
2769 2766
2770 nargs = 0; 2767 nargs = 0;
2771 2768
2772 priv = 0; 2769 priv = 0;
2773 ch = cmd_getc (); 2770 ch = cmd_getc ();
2774 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2775 { 2772 {
2776 /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
2777 priv = ch; 2774 priv = ch;
2778 ch = cmd_getc (); 2775 ch = cmd_getc ();
2779 } 2776 }
2780 2777
2781 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
2835 2832
2836 case '?': 2833 case '?':
2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2838 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
2839 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);
2840 } 2849 }
2850 break;
2851 }
2852
2841 return; 2853 return;
2842 } 2854 }
2843 2855
2844 switch (ch) 2856 switch (ch)
2845 { 2857 {
… …
3274 3286
3275/* 3287/*
3276 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3277 */ 3289 */
3278void 3290void
3279rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3280{ 3292{
3281 int color; 3293 int color;
3282 char *buf, *name; 3294 char *buf, *name;
3283 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3284 int saveop = op; 3296 int saveop = op;
… …
3325 3337
3326 XFree (value); 3338 XFree (value);
3327 } 3339 }
3328 else 3340 else
3329 { 3341 {
3330 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3331 3343
3332 if (eq) 3344 if (eq)
3333 { 3345 {
3334 *eq = 0; 3346 *eq = 0;
3335 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
… …
3391 break; 3403 break;
3392 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3393 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3394 break; 3406 break;
3395#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3396#if ENABLE_TRANSPARENCY 3411#if ENABLE_TRANSPARENCY
3397 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3398 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3399 { 3414 {
3400 bool changed = false; 3415 bool changed = false;
… …
3575 static const struct 3590 static const struct
3576 { 3591 {
3577 const int argval; 3592 const int argval;
3578 const unsigned long bit; 3593 const unsigned long bit;
3579 } argtopriv[] = { 3594 } argtopriv[] = {
3580 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
3581 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3582 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
3583 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
3584 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
3585 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
3586 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
3587 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
3588 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3589 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
3590 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3591#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
3592 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
3593#endif 3609#endif
3594 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
3595 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
3596 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
3597 // 45 margin bell NYI 3614 // 45 margin bell NYI
3598 // 46 start logging 3615 // 46 start logging
3599 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
3600 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3601#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
3602 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
3603#endif 3620#endif
3604 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
3605 { 1002, PrivMode_MouseBtnEvent }, 3622 { 1002, PrivMode_MouseBtnEvent },
3606 { 1003, PrivMode_MouseAnyEvent }, 3623 { 1003, PrivMode_MouseAnyEvent },
3607 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3646 3663
3647 scr_touch (true); 3664 scr_touch (true);
3648 break; 3665 break;
3649#endif 3666#endif
3650 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3651 case 1049:
3652 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3653 if (mode == 0) 3669 if (mode == 0)
3654 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3655 else if (mode == 1) 3671 else if (mode == 1)
3656 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
… …
3669 */ 3685 */
3670 set_privmode (PrivMode_vt52, 1); 3686 set_privmode (PrivMode_vt52, 1);
3671 break; 3687 break;
3672 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
3673 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
3674 {
3675 scr_poweron ();
3676 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3677 }
3678 break; 3691 break;
3679 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
3681 break; 3694 break;
3682 case 5: /* reverse video */ 3695 case 5: /* reverse video */
… …
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725 vt_emask_mouse = PointerMotionMask; 3738 vt_emask_mouse = PointerMotionMask;
3726 } 3739 }
3727 else 3740 else
3728 vt_emask_mouse = NoEventMask; 3741 vt_emask_mouse = NoEventMask;
3742
3729 vt_select_input (); 3743 vt_select_input ();
3730 break; 3744 break;
3731 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3732 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
3733 break; 3747 break;
3734 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3735 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3736 break; 3750 break;
3737 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3738 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3753 if (!state)
3740 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
3741 scr_change_screen (state); 3756 scr_change_screen (state);
3742 break; 3757 break;
3743 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
3744 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3745 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3766 if (state)
3747 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3748 break; 3770 break;
3749 default: 3771 default:
3750 break; 3772 break;
3751 } 3773 }
3752 } 3774 }

Diff Legend

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