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.534 by sf-exg, Tue Mar 26 14:16:46 2013 UTC vs.
Revision 1.565 by root, Tue Apr 28 12:38:19 2015 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
… …
210 210
211 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
212 212
213 if (y >= 0) 213 if (y >= 0)
214 { 214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 216 x = 0;
217 } 217 }
218 218
219 scr_overlay_new (x, y, width, len * 2 + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220 220
… …
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{
… …
1022 1034
1023#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1024void 1036void
1025rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1026{ 1038{
1039 if (!focus)
1040 return;
1041
1027 if (hidden_cursor) 1042 if (hidden_cursor)
1028 { 1043 {
1029 hidden_cursor = 0; 1044 hidden_cursor = 0;
1030 want_refresh = 1; 1045 want_refresh = 1;
1031 } 1046 }
1032 1047
1033 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1034 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1035 else 1050 else
1036 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1037} 1052}
1038 1053
… …
1077 1092
1078#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1079void 1094void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1096{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1083 { 1098 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1100 want_refresh = 1;
1086 refresh_check (); 1101 refresh_check ();
1087 } 1102 }
… …
1092 1107
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1109void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1111{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1098 { 1113 {
1099 want_refresh = 1; 1114 want_refresh = 1;
1100 refresh_check (); 1115 refresh_check ();
1101 } 1116 }
1102 1117
… …
1227 1242
1228void ecb_cold 1243void ecb_cold
1229rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1230{ 1245{
1231 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1232 recolour_cursor (); 1247 recolor_cursor ();
1233 1248
1234#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1235 hidden_pointer = 0; 1250 hidden_pointer = 0;
1236 1251
1237 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1620 &unused_root_x, &unused_root_y, 1635 &unused_root_x, &unused_root_y,
1621 &ev.xbutton.x, &ev.xbutton.y, 1636 &ev.xbutton.x, &ev.xbutton.y,
1622 &ev.xbutton.state); 1637 &ev.xbutton.state);
1623#ifdef MOUSE_THRESHOLD 1638#ifdef MOUSE_THRESHOLD
1624 /* deal with a `jumpy' mouse */ 1639 /* deal with a `jumpy' mouse */
1625 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1640 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1641#endif
1626 { 1642 {
1627#endif
1628#if ISO_14755 1643#if ISO_14755
1629 // 5.4 1644 // 5.4
1630 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1645 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1631 { 1646 {
1632 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1647 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1638 1653
1639#ifdef SELECTION_SCROLLING 1654#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1655 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1656 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1657 {
1658 page_dirn scroll_selection_dir;
1643 int dist; 1659 int dist;
1644 1660
1645 /* don't clobber the current delay if we are 1661 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1662 * already in the middle of scrolling.
1647 */ 1663 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1686 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1687 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1688 + 1;
1673 min_it (scroll_selection_lines, 1689 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1690 SELECTION_SCROLL_MAX_LINES);
1691 scroll_selection_lines *= scroll_selection_dir;
1675 } 1692 }
1676 else 1693 else
1677 { 1694 {
1678 /* we are within the text window, so we 1695 /* we are within the text window, so we
1679 * shouldn't be scrolling 1696 * shouldn't be scrolling
1680 */ 1697 */
1681 sel_scroll_ev.stop(); 1698 sel_scroll_ev.stop();
1682 } 1699 }
1683#endif 1700#endif
1684#ifdef MOUSE_THRESHOLD
1685 } 1701 }
1686#endif
1687 } 1702 }
1688 } 1703 }
1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1704 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1690 { 1705 {
1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1706 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1765#endif 1780#endif
1766#if OFF_FOCUS_FADING 1781#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1782 if (rs[Rs_fade])
1768 { 1783 {
1769 pix_colors = pix_colors_focused; 1784 pix_colors = pix_colors_focused;
1770 scr_recolour (); 1785 scr_recolor ();
1771 } 1786 }
1772#endif 1787#endif
1773#if ENABLE_FRILLS 1788#if ENABLE_FRILLS
1774 if (option (Opt_urgentOnBell)) 1789 if (option (Opt_urgentOnBell))
1775 set_urgency (0); 1790 set_urgency (0);
… …
1812#endif 1827#endif
1813#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1815 { 1830 {
1816 pix_colors = pix_colors_unfocused; 1831 pix_colors = pix_colors_unfocused;
1817 scr_recolour (); 1832 scr_recolor ();
1818 } 1833 }
1819#endif 1834#endif
1820 1835
1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1836 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 } 1837 }
1823} 1838}
1824 1839
1825void ecb_cold 1840void ecb_cold
1826rxvt_term::update_fade_color (unsigned int idx) 1841rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1827{ 1842{
1828#if OFF_FOCUS_FADING 1843#if OFF_FOCUS_FADING
1829 if (rs[Rs_fade]) 1844 if (rs[Rs_fade])
1830 { 1845 {
1846 if (!first_time)
1847 pix_colors_focused [idx].free (this);
1848
1831 rgba c; 1849 rgba c;
1832 pix_colors [Color_fade].get (c); 1850 pix_colors [Color_fade].get (c);
1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1851 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1834 } 1852 }
1835#endif 1853#endif
… …
1897 iso14755_54 (ev.x, ev.y); 1915 iso14755_54 (ev.x, ev.y);
1898 return; 1916 return;
1899 } 1917 }
1900#endif 1918#endif
1901 1919
1902 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1920 clickintime = ev.time - MEvent.time < multiClickTime;
1903 1921
1904 if (reportmode) 1922 if (reportmode)
1905 { 1923 {
1906 /* mouse report from vt window */ 1924 /* mouse report from vt window */
1907 /* save the xbutton state (for ButtonRelease) */ 1925 /* save the xbutton state (for ButtonRelease) */
… …
2157#ifdef MOUSE_REPORT_DOUBLECLICK 2175#ifdef MOUSE_REPORT_DOUBLECLICK
2158 /* only report the release of 'slow' single clicks */ 2176 /* only report the release of 'slow' single clicks */
2159 if (MEvent.button != AnyButton 2177 if (MEvent.button != AnyButton
2160 && (ev.button != MEvent.button 2178 && (ev.button != MEvent.button
2161 || (ev.time - MEvent.time 2179 || (ev.time - MEvent.time
2162 > MULTICLICK_TIME / 2))) 2180 > multiClickTime / 2)))
2163 { 2181 {
2164 MEvent.clicks = 0; 2182 MEvent.clicks = 0;
2165 MEvent.button = AnyButton; 2183 MEvent.button = AnyButton;
2166 mouse_report (ev); 2184 mouse_report (ev);
2167 } 2185 }
… …
2195 2213
2196#ifdef MOUSE_WHEEL 2214#ifdef MOUSE_WHEEL
2197 case Button4: 2215 case Button4:
2198 case Button5: 2216 case Button5:
2199 { 2217 {
2200 int i; 2218 int lines;
2201 page_dirn v; 2219 page_dirn dirn;
2202 2220
2203 v = ev.button == Button4 ? UP : DN; 2221 dirn = ev.button == Button4 ? UP : DN;
2204 2222
2205 if (ev.state & ShiftMask) 2223 if (ev.state & ShiftMask)
2206 i = 1; 2224 lines = 1;
2207 else if (option (Opt_mouseWheelScrollPage)) 2225 else if (option (Opt_mouseWheelScrollPage))
2208 i = nrow - 1; 2226 lines = nrow - 1;
2209 else 2227 else
2210 i = 5; 2228 lines = 5;
2211 2229
2212# ifdef MOUSE_SLIP_WHEELING 2230# ifdef MOUSE_SLIP_WHEELING
2213 if (ev.state & ControlMask) 2231 if (ev.state & ControlMask)
2214 { 2232 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2233 mouse_slip_wheel_speed += dirn;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2234 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2235
2219 if (!slip_wheel_ev.is_active ()) 2236 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2237 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221 } 2238 }
2222 else 2239 else
2223# endif 2240# endif
2224 { 2241 {
2225 scr_page (v, i); 2242 scr_page (dirn, lines);
2226 scrollBar.show (1); 2243 scrollBar.show (1);
2227 } 2244 }
2228 } 2245 }
2229 break; 2246 break;
2230#endif 2247#endif
… …
2558 scr_charset_choose (0); 2575 scr_charset_choose (0);
2559 break; 2576 break;
2560 2577
2561#ifdef EIGHT_BIT_CONTROLS 2578#ifdef EIGHT_BIT_CONTROLS
2562 // 8-bit controls 2579 // 8-bit controls
2563 case 0x90: /* DCS */ 2580 case 0x90: /* DCS */
2564 process_dcs_seq (); 2581 process_dcs_seq ();
2565 break; 2582 break;
2566 case 0x9b: /* CSI */ 2583 case 0x9b: /* CSI */
2567 process_csi_seq (); 2584 process_csi_seq ();
2568 break; 2585 break;
2569 case 0x9d: /* OSC */ 2586 case 0x9d: /* OSC */
2570 process_osc_seq (); 2587 process_osc_seq ();
2571 break; 2588 break;
2572#endif 2589#endif
2573 } 2590 }
2574} 2591}
… …
3079 scr_insert_mode (1); 3096 scr_insert_mode (1);
3080 else if (arg[0] == 20) 3097 else if (arg[0] == 20)
3081 priv_modes |= PrivMode_LFNL; 3098 priv_modes |= PrivMode_LFNL;
3082 break; 3099 break;
3083 3100
3084 case CSI_71: // DESCUSR: set cursor style 3101 case CSI_71: // DECSCUSR: set cursor style
3085 if (prev_ch == ' ') 3102 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]); 3103 set_cursor_style (arg[0]);
3087 break; 3104 break;
3088 3105
3089 /* 3106 /*
… …
3226rxvt_term::get_to_st (unicode_t &ends_how) 3243rxvt_term::get_to_st (unicode_t &ends_how)
3227{ 3244{
3228 unicode_t ch; 3245 unicode_t ch;
3229 bool seen_esc = false; 3246 bool seen_esc = false;
3230 unsigned int n = 0; 3247 unsigned int n = 0;
3231 wchar_t string[STRING_MAX]; 3248 wchar_t string[CBUFSIZ];
3232 3249
3233 while ((ch = cmd_getc ()) != NOCHAR) 3250 while ((ch = cmd_getc ()) != NOCHAR)
3234 { 3251 {
3235 if (seen_esc) 3252 if (seen_esc)
3236 { 3253 {
… …
3251 else if (ch < 0x20) 3268 else if (ch < 0x20)
3252 return NULL; /* other control character - exit */ 3269 return NULL; /* other control character - exit */
3253 3270
3254 seen_esc = false; 3271 seen_esc = false;
3255 3272
3256 if (n >= STRING_MAX - 1) 3273 if (n >= sizeof (string) - 1)
3257 // stop at some sane length 3274 // stop at some sane length
3258 return NULL; 3275 return NULL;
3259 3276
3260 string[n++] = ch; 3277 string[n++] = ch;
3261 } 3278 }
… …
3378 &nitems, &bytes_after, &value) == Success 3395 &nitems, &bytes_after, &value) == Success
3379 && actual_type != None 3396 && actual_type != None
3380 && actual_format == 8) 3397 && actual_format == 8)
3381 str = (const char *)(value); 3398 str = (const char *)(value);
3382 3399
3383 tt_printf ("\033]%d;%s%c", op, str, resp); 3400 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3384 3401
3385 XFree (value); 3402 XFree (value);
3386 } 3403 }
3387 else 3404 else
3388 { 3405 {
… …
3667 { 5, PrivMode_rVideo }, // DECSCNM 3684 { 5, PrivMode_rVideo }, // DECSCNM
3668 { 6, PrivMode_relOrigin }, // DECOM 3685 { 6, PrivMode_relOrigin }, // DECOM
3669 { 7, PrivMode_Autowrap }, // DECAWM 3686 { 7, PrivMode_Autowrap }, // DECAWM
3670 // 8, auto-repeat keys // DECARM 3687 // 8, auto-repeat keys // DECARM
3671 { 9, PrivMode_MouseX10 }, 3688 { 9, PrivMode_MouseX10 },
3689 { 12, PrivMode_BlinkingCursor },
3672 // 18 end FF to printer after print screen 3690 // 18 end FF to printer after print screen
3673 // 19 Print screen prints full screen/scroll region 3691 // 19 Print screen prints full screen/scroll region
3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3692 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3675#ifdef scrollBar_esc 3693#ifdef scrollBar_esc
3676 { scrollBar_esc, PrivMode_scrollBar }, 3694 { scrollBar_esc, PrivMode_scrollBar },
… …
3785 scrollBar.map (state); 3803 scrollBar.map (state);
3786 resize_all_windows (0, 0, 0); 3804 resize_all_windows (0, 0, 0);
3787 scr_touch (true); 3805 scr_touch (true);
3788 break; 3806 break;
3789#endif 3807#endif
3808#ifdef CURSOR_BLINK
3809 case 12:
3810 cursor_blink_reset ();
3811 break;
3812#endif
3790 case 25: /* visible/invisible cursor */ 3813 case 25: /* visible/invisible cursor */
3791 scr_cursor_visible (state); 3814 scr_cursor_visible (state);
3792 break; 3815 break;
3793 /* case 35: - shift keys */ 3816 /* case 35: - shift keys */
3794 /* case 40: - 80 <--> 132 mode */ 3817 /* case 40: - 80 <--> 132 mode */
… …
3899 //case 19: // ninth alt font 3922 //case 19: // ninth alt font
3900 //case 20: // gothic 3923 //case 20: // gothic
3901 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3924 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3902 rendset = 0, rendstyle = RS_Bold; 3925 rendset = 0, rendstyle = RS_Bold;
3903 break; 3926 break;
3904 case 22: // normal intensity 3927 case 22: // bold off (vt220)
3905 rendset = 0, rendstyle = RS_Bold; 3928 rendset = 0, rendstyle = RS_Bold;
3906 break; 3929 break;
3907 case 23: // disable italic 3930 case 23: // disable italic
3908 rendset = 0, rendstyle = RS_Italic; 3931 rendset = 0, rendstyle = RS_Italic;
3909 break; 3932 break;
3910 case 24: 3933 case 24: // underline off (vt220)
3911 rendset = 0, rendstyle = RS_Uline; 3934 rendset = 0, rendstyle = RS_Uline;
3912 break; 3935 break;
3913 case 25: 3936 case 25: // blink off (vt220)
3914 rendset = 0, rendstyle = RS_Blink; 3937 rendset = 0, rendstyle = RS_Blink;
3915 break; 3938 break;
3916 case 26: // variable spacing (iso 8613) 3939 case 26: // variable spacing (iso 8613)
3917 rendset = 0, rendstyle = RS_Blink; 3940 rendset = 0, rendstyle = RS_Blink;
3918 break; 3941 break;
3919 case 27: 3942 case 27: // reverse off (vt220)
3920 rendset = 0, rendstyle = RS_RVid; 3943 rendset = 0, rendstyle = RS_RVid;
3921 break; 3944 break;
3922 //case 28: // visible. NYI 3945 //case 28: // visible. NYI
3923 //case 29: // not crossed-out 3946 //case 29: // not crossed-out
3924 } 3947 }
… …
4002} 4025}
4003 4026
4004void 4027void
4005rxvt_term::set_cursor_style (int style) 4028rxvt_term::set_cursor_style (int style)
4006{ 4029{
4007 if (!IN_RANGE_INC (style, 0, 4)) 4030 if (!IN_RANGE_INC (style, 0, 6))
4008 return; 4031 return;
4009 4032
4033 if (style == 0)
4034 style = 1;
4035
4036 cursor_type = (style - 1) / 2;
4010 set_option (Opt_cursorUnderline, style >= 3); 4037 set_option (Opt_cursorUnderline, cursor_type == 1);
4011 4038
4012#ifdef CURSOR_BLINK 4039#ifdef CURSOR_BLINK
4013 set_option (Opt_cursorBlink, !style || (style & 1)); 4040 set_option (Opt_cursorBlink, style & 1);
4014 cursor_blink_reset (); 4041 cursor_blink_reset ();
4015#endif 4042#endif
4016 4043
4017 want_refresh = 1; 4044 want_refresh = 1;
4018} 4045}
4019/*}}} */ 4046/*}}} */
4020 4047
4021/* ------------------------------------------------------------------------- */ 4048/* ---------------------------------------------------------------------- */
4049/* Write data to the pty as typed by the user, pasted with the mouse,
4050 * or generated by us in response to a query ESC sequence.
4051 */
4022 4052
4023/* 4053/*
4024 * Send printf () formatted output to the command. 4054 * Send printf () formatted output to the command.
4025 * Only use for small amounts of data. 4055 * Only use for small amounts of data.
4026 */ 4056 */
… …
4034 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4064 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4035 va_end (arg_ptr); 4065 va_end (arg_ptr);
4036 tt_write (buf, strlen (buf)); 4066 tt_write (buf, strlen (buf));
4037} 4067}
4038 4068
4039/* ---------------------------------------------------------------------- */
4040/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user. */
4041 * or generated by us in response to a query ESC sequence. 4070void
4042 */ 4071rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4043static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072{
4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4074 return;
4075
4076 if (option (Opt_scrollTtyKeypress))
4077 if (view_start)
4078 {
4079 view_start = 0;
4080 want_refresh = 1;
4081 }
4082
4083 tt_write_ (data, len);
4084}
4044 4085
4045void 4086void
4046rxvt_term::tt_write (const char *data, unsigned int len) 4087rxvt_term::tt_write (const char *data, unsigned int len)
4047{ 4088{
4048 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4089 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4049 return; 4090 return;
4050 4091
4092 tt_write_ (data, len);
4093}
4094
4095static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4096
4097void
4098rxvt_term::tt_write_ (const char *data, unsigned int len)
4099{
4051 if (pty->pty < 0) 4100 if (pty->pty < 0)
4052 return; 4101 return;
4053 4102
4054 if (v_buflen == 0) 4103 if (v_buflen == 0)
4055 { 4104 {

Diff Legend

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