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.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC vs.
Revision 1.566 by sf-exg, Sat Sep 12 14:03:35 2015 UTC

… …
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 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 kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
421 414
422#if ISO_14755 415#if ISO_14755
423 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
424 return; 417 return;
425#endif 418#endif
… …
482 } 475 }
483 } 476 }
484 else 477 else
485 len = 0; 478 len = 0;
486 } 479 }
487
488 valid_keysym = status_return == XLookupKeySym
489 || status_return == XLookupBoth;
490 } 480 }
491 else 481 else
492#endif 482#endif
493 { 483 {
494 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
495 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
496 } 488 {
489 KeySym orig_keysym = keysym;
497 490
498 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)
499 { 704 {
500#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
501 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
502 return; 707 return;
503#endif 708#endif
504 709
505 if (saveLines) 710 if (saveLines)
506 { 711 {
… …
562#endif 767#endif
563 } 768 }
564 769
565 if (shft) 770 if (shft)
566 { 771 {
567 /* Shift + F1 - F10 generates F11 - F20 */
568 if (keysym >= XK_F1 && keysym <= XK_F10)
569 {
570 keysym += (XK_F11 - XK_F1);
571 shft = 0; /* turn off Shift */
572 }
573 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
574 { 773 {
575 switch (keysym) 774 switch (keysym)
576 { 775 {
577 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
578 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
664 { 863 {
665 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
666 return; 865 return;
667 } 866 }
668#endif 867#endif
669
670 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
671 {
672 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
673 unsigned int newlen = 1;
674
675 if (ev.state & ModNumLockMask)
676 kp = false;
677
678 keysym = translate_keypad (keysym, kp);
679
680 switch (keysym)
681 {
682#ifndef NO_BACKSPACE_KEY
683 case XK_BackSpace:
684 if (priv_modes & PrivMode_HaveBackSpace)
685 {
686 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
687 ^ !!ctrl) ? '\b' : '\177';
688 kbuf[1] = '\0';
689 }
690 else
691 strcpy (kbuf, rs[Rs_backspace_key]);
692 break;
693#endif
694#ifndef NO_DELETE_KEY
695 case XK_Delete:
696 strcpy (kbuf, rs[Rs_delete_key]);
697 break;
698#endif
699 case XK_Tab:
700 if (shft)
701 strcpy (kbuf, "\033[Z");
702 else
703 {
704#ifdef CTRL_TAB_MAKES_META
705 if (ctrl)
706 meta = 1;
707#endif
708#ifdef MOD4_TAB_MAKES_META
709 if (ev.state & Mod4Mask)
710 meta = 1;
711#endif
712 newlen = 0;
713 }
714 break;
715
716 case XK_Up: /* "\033[A" */
717 case XK_Down: /* "\033[B" */
718 case XK_Right: /* "\033[C" */
719 case XK_Left: /* "\033[D" */
720 strcpy (kbuf, "\033[Z");
721 kbuf[2] = "DACB"[keysym - XK_Left];
722 /* do Shift first */
723 if (shft)
724 kbuf[2] = "dacb"[keysym - XK_Left];
725 else if (ctrl)
726 {
727 kbuf[1] = 'O';
728 kbuf[2] = "dacb"[keysym - XK_Left];
729 }
730 else if (priv_modes & PrivMode_aplCUR)
731 kbuf[1] = 'O';
732 break;
733
734 case XK_KP_Enter:
735 /* allow shift to override */
736 if (kp)
737 {
738 strcpy (kbuf, "\033OM");
739 break;
740 }
741
742 /* FALLTHROUGH */
743
744 case XK_Return:
745 if (priv_modes & PrivMode_LFNL)
746 {
747 kbuf[0] = '\015';
748 kbuf[1] = '\012';
749 kbuf[2] = '\0';
750 }
751 else
752 {
753 kbuf[0] = '\015';
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_KP_F1: /* "\033OP" */
759 case XK_KP_F2: /* "\033OQ" */
760 case XK_KP_F3: /* "\033OR" */
761 case XK_KP_F4: /* "\033OS" */
762 strcpy (kbuf, "\033OP");
763 kbuf[2] += (keysym - XK_KP_F1);
764 break;
765
766 case XK_KP_Multiply: /* "\033Oj" : "*" */
767 case XK_KP_Add: /* "\033Ok" : "+" */
768 case XK_KP_Separator: /* "\033Ol" : "," */
769 case XK_KP_Subtract: /* "\033Om" : "-" */
770 case XK_KP_Decimal: /* "\033On" : "." */
771 case XK_KP_Divide: /* "\033Oo" : "/" */
772 case XK_KP_0: /* "\033Op" : "0" */
773 case XK_KP_1: /* "\033Oq" : "1" */
774 case XK_KP_2: /* "\033Or" : "2" */
775 case XK_KP_3: /* "\033Os" : "3" */
776 case XK_KP_4: /* "\033Ot" : "4" */
777 case XK_KP_5: /* "\033Ou" : "5" */
778 case XK_KP_6: /* "\033Ov" : "6" */
779 case XK_KP_7: /* "\033Ow" : "7" */
780 case XK_KP_8: /* "\033Ox" : "8" */
781 case XK_KP_9: /* "\033Oy" : "9" */
782 /* allow shift to override */
783 if (kp)
784 {
785 strcpy (kbuf, "\033Oj");
786 kbuf[2] += (keysym - XK_KP_Multiply);
787 }
788 else
789 {
790 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
791 kbuf[1] = '\0';
792 }
793 break;
794
795 default:
796 {
797 int param = map_function_key (keysym);
798 if (param > 0)
799 sprintf (kbuf,"\033[%d~", param);
800 else
801 newlen = 0;
802 }
803 break;
804 }
805
806 if (newlen)
807 len = strlen (kbuf);
808
809 if (len > 0)
810 {
811 /*
812 * pass Shift/Control indicators for function keys ending with `~'
813 *
814 * eg,
815 * Prior = "ESC[5~"
816 * Shift+Prior = "ESC[5$"
817 * Ctrl+Prior = "ESC[5^"
818 * Ctrl+Shift+Prior = "ESC[5@"
819 */
820 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
821 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
822
823 /*
824 * Pass meta for all function keys, if 'meta' option set
825 */
826#ifdef META8_OPTION
827 if (meta && (meta_char == 0x80))
828 kbuf[len - 1] |= 0x80;
829#endif
830 }
831
832 }
833 else if (ctrl && keysym == XK_minus)
834 {
835 len = 1;
836 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
837 }
838 else if (keysym == XK_ISO_Left_Tab)
839 {
840 strcpy (kbuf, "\033[Z");
841 len = 3;
842 }
843 else
844 {
845#ifdef META8_OPTION
846 /* set 8-bit on */
847 if (meta && (meta_char == 0x80))
848 {
849 char *ch;
850
851 for (ch = kbuf; ch < kbuf + len; ch++)
852 *ch |= 0x80;
853
854 meta = 0;
855 }
856#endif
857 /* nil */ ;
858 }
859 } 868 }
860
861 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
862 return;
863 869
864 if (len <= 0) 870 if (len <= 0)
865 return; /* not mapped */ 871 return; /* not mapped */
866 872
867 if (option (Opt_scrollTtyKeypress))
868 if (view_start)
869 {
870 view_start = 0;
871 want_refresh = 1;
872 }
873
874 /* escape prefix */
875 if (meta
876#ifdef META8_OPTION
877 && meta_char == C0_ESC
878#endif
879 )
880 {
881 const char ch = C0_ESC;
882 tt_write (&ch, 1);
883 }
884
885 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
886} 874}
887 875
888void ecb_cold 876void ecb_cold
889rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
890{ 878{
… …
1046 1034
1047#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1048void 1036void
1049rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1050{ 1038{
1039 if (!focus)
1040 return;
1041
1051 if (hidden_cursor) 1042 if (hidden_cursor)
1052 { 1043 {
1053 hidden_cursor = 0; 1044 hidden_cursor = 0;
1054 want_refresh = 1; 1045 want_refresh = 1;
1055 } 1046 }
1056 1047
1057 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1058 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1059 else 1050 else
1060 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1061} 1052}
1062 1053
… …
1251 1242
1252void ecb_cold 1243void ecb_cold
1253rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1254{ 1245{
1255 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1256 recolour_cursor (); 1247 recolor_cursor ();
1257 1248
1258#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1259 hidden_pointer = 0; 1250 hidden_pointer = 0;
1260 1251
1261 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1621 case MotionNotify: 1612 case MotionNotify:
1622#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1623 if (hidden_pointer) 1614 if (hidden_pointer)
1624 pointer_unblank (); 1615 pointer_unblank ();
1625#endif 1616#endif
1617 if (!bypass_keystate
1626 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1627 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1628 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1629 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1630 break; 1622 break;
1631 1623
1632 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1644 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1645 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1646 &ev.xbutton.state); 1638 &ev.xbutton.state);
1647#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1648 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1649 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1650 { 1643 {
1651#endif
1652#if ISO_14755 1644#if ISO_14755
1653 // 5.4 1645 // 5.4
1654 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1655 { 1647 {
1656 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1705 * shouldn't be scrolling 1697 * shouldn't be scrolling
1706 */ 1698 */
1707 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1708 } 1700 }
1709#endif 1701#endif
1710#ifdef MOUSE_THRESHOLD
1711 } 1702 }
1712#endif
1713 } 1703 }
1714 } 1704 }
1715 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)
1716 { 1706 {
1717 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1791#endif 1781#endif
1792#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1794 { 1784 {
1795 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1796 scr_recolour (); 1786 scr_recolor ();
1797 } 1787 }
1798#endif 1788#endif
1799#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1800 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1801 set_urgency (0); 1791 set_urgency (0);
… …
1838#endif 1828#endif
1839#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1840 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1841 { 1831 {
1842 pix_colors = pix_colors_unfocused; 1832 pix_colors = pix_colors_unfocused;
1843 scr_recolour (); 1833 scr_recolor ();
1844 } 1834 }
1845#endif 1835#endif
1846 1836
1847 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1837 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1848 } 1838 }
1849} 1839}
1850 1840
1851void ecb_cold 1841void ecb_cold
1852rxvt_term::update_fade_color (unsigned int idx) 1842rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1853{ 1843{
1854#if OFF_FOCUS_FADING 1844#if OFF_FOCUS_FADING
1855 if (rs[Rs_fade]) 1845 if (rs[Rs_fade])
1856 { 1846 {
1847 if (!first_time)
1848 pix_colors_focused [idx].free (this);
1849
1857 rgba c; 1850 rgba c;
1858 pix_colors [Color_fade].get (c); 1851 pix_colors [Color_fade].get (c);
1859 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1852 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1860 } 1853 }
1861#endif 1854#endif
… …
1923 iso14755_54 (ev.x, ev.y); 1916 iso14755_54 (ev.x, ev.y);
1924 return; 1917 return;
1925 } 1918 }
1926#endif 1919#endif
1927 1920
1928 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1921 clickintime = ev.time - MEvent.time < multiClickTime;
1929 1922
1930 if (reportmode) 1923 if (reportmode)
1931 { 1924 {
1932 /* mouse report from vt window */ 1925 /* mouse report from vt window */
1933 /* save the xbutton state (for ButtonRelease) */ 1926 /* save the xbutton state (for ButtonRelease) */
… …
2183#ifdef MOUSE_REPORT_DOUBLECLICK 2176#ifdef MOUSE_REPORT_DOUBLECLICK
2184 /* only report the release of 'slow' single clicks */ 2177 /* only report the release of 'slow' single clicks */
2185 if (MEvent.button != AnyButton 2178 if (MEvent.button != AnyButton
2186 && (ev.button != MEvent.button 2179 && (ev.button != MEvent.button
2187 || (ev.time - MEvent.time 2180 || (ev.time - MEvent.time
2188 > MULTICLICK_TIME / 2))) 2181 > multiClickTime / 2)))
2189 { 2182 {
2190 MEvent.clicks = 0; 2183 MEvent.clicks = 0;
2191 MEvent.button = AnyButton; 2184 MEvent.button = AnyButton;
2192 mouse_report (ev); 2185 mouse_report (ev);
2193 } 2186 }
… …
2583 scr_charset_choose (0); 2576 scr_charset_choose (0);
2584 break; 2577 break;
2585 2578
2586#ifdef EIGHT_BIT_CONTROLS 2579#ifdef EIGHT_BIT_CONTROLS
2587 // 8-bit controls 2580 // 8-bit controls
2588 case 0x90: /* DCS */ 2581 case 0x90: /* DCS */
2589 process_dcs_seq (); 2582 process_dcs_seq ();
2590 break; 2583 break;
2591 case 0x9b: /* CSI */ 2584 case 0x9b: /* CSI */
2592 process_csi_seq (); 2585 process_csi_seq ();
2593 break; 2586 break;
2594 case 0x9d: /* OSC */ 2587 case 0x9d: /* OSC */
2595 process_osc_seq (); 2588 process_osc_seq ();
2596 break; 2589 break;
2597#endif 2590#endif
2598 } 2591 }
2599} 2592}
… …
3104 scr_insert_mode (1); 3097 scr_insert_mode (1);
3105 else if (arg[0] == 20) 3098 else if (arg[0] == 20)
3106 priv_modes |= PrivMode_LFNL; 3099 priv_modes |= PrivMode_LFNL;
3107 break; 3100 break;
3108 3101
3109 case CSI_71: // DESCUSR: set cursor style 3102 case CSI_71: // DECSCUSR: set cursor style
3110 if (prev_ch == ' ') 3103 if (prev_ch == ' ')
3111 set_cursor_style (arg[0]); 3104 set_cursor_style (arg[0]);
3112 break; 3105 break;
3113 3106
3114 /* 3107 /*
… …
3692 { 5, PrivMode_rVideo }, // DECSCNM 3685 { 5, PrivMode_rVideo }, // DECSCNM
3693 { 6, PrivMode_relOrigin }, // DECOM 3686 { 6, PrivMode_relOrigin }, // DECOM
3694 { 7, PrivMode_Autowrap }, // DECAWM 3687 { 7, PrivMode_Autowrap }, // DECAWM
3695 // 8, auto-repeat keys // DECARM 3688 // 8, auto-repeat keys // DECARM
3696 { 9, PrivMode_MouseX10 }, 3689 { 9, PrivMode_MouseX10 },
3690 { 12, PrivMode_BlinkingCursor },
3697 // 18 end FF to printer after print screen 3691 // 18 end FF to printer after print screen
3698 // 19 Print screen prints full screen/scroll region 3692 // 19 Print screen prints full screen/scroll region
3699 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3693 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3700#ifdef scrollBar_esc 3694#ifdef scrollBar_esc
3701 { scrollBar_esc, PrivMode_scrollBar }, 3695 { scrollBar_esc, PrivMode_scrollBar },
… …
3810 scrollBar.map (state); 3804 scrollBar.map (state);
3811 resize_all_windows (0, 0, 0); 3805 resize_all_windows (0, 0, 0);
3812 scr_touch (true); 3806 scr_touch (true);
3813 break; 3807 break;
3814#endif 3808#endif
3809#ifdef CURSOR_BLINK
3810 case 12:
3811 cursor_blink_reset ();
3812 break;
3813#endif
3815 case 25: /* visible/invisible cursor */ 3814 case 25: /* visible/invisible cursor */
3816 scr_cursor_visible (state); 3815 scr_cursor_visible (state);
3817 break; 3816 break;
3818 /* case 35: - shift keys */ 3817 /* case 35: - shift keys */
3819 /* case 40: - 80 <--> 132 mode */ 3818 /* case 40: - 80 <--> 132 mode */
… …
3924 //case 19: // ninth alt font 3923 //case 19: // ninth alt font
3925 //case 20: // gothic 3924 //case 20: // gothic
3926 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3925 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3927 rendset = 0, rendstyle = RS_Bold; 3926 rendset = 0, rendstyle = RS_Bold;
3928 break; 3927 break;
3929 case 22: // normal intensity 3928 case 22: // bold off (vt220)
3930 rendset = 0, rendstyle = RS_Bold; 3929 rendset = 0, rendstyle = RS_Bold;
3931 break; 3930 break;
3932 case 23: // disable italic 3931 case 23: // disable italic
3933 rendset = 0, rendstyle = RS_Italic; 3932 rendset = 0, rendstyle = RS_Italic;
3934 break; 3933 break;
3935 case 24: 3934 case 24: // underline off (vt220)
3936 rendset = 0, rendstyle = RS_Uline; 3935 rendset = 0, rendstyle = RS_Uline;
3937 break; 3936 break;
3938 case 25: 3937 case 25: // blink off (vt220)
3939 rendset = 0, rendstyle = RS_Blink; 3938 rendset = 0, rendstyle = RS_Blink;
3940 break; 3939 break;
3941 case 26: // variable spacing (iso 8613) 3940 case 26: // variable spacing (iso 8613)
3942 rendset = 0, rendstyle = RS_Blink; 3941 rendset = 0, rendstyle = RS_Blink;
3943 break; 3942 break;
3944 case 27: 3943 case 27: // reverse off (vt220)
3945 rendset = 0, rendstyle = RS_RVid; 3944 rendset = 0, rendstyle = RS_RVid;
3946 break; 3945 break;
3947 //case 28: // visible. NYI 3946 //case 28: // visible. NYI
3948 //case 29: // not crossed-out 3947 //case 29: // not crossed-out
3949 } 3948 }
… …
4027} 4026}
4028 4027
4029void 4028void
4030rxvt_term::set_cursor_style (int style) 4029rxvt_term::set_cursor_style (int style)
4031{ 4030{
4032 if (!IN_RANGE_INC (style, 0, 4)) 4031 if (!IN_RANGE_INC (style, 0, 6))
4033 return; 4032 return;
4034 4033
4034 if (style == 0)
4035 style = 1;
4036
4037 cursor_type = (style - 1) / 2;
4035 set_option (Opt_cursorUnderline, style >= 3); 4038 set_option (Opt_cursorUnderline, cursor_type == 1);
4036 4039
4037#ifdef CURSOR_BLINK 4040#ifdef CURSOR_BLINK
4038 set_option (Opt_cursorBlink, !style || (style & 1)); 4041 set_option (Opt_cursorBlink, style & 1);
4039 cursor_blink_reset (); 4042 cursor_blink_reset ();
4040#endif 4043#endif
4041 4044
4042 want_refresh = 1; 4045 want_refresh = 1;
4043} 4046}
4044/*}}} */ 4047/*}}} */
4045 4048
4046/* ------------------------------------------------------------------------- */ 4049/* ---------------------------------------------------------------------- */
4050/* Write data to the pty as typed by the user, pasted with the mouse,
4051 * or generated by us in response to a query ESC sequence.
4052 */
4047 4053
4048/* 4054/*
4049 * Send printf () formatted output to the command. 4055 * Send printf () formatted output to the command.
4050 * Only use for small amounts of data. 4056 * Only use for small amounts of data.
4051 */ 4057 */
… …
4059 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4065 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4060 va_end (arg_ptr); 4066 va_end (arg_ptr);
4061 tt_write (buf, strlen (buf)); 4067 tt_write (buf, strlen (buf));
4062} 4068}
4063 4069
4064/* ---------------------------------------------------------------------- */
4065/* Write data to the pty as typed by the user, pasted with the mouse, 4070/* Write data to the pty as typed by the user. */
4066 * or generated by us in response to a query ESC sequence. 4071void
4067 */ 4072rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4068static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4073{
4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4075 return;
4076
4077 if (option (Opt_scrollTtyKeypress))
4078 if (view_start)
4079 {
4080 view_start = 0;
4081 want_refresh = 1;
4082 }
4083
4084 tt_write_ (data, len);
4085}
4069 4086
4070void 4087void
4071rxvt_term::tt_write (const char *data, unsigned int len) 4088rxvt_term::tt_write (const char *data, unsigned int len)
4072{ 4089{
4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4090 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4074 return; 4091 return;
4075 4092
4093 tt_write_ (data, len);
4094}
4095
4096static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4097
4098void
4099rxvt_term::tt_write_ (const char *data, unsigned int len)
4100{
4076 if (pty->pty < 0) 4101 if (pty->pty < 0)
4077 return; 4102 return;
4078 4103
4079 if (v_buflen == 0) 4104 if (v_buflen == 0)
4080 { 4105 {

Diff Legend

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