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.408 by ayin, Sat Feb 16 13:36:10 2008 UTC vs.
Revision 1.430 by root, Wed Nov 12 02:37:58 2008 UTC

… …
334# endif 334# endif
335#endif 335#endif
336 return keysym; 336 return keysym;
337} 337}
338 338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
339void 398void
340rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
341{ 400{
342 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
343 KeySym keysym; 402 KeySym keysym;
… …
360 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
361 420
362 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
363 { 422 {
364 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
365 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
366 } 425 }
367 426
368 kbuf[0] = 0; 427 kbuf[0] = 0;
369 428
370#ifdef USE_XIM 429#ifdef USE_XIM
… …
582 } 641 }
583#endif 642#endif
584 643
585 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
586 { 645 {
587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
588 unsigned int newlen = 1; 647 unsigned int newlen = 1;
589 648
590 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:
591 { 765 {
592#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
593 case XK_BackSpace: 767 if (param > 0)
594 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
595 {
596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
597 ^ !!ctrl) ? '\b' : '\177';
598 kbuf[1] = '\0';
599 }
600 else 769 else
601 strcpy (kbuf, rs[Rs_backspace_key]);
602 break;
603#endif
604#ifndef NO_DELETE_KEY
605 case XK_Delete:
606 strcpy (kbuf, rs[Rs_delete_key]);
607 break;
608#endif
609 case XK_Tab:
610 if (shft)
611 strcpy (kbuf, "\033[Z");
612 else
613 {
614#ifdef CTRL_TAB_MAKES_META
615 if (ctrl)
616 meta = 1;
617#endif
618#ifdef MOD4_TAB_MAKES_META
619 if (ev.state & Mod4Mask)
620 meta = 1;
621#endif
622 newlen = 0;
623 }
624 break;
625
626 case XK_Up: /* "\033[A" */
627 case XK_Down: /* "\033[B" */
628 case XK_Right: /* "\033[C" */
629 case XK_Left: /* "\033[D" */
630 strcpy (kbuf, "\033[Z");
631 kbuf[2] = "DACB"[keysym - XK_Left];
632 /* do Shift first */
633 if (shft)
634 kbuf[2] = "dacb"[keysym - XK_Left];
635 else if (ctrl)
636 {
637 kbuf[1] = 'O';
638 kbuf[2] = "dacb"[keysym - XK_Left];
639 }
640 else if (priv_modes & PrivMode_aplCUR)
641 kbuf[1] = 'O';
642 break;
643
644#ifndef UNSHIFTED_SCROLLKEYS
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648 case XK_Next:
649 strcpy (kbuf, "\033[6~");
650 break;
651#endif
652 case XK_KP_Enter:
653 /* allow shift to override */
654 if (kp)
655 {
656 strcpy (kbuf, "\033OM");
657 break;
658 }
659
660 /* FALLTHROUGH */
661
662 case XK_Return:
663 if (priv_modes & PrivMode_LFNL)
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\012';
667 kbuf[2] = '\0';
668 }
669 else
670 {
671 kbuf[0] = '\015';
672 kbuf[1] = '\0';
673 }
674 break;
675
676 case XK_KP_F1: /* "\033OP" */
677 case XK_KP_F2: /* "\033OQ" */
678 case XK_KP_F3: /* "\033OR" */
679 case XK_KP_F4: /* "\033OS" */
680 strcpy (kbuf, "\033OP");
681 kbuf[2] += (keysym - XK_KP_F1);
682 break;
683
684 case XK_KP_Multiply: /* "\033Oj" : "*" */
685 case XK_KP_Add: /* "\033Ok" : "+" */
686 case XK_KP_Separator: /* "\033Ol" : "," */
687 case XK_KP_Subtract: /* "\033Om" : "-" */
688 case XK_KP_Decimal: /* "\033On" : "." */
689 case XK_KP_Divide: /* "\033Oo" : "/" */
690 case XK_KP_0: /* "\033Op" : "0" */
691 case XK_KP_1: /* "\033Oq" : "1" */
692 case XK_KP_2: /* "\033Or" : "2" */
693 case XK_KP_3: /* "\033Os" : "3" */
694 case XK_KP_4: /* "\033Ot" : "4" */
695 case XK_KP_5: /* "\033Ou" : "5" */
696 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */
701 if (kp)
702 {
703 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply);
705 }
706 else
707 {
708 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
709 kbuf[1] = '\0';
710 }
711 break;
712
713 case XK_Find:
714 strcpy (kbuf, "\033[1~");
715 break;
716
717 case XK_Insert:
718 strcpy (kbuf, "\033[2~");
719 break;
720#ifdef DXK_Remove /* support for DEC remove like key */
721 case DXK_Remove:
722 /* FALLTHROUGH */
723#endif
724 case XK_Execute:
725 strcpy (kbuf, "\033[3~");
726 break;
727 case XK_Select:
728 strcpy (kbuf, "\033[4~");
729 break;
730 case XK_End:
731 strcpy (kbuf, KS_END);
732 break;
733 case XK_Home:
734 strcpy (kbuf, KS_HOME);
735 break;
736
737#define FKEY(n, fkey) \
738 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
739
740 case XK_F1: /* "\033[11~" */
741 case XK_F2: /* "\033[12~" */
742 case XK_F3: /* "\033[13~" */
743 case XK_F4: /* "\033[14~" */
744 case XK_F5: /* "\033[15~" */
745 FKEY (11, XK_F1);
746 break;
747 case XK_F6: /* "\033[17~" */
748 case XK_F7: /* "\033[18~" */
749 case XK_F8: /* "\033[19~" */
750 case XK_F9: /* "\033[20~" */
751 case XK_F10: /* "\033[21~" */
752 FKEY (17, XK_F6);
753 break;
754 case XK_F11: /* "\033[23~" */
755 case XK_F12: /* "\033[24~" */
756 case XK_F13: /* "\033[25~" */
757 case XK_F14: /* "\033[26~" */
758 FKEY (23, XK_F11);
759 break;
760 case XK_F15: /* "\033[28~" */
761 case XK_F16: /* "\033[29~" */
762 FKEY (28, XK_F15);
763 break;
764 case XK_Help: /* "\033[28~" */
765 FKEY (28, XK_Help);
766 break;
767 case XK_Menu: /* "\033[29~" */
768 FKEY (29, XK_Menu);
769 break;
770 case XK_F17: /* "\033[31~" */
771 case XK_F18: /* "\033[32~" */
772 case XK_F19: /* "\033[33~" */
773 case XK_F20: /* "\033[34~" */
774 case XK_F21: /* "\033[35~" */
775 case XK_F22: /* "\033[36~" */
776 case XK_F23: /* "\033[37~" */
777 case XK_F24: /* "\033[38~" */
778 case XK_F25: /* "\033[39~" */
779 case XK_F26: /* "\033[40~" */
780 case XK_F27: /* "\033[41~" */
781 case XK_F28: /* "\033[42~" */
782 case XK_F29: /* "\033[43~" */
783 case XK_F30: /* "\033[44~" */
784 case XK_F31: /* "\033[45~" */
785 case XK_F32: /* "\033[46~" */
786 case XK_F33: /* "\033[47~" */
787 case XK_F34: /* "\033[48~" */
788 case XK_F35: /* "\033[49~" */
789 FKEY (31, XK_F17);
790 break;
791#undef FKEY
792 default:
793 newlen = 0; 770 newlen = 0;
794 break;
795 } 771 }
772 break;
773 }
796 774
797 if (newlen) 775 if (newlen)
798 len = strlen (kbuf); 776 len = strlen (kbuf);
799 777
800 /* 778 /*
801 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
802 */ 780 */
803#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1037 } 1015 }
1038 while (row < end_row); 1016 while (row < end_row);
1039 } 1017 }
1040 1018
1041 scr_refresh (); 1019 scr_refresh ();
1042 scrollbar_show (1); 1020 scrollBar.show (1);
1043#ifdef USE_XIM 1021#ifdef USE_XIM
1044 IMSendSpot (); 1022 IMSendSpot ();
1045#endif 1023#endif
1046 } 1024 }
1047 1025
… …
1149 { 1127 {
1150 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1152 // 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
1153 // 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.
1154 1135
1155 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1156 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1157 1138
1158 w.stop (); 1139 w.stop ();
1159 } 1140 }
1160 1141
… …
1210{ 1191{
1211 make_current (); 1192 make_current ();
1212 1193
1213 if (revents & ev::READ) 1194 if (revents & ev::READ)
1214 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1215 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1216 if (cmd_parse ()) 1197 cmd_parse ();
1217 break;
1218 1198
1219 if (revents & ev::WRITE) 1199 if (revents & ev::WRITE)
1220 pty_write (); 1200 pty_write ();
1221 1201
1222 refresh_check (); 1202 refresh_check ();
… …
1558 ; 1538 ;
1559 1539
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1541 {
1562 scrollBar.state = STATE_IDLE; 1542 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1543 scrollBar.show (0);
1564 } 1544 }
1565 } 1545 }
1566 break; 1546 break;
1567 1547
1568 case MotionNotify: 1548 case MotionNotify:
… …
1667 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1668 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1669 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1670 &unused_mask); 1650 &unused_mask);
1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1672 scrollbar_size ()); 1652 scrollBar.size ());
1673 want_refresh = 1; 1653 want_refresh = 1;
1674 scrollbar_show (1); 1654 scrollBar.show (1);
1675 } 1655 }
1676 break; 1656 break;
1677 } 1657 }
1678 1658
1679#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
… …
1704#endif 1684#endif
1705 1685
1706 refresh_check (); 1686 refresh_check ();
1707} 1687}
1708 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
1709void 1705void
1710rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1711{ 1707{
1712 if (!focus) 1708 if (!focus)
1713 { 1709 {
1714 focus = 1; 1710 focus = 1;
1715 want_refresh = 1; 1711 want_refresh = 1;
1716
1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718 1712
1719#if USE_XIM 1713#if USE_XIM
1720 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1721 { 1715 {
1722 IMSetPosition (); 1716 IMSetPosition ();
… …
1734 scr_recolour (); 1728 scr_recolour ();
1735 } 1729 }
1736#endif 1730#endif
1737#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell)) 1732 if (option (Opt_urgentOnBell))
1739 { 1733 set_urgency (0);
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1745 }
1746#endif 1734#endif
1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 } 1737 }
1748} 1738}
1749 1739
1750void 1740void
1751rxvt_term::focus_out () 1741rxvt_term::focus_out ()
… …
1753 if (focus) 1743 if (focus)
1754 { 1744 {
1755 focus = 0; 1745 focus = 0;
1756 want_refresh = 1; 1746 want_refresh = 1;
1757 1747
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1748#if ENABLE_FRILLS
1759 1749 if (option (Opt_urgentOnBell))
1750 set_urgency (0);
1751#endif
1760#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf) 1753 if (iso14755buf)
1762 { 1754 {
1763 iso14755buf = 0; 1755 iso14755buf = 0;
1764# if ISO_14755 1756# if ISO_14755
… …
1781 { 1773 {
1782 pix_colors = pix_colors_unfocused; 1774 pix_colors = pix_colors_unfocused;
1783 scr_recolour (); 1775 scr_recolour ();
1784 } 1776 }
1785#endif 1777#endif
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786 } 1780 }
1787} 1781}
1788 1782
1789void 1783void
1790rxvt_term::update_fade_color (unsigned int idx) 1784rxvt_term::update_fade_color (unsigned int idx)
… …
2032 } 2026 }
2033 2027
2034 if (scrollBar.style == R_SB_XTERM 2028 if (scrollBar.style == R_SB_XTERM
2035 || scrollbar_above_slider (ev.y) 2029 || scrollbar_above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2030 || scrollbar_below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2031 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2038 2032
2039 scrollBar.state = STATE_MOTION; 2033 scrollBar.state = STATE_MOTION;
2040 break; 2034 break;
2041 2035
2042 case Button1: 2036 case Button1:
… …
2065 else 2059 else
2066 { 2060 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2061 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2062 (nrow
2069 * scrollbar_position (ev.y) 2063 * scrollbar_position (ev.y)
2070 / scrollbar_size ())); 2064 / scrollBar.size ()));
2071 } 2065 }
2072 2066
2073 break; 2067 break;
2074 } 2068 }
2075 } 2069 }
… …
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2082 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2083
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2084 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2091 { 2085 {
2092 scrollBar.state = STATE_IDLE; 2086 scrollBar.state = STATE_IDLE;
2093 scrollbar_show (0); 2087 scrollBar.show (0);
2094 } 2088 }
2095 2089
2096#ifdef SELECTION_SCROLLING 2090#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2098#endif 2092#endif
… …
2181 } 2175 }
2182 else 2176 else
2183# endif 2177# endif
2184 { 2178 {
2185 scr_page (v, i); 2179 scr_page (v, i);
2186 scrollbar_show (1); 2180 scrollBar.show (1);
2187 } 2181 }
2188 } 2182 }
2189 break; 2183 break;
2190#endif 2184#endif
2191 } 2185 }
2192 } 2186 }
2193} 2187}
2194 2188
2195/*}}} */ 2189/*}}} */
2196 2190
2197bool 2191void
2198rxvt_term::cmd_parse () 2192rxvt_term::cmd_parse ()
2199{ 2193{
2200 bool flag = false;
2201 wchar_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2202 char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2203 2196
2204 for (;;) 2197 for (;;)
2205 { 2198 {
2206 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2207 { 2200 {
2208 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2209 ch = next_char (); 2202 ch = next_char ();
2210 2203
2211 if (ch == NOCHAR) 2204 if (ch == NOCHAR)
2212 break; 2205 break;
2213 } 2206 }
2214 2207
2215 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))
2216 { 2209 {
2217 if (!seen_input) 2210 if (expect_false (!seen_input))
2218 { 2211 {
2219 seen_input = 1; 2212 seen_input = 1;
2220 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2221 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2222 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
… …
2235 wchar_t *str = buf; 2228 wchar_t *str = buf;
2236 wchar_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2237 2230
2238 for (;;) 2231 for (;;)
2239 { 2232 {
2240 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)))
2241 break; 2234 break;
2242 2235
2243 *str++ = ch; 2236 *str++ = ch;
2244 2237
2245 if (ch == C0_LF || str >= eol) 2238 if (expect_false (ch == C0_LF || str >= eol))
2246 { 2239 {
2247 if (ch == C0_LF) 2240 if (ch == C0_LF)
2248 nlines++; 2241 nlines++;
2249 2242
2250 refresh_count++; 2243 refresh_count++;
… …
2299 * 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.
2300 * if skipScroll is enabled. 2293 * if skipScroll is enabled.
2301 */ 2294 */
2302 if (refreshnow) 2295 if (refreshnow)
2303 { 2296 {
2304 flag = true;
2305 scr_refresh (); 2297 scr_refresh ();
2306 want_refresh = 1; 2298 want_refresh = 1;
2307 } 2299 }
2308
2309 } 2300 }
2310 else 2301 else
2311 { 2302 {
2312 try 2303 try
2313 { 2304 {
… …
2321 } 2312 }
2322 2313
2323 ch = NOCHAR; 2314 ch = NOCHAR;
2324 } 2315 }
2325 } 2316 }
2326
2327 return flag;
2328} 2317}
2329 2318
2330// read the next character 2319// read the next character
2331wchar_t 2320wchar_t
2332rxvt_term::next_char () NOTHROW 2321rxvt_term::next_char () NOTHROW
2333{ 2322{
2334 while (cmdbuf_ptr < cmdbuf_endp) 2323 while (cmdbuf_ptr < cmdbuf_endp)
2335 { 2324 {
2336 // assume 7-bit to be ascii ALWAYS 2325 // assume 7-bit to be ascii ALWAYS
2337 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2326 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2338 return *cmdbuf_ptr++; 2327 return *cmdbuf_ptr++;
2339 2328
2340 wchar_t wc; 2329 wchar_t wc;
2341 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);
2342 2331
… …
2346 cmdbuf_ptr = cmdbuf_endp; 2335 cmdbuf_ptr = cmdbuf_endp;
2347 break; 2336 break;
2348 } 2337 }
2349 2338
2350 if (len == (size_t)-1) 2339 if (len == (size_t)-1)
2340 {
2341 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2351 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 }
2352 2344
2353 // assume wchar == unicode 2345 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2346 cmdbuf_ptr += len;
2355 return wc & UNICODE_MASK; 2347 return wc & UNICODE_MASK;
2356 } 2348 }
… …
2400/*----------------------------------------------------------------------*/ 2392/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2393#ifdef PRINTPIPE
2402FILE * 2394FILE *
2403rxvt_term::popen_printer () 2395rxvt_term::popen_printer ()
2404{ 2396{
2405 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2397 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2398
2407 if (stream == NULL) 2399 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2400 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2401
2410 return stream; 2402 return stream;
… …
2421 * simulate attached vt100 printer 2413 * simulate attached vt100 printer
2422 */ 2414 */
2423void 2415void
2424rxvt_term::process_print_pipe () 2416rxvt_term::process_print_pipe ()
2425{ 2417{
2426 int done; 2418 FILE *fd = popen_printer ();
2427 FILE *fd;
2428 2419
2429 if ((fd = popen_printer ()) == NULL) 2420 if (!fd)
2430 return; 2421 return;
2431 2422
2432 /* 2423 /*
2433 * 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
2434 * is received. 2425 * is received.
2435 */ 2426 */
2436 for (done = 0; !done;) 2427 for (int done = 0; !done; )
2437 { 2428 {
2438 unsigned char buf[8]; 2429 unsigned char buf[8];
2439 unicode_t ch; 2430 unicode_t ch;
2440 unsigned int i, len; 2431 unsigned int i, len;
2441 2432
… …
2586 break; 2577 break;
2587 case 'Z': /* identify the terminal type */ 2578 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2580 break;
2590 case '<': /* turn off VT52 mode */ 2581 case '<': /* turn off VT52 mode */
2591 PrivMode (0, PrivMode_vt52); 2582 set_privmode (PrivMode_vt52, 0);
2592 break; 2583 break;
2593 case 'F': /* use special graphics character set */ 2584 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2585 case 'G': /* use regular character set */
2595 /* unimplemented */ 2586 /* unimplemented */
2596 break; 2587 break;
… …
2650 scr_forwardindex (); 2641 scr_forwardindex ();
2651 break; 2642 break;
2652#endif 2643#endif
2653 case '=': 2644 case '=':
2654 case '>': 2645 case '>':
2655 PrivMode ((ch == '='), PrivMode_aplKP); 2646 set_privmode (PrivMode_aplKP, ch == '=');
2656 break; 2647 break;
2657 2648
2658 case C1_40: 2649 case C1_40:
2659 cmd_getc (); 2650 cmd_getc ();
2660 break; 2651 break;
… …
2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
2703 2694
2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
2706 process_csi_seq (); 2697 process_csi_seq ();
2707 break; 2698 break;
2708 2699
2709 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2700 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710 case C1_OSC: /* ESC ] */ 2701 case C1_OSC: /* ESC ] */
2711 process_osc_seq (); 2702 process_osc_seq ();
2712 break; 2703 break;
2713 2704
2714 /* 8.3.106: RESET TO INITIAL STATE */ 2705 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715 case 'c': 2706 case 'c':
2716 mbstate.reset (); 2707 mbstate.reset ();
2717 scr_poweron (); 2708 scr_poweron ();
2718 scrollbar_show (1); 2709 scrollBar.show (1);
2719 break; 2710 break;
2720 2711
2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722 case 'n': 2713 case 'n':
2723 scr_charset_choose (2); 2714 scr_charset_choose (2);
… …
2774 2765
2775 nargs = 0; 2766 nargs = 0;
2776 2767
2777 priv = 0; 2768 priv = 0;
2778 ch = cmd_getc (); 2769 ch = cmd_getc ();
2779 if (ch >= '<' && ch <= '?') 2770 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 { 2771 {
2781 /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' '!' */
2782 priv = ch; 2773 priv = ch;
2783 ch = cmd_getc (); 2774 ch = cmd_getc ();
2784 } 2775 }
2785 2776
2786 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
2840 2831
2841 case '?': 2832 case '?':
2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2843 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
2844 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);
2845 } 2848 }
2849 break;
2850 }
2851
2846 return; 2852 return;
2847 } 2853 }
2848 2854
2849 switch (ch) 2855 switch (ch)
2850 { 2856 {
… …
3396 break; 3402 break;
3397 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3398 process_color_seq (op, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3399 break; 3405 break;
3400#endif 3406#endif
3407 case URxvt_Color_border:
3408 process_color_seq (op, Color_border, str, resp);
3409 break;
3401#if ENABLE_TRANSPARENCY 3410#if ENABLE_TRANSPARENCY
3402 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3403 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3404 { 3413 {
3405 bool changed = false; 3414 bool changed = false;
… …
3529 break; 3538 break;
3530#endif 3539#endif
3531 3540
3532#if ENABLE_PERL 3541#if ENABLE_PERL
3533 case URxvt_perl: 3542 case URxvt_perl:
3534 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));
3535 ; // no responses yet
3536 break; 3544 break;
3537#endif 3545#endif
3538 } 3546 }
3539} 3547}
3540/*----------------------------------------------------------------------*/ 3548/*----------------------------------------------------------------------*/
… …
3563 { 3571 {
3564 if (mode == 'r') 3572 if (mode == 'r')
3565 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566 else 3574 else
3567 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3575 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568 PrivMode (state, bit); 3576 set_privmode (bit, state);
3569 } 3577 }
3570 3578
3571 return state; 3579 return state;
3572} 3580}
3573 3581
… …
3581 static const struct 3589 static const struct
3582 { 3590 {
3583 const int argval; 3591 const int argval;
3584 const unsigned long bit; 3592 const unsigned long bit;
3585 } argtopriv[] = { 3593 } argtopriv[] = {
3586 { 1, PrivMode_aplCUR }, 3594 { 1, PrivMode_aplCUR }, // DECCKM
3587 { 2, PrivMode_vt52 }, 3595 { 2, PrivMode_vt52 },
3588 { 3, PrivMode_132 }, 3596 { 3, PrivMode_132 }, // DECCOLM
3589 { 4, PrivMode_smoothScroll }, 3597 { 4, PrivMode_smoothScroll }, // DECSCLM
3590 { 5, PrivMode_rVideo }, 3598 { 5, PrivMode_rVideo }, // DECSCNM
3591 { 6, PrivMode_relOrigin }, 3599 { 6, PrivMode_relOrigin }, // DECOM
3592 { 7, PrivMode_Autowrap }, 3600 { 7, PrivMode_Autowrap }, // DECAWM
3593 // 8, bi-directional support mode 3601 // 8, auto-repeat keys // DECARM
3594 { 9, PrivMode_MouseX10 }, 3602 { 9, PrivMode_MouseX10 },
3595 // 18, 19 printing-related 3603 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region
3596 { 25, PrivMode_VisibleCursor }, 3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3597#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
3598 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
3599#endif 3608#endif
3600 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK
3601 { 40, PrivMode_132OK }, 3611 { 40, PrivMode_132OK },
3602 // 41 xterm more fixes NYI 3612 // 41 xterm more fixes NYI
3603 // 45 margin bell NYI 3613 // 45 margin bell NYI
3604 // 46 start logging 3614 // 46 start logging
3605 { 47, PrivMode_Screen }, 3615 { 47, PrivMode_Screen },
3606 { 66, PrivMode_aplKP }, 3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3607#ifndef NO_BACKSPACE_KEY 3617#ifndef NO_BACKSPACE_KEY
3608 { 67, PrivMode_BackSpace }, 3618 { 67, PrivMode_BackSpace }, // DECBKM
3609#endif 3619#endif
3610 { 1000, PrivMode_MouseX11 }, 3620 { 1000, PrivMode_MouseX11 },
3611 { 1002, PrivMode_MouseBtnEvent }, 3621 { 1002, PrivMode_MouseBtnEvent },
3612 { 1003, PrivMode_MouseAnyEvent }, 3622 { 1003, PrivMode_MouseAnyEvent },
3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3652 3662
3653 scr_touch (true); 3663 scr_touch (true);
3654 break; 3664 break;
3655#endif 3665#endif
3656 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3657 case 1049:
3658 if (option (Opt_secondaryScreen)) 3667 if (option (Opt_secondaryScreen))
3659 if (mode == 0) 3668 if (mode == 0)
3660 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3661 else if (mode == 1) 3670 else if (mode == 1)
3662 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
… …
3671 case 2: /* VT52 mode */ 3680 case 2: /* VT52 mode */
3672 /* oddball mode. should be set regardless of set/reset 3681 /* oddball mode. should be set regardless of set/reset
3673 * parameter. Return from VT52 mode with an ESC < from 3682 * parameter. Return from VT52 mode with an ESC < from
3674 * within VT52 mode 3683 * within VT52 mode
3675 */ 3684 */
3676 PrivMode (1, PrivMode_vt52); 3685 set_privmode (PrivMode_vt52, 1);
3677 break; 3686 break;
3678 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3679 if (priv_modes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3683 }
3684 break; 3690 break;
3685 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3686 set_option (Opt_jumpScroll, !state); 3692 set_option (Opt_jumpScroll, !state);
3687 break; 3693 break;
3688 case 5: /* reverse video */ 3694 case 5: /* reverse video */
… …
3699 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3706 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3701 break; 3707 break;
3702#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
3703 case scrollBar_esc: 3709 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3710 if (scrollBar.map (state))
3705 { 3711 {
3706 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3713 scr_touch (true);
3708 } 3714 }
3709 break; 3715 break;
… …
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3731 vt_emask_mouse = PointerMotionMask; 3737 vt_emask_mouse = PointerMotionMask;
3732 } 3738 }
3733 else 3739 else
3734 vt_emask_mouse = NoEventMask; 3740 vt_emask_mouse = NoEventMask;
3741
3735 vt_select_input (); 3742 vt_select_input ();
3736 break; 3743 break;
3737 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
3738 set_option (Opt_scrollTtyOutput, !state); 3745 set_option (Opt_scrollTtyOutput, !state);
3739 break; 3746 break;
3740 case 1011: /* scroll to bottom on key press */ 3747 case 1011: /* scroll to bottom on key press */
3741 set_option (Opt_scrollTtyKeypress, state); 3748 set_option (Opt_scrollTtyKeypress, state);
3742 break; 3749 break;
3743 case 1047: /* secondary screen w/ clearing last */ 3750 case 1047: /* secondary screen w/ clearing last */
3744 if (option (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3752 if (!state)
3746 scr_erase_screen (2); 3753 scr_erase_screen (2);
3754
3747 scr_change_screen (state); 3755 scr_change_screen (state);
3748 break; 3756 break;
3749 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
3750 scr_change_screen (state); 3762 scr_change_screen (state);
3763
3751 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3752 if (current_screen != PRIMARY) 3765 if (state)
3753 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767 else
3768 scr_cursor (RESTORE);
3754 break; 3769 break;
3755 default: 3770 default:
3756 break; 3771 break;
3757 } 3772 }
3758 } 3773 }

Diff Legend

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