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.532 by sf-exg, Mon Dec 31 12:05:34 2012 UTC vs.
Revision 1.555 by sf-exg, Sat Aug 16 10:51:23 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 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
315 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
329 }; 324 };
330 325
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
376 param = 3; 371 param = 3;
377 break; 372 break;
378 case XK_Select: 373 case XK_Select:
379 param = 4; 374 param = 4;
380 break; 375 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior: 376 case XK_Prior:
383 param = 5; 377 param = 5;
384 break; 378 break;
385 case XK_Next: 379 case XK_Next:
386 param = 6; 380 param = 6;
… …
389 param = 7; 383 param = 7;
390 break; 384 break;
391 case XK_End: 385 case XK_End:
392 param = 8; 386 param = 8;
393 break; 387 break;
394#endif
395 case XK_Help: 388 case XK_Help:
396 param = 28; 389 param = 28;
397 break; 390 break;
398 case XK_Menu: 391 case XK_Menu:
399 param = 29; 392 param = 29;
400 break; 393 break;
401 } 394 }
402 return param; 395 return param;
403} 396}
404 397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
405void ecb_cold 407void ecb_cold
406rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
407{ 409{
408 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
409 KeySym keysym; 411 KeySym keysym = NoSymbol;
410 int valid_keysym;
411 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
412 414
413#if ISO_14755 415#if ISO_14755
414 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
415 return; 417 return;
416#endif 418#endif
… …
473 } 475 }
474 } 476 }
475 else 477 else
476 len = 0; 478 len = 0;
477 } 479 }
478
479 valid_keysym = status_return == XLookupKeySym
480 || status_return == XLookupBoth;
481 } 480 }
482 else 481 else
483#endif 482#endif
484 { 483 {
485 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
486 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
487 } 488 {
489 KeySym orig_keysym = keysym;
488 490
489 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
490 { 704 {
491#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
492 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
493 return; 707 return;
494#endif 708#endif
495 709
496 if (saveLines) 710 if (saveLines)
497 { 711 {
… …
510#endif 724#endif
511 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
512 726
513 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
514 { 728 {
515 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
516 return; 730 return;
517 } 731 }
518 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
519 { 733 {
520 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
521 return; 735 return;
522 } 736 }
523 } 737 }
524#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
525 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
526 { 740 {
527 if (keysym == XK_Up) 741 if (keysym == XK_Up)
528 { 742 {
529 scr_page (UP, 1); 743 scr_page (1);
530 return; 744 return;
531 } 745 }
532 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
533 { 747 {
534 scr_page (DN, 1); 748 scr_page (-1);
535 return; 749 return;
536 } 750 }
537 } 751 }
538#endif 752#endif
539#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
540 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
541 { 755 {
542 if (keysym == XK_Home) 756 if (keysym == XK_Home)
543 { 757 {
544 scr_move_to (0, 1); 758 scr_changeview (top_row);
545 return; 759 return;
546 } 760 }
547 else if (keysym == XK_End) 761 else if (keysym == XK_End)
548 { 762 {
549 scr_move_to (1, 1); 763 scr_changeview (0);
550 return; 764 return;
551 } 765 }
552 } 766 }
553#endif 767#endif
554 } 768 }
555 769
556 if (shft) 770 if (shft)
557 { 771 {
558 /* Shift + F1 - F10 generates F11 - F20 */
559 if (keysym >= XK_F1 && keysym <= XK_F10)
560 {
561 keysym += (XK_F11 - XK_F1);
562 shft = 0; /* turn off Shift */
563 }
564 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
565 { 773 {
566 switch (keysym) 774 switch (keysym)
567 { 775 {
568 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
569 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 return; 785 return;
578#endif 786#endif
579 } 787 }
580 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
581 } 804 }
582 805
583#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
584 // ISO 14755 support 807 // ISO 14755 support
585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
640 { 863 {
641 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
642 return; 865 return;
643 } 866 }
644#endif 867#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 } 868 }
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 869
840 if (len <= 0) 870 if (len <= 0)
841 return; /* not mapped */ 871 return; /* not mapped */
842 872
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); 873 tt_write_user_input (kbuf, (unsigned int)len);
862} 874}
863 875
864void ecb_cold 876void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
866{ 878{
… …
1077 1089
1078#ifdef SELECTION_SCROLLING 1090#ifdef SELECTION_SCROLLING
1079void 1091void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1093{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1094 if (scr_page (scroll_selection_lines))
1083 { 1095 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1096 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1097 want_refresh = 1;
1086 refresh_check (); 1098 refresh_check ();
1087 } 1099 }
… …
1092 1104
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1105#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1106void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1107rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1108{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1109 if (scr_page (mouse_slip_wheel_speed))
1098 { 1110 {
1099 want_refresh = 1; 1111 want_refresh = 1;
1100 refresh_check (); 1112 refresh_check ();
1101 } 1113 }
1102 1114
… …
1638 1650
1639#ifdef SELECTION_SCROLLING 1651#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1652 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1653 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1654 {
1655 page_dirn scroll_selection_dir;
1643 int dist; 1656 int dist;
1644 1657
1645 /* don't clobber the current delay if we are 1658 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1659 * already in the middle of scrolling.
1647 */ 1660 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1683 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1684 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1685 + 1;
1673 min_it (scroll_selection_lines, 1686 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1687 SELECTION_SCROLL_MAX_LINES);
1688 scroll_selection_lines *= scroll_selection_dir;
1675 } 1689 }
1676 else 1690 else
1677 { 1691 {
1678 /* we are within the text window, so we 1692 /* we are within the text window, so we
1679 * shouldn't be scrolling 1693 * shouldn't be scrolling
… …
1860 { 1874 {
1861 rxvt_img::new_from_root (this)->replace (root_img); 1875 rxvt_img::new_from_root (this)->replace (root_img);
1862 update_background (); 1876 update_background ();
1863 } 1877 }
1864#endif 1878#endif
1865#if ENABLE_PERL
1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1879 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1867#endif
1868 } 1880 }
1869 1881
1870 break; 1882 break;
1871 } 1883 }
1872 1884
… …
1899 iso14755_54 (ev.x, ev.y); 1911 iso14755_54 (ev.x, ev.y);
1900 return; 1912 return;
1901 } 1913 }
1902#endif 1914#endif
1903 1915
1904 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1916 clickintime = ev.time - MEvent.time < multiClickTime;
1905 1917
1906 if (reportmode) 1918 if (reportmode)
1907 { 1919 {
1908 /* mouse report from vt window */ 1920 /* mouse report from vt window */
1909 /* save the xbutton state (for ButtonRelease) */ 1921 /* save the xbutton state (for ButtonRelease) */
… …
2159#ifdef MOUSE_REPORT_DOUBLECLICK 2171#ifdef MOUSE_REPORT_DOUBLECLICK
2160 /* only report the release of 'slow' single clicks */ 2172 /* only report the release of 'slow' single clicks */
2161 if (MEvent.button != AnyButton 2173 if (MEvent.button != AnyButton
2162 && (ev.button != MEvent.button 2174 && (ev.button != MEvent.button
2163 || (ev.time - MEvent.time 2175 || (ev.time - MEvent.time
2164 > MULTICLICK_TIME / 2))) 2176 > multiClickTime / 2)))
2165 { 2177 {
2166 MEvent.clicks = 0; 2178 MEvent.clicks = 0;
2167 MEvent.button = AnyButton; 2179 MEvent.button = AnyButton;
2168 mouse_report (ev); 2180 mouse_report (ev);
2169 } 2181 }
… …
2197 2209
2198#ifdef MOUSE_WHEEL 2210#ifdef MOUSE_WHEEL
2199 case Button4: 2211 case Button4:
2200 case Button5: 2212 case Button5:
2201 { 2213 {
2202 int i; 2214 int lines;
2203 page_dirn v; 2215 page_dirn dirn;
2204 2216
2205 v = ev.button == Button4 ? UP : DN; 2217 dirn = ev.button == Button4 ? UP : DN;
2206 2218
2207 if (ev.state & ShiftMask) 2219 if (ev.state & ShiftMask)
2208 i = 1; 2220 lines = 1;
2209 else if (option (Opt_mouseWheelScrollPage)) 2221 else if (option (Opt_mouseWheelScrollPage))
2210 i = nrow - 1; 2222 lines = nrow - 1;
2211 else 2223 else
2212 i = 5; 2224 lines = 5;
2213 2225
2214# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2215 if (ev.state & ControlMask) 2227 if (ev.state & ControlMask)
2216 { 2228 {
2217 mouse_slip_wheel_speed += v ? -1 : 1; 2229 mouse_slip_wheel_speed += dirn;
2218 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2230 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2219 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2220 2231
2221 if (!slip_wheel_ev.is_active ()) 2232 if (!slip_wheel_ev.is_active ())
2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2233 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2223 } 2234 }
2224 else 2235 else
2225# endif 2236# endif
2226 { 2237 {
2227 scr_page (v, i); 2238 scr_page (dirn, lines);
2228 scrollBar.show (1); 2239 scrollBar.show (1);
2229 } 2240 }
2230 } 2241 }
2231 break; 2242 break;
2232#endif 2243#endif
… …
2801 }; 2812 };
2802 2813
2803void ecb_hot 2814void ecb_hot
2804rxvt_term::process_csi_seq () 2815rxvt_term::process_csi_seq ()
2805{ 2816{
2806 unicode_t ch, priv, i; 2817 unicode_t ch, priv, prev_ch, i;
2807 unsigned int nargs, p; 2818 unsigned int nargs, p;
2808 int n, ndef; 2819 int n, ndef;
2809 int arg[ESC_ARGS] = { }; 2820 int arg[ESC_ARGS] = { };
2810 2821
2811 nargs = 0; 2822 nargs = 0;
… …
2817 /* '<' '=' '>' '?' '!' */ 2828 /* '<' '=' '>' '?' '!' */
2818 priv = ch; 2829 priv = ch;
2819 ch = cmd_getc (); 2830 ch = cmd_getc ();
2820 } 2831 }
2821 2832
2833 prev_ch = 0;
2822 /* read any numerical arguments */ 2834 /* read any numerical arguments */
2823 for (n = -1; ch < CSI_ICH; ) 2835 for (n = -1; ch < CSI_ICH; )
2824 { 2836 {
2825 if (isdigit (ch)) 2837 if (isdigit (ch))
2826 { 2838 {
… …
2836 n = -1; 2848 n = -1;
2837 } 2849 }
2838 else if (IS_CONTROL (ch)) 2850 else if (IS_CONTROL (ch))
2839 process_nonprinting (ch); 2851 process_nonprinting (ch);
2840 2852
2853 prev_ch = ch;
2841 ch = cmd_getc (); 2854 ch = cmd_getc ();
2842 } 2855 }
2843 2856
2844 if (ch > CSI_7F) 2857 if (ch > CSI_7F)
2845 return; 2858 return;
… …
3079 scr_insert_mode (1); 3092 scr_insert_mode (1);
3080 else if (arg[0] == 20) 3093 else if (arg[0] == 20)
3081 priv_modes |= PrivMode_LFNL; 3094 priv_modes |= PrivMode_LFNL;
3082 break; 3095 break;
3083 3096
3097 case CSI_71: // DESCUSR: set cursor style
3098 if (prev_ch == ' ')
3099 set_cursor_style (arg[0]);
3100 break;
3101
3084 /* 3102 /*
3085 * PRIVATE USE beyond this point. All CSI_7? sequences here 3103 * PRIVATE USE beyond this point. All CSI_7? sequences here
3086 */ 3104 */
3087 case CSI_72: /* DECSTBM: set top and bottom margins */ 3105 case CSI_72: /* DECSTBM: set top and bottom margins */
3088 if (nargs == 1) 3106 if (nargs == 1)
… …
3221rxvt_term::get_to_st (unicode_t &ends_how) 3239rxvt_term::get_to_st (unicode_t &ends_how)
3222{ 3240{
3223 unicode_t ch; 3241 unicode_t ch;
3224 bool seen_esc = false; 3242 bool seen_esc = false;
3225 unsigned int n = 0; 3243 unsigned int n = 0;
3226 wchar_t string[STRING_MAX]; 3244 wchar_t string[CBUFSIZ];
3227 3245
3228 while ((ch = cmd_getc ()) != NOCHAR) 3246 while ((ch = cmd_getc ()) != NOCHAR)
3229 { 3247 {
3230 if (seen_esc) 3248 if (seen_esc)
3231 { 3249 {
… …
3246 else if (ch < 0x20) 3264 else if (ch < 0x20)
3247 return NULL; /* other control character - exit */ 3265 return NULL; /* other control character - exit */
3248 3266
3249 seen_esc = false; 3267 seen_esc = false;
3250 3268
3251 if (n >= STRING_MAX - 1) 3269 if (n >= sizeof (string) - 1)
3252 // stop at some sane length 3270 // stop at some sane length
3253 return NULL; 3271 return NULL;
3254 3272
3255 string[n++] = ch; 3273 string[n++] = ch;
3256 } 3274 }
… …
3373 &nitems, &bytes_after, &value) == Success 3391 &nitems, &bytes_after, &value) == Success
3374 && actual_type != None 3392 && actual_type != None
3375 && actual_format == 8) 3393 && actual_format == 8)
3376 str = (const char *)(value); 3394 str = (const char *)(value);
3377 3395
3378 tt_printf ("\033]%d;%s%c", op, str, resp); 3396 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3379 3397
3380 XFree (value); 3398 XFree (value);
3381 } 3399 }
3382 else 3400 else
3383 { 3401 {
… …
3993 break; 4011 break;
3994#endif 4012#endif
3995 } 4013 }
3996 } 4014 }
3997} 4015}
4016
4017void
4018rxvt_term::set_cursor_style (int style)
4019{
4020 if (!IN_RANGE_INC (style, 0, 4))
4021 return;
4022
4023 set_option (Opt_cursorUnderline, style >= 3);
4024
4025#ifdef CURSOR_BLINK
4026 set_option (Opt_cursorBlink, !style || (style & 1));
4027 cursor_blink_reset ();
4028#endif
4029
4030 want_refresh = 1;
4031}
3998/*}}} */ 4032/*}}} */
3999 4033
4000/* ------------------------------------------------------------------------- */ 4034/* ---------------------------------------------------------------------- */
4035/* Write data to the pty as typed by the user, pasted with the mouse,
4036 * or generated by us in response to a query ESC sequence.
4037 */
4001 4038
4002/* 4039/*
4003 * Send printf () formatted output to the command. 4040 * Send printf () formatted output to the command.
4004 * Only use for small amounts of data. 4041 * Only use for small amounts of data.
4005 */ 4042 */
… …
4013 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4050 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4014 va_end (arg_ptr); 4051 va_end (arg_ptr);
4015 tt_write (buf, strlen (buf)); 4052 tt_write (buf, strlen (buf));
4016} 4053}
4017 4054
4018/* ---------------------------------------------------------------------- */
4019/* Write data to the pty as typed by the user, pasted with the mouse, 4055/* Write data to the pty as typed by the user. */
4020 * or generated by us in response to a query ESC sequence. 4056void
4021 */ 4057rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4022static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4058{
4059 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4060 return;
4061
4062 if (option (Opt_scrollTtyKeypress))
4063 if (view_start)
4064 {
4065 view_start = 0;
4066 want_refresh = 1;
4067 }
4068
4069 tt_write_ (data, len);
4070}
4023 4071
4024void 4072void
4025rxvt_term::tt_write (const char *data, unsigned int len) 4073rxvt_term::tt_write (const char *data, unsigned int len)
4026{ 4074{
4027 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4075 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4028 return; 4076 return;
4029 4077
4078 tt_write_ (data, len);
4079}
4080
4081static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4082
4083void
4084rxvt_term::tt_write_ (const char *data, unsigned int len)
4085{
4030 if (pty->pty < 0) 4086 if (pty->pty < 0)
4031 return; 4087 return;
4032 4088
4033 if (v_buflen == 0) 4089 if (v_buflen == 0)
4034 { 4090 {

Diff Legend

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