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.529 by sf-exg, Sun Dec 30 15:05:19 2012 UTC vs.
Revision 1.577 by root, Thu Jun 30 17:00:18 2016 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 {
… …
510#endif 724#endif
511 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
512 726
513 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
514 { 728 {
515 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
516 return; 730 return;
517 } 731 }
518 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
519 { 733 {
520 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
521 return; 735 return;
522 } 736 }
523 } 737 }
524#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
525 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
526 { 740 {
527 if (keysym == XK_Up) 741 if (keysym == XK_Up)
528 { 742 {
529 scr_page (UP, 1); 743 scr_page (1);
530 return; 744 return;
531 } 745 }
532 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
533 { 747 {
534 scr_page (DN, 1); 748 scr_page (-1);
535 return; 749 return;
536 } 750 }
537 } 751 }
538#endif 752#endif
539#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
540 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
541 { 755 {
542 if (keysym == XK_Home) 756 if (keysym == XK_Home)
543 { 757 {
544 scr_move_to (0, 1); 758 scr_changeview (top_row);
545 return; 759 return;
546 } 760 }
547 else if (keysym == XK_End) 761 else if (keysym == XK_End)
548 { 762 {
549 scr_move_to (1, 1); 763 scr_changeview (0);
550 return; 764 return;
551 } 765 }
552 } 766 }
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
… …
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 }
… …
1092 1107
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1109void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1111{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1112 if (scr_page (mouse_slip_wheel_speed))
1098 { 1113 {
1099 want_refresh = 1; 1114 want_refresh = 1;
1100 refresh_check (); 1115 refresh_check ();
1101 } 1116 }
1102 1117
… …
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))
… …
1472 bool moved = false; 1487 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP 1488#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ()) 1489 if (bg_window_position_sensitive ())
1475 { 1490 {
1476 want_position_change = true; 1491 want_position_change = true;
1477 if (!(bg_flags & BG_IS_VALID)) 1492 if (bg_img == 0)
1478 moved = true; 1493 moved = true;
1479 } 1494 }
1480#endif 1495#endif
1481 1496
1482 if (want_position_change) 1497 if (want_position_change)
… …
1536 // defer bg image updates if the window is not mapped. The 1551 // defer bg image updates if the window is not mapped. The
1537 // short delay is to optimize for multiple ConfigureNotify 1552 // short delay is to optimize for multiple ConfigureNotify
1538 // events at startup when the window manager reparents the 1553 // events at startup when the window manager reparents the
1539 // window, so as to perform the computation after we have 1554 // window, so as to perform the computation after we have
1540 // received all of them. 1555 // received all of them.
1541 if (!(bg_flags & BG_IS_VALID)) 1556 if (bg_img == 0)
1542 update_background_ev.start (0.025); 1557 update_background_ev.start (0.025);
1543#endif 1558#endif
1544 mapped = 1; 1559 mapped = 1;
1545#ifdef TEXT_BLINK 1560#ifdef TEXT_BLINK
1546 text_blink_ev.start (); 1561 text_blink_ev.start ();
… …
1597 case MotionNotify: 1612 case MotionNotify:
1598#ifdef POINTER_BLANK 1613#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1614 if (hidden_pointer)
1600 pointer_unblank (); 1615 pointer_unblank ();
1601#endif 1616#endif
1617 if (!bypass_keystate
1602 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1618 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1603 || priv_modes & PrivMode_MouseAnyEvent) 1619 || priv_modes & PrivMode_MouseAnyEvent))
1604 mouse_report (ev.xbutton); 1620 mouse_report (ev.xbutton);
1605 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1606 break; 1622 break;
1607 1623
1608 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
… …
1620 &unused_root_x, &unused_root_y, 1636 &unused_root_x, &unused_root_y,
1621 &ev.xbutton.x, &ev.xbutton.y, 1637 &ev.xbutton.x, &ev.xbutton.y,
1622 &ev.xbutton.state); 1638 &ev.xbutton.state);
1623#ifdef MOUSE_THRESHOLD 1639#ifdef MOUSE_THRESHOLD
1624 /* deal with a `jumpy' mouse */ 1640 /* deal with a `jumpy' mouse */
1625 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1641 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1642#endif
1626 { 1643 {
1627#endif
1628#if ISO_14755 1644#if ISO_14755
1629 // 5.4 1645 // 5.4
1630 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1646 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1631 { 1647 {
1632 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1648 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1638 1654
1639#ifdef SELECTION_SCROLLING 1655#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1656 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1657 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1658 {
1659 page_dirn scroll_selection_dir;
1643 int dist; 1660 int dist;
1644 1661
1645 /* don't clobber the current delay if we are 1662 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1663 * already in the middle of scrolling.
1647 */ 1664 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1687 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1688 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1689 + 1;
1673 min_it (scroll_selection_lines, 1690 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1691 SELECTION_SCROLL_MAX_LINES);
1692 scroll_selection_lines *= scroll_selection_dir;
1675 } 1693 }
1676 else 1694 else
1677 { 1695 {
1678 /* we are within the text window, so we 1696 /* we are within the text window, so we
1679 * shouldn't be scrolling 1697 * shouldn't be scrolling
1680 */ 1698 */
1681 sel_scroll_ev.stop(); 1699 sel_scroll_ev.stop();
1682 } 1700 }
1683#endif 1701#endif
1684#ifdef MOUSE_THRESHOLD
1685 } 1702 }
1686#endif
1687 } 1703 }
1688 } 1704 }
1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1705 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1690 { 1706 {
1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1707 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1765#endif 1781#endif
1766#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
1768 { 1784 {
1769 pix_colors = pix_colors_focused; 1785 pix_colors = pix_colors_focused;
1770 scr_recolour (); 1786 scr_recolor ();
1771 } 1787 }
1772#endif 1788#endif
1773#if ENABLE_FRILLS 1789#if ENABLE_FRILLS
1774 if (option (Opt_urgentOnBell)) 1790 if (option (Opt_urgentOnBell))
1775 set_urgency (0); 1791 set_urgency (0);
1792
1793 if (priv_modes & PrivMode_FocusEvent)
1794 tt_printf ("\x1b[I");
1776#endif 1795#endif
1777 1796
1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1797 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 } 1798 }
1780} 1799}
… …
1788 want_refresh = 1; 1807 want_refresh = 1;
1789 1808
1790#if ENABLE_FRILLS 1809#if ENABLE_FRILLS
1791 if (option (Opt_urgentOnBell)) 1810 if (option (Opt_urgentOnBell))
1792 set_urgency (0); 1811 set_urgency (0);
1812
1813 if (priv_modes & PrivMode_FocusEvent)
1814 tt_printf ("\x1b[O");
1793#endif 1815#endif
1794#if ENABLE_FRILLS || ISO_14755 1816#if ENABLE_FRILLS || ISO_14755
1795 if (iso14755buf) 1817 if (iso14755buf)
1796 { 1818 {
1797 iso14755buf = 0; 1819 iso14755buf = 0;
… …
1812#endif 1834#endif
1813#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1815 { 1837 {
1816 pix_colors = pix_colors_unfocused; 1838 pix_colors = pix_colors_unfocused;
1817 scr_recolour (); 1839 scr_recolor ();
1818 } 1840 }
1819#endif 1841#endif
1820 1842
1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1843 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 } 1844 }
1823} 1845}
1824 1846
1825void ecb_cold 1847void ecb_cold
1826rxvt_term::update_fade_color (unsigned int idx) 1848rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1827{ 1849{
1828#if OFF_FOCUS_FADING 1850#if OFF_FOCUS_FADING
1829 if (rs[Rs_fade]) 1851 if (rs[Rs_fade])
1830 { 1852 {
1853 if (!first_time)
1854 pix_colors_focused [idx].free (this);
1855
1831 rgba c; 1856 rgba c;
1832 pix_colors [Color_fade].get (c); 1857 pix_colors [Color_fade].get (c);
1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1858 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1834 } 1859 }
1835#endif 1860#endif
… …
1854 */ 1879 */
1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1880 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1881 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1857 { 1882 {
1858#if BG_IMAGE_FROM_ROOT 1883#if BG_IMAGE_FROM_ROOT
1859 bg_set_root_pixmap (); 1884 if (option (Opt_transparent))
1885 {
1886 rxvt_img::new_from_root (this)->replace (root_img);
1860 update_background (); 1887 update_background ();
1888 }
1861#endif 1889#endif
1862#if ENABLE_PERL
1863 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END)); 1890 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1864#endif
1865 } 1891 }
1866 1892
1867 break; 1893 break;
1868 } 1894 }
1869 1895
… …
1896 iso14755_54 (ev.x, ev.y); 1922 iso14755_54 (ev.x, ev.y);
1897 return; 1923 return;
1898 } 1924 }
1899#endif 1925#endif
1900 1926
1901 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1927 clickintime = ev.time - MEvent.time < multiClickTime;
1902 1928
1903 if (reportmode) 1929 if (reportmode)
1904 { 1930 {
1905 /* mouse report from vt window */ 1931 /* mouse report from vt window */
1906 /* save the xbutton state (for ButtonRelease) */ 1932 /* save the xbutton state (for ButtonRelease) */
… …
2156#ifdef MOUSE_REPORT_DOUBLECLICK 2182#ifdef MOUSE_REPORT_DOUBLECLICK
2157 /* only report the release of 'slow' single clicks */ 2183 /* only report the release of 'slow' single clicks */
2158 if (MEvent.button != AnyButton 2184 if (MEvent.button != AnyButton
2159 && (ev.button != MEvent.button 2185 && (ev.button != MEvent.button
2160 || (ev.time - MEvent.time 2186 || (ev.time - MEvent.time
2161 > MULTICLICK_TIME / 2))) 2187 > multiClickTime / 2)))
2162 { 2188 {
2163 MEvent.clicks = 0; 2189 MEvent.clicks = 0;
2164 MEvent.button = AnyButton; 2190 MEvent.button = AnyButton;
2165 mouse_report (ev); 2191 mouse_report (ev);
2166 } 2192 }
… …
2194 2220
2195#ifdef MOUSE_WHEEL 2221#ifdef MOUSE_WHEEL
2196 case Button4: 2222 case Button4:
2197 case Button5: 2223 case Button5:
2198 { 2224 {
2199 int i; 2225 int lines;
2200 page_dirn v; 2226 page_dirn dirn;
2201 2227
2202 v = ev.button == Button4 ? UP : DN; 2228 dirn = ev.button == Button4 ? UP : DN;
2203 2229
2204 if (ev.state & ShiftMask) 2230 if (ev.state & ShiftMask)
2205 i = 1; 2231 lines = 1;
2206 else if (option (Opt_mouseWheelScrollPage)) 2232 else if (option (Opt_mouseWheelScrollPage))
2207 i = nrow - 1; 2233 lines = nrow - 1;
2208 else 2234 else
2209 i = 5; 2235 lines = 5;
2210 2236
2211# ifdef MOUSE_SLIP_WHEELING 2237# ifdef MOUSE_SLIP_WHEELING
2212 if (ev.state & ControlMask) 2238 if (ev.state & ControlMask)
2213 { 2239 {
2214 mouse_slip_wheel_speed += v ? -1 : 1; 2240 mouse_slip_wheel_speed += dirn;
2215 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2241 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2216 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2217 2242
2218 if (!slip_wheel_ev.is_active ()) 2243 if (!slip_wheel_ev.is_active ())
2219 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2244 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2220 } 2245 }
2221 else 2246 else
2222# endif 2247# endif
2223 { 2248 {
2224 scr_page (v, i); 2249 scr_page (dirn, lines);
2225 scrollBar.show (1); 2250 scrollBar.show (1);
2226 } 2251 }
2227 } 2252 }
2228 break; 2253 break;
2229#endif 2254#endif
… …
2557 scr_charset_choose (0); 2582 scr_charset_choose (0);
2558 break; 2583 break;
2559 2584
2560#ifdef EIGHT_BIT_CONTROLS 2585#ifdef EIGHT_BIT_CONTROLS
2561 // 8-bit controls 2586 // 8-bit controls
2562 case 0x90: /* DCS */ 2587 case 0x90: /* DCS */
2563 process_dcs_seq (); 2588 process_dcs_seq ();
2564 break; 2589 break;
2565 case 0x9b: /* CSI */ 2590 case 0x9b: /* CSI */
2566 process_csi_seq (); 2591 process_csi_seq ();
2567 break; 2592 break;
2568 case 0x9d: /* OSC */ 2593 case 0x9d: /* OSC */
2569 process_osc_seq (); 2594 process_osc_seq ();
2570 break; 2595 break;
2571#endif 2596#endif
2572 } 2597 }
2573} 2598}
… …
2798 }; 2823 };
2799 2824
2800void ecb_hot 2825void ecb_hot
2801rxvt_term::process_csi_seq () 2826rxvt_term::process_csi_seq ()
2802{ 2827{
2803 unicode_t ch, priv, i; 2828 unicode_t ch, priv, prev_ch, i;
2804 unsigned int nargs, p; 2829 unsigned int nargs, p;
2805 int n, ndef; 2830 int n, ndef;
2806 int arg[ESC_ARGS] = { }; 2831 int arg[ESC_ARGS] = { };
2807 2832
2808 nargs = 0; 2833 nargs = 0;
… …
2814 /* '<' '=' '>' '?' '!' */ 2839 /* '<' '=' '>' '?' '!' */
2815 priv = ch; 2840 priv = ch;
2816 ch = cmd_getc (); 2841 ch = cmd_getc ();
2817 } 2842 }
2818 2843
2844 prev_ch = 0;
2819 /* read any numerical arguments */ 2845 /* read any numerical arguments */
2820 for (n = -1; ch < CSI_ICH; ) 2846 for (n = -1; ch < CSI_ICH; )
2821 { 2847 {
2822 if (isdigit (ch)) 2848 if (isdigit (ch))
2823 { 2849 {
… …
2833 n = -1; 2859 n = -1;
2834 } 2860 }
2835 else if (IS_CONTROL (ch)) 2861 else if (IS_CONTROL (ch))
2836 process_nonprinting (ch); 2862 process_nonprinting (ch);
2837 2863
2864 prev_ch = ch;
2838 ch = cmd_getc (); 2865 ch = cmd_getc ();
2839 } 2866 }
2840 2867
2841 if (ch > CSI_7F) 2868 if (ch > CSI_7F)
2842 return; 2869 return;
… …
3076 scr_insert_mode (1); 3103 scr_insert_mode (1);
3077 else if (arg[0] == 20) 3104 else if (arg[0] == 20)
3078 priv_modes |= PrivMode_LFNL; 3105 priv_modes |= PrivMode_LFNL;
3079 break; 3106 break;
3080 3107
3108 case CSI_71: // DECSCUSR: set cursor style
3109 if (prev_ch == ' ')
3110 set_cursor_style (arg[0]);
3111 break;
3112
3081 /* 3113 /*
3082 * PRIVATE USE beyond this point. All CSI_7? sequences here 3114 * PRIVATE USE beyond this point. All CSI_7? sequences here
3083 */ 3115 */
3084 case CSI_72: /* DECSTBM: set top and bottom margins */ 3116 case CSI_72: /* DECSTBM: set top and bottom margins */
3085 if (nargs == 1) 3117 if (nargs == 1)
… …
3218rxvt_term::get_to_st (unicode_t &ends_how) 3250rxvt_term::get_to_st (unicode_t &ends_how)
3219{ 3251{
3220 unicode_t ch; 3252 unicode_t ch;
3221 bool seen_esc = false; 3253 bool seen_esc = false;
3222 unsigned int n = 0; 3254 unsigned int n = 0;
3223 wchar_t string[STRING_MAX]; 3255 wchar_t string[CBUFSIZ];
3224 3256
3225 while ((ch = cmd_getc ()) != NOCHAR) 3257 while ((ch = cmd_getc ()) != NOCHAR)
3226 { 3258 {
3227 if (seen_esc) 3259 if (seen_esc)
3228 { 3260 {
… …
3243 else if (ch < 0x20) 3275 else if (ch < 0x20)
3244 return NULL; /* other control character - exit */ 3276 return NULL; /* other control character - exit */
3245 3277
3246 seen_esc = false; 3278 seen_esc = false;
3247 3279
3248 if (n >= STRING_MAX - 1) 3280 if (n >= sizeof (string) - 1)
3249 // stop at some sane length 3281 // stop at some sane length
3250 return NULL; 3282 return NULL;
3251 3283
3252 string[n++] = ch; 3284 string[n++] = ch;
3253 } 3285 }
… …
3302 free (s); 3334 free (s);
3303 } 3335 }
3304 } 3336 }
3305} 3337}
3306 3338
3339static unsigned int
3340colorcube_index (unsigned int idx_r,
3341 unsigned int idx_g,
3342 unsigned int idx_b)
3343{
3344 assert (idx_r < Red_levels);
3345 assert (idx_g < Green_levels);
3346 assert (idx_b < Blue_levels);
3347
3348 return idx_r * Blue_levels * Green_levels +
3349 idx_g * Blue_levels +
3350 idx_b;
3351}
3352
3353/*
3354 * Find the nearest color slot in the hidden color cube,
3355 * adapt its value to the 24bit RGB color.
3356 */
3357unsigned int
3358rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b)
3359{
3360 r &= 0xff;
3361 g &= 0xff;
3362 b &= 0xff;
3363
3364 unsigned int color = (r << 16) | (g << 8) | b;
3365 unsigned int idx_r = r * (Red_levels - 1) / 0xff;
3366 unsigned int idx_g = g * (Green_levels - 1) / 0xff;
3367 unsigned int idx_b = b * (Blue_levels - 1) / 0xff;
3368 unsigned int idx = colorcube_index (idx_r, idx_g, idx_b);
3369
3370 if (rgb24_color[idx] == color)
3371 return idx + minTermCOLOR24;
3372
3373 /* we allow one of the 6 directly neighbouring colours */
3374 /* to replace the current color, if they not used recently */
3375 static const signed char dxyz[][3] = {
3376 0, 0, 0,
3377 0, 0, +1,
3378 0, 0, -1,
3379 0, +1, 0,
3380 0, -1, 0,
3381 +1, 0, 0,
3382 -1, 0, 0,
3383 };
3384
3385 for (int n = 0; n < ecb_array_length (dxyz); ++n)
3386 {
3387 int r = idx_r + dxyz[n][0];
3388 int g = idx_r + dxyz[n][1];
3389 int b = idx_r + dxyz[n][2];
3390
3391 if (!IN_RANGE_EXC (r, 0, Red_levels )) continue;
3392 if (!IN_RANGE_EXC (g, 0, Green_levels)) continue;
3393 if (!IN_RANGE_EXC (b, 0, Blue_levels )) continue;
3394
3395 unsigned int index = colorcube_index (r, g, b);
3396
3397 // minor issue: could update index 0 few more times
3398 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3399 {
3400 idx = index;
3401 goto update;
3402 }
3403
3404 if (rgb24_color[index] == color)
3405 return index + minTermCOLOR24;
3406
3407 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3408 // but also handles wrap around values good enough
3409 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x7fff)
3410 idx = index;
3411 }
3412
3413update:
3414 rgb24_color[idx] = color;
3415 rgb24_seqno[idx] = ++rgb24_sequence;
3416
3417 idx += minTermCOLOR24;
3418 pix_colors_focused [idx].free (this);
3419 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101));
3420 update_fade_color (idx, false);
3421
3422 return idx;
3423}
3424
3307void 3425void
3308rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3426rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3309{ 3427{
3310 if (str[0] == '?' && !str[1]) 3428 if (str[0] == '?' && !str[1])
3311 { 3429 {
3312 rgba c; 3430 rgba c;
3313 pix_colors_focused[color].get (c); 3431 pix_colors_focused[color].get (c);
3314 3432
3315#if XFT 3433#if XFT
3316 if (c.a != rgba::MAX_CC) 3434 if (c.a != rgba::MAX_CC)
3317 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3435 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.r, c.g, c.b, c.a, resp);
3318 else 3436 else
3319#endif 3437#endif
3320 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3438 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3321 } 3439 }
3322 else 3440 else
… …
3370 &nitems, &bytes_after, &value) == Success 3488 &nitems, &bytes_after, &value) == Success
3371 && actual_type != None 3489 && actual_type != None
3372 && actual_format == 8) 3490 && actual_format == 8)
3373 str = (const char *)(value); 3491 str = (const char *)(value);
3374 3492
3375 tt_printf ("\033]%d;%s%c", op, str, resp); 3493 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3376 3494
3377 XFree (value); 3495 XFree (value);
3378 } 3496 }
3379 else 3497 else
3380 { 3498 {
… …
3659 { 5, PrivMode_rVideo }, // DECSCNM 3777 { 5, PrivMode_rVideo }, // DECSCNM
3660 { 6, PrivMode_relOrigin }, // DECOM 3778 { 6, PrivMode_relOrigin }, // DECOM
3661 { 7, PrivMode_Autowrap }, // DECAWM 3779 { 7, PrivMode_Autowrap }, // DECAWM
3662 // 8, auto-repeat keys // DECARM 3780 // 8, auto-repeat keys // DECARM
3663 { 9, PrivMode_MouseX10 }, 3781 { 9, PrivMode_MouseX10 },
3782 { 12, PrivMode_BlinkingCursor },
3664 // 18 end FF to printer after print screen 3783 // 18 end FF to printer after print screen
3665 // 19 Print screen prints full screen/scroll region 3784 // 19 Print screen prints full screen/scroll region
3666 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3785 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3667#ifdef scrollBar_esc 3786#ifdef scrollBar_esc
3668 { scrollBar_esc, PrivMode_scrollBar }, 3787 { scrollBar_esc, PrivMode_scrollBar },
… …
3680#endif 3799#endif
3681 { 1000, PrivMode_MouseX11 }, 3800 { 1000, PrivMode_MouseX11 },
3682 { 1002, PrivMode_MouseBtnEvent }, 3801 { 1002, PrivMode_MouseBtnEvent },
3683 { 1003, PrivMode_MouseAnyEvent }, 3802 { 1003, PrivMode_MouseAnyEvent },
3684#if ENABLE_FRILLS 3803#if ENABLE_FRILLS
3804 { 1004, PrivMode_FocusEvent },
3685 { 1005, PrivMode_ExtModeMouse }, 3805 { 1005, PrivMode_ExtModeMouse },
3686#endif 3806#endif
3687 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3807 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3688 { 1011, PrivMode_Keypress }, // rxvt extension 3808 { 1011, PrivMode_Keypress }, // rxvt extension
3689#if ENABLE_FRILLS 3809#if ENABLE_FRILLS
… …
3777 scrollBar.map (state); 3897 scrollBar.map (state);
3778 resize_all_windows (0, 0, 0); 3898 resize_all_windows (0, 0, 0);
3779 scr_touch (true); 3899 scr_touch (true);
3780 break; 3900 break;
3781#endif 3901#endif
3902#ifdef CURSOR_BLINK
3903 case 12:
3904 cursor_blink_reset ();
3905 break;
3906#endif
3782 case 25: /* visible/invisible cursor */ 3907 case 25: /* visible/invisible cursor */
3783 scr_cursor_visible (state); 3908 scr_cursor_visible (state);
3784 break; 3909 break;
3785 /* case 35: - shift keys */ 3910 /* case 35: - shift keys */
3786 /* case 40: - 80 <--> 132 mode */ 3911 /* case 40: - 80 <--> 132 mode */
… …
3891 //case 19: // ninth alt font 4016 //case 19: // ninth alt font
3892 //case 20: // gothic 4017 //case 20: // gothic
3893 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 4018 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3894 rendset = 0, rendstyle = RS_Bold; 4019 rendset = 0, rendstyle = RS_Bold;
3895 break; 4020 break;
3896 case 22: // normal intensity 4021 case 22: // bold off (vt220)
3897 rendset = 0, rendstyle = RS_Bold; 4022 rendset = 0, rendstyle = RS_Bold;
3898 break; 4023 break;
3899 case 23: // disable italic 4024 case 23: // disable italic
3900 rendset = 0, rendstyle = RS_Italic; 4025 rendset = 0, rendstyle = RS_Italic;
3901 break; 4026 break;
3902 case 24: 4027 case 24: // underline off (vt220)
3903 rendset = 0, rendstyle = RS_Uline; 4028 rendset = 0, rendstyle = RS_Uline;
3904 break; 4029 break;
3905 case 25: 4030 case 25: // blink off (vt220)
3906 rendset = 0, rendstyle = RS_Blink; 4031 rendset = 0, rendstyle = RS_Blink;
3907 break; 4032 break;
3908 case 26: // variable spacing (iso 8613) 4033 case 26: // variable spacing (iso 8613)
3909 rendset = 0, rendstyle = RS_Blink; 4034 rendset = 0, rendstyle = RS_Blink;
3910 break; 4035 break;
3911 case 27: 4036 case 27: // reverse off (vt220)
3912 rendset = 0, rendstyle = RS_RVid; 4037 rendset = 0, rendstyle = RS_RVid;
3913 break; 4038 break;
3914 //case 28: // visible. NYI 4039 //case 28: // visible. NYI
3915 //case 29: // not crossed-out 4040 //case 29: // not crossed-out
3916 } 4041 }
… …
3937 if (nargs > i + 2 && arg[i + 1] == 5) 4062 if (nargs > i + 2 && arg[i + 1] == 5)
3938 { 4063 {
3939 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); 4064 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3940 i += 2; 4065 i += 2;
3941 } 4066 }
4067 else if (nargs > i + 4 && arg[i + 1] == 2)
4068 {
4069 unsigned int r = arg[i + 2];
4070 unsigned int g = arg[i + 3];
4071 unsigned int b = arg[i + 4];
4072 unsigned int idx = map_rgb24_color (r, g, b);
4073 scr_color (idx, Color_fg);
4074 i += 4;
4075 }
3942 break; 4076 break;
3943 case 39: /* default fg */ 4077 case 39: /* default fg */
3944 scr_color (Color_fg, Color_fg); 4078 scr_color (Color_fg, Color_fg);
3945 break; 4079 break;
3946 4080
… …
3957 case 48: // set bg color, ISO 8613-6 4091 case 48: // set bg color, ISO 8613-6
3958 if (nargs > i + 2 && arg[i + 1] == 5) 4092 if (nargs > i + 2 && arg[i + 1] == 5)
3959 { 4093 {
3960 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); 4094 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3961 i += 2; 4095 i += 2;
4096 }
4097 else if (nargs > i + 4 && arg[i + 1] == 2)
4098 {
4099 unsigned int r = arg[i + 2];
4100 unsigned int g = arg[i + 3];
4101 unsigned int b = arg[i + 4];
4102 unsigned int idx = map_rgb24_color (r, g, b);
4103 scr_color (idx, Color_bg);
4104 i += 4;
3962 } 4105 }
3963 break; 4106 break;
3964 case 49: /* default bg */ 4107 case 49: /* default bg */
3965 scr_color (Color_bg, Color_bg); 4108 scr_color (Color_bg, Color_bg);
3966 break; 4109 break;
… …
3990 break; 4133 break;
3991#endif 4134#endif
3992 } 4135 }
3993 } 4136 }
3994} 4137}
4138
4139void
4140rxvt_term::set_cursor_style (int style)
4141{
4142 if (!IN_RANGE_INC (style, 0, 6))
4143 return;
4144
4145 if (style == 0)
4146 style = 1;
4147
4148 cursor_type = (style - 1) / 2;
4149 set_option (Opt_cursorUnderline, cursor_type == 1);
4150
4151#ifdef CURSOR_BLINK
4152 set_option (Opt_cursorBlink, style & 1);
4153 cursor_blink_reset ();
4154#endif
4155
4156 want_refresh = 1;
4157}
3995/*}}} */ 4158/*}}} */
3996 4159
3997/* ------------------------------------------------------------------------- */ 4160/* ---------------------------------------------------------------------- */
4161/* Write data to the pty as typed by the user, pasted with the mouse,
4162 * or generated by us in response to a query ESC sequence.
4163 */
3998 4164
3999/* 4165/*
4000 * Send printf () formatted output to the command. 4166 * Send printf () formatted output to the command.
4001 * Only use for small amounts of data. 4167 * Only use for small amounts of data.
4002 */ 4168 */
… …
4010 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4176 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4011 va_end (arg_ptr); 4177 va_end (arg_ptr);
4012 tt_write (buf, strlen (buf)); 4178 tt_write (buf, strlen (buf));
4013} 4179}
4014 4180
4015/* ---------------------------------------------------------------------- */
4016/* Write data to the pty as typed by the user, pasted with the mouse, 4181/* Write data to the pty as typed by the user. */
4017 * or generated by us in response to a query ESC sequence. 4182void
4018 */ 4183rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4019static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4184{
4185 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4186 return;
4187
4188 if (option (Opt_scrollTtyKeypress))
4189 if (view_start)
4190 {
4191 view_start = 0;
4192 want_refresh = 1;
4193 }
4194
4195 tt_write_ (data, len);
4196}
4020 4197
4021void 4198void
4022rxvt_term::tt_write (const char *data, unsigned int len) 4199rxvt_term::tt_write (const char *data, unsigned int len)
4023{ 4200{
4024 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4201 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4025 return; 4202 return;
4026 4203
4204 tt_write_ (data, len);
4205}
4206
4207static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4208
4209void
4210rxvt_term::tt_write_ (const char *data, unsigned int len)
4211{
4027 if (pty->pty < 0) 4212 if (pty->pty < 0)
4028 return; 4213 return;
4029 4214
4030 if (v_buflen == 0) 4215 if (v_buflen == 0)
4031 { 4216 {

Diff Legend

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