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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.430 by root, Wed Nov 12 02:37:58 2008 UTC

… …
376 param = 5; 376 param = 5;
377 break; 377 break;
378 case XK_Next: 378 case XK_Next:
379 param = 6; 379 param = 6;
380 break; 380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
381#endif 387#endif
382 case XK_Help: 388 case XK_Help:
383 param = 28; 389 param = 28;
384 break; 390 break;
385 case XK_Menu: 391 case XK_Menu:
… …
413 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
414 420
415 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
416 { 422 {
417 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
418 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
419 } 425 }
420 426
421 kbuf[0] = 0; 427 kbuf[0] = 0;
422 428
423#ifdef USE_XIM 429#ifdef USE_XIM
… …
635 } 641 }
636#endif 642#endif
637 643
638 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639 { 645 {
640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641 unsigned int newlen = 1; 647 unsigned int newlen = 1;
642 648
643 switch (translate_keypad (keysym, kp)) 649 switch (translate_keypad (keysym, kp))
650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
644 { 765 {
645#ifndef NO_BACKSPACE_KEY
646 case XK_BackSpace:
647 if (priv_modes & PrivMode_HaveBackSpace)
648 {
649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650 ^ !!ctrl) ? '\b' : '\177';
651 kbuf[1] = '\0';
652 }
653 else
654 strcpy (kbuf, rs[Rs_backspace_key]);
655 break;
656#endif
657#ifndef NO_DELETE_KEY
658 case XK_Delete:
659 strcpy (kbuf, rs[Rs_delete_key]);
660 break;
661#endif
662 case XK_Tab:
663 if (shft)
664 strcpy (kbuf, "\033[Z");
665 else
666 {
667#ifdef CTRL_TAB_MAKES_META
668 if (ctrl)
669 meta = 1;
670#endif
671#ifdef MOD4_TAB_MAKES_META
672 if (ev.state & Mod4Mask)
673 meta = 1;
674#endif
675 newlen = 0;
676 }
677 break;
678
679 case XK_Up: /* "\033[A" */
680 case XK_Down: /* "\033[B" */
681 case XK_Right: /* "\033[C" */
682 case XK_Left: /* "\033[D" */
683 strcpy (kbuf, "\033[Z");
684 kbuf[2] = "DACB"[keysym - XK_Left];
685 /* do Shift first */
686 if (shft)
687 kbuf[2] = "dacb"[keysym - XK_Left];
688 else if (ctrl)
689 {
690 kbuf[1] = 'O';
691 kbuf[2] = "dacb"[keysym - XK_Left];
692 }
693 else if (priv_modes & PrivMode_aplCUR)
694 kbuf[1] = 'O';
695 break;
696
697 case XK_KP_Enter:
698 /* allow shift to override */
699 if (kp)
700 {
701 strcpy (kbuf, "\033OM");
702 break;
703 }
704
705 /* FALLTHROUGH */
706
707 case XK_Return:
708 if (priv_modes & PrivMode_LFNL)
709 {
710 kbuf[0] = '\015';
711 kbuf[1] = '\012';
712 kbuf[2] = '\0';
713 }
714 else
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_KP_F1: /* "\033OP" */
722 case XK_KP_F2: /* "\033OQ" */
723 case XK_KP_F3: /* "\033OR" */
724 case XK_KP_F4: /* "\033OS" */
725 strcpy (kbuf, "\033OP");
726 kbuf[2] += (keysym - XK_KP_F1);
727 break;
728
729 case XK_KP_Multiply: /* "\033Oj" : "*" */
730 case XK_KP_Add: /* "\033Ok" : "+" */
731 case XK_KP_Separator: /* "\033Ol" : "," */
732 case XK_KP_Subtract: /* "\033Om" : "-" */
733 case XK_KP_Decimal: /* "\033On" : "." */
734 case XK_KP_Divide: /* "\033Oo" : "/" */
735 case XK_KP_0: /* "\033Op" : "0" */
736 case XK_KP_1: /* "\033Oq" : "1" */
737 case XK_KP_2: /* "\033Or" : "2" */
738 case XK_KP_3: /* "\033Os" : "3" */
739 case XK_KP_4: /* "\033Ot" : "4" */
740 case XK_KP_5: /* "\033Ou" : "5" */
741 case XK_KP_6: /* "\033Ov" : "6" */
742 case XK_KP_7: /* "\033Ow" : "7" */
743 case XK_KP_8: /* "\033Ox" : "8" */
744 case XK_KP_9: /* "\033Oy" : "9" */
745 /* allow shift to override */
746 if (kp)
747 {
748 strcpy (kbuf, "\033Oj");
749 kbuf[2] += (keysym - XK_KP_Multiply);
750 }
751 else
752 {
753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761 case XK_Home:
762 strcpy (kbuf, KS_HOME);
763 break;
764
765 default:
766 {
767 int param = map_function_key (keysym); 766 int param = map_function_key (keysym);
768 if (param > 0) 767 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param); 768 sprintf (kbuf,"\033[%d~", param);
770 else 769 else
771 newlen = 0; 770 newlen = 0;
772 }
773 break;
774 } 771 }
772 break;
773 }
775 774
776 if (newlen) 775 if (newlen)
777 len = strlen (kbuf); 776 len = strlen (kbuf);
778 777
779 /* 778 /*
780 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
781 */ 780 */
782#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1016 } 1015 }
1017 while (row < end_row); 1016 while (row < end_row);
1018 } 1017 }
1019 1018
1020 scr_refresh (); 1019 scr_refresh ();
1021 scrollbar_show (1); 1020 scrollBar.show (1);
1022#ifdef USE_XIM 1021#ifdef USE_XIM
1023 IMSendSpot (); 1022 IMSendSpot ();
1024#endif 1023#endif
1025 } 1024 }
1026 1025
… …
1128 { 1127 {
1129 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1131 // 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
1132 // 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.
1133 1135
1134 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1135 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1136 1138
1137 w.stop (); 1139 w.stop ();
1138 } 1140 }
1139 1141
… …
1189{ 1191{
1190 make_current (); 1192 make_current ();
1191 1193
1192 if (revents & ev::READ) 1194 if (revents & ev::READ)
1193 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1194 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1195 if (cmd_parse ()) 1197 cmd_parse ();
1196 break;
1197 1198
1198 if (revents & ev::WRITE) 1199 if (revents & ev::WRITE)
1199 pty_write (); 1200 pty_write ();
1200 1201
1201 refresh_check (); 1202 refresh_check ();
… …
1537 ; 1538 ;
1538 1539
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1541 {
1541 scrollBar.state = STATE_IDLE; 1542 scrollBar.state = STATE_IDLE;
1542 scrollbar_show (0); 1543 scrollBar.show (0);
1543 } 1544 }
1544 } 1545 }
1545 break; 1546 break;
1546 1547
1547 case MotionNotify: 1548 case MotionNotify:
… …
1646 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1650 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1652 scrollBar.size ());
1652 want_refresh = 1; 1653 want_refresh = 1;
1653 scrollbar_show (1); 1654 scrollBar.show (1);
1654 } 1655 }
1655 break; 1656 break;
1656 } 1657 }
1657 1658
1658#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
… …
1683#endif 1684#endif
1684 1685
1685 refresh_check (); 1686 refresh_check ();
1686} 1687}
1687 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
1688void 1705void
1689rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1690{ 1707{
1691 if (!focus) 1708 if (!focus)
1692 { 1709 {
1693 focus = 1; 1710 focus = 1;
1694 want_refresh = 1; 1711 want_refresh = 1;
1695
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697 1712
1698#if USE_XIM 1713#if USE_XIM
1699 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1700 { 1715 {
1701 IMSetPosition (); 1716 IMSetPosition ();
… …
1713 scr_recolour (); 1728 scr_recolour ();
1714 } 1729 }
1715#endif 1730#endif
1716#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell)) 1732 if (option (Opt_urgentOnBell))
1718 { 1733 set_urgency (0);
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif 1734#endif
1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726 } 1737 }
1727} 1738}
1728 1739
1729void 1740void
1730rxvt_term::focus_out () 1741rxvt_term::focus_out ()
… …
1732 if (focus) 1743 if (focus)
1733 { 1744 {
1734 focus = 0; 1745 focus = 0;
1735 want_refresh = 1; 1746 want_refresh = 1;
1736 1747
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1748#if ENABLE_FRILLS
1738 1749 if (option (Opt_urgentOnBell))
1750 set_urgency (0);
1751#endif
1739#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1753 if (iso14755buf)
1741 { 1754 {
1742 iso14755buf = 0; 1755 iso14755buf = 0;
1743# if ISO_14755 1756# if ISO_14755
… …
1760 { 1773 {
1761 pix_colors = pix_colors_unfocused; 1774 pix_colors = pix_colors_unfocused;
1762 scr_recolour (); 1775 scr_recolour ();
1763 } 1776 }
1764#endif 1777#endif
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765 } 1780 }
1766} 1781}
1767 1782
1768void 1783void
1769rxvt_term::update_fade_color (unsigned int idx) 1784rxvt_term::update_fade_color (unsigned int idx)
… …
2011 } 2026 }
2012 2027
2013 if (scrollBar.style == R_SB_XTERM 2028 if (scrollBar.style == R_SB_XTERM
2014 || scrollbar_above_slider (ev.y) 2029 || scrollbar_above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2030 || scrollbar_below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2031 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2017 2032
2018 scrollBar.state = STATE_MOTION; 2033 scrollBar.state = STATE_MOTION;
2019 break; 2034 break;
2020 2035
2021 case Button1: 2036 case Button1:
… …
2044 else 2059 else
2045 { 2060 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2061 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2062 (nrow
2048 * scrollbar_position (ev.y) 2063 * scrollbar_position (ev.y)
2049 / scrollbar_size ())); 2064 / scrollBar.size ()));
2050 } 2065 }
2051 2066
2052 break; 2067 break;
2053 } 2068 }
2054 } 2069 }
… …
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2082 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2083
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2084 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2070 { 2085 {
2071 scrollBar.state = STATE_IDLE; 2086 scrollBar.state = STATE_IDLE;
2072 scrollbar_show (0); 2087 scrollBar.show (0);
2073 } 2088 }
2074 2089
2075#ifdef SELECTION_SCROLLING 2090#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2077#endif 2092#endif
… …
2160 } 2175 }
2161 else 2176 else
2162# endif 2177# endif
2163 { 2178 {
2164 scr_page (v, i); 2179 scr_page (v, i);
2165 scrollbar_show (1); 2180 scrollBar.show (1);
2166 } 2181 }
2167 } 2182 }
2168 break; 2183 break;
2169#endif 2184#endif
2170 } 2185 }
2171 } 2186 }
2172} 2187}
2173 2188
2174/*}}} */ 2189/*}}} */
2175 2190
2176bool 2191void
2177rxvt_term::cmd_parse () 2192rxvt_term::cmd_parse ()
2178{ 2193{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2182 2196
2183 for (;;) 2197 for (;;)
2184 { 2198 {
2185 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2186 { 2200 {
2187 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2202 ch = next_char ();
2189 2203
2190 if (ch == NOCHAR) 2204 if (ch == NOCHAR)
2191 break; 2205 break;
2192 } 2206 }
2193 2207
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2209 {
2196 if (!seen_input) 2210 if (expect_false (!seen_input))
2197 { 2211 {
2198 seen_input = 1; 2212 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2228 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2230
2217 for (;;) 2231 for (;;)
2218 { 2232 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2234 break;
2221 2235
2222 *str++ = ch; 2236 *str++ = ch;
2223 2237
2224 if (ch == C0_LF || str >= eol) 2238 if (expect_false (ch == C0_LF || str >= eol))
2225 { 2239 {
2226 if (ch == C0_LF) 2240 if (ch == C0_LF)
2227 nlines++; 2241 nlines++;
2228 2242
2229 refresh_count++; 2243 refresh_count++;
… …
2278 * 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.
2279 * if skipScroll is enabled. 2293 * if skipScroll is enabled.
2280 */ 2294 */
2281 if (refreshnow) 2295 if (refreshnow)
2282 { 2296 {
2283 flag = true;
2284 scr_refresh (); 2297 scr_refresh ();
2285 want_refresh = 1; 2298 want_refresh = 1;
2286 } 2299 }
2287
2288 } 2300 }
2289 else 2301 else
2290 { 2302 {
2291 try 2303 try
2292 { 2304 {
… …
2300 } 2312 }
2301 2313
2302 ch = NOCHAR; 2314 ch = NOCHAR;
2303 } 2315 }
2304 } 2316 }
2305
2306 return flag;
2307} 2317}
2308 2318
2309// read the next character 2319// read the next character
2310wchar_t 2320wchar_t
2311rxvt_term::next_char () NOTHROW 2321rxvt_term::next_char () NOTHROW
2312{ 2322{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2323 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2324 {
2315 // assume 7-bit to be ascii ALWAYS 2325 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2326 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2327 return *cmdbuf_ptr++;
2318 2328
2319 wchar_t wc; 2329 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2331
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2335 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2336 break;
2327 } 2337 }
2328 2338
2329 if (len == (size_t)-1) 2339 if (len == (size_t)-1)
2340 {
2341 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2330 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
2343 }
2331 2344
2332 // assume wchar == unicode 2345 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2346 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2347 return wc & UNICODE_MASK;
2335 } 2348 }
… …
2379/*----------------------------------------------------------------------*/ 2392/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2393#ifdef PRINTPIPE
2381FILE * 2394FILE *
2382rxvt_term::popen_printer () 2395rxvt_term::popen_printer ()
2383{ 2396{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2397 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2398
2386 if (stream == NULL) 2399 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2400 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2401
2389 return stream; 2402 return stream;
… …
2400 * simulate attached vt100 printer 2413 * simulate attached vt100 printer
2401 */ 2414 */
2402void 2415void
2403rxvt_term::process_print_pipe () 2416rxvt_term::process_print_pipe ()
2404{ 2417{
2405 int done; 2418 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2419
2408 if ((fd = popen_printer ()) == NULL) 2420 if (!fd)
2409 return; 2421 return;
2410 2422
2411 /* 2423 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2424 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2425 * is received.
2414 */ 2426 */
2415 for (done = 0; !done;) 2427 for (int done = 0; !done; )
2416 { 2428 {
2417 unsigned char buf[8]; 2429 unsigned char buf[8];
2418 unicode_t ch; 2430 unicode_t ch;
2419 unsigned int i, len; 2431 unsigned int i, len;
2420 2432
… …
2565 break; 2577 break;
2566 case 'Z': /* identify the terminal type */ 2578 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2580 break;
2569 case '<': /* turn off VT52 mode */ 2581 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2582 set_privmode (PrivMode_vt52, 0);
2571 break; 2583 break;
2572 case 'F': /* use special graphics character set */ 2584 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2585 case 'G': /* use regular character set */
2574 /* unimplemented */ 2586 /* unimplemented */
2575 break; 2587 break;
… …
2629 scr_forwardindex (); 2641 scr_forwardindex ();
2630 break; 2642 break;
2631#endif 2643#endif
2632 case '=': 2644 case '=':
2633 case '>': 2645 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2646 set_privmode (PrivMode_aplKP, ch == '=');
2635 break; 2647 break;
2636 2648
2637 case C1_40: 2649 case C1_40:
2638 cmd_getc (); 2650 cmd_getc ();
2639 break; 2651 break;
… …
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
2682 2694
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2697 process_csi_seq ();
2686 break; 2698 break;
2687 2699
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2700 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2701 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2702 process_osc_seq ();
2691 break; 2703 break;
2692 2704
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2705 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2706 case 'c':
2695 mbstate.reset (); 2707 mbstate.reset ();
2696 scr_poweron (); 2708 scr_poweron ();
2697 scrollbar_show (1); 2709 scrollBar.show (1);
2698 break; 2710 break;
2699 2711
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2713 case 'n':
2702 scr_charset_choose (2); 2714 scr_charset_choose (2);
… …
2753 2765
2754 nargs = 0; 2766 nargs = 0;
2755 2767
2756 priv = 0; 2768 priv = 0;
2757 ch = cmd_getc (); 2769 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2770 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2771 {
2760 /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2773 priv = ch;
2762 ch = cmd_getc (); 2774 ch = cmd_getc ();
2763 } 2775 }
2764 2776
2765 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
2819 2831
2820 case '?': 2832 case '?':
2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2822 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
2823 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);
2824 } 2848 }
2849 break;
2850 }
2851
2825 return; 2852 return;
2826 } 2853 }
2827 2854
2828 switch (ch) 2855 switch (ch)
2829 { 2856 {
… …
3375 break; 3402 break;
3376 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3377 process_color_seq (op, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3378 break; 3405 break;
3379#endif 3406#endif
3407 case URxvt_Color_border:
3408 process_color_seq (op, Color_border, str, resp);
3409 break;
3380#if ENABLE_TRANSPARENCY 3410#if ENABLE_TRANSPARENCY
3381 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3382 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3383 { 3413 {
3384 bool changed = false; 3414 bool changed = false;
… …
3508 break; 3538 break;
3509#endif 3539#endif
3510 3540
3511#if ENABLE_PERL 3541#if ENABLE_PERL
3512 case URxvt_perl: 3542 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3543 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3544 break;
3516#endif 3545#endif
3517 } 3546 }
3518} 3547}
3519/*----------------------------------------------------------------------*/ 3548/*----------------------------------------------------------------------*/
… …
3542 { 3571 {
3543 if (mode == 'r') 3572 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3574 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3575 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3576 set_privmode (bit, state);
3548 } 3577 }
3549 3578
3550 return state; 3579 return state;
3551} 3580}
3552 3581
… …
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);
… …
3650 case 2: /* VT52 mode */ 3680 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3681 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3682 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3683 * within VT52 mode
3654 */ 3684 */
3655 PrivMode (1, PrivMode_vt52); 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 */
… …
3678 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3706 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3707 break;
3681#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
3682 case scrollBar_esc: 3709 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3710 if (scrollBar.map (state))
3684 { 3711 {
3685 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3713 scr_touch (true);
3687 } 3714 }
3688 break; 3715 break;
… …
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