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.526 by root, Fri Nov 30 07:19:09 2012 UTC vs.
Revision 1.548 by sf-exg, Tue Apr 29 13:10:06 2014 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
400 break; 400 break;
401 } 401 }
402 return param; 402 return param;
403} 403}
404 404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
405void ecb_cold 414void ecb_cold
406rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
407{ 416{
408 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
409 KeySym keysym; 418 KeySym keysym;
410 int valid_keysym; 419 int valid_keysym;
411 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
412 422
413#if ISO_14755 423#if ISO_14755
414 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
415 return; 425 return;
416#endif 426#endif
… …
486 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
487 } 497 }
488 498
489 if (valid_keysym) 499 if (valid_keysym)
490 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
491#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
492 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
493 return; 710 return;
494#endif 711#endif
495 712
496 if (saveLines) 713 if (saveLines)
497 { 714 {
… …
510#endif 727#endif
511 max_it (lnsppg, 1); 728 max_it (lnsppg, 1);
512 729
513 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
514 { 731 {
515 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
516 return; 733 return;
517 } 734 }
518 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
519 { 736 {
520 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
521 return; 738 return;
522 } 739 }
523 } 740 }
524#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
525 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
526 { 743 {
527 if (keysym == XK_Up) 744 if (keysym == XK_Up)
528 { 745 {
529 scr_page (UP, 1); 746 scr_page (1);
530 return; 747 return;
531 } 748 }
532 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
533 { 750 {
534 scr_page (DN, 1); 751 scr_page (-1);
535 return; 752 return;
536 } 753 }
537 } 754 }
538#endif 755#endif
539#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
540 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
541 { 758 {
542 if (keysym == XK_Home) 759 if (keysym == XK_Home)
543 { 760 {
544 scr_move_to (0, 1); 761 scr_changeview (top_row);
545 return; 762 return;
546 } 763 }
547 else if (keysym == XK_End) 764 else if (keysym == XK_End)
548 { 765 {
549 scr_move_to (1, 1); 766 scr_changeview (0);
550 return; 767 return;
551 } 768 }
552 } 769 }
553#endif 770#endif
554 } 771 }
… …
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 return; 794 return;
578#endif 795#endif
579 } 796 }
580 } 797 }
798 }
799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
581 } 813 }
582 814
583#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
584 // ISO 14755 support 816 // ISO 14755 support
585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
640 { 872 {
641 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
642 return; 874 return;
643 } 875 }
644#endif 876#endif
645
646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
647 {
648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
649 unsigned int newlen = 1;
650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
691
692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
772 {
773 int param = map_function_key (keysym);
774 if (param > 0)
775 sprintf (kbuf,"\033[%d~", param);
776 else
777 newlen = 0;
778 }
779 break;
780 }
781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
800 * Pass meta for all function keys, if 'meta' option set
801 */
802#ifdef META8_OPTION
803 if (meta && (meta_char == 0x80))
804 kbuf[len - 1] |= 0x80;
805#endif
806 }
807
808 }
809 else if (ctrl && keysym == XK_minus)
810 {
811 len = 1;
812 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
813 }
814 else if (keysym == XK_ISO_Left_Tab)
815 {
816 strcpy (kbuf, "\033[Z");
817 len = 3;
818 }
819 else
820 {
821#ifdef META8_OPTION
822 /* set 8-bit on */
823 if (meta && (meta_char == 0x80))
824 {
825 char *ch;
826
827 for (ch = kbuf; ch < kbuf + len; ch++)
828 *ch |= 0x80;
829
830 meta = 0;
831 }
832#endif
833 /* nil */ ;
834 }
835 } 877 }
836
837 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
838 return;
839 878
840 if (len <= 0) 879 if (len <= 0)
841 return; /* not mapped */ 880 return; /* not mapped */
842 881
843 if (option (Opt_scrollTtyKeypress))
844 if (view_start)
845 {
846 view_start = 0;
847 want_refresh = 1;
848 }
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
862} 883}
863 884
864void ecb_cold 885void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
866{ 887{
… …
941void 962void
942rxvt_term::flush () 963rxvt_term::flush ()
943{ 964{
944 flush_ev.stop (); 965 flush_ev.stop ();
945 966
946#ifdef HAVE_BG_PIXMAP 967#ifdef HAVE_IMG
947 if (bg_flags & BG_NEEDS_REFRESH) 968 if (bg_flags & BG_NEEDS_REFRESH)
948 { 969 {
949 bg_flags &= ~BG_NEEDS_REFRESH; 970 bg_flags &= ~BG_NEEDS_REFRESH;
950 scr_touch (false); 971 scr_touch (false);
951 } 972 }
… …
1077 1098
1078#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1079void 1100void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1102{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1083 { 1104 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1106 want_refresh = 1;
1086 refresh_check (); 1107 refresh_check ();
1087 } 1108 }
… …
1092 1113
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1115void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1117{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1118 if (scr_page (mouse_slip_wheel_speed))
1098 { 1119 {
1099 want_refresh = 1; 1120 want_refresh = 1;
1100 refresh_check (); 1121 refresh_check ();
1101 } 1122 }
1102 1123
… …
1472 bool moved = false; 1493 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP 1494#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ()) 1495 if (bg_window_position_sensitive ())
1475 { 1496 {
1476 want_position_change = true; 1497 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID)) 1498 if (bg_img == 0)
1478 moved = true; 1499 moved = true;
1479 } 1500 }
1480#endif 1501#endif
1481 1502
1482 if (want_position_change) 1503 if (want_position_change)
… …
1529 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1530 break; 1551 break;
1531 1552
1532 case MapNotify: 1553 case MapNotify:
1533#ifdef HAVE_BG_PIXMAP 1554#ifdef HAVE_BG_PIXMAP
1534 /* This is needed specifically to fix the case of no window manager or a 1555 // This is needed at startup for the case of no window manager
1535 * non-reparenting window manager. In those cases we never get first 1556 // or a non-reparenting window manager and also because we
1536 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1557 // defer bg image updates if the window is not mapped. The
1537 * care of multiplicity of ConfigureNotify events arriving while WM does 1558 // short delay is to optimize for multiple ConfigureNotify
1538 * reparenting. 1559 // events at startup when the window manager reparents the
1539 * We should not render background immediately, as there could be several 1560 // window, so as to perform the computation after we have
1540 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1561 // received all of them.
1541 * by scheduling background redraw as soon as we can, but giving a short 1562 if (bg_img == 0)
1542 * bit of time for ConfigureNotifies to arrive.
1543 * We should render background PRIOR to drawing any text, but AFTER all
1544 * of ConfigureNotifys for the best results.
1545 */
1546 if (!(bg_flags & BG_IS_VALID))
1547 update_background_ev.start (0.025); 1563 update_background_ev.start (0.025);
1548#endif 1564#endif
1549 mapped = 1; 1565 mapped = 1;
1550#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1551 text_blink_ev.start (); 1567 text_blink_ev.start ();
… …
1643 1659
1644#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1645 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1646 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1647 { 1663 {
1664 page_dirn scroll_selection_dir;
1648 int dist; 1665 int dist;
1649 1666
1650 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1651 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1652 */ 1669 */
… …
1675 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1676 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1677 + 1; 1694 + 1;
1678 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1679 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1680 } 1698 }
1681 else 1699 else
1682 { 1700 {
1683 /* we are within the text window, so we 1701 /* we are within the text window, so we
1684 * shouldn't be scrolling 1702 * shouldn't be scrolling
… …
1838 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1839 } 1857 }
1840#endif 1858#endif
1841} 1859}
1842 1860
1843#if ENABLE_TRANSPARENCY || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1844void ecb_hot 1862void ecb_hot
1845rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1846{ 1864{
1847 make_current (); 1865 make_current ();
1848 1866
… …
1858 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1859 */ 1877 */
1860 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1861 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1862 { 1880 {
1863# if ENABLE_TRANSPARENCY 1881#if BG_IMAGE_FROM_ROOT
1864 bg_set_root_pixmap (); 1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1865 update_background (); 1885 update_background ();
1886 }
1866#endif 1887#endif
1867#if ENABLE_PERL
1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1869#endif
1870 } 1889 }
1871 1890
1872 break; 1891 break;
1873 } 1892 }
1874 1893
… …
2199 2218
2200#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2201 case Button4: 2220 case Button4:
2202 case Button5: 2221 case Button5:
2203 { 2222 {
2204 int i; 2223 int lines;
2205 page_dirn v; 2224 page_dirn dirn;
2206 2225
2207 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2208 2227
2209 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2210 i = 1; 2229 lines = 1;
2211 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2212 i = nrow - 1; 2231 lines = nrow - 1;
2213 else 2232 else
2214 i = 5; 2233 lines = 5;
2215 2234
2216# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2217 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2218 { 2237 {
2219 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2220 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2221 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2222 2240
2223 if (!slip_wheel_ev.is_active ()) 2241 if (!slip_wheel_ev.is_active ())
2224 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2225 } 2243 }
2226 else 2244 else
2227# endif 2245# endif
2228 { 2246 {
2229 scr_page (v, i); 2247 scr_page (dirn, lines);
2230 scrollBar.show (1); 2248 scrollBar.show (1);
2231 } 2249 }
2232 } 2250 }
2233 break; 2251 break;
2234#endif 2252#endif
… …
2803 }; 2821 };
2804 2822
2805void ecb_hot 2823void ecb_hot
2806rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2807{ 2825{
2808 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2809 unsigned int nargs, p; 2827 unsigned int nargs, p;
2810 int n, ndef; 2828 int n, ndef;
2811 int arg[ESC_ARGS] = { }; 2829 int arg[ESC_ARGS] = { };
2812 2830
2813 nargs = 0; 2831 nargs = 0;
… …
2819 /* '<' '=' '>' '?' '!' */ 2837 /* '<' '=' '>' '?' '!' */
2820 priv = ch; 2838 priv = ch;
2821 ch = cmd_getc (); 2839 ch = cmd_getc ();
2822 } 2840 }
2823 2841
2842 prev_ch = 0;
2824 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2825 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2826 { 2845 {
2827 if (isdigit (ch)) 2846 if (isdigit (ch))
2828 { 2847 {
… …
2838 n = -1; 2857 n = -1;
2839 } 2858 }
2840 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2841 process_nonprinting (ch); 2860 process_nonprinting (ch);
2842 2861
2862 prev_ch = ch;
2843 ch = cmd_getc (); 2863 ch = cmd_getc ();
2844 } 2864 }
2845 2865
2846 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2847 return; 2867 return;
… …
3081 scr_insert_mode (1); 3101 scr_insert_mode (1);
3082 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3083 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3084 break; 3104 break;
3085 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3086 /* 3111 /*
3087 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3088 */ 3113 */
3089 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3090 if (nargs == 1) 3115 if (nargs == 1)
… …
3223rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3224{ 3249{
3225 unicode_t ch; 3250 unicode_t ch;
3226 bool seen_esc = false; 3251 bool seen_esc = false;
3227 unsigned int n = 0; 3252 unsigned int n = 0;
3228 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3229 3254
3230 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3231 { 3256 {
3232 if (seen_esc) 3257 if (seen_esc)
3233 { 3258 {
… …
3248 else if (ch < 0x20) 3273 else if (ch < 0x20)
3249 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3250 3275
3251 seen_esc = false; 3276 seen_esc = false;
3252 3277
3253 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3254 // stop at some sane length 3279 // stop at some sane length
3255 return NULL; 3280 return NULL;
3256 3281
3257 string[n++] = ch; 3282 string[n++] = ch;
3258 } 3283 }
… …
3375 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3376 && actual_type != None 3401 && actual_type != None
3377 && actual_format == 8) 3402 && actual_format == 8)
3378 str = (const char *)(value); 3403 str = (const char *)(value);
3379 3404
3380 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3381 3406
3382 XFree (value); 3407 XFree (value);
3383 } 3408 }
3384 else 3409 else
3385 { 3410 {
… …
3453 break; 3478 break;
3454#endif 3479#endif
3455 case URxvt_Color_border: 3480 case URxvt_Color_border:
3456 process_color_seq (op, Color_border, str, resp); 3481 process_color_seq (op, Color_border, str, resp);
3457 break; 3482 break;
3458#if ENABLE_TRANSPARENCY 3483
3484#if BG_IMAGE_FROM_ROOT
3459 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3460 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3461 { 3487 {
3462 bool changed = false; 3488 bool changed = false;
3463 3489
… …
3994 break; 4020 break;
3995#endif 4021#endif
3996 } 4022 }
3997 } 4023 }
3998} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4040}
3999/*}}} */ 4041/*}}} */
4000 4042
4001/* ------------------------------------------------------------------------- */ 4043/* ------------------------------------------------------------------------- */
4002 4044
4003/* 4045/*
… …
4014 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4056 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4015 va_end (arg_ptr); 4057 va_end (arg_ptr);
4016 tt_write (buf, strlen (buf)); 4058 tt_write (buf, strlen (buf));
4017} 4059}
4018 4060
4061/* Write data to the pty as typed by the user. */
4062void
4063rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4064{
4065 if (option (Opt_scrollTtyKeypress))
4066 if (view_start)
4067 {
4068 view_start = 0;
4069 want_refresh = 1;
4070 }
4071
4072 tt_write (data, len);
4073}
4074
4019/* ---------------------------------------------------------------------- */ 4075/* ---------------------------------------------------------------------- */
4020/* Write data to the pty as typed by the user, pasted with the mouse, 4076/* Write data to the pty as typed by the user, pasted with the mouse,
4021 * or generated by us in response to a query ESC sequence. 4077 * or generated by us in response to a query ESC sequence.
4022 */ 4078 */
4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4079static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT

Diff Legend

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