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.437 by sf-exg, Fri Jan 29 17:27:36 2010 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
573 } 579 }
574 } 580 }
575 581
576#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
577 // ISO 14755 support 583 // ISO 14755 support
578 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
579 { 585 {
580 int hv; 586 int hv;
581 587
582 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
583 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
613 scr_overlay_off (); 619 scr_overlay_off ();
614# endif 620# endif
615 iso14755buf = 0; 621 iso14755buf = 0;
616 } 622 }
617 } 623 }
624 else if (option (Opt_iso14755) &&
618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
620 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
621 { 628 {
622 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
623# if ISO_14755 630# if ISO_14755
624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
635 } 642 }
636#endif 643#endif
637 644
638 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639 { 646 {
640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641 unsigned int newlen = 1; 648 unsigned int newlen = 1;
642 649
643 switch (translate_keypad (keysym, kp)) 650 switch (translate_keypad (keysym, kp))
651 {
652#ifndef NO_BACKSPACE_KEY
653 case XK_BackSpace:
654 if (priv_modes & PrivMode_HaveBackSpace)
655 {
656 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
657 ^ !!ctrl) ? '\b' : '\177';
658 kbuf[1] = '\0';
659 }
660 else
661 strcpy (kbuf, rs[Rs_backspace_key]);
662 break;
663#endif
664#ifndef NO_DELETE_KEY
665 case XK_Delete:
666 strcpy (kbuf, rs[Rs_delete_key]);
667 break;
668#endif
669 case XK_Tab:
670 if (shft)
671 strcpy (kbuf, "\033[Z");
672 else
673 {
674#ifdef CTRL_TAB_MAKES_META
675 if (ctrl)
676 meta = 1;
677#endif
678#ifdef MOD4_TAB_MAKES_META
679 if (ev.state & Mod4Mask)
680 meta = 1;
681#endif
682 newlen = 0;
683 }
684 break;
685
686 case XK_Up: /* "\033[A" */
687 case XK_Down: /* "\033[B" */
688 case XK_Right: /* "\033[C" */
689 case XK_Left: /* "\033[D" */
690 strcpy (kbuf, "\033[Z");
691 kbuf[2] = "DACB"[keysym - XK_Left];
692 /* do Shift first */
693 if (shft)
694 kbuf[2] = "dacb"[keysym - XK_Left];
695 else if (ctrl)
696 {
697 kbuf[1] = 'O';
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 }
700 else if (priv_modes & PrivMode_aplCUR)
701 kbuf[1] = 'O';
702 break;
703
704 case XK_KP_Enter:
705 /* allow shift to override */
706 if (kp)
707 {
708 strcpy (kbuf, "\033OM");
709 break;
710 }
711
712 /* FALLTHROUGH */
713
714 case XK_Return:
715 if (priv_modes & PrivMode_LFNL)
716 {
717 kbuf[0] = '\015';
718 kbuf[1] = '\012';
719 kbuf[2] = '\0';
720 }
721 else
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_KP_F1: /* "\033OP" */
729 case XK_KP_F2: /* "\033OQ" */
730 case XK_KP_F3: /* "\033OR" */
731 case XK_KP_F4: /* "\033OS" */
732 strcpy (kbuf, "\033OP");
733 kbuf[2] += (keysym - XK_KP_F1);
734 break;
735
736 case XK_KP_Multiply: /* "\033Oj" : "*" */
737 case XK_KP_Add: /* "\033Ok" : "+" */
738 case XK_KP_Separator: /* "\033Ol" : "," */
739 case XK_KP_Subtract: /* "\033Om" : "-" */
740 case XK_KP_Decimal: /* "\033On" : "." */
741 case XK_KP_Divide: /* "\033Oo" : "/" */
742 case XK_KP_0: /* "\033Op" : "0" */
743 case XK_KP_1: /* "\033Oq" : "1" */
744 case XK_KP_2: /* "\033Or" : "2" */
745 case XK_KP_3: /* "\033Os" : "3" */
746 case XK_KP_4: /* "\033Ot" : "4" */
747 case XK_KP_5: /* "\033Ou" : "5" */
748 case XK_KP_6: /* "\033Ov" : "6" */
749 case XK_KP_7: /* "\033Ow" : "7" */
750 case XK_KP_8: /* "\033Ox" : "8" */
751 case XK_KP_9: /* "\033Oy" : "9" */
752 /* allow shift to override */
753 if (kp)
754 {
755 strcpy (kbuf, "\033Oj");
756 kbuf[2] += (keysym - XK_KP_Multiply);
757 }
758 else
759 {
760 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
761 kbuf[1] = '\0';
762 }
763 break;
764
765 default:
644 { 766 {
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); 767 int param = map_function_key (keysym);
768 if (param > 0) 768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param); 769 sprintf (kbuf,"\033[%d~", param);
770 else 770 else
771 newlen = 0; 771 newlen = 0;
772 }
773 break;
774 } 772 }
773 break;
774 }
775 775
776 if (newlen) 776 if (newlen)
777 len = strlen (kbuf); 777 len = strlen (kbuf);
778 778
779 /* 779 /*
780 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
781 */ 781 */
782#ifdef META8_OPTION 782#ifdef META8_OPTION
1016 } 1016 }
1017 while (row < end_row); 1017 while (row < end_row);
1018 } 1018 }
1019 1019
1020 scr_refresh (); 1020 scr_refresh ();
1021 scrollbar_show (1); 1021 scrollBar.show (1);
1022#ifdef USE_XIM 1022#ifdef USE_XIM
1023 IMSendSpot (); 1023 IMSendSpot ();
1024#endif 1024#endif
1025 } 1025 }
1026 1026
1128 { 1128 {
1129 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1130 // that giving a process calling sched_yield () less cpu time than 1130 // 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 1131 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS. 1132 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best.
1133 1136
1134 struct timespec ts = { 0, 0 }; 1137 struct timespec ts = { 0, 1000 };
1135 nanosleep (&ts, 0); 1138 nanosleep (&ts, 0);
1136 1139
1137 w.stop (); 1140 w.stop ();
1138 } 1141 }
1139 1142
1189{ 1192{
1190 make_current (); 1193 make_current ();
1191 1194
1192 if (revents & ev::READ) 1195 if (revents & ev::READ)
1193 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1194 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1195 if (cmd_parse ()) 1198 cmd_parse ();
1196 break;
1197 1199
1198 if (revents & ev::WRITE) 1200 if (revents & ev::WRITE)
1199 pty_write (); 1201 pty_write ();
1200 1202
1201 refresh_check (); 1203 refresh_check ();
1460 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461 1463
1462 break; 1464 break;
1463 1465
1464 case SelectionClear: 1466 case SelectionClear:
1465 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1466 break; 1468 break;
1467 1469
1468 case SelectionNotify: 1470 case SelectionNotify:
1469 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1470 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1537 ; 1539 ;
1538 1540
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1542 {
1541 scrollBar.state = STATE_IDLE; 1543 scrollBar.state = STATE_IDLE;
1542 scrollbar_show (0); 1544 scrollBar.show (0);
1543 } 1545 }
1544 } 1546 }
1545 break; 1547 break;
1546 1548
1547 case MotionNotify: 1549 case MotionNotify:
1646 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1651 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1653 scrollBar.size ());
1652 want_refresh = 1; 1654 want_refresh = 1;
1653 scrollbar_show (1); 1655 scrollBar.show (1);
1654 } 1656 }
1655 break; 1657 break;
1656 } 1658 }
1657 1659
1658#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1683#endif 1685#endif
1684 1686
1685 refresh_check (); 1687 refresh_check ();
1686} 1688}
1687 1689
1690#if ENABLE_FRILLS
1691void
1692rxvt_term::set_urgency (bool enable)
1693{
1694 if (enable == urgency_hint)
1695 return;
1696
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1698 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h);
1701 urgency_hint = enable;
1702 }
1703}
1704#endif
1705
1688void 1706void
1689rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1690{ 1708{
1691 if (!focus) 1709 if (!focus)
1692 { 1710 {
1693 focus = 1; 1711 focus = 1;
1694 want_refresh = 1; 1712 want_refresh = 1;
1695
1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1697 1713
1698#if USE_XIM 1714#if USE_XIM
1699 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1700 { 1716 {
1701 IMSetPosition (); 1717 IMSetPosition ();
1713 scr_recolour (); 1729 scr_recolour ();
1714 } 1730 }
1715#endif 1731#endif
1716#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell)) 1733 if (option (Opt_urgentOnBell))
1718 { 1734 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 1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726 } 1738 }
1727} 1739}
1728 1740
1729void 1741void
1730rxvt_term::focus_out () 1742rxvt_term::focus_out ()
1732 if (focus) 1744 if (focus)
1733 { 1745 {
1734 focus = 0; 1746 focus = 0;
1735 want_refresh = 1; 1747 want_refresh = 1;
1736 1748
1737 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1738 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1739#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1754 if (iso14755buf)
1741 { 1755 {
1742 iso14755buf = 0; 1756 iso14755buf = 0;
1743# if ISO_14755 1757# if ISO_14755
1760 { 1774 {
1761 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1762 scr_recolour (); 1776 scr_recolour ();
1763 } 1777 }
1764#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765 } 1781 }
1766} 1782}
1767 1783
1768void 1784void
1769rxvt_term::update_fade_color (unsigned int idx) 1785rxvt_term::update_fade_color (unsigned int idx)
2011 } 2027 }
2012 2028
2013 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2014 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2017 2033
2018 scrollBar.state = STATE_MOTION; 2034 scrollBar.state = STATE_MOTION;
2019 break; 2035 break;
2020 2036
2021 case Button1: 2037 case Button1:
2044 else 2060 else
2045 { 2061 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2063 (nrow
2048 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2049 / scrollbar_size ())); 2065 / scrollBar.size ()));
2050 } 2066 }
2051 2067
2052 break; 2068 break;
2053 } 2069 }
2054 } 2070 }
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2084
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2070 { 2086 {
2071 scrollBar.state = STATE_IDLE; 2087 scrollBar.state = STATE_IDLE;
2072 scrollbar_show (0); 2088 scrollBar.show (0);
2073 } 2089 }
2074 2090
2075#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2077#endif 2093#endif
2160 } 2176 }
2161 else 2177 else
2162# endif 2178# endif
2163 { 2179 {
2164 scr_page (v, i); 2180 scr_page (v, i);
2165 scrollbar_show (1); 2181 scrollBar.show (1);
2166 } 2182 }
2167 } 2183 }
2168 break; 2184 break;
2169#endif 2185#endif
2170 } 2186 }
2171 } 2187 }
2172} 2188}
2173 2189
2174/*}}} */ 2190/*}}} */
2175 2191
2176bool 2192void
2177rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2178{ 2194{
2179 bool flag = false;
2180 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2182 2197
2183 for (;;) 2198 for (;;)
2184 { 2199 {
2185 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2186 { 2201 {
2187 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2203 ch = next_char ();
2189 2204
2190 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2191 break; 2206 break;
2192 } 2207 }
2193 2208
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2209 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2210 {
2196 if (!seen_input) 2211 if (expect_false (!seen_input))
2197 { 2212 {
2198 seen_input = 1; 2213 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
2214 wchar_t *str = buf; 2229 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2231
2217 for (;;) 2232 for (;;)
2218 { 2233 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2234 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2235 break;
2221 2236
2222 *str++ = ch; 2237 *str++ = ch;
2223 2238
2224 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2225 { 2240 {
2226 if (ch == C0_LF) 2241 if (ch == C0_LF)
2227 nlines++; 2242 nlines++;
2228 2243
2229 refresh_count++; 2244 refresh_count++;
2278 * 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.
2279 * if skipScroll is enabled. 2294 * if skipScroll is enabled.
2280 */ 2295 */
2281 if (refreshnow) 2296 if (refreshnow)
2282 { 2297 {
2283 flag = true;
2284 scr_refresh (); 2298 scr_refresh ();
2285 want_refresh = 1; 2299 want_refresh = 1;
2286 } 2300 }
2287
2288 } 2301 }
2289 else 2302 else
2290 { 2303 {
2291 try 2304 try
2292 { 2305 {
2300 } 2313 }
2301 2314
2302 ch = NOCHAR; 2315 ch = NOCHAR;
2303 } 2316 }
2304 } 2317 }
2305
2306 return flag;
2307} 2318}
2308 2319
2309// read the next character 2320// read the next character
2310wchar_t 2321wchar_t
2311rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2312{ 2323{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2325 {
2315 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2318 2329
2319 wchar_t wc; 2330 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2332
2325 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2337 break;
2327 } 2338 }
2328 2339
2329 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2330 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
2344 }
2331 2345
2332 // assume wchar == unicode 2346 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2335 } 2349 }
2379/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2381FILE * 2395FILE *
2382rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2383{ 2397{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2399
2386 if (stream == NULL) 2400 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2402
2389 return stream; 2403 return stream;
2400 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2401 */ 2415 */
2402void 2416void
2403rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2404{ 2418{
2405 int done; 2419 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2420
2408 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2409 return; 2422 return;
2410 2423
2411 /* 2424 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2425 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2426 * is received.
2414 */ 2427 */
2415 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2416 { 2429 {
2417 unsigned char buf[8]; 2430 unsigned char buf[8];
2418 unicode_t ch; 2431 unicode_t ch;
2419 unsigned int i, len; 2432 unsigned int i, len;
2420 2433
2565 break; 2578 break;
2566 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2581 break;
2569 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
2571 break; 2584 break;
2572 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
2574 /* unimplemented */ 2587 /* unimplemented */
2575 break; 2588 break;
2629 scr_forwardindex (); 2642 scr_forwardindex ();
2630 break; 2643 break;
2631#endif 2644#endif
2632 case '=': 2645 case '=':
2633 case '>': 2646 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
2635 break; 2648 break;
2636 2649
2637 case C1_40: 2650 case C1_40:
2638 cmd_getc (); 2651 cmd_getc ();
2639 break; 2652 break;
2678 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2679 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2680 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2681 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2682 2695
2683 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2684 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2685 process_csi_seq (); 2698 process_csi_seq ();
2686 break; 2699 break;
2687 2700
2688 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2689 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
2690 process_osc_seq (); 2703 process_osc_seq ();
2691 break; 2704 break;
2692 2705
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2694 case 'c': 2707 case 'c':
2695 mbstate.reset (); 2708 mbstate.reset ();
2696 scr_poweron (); 2709 scr_poweron ();
2697 scrollbar_show (1); 2710 scrollBar.show (1);
2698 break; 2711 break;
2699 2712
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2714 case 'n':
2702 scr_charset_choose (2); 2715 scr_charset_choose (2);
2753 2766
2754 nargs = 0; 2767 nargs = 0;
2755 2768
2756 priv = 0; 2769 priv = 0;
2757 ch = cmd_getc (); 2770 ch = cmd_getc ();
2758 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2759 { 2772 {
2760 /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
2761 priv = ch; 2774 priv = ch;
2762 ch = cmd_getc (); 2775 ch = cmd_getc ();
2763 } 2776 }
2764 2777
2765 /* read any numerical arguments */ 2778 /* read any numerical arguments */
2819 2832
2820 case '?': 2833 case '?':
2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2822 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
2823 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);
2824 } 2849 }
2850 break;
2851 }
2852
2825 return; 2853 return;
2826 } 2854 }
2827 2855
2828 switch (ch) 2856 switch (ch)
2829 { 2857 {
3258 3286
3259/* 3287/*
3260 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3261 */ 3289 */
3262void 3290void
3263rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3264{ 3292{
3265 int color; 3293 int color;
3266 char *buf, *name; 3294 char *buf, *name;
3267 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3268 int saveop = op; 3296 int saveop = op;
3309 3337
3310 XFree (value); 3338 XFree (value);
3311 } 3339 }
3312 else 3340 else
3313 { 3341 {
3314 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3315 3343
3316 if (eq) 3344 if (eq)
3317 { 3345 {
3318 *eq = 0; 3346 *eq = 0;
3319 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
3375 break; 3403 break;
3376 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3377 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3378 break; 3406 break;
3379#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3380#if ENABLE_TRANSPARENCY 3411#if ENABLE_TRANSPARENCY
3381 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3382 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3383 { 3414 {
3384 bool changed = false; 3415 bool changed = false;
3399 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3400 if (!strcmp (str, "?")) 3431 if (!strcmp (str, "?"))
3401 { 3432 {
3402 char str[256]; 3433 char str[256];
3403 3434
3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3435 sprintf (str, "[%dx%d+%d+%d]",
3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST); 3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3408 } 3439 }
3409 else 3440 else
3508 break; 3539 break;
3509#endif 3540#endif
3510 3541
3511#if ENABLE_PERL 3542#if ENABLE_PERL
3512 case URxvt_perl: 3543 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3544 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3545 break;
3516#endif 3546#endif
3517 } 3547 }
3518} 3548}
3519/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
3542 { 3572 {
3543 if (mode == 'r') 3573 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3575 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3577 set_privmode (bit, state);
3548 } 3578 }
3549 3579
3550 return state; 3580 return state;
3551} 3581}
3552 3582
3560 static const struct 3590 static const struct
3561 { 3591 {
3562 const int argval; 3592 const int argval;
3563 const unsigned long bit; 3593 const unsigned long bit;
3564 } argtopriv[] = { 3594 } argtopriv[] = {
3565 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
3566 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3567 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
3568 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
3569 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
3570 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
3571 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
3572 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
3573 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3574 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
3575 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3576#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
3577 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
3578#endif 3609#endif
3579 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
3580 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
3581 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
3582 // 45 margin bell NYI 3614 // 45 margin bell NYI
3583 // 46 start logging 3615 // 46 start logging
3584 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
3585 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3586#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
3587 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
3588#endif 3620#endif
3589 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
3590 { 1002, PrivMode_MouseBtnEvent }, 3622 { 1002, PrivMode_MouseBtnEvent },
3591 { 1003, PrivMode_MouseAnyEvent }, 3623 { 1003, PrivMode_MouseAnyEvent },
3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3631 3663
3632 scr_touch (true); 3664 scr_touch (true);
3633 break; 3665 break;
3634#endif 3666#endif
3635 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3636 case 1049:
3637 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3638 if (mode == 0) 3669 if (mode == 0)
3639 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3640 else if (mode == 1) 3671 else if (mode == 1)
3641 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
3650 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3684 * within VT52 mode
3654 */ 3685 */
3655 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
3656 break; 3687 break;
3657 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3662 }
3663 break; 3691 break;
3664 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
3665 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
3666 break; 3694 break;
3667 case 5: /* reverse video */ 3695 case 5: /* reverse video */
3678 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3708 break;
3681#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
3682 case scrollBar_esc: 3710 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
3684 { 3712 {
3685 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3714 scr_touch (true);
3687 } 3715 }
3688 break; 3716 break;
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask; 3738 vt_emask_mouse = PointerMotionMask;
3711 } 3739 }
3712 else 3740 else
3713 vt_emask_mouse = NoEventMask; 3741 vt_emask_mouse = NoEventMask;
3742
3714 vt_select_input (); 3743 vt_select_input ();
3715 break; 3744 break;
3716 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3717 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
3718 break; 3747 break;
3719 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3720 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3721 break; 3750 break;
3722 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3723 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3724 if (current_screen != PRIMARY) 3753 if (!state)
3725 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
3726 scr_change_screen (state); 3756 scr_change_screen (state);
3727 break; 3757 break;
3728 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
3729 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3730 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3731 if (current_screen != PRIMARY) 3766 if (state)
3732 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3733 break; 3770 break;
3734 default: 3771 default:
3735 break; 3772 break;
3736 } 3773 }
3737 } 3774 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines