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.421 by root, Wed Oct 15 17:16:47 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
… …
1558 ; 1539 ;
1559 1540
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1542 {
1562 scrollBar.state = STATE_IDLE; 1543 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1544 scrollBar.show (0);
1564 } 1545 }
1565 } 1546 }
1566 break; 1547 break;
1567 1548
1568 case MotionNotify: 1549 case MotionNotify:
… …
1667 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1668 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1669 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1670 &unused_mask); 1651 &unused_mask);
1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1672 scrollbar_size ()); 1653 scrollBar.size ());
1673 want_refresh = 1; 1654 want_refresh = 1;
1674 scrollbar_show (1); 1655 scrollBar.show (1);
1675 } 1656 }
1676 break; 1657 break;
1677 } 1658 }
1678 1659
1679#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
… …
1705 1686
1706 refresh_check (); 1687 refresh_check ();
1707} 1688}
1708 1689
1709void 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
1704void
1710rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1711{ 1706{
1712 if (!focus) 1707 if (!focus)
1713 { 1708 {
1714 focus = 1; 1709 focus = 1;
1715 want_refresh = 1; 1710 want_refresh = 1;
1716
1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718 1711
1719#if USE_XIM 1712#if USE_XIM
1720 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1721 { 1714 {
1722 IMSetPosition (); 1715 IMSetPosition ();
… …
1734 scr_recolour (); 1727 scr_recolour ();
1735 } 1728 }
1736#endif 1729#endif
1737#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell)) 1731 if (option (Opt_urgentOnBell))
1739 { 1732 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 1733#endif
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 } 1736 }
1748} 1737}
1749 1738
1750void 1739void
1751rxvt_term::focus_out () 1740rxvt_term::focus_out ()
… …
1753 if (focus) 1742 if (focus)
1754 { 1743 {
1755 focus = 0; 1744 focus = 0;
1756 want_refresh = 1; 1745 want_refresh = 1;
1757 1746
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1747#if ENABLE_FRILLS
1759 1748 if (option (Opt_urgentOnBell))
1749 set_urgency (0);
1750#endif
1760#if ENABLE_FRILLS || ISO_14755 1751#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf) 1752 if (iso14755buf)
1762 { 1753 {
1763 iso14755buf = 0; 1754 iso14755buf = 0;
1764# if ISO_14755 1755# if ISO_14755
… …
1781 { 1772 {
1782 pix_colors = pix_colors_unfocused; 1773 pix_colors = pix_colors_unfocused;
1783 scr_recolour (); 1774 scr_recolour ();
1784 } 1775 }
1785#endif 1776#endif
1777
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786 } 1779 }
1787} 1780}
1788 1781
1789void 1782void
1790rxvt_term::update_fade_color (unsigned int idx) 1783rxvt_term::update_fade_color (unsigned int idx)
… …
2032 } 2025 }
2033 2026
2034 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2035 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2038 2031
2039 scrollBar.state = STATE_MOTION; 2032 scrollBar.state = STATE_MOTION;
2040 break; 2033 break;
2041 2034
2042 case Button1: 2035 case Button1:
… …
2065 else 2058 else
2066 { 2059 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2061 (nrow
2069 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
2070 / scrollbar_size ())); 2063 / scrollBar.size ()));
2071 } 2064 }
2072 2065
2073 break; 2066 break;
2074 } 2067 }
2075 } 2068 }
… …
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2082
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2091 { 2084 {
2092 scrollBar.state = STATE_IDLE; 2085 scrollBar.state = STATE_IDLE;
2093 scrollbar_show (0); 2086 scrollBar.show (0);
2094 } 2087 }
2095 2088
2096#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2098#endif 2091#endif
… …
2181 } 2174 }
2182 else 2175 else
2183# endif 2176# endif
2184 { 2177 {
2185 scr_page (v, i); 2178 scr_page (v, i);
2186 scrollbar_show (1); 2179 scrollBar.show (1);
2187 } 2180 }
2188 } 2181 }
2189 break; 2182 break;
2190#endif 2183#endif
2191 } 2184 }
… …
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++;
… …
2332rxvt_term::next_char () NOTHROW 2325rxvt_term::next_char () NOTHROW
2333{ 2326{
2334 while (cmdbuf_ptr < cmdbuf_endp) 2327 while (cmdbuf_ptr < cmdbuf_endp)
2335 { 2328 {
2336 // assume 7-bit to be ascii ALWAYS 2329 // assume 7-bit to be ascii ALWAYS
2337 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2330 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2338 return *cmdbuf_ptr++; 2331 return *cmdbuf_ptr++;
2339 2332
2340 wchar_t wc; 2333 wchar_t wc;
2341 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2342 2335
… …
2346 cmdbuf_ptr = cmdbuf_endp; 2339 cmdbuf_ptr = cmdbuf_endp;
2347 break; 2340 break;
2348 } 2341 }
2349 2342
2350 if (len == (size_t)-1) 2343 if (len == (size_t)-1)
2344 {
2345 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 2346 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2347 }
2352 2348
2353 // assume wchar == unicode 2349 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2350 cmdbuf_ptr += len;
2355 return wc & UNICODE_MASK; 2351 return wc & UNICODE_MASK;
2356 } 2352 }
… …
2400/*----------------------------------------------------------------------*/ 2396/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2397#ifdef PRINTPIPE
2402FILE * 2398FILE *
2403rxvt_term::popen_printer () 2399rxvt_term::popen_printer ()
2404{ 2400{
2405 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2401 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2402
2407 if (stream == NULL) 2403 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2404 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2405
2410 return stream; 2406 return stream;
… …
2421 * simulate attached vt100 printer 2417 * simulate attached vt100 printer
2422 */ 2418 */
2423void 2419void
2424rxvt_term::process_print_pipe () 2420rxvt_term::process_print_pipe ()
2425{ 2421{
2426 int done; 2422 FILE *fd = popen_printer ();
2427 FILE *fd;
2428 2423
2429 if ((fd = popen_printer ()) == NULL) 2424 if (!fd)
2430 return; 2425 return;
2431 2426
2432 /* 2427 /*
2433 * Send all input to the printer until either ESC[4i or ESC[?4i 2428 * Send all input to the printer until either ESC[4i or ESC[?4i
2434 * is received. 2429 * is received.
2435 */ 2430 */
2436 for (done = 0; !done;) 2431 for (int done = 0; !done; )
2437 { 2432 {
2438 unsigned char buf[8]; 2433 unsigned char buf[8];
2439 unicode_t ch; 2434 unicode_t ch;
2440 unsigned int i, len; 2435 unsigned int i, len;
2441 2436
… …
2586 break; 2581 break;
2587 case 'Z': /* identify the terminal type */ 2582 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2583 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2584 break;
2590 case '<': /* turn off VT52 mode */ 2585 case '<': /* turn off VT52 mode */
2591 PrivMode (0, PrivMode_vt52); 2586 set_privmode (PrivMode_vt52, 0);
2592 break; 2587 break;
2593 case 'F': /* use special graphics character set */ 2588 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2589 case 'G': /* use regular character set */
2595 /* unimplemented */ 2590 /* unimplemented */
2596 break; 2591 break;
… …
2650 scr_forwardindex (); 2645 scr_forwardindex ();
2651 break; 2646 break;
2652#endif 2647#endif
2653 case '=': 2648 case '=':
2654 case '>': 2649 case '>':
2655 PrivMode ((ch == '='), PrivMode_aplKP); 2650 set_privmode (PrivMode_aplKP, ch == '=');
2656 break; 2651 break;
2657 2652
2658 case C1_40: 2653 case C1_40:
2659 cmd_getc (); 2654 cmd_getc ();
2660 break; 2655 break;
… …
2713 2708
2714 /* 8.3.106: RESET TO INITIAL STATE */ 2709 /* 8.3.106: RESET TO INITIAL STATE */
2715 case 'c': 2710 case 'c':
2716 mbstate.reset (); 2711 mbstate.reset ();
2717 scr_poweron (); 2712 scr_poweron ();
2718 scrollbar_show (1); 2713 scrollBar.show (1);
2719 break; 2714 break;
2720 2715
2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2716 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722 case 'n': 2717 case 'n':
2723 scr_charset_choose (2); 2718 scr_charset_choose (2);
… …
3529 break; 3524 break;
3530#endif 3525#endif
3531 3526
3532#if ENABLE_PERL 3527#if ENABLE_PERL
3533 case URxvt_perl: 3528 case URxvt_perl:
3534 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3529 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3535 ; // no responses yet
3536 break; 3530 break;
3537#endif 3531#endif
3538 } 3532 }
3539} 3533}
3540/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
… …
3563 { 3557 {
3564 if (mode == 'r') 3558 if (mode == 'r')
3565 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3559 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566 else 3560 else
3567 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3561 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568 PrivMode (state, bit); 3562 set_privmode (bit, state);
3569 } 3563 }
3570 3564
3571 return state; 3565 return state;
3572} 3566}
3573 3567
… …
3671 case 2: /* VT52 mode */ 3665 case 2: /* VT52 mode */
3672 /* oddball mode. should be set regardless of set/reset 3666 /* oddball mode. should be set regardless of set/reset
3673 * parameter. Return from VT52 mode with an ESC < from 3667 * parameter. Return from VT52 mode with an ESC < from
3674 * within VT52 mode 3668 * within VT52 mode
3675 */ 3669 */
3676 PrivMode (1, PrivMode_vt52); 3670 set_privmode (PrivMode_vt52, 1);
3677 break; 3671 break;
3678 case 3: /* 80/132 */ 3672 case 3: /* 80/132 */
3679 if (priv_modes & PrivMode_132OK) 3673 if (priv_modes & PrivMode_132OK)
3680 { 3674 {
3681 scr_poweron (); 3675 scr_poweron ();
… …
3699 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3701 break; 3695 break;
3702#ifdef scrollBar_esc 3696#ifdef scrollBar_esc
3703 case scrollBar_esc: 3697 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3698 if (scrollBar.map (state))
3705 { 3699 {
3706 resize_all_windows (0, 0, 0); 3700 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3701 scr_touch (true);
3708 } 3702 }
3709 break; 3703 break;

Diff Legend

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