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.539 by sf-exg, Tue Apr 16 08:44:45 2013 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-2011 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;
400 break; 393 break;
401 } 394 }
402 return param; 395 return param;
403} 396}
404 397
398static inline wchar_t *
399rxvt_wcsdup (const wchar_t *str, int len)
400{
401 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
402 memcpy (r, str, len * sizeof (wchar_t));
403 r[len] = 0;
404 return r;
405}
406
405void ecb_cold 407void ecb_cold
406rxvt_term::key_press (XKeyEvent &ev) 408rxvt_term::key_press (XKeyEvent &ev)
407{ 409{
408 int ctrl, meta, shft, len; 410 int ctrl, meta, shft, len;
409 KeySym keysym; 411 KeySym keysym = NoSymbol;
410 int valid_keysym;
411 char kbuf[KBUFSZ]; 412 char rkbuf[KBUFSZ + 1];
413 char *kbuf = rkbuf + 1;
412 414
413#if ISO_14755 415#if ISO_14755
414 if (iso14755buf & ISO_14755_52) 416 if (iso14755buf & ISO_14755_52)
415 return; 417 return;
416#endif 418#endif
… …
473 } 475 }
474 } 476 }
475 else 477 else
476 len = 0; 478 len = 0;
477 } 479 }
478
479 valid_keysym = status_return == XLookupKeySym
480 || status_return == XLookupBoth;
481 } 480 }
482 else 481 else
483#endif 482#endif
484 { 483 {
485 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 484 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
486 valid_keysym = keysym != NoSymbol; 485 }
486
487 if (keysym != NoSymbol)
487 } 488 {
489 KeySym orig_keysym = keysym;
488 490
489 if (valid_keysym) 491 /* Shift + F1 - F10 generates F11 - F20 */
492 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
493 {
494 keysym += (XK_F11 - XK_F1);
495 shft = 0; /* turn off Shift */
496 }
497
498 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
499 {
500 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
501 unsigned int newlen = 1;
502
503 if (ev.state & ModNumLockMask)
504 kp = false;
505
506 keysym = translate_keypad (keysym, kp);
507
508 switch (keysym)
509 {
510#ifndef NO_BACKSPACE_KEY
511 case XK_BackSpace:
512 if (priv_modes & PrivMode_HaveBackSpace)
513 {
514 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
515 ^ !!ctrl) ? '\b' : '\177';
516 kbuf[1] = '\0';
517 }
518 else
519 strcpy (kbuf, rs[Rs_backspace_key]);
520 break;
521#endif
522#ifndef NO_DELETE_KEY
523 case XK_Delete:
524 strcpy (kbuf, rs[Rs_delete_key]);
525 break;
526#endif
527 case XK_Tab:
528 if (shft)
529 strcpy (kbuf, "\033[Z");
530 else
531 {
532#ifdef CTRL_TAB_MAKES_META
533 if (ctrl)
534 meta = 1;
535#endif
536#ifdef MOD4_TAB_MAKES_META
537 if (ev.state & Mod4Mask)
538 meta = 1;
539#endif
540 newlen = 0;
541 }
542 break;
543
544 case XK_Up: /* "\033[A" */
545 case XK_Down: /* "\033[B" */
546 case XK_Right: /* "\033[C" */
547 case XK_Left: /* "\033[D" */
548 strcpy (kbuf, "\033[Z");
549 kbuf[2] = "DACB"[keysym - XK_Left];
550 /* do Shift first */
551 if (shft)
552 kbuf[2] = "dacb"[keysym - XK_Left];
553 else if (ctrl)
554 {
555 kbuf[1] = 'O';
556 kbuf[2] = "dacb"[keysym - XK_Left];
557 }
558 else if (priv_modes & PrivMode_aplCUR)
559 kbuf[1] = 'O';
560 break;
561
562 case XK_KP_Enter:
563 /* allow shift to override */
564 if (kp)
565 {
566 strcpy (kbuf, "\033OM");
567 break;
568 }
569
570 /* FALLTHROUGH */
571
572 case XK_Return:
573 if (priv_modes & PrivMode_LFNL)
574 {
575 kbuf[0] = '\015';
576 kbuf[1] = '\012';
577 kbuf[2] = '\0';
578 }
579 else
580 {
581 kbuf[0] = '\015';
582 kbuf[1] = '\0';
583 }
584 break;
585
586 case XK_KP_F1: /* "\033OP" */
587 case XK_KP_F2: /* "\033OQ" */
588 case XK_KP_F3: /* "\033OR" */
589 case XK_KP_F4: /* "\033OS" */
590 strcpy (kbuf, "\033OP");
591 kbuf[2] += (keysym - XK_KP_F1);
592 break;
593
594 case XK_KP_Multiply: /* "\033Oj" : "*" */
595 case XK_KP_Add: /* "\033Ok" : "+" */
596 case XK_KP_Separator: /* "\033Ol" : "," */
597 case XK_KP_Subtract: /* "\033Om" : "-" */
598 case XK_KP_Decimal: /* "\033On" : "." */
599 case XK_KP_Divide: /* "\033Oo" : "/" */
600 case XK_KP_0: /* "\033Op" : "0" */
601 case XK_KP_1: /* "\033Oq" : "1" */
602 case XK_KP_2: /* "\033Or" : "2" */
603 case XK_KP_3: /* "\033Os" : "3" */
604 case XK_KP_4: /* "\033Ot" : "4" */
605 case XK_KP_5: /* "\033Ou" : "5" */
606 case XK_KP_6: /* "\033Ov" : "6" */
607 case XK_KP_7: /* "\033Ow" : "7" */
608 case XK_KP_8: /* "\033Ox" : "8" */
609 case XK_KP_9: /* "\033Oy" : "9" */
610 /* allow shift to override */
611 if (kp)
612 {
613 strcpy (kbuf, "\033Oj");
614 kbuf[2] += (keysym - XK_KP_Multiply);
615 }
616 else
617 {
618 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
619 kbuf[1] = '\0';
620 }
621 break;
622
623 default:
624 {
625 int param = map_function_key (keysym);
626 if (param > 0)
627 sprintf (kbuf,"\033[%d~", param);
628 else
629 newlen = 0;
630 }
631 break;
632 }
633
634 if (newlen)
635 len = strlen (kbuf);
636
637 if (len > 0)
638 {
639 /*
640 * pass Shift/Control indicators for function keys ending with `~'
641 *
642 * eg,
643 * Prior = "ESC[5~"
644 * Shift+Prior = "ESC[5$"
645 * Ctrl+Prior = "ESC[5^"
646 * Ctrl+Shift+Prior = "ESC[5@"
647 */
648 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
649 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
650
651 /*
652 * Pass meta for all function keys, if 'meta' option set
653 */
654#ifdef META8_OPTION
655 if (meta && (meta_char == 0x80))
656 kbuf[len - 1] |= 0x80;
657#endif
658 }
659
660 }
661 else if (ctrl && keysym == XK_minus)
662 {
663 len = 1;
664 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
665 }
666 else if (keysym == XK_ISO_Left_Tab)
667 {
668 strcpy (kbuf, "\033[Z");
669 len = 3;
670 }
671 else
672 {
673#ifdef META8_OPTION
674 /* set 8-bit on */
675 if (meta && (meta_char == 0x80))
676 {
677 char *ch;
678
679 for (ch = kbuf; ch < kbuf + len; ch++)
680 *ch |= 0x80;
681 }
682#endif
683 /* nil */ ;
684 }
685
686 keysym = orig_keysym;
687 }
688
689 /* escape prefix */
690 if (len && meta
691#ifdef META8_OPTION
692 && meta_char == C0_ESC
693#endif
694 )
695 {
696 *--kbuf = C0_ESC;
697 len++;
698 }
699
700 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
701 return;
702
703 if (keysym != NoSymbol)
490 { 704 {
491#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
492 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
493 return; 707 return;
494#endif 708#endif
495 709
496 if (saveLines) 710 if (saveLines)
497 { 711 {
… …
553#endif 767#endif
554 } 768 }
555 769
556 if (shft) 770 if (shft)
557 { 771 {
558 /* Shift + F1 - F10 generates F11 - F20 */
559 if (keysym >= XK_F1 && keysym <= XK_F10)
560 {
561 keysym += (XK_F11 - XK_F1);
562 shft = 0; /* turn off Shift */
563 }
564 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 772 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
565 { 773 {
566 switch (keysym) 774 switch (keysym)
567 { 775 {
568 /* normal XTerm key bindings */ 776 /* normal XTerm key bindings */
569 case XK_Insert: /* Shift+Insert = paste mouse selection */ 777 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 784 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 return; 785 return;
578#endif 786#endif
579 } 787 }
580 } 788 }
789 }
790
791 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
792 {
793 if (keysym == XK_v)
794 selection_request (ev.time, Sel_Clipboard);
795 else if (selection.len > 0)
796 {
797 free (selection.clip_text);
798 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
799 selection.clip_len = selection.len;
800 selection_grab (CurrentTime, true);
801 }
802
803 return;
581 } 804 }
582 805
583#if ENABLE_FRILLS || ISO_14755 806#if ENABLE_FRILLS || ISO_14755
584 // ISO 14755 support 807 // ISO 14755 support
585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 808 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
640 { 863 {
641 scr_printscreen (ctrl | shft); 864 scr_printscreen (ctrl | shft);
642 return; 865 return;
643 } 866 }
644#endif 867#endif
645
646 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
647 {
648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
649 unsigned int newlen = 1;
650
651 if (ev.state & ModNumLockMask)
652 kp = false;
653
654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
657 {
658#ifndef NO_BACKSPACE_KEY
659 case XK_BackSpace:
660 if (priv_modes & PrivMode_HaveBackSpace)
661 {
662 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
663 ^ !!ctrl) ? '\b' : '\177';
664 kbuf[1] = '\0';
665 }
666 else
667 strcpy (kbuf, rs[Rs_backspace_key]);
668 break;
669#endif
670#ifndef NO_DELETE_KEY
671 case XK_Delete:
672 strcpy (kbuf, rs[Rs_delete_key]);
673 break;
674#endif
675 case XK_Tab:
676 if (shft)
677 strcpy (kbuf, "\033[Z");
678 else
679 {
680#ifdef CTRL_TAB_MAKES_META
681 if (ctrl)
682 meta = 1;
683#endif
684#ifdef MOD4_TAB_MAKES_META
685 if (ev.state & Mod4Mask)
686 meta = 1;
687#endif
688 newlen = 0;
689 }
690 break;
691
692 case XK_Up: /* "\033[A" */
693 case XK_Down: /* "\033[B" */
694 case XK_Right: /* "\033[C" */
695 case XK_Left: /* "\033[D" */
696 strcpy (kbuf, "\033[Z");
697 kbuf[2] = "DACB"[keysym - XK_Left];
698 /* do Shift first */
699 if (shft)
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 else if (ctrl)
702 {
703 kbuf[1] = 'O';
704 kbuf[2] = "dacb"[keysym - XK_Left];
705 }
706 else if (priv_modes & PrivMode_aplCUR)
707 kbuf[1] = 'O';
708 break;
709
710 case XK_KP_Enter:
711 /* allow shift to override */
712 if (kp)
713 {
714 strcpy (kbuf, "\033OM");
715 break;
716 }
717
718 /* FALLTHROUGH */
719
720 case XK_Return:
721 if (priv_modes & PrivMode_LFNL)
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\012';
725 kbuf[2] = '\0';
726 }
727 else
728 {
729 kbuf[0] = '\015';
730 kbuf[1] = '\0';
731 }
732 break;
733
734 case XK_KP_F1: /* "\033OP" */
735 case XK_KP_F2: /* "\033OQ" */
736 case XK_KP_F3: /* "\033OR" */
737 case XK_KP_F4: /* "\033OS" */
738 strcpy (kbuf, "\033OP");
739 kbuf[2] += (keysym - XK_KP_F1);
740 break;
741
742 case XK_KP_Multiply: /* "\033Oj" : "*" */
743 case XK_KP_Add: /* "\033Ok" : "+" */
744 case XK_KP_Separator: /* "\033Ol" : "," */
745 case XK_KP_Subtract: /* "\033Om" : "-" */
746 case XK_KP_Decimal: /* "\033On" : "." */
747 case XK_KP_Divide: /* "\033Oo" : "/" */
748 case XK_KP_0: /* "\033Op" : "0" */
749 case XK_KP_1: /* "\033Oq" : "1" */
750 case XK_KP_2: /* "\033Or" : "2" */
751 case XK_KP_3: /* "\033Os" : "3" */
752 case XK_KP_4: /* "\033Ot" : "4" */
753 case XK_KP_5: /* "\033Ou" : "5" */
754 case XK_KP_6: /* "\033Ov" : "6" */
755 case XK_KP_7: /* "\033Ow" : "7" */
756 case XK_KP_8: /* "\033Ox" : "8" */
757 case XK_KP_9: /* "\033Oy" : "9" */
758 /* allow shift to override */
759 if (kp)
760 {
761 strcpy (kbuf, "\033Oj");
762 kbuf[2] += (keysym - XK_KP_Multiply);
763 }
764 else
765 {
766 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
767 kbuf[1] = '\0';
768 }
769 break;
770
771 default:
772 {
773 int param = map_function_key (keysym);
774 if (param > 0)
775 sprintf (kbuf,"\033[%d~", param);
776 else
777 newlen = 0;
778 }
779 break;
780 }
781
782 if (newlen)
783 len = strlen (kbuf);
784
785 if (len > 0)
786 {
787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
800 * Pass meta for all function keys, if 'meta' option set
801 */
802#ifdef META8_OPTION
803 if (meta && (meta_char == 0x80))
804 kbuf[len - 1] |= 0x80;
805#endif
806 }
807
808 }
809 else if (ctrl && keysym == XK_minus)
810 {
811 len = 1;
812 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
813 }
814 else if (keysym == XK_ISO_Left_Tab)
815 {
816 strcpy (kbuf, "\033[Z");
817 len = 3;
818 }
819 else
820 {
821#ifdef META8_OPTION
822 /* set 8-bit on */
823 if (meta && (meta_char == 0x80))
824 {
825 char *ch;
826
827 for (ch = kbuf; ch < kbuf + len; ch++)
828 *ch |= 0x80;
829
830 meta = 0;
831 }
832#endif
833 /* nil */ ;
834 }
835 } 868 }
836
837 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
838 return;
839 869
840 if (len <= 0) 870 if (len <= 0)
841 return; /* not mapped */ 871 return; /* not mapped */
842 872
843 if (option (Opt_scrollTtyKeypress))
844 if (view_start)
845 {
846 view_start = 0;
847 want_refresh = 1;
848 }
849
850 /* escape prefix */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 873 tt_write_user_input (kbuf, (unsigned int)len);
862} 874}
863 875
864void ecb_cold 876void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 877rxvt_term::key_release (XKeyEvent &ev)
866{ 878{
… …
1004/* checks whether a refresh is requested and starts the refresh timer */ 1016/* checks whether a refresh is requested and starts the refresh timer */
1005void 1017void
1006rxvt_term::refresh_check () 1018rxvt_term::refresh_check ()
1007{ 1019{
1008 if (want_refresh && !flush_ev.is_active ()) 1020 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1021 flush_ev.start ();
1010 1022
1011 display->flush (); 1023 display->flush ();
1012} 1024}
1013 1025
1014void 1026void
… …
1022 1034
1023#ifdef CURSOR_BLINK 1035#ifdef CURSOR_BLINK
1024void 1036void
1025rxvt_term::cursor_blink_reset () 1037rxvt_term::cursor_blink_reset ()
1026{ 1038{
1039 if (!focus)
1040 return;
1041
1027 if (hidden_cursor) 1042 if (hidden_cursor)
1028 { 1043 {
1029 hidden_cursor = 0; 1044 hidden_cursor = 0;
1030 want_refresh = 1; 1045 want_refresh = 1;
1031 } 1046 }
1032 1047
1033 if (option (Opt_cursorBlink)) 1048 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1034 cursor_blink_ev.again (); 1049 cursor_blink_ev.again ();
1035 else 1050 else
1036 cursor_blink_ev.stop (); 1051 cursor_blink_ev.stop ();
1037} 1052}
1038 1053
… …
1077 1092
1078#ifdef SELECTION_SCROLLING 1093#ifdef SELECTION_SCROLLING
1079void 1094void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1095rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1096{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1097 if (scr_page (scroll_selection_lines))
1083 { 1098 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1099 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1100 want_refresh = 1;
1086 refresh_check (); 1101 refresh_check ();
1087 } 1102 }
… …
1227 1242
1228void ecb_cold 1243void ecb_cold
1229rxvt_term::pointer_unblank () 1244rxvt_term::pointer_unblank ()
1230{ 1245{
1231 XDefineCursor (dpy, vt, TermWin_cursor); 1246 XDefineCursor (dpy, vt, TermWin_cursor);
1232 recolour_cursor (); 1247 recolor_cursor ();
1233 1248
1234#ifdef POINTER_BLANK 1249#ifdef POINTER_BLANK
1235 hidden_pointer = 0; 1250 hidden_pointer = 0;
1236 1251
1237 if (option (Opt_pointerBlank)) 1252 if (option (Opt_pointerBlank))
… …
1262#endif 1277#endif
1263 1278
1264void 1279void
1265rxvt_term::mouse_report (XButtonEvent &ev) 1280rxvt_term::mouse_report (XButtonEvent &ev)
1266{ 1281{
1267 int button_number, key_state = 0; 1282 int button_number, state = 0;
1268 int x, y; 1283 int x, y;
1269 int code = 32; 1284 bool release = ev.type == ButtonRelease;
1270 1285
1271 x = Pixel2Col (ev.x) + 1; 1286 x = Pixel2Col (ev.x) + 1;
1272 y = Pixel2Row (ev.y) + 1; 1287 y = Pixel2Row (ev.y) + 1;
1273 1288
1274 if (ev.type == MotionNotify) 1289 if (ev.type == MotionNotify)
… …
1276 if (x == mouse_row && y == mouse_col) 1291 if (x == mouse_row && y == mouse_col)
1277 return; 1292 return;
1278 1293
1279 mouse_row = x; 1294 mouse_row = x;
1280 mouse_col = y; 1295 mouse_col = y;
1281 code += 32; 1296 state += 32;
1282 }
1283
1284 if (MEvent.button == AnyButton)
1285 button_number = 3;
1286 else
1287 { 1297 }
1298
1288 button_number = MEvent.button - Button1; 1299 button_number = MEvent.button - Button1;
1289 /* 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;
1290 if (button_number >= 3) 1304 else if (button_number >= 3)
1291 button_number += 64 - 3; 1305 button_number += 64 - 3;
1292 }
1293 1306
1294 if (priv_modes & PrivMode_MouseX10) 1307 if (priv_modes & PrivMode_MouseX10)
1295 { 1308 {
1296 /* 1309 /*
1297 * do not report ButtonRelease 1310 * do not report ButtonRelease
1298 * no state info allowed 1311 * no state info allowed
1299 */ 1312 */
1300 key_state = 0; 1313 if (release)
1301 if (button_number == 3)
1302 return; 1314 return;
1303 } 1315 }
1304 else 1316 else
1305 { 1317 {
1306 /* XTerm mouse reporting needs these values: 1318 /* XTerm mouse reporting needs these values:
… …
1308 * 8 = Meta 1320 * 8 = Meta
1309 * 16 = Control 1321 * 16 = Control
1310 * plus will add in our own Double-Click reporting 1322 * plus will add in our own Double-Click reporting
1311 * 32 = Double Click 1323 * 32 = Double Click
1312 */ 1324 */
1313 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1325 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1314 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1326 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1315 + ((MEvent.state & ControlMask) ? 16 : 0); 1327 + ((MEvent.state & ControlMask) ? 16 : 0);
1316#ifdef MOUSE_REPORT_DOUBLECLICK 1328#ifdef MOUSE_REPORT_DOUBLECLICK
1317 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1329 state += ((MEvent.clicks > 1) ? 32 : 0);
1318#endif 1330#endif
1319 } 1331 }
1332
1333 int code = 32 + (release ? 3 : button_number) + state;
1320 1334
1321#if DEBUG_MOUSEREPORT 1335#if DEBUG_MOUSEREPORT
1322 fprintf (stderr, "Mouse ["); 1336 fprintf (stderr, "Mouse [");
1323 if (key_state & 16) 1337 if (state & 16)
1324 fputc ('C', stderr); 1338 fputc ('C', stderr);
1325 if (key_state & 4) 1339 if (state & 4)
1326 fputc ('S', stderr); 1340 fputc ('S', stderr);
1327 if (key_state & 8) 1341 if (state & 8)
1328 fputc ('A', stderr); 1342 fputc ('A', stderr);
1329 if (key_state & 32) 1343 if (state & 32)
1330 fputc ('2', stderr); 1344 fputc ('2', stderr);
1331 fprintf (stderr, "]: <%d>, %d/%d\n", 1345 fprintf (stderr, "]: <%d>, %d/%d\n",
1332 button_number, 1346 button_number,
1333 x, 1347 x,
1334 y); 1348 y);
1335#endif 1349#endif
1336 1350
1337#if ENABLE_FRILLS 1351#if ENABLE_FRILLS
1338 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)
1339 tt_printf ("\033[%d;%d;%dM", 1359 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state, 1360 code,
1341 x, 1361 x,
1342 y); 1362 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse) 1363 else if (priv_modes & PrivMode_ExtMouseUTF8)
1364 if (code < 128)
1344 tt_printf ("\033[M%c%lc%lc", 1365 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state, 1366 code,
1346 wint_t (32 + x), 1367 wint_t (32 + x),
1347 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));
1348 else 1375 else
1349#endif 1376#endif
1350 tt_printf ("\033[M%c%c%c", 1377 tt_printf ("\033[M%c%c%c",
1351 code + button_number + key_state, 1378 code,
1352 32 + x, 1379 32 + x,
1353 32 + y); 1380 32 + y);
1354} 1381}
1355 1382
1356/*{{{ process an X event */ 1383/*{{{ process an X event */
… …
1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1494 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1495 ;
1469 1496
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1497 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471 1498
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change) 1499 if (want_position_change)
1483 { 1500 {
1484 int x, y; 1501 int x, y;
1485 1502
1486 if (ev.xconfigure.send_event) 1503 if (ev.xconfigure.send_event)
… …
1494 if (x != parent_x || y != parent_y) 1511 if (x != parent_x || y != parent_y)
1495 { 1512 {
1496 parent_x = x; 1513 parent_x = x;
1497 parent_y = y; 1514 parent_y = y;
1498 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));
1499 moved = true;
1500 } 1516 }
1501 } 1517 }
1502 1518
1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1519 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1504 { 1520 {
1505 seen_resize = 1; 1521 seen_resize = 1;
1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1522 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1507 } 1523 }
1508 else
1509 {
1510#ifdef HAVE_BG_PIXMAP
1511 if (moved)
1512 update_background ();
1513#endif
1514 }
1515 1524
1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1525 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1517 } 1526 }
1518 break; 1527 break;
1519 1528
… …
1528 case SelectionRequest: 1537 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1530 break; 1539 break;
1531 1540
1532 case MapNotify: 1541 case MapNotify:
1533#ifdef HAVE_BG_PIXMAP
1534 // This is needed at startup for the case of no window manager
1535 // or a non-reparenting window manager and also because we
1536 // defer bg image updates if the window is not mapped. The
1537 // short delay is to optimize for multiple ConfigureNotify
1538 // events at startup when the window manager reparents the
1539 // window, so as to perform the computation after we have
1540 // received all of them.
1541 if (bg_img == 0)
1542 update_background_ev.start (0.025);
1543#endif
1544 mapped = 1; 1542 mapped = 1;
1545#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1546 text_blink_ev.start (); 1544 text_blink_ev.start ();
1547#endif 1545#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1597 case MotionNotify: 1595 case MotionNotify:
1598#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1597 if (hidden_pointer)
1600 pointer_unblank (); 1598 pointer_unblank ();
1601#endif 1599#endif
1600 if (!bypass_keystate
1602 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1601 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1603 || priv_modes & PrivMode_MouseAnyEvent) 1602 || priv_modes & PrivMode_MouseAnyEvent))
1604 mouse_report (ev.xbutton); 1603 mouse_report (ev.xbutton);
1605 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1604 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1606 break; 1605 break;
1607 1606
1608 if (ev.xany.window == vt) 1607 if (ev.xany.window == vt)
… …
1620 &unused_root_x, &unused_root_y, 1619 &unused_root_x, &unused_root_y,
1621 &ev.xbutton.x, &ev.xbutton.y, 1620 &ev.xbutton.x, &ev.xbutton.y,
1622 &ev.xbutton.state); 1621 &ev.xbutton.state);
1623#ifdef MOUSE_THRESHOLD 1622#ifdef MOUSE_THRESHOLD
1624 /* deal with a `jumpy' mouse */ 1623 /* deal with a `jumpy' mouse */
1625 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1624 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1625#endif
1626 { 1626 {
1627#endif
1628#if ISO_14755 1627#if ISO_14755
1629 // 5.4 1628 // 5.4
1630 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1629 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1631 { 1630 {
1632 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1631 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1638 1637
1639#ifdef SELECTION_SCROLLING 1638#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1639 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1640 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1641 {
1642 page_dirn scroll_selection_dir;
1643 int dist; 1643 int dist;
1644 1644
1645 /* don't clobber the current delay if we are 1645 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1646 * already in the middle of scrolling.
1647 */ 1647 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1672 + 1;
1673 min_it (scroll_selection_lines, 1673 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1674 SELECTION_SCROLL_MAX_LINES);
1675 scroll_selection_lines *= scroll_selection_dir;
1675 } 1676 }
1676 else 1677 else
1677 { 1678 {
1678 /* we are within the text window, so we 1679 /* we are within the text window, so we
1679 * shouldn't be scrolling 1680 * shouldn't be scrolling
1680 */ 1681 */
1681 sel_scroll_ev.stop(); 1682 sel_scroll_ev.stop();
1682 } 1683 }
1683#endif 1684#endif
1684#ifdef MOUSE_THRESHOLD
1685 } 1685 }
1686#endif
1687 } 1686 }
1688 } 1687 }
1689 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)
1690 { 1689 {
1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1690 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1765#endif 1764#endif
1766#if OFF_FOCUS_FADING 1765#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1766 if (rs[Rs_fade])
1768 { 1767 {
1769 pix_colors = pix_colors_focused; 1768 pix_colors = pix_colors_focused;
1770 scr_recolour (); 1769 scr_recolor ();
1771 } 1770 }
1772#endif 1771#endif
1773#if ENABLE_FRILLS 1772#if ENABLE_FRILLS
1774 if (option (Opt_urgentOnBell)) 1773 if (option (Opt_urgentOnBell))
1775 set_urgency (0); 1774 set_urgency (0);
1775
1776 if (priv_modes & PrivMode_FocusEvent)
1777 tt_printf ("\x1b[I");
1776#endif 1778#endif
1777 1779
1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 } 1781 }
1780} 1782}
… …
1788 want_refresh = 1; 1790 want_refresh = 1;
1789 1791
1790#if ENABLE_FRILLS 1792#if ENABLE_FRILLS
1791 if (option (Opt_urgentOnBell)) 1793 if (option (Opt_urgentOnBell))
1792 set_urgency (0); 1794 set_urgency (0);
1795
1796 if (priv_modes & PrivMode_FocusEvent)
1797 tt_printf ("\x1b[O");
1793#endif 1798#endif
1794#if ENABLE_FRILLS || ISO_14755 1799#if ENABLE_FRILLS || ISO_14755
1795 if (iso14755buf) 1800 if (iso14755buf)
1796 { 1801 {
1797 iso14755buf = 0; 1802 iso14755buf = 0;
… …
1812#endif 1817#endif
1813#if OFF_FOCUS_FADING 1818#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade]) 1819 if (rs[Rs_fade])
1815 { 1820 {
1816 pix_colors = pix_colors_unfocused; 1821 pix_colors = pix_colors_unfocused;
1817 scr_recolour (); 1822 scr_recolor ();
1818 } 1823 }
1819#endif 1824#endif
1820 1825
1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1826 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 } 1827 }
1823} 1828}
1824 1829
1825void ecb_cold 1830void ecb_cold
1826rxvt_term::update_fade_color (unsigned int idx) 1831rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1827{ 1832{
1828#if OFF_FOCUS_FADING 1833#if OFF_FOCUS_FADING
1829 if (rs[Rs_fade]) 1834 if (rs[Rs_fade])
1830 { 1835 {
1836 if (!first_time)
1837 pix_colors_focused [idx].free (this);
1838
1831 rgba c; 1839 rgba c;
1832 pix_colors [Color_fade].get (c); 1840 pix_colors [Color_fade].get (c);
1833 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);
1834 } 1842 }
1835#endif 1843#endif
1836} 1844}
1837 1845
1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1846#if ENABLE_PERL
1839void ecb_hot 1847void ecb_hot
1840rxvt_term::rootwin_cb (XEvent &ev) 1848rxvt_term::rootwin_cb (XEvent &ev)
1841{ 1849{
1842 make_current (); 1850 make_current ();
1843 1851
… …
1853 * 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.
1854 */ 1862 */
1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1863 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1864 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1857 { 1865 {
1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1866 } 1867 }
1867 1868
1868 break; 1869 break;
1869 } 1870 }
… …
1897 iso14755_54 (ev.x, ev.y); 1898 iso14755_54 (ev.x, ev.y);
1898 return; 1899 return;
1899 } 1900 }
1900#endif 1901#endif
1901 1902
1902 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1903 clickintime = ev.time - MEvent.time < multiClickTime;
1903 1904
1904 if (reportmode) 1905 if (reportmode)
1905 { 1906 {
1906 /* mouse report from vt window */ 1907 /* mouse report from vt window */
1907 /* save the xbutton state (for ButtonRelease) */ 1908 /* save the xbutton state (for ButtonRelease) */
… …
2150 2151
2151 if (reportmode) 2152 if (reportmode)
2152 { 2153 {
2153 /* mouse report from vt window */ 2154 /* mouse report from vt window */
2154 /* don't report release of wheel "buttons" */ 2155 /* don't report release of wheel "buttons" */
2155 if (ev.button >= 4) 2156 if (ev.button >= 4 && ev.button <= 7)
2156 return; 2157 return;
2157#ifdef MOUSE_REPORT_DOUBLECLICK 2158#ifdef MOUSE_REPORT_DOUBLECLICK
2158 /* only report the release of 'slow' single clicks */ 2159 /* only report the release of 'slow' single clicks */
2159 if (MEvent.button != AnyButton 2160 if (MEvent.button != AnyButton
2160 && (ev.button != MEvent.button 2161 && (ev.button != MEvent.button
2161 || (ev.time - MEvent.time 2162 || (ev.time - MEvent.time
2162 > MULTICLICK_TIME / 2))) 2163 > multiClickTime / 2)))
2163 { 2164 {
2164 MEvent.clicks = 0; 2165 MEvent.clicks = 0;
2165 MEvent.button = AnyButton; 2166 MEvent.button = ev.button;
2166 mouse_report (ev); 2167 mouse_report (ev);
2167 } 2168 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2169#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2170 MEvent.button = ev.button;
2170 mouse_report (ev); 2171 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2172#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2173 return;
2173 } 2174 }
2174 2175
… …
2361 } 2362 }
2362} 2363}
2363 2364
2364// read the next character 2365// read the next character
2365wchar_t ecb_hot 2366wchar_t ecb_hot
2366rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () noexcept
2367{ 2368{
2368 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2369 { 2370 {
2370 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2371 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2372 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2373 2374
2374 wchar_t wc; 2375 wchar_t wc;
2375 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);
2376 2377
… …
2397 return NOCHAR; 2398 return NOCHAR;
2398} 2399}
2399 2400
2400// read the next octet 2401// read the next octet
2401uint32_t ecb_hot 2402uint32_t ecb_hot
2402rxvt_term::next_octet () NOTHROW 2403rxvt_term::next_octet () noexcept
2403{ 2404{
2404 return cmdbuf_ptr < cmdbuf_endp 2405 return cmdbuf_ptr < cmdbuf_endp
2405 ? (unsigned char)*cmdbuf_ptr++ 2406 ? (unsigned char)*cmdbuf_ptr++
2406 : NOCHAR; 2407 : NOCHAR;
2407} 2408}
2408 2409
2409static class out_of_input out_of_input; 2410static class out_of_input out_of_input;
2410 2411
2411wchar_t ecb_hot 2412wchar_t ecb_hot
2412rxvt_term::cmd_getc () THROW ((class out_of_input)) 2413rxvt_term::cmd_getc ()
2413{ 2414{
2414 wchar_t c = next_char (); 2415 wchar_t c = next_char ();
2415 2416
2416 if (c == NOCHAR) 2417 if (c == NOCHAR)
2417 throw out_of_input; 2418 throw out_of_input;
2418 2419
2419 return c; 2420 return c;
2420} 2421}
2421 2422
2422uint32_t ecb_hot 2423uint32_t ecb_hot
2423rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2424rxvt_term::cmd_get8 ()
2424{ 2425{
2425 uint32_t c = next_octet (); 2426 uint32_t c = next_octet ();
2426 2427
2427 if (c == NOCHAR) 2428 if (c == NOCHAR)
2428 throw out_of_input; 2429 throw out_of_input;
… …
2557 scr_charset_choose (0); 2558 scr_charset_choose (0);
2558 break; 2559 break;
2559 2560
2560#ifdef EIGHT_BIT_CONTROLS 2561#ifdef EIGHT_BIT_CONTROLS
2561 // 8-bit controls 2562 // 8-bit controls
2562 case 0x90: /* DCS */ 2563 case 0x90: /* DCS */
2563 process_dcs_seq (); 2564 process_dcs_seq ();
2564 break; 2565 break;
2565 case 0x9b: /* CSI */ 2566 case 0x9b: /* CSI */
2566 process_csi_seq (); 2567 process_csi_seq ();
2567 break; 2568 break;
2568 case 0x9d: /* OSC */ 2569 case 0x9d: /* OSC */
2569 process_osc_seq (); 2570 process_osc_seq ();
2570 break; 2571 break;
2571#endif 2572#endif
2572 } 2573 }
2573} 2574}
… …
2701 wchar_t nlcr[] = { C0_LF, C0_CR }; 2702 wchar_t nlcr[] = { C0_LF, C0_CR };
2702 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2703 } 2704 }
2704 break; 2705 break;
2705 2706
2707#if 0 // disabled because embedded newlines can make exploits easier
2706 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2707 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2708 // used by original rxvt for rob nations own graphics mode 2710 // used by original rxvt for rob nations own graphics mode
2709 if (cmd_getc () == 'Q') 2711 if (cmd_getc () == 'Q' && option (Opt_insecure))
2710 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2711 break; 2713 break;
2714#endif
2712 2715
2713 /* 8.3.63: CHARACTER TABULATION SET */ 2716 /* 8.3.63: CHARACTER TABULATION SET */
2714 case C1_HTS: /* ESC H */ 2717 case C1_HTS: /* ESC H */
2715 scr_set_tab (1); 2718 scr_set_tab (1);
2716 break; 2719 break;
… …
2874 break; 2877 break;
2875 2878
2876 case '?': 2879 case '?':
2877 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2880 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2878 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);
2879 break; 2884 break;
2880 2885
2881 case '!': 2886 case '!':
2882 if (ch == CSI_70) 2887 if (ch == CSI_70)
2883 { 2888 {
2884 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2889 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2885 scr_soft_reset (); 2890 scr_soft_reset ();
2886 2891
2887 static const int pm_h[] = { 7, 25 }; 2892 static const int pm_h[] = { 7, 25 };
2888 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 };
2889 2894
2890 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);
2891 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);
2892 } 2897 }
2893 break; 2898 break;
… …
2923 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2928 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2924 scr_gotorc (arg[0], 0, RELATIVE); 2929 scr_gotorc (arg[0], 0, RELATIVE);
2925 break; 2930 break;
2926 2931
2927 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2932 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2928 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2933 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2929#ifdef ISO6429 2934#ifdef ISO6429
2930 arg[0] = -arg[0]; 2935 arg[0] = -arg[0];
2931#else /* emulate common DEC VTs */ 2936#else /* emulate common DEC VTs */
2932 arg[0] = arg[0] ? -arg[0] : -1; 2937 arg[0] = arg[0] ? -arg[0] : -1;
2933#endif 2938#endif
… …
3024 case 7: /* unofficial extension */ 3029 case 7: /* unofficial extension */
3025 if (option (Opt_insecure)) 3030 if (option (Opt_insecure))
3026 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3031 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3027 break; 3032 break;
3028 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';
3029 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3038 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3030 break; 3039 break;
3040 }
3031 } 3041 }
3032 break; 3042 break;
3033 3043
3034 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3044 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3035 switch (arg[0]) 3045 switch (arg[0])
… …
3078 scr_insert_mode (1); 3088 scr_insert_mode (1);
3079 else if (arg[0] == 20) 3089 else if (arg[0] == 20)
3080 priv_modes |= PrivMode_LFNL; 3090 priv_modes |= PrivMode_LFNL;
3081 break; 3091 break;
3082 3092
3083 case CSI_71: // DESCUSR: set cursor style 3093 case CSI_71: // DECSCUSR: set cursor style
3084 if (prev_ch == ' ') 3094 if (prev_ch == ' ')
3085 set_cursor_style (arg[0]); 3095 set_cursor_style (arg[0]);
3086 break; 3096 break;
3087 3097
3088 /* 3098 /*
… …
3220/* 3230/*
3221 * get input up until STRING TERMINATOR (or BEL) 3231 * get input up until STRING TERMINATOR (or BEL)
3222 * ends_how is terminator used. returned input must be free()'d 3232 * ends_how is terminator used. returned input must be free()'d
3223 */ 3233 */
3224char * 3234char *
3225rxvt_term::get_to_st (unicode_t &ends_how) 3235rxvt_term::get_to_st (string_term &st)
3226{ 3236{
3227 unicode_t ch; 3237 unicode_t ch;
3228 bool seen_esc = false; 3238 bool seen_esc = false;
3229 unsigned int n = 0; 3239 unsigned int n = 0;
3230 wchar_t string[STRING_MAX]; 3240 wchar_t string[CBUFSIZ];
3231 3241
3232 while ((ch = cmd_getc ()) != NOCHAR) 3242 while ((ch = cmd_getc ()) != NOCHAR)
3233 { 3243 {
3234 if (seen_esc) 3244 if (seen_esc)
3235 { 3245 {
… …
3250 else if (ch < 0x20) 3260 else if (ch < 0x20)
3251 return NULL; /* other control character - exit */ 3261 return NULL; /* other control character - exit */
3252 3262
3253 seen_esc = false; 3263 seen_esc = false;
3254 3264
3255 if (n >= STRING_MAX - 1) 3265 if (n >= sizeof (string) - 1)
3256 // stop at some sane length 3266 // stop at some sane length
3257 return NULL; 3267 return NULL;
3258 3268
3259 string[n++] = ch; 3269 string[n++] = ch;
3260 } 3270 }
3261 3271
3262 string[n++] = '\0'; 3272 string[n++] = '\0';
3263 3273
3264 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';
3265 3279
3266 return rxvt_wcstombs (string); 3280 return rxvt_wcstombs (string);
3267} 3281}
3268 3282
3269/*----------------------------------------------------------------------*/ 3283/*----------------------------------------------------------------------*/
… …
3275{ 3289{
3276 /* 3290 /*
3277 * Not handled yet 3291 * Not handled yet
3278 */ 3292 */
3279 3293
3280 unicode_t eh; 3294 string_term st;
3281 char *s = get_to_st (eh); 3295 char *s = get_to_st (st);
3282 if (s) 3296 if (s)
3283 free (s); 3297 free (s);
3284 3298
3285 return; 3299 return;
3286} 3300}
… …
3298 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3312 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3299 arg = arg * 10 + (ch - '0'); 3313 arg = arg * 10 + (ch - '0');
3300 3314
3301 if (ch == ';') 3315 if (ch == ';')
3302 { 3316 {
3303 unicode_t eh; 3317 string_term st;
3304 char *s = get_to_st (eh); 3318 char *s = get_to_st (st);
3305 3319
3306 if (s) 3320 if (s)
3307 { 3321 {
3308 process_xterm_seq (arg, s, eh); 3322 process_xterm_seq (arg, s, st);
3309 free (s); 3323 free (s);
3310 } 3324 }
3311 } 3325 }
3312} 3326}
3313 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
3314void 3431void
3315rxvt_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)
3316{ 3433{
3317 if (str[0] == '?' && !str[1]) 3434 if (str[0] == '?' && !str[1])
3318 { 3435 {
3319 rgba c; 3436 rgba c;
3320 pix_colors_focused[color].get (c); 3437 pix_colors_focused[color].get (c);
3438 char rgba_str[32];
3321 3439
3322#if XFT 3440#if XFT
3323 if (c.a != rgba::MAX_CC) 3441 if (c.a != rgba::MAX_CC)
3324 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);
3325 else 3443 else
3326#endif 3444#endif
3327 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);
3328 } 3451 }
3329 else 3452 else
3330 set_window_color (color, str); 3453 set_window_color (color, str);
3331} 3454}
3332 3455
3333/* 3456/*
3334 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3457 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3335 */ 3458 */
3336void 3459void
3337rxvt_term::process_xterm_seq (int op, char *str, char resp) 3460rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3338{ 3461{
3339 int color; 3462 int color;
3340 char *buf, *name; 3463 char *buf, *name;
3341 bool query = str[0] == '?' && !str[1]; 3464 bool query = str[0] == '?' && !str[1];
3342 int saveop = op; 3465 int saveop = op;
… …
3377 &nitems, &bytes_after, &value) == Success 3500 &nitems, &bytes_after, &value) == Success
3378 && actual_type != None 3501 && actual_type != None
3379 && actual_format == 8) 3502 && actual_format == 8)
3380 str = (const char *)(value); 3503 str = (const char *)(value);
3381 3504
3382 tt_printf ("\033]%d;%s%c", op, str, resp); 3505 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3383 3506
3384 XFree (value); 3507 XFree (value);
3385 } 3508 }
3386 else 3509 else
3387 { 3510 {
… …
3411 break; 3534 break;
3412 3535
3413 if ((buf = strchr (name, ';')) != NULL) 3536 if ((buf = strchr (name, ';')) != NULL)
3414 *buf++ = '\0'; 3537 *buf++ = '\0';
3415 3538
3416 process_color_seq (op, color, name, resp); 3539 process_color_seq (op, color, name, st);
3417 } 3540 }
3418 break; 3541 break;
3419 case Rxvt_restoreFG: 3542 case Rxvt_restoreFG:
3420 case XTerm_Color00: 3543 case XTerm_Color00:
3421 process_color_seq (op, Color_fg, str, resp); 3544 process_color_seq (op, Color_fg, str, st);
3422 break; 3545 break;
3423 case Rxvt_restoreBG: 3546 case Rxvt_restoreBG:
3424 case XTerm_Color01: 3547 case XTerm_Color01:
3425 process_color_seq (op, Color_bg, str, resp); 3548 process_color_seq (op, Color_bg, str, st);
3426 break; 3549 break;
3427#ifndef NO_CURSORCOLOR 3550#ifndef NO_CURSORCOLOR
3428 case XTerm_Color_cursor: 3551 case XTerm_Color_cursor:
3429 process_color_seq (op, Color_cursor, str, resp); 3552 process_color_seq (op, Color_cursor, str, st);
3430 break; 3553 break;
3431#endif 3554#endif
3432 case XTerm_Color_pointer_fg: 3555 case XTerm_Color_pointer_fg:
3433 process_color_seq (op, Color_pointer_fg, str, resp); 3556 process_color_seq (op, Color_pointer_fg, str, st);
3434 break; 3557 break;
3435 case XTerm_Color_pointer_bg: 3558 case XTerm_Color_pointer_bg:
3436 process_color_seq (op, Color_pointer_bg, str, resp); 3559 process_color_seq (op, Color_pointer_bg, str, st);
3437 break; 3560 break;
3438#ifdef OPTION_HC 3561#ifdef OPTION_HC
3439 case XTerm_Color_HC: 3562 case XTerm_Color_HC:
3440 process_color_seq (op, Color_HC, str, resp); 3563 process_color_seq (op, Color_HC, str, st);
3441 break; 3564 break;
3442 case XTerm_Color_HTC: 3565 case XTerm_Color_HTC:
3443 process_color_seq (op, Color_HTC, str, resp); 3566 process_color_seq (op, Color_HTC, str, st);
3444 break; 3567 break;
3445#endif 3568#endif
3446#ifndef NO_BOLD_UNDERLINE_REVERSE 3569#ifndef NO_BOLD_UNDERLINE_REVERSE
3447 case URxvt_Color_BD: 3570 case URxvt_Color_BD:
3448 process_color_seq (op, Color_BD, str, resp); 3571 process_color_seq (op, Color_BD, str, st);
3449 break; 3572 break;
3450 case URxvt_Color_UL: 3573 case URxvt_Color_UL:
3451 process_color_seq (op, Color_UL, str, resp); 3574 process_color_seq (op, Color_UL, str, st);
3452 break; 3575 break;
3453 case URxvt_Color_IT: 3576 case URxvt_Color_IT:
3454 process_color_seq (op, Color_IT, str, resp); 3577 process_color_seq (op, Color_IT, str, st);
3455 break; 3578 break;
3456#endif 3579#endif
3457 case URxvt_Color_border: 3580 case URxvt_Color_border:
3458 process_color_seq (op, Color_border, str, resp); 3581 process_color_seq (op, Color_border, str, st);
3459 break; 3582 break;
3460
3461#if BG_IMAGE_FROM_ROOT
3462 case URxvt_Color_tint:
3463 process_color_seq (op, Color_tint, str, resp);
3464 {
3465 bool changed = false;
3466
3467 if (ISSET_PIXCOLOR (Color_tint))
3468 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3469
3470 if (changed)
3471 update_background ();
3472 }
3473
3474 break;
3475#endif
3476
3477#if BG_IMAGE_FROM_FILE
3478 case Rxvt_Pixmap:
3479 if (!strcmp (str, "?"))
3480 {
3481 char str[256];
3482 int h_scale = fimage.h_scale;
3483 int v_scale = fimage.v_scale;
3484 int h_align = fimage.h_align;
3485 int v_align = fimage.v_align;
3486
3487 sprintf (str, "[%dx%d+%d+%d]",
3488 h_scale, v_scale,
3489 h_align, v_align);
3490 process_xterm_seq (XTerm_title, str, CHAR_ST);
3491 }
3492 else
3493 {
3494 bool changed = false;
3495
3496 if (*str != ';')
3497 {
3498 try
3499 {
3500 fimage.set_file_geometry (this, str);
3501 changed = true;
3502 }
3503 catch (const class rxvt_failure_exception &e)
3504 {
3505 }
3506 }
3507 else
3508 {
3509 str++;
3510 if (fimage.set_geometry (str, true))
3511 changed = true;
3512 }
3513
3514 if (changed)
3515 {
3516 if (bg_window_position_sensitive ())
3517 {
3518 int x, y;
3519 get_window_origin (x, y);
3520 parent_x = x;
3521 parent_y = y;
3522 }
3523 update_background ();
3524 }
3525 }
3526 break;
3527#endif
3528 3583
3529 case XTerm_logfile: 3584 case XTerm_logfile:
3530 // TODO, when secure mode? 3585 // TODO, when secure mode?
3531 break; 3586 break;
3532 3587
… …
3549 case URxvt_boldFont: 3604 case URxvt_boldFont:
3550 case URxvt_italicFont: 3605 case URxvt_italicFont:
3551 case URxvt_boldItalicFont: 3606 case URxvt_boldItalicFont:
3552#endif 3607#endif
3553 if (query) 3608 if (query)
3554 tt_printf ("\33]%d;%-.250s%c", saveop, 3609 tt_printf ("\33]%d;%-.250s%s", saveop,
3555 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3610 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3556 ? fontset[op - URxvt_font]->fontdesc : "", 3611 ? fontset[op - URxvt_font]->fontdesc : "",
3557 resp); 3612 st.v);
3558 else 3613 else
3559 { 3614 {
3560 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3615 const char *&res = rs[Rs_font + (op - URxvt_font)];
3561 3616
3562 res = strdup (str); 3617 res = strdup (str);
… …
3565 } 3620 }
3566 break; 3621 break;
3567 3622
3568 case URxvt_version: 3623 case URxvt_version:
3569 if (query) 3624 if (query)
3570 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3625 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3571 op, 3626 op,
3572 rs[Rs_name], VERSION[0], VERSION[2], 3627 rs[Rs_name], VERSION[0], VERSION[2],
3573 resp); 3628 st.v);
3574 break; 3629 break;
3575 3630
3576#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
3577 case URxvt_locale: 3639 case URxvt_locale:
3578 if (query) 3640 if (query)
3579 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);
3580 else 3642 else
3581 { 3643 {
3582 set_locale (str); 3644 set_locale (str);
3583 pty->set_utf8_mode (enc_utf8); 3645 pty->set_utf8_mode (enc_utf8);
3584 init_xlocale (); 3646 init_xlocale ();
… …
3599 break; 3661 break;
3600#endif 3662#endif
3601 3663
3602#if ENABLE_PERL 3664#if ENABLE_PERL
3603 case URxvt_perl: 3665 case URxvt_perl:
3604 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));
3605 break; 3667 break;
3606#endif 3668#endif
3607 } 3669 }
3608} 3670}
3609/*----------------------------------------------------------------------*/ 3671/*----------------------------------------------------------------------*/
… …
3666 { 5, PrivMode_rVideo }, // DECSCNM 3728 { 5, PrivMode_rVideo }, // DECSCNM
3667 { 6, PrivMode_relOrigin }, // DECOM 3729 { 6, PrivMode_relOrigin }, // DECOM
3668 { 7, PrivMode_Autowrap }, // DECAWM 3730 { 7, PrivMode_Autowrap }, // DECAWM
3669 // 8, auto-repeat keys // DECARM 3731 // 8, auto-repeat keys // DECARM
3670 { 9, PrivMode_MouseX10 }, 3732 { 9, PrivMode_MouseX10 },
3733 { 12, PrivMode_BlinkingCursor },
3671 // 18 end FF to printer after print screen 3734 // 18 end FF to printer after print screen
3672 // 19 Print screen prints full screen/scroll region 3735 // 19 Print screen prints full screen/scroll region
3673 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3736 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3674#ifdef scrollBar_esc 3737#ifdef scrollBar_esc
3675 { scrollBar_esc, PrivMode_scrollBar }, 3738 { scrollBar_esc, PrivMode_scrollBar },
… …
3687#endif 3750#endif
3688 { 1000, PrivMode_MouseX11 }, 3751 { 1000, PrivMode_MouseX11 },
3689 { 1002, PrivMode_MouseBtnEvent }, 3752 { 1002, PrivMode_MouseBtnEvent },
3690 { 1003, PrivMode_MouseAnyEvent }, 3753 { 1003, PrivMode_MouseAnyEvent },
3691#if ENABLE_FRILLS 3754#if ENABLE_FRILLS
3755 { 1004, PrivMode_FocusEvent },
3692 { 1005, PrivMode_ExtModeMouse }, 3756 { 1005, PrivMode_ExtMouseUTF8 },
3757 { 1006, PrivMode_ExtMouseSGR },
3693#endif 3758#endif
3694 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3759 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3695 { 1011, PrivMode_Keypress }, // rxvt extension 3760 { 1011, PrivMode_Keypress }, // rxvt extension
3696#if ENABLE_FRILLS 3761#if ENABLE_FRILLS
3697 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3762 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3698#endif 3763#endif
3699 // 1035 enable modifiers for alt, numlock NYI 3764 // 1035 enable modifiers for alt, numlock NYI
3700 // 1036 send ESC for meta keys NYI 3765 // 1036 send ESC for meta keys NYI
3701 // 1037 send DEL for keypad delete NYI 3766 // 1037 send DEL for keypad delete NYI
3702 { 1047, PrivMode_Screen }, 3767 { 1047, PrivMode_Screen },
3703 // 1048 save and restore cursor, implemented in code 3768 // 1048 save and restore cursor, implemented in code
3704 { 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 */
3705 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3770 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3771#if ENABLE_FRILLS
3706 { 2004, PrivMode_BracketPaste }, 3772 { 2004, PrivMode_BracketPaste },
3773#endif
3707 }; 3774 };
3708 3775
3709 if (nargs == 0) 3776 if (nargs == 0)
3710 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 }
3711 3796
3712 /* make lo/hi boolean */ 3797 /* make lo/hi boolean */
3713 if (mode == 'l') 3798 if (mode == 'l')
3714 mode = 0; /* reset */ 3799 mode = 0; /* reset */
3715 else if (mode == 'h') 3800 else if (mode == 'h')
… …
3784 scrollBar.map (state); 3869 scrollBar.map (state);
3785 resize_all_windows (0, 0, 0); 3870 resize_all_windows (0, 0, 0);
3786 scr_touch (true); 3871 scr_touch (true);
3787 break; 3872 break;
3788#endif 3873#endif
3874#ifdef CURSOR_BLINK
3875 case 12:
3876 cursor_blink_reset ();
3877 break;
3878#endif
3789 case 25: /* visible/invisible cursor */ 3879 case 25: /* visible/invisible cursor */
3790 scr_cursor_visible (state); 3880 scr_cursor_visible (state);
3791 break; 3881 break;
3792 /* case 35: - shift keys */ 3882 /* case 35: - shift keys */
3793 /* case 40: - 80 <--> 132 mode */ 3883 /* case 40: - 80 <--> 132 mode */
… …
3898 //case 19: // ninth alt font 3988 //case 19: // ninth alt font
3899 //case 20: // gothic 3989 //case 20: // gothic
3900 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3990 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3901 rendset = 0, rendstyle = RS_Bold; 3991 rendset = 0, rendstyle = RS_Bold;
3902 break; 3992 break;
3903 case 22: // normal intensity 3993 case 22: // bold off (vt220)
3904 rendset = 0, rendstyle = RS_Bold; 3994 rendset = 0, rendstyle = RS_Bold;
3905 break; 3995 break;
3906 case 23: // disable italic 3996 case 23: // disable italic
3907 rendset = 0, rendstyle = RS_Italic; 3997 rendset = 0, rendstyle = RS_Italic;
3908 break; 3998 break;
3909 case 24: 3999 case 24: // underline off (vt220)
3910 rendset = 0, rendstyle = RS_Uline; 4000 rendset = 0, rendstyle = RS_Uline;
3911 break; 4001 break;
3912 case 25: 4002 case 25: // blink off (vt220)
3913 rendset = 0, rendstyle = RS_Blink; 4003 rendset = 0, rendstyle = RS_Blink;
3914 break; 4004 break;
3915 case 26: // variable spacing (iso 8613) 4005 case 26: // variable spacing (iso 8613)
3916 rendset = 0, rendstyle = RS_Blink; 4006 rendset = 0, rendstyle = RS_Blink;
3917 break; 4007 break;
3918 case 27: 4008 case 27: // reverse off (vt220)
3919 rendset = 0, rendstyle = RS_RVid; 4009 rendset = 0, rendstyle = RS_RVid;
3920 break; 4010 break;
3921 //case 28: // visible. NYI 4011 //case 28: // visible. NYI
3922 //case 29: // not crossed-out 4012 //case 29: // not crossed-out
3923 } 4013 }
… …
3938 case 35: 4028 case 35:
3939 case 36: 4029 case 36:
3940 case 37: 4030 case 37:
3941 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4031 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3942 break; 4032 break;
3943 case 38: // set fg color, ISO 8613-6
3944 if (nargs > i + 2 && arg[i + 1] == 5)
3945 {
3946 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3947 i += 2;
3948 }
3949 break;
3950 case 39: /* default fg */ 4033 case 39: /* default fg */
3951 scr_color (Color_fg, Color_fg); 4034 scr_color (Color_fg, Color_fg);
3952 break; 4035 break;
3953 4036
3954 case 40: 4037 case 40:
… …
3959 case 45: 4042 case 45:
3960 case 46: 4043 case 46:
3961 case 47: 4044 case 47:
3962 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4045 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3963 break; 4046 break;
3964 case 48: // set bg color, ISO 8613-6
3965 if (nargs > i + 2 && arg[i + 1] == 5)
3966 {
3967 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3968 i += 2;
3969 }
3970 break;
3971 case 49: /* default bg */ 4047 case 49: /* default bg */
3972 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 }
3973 break; 4078 break;
3974 4079
3975 //case 50: // not variable spacing 4080 //case 50: // not variable spacing
3976 4081
3977#if !ENABLE_MINIMAL 4082#if !ENABLE_MINIMAL
… …
4001} 4106}
4002 4107
4003void 4108void
4004rxvt_term::set_cursor_style (int style) 4109rxvt_term::set_cursor_style (int style)
4005{ 4110{
4006 if (!IN_RANGE_INC (style, 0, 4)) 4111 if (!IN_RANGE_INC (style, 0, 6))
4007 return; 4112 return;
4008 4113
4114 if (style == 0)
4115 style = 1;
4116
4117 cursor_type = (style - 1) / 2;
4009 set_option (Opt_cursorUnderline, style >= 3); 4118 set_option (Opt_cursorUnderline, cursor_type == 1);
4010 4119
4011#ifdef CURSOR_BLINK 4120#ifdef CURSOR_BLINK
4012 set_option (Opt_cursorBlink, !style || (style & 1)); 4121 set_option (Opt_cursorBlink, style & 1);
4013 cursor_blink_reset (); 4122 cursor_blink_reset ();
4014#endif 4123#endif
4015 4124
4016 want_refresh = 1; 4125 want_refresh = 1;
4017} 4126}
4018/*}}} */ 4127/*}}} */
4019 4128
4020/* ------------------------------------------------------------------------- */ 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 */
4021 4133
4022/* 4134/*
4023 * Send printf () formatted output to the command. 4135 * Send printf () formatted output to the command.
4024 * Only use for small amounts of data. 4136 * Only use for small amounts of data.
4025 */ 4137 */
… …
4033 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4145 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4034 va_end (arg_ptr); 4146 va_end (arg_ptr);
4035 tt_write (buf, strlen (buf)); 4147 tt_write (buf, strlen (buf));
4036} 4148}
4037 4149
4038/* ---------------------------------------------------------------------- */
4039/* 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. */
4040 * or generated by us in response to a query ESC sequence. 4151void
4041 */ 4152rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4042static 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}
4043 4166
4044void 4167void
4045rxvt_term::tt_write (const char *data, unsigned int len) 4168rxvt_term::tt_write (const char *data, unsigned int len)
4046{ 4169{
4047 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)))
4048 return; 4171 return;
4049 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{
4050 if (pty->pty < 0) 4181 if (pty->pty < 0)
4051 return; 4182 return;
4052 4183
4053 if (v_buflen == 0) 4184 if (v_buflen == 0)
4054 { 4185 {

Diff Legend

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