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.540 by sf-exg, Sat Apr 20 19:50:04 2013 UTC vs.
Revision 1.585 by root, Sun Jul 7 08:06:44 2019 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de> 30 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007,2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 3 of the License, or
36 * (at your option) any later version. 36 * (at your option) any later version.
37 * 37 *
38 * This program is distributed in the hope that it will be useful, 38 * This program is distributed in the hope that it will be useful,
39 * but WITHOUT ANY WARRANTY; without even the implied warranty of 39 * but WITHOUT ANY WARRANTY; without even the implied warranty of
40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 40 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
210 210
211 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
212 212
213 if (y >= 0) 213 if (y >= 0)
214 { 214 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 216 x = 0;
217 } 217 }
218 218
219 scr_overlay_new (x, y, width, len * 2 + 2); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220 220
… …
315 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left 316 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up 317 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right 318 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down 319 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior 320 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next 321 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End 322 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin 323 XK_KP_5, // XK_KP_Begin
329 }; 324 };
330 325
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 326 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
376 param = 3; 371 param = 3;
377 break; 372 break;
378 case XK_Select: 373 case XK_Select:
379 param = 4; 374 param = 4;
380 break; 375 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior: 376 case XK_Prior:
383 param = 5; 377 param = 5;
384 break; 378 break;
385 case XK_Next: 379 case XK_Next:
386 param = 6; 380 param = 6;
… …
389 param = 7; 383 param = 7;
390 break; 384 break;
391 case XK_End: 385 case XK_End:
392 param = 8; 386 param = 8;
393 break; 387 break;
394#endif
395 case XK_Help: 388 case XK_Help:
396 param = 28; 389 param = 28;
397 break; 390 break;
398 case XK_Menu: 391 case XK_Menu:
399 param = 29; 392 param = 29;
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{
… …
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
… …
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))
… …
1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1483 ;
1469 1484
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1485 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471 1486
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) 1487 if (want_position_change)
1483 { 1488 {
1484 int x, y; 1489 int x, y;
1485 1490
1486 if (ev.xconfigure.send_event) 1491 if (ev.xconfigure.send_event)
… …
1494 if (x != parent_x || y != parent_y) 1499 if (x != parent_x || y != parent_y)
1495 { 1500 {
1496 parent_x = x; 1501 parent_x = x;
1497 parent_y = y; 1502 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1503 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 } 1504 }
1501 } 1505 }
1502 1506
1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1507 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1504 { 1508 {
1505 seen_resize = 1; 1509 seen_resize = 1;
1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1510 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1507 } 1511 }
1508 else
1509 {
1510#ifdef HAVE_BG_PIXMAP
1511 if (moved)
1512 update_background ();
1513#endif
1514 }
1515 1512
1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1513 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1517 } 1514 }
1518 break; 1515 break;
1519 1516
… …
1528 case SelectionRequest: 1525 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1530 break; 1527 break;
1531 1528
1532 case MapNotify: 1529 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; 1530 mapped = 1;
1545#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1546 text_blink_ev.start (); 1532 text_blink_ev.start ();
1547#endif 1533#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1597 case MotionNotify: 1583 case MotionNotify:
1598#ifdef POINTER_BLANK 1584#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1585 if (hidden_pointer)
1600 pointer_unblank (); 1586 pointer_unblank ();
1601#endif 1587#endif
1588 if (!bypass_keystate
1602 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1589 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1603 || priv_modes & PrivMode_MouseAnyEvent) 1590 || priv_modes & PrivMode_MouseAnyEvent))
1604 mouse_report (ev.xbutton); 1591 mouse_report (ev.xbutton);
1605 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1606 break; 1593 break;
1607 1594
1608 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
… …
1620 &unused_root_x, &unused_root_y, 1607 &unused_root_x, &unused_root_y,
1621 &ev.xbutton.x, &ev.xbutton.y, 1608 &ev.xbutton.x, &ev.xbutton.y,
1622 &ev.xbutton.state); 1609 &ev.xbutton.state);
1623#ifdef MOUSE_THRESHOLD 1610#ifdef MOUSE_THRESHOLD
1624 /* deal with a `jumpy' mouse */ 1611 /* deal with a `jumpy' mouse */
1625 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1612 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1613#endif
1626 { 1614 {
1627#endif
1628#if ISO_14755 1615#if ISO_14755
1629 // 5.4 1616 // 5.4
1630 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1617 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1631 { 1618 {
1632 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1619 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1681 * shouldn't be scrolling 1668 * shouldn't be scrolling
1682 */ 1669 */
1683 sel_scroll_ev.stop(); 1670 sel_scroll_ev.stop();
1684 } 1671 }
1685#endif 1672#endif
1686#ifdef MOUSE_THRESHOLD
1687 } 1673 }
1688#endif
1689 } 1674 }
1690 } 1675 }
1691 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1692 { 1677 {
1693 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1767#endif 1752#endif
1768#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1769 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1770 { 1755 {
1771 pix_colors = pix_colors_focused; 1756 pix_colors = pix_colors_focused;
1772 scr_recolour (); 1757 scr_recolor ();
1773 } 1758 }
1774#endif 1759#endif
1775#if ENABLE_FRILLS 1760#if ENABLE_FRILLS
1776 if (option (Opt_urgentOnBell)) 1761 if (option (Opt_urgentOnBell))
1777 set_urgency (0); 1762 set_urgency (0);
1763
1764 if (priv_modes & PrivMode_FocusEvent)
1765 tt_printf ("\x1b[I");
1778#endif 1766#endif
1779 1767
1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1768 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1781 } 1769 }
1782} 1770}
… …
1790 want_refresh = 1; 1778 want_refresh = 1;
1791 1779
1792#if ENABLE_FRILLS 1780#if ENABLE_FRILLS
1793 if (option (Opt_urgentOnBell)) 1781 if (option (Opt_urgentOnBell))
1794 set_urgency (0); 1782 set_urgency (0);
1783
1784 if (priv_modes & PrivMode_FocusEvent)
1785 tt_printf ("\x1b[O");
1795#endif 1786#endif
1796#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf) 1788 if (iso14755buf)
1798 { 1789 {
1799 iso14755buf = 0; 1790 iso14755buf = 0;
… …
1814#endif 1805#endif
1815#if OFF_FOCUS_FADING 1806#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade]) 1807 if (rs[Rs_fade])
1817 { 1808 {
1818 pix_colors = pix_colors_unfocused; 1809 pix_colors = pix_colors_unfocused;
1819 scr_recolour (); 1810 scr_recolor ();
1820 } 1811 }
1821#endif 1812#endif
1822 1813
1823 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1814 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1824 } 1815 }
1825} 1816}
1826 1817
1827void ecb_cold 1818void ecb_cold
1828rxvt_term::update_fade_color (unsigned int idx) 1819rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1829{ 1820{
1830#if OFF_FOCUS_FADING 1821#if OFF_FOCUS_FADING
1831 if (rs[Rs_fade]) 1822 if (rs[Rs_fade])
1832 { 1823 {
1824 if (!first_time)
1825 pix_colors_focused [idx].free (this);
1826
1833 rgba c; 1827 rgba c;
1834 pix_colors [Color_fade].get (c); 1828 pix_colors [Color_fade].get (c);
1835 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1829 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1836 } 1830 }
1837#endif 1831#endif
1838} 1832}
1839 1833
1840#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1834#if ENABLE_PERL
1841void ecb_hot 1835void ecb_hot
1842rxvt_term::rootwin_cb (XEvent &ev) 1836rxvt_term::rootwin_cb (XEvent &ev)
1843{ 1837{
1844 make_current (); 1838 make_current ();
1845 1839
… …
1855 * use the property to determine the pixmap. We use it later on. 1849 * use the property to determine the pixmap. We use it later on.
1856 */ 1850 */
1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1851 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1852 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1859 { 1853 {
1860#if BG_IMAGE_FROM_ROOT
1861 if (option (Opt_transparent))
1862 {
1863 rxvt_img::new_from_root (this)->replace (root_img);
1864 update_background ();
1865 }
1866#endif
1867 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1854 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1868 } 1855 }
1869 1856
1870 break; 1857 break;
1871 } 1858 }
… …
1899 iso14755_54 (ev.x, ev.y); 1886 iso14755_54 (ev.x, ev.y);
1900 return; 1887 return;
1901 } 1888 }
1902#endif 1889#endif
1903 1890
1904 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1891 clickintime = ev.time - MEvent.time < multiClickTime;
1905 1892
1906 if (reportmode) 1893 if (reportmode)
1907 { 1894 {
1908 /* mouse report from vt window */ 1895 /* mouse report from vt window */
1909 /* save the xbutton state (for ButtonRelease) */ 1896 /* save the xbutton state (for ButtonRelease) */
… …
2159#ifdef MOUSE_REPORT_DOUBLECLICK 2146#ifdef MOUSE_REPORT_DOUBLECLICK
2160 /* only report the release of 'slow' single clicks */ 2147 /* only report the release of 'slow' single clicks */
2161 if (MEvent.button != AnyButton 2148 if (MEvent.button != AnyButton
2162 && (ev.button != MEvent.button 2149 && (ev.button != MEvent.button
2163 || (ev.time - MEvent.time 2150 || (ev.time - MEvent.time
2164 > MULTICLICK_TIME / 2))) 2151 > multiClickTime / 2)))
2165 { 2152 {
2166 MEvent.clicks = 0; 2153 MEvent.clicks = 0;
2167 MEvent.button = AnyButton; 2154 MEvent.button = AnyButton;
2168 mouse_report (ev); 2155 mouse_report (ev);
2169 } 2156 }
… …
2367wchar_t ecb_hot 2354wchar_t ecb_hot
2368rxvt_term::next_char () NOTHROW 2355rxvt_term::next_char () NOTHROW
2369{ 2356{
2370 while (cmdbuf_ptr < cmdbuf_endp) 2357 while (cmdbuf_ptr < cmdbuf_endp)
2371 { 2358 {
2372 // assume 7-bit to be ascii ALWAYS 2359 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2373 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2360 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2374 return *cmdbuf_ptr++; 2361 return *cmdbuf_ptr++;
2375 2362
2376 wchar_t wc; 2363 wchar_t wc;
2377 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2364 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2378 2365
… …
2559 scr_charset_choose (0); 2546 scr_charset_choose (0);
2560 break; 2547 break;
2561 2548
2562#ifdef EIGHT_BIT_CONTROLS 2549#ifdef EIGHT_BIT_CONTROLS
2563 // 8-bit controls 2550 // 8-bit controls
2564 case 0x90: /* DCS */ 2551 case 0x90: /* DCS */
2565 process_dcs_seq (); 2552 process_dcs_seq ();
2566 break; 2553 break;
2567 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
2568 process_csi_seq (); 2555 process_csi_seq ();
2569 break; 2556 break;
2570 case 0x9d: /* OSC */ 2557 case 0x9d: /* OSC */
2571 process_osc_seq (); 2558 process_osc_seq ();
2572 break; 2559 break;
2573#endif 2560#endif
2574 } 2561 }
2575} 2562}
… …
2703 wchar_t nlcr[] = { C0_LF, C0_CR }; 2690 wchar_t nlcr[] = { C0_LF, C0_CR };
2704 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2691 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2705 } 2692 }
2706 break; 2693 break;
2707 2694
2695#if 0 // disabled because embedded newlines can make exploits easier
2708 /* kidnapped escape sequence: Should be 8.3.48 */ 2696 /* kidnapped escape sequence: Should be 8.3.48 */
2709 case C1_ESA: /* ESC G */ 2697 case C1_ESA: /* ESC G */
2710 // used by original rxvt for rob nations own graphics mode 2698 // used by original rxvt for rob nations own graphics mode
2711 if (cmd_getc () == 'Q') 2699 if (cmd_getc () == 'Q' && option (Opt_insecure))
2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2700 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2713 break; 2701 break;
2702#endif
2714 2703
2715 /* 8.3.63: CHARACTER TABULATION SET */ 2704 /* 8.3.63: CHARACTER TABULATION SET */
2716 case C1_HTS: /* ESC H */ 2705 case C1_HTS: /* ESC H */
2717 scr_set_tab (1); 2706 scr_set_tab (1);
2718 break; 2707 break;
… …
2925 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2926 scr_gotorc (arg[0], 0, RELATIVE); 2915 scr_gotorc (arg[0], 0, RELATIVE);
2927 break; 2916 break;
2928 2917
2929 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2918 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2930 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2919 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2931#ifdef ISO6429 2920#ifdef ISO6429
2932 arg[0] = -arg[0]; 2921 arg[0] = -arg[0];
2933#else /* emulate common DEC VTs */ 2922#else /* emulate common DEC VTs */
2934 arg[0] = arg[0] ? -arg[0] : -1; 2923 arg[0] = arg[0] ? -arg[0] : -1;
2935#endif 2924#endif
… …
3080 scr_insert_mode (1); 3069 scr_insert_mode (1);
3081 else if (arg[0] == 20) 3070 else if (arg[0] == 20)
3082 priv_modes |= PrivMode_LFNL; 3071 priv_modes |= PrivMode_LFNL;
3083 break; 3072 break;
3084 3073
3085 case CSI_71: // DESCUSR: set cursor style 3074 case CSI_71: // DECSCUSR: set cursor style
3086 if (prev_ch == ' ') 3075 if (prev_ch == ' ')
3087 set_cursor_style (arg[0]); 3076 set_cursor_style (arg[0]);
3088 break; 3077 break;
3089 3078
3090 /* 3079 /*
… …
3227rxvt_term::get_to_st (unicode_t &ends_how) 3216rxvt_term::get_to_st (unicode_t &ends_how)
3228{ 3217{
3229 unicode_t ch; 3218 unicode_t ch;
3230 bool seen_esc = false; 3219 bool seen_esc = false;
3231 unsigned int n = 0; 3220 unsigned int n = 0;
3232 wchar_t string[STRING_MAX]; 3221 wchar_t string[CBUFSIZ];
3233 3222
3234 while ((ch = cmd_getc ()) != NOCHAR) 3223 while ((ch = cmd_getc ()) != NOCHAR)
3235 { 3224 {
3236 if (seen_esc) 3225 if (seen_esc)
3237 { 3226 {
… …
3252 else if (ch < 0x20) 3241 else if (ch < 0x20)
3253 return NULL; /* other control character - exit */ 3242 return NULL; /* other control character - exit */
3254 3243
3255 seen_esc = false; 3244 seen_esc = false;
3256 3245
3257 if (n >= STRING_MAX - 1) 3246 if (n >= sizeof (string) - 1)
3258 // stop at some sane length 3247 // stop at some sane length
3259 return NULL; 3248 return NULL;
3260 3249
3261 string[n++] = ch; 3250 string[n++] = ch;
3262 } 3251 }
… …
3311 free (s); 3300 free (s);
3312 } 3301 }
3313 } 3302 }
3314} 3303}
3315 3304
3305static unsigned int
3306colorcube_index (unsigned int idx_r,
3307 unsigned int idx_g,
3308 unsigned int idx_b)
3309{
3310 assert (idx_r < Red_levels);
3311 assert (idx_g < Green_levels);
3312 assert (idx_b < Blue_levels);
3313
3314 return idx_r * Blue_levels * Green_levels +
3315 idx_g * Blue_levels +
3316 idx_b;
3317}
3318
3319/*
3320 * Find the nearest color slot in the hidden color cube,
3321 * adapt its value to the 32bit RGBA color.
3322 */
3323unsigned int
3324rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3325{
3326 r &= 0xff;
3327 g &= 0xff;
3328 b &= 0xff;
3329 a &= 0xff;
3330
3331 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3332
3333 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3334 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3335 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3336 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3337
3338 /* we allow one of the 6 directly neighbouring colours */
3339 /* to replace the current color, if they not used recently */
3340 static const signed char dxyz[][3] = {
3341 0, 0, 0,
3342 0, 0, +1,
3343 0, 0, -1,
3344 0, +1, 0,
3345 0, -1, 0,
3346 +1, 0, 0,
3347 -1, 0, 0,
3348 };
3349
3350 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3351 {
3352 int r = idx_r + dxyz[n][0];
3353 int g = idx_g + dxyz[n][1];
3354 int b = idx_b + dxyz[n][2];
3355
3356 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3357 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3358 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3359
3360 unsigned int index = colorcube_index (r, g, b);
3361
3362 if (rgb24_color[index] == color)
3363 {
3364 rgb24_seqno[index] = ++rgb24_sequence;
3365 return index + minTermCOLOR24;
3366 }
3367
3368 // minor issue: could update index 0 few more times
3369 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3370 {
3371 idx = index;
3372 goto update;
3373 }
3374
3375 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3376 // but also handles wrap around values good enough
3377 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3378 idx = index;
3379 }
3380
3381update:
3382 rgb24_color[idx] = color;
3383 rgb24_seqno[idx] = ++rgb24_sequence;
3384
3385 idx += minTermCOLOR24;
3386 pix_colors_focused [idx].free (this);
3387 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3388 update_fade_color (idx, false);
3389
3390 return idx;
3391}
3392
3316void 3393void
3317rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3394rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3318{ 3395{
3319 if (str[0] == '?' && !str[1]) 3396 if (str[0] == '?' && !str[1])
3320 { 3397 {
3321 rgba c; 3398 rgba c;
3322 pix_colors_focused[color].get (c); 3399 pix_colors_focused[color].get (c);
3323 3400
3324#if XFT 3401#if XFT
3325 if (c.a != rgba::MAX_CC) 3402 if (c.a != rgba::MAX_CC)
3326 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3403 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3327 else 3404 else
3328#endif 3405#endif
3329 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3406 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3330 } 3407 }
3331 else 3408 else
… …
3379 &nitems, &bytes_after, &value) == Success 3456 &nitems, &bytes_after, &value) == Success
3380 && actual_type != None 3457 && actual_type != None
3381 && actual_format == 8) 3458 && actual_format == 8)
3382 str = (const char *)(value); 3459 str = (const char *)(value);
3383 3460
3384 tt_printf ("\033]%d;%s%c", op, str, resp); 3461 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3385 3462
3386 XFree (value); 3463 XFree (value);
3387 } 3464 }
3388 else 3465 else
3389 { 3466 {
… …
3457 break; 3534 break;
3458#endif 3535#endif
3459 case URxvt_Color_border: 3536 case URxvt_Color_border:
3460 process_color_seq (op, Color_border, str, resp); 3537 process_color_seq (op, Color_border, str, resp);
3461 break; 3538 break;
3462
3463#if BG_IMAGE_FROM_ROOT
3464 case URxvt_Color_tint:
3465 process_color_seq (op, Color_tint, str, resp);
3466 {
3467 bool changed = false;
3468
3469 if (ISSET_PIXCOLOR (Color_tint))
3470 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3471
3472 if (changed)
3473 update_background ();
3474 }
3475
3476 break;
3477#endif
3478
3479#if BG_IMAGE_FROM_FILE
3480 case Rxvt_Pixmap:
3481 if (!strcmp (str, "?"))
3482 {
3483 char str[256];
3484 int h_scale = fimage.h_scale;
3485 int v_scale = fimage.v_scale;
3486 int h_align = fimage.h_align;
3487 int v_align = fimage.v_align;
3488
3489 sprintf (str, "[%dx%d+%d+%d]",
3490 h_scale, v_scale,
3491 h_align, v_align);
3492 process_xterm_seq (XTerm_title, str, CHAR_ST);
3493 }
3494 else
3495 {
3496 bool changed = false;
3497
3498 if (*str != ';')
3499 {
3500 try
3501 {
3502 fimage.set_file_geometry (this, str);
3503 changed = true;
3504 }
3505 catch (const class rxvt_failure_exception &e)
3506 {
3507 }
3508 }
3509 else
3510 {
3511 str++;
3512 if (fimage.set_geometry (str, true))
3513 changed = true;
3514 }
3515
3516 if (changed)
3517 {
3518 if (bg_window_position_sensitive ())
3519 {
3520 int x, y;
3521 get_window_origin (x, y);
3522 parent_x = x;
3523 parent_y = y;
3524 }
3525 update_background ();
3526 }
3527 }
3528 break;
3529#endif
3530 3539
3531 case XTerm_logfile: 3540 case XTerm_logfile:
3532 // TODO, when secure mode? 3541 // TODO, when secure mode?
3533 break; 3542 break;
3534 3543
… …
3668 { 5, PrivMode_rVideo }, // DECSCNM 3677 { 5, PrivMode_rVideo }, // DECSCNM
3669 { 6, PrivMode_relOrigin }, // DECOM 3678 { 6, PrivMode_relOrigin }, // DECOM
3670 { 7, PrivMode_Autowrap }, // DECAWM 3679 { 7, PrivMode_Autowrap }, // DECAWM
3671 // 8, auto-repeat keys // DECARM 3680 // 8, auto-repeat keys // DECARM
3672 { 9, PrivMode_MouseX10 }, 3681 { 9, PrivMode_MouseX10 },
3682 { 12, PrivMode_BlinkingCursor },
3673 // 18 end FF to printer after print screen 3683 // 18 end FF to printer after print screen
3674 // 19 Print screen prints full screen/scroll region 3684 // 19 Print screen prints full screen/scroll region
3675 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3685 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3676#ifdef scrollBar_esc 3686#ifdef scrollBar_esc
3677 { scrollBar_esc, PrivMode_scrollBar }, 3687 { scrollBar_esc, PrivMode_scrollBar },
… …
3689#endif 3699#endif
3690 { 1000, PrivMode_MouseX11 }, 3700 { 1000, PrivMode_MouseX11 },
3691 { 1002, PrivMode_MouseBtnEvent }, 3701 { 1002, PrivMode_MouseBtnEvent },
3692 { 1003, PrivMode_MouseAnyEvent }, 3702 { 1003, PrivMode_MouseAnyEvent },
3693#if ENABLE_FRILLS 3703#if ENABLE_FRILLS
3704 { 1004, PrivMode_FocusEvent },
3694 { 1005, PrivMode_ExtModeMouse }, 3705 { 1005, PrivMode_ExtModeMouse },
3695#endif 3706#endif
3696 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3707 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3697 { 1011, PrivMode_Keypress }, // rxvt extension 3708 { 1011, PrivMode_Keypress }, // rxvt extension
3698#if ENABLE_FRILLS 3709#if ENABLE_FRILLS
… …
3786 scrollBar.map (state); 3797 scrollBar.map (state);
3787 resize_all_windows (0, 0, 0); 3798 resize_all_windows (0, 0, 0);
3788 scr_touch (true); 3799 scr_touch (true);
3789 break; 3800 break;
3790#endif 3801#endif
3802#ifdef CURSOR_BLINK
3803 case 12:
3804 cursor_blink_reset ();
3805 break;
3806#endif
3791 case 25: /* visible/invisible cursor */ 3807 case 25: /* visible/invisible cursor */
3792 scr_cursor_visible (state); 3808 scr_cursor_visible (state);
3793 break; 3809 break;
3794 /* case 35: - shift keys */ 3810 /* case 35: - shift keys */
3795 /* case 40: - 80 <--> 132 mode */ 3811 /* case 40: - 80 <--> 132 mode */
… …
3900 //case 19: // ninth alt font 3916 //case 19: // ninth alt font
3901 //case 20: // gothic 3917 //case 20: // gothic
3902 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3918 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3903 rendset = 0, rendstyle = RS_Bold; 3919 rendset = 0, rendstyle = RS_Bold;
3904 break; 3920 break;
3905 case 22: // normal intensity 3921 case 22: // bold off (vt220)
3906 rendset = 0, rendstyle = RS_Bold; 3922 rendset = 0, rendstyle = RS_Bold;
3907 break; 3923 break;
3908 case 23: // disable italic 3924 case 23: // disable italic
3909 rendset = 0, rendstyle = RS_Italic; 3925 rendset = 0, rendstyle = RS_Italic;
3910 break; 3926 break;
3911 case 24: 3927 case 24: // underline off (vt220)
3912 rendset = 0, rendstyle = RS_Uline; 3928 rendset = 0, rendstyle = RS_Uline;
3913 break; 3929 break;
3914 case 25: 3930 case 25: // blink off (vt220)
3915 rendset = 0, rendstyle = RS_Blink; 3931 rendset = 0, rendstyle = RS_Blink;
3916 break; 3932 break;
3917 case 26: // variable spacing (iso 8613) 3933 case 26: // variable spacing (iso 8613)
3918 rendset = 0, rendstyle = RS_Blink; 3934 rendset = 0, rendstyle = RS_Blink;
3919 break; 3935 break;
3920 case 27: 3936 case 27: // reverse off (vt220)
3921 rendset = 0, rendstyle = RS_RVid; 3937 rendset = 0, rendstyle = RS_RVid;
3922 break; 3938 break;
3923 //case 28: // visible. NYI 3939 //case 28: // visible. NYI
3924 //case 29: // not crossed-out 3940 //case 29: // not crossed-out
3925 } 3941 }
… …
3940 case 35: 3956 case 35:
3941 case 36: 3957 case 36:
3942 case 37: 3958 case 37:
3943 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 3959 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3944 break; 3960 break;
3945 case 38: // set fg color, ISO 8613-6
3946 if (nargs > i + 2 && arg[i + 1] == 5)
3947 {
3948 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3949 i += 2;
3950 }
3951 break;
3952 case 39: /* default fg */ 3961 case 39: /* default fg */
3953 scr_color (Color_fg, Color_fg); 3962 scr_color (Color_fg, Color_fg);
3954 break; 3963 break;
3955 3964
3956 case 40: 3965 case 40:
… …
3961 case 45: 3970 case 45:
3962 case 46: 3971 case 46:
3963 case 47: 3972 case 47:
3964 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 3973 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3965 break; 3974 break;
3966 case 48: // set bg color, ISO 8613-6
3967 if (nargs > i + 2 && arg[i + 1] == 5)
3968 {
3969 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3970 i += 2;
3971 }
3972 break;
3973 case 49: /* default bg */ 3975 case 49: /* default bg */
3974 scr_color (Color_bg, Color_bg); 3976 scr_color (Color_bg, Color_bg);
3977 break;
3978
3979 case 38: // set fg color, ISO 8613-6
3980 case 48: // set bg color, ISO 8613-6
3981 {
3982 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
3983 unsigned int idx;
3984
3985 if (nargs > i + 2 && arg[i + 1] == 5)
3986 {
3987 idx = minCOLOR + arg[i + 2];
3988 i += 2;
3989
3990 scr_color (idx, fgbg);
3991 }
3992 else if (nargs > i + 4 && arg[i + 1] == 2)
3993 {
3994 unsigned int r = arg[i + 2];
3995 unsigned int g = arg[i + 3];
3996 unsigned int b = arg[i + 4];
3997 unsigned int a = 0xff;
3998
3999 idx = map_rgb24_color (r, g, b, a);
4000
4001 i += 4;
4002
4003 scr_color (idx, fgbg);
4004 }
4005 }
3975 break; 4006 break;
3976 4007
3977 //case 50: // not variable spacing 4008 //case 50: // not variable spacing
3978 4009
3979#if !ENABLE_MINIMAL 4010#if !ENABLE_MINIMAL
… …
4003} 4034}
4004 4035
4005void 4036void
4006rxvt_term::set_cursor_style (int style) 4037rxvt_term::set_cursor_style (int style)
4007{ 4038{
4008 if (!IN_RANGE_INC (style, 0, 4)) 4039 if (!IN_RANGE_INC (style, 0, 6))
4009 return; 4040 return;
4010 4041
4042 if (style == 0)
4043 style = 1;
4044
4045 cursor_type = (style - 1) / 2;
4011 set_option (Opt_cursorUnderline, style >= 3); 4046 set_option (Opt_cursorUnderline, cursor_type == 1);
4012 4047
4013#ifdef CURSOR_BLINK 4048#ifdef CURSOR_BLINK
4014 set_option (Opt_cursorBlink, !style || (style & 1)); 4049 set_option (Opt_cursorBlink, style & 1);
4015 cursor_blink_reset (); 4050 cursor_blink_reset ();
4016#endif 4051#endif
4017 4052
4018 want_refresh = 1; 4053 want_refresh = 1;
4019} 4054}
4020/*}}} */ 4055/*}}} */
4021 4056
4022/* ------------------------------------------------------------------------- */ 4057/* ---------------------------------------------------------------------- */
4058/* Write data to the pty as typed by the user, pasted with the mouse,
4059 * or generated by us in response to a query ESC sequence.
4060 */
4023 4061
4024/* 4062/*
4025 * Send printf () formatted output to the command. 4063 * Send printf () formatted output to the command.
4026 * Only use for small amounts of data. 4064 * Only use for small amounts of data.
4027 */ 4065 */
… …
4035 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4073 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4036 va_end (arg_ptr); 4074 va_end (arg_ptr);
4037 tt_write (buf, strlen (buf)); 4075 tt_write (buf, strlen (buf));
4038} 4076}
4039 4077
4040/* ---------------------------------------------------------------------- */
4041/* Write data to the pty as typed by the user, pasted with the mouse, 4078/* Write data to the pty as typed by the user. */
4042 * or generated by us in response to a query ESC sequence. 4079void
4043 */ 4080rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4044static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4081{
4082 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4083 return;
4084
4085 if (option (Opt_scrollTtyKeypress))
4086 if (view_start)
4087 {
4088 view_start = 0;
4089 want_refresh = 1;
4090 }
4091
4092 tt_write_ (data, len);
4093}
4045 4094
4046void 4095void
4047rxvt_term::tt_write (const char *data, unsigned int len) 4096rxvt_term::tt_write (const char *data, unsigned int len)
4048{ 4097{
4049 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4098 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4050 return; 4099 return;
4051 4100
4101 tt_write_ (data, len);
4102}
4103
4104static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4105
4106void
4107rxvt_term::tt_write_ (const char *data, unsigned int len)
4108{
4052 if (pty->pty < 0) 4109 if (pty->pty < 0)
4053 return; 4110 return;
4054 4111
4055 if (v_buflen == 0) 4112 if (v_buflen == 0)
4056 { 4113 {

Diff Legend

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