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.544 by sf-exg, Sat Apr 26 14:55:58 2014 UTC vs.
Revision 1.579 by root, Thu Jun 30 17:03:45 2016 UTC

… …
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-2014 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,2015 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;
… …
413 406
414void ecb_cold 407void ecb_cold
415rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
416{ 409{
417 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
418 KeySym keysym; 411 KeySym keysym = NoSymbol;
419 int valid_keysym;
420 char rkbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1; 413 char *kbuf = rkbuf + 1;
422 414
423#if ISO_14755 415#if ISO_14755
424 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
425 return; 417 return;
… …
483 } 475 }
484 } 476 }
485 else 477 else
486 len = 0; 478 len = 0;
487 } 479 }
488
489 valid_keysym = status_return == XLookupKeySym
490 || status_return == XLookupBoth;
491 } 480 }
492 else 481 else
493#endif 482#endif
494 { 483 {
495 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
496 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
497 } 488 {
489 KeySym orig_keysym = keysym;
498 490
499 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)
500 { 704 {
501#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
502 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
503 return; 707 return;
504#endif 708#endif
505 709
506 if (saveLines) 710 if (saveLines)
507 { 711 {
… …
563#endif 767#endif
564 } 768 }
565 769
566 if (shft) 770 if (shft)
567 { 771 {
568 /* Shift + F1 - F10 generates F11 - F20 */
569 if (keysym >= XK_F1 && keysym <= XK_F10)
570 {
571 keysym += (XK_F11 - XK_F1);
572 shft = 0; /* turn off Shift */
573 }
574 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
575 { 773 {
576 switch (keysym) 774 switch (keysym)
577 { 775 {
578 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
579 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
665 { 863 {
666 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
667 return; 865 return;
668 } 866 }
669#endif 867#endif
670
671 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
672 {
673 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
674 unsigned int newlen = 1;
675
676 if (ev.state & ModNumLockMask)
677 kp = false;
678
679 keysym = translate_keypad (keysym, kp);
680
681 switch (keysym)
682 {
683#ifndef NO_BACKSPACE_KEY
684 case XK_BackSpace:
685 if (priv_modes & PrivMode_HaveBackSpace)
686 {
687 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
688 ^ !!ctrl) ? '\b' : '\177';
689 kbuf[1] = '\0';
690 }
691 else
692 strcpy (kbuf, rs[Rs_backspace_key]);
693 break;
694#endif
695#ifndef NO_DELETE_KEY
696 case XK_Delete:
697 strcpy (kbuf, rs[Rs_delete_key]);
698 break;
699#endif
700 case XK_Tab:
701 if (shft)
702 strcpy (kbuf, "\033[Z");
703 else
704 {
705#ifdef CTRL_TAB_MAKES_META
706 if (ctrl)
707 meta = 1;
708#endif
709#ifdef MOD4_TAB_MAKES_META
710 if (ev.state & Mod4Mask)
711 meta = 1;
712#endif
713 newlen = 0;
714 }
715 break;
716
717 case XK_Up: /* "\033[A" */
718 case XK_Down: /* "\033[B" */
719 case XK_Right: /* "\033[C" */
720 case XK_Left: /* "\033[D" */
721 strcpy (kbuf, "\033[Z");
722 kbuf[2] = "DACB"[keysym - XK_Left];
723 /* do Shift first */
724 if (shft)
725 kbuf[2] = "dacb"[keysym - XK_Left];
726 else if (ctrl)
727 {
728 kbuf[1] = 'O';
729 kbuf[2] = "dacb"[keysym - XK_Left];
730 }
731 else if (priv_modes & PrivMode_aplCUR)
732 kbuf[1] = 'O';
733 break;
734
735 case XK_KP_Enter:
736 /* allow shift to override */
737 if (kp)
738 {
739 strcpy (kbuf, "\033OM");
740 break;
741 }
742
743 /* FALLTHROUGH */
744
745 case XK_Return:
746 if (priv_modes & PrivMode_LFNL)
747 {
748 kbuf[0] = '\015';
749 kbuf[1] = '\012';
750 kbuf[2] = '\0';
751 }
752 else
753 {
754 kbuf[0] = '\015';
755 kbuf[1] = '\0';
756 }
757 break;
758
759 case XK_KP_F1: /* "\033OP" */
760 case XK_KP_F2: /* "\033OQ" */
761 case XK_KP_F3: /* "\033OR" */
762 case XK_KP_F4: /* "\033OS" */
763 strcpy (kbuf, "\033OP");
764 kbuf[2] += (keysym - XK_KP_F1);
765 break;
766
767 case XK_KP_Multiply: /* "\033Oj" : "*" */
768 case XK_KP_Add: /* "\033Ok" : "+" */
769 case XK_KP_Separator: /* "\033Ol" : "," */
770 case XK_KP_Subtract: /* "\033Om" : "-" */
771 case XK_KP_Decimal: /* "\033On" : "." */
772 case XK_KP_Divide: /* "\033Oo" : "/" */
773 case XK_KP_0: /* "\033Op" : "0" */
774 case XK_KP_1: /* "\033Oq" : "1" */
775 case XK_KP_2: /* "\033Or" : "2" */
776 case XK_KP_3: /* "\033Os" : "3" */
777 case XK_KP_4: /* "\033Ot" : "4" */
778 case XK_KP_5: /* "\033Ou" : "5" */
779 case XK_KP_6: /* "\033Ov" : "6" */
780 case XK_KP_7: /* "\033Ow" : "7" */
781 case XK_KP_8: /* "\033Ox" : "8" */
782 case XK_KP_9: /* "\033Oy" : "9" */
783 /* allow shift to override */
784 if (kp)
785 {
786 strcpy (kbuf, "\033Oj");
787 kbuf[2] += (keysym - XK_KP_Multiply);
788 }
789 else
790 {
791 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
792 kbuf[1] = '\0';
793 }
794 break;
795
796 default:
797 {
798 int param = map_function_key (keysym);
799 if (param > 0)
800 sprintf (kbuf,"\033[%d~", param);
801 else
802 newlen = 0;
803 }
804 break;
805 }
806
807 if (newlen)
808 len = strlen (kbuf);
809
810 if (len > 0)
811 {
812 /*
813 * pass Shift/Control indicators for function keys ending with `~'
814 *
815 * eg,
816 * Prior = "ESC[5~"
817 * Shift+Prior = "ESC[5$"
818 * Ctrl+Prior = "ESC[5^"
819 * Ctrl+Shift+Prior = "ESC[5@"
820 */
821 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
822 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
823
824 /*
825 * Pass meta for all function keys, if 'meta' option set
826 */
827#ifdef META8_OPTION
828 if (meta && (meta_char == 0x80))
829 kbuf[len - 1] |= 0x80;
830#endif
831 }
832
833 }
834 else if (ctrl && keysym == XK_minus)
835 {
836 len = 1;
837 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
838 }
839 else if (keysym == XK_ISO_Left_Tab)
840 {
841 strcpy (kbuf, "\033[Z");
842 len = 3;
843 }
844 else
845 {
846#ifdef META8_OPTION
847 /* set 8-bit on */
848 if (meta && (meta_char == 0x80))
849 {
850 char *ch;
851
852 for (ch = kbuf; ch < kbuf + len; ch++)
853 *ch |= 0x80;
854
855 meta = 0;
856 }
857#endif
858 /* nil */ ;
859 }
860 }
861
862 /* escape prefix */
863 if (len && meta
864#ifdef META8_OPTION
865 && meta_char == C0_ESC
866#endif
867 )
868 { 868 }
869 *--kbuf = C0_ESC;
870 len++;
871 }
872
873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
874 return;
875 869
876 if (len <= 0) 870 if (len <= 0)
877 return; /* not mapped */ 871 return; /* not mapped */
878 872
879 if (option (Opt_scrollTtyKeypress))
880 if (view_start)
881 {
882 view_start = 0;
883 want_refresh = 1;
884 }
885
886 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
887} 874}
888 875
889void ecb_cold 876void ecb_cold
890rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
891{ 878{
… …
1047 1034
1048#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1049void 1036void
1050rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1051{ 1038{
1039 if (!focus)
1040 return;
1041
1052 if (hidden_cursor) 1042 if (hidden_cursor)
1053 { 1043 {
1054 hidden_cursor = 0; 1044 hidden_cursor = 0;
1055 want_refresh = 1; 1045 want_refresh = 1;
1056 } 1046 }
1057 1047
1058 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1059 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1060 else 1050 else
1061 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1062} 1052}
1063 1053
… …
1252 1242
1253void ecb_cold 1243void ecb_cold
1254rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1255{ 1245{
1256 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1257 recolour_cursor (); 1247 recolor_cursor ();
1258 1248
1259#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1260 hidden_pointer = 0; 1250 hidden_pointer = 0;
1261 1251
1262 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1622 case MotionNotify: 1612 case MotionNotify:
1623#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1624 if (hidden_pointer) 1614 if (hidden_pointer)
1625 pointer_unblank (); 1615 pointer_unblank ();
1626#endif 1616#endif
1617 if (!bypass_keystate
1627 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1628 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1629 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1630 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1631 break; 1622 break;
1632 1623
1633 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1645 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1646 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1647 &ev.xbutton.state); 1638 &ev.xbutton.state);
1648#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1649 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1650 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1651 { 1643 {
1652#endif
1653#if ISO_14755 1644#if ISO_14755
1654 // 5.4 1645 // 5.4
1655 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1656 { 1647 {
1657 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1706 * shouldn't be scrolling 1697 * shouldn't be scrolling
1707 */ 1698 */
1708 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1709 } 1700 }
1710#endif 1701#endif
1711#ifdef MOUSE_THRESHOLD
1712 } 1702 }
1713#endif
1714 } 1703 }
1715 } 1704 }
1716 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1717 { 1706 {
1718 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1792#endif 1781#endif
1793#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1795 { 1784 {
1796 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1797 scr_recolour (); 1786 scr_recolor ();
1798 } 1787 }
1799#endif 1788#endif
1800#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1801 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1802 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1803#endif 1795#endif
1804 1796
1805 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1806 } 1798 }
1807} 1799}
… …
1815 want_refresh = 1; 1807 want_refresh = 1;
1816 1808
1817#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1818 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1819 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1820#endif 1815#endif
1821#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1822 if (iso14755buf) 1817 if (iso14755buf)
1823 { 1818 {
1824 iso14755buf = 0; 1819 iso14755buf = 0;
… …
1839#endif 1834#endif
1840#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1841 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1842 { 1837 {
1843 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1844 scr_recolour (); 1839 scr_recolor ();
1845 } 1840 }
1846#endif 1841#endif
1847 1842
1848 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1849 } 1844 }
1850} 1845}
1851 1846
1852void ecb_cold 1847void ecb_cold
1853rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1854{ 1849{
1855#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1856 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1857 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1858 rgba c; 1856 rgba c;
1859 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1860 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1861 } 1859 }
1862#endif 1860#endif
… …
1924 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1925 return; 1923 return;
1926 } 1924 }
1927#endif 1925#endif
1928 1926
1929 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1930 1928
1931 if (reportmode) 1929 if (reportmode)
1932 { 1930 {
1933 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1934 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
… …
2184#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2185 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2186 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2187 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2188 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2189 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2190 { 2188 {
2191 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2192 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2193 mouse_report (ev); 2191 mouse_report (ev);
2194 } 2192 }
… …
2584 scr_charset_choose (0); 2582 scr_charset_choose (0);
2585 break; 2583 break;
2586 2584
2587#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2588 // 8-bit controls 2586 // 8-bit controls
2589 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2590 process_dcs_seq (); 2588 process_dcs_seq ();
2591 break; 2589 break;
2592 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2593 process_csi_seq (); 2591 process_csi_seq ();
2594 break; 2592 break;
2595 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2596 process_osc_seq (); 2594 process_osc_seq ();
2597 break; 2595 break;
2598#endif 2596#endif
2599 } 2597 }
2600} 2598}
… …
3105 scr_insert_mode (1); 3103 scr_insert_mode (1);
3106 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3107 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3108 break; 3106 break;
3109 3107
3110 case CSI_71: // DESCUSR: set cursor style 3108 case CSI_71: // DECSCUSR: set cursor style
3111 if (prev_ch == ' ') 3109 if (prev_ch == ' ')
3112 set_cursor_style (arg[0]); 3110 set_cursor_style (arg[0]);
3113 break; 3111 break;
3114 3112
3115 /* 3113 /*
… …
3336 free (s); 3334 free (s);
3337 } 3335 }
3338 } 3336 }
3339} 3337}
3340 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363
3364 unsigned int color = (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 /* we allow one of the 6 directly neighbouring colours */
3371 /* to replace the current color, if they not used recently */
3372 static const signed char dxyz[][3] = {
3373 0, 0, 0,
3374 0, 0, +1,
3375 0, 0, -1,
3376 0, +1, 0,
3377 0, -1, 0,
3378 +1, 0, 0,
3379 -1, 0, 0,
3380 };
3381
3382 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3383 {
3384 int r = idx_r + dxyz[n][0];
3385 int g = idx_r + dxyz[n][1];
3386 int b = idx_r + dxyz[n][2];
3387
3388 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3389 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3390 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3391
3392 unsigned int index = colorcube_index (r, g, b);
3393
3394 if (rgb24_color[index] == color)
3395 {
3396 rgb24_seqno[index] = ++rgb24_sequence;
3397 return index + minTermCOLOR24;
3398 }
3399
3400 // minor issue: could update index 0 few more times
3401 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3402 {
3403 idx = index;
3404 goto update;
3405 }
3406
3407 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3408 // but also handles wrap around values good enough
3409 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3410 idx = index;
3411 }
3412
3413update:
3414 rgb24_color[idx] = color;
3415 rgb24_seqno[idx] = ++rgb24_sequence;
3416
3417 idx += minTermCOLOR24;
3418 pix_colors_focused [idx].free (this);
3419 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101));
3420 update_fade_color (idx, false);
3421
3422 return idx;
3423}
3424
3341void 3425void
3342rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3426rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3343{ 3427{
3344 if (str[0] == '?' && !str[1]) 3428 if (str[0] == '?' && !str[1])
3345 { 3429 {
3346 rgba c; 3430 rgba c;
3347 pix_colors_focused[color].get (c); 3431 pix_colors_focused[color].get (c);
3348 3432
3349#if XFT 3433#if XFT
3350 if (c.a != rgba::MAX_CC) 3434 if (c.a != rgba::MAX_CC)
3351 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3435 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3352 else 3436 else
3353#endif 3437#endif
3354 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3438 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3355 } 3439 }
3356 else 3440 else
… …
3693 { 5, PrivMode_rVideo }, // DECSCNM 3777 { 5, PrivMode_rVideo }, // DECSCNM
3694 { 6, PrivMode_relOrigin }, // DECOM 3778 { 6, PrivMode_relOrigin }, // DECOM
3695 { 7, PrivMode_Autowrap }, // DECAWM 3779 { 7, PrivMode_Autowrap }, // DECAWM
3696 // 8, auto-repeat keys // DECARM 3780 // 8, auto-repeat keys // DECARM
3697 { 9, PrivMode_MouseX10 }, 3781 { 9, PrivMode_MouseX10 },
3782 { 12, PrivMode_BlinkingCursor },
3698 // 18 end FF to printer after print screen 3783 // 18 end FF to printer after print screen
3699 // 19 Print screen prints full screen/scroll region 3784 // 19 Print screen prints full screen/scroll region
3700 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3785 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3701#ifdef scrollBar_esc 3786#ifdef scrollBar_esc
3702 { scrollBar_esc, PrivMode_scrollBar }, 3787 { scrollBar_esc, PrivMode_scrollBar },
… …
3714#endif 3799#endif
3715 { 1000, PrivMode_MouseX11 }, 3800 { 1000, PrivMode_MouseX11 },
3716 { 1002, PrivMode_MouseBtnEvent }, 3801 { 1002, PrivMode_MouseBtnEvent },
3717 { 1003, PrivMode_MouseAnyEvent }, 3802 { 1003, PrivMode_MouseAnyEvent },
3718#if ENABLE_FRILLS 3803#if ENABLE_FRILLS
3804 { 1004, PrivMode_FocusEvent },
3719 { 1005, PrivMode_ExtModeMouse }, 3805 { 1005, PrivMode_ExtModeMouse },
3720#endif 3806#endif
3721 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3807 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3722 { 1011, PrivMode_Keypress }, // rxvt extension 3808 { 1011, PrivMode_Keypress }, // rxvt extension
3723#if ENABLE_FRILLS 3809#if ENABLE_FRILLS
… …
3811 scrollBar.map (state); 3897 scrollBar.map (state);
3812 resize_all_windows (0, 0, 0); 3898 resize_all_windows (0, 0, 0);
3813 scr_touch (true); 3899 scr_touch (true);
3814 break; 3900 break;
3815#endif 3901#endif
3902#ifdef CURSOR_BLINK
3903 case 12:
3904 cursor_blink_reset ();
3905 break;
3906#endif
3816 case 25: /* visible/invisible cursor */ 3907 case 25: /* visible/invisible cursor */
3817 scr_cursor_visible (state); 3908 scr_cursor_visible (state);
3818 break; 3909 break;
3819 /* case 35: - shift keys */ 3910 /* case 35: - shift keys */
3820 /* case 40: - 80 <--> 132 mode */ 3911 /* case 40: - 80 <--> 132 mode */
… …
3925 //case 19: // ninth alt font 4016 //case 19: // ninth alt font
3926 //case 20: // gothic 4017 //case 20: // gothic
3927 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4018 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3928 rendset = 0, rendstyle = RS_Bold; 4019 rendset = 0, rendstyle = RS_Bold;
3929 break; 4020 break;
3930 case 22: // normal intensity 4021 case 22: // bold off (vt220)
3931 rendset = 0, rendstyle = RS_Bold; 4022 rendset = 0, rendstyle = RS_Bold;
3932 break; 4023 break;
3933 case 23: // disable italic 4024 case 23: // disable italic
3934 rendset = 0, rendstyle = RS_Italic; 4025 rendset = 0, rendstyle = RS_Italic;
3935 break; 4026 break;
3936 case 24: 4027 case 24: // underline off (vt220)
3937 rendset = 0, rendstyle = RS_Uline; 4028 rendset = 0, rendstyle = RS_Uline;
3938 break; 4029 break;
3939 case 25: 4030 case 25: // blink off (vt220)
3940 rendset = 0, rendstyle = RS_Blink; 4031 rendset = 0, rendstyle = RS_Blink;
3941 break; 4032 break;
3942 case 26: // variable spacing (iso 8613) 4033 case 26: // variable spacing (iso 8613)
3943 rendset = 0, rendstyle = RS_Blink; 4034 rendset = 0, rendstyle = RS_Blink;
3944 break; 4035 break;
3945 case 27: 4036 case 27: // reverse off (vt220)
3946 rendset = 0, rendstyle = RS_RVid; 4037 rendset = 0, rendstyle = RS_RVid;
3947 break; 4038 break;
3948 //case 28: // visible. NYI 4039 //case 28: // visible. NYI
3949 //case 29: // not crossed-out 4040 //case 29: // not crossed-out
3950 } 4041 }
… …
3971 if (nargs > i + 2 && arg[i + 1] == 5) 4062 if (nargs > i + 2 && arg[i + 1] == 5)
3972 { 4063 {
3973 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4064 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3974 i += 2; 4065 i += 2;
3975 } 4066 }
4067 else if (nargs > i + 4 && arg[i + 1] == 2)
4068 {
4069 unsigned int r = arg[i + 2];
4070 unsigned int g = arg[i + 3];
4071 unsigned int b = arg[i + 4];
4072 unsigned int idx = map_rgb24_color (r, g, b);
4073 scr_color (idx, Color_fg);
4074 i += 4;
4075 }
3976 break; 4076 break;
3977 case 39: /* default fg */ 4077 case 39: /* default fg */
3978 scr_color (Color_fg, Color_fg); 4078 scr_color (Color_fg, Color_fg);
3979 break; 4079 break;
3980 4080
… …
3991 case 48: // set bg color, ISO 8613-6 4091 case 48: // set bg color, ISO 8613-6
3992 if (nargs > i + 2 && arg[i + 1] == 5) 4092 if (nargs > i + 2 && arg[i + 1] == 5)
3993 { 4093 {
3994 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4094 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3995 i += 2; 4095 i += 2;
4096 }
4097 else if (nargs > i + 4 && arg[i + 1] == 2)
4098 {
4099 unsigned int r = arg[i + 2];
4100 unsigned int g = arg[i + 3];
4101 unsigned int b = arg[i + 4];
4102 unsigned int idx = map_rgb24_color (r, g, b);
4103 scr_color (idx, Color_bg);
4104 i += 4;
3996 } 4105 }
3997 break; 4106 break;
3998 case 49: /* default bg */ 4107 case 49: /* default bg */
3999 scr_color (Color_bg, Color_bg); 4108 scr_color (Color_bg, Color_bg);
4000 break; 4109 break;
… …
4028} 4137}
4029 4138
4030void 4139void
4031rxvt_term::set_cursor_style (int style) 4140rxvt_term::set_cursor_style (int style)
4032{ 4141{
4033 if (!IN_RANGE_INC (style, 0, 4)) 4142 if (!IN_RANGE_INC (style, 0, 6))
4034 return; 4143 return;
4035 4144
4145 if (style == 0)
4146 style = 1;
4147
4148 cursor_type = (style - 1) / 2;
4036 set_option (Opt_cursorUnderline, style >= 3); 4149 set_option (Opt_cursorUnderline, cursor_type == 1);
4037 4150
4038#ifdef CURSOR_BLINK 4151#ifdef CURSOR_BLINK
4039 set_option (Opt_cursorBlink, !style || (style & 1)); 4152 set_option (Opt_cursorBlink, style & 1);
4040 cursor_blink_reset (); 4153 cursor_blink_reset ();
4041#endif 4154#endif
4042 4155
4043 want_refresh = 1; 4156 want_refresh = 1;
4044} 4157}
4045/*}}} */ 4158/*}}} */
4046 4159
4047/* ------------------------------------------------------------------------- */ 4160/* ---------------------------------------------------------------------- */
4161/* Write data to the pty as typed by the user, pasted with the mouse,
4162 * or generated by us in response to a query ESC sequence.
4163 */
4048 4164
4049/* 4165/*
4050 * Send printf () formatted output to the command. 4166 * Send printf () formatted output to the command.
4051 * Only use for small amounts of data. 4167 * Only use for small amounts of data.
4052 */ 4168 */
… …
4060 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4176 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4061 va_end (arg_ptr); 4177 va_end (arg_ptr);
4062 tt_write (buf, strlen (buf)); 4178 tt_write (buf, strlen (buf));
4063} 4179}
4064 4180
4065/* ---------------------------------------------------------------------- */
4066/* Write data to the pty as typed by the user, pasted with the mouse, 4181/* Write data to the pty as typed by the user. */
4067 * or generated by us in response to a query ESC sequence. 4182void
4068 */ 4183rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4069static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4184{
4185 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4186 return;
4187
4188 if (option (Opt_scrollTtyKeypress))
4189 if (view_start)
4190 {
4191 view_start = 0;
4192 want_refresh = 1;
4193 }
4194
4195 tt_write_ (data, len);
4196}
4070 4197
4071void 4198void
4072rxvt_term::tt_write (const char *data, unsigned int len) 4199rxvt_term::tt_write (const char *data, unsigned int len)
4073{ 4200{
4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4201 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4075 return; 4202 return;
4076 4203
4204 tt_write_ (data, len);
4205}
4206
4207static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4208
4209void
4210rxvt_term::tt_write_ (const char *data, unsigned int len)
4211{
4077 if (pty->pty < 0) 4212 if (pty->pty < 0)
4078 return; 4213 return;
4079 4214
4080 if (v_buflen == 0) 4215 if (v_buflen == 0)
4081 { 4216 {

Diff Legend

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