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.437 by sf-exg, Fri Jan 29 17:27:36 2010 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
… …
520 } 579 }
521 } 580 }
522 581
523#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
524 // ISO 14755 support 583 // ISO 14755 support
525 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
526 { 585 {
527 int hv; 586 int hv;
528 587
529 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
530 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
560 scr_overlay_off (); 619 scr_overlay_off ();
561# endif 620# endif
562 iso14755buf = 0; 621 iso14755buf = 0;
563 } 622 }
564 } 623 }
624 else if (option (Opt_iso14755) &&
565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
567 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
568 { 628 {
569 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
570# if ISO_14755 630# if ISO_14755
571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
582 } 642 }
583#endif 643#endif
584 644
585 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
586 { 646 {
587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
588 unsigned int newlen = 1; 648 unsigned int newlen = 1;
589 649
590 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:
591 { 766 {
592#ifndef NO_BACKSPACE_KEY 767 int param = map_function_key (keysym);
593 case XK_BackSpace: 768 if (param > 0)
594 if (priv_modes & PrivMode_HaveBackSpace) 769 sprintf (kbuf,"\033[%d~", param);
595 {
596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
597 ^ !!ctrl) ? '\b' : '\177';
598 kbuf[1] = '\0';
599 }
600 else 770 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; 771 newlen = 0;
794 break;
795 } 772 }
773 break;
774 }
796 775
797 if (newlen) 776 if (newlen)
798 len = strlen (kbuf); 777 len = strlen (kbuf);
799 778
800 /* 779 /*
801 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
802 */ 781 */
803#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
1037 } 1016 }
1038 while (row < end_row); 1017 while (row < end_row);
1039 } 1018 }
1040 1019
1041 scr_refresh (); 1020 scr_refresh ();
1042 scrollbar_show (1); 1021 scrollBar.show (1);
1043#ifdef USE_XIM 1022#ifdef USE_XIM
1044 IMSendSpot (); 1023 IMSendSpot ();
1045#endif 1024#endif
1046 } 1025 }
1047 1026
… …
1149 { 1128 {
1150 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than 1130 // 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 1131 // ones with high nice levels is a useful thing to do. It surely is is
1153 // 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.
1154 1136
1155 struct timespec ts = { 0, 0 }; 1137 struct timespec ts = { 0, 1000 };
1156 nanosleep (&ts, 0); 1138 nanosleep (&ts, 0);
1157 1139
1158 w.stop (); 1140 w.stop ();
1159 } 1141 }
1160 1142
… …
1210{ 1192{
1211 make_current (); 1193 make_current ();
1212 1194
1213 if (revents & ev::READ) 1195 if (revents & ev::READ)
1214 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1215 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1216 if (cmd_parse ()) 1198 cmd_parse ();
1217 break;
1218 1199
1219 if (revents & ev::WRITE) 1200 if (revents & ev::WRITE)
1220 pty_write (); 1201 pty_write ();
1221 1202
1222 refresh_check (); 1203 refresh_check ();
… …
1481 selection_property (ev.xproperty.window, ev.xproperty.atom); 1462 selection_property (ev.xproperty.window, ev.xproperty.atom);
1482 1463
1483 break; 1464 break;
1484 1465
1485 case SelectionClear: 1466 case SelectionClear:
1486 selection_clear (); 1467 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1487 break; 1468 break;
1488 1469
1489 case SelectionNotify: 1470 case SelectionNotify:
1490 if (selection_wait == Sel_normal) 1471 if (selection_wait == Sel_normal)
1491 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1472 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
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)
… …
1704#endif 1685#endif
1705 1686
1706 refresh_check (); 1687 refresh_check ();
1707} 1688}
1708 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
1709void 1706void
1710rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1711{ 1708{
1712 if (!focus) 1709 if (!focus)
1713 { 1710 {
1714 focus = 1; 1711 focus = 1;
1715 want_refresh = 1; 1712 want_refresh = 1;
1716
1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1718 1713
1719#if USE_XIM 1714#if USE_XIM
1720 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1721 { 1716 {
1722 IMSetPosition (); 1717 IMSetPosition ();
… …
1734 scr_recolour (); 1729 scr_recolour ();
1735 } 1730 }
1736#endif 1731#endif
1737#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell)) 1733 if (option (Opt_urgentOnBell))
1739 { 1734 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 1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 } 1738 }
1748} 1739}
1749 1740
1750void 1741void
1751rxvt_term::focus_out () 1742rxvt_term::focus_out ()
… …
1753 if (focus) 1744 if (focus)
1754 { 1745 {
1755 focus = 0; 1746 focus = 0;
1756 want_refresh = 1; 1747 want_refresh = 1;
1757 1748
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1759 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1760#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1761 if (iso14755buf) 1754 if (iso14755buf)
1762 { 1755 {
1763 iso14755buf = 0; 1756 iso14755buf = 0;
1764# if ISO_14755 1757# if ISO_14755
… …
1781 { 1774 {
1782 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1783 scr_recolour (); 1776 scr_recolour ();
1784 } 1777 }
1785#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786 } 1781 }
1787} 1782}
1788 1783
1789void 1784void
1790rxvt_term::update_fade_color (unsigned int idx) 1785rxvt_term::update_fade_color (unsigned int idx)
… …
2032 } 2027 }
2033 2028
2034 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2035 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2038 2033
2039 scrollBar.state = STATE_MOTION; 2034 scrollBar.state = STATE_MOTION;
2040 break; 2035 break;
2041 2036
2042 case Button1: 2037 case Button1:
… …
2065 else 2060 else
2066 { 2061 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2063 (nrow
2069 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2070 / scrollbar_size ())); 2065 / scrollBar.size ()));
2071 } 2066 }
2072 2067
2073 break; 2068 break;
2074 } 2069 }
2075 } 2070 }
… …
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2084
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2091 { 2086 {
2092 scrollBar.state = STATE_IDLE; 2087 scrollBar.state = STATE_IDLE;
2093 scrollbar_show (0); 2088 scrollBar.show (0);
2094 } 2089 }
2095 2090
2096#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2098#endif 2093#endif
… …
2181 } 2176 }
2182 else 2177 else
2183# endif 2178# endif
2184 { 2179 {
2185 scr_page (v, i); 2180 scr_page (v, i);
2186 scrollbar_show (1); 2181 scrollBar.show (1);
2187 } 2182 }
2188 } 2183 }
2189 break; 2184 break;
2190#endif 2185#endif
2191 } 2186 }
2192 } 2187 }
2193} 2188}
2194 2189
2195/*}}} */ 2190/*}}} */
2196 2191
2197bool 2192void
2198rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2199{ 2194{
2200 bool flag = false;
2201 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2202 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2203 2197
2204 for (;;) 2198 for (;;)
2205 { 2199 {
2206 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2207 { 2201 {
2208 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2209 ch = next_char (); 2203 ch = next_char ();
2210 2204
2211 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2212 break; 2206 break;
2213 } 2207 }
2214 2208
2215 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))
2216 { 2210 {
2217 if (!seen_input) 2211 if (expect_false (!seen_input))
2218 { 2212 {
2219 seen_input = 1; 2213 seen_input = 1;
2220 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2221 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2222 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
… …
2235 wchar_t *str = buf; 2229 wchar_t *str = buf;
2236 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2237 2231
2238 for (;;) 2232 for (;;)
2239 { 2233 {
2240 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)))
2241 break; 2235 break;
2242 2236
2243 *str++ = ch; 2237 *str++ = ch;
2244 2238
2245 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2246 { 2240 {
2247 if (ch == C0_LF) 2241 if (ch == C0_LF)
2248 nlines++; 2242 nlines++;
2249 2243
2250 refresh_count++; 2244 refresh_count++;
… …
2299 * 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.
2300 * if skipScroll is enabled. 2294 * if skipScroll is enabled.
2301 */ 2295 */
2302 if (refreshnow) 2296 if (refreshnow)
2303 { 2297 {
2304 flag = true;
2305 scr_refresh (); 2298 scr_refresh ();
2306 want_refresh = 1; 2299 want_refresh = 1;
2307 } 2300 }
2308
2309 } 2301 }
2310 else 2302 else
2311 { 2303 {
2312 try 2304 try
2313 { 2305 {
… …
2321 } 2313 }
2322 2314
2323 ch = NOCHAR; 2315 ch = NOCHAR;
2324 } 2316 }
2325 } 2317 }
2326
2327 return flag;
2328} 2318}
2329 2319
2330// read the next character 2320// read the next character
2331wchar_t 2321wchar_t
2332rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2333{ 2323{
2334 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2335 { 2325 {
2336 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2337 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2338 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2339 2329
2340 wchar_t wc; 2330 wchar_t wc;
2341 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);
2342 2332
… …
2346 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2347 break; 2337 break;
2348 } 2338 }
2349 2339
2350 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2351 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 }
2352 2345
2353 // assume wchar == unicode 2346 // assume wchar == unicode
2354 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2355 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2356 } 2349 }
… …
2400/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2401#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2402FILE * 2395FILE *
2403rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2404{ 2397{
2405 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2406 2399
2407 if (stream == NULL) 2400 if (stream == NULL)
2408 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2409 2402
2410 return stream; 2403 return stream;
… …
2421 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2422 */ 2415 */
2423void 2416void
2424rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2425{ 2418{
2426 int done; 2419 FILE *fd = popen_printer ();
2427 FILE *fd;
2428 2420
2429 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2430 return; 2422 return;
2431 2423
2432 /* 2424 /*
2433 * 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
2434 * is received. 2426 * is received.
2435 */ 2427 */
2436 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2437 { 2429 {
2438 unsigned char buf[8]; 2430 unsigned char buf[8];
2439 unicode_t ch; 2431 unicode_t ch;
2440 unsigned int i, len; 2432 unsigned int i, len;
2441 2433
… …
2586 break; 2578 break;
2587 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2581 break;
2590 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
2591 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
2592 break; 2584 break;
2593 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
2595 /* unimplemented */ 2587 /* unimplemented */
2596 break; 2588 break;
… …
2650 scr_forwardindex (); 2642 scr_forwardindex ();
2651 break; 2643 break;
2652#endif 2644#endif
2653 case '=': 2645 case '=':
2654 case '>': 2646 case '>':
2655 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
2656 break; 2648 break;
2657 2649
2658 case C1_40: 2650 case C1_40:
2659 cmd_getc (); 2651 cmd_getc ();
2660 break; 2652 break;
… …
2699 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2700 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2701 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2702 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2703 2695
2704 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2705 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2706 process_csi_seq (); 2698 process_csi_seq ();
2707 break; 2699 break;
2708 2700
2709 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2710 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
2711 process_osc_seq (); 2703 process_osc_seq ();
2712 break; 2704 break;
2713 2705
2714 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2715 case 'c': 2707 case 'c':
2716 mbstate.reset (); 2708 mbstate.reset ();
2717 scr_poweron (); 2709 scr_poweron ();
2718 scrollbar_show (1); 2710 scrollBar.show (1);
2719 break; 2711 break;
2720 2712
2721 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2722 case 'n': 2714 case 'n':
2723 scr_charset_choose (2); 2715 scr_charset_choose (2);
… …
2774 2766
2775 nargs = 0; 2767 nargs = 0;
2776 2768
2777 priv = 0; 2769 priv = 0;
2778 ch = cmd_getc (); 2770 ch = cmd_getc ();
2779 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2780 { 2772 {
2781 /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
2782 priv = ch; 2774 priv = ch;
2783 ch = cmd_getc (); 2775 ch = cmd_getc ();
2784 } 2776 }
2785 2777
2786 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
2840 2832
2841 case '?': 2833 case '?':
2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2843 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
2844 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);
2845 } 2849 }
2850 break;
2851 }
2852
2846 return; 2853 return;
2847 } 2854 }
2848 2855
2849 switch (ch) 2856 switch (ch)
2850 { 2857 {
… …
3279 3286
3280/* 3287/*
3281 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3282 */ 3289 */
3283void 3290void
3284rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3285{ 3292{
3286 int color; 3293 int color;
3287 char *buf, *name; 3294 char *buf, *name;
3288 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3289 int saveop = op; 3296 int saveop = op;
… …
3330 3337
3331 XFree (value); 3338 XFree (value);
3332 } 3339 }
3333 else 3340 else
3334 { 3341 {
3335 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3336 3343
3337 if (eq) 3344 if (eq)
3338 { 3345 {
3339 *eq = 0; 3346 *eq = 0;
3340 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
… …
3396 break; 3403 break;
3397 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3398 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3399 break; 3406 break;
3400#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3401#if ENABLE_TRANSPARENCY 3411#if ENABLE_TRANSPARENCY
3402 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3403 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3404 { 3414 {
3405 bool changed = false; 3415 bool changed = false;
… …
3420 case Rxvt_Pixmap: 3430 case Rxvt_Pixmap:
3421 if (!strcmp (str, "?")) 3431 if (!strcmp (str, "?"))
3422 { 3432 {
3423 char str[256]; 3433 char str[256];
3424 3434
3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3435 sprintf (str, "[%dx%d+%d+%d]",
3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3436 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3437 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST); 3438 process_xterm_seq (XTerm_title, str, CHAR_ST);
3429 } 3439 }
3430 else 3440 else
… …
3529 break; 3539 break;
3530#endif 3540#endif
3531 3541
3532#if ENABLE_PERL 3542#if ENABLE_PERL
3533 case URxvt_perl: 3543 case URxvt_perl:
3534 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));
3535 ; // no responses yet
3536 break; 3545 break;
3537#endif 3546#endif
3538 } 3547 }
3539} 3548}
3540/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
… …
3563 { 3572 {
3564 if (mode == 'r') 3573 if (mode == 'r')
3565 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3566 else 3575 else
3567 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3568 PrivMode (state, bit); 3577 set_privmode (bit, state);
3569 } 3578 }
3570 3579
3571 return state; 3580 return state;
3572} 3581}
3573 3582
… …
3581 static const struct 3590 static const struct
3582 { 3591 {
3583 const int argval; 3592 const int argval;
3584 const unsigned long bit; 3593 const unsigned long bit;
3585 } argtopriv[] = { 3594 } argtopriv[] = {
3586 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
3587 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3588 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
3589 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
3590 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
3591 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
3592 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
3593 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
3594 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3595 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
3596 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3597#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
3598 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
3599#endif 3609#endif
3600 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
3601 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
3602 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
3603 // 45 margin bell NYI 3614 // 45 margin bell NYI
3604 // 46 start logging 3615 // 46 start logging
3605 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
3606 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3607#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
3608 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
3609#endif 3620#endif
3610 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
3611 { 1002, PrivMode_MouseBtnEvent }, 3622 { 1002, PrivMode_MouseBtnEvent },
3612 { 1003, PrivMode_MouseAnyEvent }, 3623 { 1003, PrivMode_MouseAnyEvent },
3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3652 3663
3653 scr_touch (true); 3664 scr_touch (true);
3654 break; 3665 break;
3655#endif 3666#endif
3656 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3657 case 1049:
3658 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3659 if (mode == 0) 3669 if (mode == 0)
3660 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3661 else if (mode == 1) 3671 else if (mode == 1)
3662 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
… …
3671 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
3672 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
3673 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
3674 * within VT52 mode 3684 * within VT52 mode
3675 */ 3685 */
3676 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
3677 break; 3687 break;
3678 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
3679 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3683 }
3684 break; 3691 break;
3685 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
3686 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
3687 break; 3694 break;
3688 case 5: /* reverse video */ 3695 case 5: /* reverse video */
… …
3699 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3701 break; 3708 break;
3702#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
3703 case scrollBar_esc: 3710 case scrollBar_esc:
3704 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
3705 { 3712 {
3706 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
3707 scr_touch (true); 3714 scr_touch (true);
3708 } 3715 }
3709 break; 3716 break;
… …
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3731 vt_emask_mouse = PointerMotionMask; 3738 vt_emask_mouse = PointerMotionMask;
3732 } 3739 }
3733 else 3740 else
3734 vt_emask_mouse = NoEventMask; 3741 vt_emask_mouse = NoEventMask;
3742
3735 vt_select_input (); 3743 vt_select_input ();
3736 break; 3744 break;
3737 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3738 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
3739 break; 3747 break;
3740 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3741 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3742 break; 3750 break;
3743 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3744 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3753 if (!state)
3746 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
3747 scr_change_screen (state); 3756 scr_change_screen (state);
3748 break; 3757 break;
3749 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
3750 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3751 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3752 if (current_screen != PRIMARY) 3766 if (state)
3753 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3754 break; 3770 break;
3755 default: 3771 default:
3756 break; 3772 break;
3757 } 3773 }
3758 } 3774 }

Diff Legend

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