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.406 by ayin, Thu Feb 14 23:53:05 2008 UTC vs.
Revision 1.417 by root, Mon Jul 21 16:51:31 2008 UTC

… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
297 } 297 }
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
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}
302 397
303void 398void
304rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
305{ 400{
306 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
… …
324 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
325 420
326 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
327 { 422 {
328 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
330 } 425 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
… …
546 } 641 }
547#endif 642#endif
548 643
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 645 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1; 647 unsigned int newlen = 1;
553#ifdef XK_KP_Home 648
554 static const KeySym keypadtrans[] = { 649 switch (translate_keypad (keysym, kp))
555 XK_KP_7, // XK_KP_Home 650 {
556 XK_KP_4, // XK_KP_Left 651#ifndef NO_BACKSPACE_KEY
557 XK_KP_8, // XK_KP_Up 652 case XK_BackSpace:
558 XK_KP_6, // XK_KP_Right 653 if (priv_modes & PrivMode_HaveBackSpace)
559 XK_KP_2, // XK_KP_Down 654 {
560#ifndef UNSHIFTED_SCROLLKEYS 655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 XK_KP_9, // XK_KP_Prior 656 ^ !!ctrl) ? '\b' : '\177';
562 XK_KP_3, // XK_KP_Next 657 kbuf[1] = '\0';
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 }; 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;
570 684
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
572 { 765 {
573 unsigned int index = keysym - XK_KP_Home; 766 int param = map_function_key (keysym);
574 keysym = kp ? keypadtrans[index] : XK_Home + index; 767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
575 } 771 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
583 switch (keysym)
584 {
585#ifndef NO_BACKSPACE_KEY
586 case XK_BackSpace:
587 if (priv_modes & PrivMode_HaveBackSpace)
588 {
589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
590 ^ !!ctrl) ? '\b' : '\177';
591 kbuf[1] = '\0';
592 }
593 else
594 strcpy (kbuf, rs[Rs_backspace_key]);
595 break; 772 break;
596#endif
597#ifndef NO_DELETE_KEY
598 case XK_Delete:
599 strcpy (kbuf, rs[Rs_delete_key]);
600 break;
601#endif
602 case XK_Tab:
603 if (shft)
604 strcpy (kbuf, "\033[Z");
605 else
606 {
607#ifdef CTRL_TAB_MAKES_META
608 if (ctrl)
609 meta = 1;
610#endif
611#ifdef MOD4_TAB_MAKES_META
612 if (ev.state & Mod4Mask)
613 meta = 1;
614#endif
615 newlen = 0;
616 }
617 break;
618
619 case XK_Up: /* "\033[A" */
620 case XK_Down: /* "\033[B" */
621 case XK_Right: /* "\033[C" */
622 case XK_Left: /* "\033[D" */
623 strcpy (kbuf, "\033[Z");
624 kbuf[2] = "DACB"[keysym - XK_Left];
625 /* do Shift first */
626 if (shft)
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 else if (ctrl)
629 {
630 kbuf[1] = 'O';
631 kbuf[2] = "dacb"[keysym - XK_Left];
632 }
633 else if (priv_modes & PrivMode_aplCUR)
634 kbuf[1] = 'O';
635 break;
636
637#ifndef UNSHIFTED_SCROLLKEYS
638 case XK_Prior:
639 strcpy (kbuf, "\033[5~");
640 break;
641 case XK_Next:
642 strcpy (kbuf, "\033[6~");
643 break;
644#endif
645 case XK_KP_Enter:
646 /* allow shift to override */
647 if (kp)
648 {
649 strcpy (kbuf, "\033OM");
650 break;
651 }
652
653 /* FALLTHROUGH */
654
655 case XK_Return:
656 if (priv_modes & PrivMode_LFNL)
657 {
658 kbuf[0] = '\015';
659 kbuf[1] = '\012';
660 kbuf[2] = '\0';
661 }
662 else
663 {
664 kbuf[0] = '\015';
665 kbuf[1] = '\0';
666 }
667 break;
668
669 case XK_KP_F1: /* "\033OP" */
670 case XK_KP_F2: /* "\033OQ" */
671 case XK_KP_F3: /* "\033OR" */
672 case XK_KP_F4: /* "\033OS" */
673 strcpy (kbuf, "\033OP");
674 kbuf[2] += (keysym - XK_KP_F1);
675 break;
676
677 case XK_KP_Multiply: /* "\033Oj" : "*" */
678 case XK_KP_Add: /* "\033Ok" : "+" */
679 case XK_KP_Separator: /* "\033Ol" : "," */
680 case XK_KP_Subtract: /* "\033Om" : "-" */
681 case XK_KP_Decimal: /* "\033On" : "." */
682 case XK_KP_Divide: /* "\033Oo" : "/" */
683 case XK_KP_0: /* "\033Op" : "0" */
684 case XK_KP_1: /* "\033Oq" : "1" */
685 case XK_KP_2: /* "\033Or" : "2" */
686 case XK_KP_3: /* "\033Os" : "3" */
687 case XK_KP_4: /* "\033Ot" : "4" */
688 case XK_KP_5: /* "\033Ou" : "5" */
689 case XK_KP_6: /* "\033Ov" : "6" */
690 case XK_KP_7: /* "\033Ow" : "7" */
691 case XK_KP_8: /* "\033Ox" : "8" */
692 case XK_KP_9: /* "\033Oy" : "9" */
693 /* allow shift to override */
694 if (kp)
695 {
696 strcpy (kbuf, "\033Oj");
697 kbuf[2] += (keysym - XK_KP_Multiply);
698 }
699 else
700 {
701 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
702 kbuf[1] = '\0';
703 }
704 break;
705
706 case XK_Find:
707 strcpy (kbuf, "\033[1~");
708 break;
709
710 case XK_Insert:
711 strcpy (kbuf, "\033[2~");
712 break;
713#ifdef DXK_Remove /* support for DEC remove like key */
714 case DXK_Remove:
715 /* FALLTHROUGH */
716#endif
717 case XK_Execute:
718 strcpy (kbuf, "\033[3~");
719 break;
720 case XK_Select:
721 strcpy (kbuf, "\033[4~");
722 break;
723 case XK_End:
724 strcpy (kbuf, KS_END);
725 break;
726 case XK_Home:
727 strcpy (kbuf, KS_HOME);
728 break;
729
730#define FKEY(n, fkey) \
731 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
732
733 case XK_F1: /* "\033[11~" */
734 case XK_F2: /* "\033[12~" */
735 case XK_F3: /* "\033[13~" */
736 case XK_F4: /* "\033[14~" */
737 case XK_F5: /* "\033[15~" */
738 FKEY (11, XK_F1);
739 break;
740 case XK_F6: /* "\033[17~" */
741 case XK_F7: /* "\033[18~" */
742 case XK_F8: /* "\033[19~" */
743 case XK_F9: /* "\033[20~" */
744 case XK_F10: /* "\033[21~" */
745 FKEY (17, XK_F6);
746 break;
747 case XK_F11: /* "\033[23~" */
748 case XK_F12: /* "\033[24~" */
749 case XK_F13: /* "\033[25~" */
750 case XK_F14: /* "\033[26~" */
751 FKEY (23, XK_F11);
752 break;
753 case XK_F15: /* "\033[28~" */
754 case XK_F16: /* "\033[29~" */
755 FKEY (28, XK_F15);
756 break;
757 case XK_Help: /* "\033[28~" */
758 FKEY (28, XK_Help);
759 break;
760 case XK_Menu: /* "\033[29~" */
761 FKEY (29, XK_Menu);
762 break;
763 case XK_F17: /* "\033[31~" */
764 case XK_F18: /* "\033[32~" */
765 case XK_F19: /* "\033[33~" */
766 case XK_F20: /* "\033[34~" */
767 case XK_F21: /* "\033[35~" */
768 case XK_F22: /* "\033[36~" */
769 case XK_F23: /* "\033[37~" */
770 case XK_F24: /* "\033[38~" */
771 case XK_F25: /* "\033[39~" */
772 case XK_F26: /* "\033[40~" */
773 case XK_F27: /* "\033[41~" */
774 case XK_F28: /* "\033[42~" */
775 case XK_F29: /* "\033[43~" */
776 case XK_F30: /* "\033[44~" */
777 case XK_F31: /* "\033[45~" */
778 case XK_F32: /* "\033[46~" */
779 case XK_F33: /* "\033[47~" */
780 case XK_F34: /* "\033[48~" */
781 case XK_F35: /* "\033[49~" */
782 FKEY (31, XK_F17);
783 break;
784#undef FKEY
785 default:
786 newlen = 0;
787 break;
788 } 773 }
789 774
790 if (newlen) 775 if (newlen)
791 len = strlen (kbuf); 776 len = strlen (kbuf);
792 777
793 /* 778 /*
794 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
795 */ 780 */
796#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1030 } 1015 }
1031 while (row < end_row); 1016 while (row < end_row);
1032 } 1017 }
1033 1018
1034 scr_refresh (); 1019 scr_refresh ();
1035 scrollbar_show (1); 1020 scrollBar.show (1);
1036#ifdef USE_XIM 1021#ifdef USE_XIM
1037 IMSendSpot (); 1022 IMSendSpot ();
1038#endif 1023#endif
1039 } 1024 }
1040 1025
… …
1551 ; 1536 ;
1552 1537
1553 if (scrollBar.state && ev.xany.window == scrollBar.win) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1554 { 1539 {
1555 scrollBar.state = STATE_IDLE; 1540 scrollBar.state = STATE_IDLE;
1556 scrollbar_show (0); 1541 scrollBar.show (0);
1557 } 1542 }
1558 } 1543 }
1559 break; 1544 break;
1560 1545
1561 case MotionNotify: 1546 case MotionNotify:
… …
1660 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1661 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1662 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1663 &unused_mask); 1648 &unused_mask);
1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1665 scrollbar_size ()); 1650 scrollBar.size ());
1666 want_refresh = 1; 1651 want_refresh = 1;
1667 scrollbar_show (1); 1652 scrollBar.show (1);
1668 } 1653 }
1669 break; 1654 break;
1670 } 1655 }
1671 1656
1672#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
… …
2025 } 2010 }
2026 2011
2027 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2031 2016
2032 scrollBar.state = STATE_MOTION; 2017 scrollBar.state = STATE_MOTION;
2033 break; 2018 break;
2034 2019
2035 case Button1: 2020 case Button1:
… …
2058 else 2043 else
2059 { 2044 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2046 (nrow
2062 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2063 / scrollbar_size ())); 2048 / scrollBar.size ()));
2064 } 2049 }
2065 2050
2066 break; 2051 break;
2067 } 2052 }
2068 } 2053 }
… …
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2067
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2069 {
2085 scrollBar.state = STATE_IDLE; 2070 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2071 scrollBar.show (0);
2087 } 2072 }
2088 2073
2089#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2091#endif 2076#endif
… …
2174 } 2159 }
2175 else 2160 else
2176# endif 2161# endif
2177 { 2162 {
2178 scr_page (v, i); 2163 scr_page (v, i);
2179 scrollbar_show (1); 2164 scrollBar.show (1);
2180 } 2165 }
2181 } 2166 }
2182 break; 2167 break;
2183#endif 2168#endif
2184 } 2169 }
… …
2194 wchar_t ch = NOCHAR; 2179 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2180 char *seq_begin; // remember start of esc-sequence here
2196 2181
2197 for (;;) 2182 for (;;)
2198 { 2183 {
2199 if (ch == NOCHAR) 2184 if (expect_false (ch == NOCHAR))
2200 { 2185 {
2201 seq_begin = cmdbuf_ptr; 2186 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2187 ch = next_char ();
2203 2188
2204 if (ch == NOCHAR) 2189 if (ch == NOCHAR)
2205 break; 2190 break;
2206 } 2191 }
2207 2192
2208 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2193 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2194 {
2210 if (!seen_input) 2195 if (expect_false (!seen_input))
2211 { 2196 {
2212 seen_input = 1; 2197 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2198 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2199 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2200 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2213 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2214 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2215
2231 for (;;) 2216 for (;;)
2232 { 2217 {
2233 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2218 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2219 break;
2235 2220
2236 *str++ = ch; 2221 *str++ = ch;
2237 2222
2238 if (ch == C0_LF || str >= eol) 2223 if (expect_false (ch == C0_LF || str >= eol))
2239 { 2224 {
2240 if (ch == C0_LF) 2225 if (ch == C0_LF)
2241 nlines++; 2226 nlines++;
2242 2227
2243 refresh_count++; 2228 refresh_count++;
… …
2325rxvt_term::next_char () NOTHROW 2310rxvt_term::next_char () NOTHROW
2326{ 2311{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2313 {
2329 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2316 return *cmdbuf_ptr++;
2332 2317
2333 wchar_t wc; 2318 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2320
… …
2339 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2325 break;
2341 } 2326 }
2342 2327
2343 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2344 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2345 2333
2346 // assume wchar == unicode 2334 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2349 } 2337 }
… …
2393/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2395FILE * 2383FILE *
2396rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2397{ 2385{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2387
2400 if (stream == NULL) 2388 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2390
2403 return stream; 2391 return stream;
… …
2414 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2415 */ 2403 */
2416void 2404void
2417rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2418{ 2406{
2419 int done; 2407 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2408
2422 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2423 return; 2410 return;
2424 2411
2425 /* 2412 /*
2426 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2427 * is received. 2414 * is received.
2428 */ 2415 */
2429 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2430 { 2417 {
2431 unsigned char buf[8]; 2418 unsigned char buf[8];
2432 unicode_t ch; 2419 unicode_t ch;
2433 unsigned int i, len; 2420 unsigned int i, len;
2434 2421
… …
2579 break; 2566 break;
2580 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2569 break;
2583 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
2585 break; 2572 break;
2586 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
2588 /* unimplemented */ 2575 /* unimplemented */
2589 break; 2576 break;
… …
2643 scr_forwardindex (); 2630 scr_forwardindex ();
2644 break; 2631 break;
2645#endif 2632#endif
2646 case '=': 2633 case '=':
2647 case '>': 2634 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2636 break;
2650 2637
2651 case C1_40: 2638 case C1_40:
2652 cmd_getc (); 2639 cmd_getc ();
2653 break; 2640 break;
… …
2706 2693
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
2708 case 'c': 2695 case 'c':
2709 mbstate.reset (); 2696 mbstate.reset ();
2710 scr_poweron (); 2697 scr_poweron ();
2711 scrollbar_show (1); 2698 scrollBar.show (1);
2712 break; 2699 break;
2713 2700
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2702 case 'n':
2716 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3556 { 3543 {
3557 if (mode == 'r') 3544 if (mode == 'r')
3558 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559 else 3546 else
3560 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561 PrivMode (state, bit); 3548 set_privmode (bit, state);
3562 } 3549 }
3563 3550
3564 return state; 3551 return state;
3565} 3552}
3566 3553
… …
3664 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3654 * within VT52 mode
3668 */ 3655 */
3669 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
3670 break; 3657 break;
3671 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
3672 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3673 { 3660 {
3674 scr_poweron (); 3661 scr_poweron ();
… …
3692 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3681 break;
3695#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
3696 case scrollBar_esc: 3683 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
3698 { 3685 {
3699 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3687 scr_touch (true);
3701 } 3688 }
3702 break; 3689 break;

Diff Legend

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