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.419 by root, Fri Oct 10 13:23:56 2008 UTC vs.
Revision 1.432 by root, Sun Apr 26 01:51:20 2009 UTC

… …
1127 { 1127 {
1128 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1132 1135
1133 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1135 1138
1136 w.stop (); 1139 w.stop ();
1137 } 1140 }
1138 1141
… …
1188{ 1191{
1189 make_current (); 1192 make_current ();
1190 1193
1191 if (revents & ev::READ) 1194 if (revents & ev::READ)
1192 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1193 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1194 if (cmd_parse ()) 1197 cmd_parse ();
1195 break;
1196 1198
1197 if (revents & ev::WRITE) 1199 if (revents & ev::WRITE)
1198 pty_write (); 1200 pty_write ();
1199 1201
1200 refresh_check (); 1202 refresh_check ();
… …
1682#endif 1684#endif
1683 1685
1684 refresh_check (); 1686 refresh_check ();
1685} 1687}
1686 1688
1689#if ENABLE_FRILLS
1690void
1691rxvt_term::set_urgency (bool enable)
1692{
1693 if (enable == urgency_hint)
1694 return;
1695
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1697 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable;
1701 }
1702}
1703#endif
1704
1687void 1705void
1688rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1689{ 1707{
1690 if (!focus) 1708 if (!focus)
1691 { 1709 {
1692 focus = 1; 1710 focus = 1;
1693 want_refresh = 1; 1711 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1712
1697#if USE_XIM 1713#if USE_XIM
1698 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1699 { 1715 {
1700 IMSetPosition (); 1716 IMSetPosition ();
… …
1712 scr_recolour (); 1728 scr_recolour ();
1713 } 1729 }
1714#endif 1730#endif
1715#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1732 if (option (Opt_urgentOnBell))
1717 { 1733 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1734#endif
1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1737 }
1726} 1738}
1727 1739
1728void 1740void
1729rxvt_term::focus_out () 1741rxvt_term::focus_out ()
… …
1731 if (focus) 1743 if (focus)
1732 { 1744 {
1733 focus = 0; 1745 focus = 0;
1734 want_refresh = 1; 1746 want_refresh = 1;
1735 1747
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1748#if ENABLE_FRILLS
1737 1749 if (option (Opt_urgentOnBell))
1750 set_urgency (0);
1751#endif
1738#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1753 if (iso14755buf)
1740 { 1754 {
1741 iso14755buf = 0; 1755 iso14755buf = 0;
1742# if ISO_14755 1756# if ISO_14755
… …
1759 { 1773 {
1760 pix_colors = pix_colors_unfocused; 1774 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1775 scr_recolour ();
1762 } 1776 }
1763#endif 1777#endif
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1780 }
1765} 1781}
1766 1782
1767void 1783void
1768rxvt_term::update_fade_color (unsigned int idx) 1784rxvt_term::update_fade_color (unsigned int idx)
… …
2170 } 2186 }
2171} 2187}
2172 2188
2173/*}}} */ 2189/*}}} */
2174 2190
2175bool 2191void
2176rxvt_term::cmd_parse () 2192rxvt_term::cmd_parse ()
2177{ 2193{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2181 2196
2182 for (;;) 2197 for (;;)
2183 { 2198 {
… …
2277 * What the heck we'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2293 * if skipScroll is enabled.
2279 */ 2294 */
2280 if (refreshnow) 2295 if (refreshnow)
2281 { 2296 {
2282 flag = true;
2283 scr_refresh (); 2297 scr_refresh ();
2284 want_refresh = 1; 2298 want_refresh = 1;
2285 } 2299 }
2286
2287 } 2300 }
2288 else 2301 else
2289 { 2302 {
2290 try 2303 try
2291 { 2304 {
… …
2299 } 2312 }
2300 2313
2301 ch = NOCHAR; 2314 ch = NOCHAR;
2302 } 2315 }
2303 } 2316 }
2304
2305 return flag;
2306} 2317}
2307 2318
2308// read the next character 2319// read the next character
2309wchar_t 2320wchar_t
2310rxvt_term::next_char () NOTHROW 2321rxvt_term::next_char () NOTHROW
… …
2325 break; 2336 break;
2326 } 2337 }
2327 2338
2328 if (len == (size_t)-1) 2339 if (len == (size_t)-1)
2329 { 2340 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state 2341 mbstate.reset (); // reset now undefined conversion state
2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 } 2343 }
2333 2344
2334 // assume wchar == unicode 2345 // assume wchar == unicode
2335 cmdbuf_ptr += len; 2346 cmdbuf_ptr += len;
… …
2679 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2680 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
2681 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2682 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
2683 2694
2684 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2685 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
2686 process_csi_seq (); 2697 process_csi_seq ();
2687 break; 2698 break;
2688 2699
2689 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2700 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2690 case C1_OSC: /* ESC ] */ 2701 case C1_OSC: /* ESC ] */
2691 process_osc_seq (); 2702 process_osc_seq ();
2692 break; 2703 break;
2693 2704
2694 /* 8.3.106: RESET TO INITIAL STATE */ 2705 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2695 case 'c': 2706 case 'c':
2696 mbstate.reset (); 2707 mbstate.reset ();
2697 scr_poweron (); 2708 scr_poweron ();
2698 scrollBar.show (1); 2709 scrollBar.show (1);
2699 break; 2710 break;
… …
2754 2765
2755 nargs = 0; 2766 nargs = 0;
2756 2767
2757 priv = 0; 2768 priv = 0;
2758 ch = cmd_getc (); 2769 ch = cmd_getc ();
2759 if (ch >= '<' && ch <= '?') 2770 if ((ch >= '<' && ch <= '?') || ch == '!')
2760 { 2771 {
2761 /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' '!' */
2762 priv = ch; 2773 priv = ch;
2763 ch = cmd_getc (); 2774 ch = cmd_getc ();
2764 } 2775 }
2765 2776
2766 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
2820 2831
2821 case '?': 2832 case '?':
2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2823 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
2824 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);
2825 } 2848 }
2849 break;
2850 }
2851
2826 return; 2852 return;
2827 } 2853 }
2828 2854
2829 switch (ch) 2855 switch (ch)
2830 { 2856 {
… …
3259 3285
3260/* 3286/*
3261 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3287 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3262 */ 3288 */
3263void 3289void
3264rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3290rxvt_term::process_xterm_seq (int op, char *str, char resp)
3265{ 3291{
3266 int color; 3292 int color;
3267 char *buf, *name; 3293 char *buf, *name;
3268 bool query = str[0] == '?' && !str[1]; 3294 bool query = str[0] == '?' && !str[1];
3269 int saveop = op; 3295 int saveop = op;
… …
3376 break; 3402 break;
3377 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3378 process_color_seq (op, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3379 break; 3405 break;
3380#endif 3406#endif
3407 case URxvt_Color_border:
3408 process_color_seq (op, Color_border, str, resp);
3409 break;
3381#if ENABLE_TRANSPARENCY 3410#if ENABLE_TRANSPARENCY
3382 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3383 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3384 { 3413 {
3385 bool changed = false; 3414 bool changed = false;
… …
3560 static const struct 3589 static const struct
3561 { 3590 {
3562 const int argval; 3591 const int argval;
3563 const unsigned long bit; 3592 const unsigned long bit;
3564 } argtopriv[] = { 3593 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3594 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3595 { 2, PrivMode_vt52 },
3567 { 3, PrivMode_132 }, 3596 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3597 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3598 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3599 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3600 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3601 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3602 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3603 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region
3575 { 25, PrivMode_VisibleCursor }, 3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3608#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3611 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3612 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3613 // 45 margin bell NYI
3583 // 46 start logging 3614 // 46 start logging
3584 { 47, PrivMode_Screen }, 3615 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3586#ifndef NO_BACKSPACE_KEY 3617#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3618 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3619#endif
3589 { 1000, PrivMode_MouseX11 }, 3620 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3621 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3622 { 1003, PrivMode_MouseAnyEvent },
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3631 3662
3632 scr_touch (true); 3663 scr_touch (true);
3633 break; 3664 break;
3634#endif 3665#endif
3635 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3636 case 1049:
3637 if (option (Opt_secondaryScreen)) 3667 if (option (Opt_secondaryScreen))
3638 if (mode == 0) 3668 if (mode == 0)
3639 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3640 else if (mode == 1) 3670 else if (mode == 1)
3641 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
… …
3654 */ 3684 */
3655 set_privmode (PrivMode_vt52, 1); 3685 set_privmode (PrivMode_vt52, 1);
3656 break; 3686 break;
3657 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662 }
3663 break; 3690 break;
3664 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3665 set_option (Opt_jumpScroll, !state); 3692 set_option (Opt_jumpScroll, !state);
3666 break; 3693 break;
3667 case 5: /* reverse video */ 3694 case 5: /* reverse video */
… …
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask; 3737 vt_emask_mouse = PointerMotionMask;
3711 } 3738 }
3712 else 3739 else
3713 vt_emask_mouse = NoEventMask; 3740 vt_emask_mouse = NoEventMask;
3741
3714 vt_select_input (); 3742 vt_select_input ();
3715 break; 3743 break;
3716 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
3717 set_option (Opt_scrollTtyOutput, !state); 3745 set_option (Opt_scrollTtyOutput, !state);
3718 break; 3746 break;
3719 case 1011: /* scroll to bottom on key press */ 3747 case 1011: /* scroll to bottom on key press */
3720 set_option (Opt_scrollTtyKeypress, state); 3748 set_option (Opt_scrollTtyKeypress, state);
3721 break; 3749 break;
3722 case 1047: /* secondary screen w/ clearing last */ 3750 case 1047: /* secondary screen w/ clearing last */
3723 if (option (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3752 if (!state)
3725 scr_erase_screen (2); 3753 scr_erase_screen (2);
3754
3726 scr_change_screen (state); 3755 scr_change_screen (state);
3727 break; 3756 break;
3728 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
3729 scr_change_screen (state); 3762 scr_change_screen (state);
3763
3730 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3731 if (current_screen != PRIMARY) 3765 if (state)
3732 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767 else
3768 scr_cursor (RESTORE);
3733 break; 3769 break;
3734 default: 3770 default:
3735 break; 3771 break;
3736 } 3772 }
3737 } 3773 }

Diff Legend

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