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.407 by ayin, Fri Feb 15 10:56:29 2008 UTC vs.
Revision 1.435 by sf-exg, Wed Jan 6 12:10:44 2010 UTC

… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 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}
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;
307 KeySym keysym; 402 KeySym keysym;
… …
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
… …
484 } 579 }
485 } 580 }
486 581
487#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 583 // ISO 14755 support
489 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 585 {
491 int hv; 586 int hv;
492 587
493 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 619 scr_overlay_off ();
525# endif 620# endif
526 iso14755buf = 0; 621 iso14755buf = 0;
527 } 622 }
528 } 623 }
624 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
532 { 628 {
533 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 630# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 642 }
547#endif 643#endif
548 644
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 646 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1; 648 unsigned int newlen = 1;
553#ifdef XK_KP_Home 649
554 static const KeySym keypadtrans[] = { 650 switch (translate_keypad (keysym, kp))
555 XK_KP_7, // XK_KP_Home 651 {
556 XK_KP_4, // XK_KP_Left 652#ifndef NO_BACKSPACE_KEY
557 XK_KP_8, // XK_KP_Up 653 case XK_BackSpace:
558 XK_KP_6, // XK_KP_Right 654 if (priv_modes & PrivMode_HaveBackSpace)
559 XK_KP_2, // XK_KP_Down 655 {
560#ifndef UNSHIFTED_SCROLLKEYS 656 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 XK_KP_9, // XK_KP_Prior 657 ^ !!ctrl) ? '\b' : '\177';
562 XK_KP_3, // XK_KP_Next 658 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 }; 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;
570 685
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
572 { 766 {
573 unsigned int index = keysym - XK_KP_Home; 767 int param = map_function_key (keysym);
574 keysym = kp ? keypadtrans[index] : XK_Home + index; 768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
771 newlen = 0;
575 } 772 }
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; 773 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 } 774 }
789 775
790 if (newlen) 776 if (newlen)
791 len = strlen (kbuf); 777 len = strlen (kbuf);
792 778
793 /* 779 /*
794 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
795 */ 781 */
796#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
1030 } 1016 }
1031 while (row < end_row); 1017 while (row < end_row);
1032 } 1018 }
1033 1019
1034 scr_refresh (); 1020 scr_refresh ();
1035 scrollbar_show (1); 1021 scrollBar.show (1);
1036#ifdef USE_XIM 1022#ifdef USE_XIM
1037 IMSendSpot (); 1023 IMSendSpot ();
1038#endif 1024#endif
1039 } 1025 }
1040 1026
… …
1142 { 1128 {
1143 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1130 // that giving a process calling sched_yield () less cpu time than
1145 // 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
1146 // 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.
1147 1136
1148 struct timespec ts = { 0, 0 }; 1137 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1138 nanosleep (&ts, 0);
1150 1139
1151 w.stop (); 1140 w.stop ();
1152 } 1141 }
1153 1142
… …
1203{ 1192{
1204 make_current (); 1193 make_current ();
1205 1194
1206 if (revents & ev::READ) 1195 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1198 cmd_parse ();
1210 break;
1211 1199
1212 if (revents & ev::WRITE) 1200 if (revents & ev::WRITE)
1213 pty_write (); 1201 pty_write ();
1214 1202
1215 refresh_check (); 1203 refresh_check ();
… …
1551 ; 1539 ;
1552 1540
1553 if (scrollBar.state && ev.xany.window == scrollBar.win) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1554 { 1542 {
1555 scrollBar.state = STATE_IDLE; 1543 scrollBar.state = STATE_IDLE;
1556 scrollbar_show (0); 1544 scrollBar.show (0);
1557 } 1545 }
1558 } 1546 }
1559 break; 1547 break;
1560 1548
1561 case MotionNotify: 1549 case MotionNotify:
… …
1660 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1661 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1662 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1663 &unused_mask); 1651 &unused_mask);
1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1665 scrollbar_size ()); 1653 scrollBar.size ());
1666 want_refresh = 1; 1654 want_refresh = 1;
1667 scrollbar_show (1); 1655 scrollBar.show (1);
1668 } 1656 }
1669 break; 1657 break;
1670 } 1658 }
1671 1659
1672#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
… …
1697#endif 1685#endif
1698 1686
1699 refresh_check (); 1687 refresh_check ();
1700} 1688}
1701 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
1702void 1706void
1703rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1704{ 1708{
1705 if (!focus) 1709 if (!focus)
1706 { 1710 {
1707 focus = 1; 1711 focus = 1;
1708 want_refresh = 1; 1712 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1713
1712#if USE_XIM 1714#if USE_XIM
1713 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1714 { 1716 {
1715 IMSetPosition (); 1717 IMSetPosition ();
… …
1727 scr_recolour (); 1729 scr_recolour ();
1728 } 1730 }
1729#endif 1731#endif
1730#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell)) 1733 if (option (Opt_urgentOnBell))
1732 { 1734 set_urgency (0);
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif 1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1740 } 1738 }
1741} 1739}
1742 1740
1743void 1741void
1744rxvt_term::focus_out () 1742rxvt_term::focus_out ()
… …
1746 if (focus) 1744 if (focus)
1747 { 1745 {
1748 focus = 0; 1746 focus = 0;
1749 want_refresh = 1; 1747 want_refresh = 1;
1750 1748
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1752 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1753#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1754 if (iso14755buf) 1754 if (iso14755buf)
1755 { 1755 {
1756 iso14755buf = 0; 1756 iso14755buf = 0;
1757# if ISO_14755 1757# if ISO_14755
… …
1774 { 1774 {
1775 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1776 scr_recolour ();
1777 } 1777 }
1778#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1781 }
1780} 1782}
1781 1783
1782void 1784void
1783rxvt_term::update_fade_color (unsigned int idx) 1785rxvt_term::update_fade_color (unsigned int idx)
… …
2025 } 2027 }
2026 2028
2027 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2031 2033
2032 scrollBar.state = STATE_MOTION; 2034 scrollBar.state = STATE_MOTION;
2033 break; 2035 break;
2034 2036
2035 case Button1: 2037 case Button1:
… …
2058 else 2060 else
2059 { 2061 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2063 (nrow
2062 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2063 / scrollbar_size ())); 2065 / scrollBar.size ()));
2064 } 2066 }
2065 2067
2066 break; 2068 break;
2067 } 2069 }
2068 } 2070 }
… …
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2084
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2086 {
2085 scrollBar.state = STATE_IDLE; 2087 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2088 scrollBar.show (0);
2087 } 2089 }
2088 2090
2089#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2091#endif 2093#endif
… …
2174 } 2176 }
2175 else 2177 else
2176# endif 2178# endif
2177 { 2179 {
2178 scr_page (v, i); 2180 scr_page (v, i);
2179 scrollbar_show (1); 2181 scrollBar.show (1);
2180 } 2182 }
2181 } 2183 }
2182 break; 2184 break;
2183#endif 2185#endif
2184 } 2186 }
2185 } 2187 }
2186} 2188}
2187 2189
2188/*}}} */ 2190/*}}} */
2189 2191
2190bool 2192void
2191rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2192{ 2194{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2196 2197
2197 for (;;) 2198 for (;;)
2198 { 2199 {
2199 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2200 { 2201 {
2201 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2203 ch = next_char ();
2203 2204
2204 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2205 break; 2206 break;
2206 } 2207 }
2207 2208
2208 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))
2209 { 2210 {
2210 if (!seen_input) 2211 if (expect_false (!seen_input))
2211 { 2212 {
2212 seen_input = 1; 2213 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2229 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2231
2231 for (;;) 2232 for (;;)
2232 { 2233 {
2233 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)))
2234 break; 2235 break;
2235 2236
2236 *str++ = ch; 2237 *str++ = ch;
2237 2238
2238 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2239 { 2240 {
2240 if (ch == C0_LF) 2241 if (ch == C0_LF)
2241 nlines++; 2242 nlines++;
2242 2243
2243 refresh_count++; 2244 refresh_count++;
… …
2292 * 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.
2293 * if skipScroll is enabled. 2294 * if skipScroll is enabled.
2294 */ 2295 */
2295 if (refreshnow) 2296 if (refreshnow)
2296 { 2297 {
2297 flag = true;
2298 scr_refresh (); 2298 scr_refresh ();
2299 want_refresh = 1; 2299 want_refresh = 1;
2300 } 2300 }
2301
2302 } 2301 }
2303 else 2302 else
2304 { 2303 {
2305 try 2304 try
2306 { 2305 {
… …
2314 } 2313 }
2315 2314
2316 ch = NOCHAR; 2315 ch = NOCHAR;
2317 } 2316 }
2318 } 2317 }
2319
2320 return flag;
2321} 2318}
2322 2319
2323// read the next character 2320// read the next character
2324wchar_t 2321wchar_t
2325rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2326{ 2323{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2325 {
2329 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2332 2329
2333 wchar_t wc; 2330 wchar_t wc;
2334 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);
2335 2332
… …
2339 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2337 break;
2341 } 2338 }
2342 2339
2343 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2344 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 }
2345 2345
2346 // assume wchar == unicode 2346 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2349 } 2349 }
… …
2393/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2395FILE * 2395FILE *
2396rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2397{ 2397{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2399
2400 if (stream == NULL) 2400 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2402
2403 return stream; 2403 return stream;
… …
2414 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2415 */ 2415 */
2416void 2416void
2417rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2418{ 2418{
2419 int done; 2419 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2420
2422 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2423 return; 2422 return;
2424 2423
2425 /* 2424 /*
2426 * 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
2427 * is received. 2426 * is received.
2428 */ 2427 */
2429 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2430 { 2429 {
2431 unsigned char buf[8]; 2430 unsigned char buf[8];
2432 unicode_t ch; 2431 unicode_t ch;
2433 unsigned int i, len; 2432 unsigned int i, len;
2434 2433
… …
2579 break; 2578 break;
2580 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2581 break;
2583 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
2585 break; 2584 break;
2586 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
2588 /* unimplemented */ 2587 /* unimplemented */
2589 break; 2588 break;
… …
2643 scr_forwardindex (); 2642 scr_forwardindex ();
2644 break; 2643 break;
2645#endif 2644#endif
2646 case '=': 2645 case '=':
2647 case '>': 2646 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2648 break;
2650 2649
2651 case C1_40: 2650 case C1_40:
2652 cmd_getc (); 2651 cmd_getc ();
2653 break; 2652 break;
… …
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2696 2695
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2698 process_csi_seq ();
2700 break; 2699 break;
2701 2700
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2703 process_osc_seq ();
2705 break; 2704 break;
2706 2705
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2707 case 'c':
2709 mbstate.reset (); 2708 mbstate.reset ();
2710 scr_poweron (); 2709 scr_poweron ();
2711 scrollbar_show (1); 2710 scrollBar.show (1);
2712 break; 2711 break;
2713 2712
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2714 case 'n':
2716 scr_charset_choose (2); 2715 scr_charset_choose (2);
… …
2767 2766
2768 nargs = 0; 2767 nargs = 0;
2769 2768
2770 priv = 0; 2769 priv = 0;
2771 ch = cmd_getc (); 2770 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2772 {
2774 /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2774 priv = ch;
2776 ch = cmd_getc (); 2775 ch = cmd_getc ();
2777 } 2776 }
2778 2777
2779 /* read any numerical arguments */ 2778 /* read any numerical arguments */
… …
2833 2832
2834 case '?': 2833 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
2837 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);
2838 } 2849 }
2850 break;
2851 }
2852
2839 return; 2853 return;
2840 } 2854 }
2841 2855
2842 switch (ch) 2856 switch (ch)
2843 { 2857 {
… …
3272 3286
3273/* 3287/*
3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3275 */ 3289 */
3276void 3290void
3277rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3278{ 3292{
3279 int color; 3293 int color;
3280 char *buf, *name; 3294 char *buf, *name;
3281 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3282 int saveop = op; 3296 int saveop = op;
… …
3323 3337
3324 XFree (value); 3338 XFree (value);
3325 } 3339 }
3326 else 3340 else
3327 { 3341 {
3328 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3329 3343
3330 if (eq) 3344 if (eq)
3331 { 3345 {
3332 *eq = 0; 3346 *eq = 0;
3333 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
… …
3389 break; 3403 break;
3390 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3391 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3392 break; 3406 break;
3393#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3394#if ENABLE_TRANSPARENCY 3411#if ENABLE_TRANSPARENCY
3395 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3396 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3397 { 3414 {
3398 bool changed = false; 3415 bool changed = false;
… …
3522 break; 3539 break;
3523#endif 3540#endif
3524 3541
3525#if ENABLE_PERL 3542#if ENABLE_PERL
3526 case URxvt_perl: 3543 case URxvt_perl:
3527 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));
3528 ; // no responses yet
3529 break; 3545 break;
3530#endif 3546#endif
3531 } 3547 }
3532} 3548}
3533/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
… …
3556 { 3572 {
3557 if (mode == 'r') 3573 if (mode == 'r')
3558 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559 else 3575 else
3560 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561 PrivMode (state, bit); 3577 set_privmode (bit, state);
3562 } 3578 }
3563 3579
3564 return state; 3580 return state;
3565} 3581}
3566 3582
… …
3574 static const struct 3590 static const struct
3575 { 3591 {
3576 const int argval; 3592 const int argval;
3577 const unsigned long bit; 3593 const unsigned long bit;
3578 } argtopriv[] = { 3594 } argtopriv[] = {
3579 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
3580 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3581 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
3582 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
3583 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
3584 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
3585 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
3586 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
3587 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3588 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
3589 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3590#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
3591 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
3592#endif 3609#endif
3593 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
3594 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
3595 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
3596 // 45 margin bell NYI 3614 // 45 margin bell NYI
3597 // 46 start logging 3615 // 46 start logging
3598 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
3599 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3600#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
3601 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
3602#endif 3620#endif
3603 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
3604 { 1002, PrivMode_MouseBtnEvent }, 3622 { 1002, PrivMode_MouseBtnEvent },
3605 { 1003, PrivMode_MouseAnyEvent }, 3623 { 1003, PrivMode_MouseAnyEvent },
3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3645 3663
3646 scr_touch (true); 3664 scr_touch (true);
3647 break; 3665 break;
3648#endif 3666#endif
3649 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3650 case 1049:
3651 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 3669 if (mode == 0)
3653 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3654 else if (mode == 1) 3671 else if (mode == 1)
3655 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
… …
3664 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3684 * within VT52 mode
3668 */ 3685 */
3669 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
3670 break; 3687 break;
3671 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
3672 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3676 }
3677 break; 3691 break;
3678 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
3680 break; 3694 break;
3681 case 5: /* reverse video */ 3695 case 5: /* reverse video */
… …
3692 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3708 break;
3695#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
3696 case scrollBar_esc: 3710 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
3698 { 3712 {
3699 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3714 scr_touch (true);
3701 } 3715 }
3702 break; 3716 break;
… …
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask; 3738 vt_emask_mouse = PointerMotionMask;
3725 } 3739 }
3726 else 3740 else
3727 vt_emask_mouse = NoEventMask; 3741 vt_emask_mouse = NoEventMask;
3742
3728 vt_select_input (); 3743 vt_select_input ();
3729 break; 3744 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3747 break;
3733 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3734 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3735 break; 3750 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3753 if (!state)
3739 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
3740 scr_change_screen (state); 3756 scr_change_screen (state);
3741 break; 3757 break;
3742 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
3743 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3744 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3766 if (state)
3746 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3747 break; 3770 break;
3748 default: 3771 default:
3749 break; 3772 break;
3750 } 3773 }
3751 } 3774 }

Diff Legend

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