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.601 by sf-exg, Sat May 6 06:47:29 2023 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-2014 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2021 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
… …
168 int len; 168 int len;
169 169
170# if ENABLE_COMBINING 170# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
172 { 172 {
173 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 174 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 175 rxvt_composite.expand (ch, chr);
176 } 176 }
177 else 177 else
178# endif 178# endif
… …
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{
… …
1029/* checks whether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1030void 1017void
1031rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1032{ 1019{
1033 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1035 1022
1036 display->flush (); 1023 display->flush ();
1037} 1024}
1038 1025
1039void 1026void
… …
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))
… …
1287#endif 1277#endif
1288 1278
1289void 1279void
1290rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1291{ 1281{
1292 int button_number, key_state = 0; 1282 int button_number, state = 0;
1293 int x, y; 1283 int x, y;
1294 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1295 1285
1296 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1297 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1298 1288
1299 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1301 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1302 return; 1292 return;
1303 1293
1304 mouse_row = x; 1294 mouse_row = x;
1305 mouse_col = y; 1295 mouse_col = y;
1306 code += 32; 1296 state += 32;
1307 }
1308
1309 if (MEvent.button == AnyButton)
1310 button_number = 3;
1311 else
1312 { 1297 }
1298
1313 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1314 /* add 0x3D for wheel events, like xterm does */ 1300 if (button_number > 10)
1301 return;
1302 else if (button_number >= 7)
1303 button_number += 128 - 7;
1315 if (button_number >= 3) 1304 else if (button_number >= 3)
1316 button_number += 64 - 3; 1305 button_number += 64 - 3;
1317 }
1318 1306
1319 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1320 { 1308 {
1321 /* 1309 /*
1322 * do not report ButtonRelease 1310 * do not report ButtonRelease
1323 * no state info allowed 1311 * no state info allowed
1324 */ 1312 */
1325 key_state = 0; 1313 if (release)
1326 if (button_number == 3)
1327 return; 1314 return;
1328 } 1315 }
1329 else 1316 else
1330 { 1317 {
1331 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1333 * 8 = Meta 1320 * 8 = Meta
1334 * 16 = Control 1321 * 16 = Control
1335 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1336 * 32 = Double Click 1323 * 32 = Double Click
1337 */ 1324 */
1338 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1339 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1340 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1341#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1342 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1343#endif 1330#endif
1344 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1345 1334
1346#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1347 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1348 if (key_state & 16) 1337 if (state & 16)
1349 fputc ('C', stderr); 1338 fputc ('C', stderr);
1350 if (key_state & 4) 1339 if (state & 4)
1351 fputc ('S', stderr); 1340 fputc ('S', stderr);
1352 if (key_state & 8) 1341 if (state & 8)
1353 fputc ('A', stderr); 1342 fputc ('A', stderr);
1354 if (key_state & 32) 1343 if (state & 32)
1355 fputc ('2', stderr); 1344 fputc ('2', stderr);
1356 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1357 button_number, 1346 button_number,
1358 x, 1347 x,
1359 y); 1348 y);
1360#endif 1349#endif
1361 1350
1362#if ENABLE_FRILLS 1351#if ENABLE_FRILLS
1363 if (priv_modes & PrivMode_ExtMouseRight) 1352 if (priv_modes & PrivMode_ExtMouseSGR)
1353 tt_printf ("\033[<%d;%d;%d%c",
1354 button_number + state,
1355 x,
1356 y,
1357 release ? 'm' : 'M');
1358 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1364 tt_printf ("\033[%d;%d;%dM", 1359 tt_printf ("\033[%d;%d;%dM",
1365 code + button_number + key_state, 1360 code,
1366 x, 1361 x,
1367 y); 1362 y);
1368 else if (priv_modes & PrivMode_ExtModeMouse) 1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1369 tt_printf ("\033[M%c%lc%lc", 1365 tt_printf ("\033[M%c%lc%lc",
1370 code + button_number + key_state, 1366 code,
1371 wint_t (32 + x), 1367 wint_t (32 + x),
1372 wint_t (32 + y)); 1368 wint_t (32 + y));
1369 else
1370 tt_printf ("\033[M%c%c%lc%lc",
1371 0xc0 + (code >> 6),
1372 0x80 + (code & 0x3f),
1373 wint_t (32 + x),
1374 wint_t (32 + y));
1373 else 1375 else
1374#endif 1376#endif
1375 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1376 code + button_number + key_state, 1378 code,
1377 32 + x, 1379 32 + x,
1378 32 + y); 1380 32 + y);
1379} 1381}
1380 1382
1381/*{{{ process an X event */ 1383/*{{{ process an X event */
… …
1492 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1493 ; 1495 ;
1494 1496
1495 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1496 1498
1497 bool moved = false;
1498#ifdef HAVE_BG_PIXMAP
1499 if (bg_window_position_sensitive ())
1500 {
1501 want_position_change = true;
1502 if (bg_img == 0)
1503 moved = true;
1504 }
1505#endif
1506
1507 if (want_position_change) 1499 if (want_position_change)
1508 { 1500 {
1509 int x, y; 1501 int x, y;
1510 1502
1511 if (ev.xconfigure.send_event) 1503 if (ev.xconfigure.send_event)
… …
1519 if (x != parent_x || y != parent_y) 1511 if (x != parent_x || y != parent_y)
1520 { 1512 {
1521 parent_x = x; 1513 parent_x = x;
1522 parent_y = y; 1514 parent_y = y;
1523 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1524 moved = true;
1525 } 1516 }
1526 } 1517 }
1527 1518
1528 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1529 { 1520 {
1530 seen_resize = 1; 1521 seen_resize = 1;
1531 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1532 } 1523 }
1533 else
1534 {
1535#ifdef HAVE_BG_PIXMAP
1536 if (moved)
1537 update_background ();
1538#endif
1539 }
1540 1524
1541 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 } 1526 }
1543 break; 1527 break;
1544 1528
… …
1553 case SelectionRequest: 1537 case SelectionRequest:
1554 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1555 break; 1539 break;
1556 1540
1557 case MapNotify: 1541 case MapNotify:
1558#ifdef HAVE_BG_PIXMAP
1559 // This is needed at startup for the case of no window manager
1560 // or a non-reparenting window manager and also because we
1561 // defer bg image updates if the window is not mapped. The
1562 // short delay is to optimize for multiple ConfigureNotify
1563 // events at startup when the window manager reparents the
1564 // window, so as to perform the computation after we have
1565 // received all of them.
1566 if (bg_img == 0)
1567 update_background_ev.start (0.025);
1568#endif
1569 mapped = 1; 1542 mapped = 1;
1570#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1571 text_blink_ev.start (); 1544 text_blink_ev.start ();
1572#endif 1545#endif
1573 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1622 case MotionNotify: 1595 case MotionNotify:
1623#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1624 if (hidden_pointer) 1597 if (hidden_pointer)
1625 pointer_unblank (); 1598 pointer_unblank ();
1626#endif 1599#endif
1600 if (!bypass_keystate
1627 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1628 || priv_modes & PrivMode_MouseAnyEvent) 1602 || priv_modes & PrivMode_MouseAnyEvent))
1629 mouse_report (ev.xbutton); 1603 mouse_report (ev.xbutton);
1630 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1631 break; 1605 break;
1632 1606
1633 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
… …
1645 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1646 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1647 &ev.xbutton.state); 1621 &ev.xbutton.state);
1648#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1649 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1650 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1651 { 1626 {
1652#endif
1653#if ISO_14755 1627#if ISO_14755
1654 // 5.4 1628 // 5.4
1655 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1656 { 1630 {
1657 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1706 * shouldn't be scrolling 1680 * shouldn't be scrolling
1707 */ 1681 */
1708 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1709 } 1683 }
1710#endif 1684#endif
1711#ifdef MOUSE_THRESHOLD
1712 } 1685 }
1713#endif
1714 } 1686 }
1715 } 1687 }
1716 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1688 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1717 { 1689 {
1718 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1792#endif 1764#endif
1793#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1795 { 1767 {
1796 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1797 scr_recolour (); 1769 scr_recolor ();
1798 } 1770 }
1799#endif 1771#endif
1800#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1801 if (option (Opt_urgentOnBell)) 1773 if (option (Opt_urgentOnBell))
1802 set_urgency (0); 1774 set_urgency (0);
1775
1776 if (priv_modes & PrivMode_FocusEvent)
1777 tt_printf ("\x1b[I");
1803#endif 1778#endif
1804 1779
1805 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1806 } 1781 }
1807} 1782}
… …
1815 want_refresh = 1; 1790 want_refresh = 1;
1816 1791
1817#if ENABLE_FRILLS 1792#if ENABLE_FRILLS
1818 if (option (Opt_urgentOnBell)) 1793 if (option (Opt_urgentOnBell))
1819 set_urgency (0); 1794 set_urgency (0);
1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1820#endif 1798#endif
1821#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1822 if (iso14755buf) 1800 if (iso14755buf)
1823 { 1801 {
1824 iso14755buf = 0; 1802 iso14755buf = 0;
… …
1839#endif 1817#endif
1840#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1841 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1842 { 1820 {
1843 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1844 scr_recolour (); 1822 scr_recolor ();
1845 } 1823 }
1846#endif 1824#endif
1847 1825
1848 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1849 } 1827 }
1850} 1828}
1851 1829
1852void ecb_cold 1830void ecb_cold
1853rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1854{ 1832{
1855#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1856 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1857 { 1835 {
1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1838
1858 rgba c; 1839 rgba c;
1859 pix_colors [Color_fade].get (c); 1840 pix_colors [Color_fade].get (c);
1860 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1841 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1861 } 1842 }
1862#endif 1843#endif
1863} 1844}
1864 1845
1865#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1846#if ENABLE_PERL
1866void ecb_hot 1847void ecb_hot
1867rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1868{ 1849{
1869 make_current (); 1850 make_current ();
1870 1851
… …
1880 * use the property to determine the pixmap. We use it later on. 1861 * use the property to determine the pixmap. We use it later on.
1881 */ 1862 */
1882 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1883 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1884 { 1865 {
1885#if BG_IMAGE_FROM_ROOT
1886 if (option (Opt_transparent))
1887 {
1888 rxvt_img::new_from_root (this)->replace (root_img);
1889 update_background ();
1890 }
1891#endif
1892 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1893 } 1867 }
1894 1868
1895 break; 1869 break;
1896 } 1870 }
… …
1924 iso14755_54 (ev.x, ev.y); 1898 iso14755_54 (ev.x, ev.y);
1925 return; 1899 return;
1926 } 1900 }
1927#endif 1901#endif
1928 1902
1929 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1903 clickintime = ev.time - MEvent.time < multiClickTime;
1930 1904
1931 if (reportmode) 1905 if (reportmode)
1932 { 1906 {
1933 /* mouse report from vt window */ 1907 /* mouse report from vt window */
1934 /* save the xbutton state (for ButtonRelease) */ 1908 /* save the xbutton state (for ButtonRelease) */
… …
2177 2151
2178 if (reportmode) 2152 if (reportmode)
2179 { 2153 {
2180 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2181 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2182 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2183 return; 2157 return;
2184#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2185 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2186 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2187 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2188 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2189 > MULTICLICK_TIME / 2))) 2163 > multiClickTime / 2)))
2190 { 2164 {
2191 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2192 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2193 mouse_report (ev); 2167 mouse_report (ev);
2194 } 2168 }
2195#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2196 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2197 mouse_report (ev); 2171 mouse_report (ev);
2198#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2199 return; 2173 return;
2200 } 2174 }
2201 2175
… …
2388 } 2362 }
2389} 2363}
2390 2364
2391// read the next character 2365// read the next character
2392wchar_t ecb_hot 2366wchar_t ecb_hot
2393rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2394{ 2368{
2395 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2396 { 2370 {
2397 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2398 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2399 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2400 2374
2401 wchar_t wc; 2375 wchar_t wc;
2402 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2403 2377
… …
2424 return NOCHAR; 2398 return NOCHAR;
2425} 2399}
2426 2400
2427// read the next octet 2401// read the next octet
2428uint32_t ecb_hot 2402uint32_t ecb_hot
2429rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2430{ 2404{
2431 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2432 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2433 : NOCHAR; 2407 : NOCHAR;
2434} 2408}
2435 2409
2436static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2437 2411
2438wchar_t ecb_hot 2412wchar_t ecb_hot
2439rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc ()
2440{ 2414{
2441 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2442 2416
2443 if (c == NOCHAR) 2417 if (c == NOCHAR)
2444 throw out_of_input; 2418 throw out_of_input;
2445 2419
2446 return c; 2420 return c;
2447} 2421}
2448 2422
2449uint32_t ecb_hot 2423uint32_t ecb_hot
2450rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2451{ 2425{
2452 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2453 2427
2454 if (c == NOCHAR) 2428 if (c == NOCHAR)
2455 throw out_of_input; 2429 throw out_of_input;
… …
2584 scr_charset_choose (0); 2558 scr_charset_choose (0);
2585 break; 2559 break;
2586 2560
2587#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
2588 // 8-bit controls 2562 // 8-bit controls
2589 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
2590 process_dcs_seq (); 2564 process_dcs_seq ();
2591 break; 2565 break;
2592 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2593 process_csi_seq (); 2567 process_csi_seq ();
2594 break; 2568 break;
2595 case 0x9d: /* OSC */ 2569 case 0x9d: /* OSC */
2596 process_osc_seq (); 2570 process_osc_seq ();
2597 break; 2571 break;
2598#endif 2572#endif
2599 } 2573 }
2600} 2574}
… …
2728 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2729 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2730 } 2704 }
2731 break; 2705 break;
2732 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
2733 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2734 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2735 // used by original rxvt for rob nations own graphics mode 2710 // used by original rxvt for rob nations own graphics mode
2736 if (cmd_getc () == 'Q') 2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2737 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2738 break; 2713 break;
2714#endif
2739 2715
2740 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2741 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2742 scr_set_tab (1); 2718 scr_set_tab (1);
2743 break; 2719 break;
… …
2901 break; 2877 break;
2902 2878
2903 case '?': 2879 case '?':
2904 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2905 process_terminal_mode (ch, priv, nargs, arg); 2881 process_terminal_mode (ch, priv, nargs, arg);
2882 if (prev_ch == '$' && ch == 'p')
2883 process_terminal_mode (ch, priv, nargs, arg);
2906 break; 2884 break;
2907 2885
2908 case '!': 2886 case '!':
2909 if (ch == CSI_70) 2887 if (ch == CSI_70)
2910 { 2888 {
2911 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2912 scr_soft_reset (); 2890 scr_soft_reset ();
2913 2891
2914 static const int pm_h[] = { 7, 25 }; 2892 static const int pm_h[] = { 7, 25 };
2915 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2893 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2916 2894
2917 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2895 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2918 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2896 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2919 } 2897 }
2920 break; 2898 break;
… …
2950 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2951 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
2952 break; 2930 break;
2953 2931
2954 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2955 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2956#ifdef ISO6429 2934#ifdef ISO6429
2957 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
2958#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
2959 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
2960#endif 2938#endif
… …
3051 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3052 if (option (Opt_insecure)) 3030 if (option (Opt_insecure))
3053 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3054 break; 3032 break;
3055 case 8: /* unofficial extension */ 3033 case 8: /* unofficial extension */
3034 {
3035 string_term st;
3036 st.v[0] = CHAR_ST;
3037 st.v[1] = '\0';
3056 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3057 break; 3039 break;
3040 }
3058 } 3041 }
3059 break; 3042 break;
3060 3043
3061 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3062 switch (arg[0]) 3045 switch (arg[0])
… …
3105 scr_insert_mode (1); 3088 scr_insert_mode (1);
3106 else if (arg[0] == 20) 3089 else if (arg[0] == 20)
3107 priv_modes |= PrivMode_LFNL; 3090 priv_modes |= PrivMode_LFNL;
3108 break; 3091 break;
3109 3092
3110 case CSI_71: // DESCUSR: set cursor style 3093 case CSI_71: // DECSCUSR: set cursor style
3111 if (prev_ch == ' ') 3094 if (prev_ch == ' ')
3112 set_cursor_style (arg[0]); 3095 set_cursor_style (arg[0]);
3113 break; 3096 break;
3114 3097
3115 /* 3098 /*
… …
3247/* 3230/*
3248 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3249 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3250 */ 3233 */
3251char * 3234char *
3252rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3253{ 3236{
3254 unicode_t ch; 3237 unicode_t ch;
3255 bool seen_esc = false; 3238 bool seen_esc = false;
3256 unsigned int n = 0; 3239 unsigned int n = 0;
3257 wchar_t string[CBUFSIZ]; 3240 wchar_t string[CBUFSIZ];
… …
3286 string[n++] = ch; 3269 string[n++] = ch;
3287 } 3270 }
3288 3271
3289 string[n++] = '\0'; 3272 string[n++] = '\0';
3290 3273
3291 ends_how = (ch == 0x5c ? C0_ESC : ch); 3274 n = 0;
3275 if (ch == 0x5c)
3276 st.v[n++] = C0_ESC;
3277 st.v[n++] = ch;
3278 st.v[n] = '\0';
3292 3279
3293 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3294} 3281}
3295 3282
3296/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3302{ 3289{
3303 /* 3290 /*
3304 * Not handled yet 3291 * Not handled yet
3305 */ 3292 */
3306 3293
3307 unicode_t eh; 3294 string_term st;
3308 char *s = get_to_st (eh); 3295 char *s = get_to_st (st);
3309 if (s) 3296 if (s)
3310 free (s); 3297 free (s);
3311 3298
3312 return; 3299 return;
3313} 3300}
… …
3325 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3326 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3327 3314
3328 if (ch == ';') 3315 if (ch == ';')
3329 { 3316 {
3330 unicode_t eh; 3317 string_term st;
3331 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3332 3319
3333 if (s) 3320 if (s)
3334 { 3321 {
3335 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3336 free (s); 3323 free (s);
3337 } 3324 }
3338 } 3325 }
3339} 3326}
3340 3327
3328static unsigned int
3329colorcube_index (unsigned int idx_r,
3330 unsigned int idx_g,
3331 unsigned int idx_b)
3332{
3333 assert (idx_r < Red_levels);
3334 assert (idx_g < Green_levels);
3335 assert (idx_b < Blue_levels);
3336
3337 return idx_r * Blue_levels * Green_levels +
3338 idx_g * Blue_levels +
3339 idx_b;
3340}
3341
3342/*
3343 * Find the nearest color slot in the hidden color cube,
3344 * adapt its value to the 32bit RGBA color.
3345 */
3346unsigned int
3347rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3348{
3349 r &= 0xff;
3350 g &= 0xff;
3351 b &= 0xff;
3352 a &= 0xff;
3353
3354 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3355
3356 /* we allow one of the 6 closest neighbouring colours */
3357 /* to replace the current color, if they not used recently */
3358 #if 0
3359 static const unsigned char dxyz[][3] = {
3360 0, 0, 0,
3361 0, 0, 4,
3362 0, 4, 4,
3363 4, 4, 0,
3364 4, 0, 4,
3365 0, 4, 0,
3366 4, 0, 0,
3367 };
3368 #else
3369 // silly compressed verlapping triplets version of above
3370 static const unsigned char dxyz[] = {
3371 0, 0, 0, 4, 4, 0, 4, 0, 0,
3372 };
3373 #endif
3374
3375 static const unsigned char color_level[8][32] = {
3376 // neighbour index
3377 {0, 0, 1, 0, 0, 1, 1, 2, 2, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3378 {0, 1, 0, 1, 1, 2, 1, 1, 2, 2, 3, 3, 2, 2, 2, 3, 3, 3, 4, 4, 4, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4},
3379 {0, 0, 1, 2, 1, 1, 2, 3, 3, 2, 2, 3, 3, 4, 4, 3, 3, 3, 4, 4, 5, 5, 5, 4, 4, 4, 5, 5, 5, 5, 5, 5},
3380 {0, 0, 2, 1, 2, 3, 2, 2, 3, 4, 4, 3, 3, 4, 4, 5, 5, 4, 4, 5, 5, 5, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6},
3381 // Red_levels/Green_levels/Blue_levels index
3382 {0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3},
3383 {0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4},
3384 {0, 1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5},
3385 {0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6},
3386 };
3387
3388 unsigned int idx;
3389
3390 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3391 {
3392 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3393 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3394 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3395 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3396
3397 if (n == 0)
3398 idx = index;
3399
3400 if (rgb24_color[index] == color)
3401 {
3402 rgb24_seqno[index] = ++rgb24_sequence;
3403 return index + minTermCOLOR24;
3404 }
3405
3406 // minor issue: could update index 0 few more times
3407 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3408 {
3409 idx = index;
3410 goto update;
3411 }
3412
3413 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3414 // but also handles wrap around values well enough
3415 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3416 idx = index;
3417 }
3418
3419update:
3420 rgb24_color[idx] = color;
3421 rgb24_seqno[idx] = ++rgb24_sequence;
3422
3423 idx += minTermCOLOR24;
3424 pix_colors_focused [idx].free (this);
3425 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3426 update_fade_color (idx, false);
3427
3428 return idx;
3429}
3430
3341void 3431void
3342rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3432rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3343{ 3433{
3344 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3345 { 3435 {
3346 rgba c; 3436 rgba c;
3347 pix_colors_focused[color].get (c); 3437 pix_colors_focused[color].get (c);
3438 char rgba_str[32];
3348 3439
3349#if XFT 3440#if XFT
3350 if (c.a != rgba::MAX_CC) 3441 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); 3442 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3352 else 3443 else
3353#endif 3444#endif
3354 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3445 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3446
3447 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3448 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3449 else
3450 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3355 } 3451 }
3356 else 3452 else
3357 set_window_color (color, str); 3453 set_window_color (color, str);
3358} 3454}
3359 3455
3360/* 3456/*
3361 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3362 */ 3458 */
3363void 3459void
3364rxvt_term::process_xterm_seq (int op, char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3365{ 3461{
3366 int color; 3462 int color;
3367 char *buf, *name; 3463 char *buf, *name;
3368 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3369 int saveop = op; 3465 int saveop = op;
… …
3404 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3405 && actual_type != None 3501 && actual_type != None
3406 && actual_format == 8) 3502 && actual_format == 8)
3407 str = (const char *)(value); 3503 str = (const char *)(value);
3408 3504
3409 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp); 3505 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3410 3506
3411 XFree (value); 3507 XFree (value);
3412 } 3508 }
3413 else 3509 else
3414 { 3510 {
… …
3438 break; 3534 break;
3439 3535
3440 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3441 *buf++ = '\0'; 3537 *buf++ = '\0';
3442 3538
3443 process_color_seq (op, color, name, resp); 3539 process_color_seq (op, color, name, st);
3444 } 3540 }
3445 break; 3541 break;
3446 case Rxvt_restoreFG: 3542 case Rxvt_restoreFG:
3447 case XTerm_Color00: 3543 case XTerm_Color00:
3448 process_color_seq (op, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3449 break; 3545 break;
3450 case Rxvt_restoreBG: 3546 case Rxvt_restoreBG:
3451 case XTerm_Color01: 3547 case XTerm_Color01:
3452 process_color_seq (op, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3453 break; 3549 break;
3454#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3455 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3456 process_color_seq (op, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3457 break; 3553 break;
3458#endif 3554#endif
3459 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3460 process_color_seq (op, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3461 break; 3557 break;
3462 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3463 process_color_seq (op, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3464 break; 3560 break;
3465#ifdef OPTION_HC 3561#ifdef OPTION_HC
3466 case XTerm_Color_HC: 3562 case XTerm_Color_HC:
3467 process_color_seq (op, Color_HC, str, resp); 3563 process_color_seq (op, Color_HC, str, st);
3468 break; 3564 break;
3469 case XTerm_Color_HTC: 3565 case XTerm_Color_HTC:
3470 process_color_seq (op, Color_HTC, str, resp); 3566 process_color_seq (op, Color_HTC, str, st);
3471 break; 3567 break;
3472#endif 3568#endif
3473#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#ifndef NO_BOLD_UNDERLINE_REVERSE
3474 case URxvt_Color_BD: 3570 case URxvt_Color_BD:
3475 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3476 break; 3572 break;
3477 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3478 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3479 break; 3575 break;
3480 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3481 process_color_seq (op, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3482 break; 3578 break;
3483#endif 3579#endif
3484 case URxvt_Color_border: 3580 case URxvt_Color_border:
3485 process_color_seq (op, Color_border, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3486 break; 3582 break;
3487
3488#if BG_IMAGE_FROM_ROOT
3489 case URxvt_Color_tint:
3490 process_color_seq (op, Color_tint, str, resp);
3491 {
3492 bool changed = false;
3493
3494 if (ISSET_PIXCOLOR (Color_tint))
3495 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3496
3497 if (changed)
3498 update_background ();
3499 }
3500
3501 break;
3502#endif
3503
3504#if BG_IMAGE_FROM_FILE
3505 case Rxvt_Pixmap:
3506 if (!strcmp (str, "?"))
3507 {
3508 char str[256];
3509 int h_scale = fimage.h_scale;
3510 int v_scale = fimage.v_scale;
3511 int h_align = fimage.h_align;
3512 int v_align = fimage.v_align;
3513
3514 sprintf (str, "[%dx%d+%d+%d]",
3515 h_scale, v_scale,
3516 h_align, v_align);
3517 process_xterm_seq (XTerm_title, str, CHAR_ST);
3518 }
3519 else
3520 {
3521 bool changed = false;
3522
3523 if (*str != ';')
3524 {
3525 try
3526 {
3527 fimage.set_file_geometry (this, str);
3528 changed = true;
3529 }
3530 catch (const class rxvt_failure_exception &e)
3531 {
3532 }
3533 }
3534 else
3535 {
3536 str++;
3537 if (fimage.set_geometry (str, true))
3538 changed = true;
3539 }
3540
3541 if (changed)
3542 {
3543 if (bg_window_position_sensitive ())
3544 {
3545 int x, y;
3546 get_window_origin (x, y);
3547 parent_x = x;
3548 parent_y = y;
3549 }
3550 update_background ();
3551 }
3552 }
3553 break;
3554#endif
3555 3583
3556 case XTerm_logfile: 3584 case XTerm_logfile:
3557 // TODO, when secure mode? 3585 // TODO, when secure mode?
3558 break; 3586 break;
3559 3587
… …
3576 case URxvt_boldFont: 3604 case URxvt_boldFont:
3577 case URxvt_italicFont: 3605 case URxvt_italicFont:
3578 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3579#endif 3607#endif
3580 if (query) 3608 if (query)
3581 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3582 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3583 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3584 resp); 3612 st.v);
3585 else 3613 else
3586 { 3614 {
3587 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3588 3616
3589 res = strdup (str); 3617 res = strdup (str);
… …
3592 } 3620 }
3593 break; 3621 break;
3594 3622
3595 case URxvt_version: 3623 case URxvt_version:
3596 if (query) 3624 if (query)
3597 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3598 op, 3626 op,
3599 rs[Rs_name], VERSION[0], VERSION[2], 3627 rs[Rs_name], VERSION[0], VERSION[2],
3600 resp); 3628 st.v);
3601 break; 3629 break;
3602 3630
3603#if !ENABLE_MINIMAL 3631#if !ENABLE_MINIMAL
3632 case URxvt_cellinfo:
3633 if (query)
3634 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3635 fwidth, fheight, fbase,
3636 st.v);
3637 break;
3638
3604 case URxvt_locale: 3639 case URxvt_locale:
3605 if (query) 3640 if (query)
3606 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3641 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3607 else 3642 else
3608 { 3643 {
3609 set_locale (str); 3644 set_locale (str);
3610 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3611 init_xlocale (); 3646 init_xlocale ();
… …
3626 break; 3661 break;
3627#endif 3662#endif
3628 3663
3629#if ENABLE_PERL 3664#if ENABLE_PERL
3630 case URxvt_perl: 3665 case URxvt_perl:
3631 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3666 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3632 break; 3667 break;
3633#endif 3668#endif
3634 } 3669 }
3635} 3670}
3636/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3693 { 5, PrivMode_rVideo }, // DECSCNM 3728 { 5, PrivMode_rVideo }, // DECSCNM
3694 { 6, PrivMode_relOrigin }, // DECOM 3729 { 6, PrivMode_relOrigin }, // DECOM
3695 { 7, PrivMode_Autowrap }, // DECAWM 3730 { 7, PrivMode_Autowrap }, // DECAWM
3696 // 8, auto-repeat keys // DECARM 3731 // 8, auto-repeat keys // DECARM
3697 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
3733 { 12, PrivMode_BlinkingCursor },
3698 // 18 end FF to printer after print screen 3734 // 18 end FF to printer after print screen
3699 // 19 Print screen prints full screen/scroll region 3735 // 19 Print screen prints full screen/scroll region
3700 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3701#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
3702 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
… …
3714#endif 3750#endif
3715 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
3716 { 1002, PrivMode_MouseBtnEvent }, 3752 { 1002, PrivMode_MouseBtnEvent },
3717 { 1003, PrivMode_MouseAnyEvent }, 3753 { 1003, PrivMode_MouseAnyEvent },
3718#if ENABLE_FRILLS 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3719 { 1005, PrivMode_ExtModeMouse }, 3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3720#endif 3758#endif
3721 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3722 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3723#if ENABLE_FRILLS 3761#if ENABLE_FRILLS
3724 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3725#endif 3763#endif
3726 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
3727 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
3728 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
3729 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
3730 // 1048 save and restore cursor, implemented in code 3768 // 1048 save and restore cursor, implemented in code
3731 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3769 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3732 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3733 { 2004, PrivMode_BracketPaste }, 3772 { 2004, PrivMode_BracketPaste },
3773#endif
3734 }; 3774 };
3735 3775
3736 if (nargs == 0) 3776 if (nargs == 0)
3737 return; 3777 return;
3778
3779 // DECRQM
3780 if (mode == 'p')
3781 {
3782 int status = 0;
3783 if (nargs != 1)
3784 return;
3785
3786 for (j = 0; j < ecb_array_length (argtopriv); j++)
3787 if (argtopriv[j].argval == arg[0])
3788 {
3789 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3790 break;
3791 }
3792
3793 tt_printf ("\33[?%d;%d$y", arg[0], status);
3794 return;
3795 }
3738 3796
3739 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
3740 if (mode == 'l') 3798 if (mode == 'l')
3741 mode = 0; /* reset */ 3799 mode = 0; /* reset */
3742 else if (mode == 'h') 3800 else if (mode == 'h')
… …
3811 scrollBar.map (state); 3869 scrollBar.map (state);
3812 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
3813 scr_touch (true); 3871 scr_touch (true);
3814 break; 3872 break;
3815#endif 3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
3877 break;
3878#endif
3816 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
3817 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
3818 break; 3881 break;
3819 /* case 35: - shift keys */ 3882 /* case 35: - shift keys */
3820 /* case 40: - 80 <--> 132 mode */ 3883 /* case 40: - 80 <--> 132 mode */
… …
3925 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
3926 //case 20: // gothic 3989 //case 20: // gothic
3927 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3928 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
3929 break; 3992 break;
3930 case 22: // normal intensity 3993 case 22: // bold off (vt220)
3931 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
3932 break; 3995 break;
3933 case 23: // disable italic 3996 case 23: // disable italic
3934 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
3935 break; 3998 break;
3936 case 24: 3999 case 24: // underline off (vt220)
3937 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
3938 break; 4001 break;
3939 case 25: 4002 case 25: // blink off (vt220)
3940 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
3941 break; 4004 break;
3942 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
3943 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
3944 break; 4007 break;
3945 case 27: 4008 case 27: // reverse off (vt220)
3946 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
3947 break; 4010 break;
3948 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
3949 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
3950 } 4013 }
… …
3965 case 35: 4028 case 35:
3966 case 36: 4029 case 36:
3967 case 37: 4030 case 37:
3968 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3969 break; 4032 break;
3970 case 38: // set fg color, ISO 8613-6
3971 if (nargs > i + 2 && arg[i + 1] == 5)
3972 {
3973 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3974 i += 2;
3975 }
3976 break;
3977 case 39: /* default fg */ 4033 case 39: /* default fg */
3978 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
3979 break; 4035 break;
3980 4036
3981 case 40: 4037 case 40:
… …
3986 case 45: 4042 case 45:
3987 case 46: 4043 case 46:
3988 case 47: 4044 case 47:
3989 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3990 break; 4046 break;
3991 case 48: // set bg color, ISO 8613-6
3992 if (nargs > i + 2 && arg[i + 1] == 5)
3993 {
3994 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3995 i += 2;
3996 }
3997 break;
3998 case 49: /* default bg */ 4047 case 49: /* default bg */
3999 scr_color (Color_bg, Color_bg); 4048 scr_color (Color_bg, Color_bg);
4049 break;
4050
4051 case 38: // set fg color, ISO 8613-6
4052 case 48: // set bg color, ISO 8613-6
4053 {
4054 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4055 unsigned int idx;
4056
4057 if (nargs > i + 2 && arg[i + 1] == 5)
4058 {
4059 idx = minCOLOR + arg[i + 2];
4060 i += 2;
4061
4062 scr_color (idx, fgbg);
4063 }
4064 else if (nargs > i + 4 && arg[i + 1] == 2)
4065 {
4066 unsigned int r = arg[i + 2];
4067 unsigned int g = arg[i + 3];
4068 unsigned int b = arg[i + 4];
4069 unsigned int a = 0xff;
4070
4071 idx = map_rgb24_color (r, g, b, a);
4072
4073 i += 4;
4074
4075 scr_color (idx, fgbg);
4076 }
4077 }
4000 break; 4078 break;
4001 4079
4002 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
4003 4081
4004#if !ENABLE_MINIMAL 4082#if !ENABLE_MINIMAL
… …
4028} 4106}
4029 4107
4030void 4108void
4031rxvt_term::set_cursor_style (int style) 4109rxvt_term::set_cursor_style (int style)
4032{ 4110{
4033 if (!IN_RANGE_INC (style, 0, 4)) 4111 if (!IN_RANGE_INC (style, 0, 6))
4034 return; 4112 return;
4035 4113
4114 if (style == 0)
4115 style = 1;
4116
4117 cursor_type = (style - 1) / 2;
4036 set_option (Opt_cursorUnderline, style >= 3); 4118 set_option (Opt_cursorUnderline, cursor_type == 1);
4037 4119
4038#ifdef CURSOR_BLINK 4120#ifdef CURSOR_BLINK
4039 set_option (Opt_cursorBlink, !style || (style & 1)); 4121 set_option (Opt_cursorBlink, style & 1);
4040 cursor_blink_reset (); 4122 cursor_blink_reset ();
4041#endif 4123#endif
4042 4124
4043 want_refresh = 1; 4125 want_refresh = 1;
4044} 4126}
4045/*}}} */ 4127/*}}} */
4046 4128
4047/* ------------------------------------------------------------------------- */ 4129/* ---------------------------------------------------------------------- */
4130/* Write data to the pty as typed by the user, pasted with the mouse,
4131 * or generated by us in response to a query ESC sequence.
4132 */
4048 4133
4049/* 4134/*
4050 * Send printf () formatted output to the command. 4135 * Send printf () formatted output to the command.
4051 * Only use for small amounts of data. 4136 * Only use for small amounts of data.
4052 */ 4137 */
… …
4060 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4145 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4061 va_end (arg_ptr); 4146 va_end (arg_ptr);
4062 tt_write (buf, strlen (buf)); 4147 tt_write (buf, strlen (buf));
4063} 4148}
4064 4149
4065/* ---------------------------------------------------------------------- */
4066/* Write data to the pty as typed by the user, pasted with the mouse, 4150/* Write data to the pty as typed by the user. */
4067 * or generated by us in response to a query ESC sequence. 4151void
4068 */ 4152rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4069static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4153{
4154 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4155 return;
4156
4157 if (option (Opt_scrollTtyKeypress))
4158 if (view_start)
4159 {
4160 view_start = 0;
4161 want_refresh = 1;
4162 }
4163
4164 tt_write_ (data, len);
4165}
4070 4166
4071void 4167void
4072rxvt_term::tt_write (const char *data, unsigned int len) 4168rxvt_term::tt_write (const char *data, unsigned int len)
4073{ 4169{
4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4170 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4075 return; 4171 return;
4076 4172
4173 tt_write_ (data, len);
4174}
4175
4176static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4177
4178void
4179rxvt_term::tt_write_ (const char *data, unsigned int len)
4180{
4077 if (pty->pty < 0) 4181 if (pty->pty < 0)
4078 return; 4182 return;
4079 4183
4080 if (v_buflen == 0) 4184 if (v_buflen == 0)
4081 { 4185 {

Diff Legend

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