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.536 by sf-exg, Thu Mar 28 08:53:16 2013 UTC vs.
Revision 1.603 by root, Mon Jun 5 13:39:34 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
… …
84 XK_Right, 0x2192, 84 XK_Right, 0x2192,
85 XK_KP_Right, 0x2192, 85 XK_KP_Right, 0x2192,
86 XK_Down, 0x2193, 86 XK_Down, 0x2193,
87 XK_KP_Down, 0x2193, 87 XK_KP_Down, 0x2193,
88 XK_Linefeed, 0x21b4, 88 XK_Linefeed, 0x21b4,
89 XK_Return, 0x21b5,
90 XK_KP_Enter, 0x21b5,
91 89
92 XK_Prior, 0x21de, 90 XK_Prior, 0x21de,
93 XK_Next, 0x21df, 91 XK_Next, 0x21df,
94 XK_Tab, 0x21e5, 92 XK_Tab, 0x21e5,
95 XK_ISO_Left_Tab, 0x21e6, 93 XK_ISO_Left_Tab, 0x21e6,
… …
110 XK_Begin, 0x2320, 108 XK_Begin, 0x2320,
111 XK_Delete, 0x2326, 109 XK_Delete, 0x2326,
112 XK_Clear, 0x2327, 110 XK_Clear, 0x2327,
113 XK_BackSpace, 0x232b, 111 XK_BackSpace, 0x232b,
114 XK_Insert, 0x2380, 112 XK_Insert, 0x2380,
113 XK_KP_Enter, 0x2386,
114 XK_Alt_L, 0x2387,
115 XK_Alt_R, 0x2387,
115 XK_Control_L, 0x2388, 116 XK_Control_L, 0x2388,
116 XK_Control_R, 0x2388, 117 XK_Control_R, 0x2388,
117 XK_Pause, 0x2389, 118 XK_Pause, 0x2389,
118 XK_Break, 0x238a, 119 XK_Break, 0x238a,
119 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
120 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
121 XK_Print, 0x2399, 122 XK_Print, 0x2399,
123 XK_Return, 0x23ce,
122 124
123 XK_space, 0x2423, 125 XK_space, 0x2423,
124 126
125#ifdef XK_KP_Begin 127#ifdef XK_KP_Begin
126 XK_KP_Prior, 0x21de, 128 XK_KP_Prior, 0x21de,
… …
168 int len; 170 int len;
169 171
170# if ENABLE_COMBINING 172# if ENABLE_COMBINING
171 if (IS_COMPOSE (ch)) 173 if (IS_COMPOSE (ch))
172 { 174 {
173 len = rxvt_composite.expand (ch, 0); 175 len = rxvt_composite.expand (ch);
174 alloc = chr = new wchar_t[len]; 176 alloc = chr = new wchar_t[len];
175 rxvt_composite.expand (ch, chr); 177 rxvt_composite.expand (ch, chr);
176 } 178 }
177 else 179 else
178# endif 180# endif
… …
210 212
211 max_it (width, strlen (attr)); 213 max_it (width, strlen (attr));
212 214
213 if (y >= 0) 215 if (y >= 0)
214 { 216 {
215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 217 y = (y >= nrow - len - 5 && x < width + 2) ? 0 : -1;
216 x = 0; 218 x = 0;
217 } 219 }
218 220
219 scr_overlay_new (x, y, width, len * 2 + 2); 221 scr_overlay_new (x, y, width, len * 2 + 2);
220 222
… …
315 XK_KP_7, // XK_KP_Home 317 XK_KP_7, // XK_KP_Home
316 XK_KP_4, // XK_KP_Left 318 XK_KP_4, // XK_KP_Left
317 XK_KP_8, // XK_KP_Up 319 XK_KP_8, // XK_KP_Up
318 XK_KP_6, // XK_KP_Right 320 XK_KP_6, // XK_KP_Right
319 XK_KP_2, // XK_KP_Down 321 XK_KP_2, // XK_KP_Down
320# ifndef UNSHIFTED_SCROLLKEYS
321 XK_KP_9, // XK_KP_Prior 322 XK_KP_9, // XK_KP_Prior
322 XK_KP_3, // XK_KP_Next 323 XK_KP_3, // XK_KP_Next
323# else
324 XK_Prior,
325 XK_Next,
326# endif
327 XK_KP_1, // XK_KP_End 324 XK_KP_1, // XK_KP_End
328 XK_KP_5, // XK_KP_Begin 325 XK_KP_5, // XK_KP_Begin
329 }; 326 };
330 327
331 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 328 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
… …
376 param = 3; 373 param = 3;
377 break; 374 break;
378 case XK_Select: 375 case XK_Select:
379 param = 4; 376 param = 4;
380 break; 377 break;
381#ifndef UNSHIFTED_SCROLLKEYS
382 case XK_Prior: 378 case XK_Prior:
383 param = 5; 379 param = 5;
384 break; 380 break;
385 case XK_Next: 381 case XK_Next:
386 param = 6; 382 param = 6;
… …
389 param = 7; 385 param = 7;
390 break; 386 break;
391 case XK_End: 387 case XK_End:
392 param = 8; 388 param = 8;
393 break; 389 break;
394#endif
395 case XK_Help: 390 case XK_Help:
396 param = 28; 391 param = 28;
397 break; 392 break;
398 case XK_Menu: 393 case XK_Menu:
399 param = 29; 394 param = 29;
400 break; 395 break;
401 } 396 }
402 return param; 397 return param;
403} 398}
404 399
400static inline wchar_t *
401rxvt_wcsdup (const wchar_t *str, int len)
402{
403 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
404 memcpy (r, str, len * sizeof (wchar_t));
405 r[len] = 0;
406 return r;
407}
408
405void ecb_cold 409void ecb_cold
406rxvt_term::key_press (XKeyEvent &ev) 410rxvt_term::key_press (XKeyEvent &ev)
407{ 411{
408 int ctrl, meta, shft, len; 412 int ctrl, meta, shft, len;
409 KeySym keysym; 413 KeySym keysym = NoSymbol;
410 int valid_keysym;
411 char kbuf[KBUFSZ]; 414 char rkbuf[KBUFSZ + 1];
415 char *kbuf = rkbuf + 1;
412 416
413#if ISO_14755 417#if ISO_14755
414 if (iso14755buf & ISO_14755_52) 418 if (iso14755buf & ISO_14755_52)
415 return; 419 return;
416#endif 420#endif
… …
473 } 477 }
474 } 478 }
475 else 479 else
476 len = 0; 480 len = 0;
477 } 481 }
478
479 valid_keysym = status_return == XLookupKeySym
480 || status_return == XLookupBoth;
481 } 482 }
482 else 483 else
483#endif 484#endif
484 { 485 {
485 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); 486 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
486 valid_keysym = keysym != NoSymbol; 487 }
488
489 if (keysym != NoSymbol)
487 } 490 {
491 KeySym orig_keysym = keysym;
488 492
489 if (valid_keysym) 493 /* Shift + F1 - F10 generates F11 - F20 */
494 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
495 {
496 keysym += (XK_F11 - XK_F1);
497 shft = 0; /* turn off Shift */
498 }
499
500 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
501 {
502 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
503 unsigned int newlen = 1;
504
505 if (ev.state & ModNumLockMask)
506 kp = false;
507
508 keysym = translate_keypad (keysym, kp);
509
510 switch (keysym)
511 {
512#ifndef NO_BACKSPACE_KEY
513 case XK_BackSpace:
514 if (priv_modes & PrivMode_HaveBackSpace)
515 {
516 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
517 ^ !!ctrl) ? '\b' : '\177';
518 kbuf[1] = '\0';
519 }
520 else
521 strcpy (kbuf, rs[Rs_backspace_key]);
522 break;
523#endif
524#ifndef NO_DELETE_KEY
525 case XK_Delete:
526 strcpy (kbuf, rs[Rs_delete_key]);
527 break;
528#endif
529 case XK_Tab:
530 if (shft)
531 strcpy (kbuf, "\033[Z");
532 else
533 {
534#ifdef CTRL_TAB_MAKES_META
535 if (ctrl)
536 meta = 1;
537#endif
538#ifdef MOD4_TAB_MAKES_META
539 if (ev.state & Mod4Mask)
540 meta = 1;
541#endif
542 newlen = 0;
543 }
544 break;
545
546 case XK_Up: /* "\033[A" */
547 case XK_Down: /* "\033[B" */
548 case XK_Right: /* "\033[C" */
549 case XK_Left: /* "\033[D" */
550 strcpy (kbuf, "\033[Z");
551 kbuf[2] = "DACB"[keysym - XK_Left];
552 /* do Shift first */
553 if (shft)
554 kbuf[2] = "dacb"[keysym - XK_Left];
555 else if (ctrl)
556 {
557 kbuf[1] = 'O';
558 kbuf[2] = "dacb"[keysym - XK_Left];
559 }
560 else if (priv_modes & PrivMode_aplCUR)
561 kbuf[1] = 'O';
562 break;
563
564 case XK_KP_Enter:
565 /* allow shift to override */
566 if (kp)
567 {
568 strcpy (kbuf, "\033OM");
569 break;
570 }
571
572 /* FALLTHROUGH */
573
574 case XK_Return:
575 if (priv_modes & PrivMode_LFNL)
576 {
577 kbuf[0] = '\015';
578 kbuf[1] = '\012';
579 kbuf[2] = '\0';
580 }
581 else
582 {
583 kbuf[0] = '\015';
584 kbuf[1] = '\0';
585 }
586 break;
587
588 case XK_KP_F1: /* "\033OP" */
589 case XK_KP_F2: /* "\033OQ" */
590 case XK_KP_F3: /* "\033OR" */
591 case XK_KP_F4: /* "\033OS" */
592 strcpy (kbuf, "\033OP");
593 kbuf[2] += (keysym - XK_KP_F1);
594 break;
595
596 case XK_KP_Multiply: /* "\033Oj" : "*" */
597 case XK_KP_Add: /* "\033Ok" : "+" */
598 case XK_KP_Separator: /* "\033Ol" : "," */
599 case XK_KP_Subtract: /* "\033Om" : "-" */
600 case XK_KP_Decimal: /* "\033On" : "." */
601 case XK_KP_Divide: /* "\033Oo" : "/" */
602 case XK_KP_0: /* "\033Op" : "0" */
603 case XK_KP_1: /* "\033Oq" : "1" */
604 case XK_KP_2: /* "\033Or" : "2" */
605 case XK_KP_3: /* "\033Os" : "3" */
606 case XK_KP_4: /* "\033Ot" : "4" */
607 case XK_KP_5: /* "\033Ou" : "5" */
608 case XK_KP_6: /* "\033Ov" : "6" */
609 case XK_KP_7: /* "\033Ow" : "7" */
610 case XK_KP_8: /* "\033Ox" : "8" */
611 case XK_KP_9: /* "\033Oy" : "9" */
612 /* allow shift to override */
613 if (kp)
614 {
615 strcpy (kbuf, "\033Oj");
616 kbuf[2] += (keysym - XK_KP_Multiply);
617 }
618 else
619 {
620 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
621 kbuf[1] = '\0';
622 }
623 break;
624
625 default:
626 {
627 int param = map_function_key (keysym);
628 if (param > 0)
629 sprintf (kbuf,"\033[%d~", param);
630 else
631 newlen = 0;
632 }
633 break;
634 }
635
636 if (newlen)
637 len = strlen (kbuf);
638
639 if (len > 0)
640 {
641 /*
642 * pass Shift/Control indicators for function keys ending with `~'
643 *
644 * eg,
645 * Prior = "ESC[5~"
646 * Shift+Prior = "ESC[5$"
647 * Ctrl+Prior = "ESC[5^"
648 * Ctrl+Shift+Prior = "ESC[5@"
649 */
650 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
651 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
652
653 /*
654 * Pass meta for all function keys, if 'meta' option set
655 */
656#ifdef META8_OPTION
657 if (meta && (meta_char == 0x80))
658 kbuf[len - 1] |= 0x80;
659#endif
660 }
661
662 }
663 else if (ctrl && keysym == XK_minus)
664 {
665 len = 1;
666 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
667 }
668 else if (keysym == XK_ISO_Left_Tab)
669 {
670 strcpy (kbuf, "\033[Z");
671 len = 3;
672 }
673 else
674 {
675#ifdef META8_OPTION
676 /* set 8-bit on */
677 if (meta && (meta_char == 0x80))
678 {
679 char *ch;
680
681 for (ch = kbuf; ch < kbuf + len; ch++)
682 *ch |= 0x80;
683 }
684#endif
685 /* nil */ ;
686 }
687
688 keysym = orig_keysym;
689 }
690
691 /* escape prefix */
692 if (len && meta
693#ifdef META8_OPTION
694 && meta_char == C0_ESC
695#endif
696 )
697 {
698 *--kbuf = C0_ESC;
699 len++;
700 }
701
702 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
703 return;
704
705 if (keysym != NoSymbol)
490 { 706 {
491#ifdef KEYSYM_RESOURCE 707#ifdef KEYSYM_RESOURCE
492 if (keyboard->dispatch (this, keysym, ev.state)) 708 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
493 return; 709 return;
494#endif 710#endif
495 711
496 if (saveLines) 712 if (saveLines)
497 { 713 {
… …
539#ifdef SCROLL_ON_HOMEEND_KEYS 755#ifdef SCROLL_ON_HOMEEND_KEYS
540 if (IS_SCROLL_MOD) 756 if (IS_SCROLL_MOD)
541 { 757 {
542 if (keysym == XK_Home) 758 if (keysym == XK_Home)
543 { 759 {
544 scr_move_to (0, 1); 760 scr_changeview (top_row);
545 return; 761 return;
546 } 762 }
547 else if (keysym == XK_End) 763 else if (keysym == XK_End)
548 { 764 {
549 scr_move_to (1, 1); 765 scr_changeview (0);
550 return; 766 return;
551 } 767 }
552 } 768 }
553#endif 769#endif
554 } 770 }
555 771
556 if (shft) 772 if (shft)
557 { 773 {
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)) 774 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
565 { 775 {
566 switch (keysym) 776 switch (keysym)
567 { 777 {
568 /* normal XTerm key bindings */ 778 /* normal XTerm key bindings */
569 case XK_Insert: /* Shift+Insert = paste mouse selection */ 779 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 786 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 return; 787 return;
578#endif 788#endif
579 } 789 }
580 } 790 }
791 }
792
793 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
794 {
795 if (keysym == XK_v)
796 selection_request (ev.time, Sel_Clipboard);
797 else if (selection.len > 0)
798 {
799 free (selection.clip_text);
800 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
801 selection.clip_len = selection.len;
802 selection_grab (CurrentTime, true);
803 }
804
805 return;
581 } 806 }
582 807
583#if ENABLE_FRILLS || ISO_14755 808#if ENABLE_FRILLS || ISO_14755
584 // ISO 14755 support 809 // ISO 14755 support
585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
640 { 865 {
641 scr_printscreen (ctrl | shft); 866 scr_printscreen (ctrl | shft);
642 return; 867 return;
643 } 868 }
644#endif 869#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 } 870 }
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 871
840 if (len <= 0) 872 if (len <= 0)
841 return; /* not mapped */ 873 return; /* not mapped */
842 874
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); 875 tt_write_user_input (kbuf, (unsigned int)len);
862} 876}
863 877
864void ecb_cold 878void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 879rxvt_term::key_release (XKeyEvent &ev)
866{ 880{
… …
1004/* checks whether a refresh is requested and starts the refresh timer */ 1018/* checks whether a refresh is requested and starts the refresh timer */
1005void 1019void
1006rxvt_term::refresh_check () 1020rxvt_term::refresh_check ()
1007{ 1021{
1008 if (want_refresh && !flush_ev.is_active ()) 1022 if (want_refresh && !flush_ev.is_active ())
1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1023 flush_ev.start ();
1010 1024
1011 display->flush (); 1025 display->flush ();
1012} 1026}
1013 1027
1014void 1028void
… …
1022 1036
1023#ifdef CURSOR_BLINK 1037#ifdef CURSOR_BLINK
1024void 1038void
1025rxvt_term::cursor_blink_reset () 1039rxvt_term::cursor_blink_reset ()
1026{ 1040{
1041 if (!focus)
1042 return;
1043
1027 if (hidden_cursor) 1044 if (hidden_cursor)
1028 { 1045 {
1029 hidden_cursor = 0; 1046 hidden_cursor = 0;
1030 want_refresh = 1; 1047 want_refresh = 1;
1031 } 1048 }
1032 1049
1033 if (option (Opt_cursorBlink)) 1050 if (option (Opt_cursorBlink) || (priv_modes & PrivMode_BlinkingCursor))
1034 cursor_blink_ev.again (); 1051 cursor_blink_ev.again ();
1035 else 1052 else
1036 cursor_blink_ev.stop (); 1053 cursor_blink_ev.stop ();
1037} 1054}
1038 1055
… …
1077 1094
1078#ifdef SELECTION_SCROLLING 1095#ifdef SELECTION_SCROLLING
1079void 1096void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1097rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1098{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1099 if (scr_page (scroll_selection_lines))
1083 { 1100 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1101 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1102 want_refresh = 1;
1086 refresh_check (); 1103 refresh_check ();
1087 } 1104 }
… …
1092 1109
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1110#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1111void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1112rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1113{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1114 if (scr_page (mouse_slip_wheel_speed))
1098 { 1115 {
1099 want_refresh = 1; 1116 want_refresh = 1;
1100 refresh_check (); 1117 refresh_check ();
1101 } 1118 }
1102 1119
… …
1227 1244
1228void ecb_cold 1245void ecb_cold
1229rxvt_term::pointer_unblank () 1246rxvt_term::pointer_unblank ()
1230{ 1247{
1231 XDefineCursor (dpy, vt, TermWin_cursor); 1248 XDefineCursor (dpy, vt, TermWin_cursor);
1232 recolour_cursor (); 1249 recolor_cursor ();
1233 1250
1234#ifdef POINTER_BLANK 1251#ifdef POINTER_BLANK
1235 hidden_pointer = 0; 1252 hidden_pointer = 0;
1236 1253
1237 if (option (Opt_pointerBlank)) 1254 if (option (Opt_pointerBlank))
… …
1262#endif 1279#endif
1263 1280
1264void 1281void
1265rxvt_term::mouse_report (XButtonEvent &ev) 1282rxvt_term::mouse_report (XButtonEvent &ev)
1266{ 1283{
1267 int button_number, key_state = 0; 1284 int button_number, state = 0;
1268 int x, y; 1285 int x, y;
1269 int code = 32; 1286 bool release = ev.type == ButtonRelease;
1270 1287
1271 x = Pixel2Col (ev.x) + 1; 1288 x = 1 + clamp (Pixel2Col (ev.x), 0, ncol - 1);
1272 y = Pixel2Row (ev.y) + 1; 1289 y = 1 + clamp (Pixel2Row (ev.y), 0, nrow - 1);
1273 1290
1274 if (ev.type == MotionNotify) 1291 if (ev.type == MotionNotify)
1275 { 1292 {
1276 if (x == mouse_row && y == mouse_col) 1293 if (x == mouse_row && y == mouse_col)
1277 return; 1294 return;
1278 1295
1279 mouse_row = x; 1296 mouse_row = x;
1280 mouse_col = y; 1297 mouse_col = y;
1281 code += 32; 1298 state += 32;
1282 }
1283
1284 if (MEvent.button == AnyButton)
1285 button_number = 3;
1286 else
1287 { 1299 }
1300
1288 button_number = MEvent.button - Button1; 1301 button_number = MEvent.button - Button1;
1289 /* add 0x3D for wheel events, like xterm does */ 1302 if (button_number > 10)
1303 return;
1304 else if (button_number >= 7)
1305 button_number += 128 - 7;
1290 if (button_number >= 3) 1306 else if (button_number >= 3)
1291 button_number += 64 - 3; 1307 button_number += 64 - 3;
1292 }
1293 1308
1294 if (priv_modes & PrivMode_MouseX10) 1309 if (priv_modes & PrivMode_MouseX10)
1295 { 1310 {
1296 /* 1311 /*
1297 * do not report ButtonRelease 1312 * do not report ButtonRelease
1298 * no state info allowed 1313 * no state info allowed
1299 */ 1314 */
1300 key_state = 0; 1315 if (release)
1301 if (button_number == 3)
1302 return; 1316 return;
1303 } 1317 }
1304 else 1318 else
1305 { 1319 {
1306 /* XTerm mouse reporting needs these values: 1320 /* XTerm mouse reporting needs these values:
… …
1308 * 8 = Meta 1322 * 8 = Meta
1309 * 16 = Control 1323 * 16 = Control
1310 * plus will add in our own Double-Click reporting 1324 * plus will add in our own Double-Click reporting
1311 * 32 = Double Click 1325 * 32 = Double Click
1312 */ 1326 */
1313 key_state = ((MEvent.state & ShiftMask) ? 4 : 0) 1327 state += ((MEvent.state & ShiftMask) ? 4 : 0)
1314 + ((MEvent.state & ModMetaMask) ? 8 : 0) 1328 + ((MEvent.state & ModMetaMask) ? 8 : 0)
1315 + ((MEvent.state & ControlMask) ? 16 : 0); 1329 + ((MEvent.state & ControlMask) ? 16 : 0);
1316#ifdef MOUSE_REPORT_DOUBLECLICK 1330#ifdef MOUSE_REPORT_DOUBLECLICK
1317 key_state += ((MEvent.clicks > 1) ? 32 : 0); 1331 state += ((MEvent.clicks > 1) ? 32 : 0);
1318#endif 1332#endif
1319 } 1333 }
1334
1335 int code = 32 + (release ? 3 : button_number) + state;
1320 1336
1321#if DEBUG_MOUSEREPORT 1337#if DEBUG_MOUSEREPORT
1322 fprintf (stderr, "Mouse ["); 1338 fprintf (stderr, "Mouse [");
1323 if (key_state & 16) 1339 if (state & 16)
1324 fputc ('C', stderr); 1340 fputc ('C', stderr);
1325 if (key_state & 4) 1341 if (state & 4)
1326 fputc ('S', stderr); 1342 fputc ('S', stderr);
1327 if (key_state & 8) 1343 if (state & 8)
1328 fputc ('A', stderr); 1344 fputc ('A', stderr);
1329 if (key_state & 32) 1345 if (state & 32)
1330 fputc ('2', stderr); 1346 fputc ('2', stderr);
1331 fprintf (stderr, "]: <%d>, %d/%d\n", 1347 fprintf (stderr, "]: <%d>, %d/%d\n",
1332 button_number, 1348 button_number,
1333 x, 1349 x,
1334 y); 1350 y);
1335#endif 1351#endif
1336 1352
1337#if ENABLE_FRILLS 1353#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight) 1354 if (priv_modes & PrivMode_ExtMouseSGR)
1355 tt_printf ("\033[<%d;%d;%d%c",
1356 button_number + state,
1357 x,
1358 y,
1359 release ? 'm' : 'M');
1360 else if (priv_modes & PrivMode_ExtMouseUrxvt)
1339 tt_printf ("\033[%d;%d;%dM", 1361 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state, 1362 code,
1341 x, 1363 x,
1342 y); 1364 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse) 1365 else if (priv_modes & PrivMode_ExtMouseUTF8)
1366 if (code < 128)
1344 tt_printf ("\033[M%c%lc%lc", 1367 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state, 1368 code,
1346 wint_t (32 + x), 1369 wint_t (32 + x),
1347 wint_t (32 + y)); 1370 wint_t (32 + y));
1371 else
1372 tt_printf ("\033[M%c%c%lc%lc",
1373 0xc0 + (code >> 6),
1374 0x80 + (code & 0x3f),
1375 wint_t (32 + x),
1376 wint_t (32 + y));
1348 else 1377 else
1349#endif 1378#endif
1350 tt_printf ("\033[M%c%c%c", 1379 tt_printf ("\033[M%c%c%c",
1351 code + button_number + key_state, 1380 code,
1352 32 + x, 1381 32 + x,
1353 32 + y); 1382 32 + y);
1354} 1383}
1355 1384
1356/*{{{ process an X event */ 1385/*{{{ process an X event */
… …
1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1496 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1497 ;
1469 1498
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1499 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471 1500
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) 1501 if (want_position_change)
1483 { 1502 {
1484 int x, y; 1503 int x, y;
1485 1504
1486 if (ev.xconfigure.send_event) 1505 if (ev.xconfigure.send_event)
… …
1494 if (x != parent_x || y != parent_y) 1513 if (x != parent_x || y != parent_y)
1495 { 1514 {
1496 parent_x = x; 1515 parent_x = x;
1497 parent_y = y; 1516 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END)); 1517 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 } 1518 }
1501 } 1519 }
1502 1520
1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1521 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1504 { 1522 {
1505 seen_resize = 1; 1523 seen_resize = 1;
1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1524 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1507 } 1525 }
1508 else
1509 {
1510#ifdef HAVE_BG_PIXMAP
1511 if (moved)
1512 update_background ();
1513#endif
1514 }
1515 1526
1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1517 } 1528 }
1518 break; 1529 break;
1519 1530
… …
1528 case SelectionRequest: 1539 case SelectionRequest:
1529 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1530 break; 1541 break;
1531 1542
1532 case MapNotify: 1543 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; 1544 mapped = 1;
1545#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1546 text_blink_ev.start (); 1546 text_blink_ev.start ();
1547#endif 1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1597 case MotionNotify: 1597 case MotionNotify:
1598#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1599 if (hidden_pointer)
1600 pointer_unblank (); 1600 pointer_unblank ();
1601#endif 1601#endif
1602 if (!bypass_keystate
1602 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask)) 1603 && ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1603 || priv_modes & PrivMode_MouseAnyEvent) 1604 || priv_modes & PrivMode_MouseAnyEvent))
1604 mouse_report (ev.xbutton); 1605 mouse_report (ev.xbutton);
1605 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1606 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1606 break; 1607 break;
1607 1608
1608 if (ev.xany.window == vt) 1609 if (ev.xany.window == vt)
… …
1620 &unused_root_x, &unused_root_y, 1621 &unused_root_x, &unused_root_y,
1621 &ev.xbutton.x, &ev.xbutton.y, 1622 &ev.xbutton.x, &ev.xbutton.y,
1622 &ev.xbutton.state); 1623 &ev.xbutton.state);
1623#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1624 /* deal with a `jumpy' mouse */ 1625 /* deal with a `jumpy' mouse */
1625 if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) 1626 if (ev.xmotion.time - MEvent.time > MOUSE_THRESHOLD)
1627#endif
1626 { 1628 {
1627#endif
1628#if ISO_14755 1629#if ISO_14755
1629 // 5.4 1630 // 5.4
1630 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1631 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1631 { 1632 {
1632 iso14755_54 (ev.xbutton.x, ev.xbutton.y); 1633 iso14755_54 (ev.xbutton.x, ev.xbutton.y);
… …
1638 1639
1639#ifdef SELECTION_SCROLLING 1640#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1641 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1642 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1643 {
1644 page_dirn scroll_selection_dir;
1643 int dist; 1645 int dist;
1644 1646
1645 /* don't clobber the current delay if we are 1647 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1648 * already in the middle of scrolling.
1647 */ 1649 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1672 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1673 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1674 + 1;
1673 min_it (scroll_selection_lines, 1675 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1676 SELECTION_SCROLL_MAX_LINES);
1677 scroll_selection_lines *= scroll_selection_dir;
1675 } 1678 }
1676 else 1679 else
1677 { 1680 {
1678 /* we are within the text window, so we 1681 /* we are within the text window, so we
1679 * shouldn't be scrolling 1682 * shouldn't be scrolling
1680 */ 1683 */
1681 sel_scroll_ev.stop(); 1684 sel_scroll_ev.stop();
1682 } 1685 }
1683#endif 1686#endif
1684#ifdef MOUSE_THRESHOLD
1685 } 1687 }
1686#endif
1687 } 1688 }
1688 } 1689 }
1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1690 { 1691 {
1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
… …
1765#endif 1766#endif
1766#if OFF_FOCUS_FADING 1767#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1768 if (rs[Rs_fade])
1768 { 1769 {
1769 pix_colors = pix_colors_focused; 1770 pix_colors = pix_colors_focused;
1770 scr_recolour (); 1771 scr_recolor ();
1771 } 1772 }
1772#endif 1773#endif
1773#if ENABLE_FRILLS 1774#if ENABLE_FRILLS
1774 if (option (Opt_urgentOnBell)) 1775 if (option (Opt_urgentOnBell))
1775 set_urgency (0); 1776 set_urgency (0);
1777
1778 if (priv_modes & PrivMode_FocusEvent)
1779 tt_printf ("\x1b[I");
1776#endif 1780#endif
1777 1781
1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1782 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1779 } 1783 }
1780} 1784}
… …
1788 want_refresh = 1; 1792 want_refresh = 1;
1789 1793
1790#if ENABLE_FRILLS 1794#if ENABLE_FRILLS
1791 if (option (Opt_urgentOnBell)) 1795 if (option (Opt_urgentOnBell))
1792 set_urgency (0); 1796 set_urgency (0);
1797
1798 if (priv_modes & PrivMode_FocusEvent)
1799 tt_printf ("\x1b[O");
1793#endif 1800#endif
1794#if ENABLE_FRILLS || ISO_14755 1801#if ENABLE_FRILLS || ISO_14755
1795 if (iso14755buf) 1802 if (iso14755buf)
1796 { 1803 {
1797 iso14755buf = 0; 1804 iso14755buf = 0;
… …
1812#endif 1819#endif
1813#if OFF_FOCUS_FADING 1820#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade]) 1821 if (rs[Rs_fade])
1815 { 1822 {
1816 pix_colors = pix_colors_unfocused; 1823 pix_colors = pix_colors_unfocused;
1817 scr_recolour (); 1824 scr_recolor ();
1818 } 1825 }
1819#endif 1826#endif
1820 1827
1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1828 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1822 } 1829 }
1823} 1830}
1824 1831
1825void ecb_cold 1832void ecb_cold
1826rxvt_term::update_fade_color (unsigned int idx) 1833rxvt_term::update_fade_color (unsigned int idx, bool first_time)
1827{ 1834{
1828#if OFF_FOCUS_FADING 1835#if OFF_FOCUS_FADING
1829 if (rs[Rs_fade]) 1836 if (rs[Rs_fade])
1830 { 1837 {
1838 if (!first_time)
1839 pix_colors_focused [idx].free (this);
1840
1831 rgba c; 1841 rgba c;
1832 pix_colors [Color_fade].get (c); 1842 pix_colors [Color_fade].get (c);
1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1843 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1834 } 1844 }
1835#endif 1845#endif
1836} 1846}
1837 1847
1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL 1848#if ENABLE_PERL
1839void ecb_hot 1849void ecb_hot
1840rxvt_term::rootwin_cb (XEvent &ev) 1850rxvt_term::rootwin_cb (XEvent &ev)
1841{ 1851{
1842 make_current (); 1852 make_current ();
1843 1853
… …
1853 * use the property to determine the pixmap. We use it later on. 1863 * use the property to determine the pixmap. We use it later on.
1854 */ 1864 */
1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1865 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1866 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1857 { 1867 {
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)); 1868 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1866 } 1869 }
1867 1870
1868 break; 1871 break;
1869 } 1872 }
… …
1897 iso14755_54 (ev.x, ev.y); 1900 iso14755_54 (ev.x, ev.y);
1898 return; 1901 return;
1899 } 1902 }
1900#endif 1903#endif
1901 1904
1902 clickintime = ev.time - MEvent.time < MULTICLICK_TIME; 1905 clickintime = ev.time - MEvent.time < multiClickTime;
1903 1906
1904 if (reportmode) 1907 if (reportmode)
1905 { 1908 {
1906 /* mouse report from vt window */ 1909 /* mouse report from vt window */
1907 /* save the xbutton state (for ButtonRelease) */ 1910 /* save the xbutton state (for ButtonRelease) */
… …
2150 2153
2151 if (reportmode) 2154 if (reportmode)
2152 { 2155 {
2153 /* mouse report from vt window */ 2156 /* mouse report from vt window */
2154 /* don't report release of wheel "buttons" */ 2157 /* don't report release of wheel "buttons" */
2155 if (ev.button >= 4) 2158 if (ev.button >= 4 && ev.button <= 7)
2156 return; 2159 return;
2157#ifdef MOUSE_REPORT_DOUBLECLICK 2160#ifdef MOUSE_REPORT_DOUBLECLICK
2158 /* only report the release of 'slow' single clicks */ 2161 /* only report the release of 'slow' single clicks */
2159 if (MEvent.button != AnyButton 2162 if (MEvent.button != AnyButton
2160 && (ev.button != MEvent.button 2163 && (ev.button != MEvent.button
2161 || (ev.time - MEvent.time 2164 || (ev.time - MEvent.time
2162 > MULTICLICK_TIME / 2))) 2165 > multiClickTime / 2)))
2163 { 2166 {
2164 MEvent.clicks = 0; 2167 MEvent.clicks = 0;
2165 MEvent.button = AnyButton; 2168 MEvent.button = ev.button;
2166 mouse_report (ev); 2169 mouse_report (ev);
2167 } 2170 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2171#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2172 MEvent.button = ev.button;
2170 mouse_report (ev); 2173 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2174#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2175 return;
2173 } 2176 }
2174 2177
… …
2195 2198
2196#ifdef MOUSE_WHEEL 2199#ifdef MOUSE_WHEEL
2197 case Button4: 2200 case Button4:
2198 case Button5: 2201 case Button5:
2199 { 2202 {
2200 int i; 2203 int lines;
2201 page_dirn v; 2204 page_dirn dirn;
2202 2205
2203 v = ev.button == Button4 ? UP : DN; 2206 dirn = ev.button == Button4 ? UP : DN;
2204 2207
2205 if (ev.state & ShiftMask) 2208 if (ev.state & ShiftMask)
2206 i = 1; 2209 lines = 1;
2207 else if (option (Opt_mouseWheelScrollPage)) 2210 else if (option (Opt_mouseWheelScrollPage))
2208 i = nrow - 1; 2211 lines = nrow - 1;
2209 else 2212 else
2210 i = 5; 2213 lines = 5;
2211 2214
2212# ifdef MOUSE_SLIP_WHEELING 2215# ifdef MOUSE_SLIP_WHEELING
2213 if (ev.state & ControlMask) 2216 if (ev.state & ControlMask)
2214 { 2217 {
2215 mouse_slip_wheel_speed += v; 2218 mouse_slip_wheel_speed += dirn;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2219 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2220
2219 if (!slip_wheel_ev.is_active ()) 2221 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2222 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221 } 2223 }
2222 else 2224 else
2223# endif 2225# endif
2224 { 2226 {
2225 scr_page (v, i); 2227 scr_page (dirn, lines);
2226 scrollBar.show (1); 2228 scrollBar.show (1);
2227 } 2229 }
2228 } 2230 }
2229 break; 2231 break;
2230#endif 2232#endif
… …
2362 } 2364 }
2363} 2365}
2364 2366
2365// read the next character 2367// read the next character
2366wchar_t ecb_hot 2368wchar_t ecb_hot
2367rxvt_term::next_char () NOTHROW 2369rxvt_term::next_char () noexcept
2368{ 2370{
2369 while (cmdbuf_ptr < cmdbuf_endp) 2371 while (cmdbuf_ptr < cmdbuf_endp)
2370 { 2372 {
2371 // assume 7-bit to be ascii ALWAYS 2373 // assume 7-bit to be ascii ALWAYS (always true in POSIX)
2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2374 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f))
2373 return *cmdbuf_ptr++; 2375 return *cmdbuf_ptr++;
2374 2376
2375 wchar_t wc; 2377 wchar_t wc;
2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2378 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2377 2379
… …
2398 return NOCHAR; 2400 return NOCHAR;
2399} 2401}
2400 2402
2401// read the next octet 2403// read the next octet
2402uint32_t ecb_hot 2404uint32_t ecb_hot
2403rxvt_term::next_octet () NOTHROW 2405rxvt_term::next_octet () noexcept
2404{ 2406{
2405 return cmdbuf_ptr < cmdbuf_endp 2407 return cmdbuf_ptr < cmdbuf_endp
2406 ? (unsigned char)*cmdbuf_ptr++ 2408 ? (unsigned char)*cmdbuf_ptr++
2407 : NOCHAR; 2409 : NOCHAR;
2408} 2410}
2409 2411
2410static class out_of_input out_of_input; 2412static class out_of_input out_of_input;
2411 2413
2412wchar_t ecb_hot 2414wchar_t ecb_hot
2413rxvt_term::cmd_getc () THROW ((class out_of_input)) 2415rxvt_term::cmd_getc ()
2414{ 2416{
2415 wchar_t c = next_char (); 2417 wchar_t c = next_char ();
2416 2418
2417 if (c == NOCHAR) 2419 if (c == NOCHAR)
2418 throw out_of_input; 2420 throw out_of_input;
2419 2421
2420 return c; 2422 return c;
2421} 2423}
2422 2424
2423uint32_t ecb_hot 2425uint32_t ecb_hot
2424rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2426rxvt_term::cmd_get8 ()
2425{ 2427{
2426 uint32_t c = next_octet (); 2428 uint32_t c = next_octet ();
2427 2429
2428 if (c == NOCHAR) 2430 if (c == NOCHAR)
2429 throw out_of_input; 2431 throw out_of_input;
… …
2558 scr_charset_choose (0); 2560 scr_charset_choose (0);
2559 break; 2561 break;
2560 2562
2561#ifdef EIGHT_BIT_CONTROLS 2563#ifdef EIGHT_BIT_CONTROLS
2562 // 8-bit controls 2564 // 8-bit controls
2563 case 0x90: /* DCS */ 2565 case 0x90: /* DCS */
2564 process_dcs_seq (); 2566 process_dcs_seq ();
2565 break; 2567 break;
2566 case 0x9b: /* CSI */ 2568 case 0x9b: /* CSI */
2567 process_csi_seq (); 2569 process_csi_seq ();
2568 break; 2570 break;
2569 case 0x9d: /* OSC */ 2571 case 0x9d: /* OSC */
2570 process_osc_seq (); 2572 process_osc_seq ();
2571 break; 2573 break;
2572#endif 2574#endif
2573 } 2575 }
2574} 2576}
… …
2702 wchar_t nlcr[] = { C0_LF, C0_CR }; 2704 wchar_t nlcr[] = { C0_LF, C0_CR };
2703 scr_add_lines (nlcr, ecb_array_length (nlcr), 1); 2705 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2704 } 2706 }
2705 break; 2707 break;
2706 2708
2709#if 0 // disabled because embedded newlines can make exploits easier
2707 /* kidnapped escape sequence: Should be 8.3.48 */ 2710 /* kidnapped escape sequence: Should be 8.3.48 */
2708 case C1_ESA: /* ESC G */ 2711 case C1_ESA: /* ESC G */
2709 // used by original rxvt for rob nations own graphics mode 2712 // used by original rxvt for rob nations own graphics mode
2710 if (cmd_getc () == 'Q') 2713 if (cmd_getc () == 'Q' && option (Opt_insecure))
2711 tt_printf ("\033G0\012"); /* query graphics - no graphics */ 2714 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2712 break; 2715 break;
2716#endif
2713 2717
2714 /* 8.3.63: CHARACTER TABULATION SET */ 2718 /* 8.3.63: CHARACTER TABULATION SET */
2715 case C1_HTS: /* ESC H */ 2719 case C1_HTS: /* ESC H */
2716 scr_set_tab (1); 2720 scr_set_tab (1);
2717 break; 2721 break;
… …
2875 break; 2879 break;
2876 2880
2877 case '?': 2881 case '?':
2878 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2882 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2879 process_terminal_mode (ch, priv, nargs, arg); 2883 process_terminal_mode (ch, priv, nargs, arg);
2884 if (prev_ch == '$' && ch == 'p')
2885 process_terminal_mode (ch, priv, nargs, arg);
2880 break; 2886 break;
2881 2887
2882 case '!': 2888 case '!':
2883 if (ch == CSI_70) 2889 if (ch == CSI_70)
2884 { 2890 {
2885 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2891 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2886 scr_soft_reset (); 2892 scr_soft_reset ();
2887 2893
2888 static const int pm_h[] = { 7, 25 }; 2894 static const int pm_h[] = { 7, 25 };
2889 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2895 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1006, 1015, 1049 };
2890 2896
2891 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h); 2897 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2892 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l); 2898 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2893 } 2899 }
2894 break; 2900 break;
… …
2924 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2930 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2925 scr_gotorc (arg[0], 0, RELATIVE); 2931 scr_gotorc (arg[0], 0, RELATIVE);
2926 break; 2932 break;
2927 2933
2928 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2934 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2929 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2935 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
2930#ifdef ISO6429 2936#ifdef ISO6429
2931 arg[0] = -arg[0]; 2937 arg[0] = -arg[0];
2932#else /* emulate common DEC VTs */ 2938#else /* emulate common DEC VTs */
2933 arg[0] = arg[0] ? -arg[0] : -1; 2939 arg[0] = arg[0] ? -arg[0] : -1;
2934#endif 2940#endif
… …
3025 case 7: /* unofficial extension */ 3031 case 7: /* unofficial extension */
3026 if (option (Opt_insecure)) 3032 if (option (Opt_insecure))
3027 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3033 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3028 break; 3034 break;
3029 case 8: /* unofficial extension */ 3035 case 8: /* unofficial extension */
3036 {
3037 string_term st;
3038 st.v[0] = CHAR_ST;
3039 st.v[1] = '\0';
3030 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3040 process_xterm_seq (XTerm_title, (char *)RESNAME "-" VERSION, st); // char * cast verified
3031 break; 3041 break;
3042 }
3032 } 3043 }
3033 break; 3044 break;
3034 3045
3035 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */ 3046 case CSI_TBC: /* 8.3.155: (0) TABULATION CLEAR */
3036 switch (arg[0]) 3047 switch (arg[0])
… …
3079 scr_insert_mode (1); 3090 scr_insert_mode (1);
3080 else if (arg[0] == 20) 3091 else if (arg[0] == 20)
3081 priv_modes |= PrivMode_LFNL; 3092 priv_modes |= PrivMode_LFNL;
3082 break; 3093 break;
3083 3094
3084 case CSI_71: // DESCUSR: set cursor style 3095 case CSI_71: // DECSCUSR: set cursor style
3085 if (prev_ch == ' ') 3096 if (prev_ch == ' ')
3086 set_cursor_style (arg[0]); 3097 set_cursor_style (arg[0]);
3087 break; 3098 break;
3088 3099
3089 /* 3100 /*
… …
3221/* 3232/*
3222 * get input up until STRING TERMINATOR (or BEL) 3233 * get input up until STRING TERMINATOR (or BEL)
3223 * ends_how is terminator used. returned input must be free()'d 3234 * ends_how is terminator used. returned input must be free()'d
3224 */ 3235 */
3225char * 3236char *
3226rxvt_term::get_to_st (unicode_t &ends_how) 3237rxvt_term::get_to_st (string_term &st)
3227{ 3238{
3228 unicode_t ch; 3239 unicode_t ch;
3229 bool seen_esc = false; 3240 bool seen_esc = false;
3230 unsigned int n = 0; 3241 unsigned int n = 0;
3231 wchar_t string[STRING_MAX]; 3242 wchar_t string[CBUFSIZ];
3232 3243
3233 while ((ch = cmd_getc ()) != NOCHAR) 3244 while ((ch = cmd_getc ()) != NOCHAR)
3234 { 3245 {
3235 if (seen_esc) 3246 if (seen_esc)
3236 { 3247 {
… …
3251 else if (ch < 0x20) 3262 else if (ch < 0x20)
3252 return NULL; /* other control character - exit */ 3263 return NULL; /* other control character - exit */
3253 3264
3254 seen_esc = false; 3265 seen_esc = false;
3255 3266
3256 if (n >= STRING_MAX - 1) 3267 if (n >= sizeof (string) - 1)
3257 // stop at some sane length 3268 // stop at some sane length
3258 return NULL; 3269 return NULL;
3259 3270
3260 string[n++] = ch; 3271 string[n++] = ch;
3261 } 3272 }
3262 3273
3263 string[n++] = '\0'; 3274 string[n++] = '\0';
3264 3275
3265 ends_how = (ch == 0x5c ? C0_ESC : ch); 3276 n = 0;
3277 if (ch == 0x5c)
3278 st.v[n++] = C0_ESC;
3279 st.v[n++] = ch;
3280 st.v[n] = '\0';
3266 3281
3267 return rxvt_wcstombs (string); 3282 return rxvt_wcstombs (string);
3268} 3283}
3269 3284
3270/*----------------------------------------------------------------------*/ 3285/*----------------------------------------------------------------------*/
… …
3276{ 3291{
3277 /* 3292 /*
3278 * Not handled yet 3293 * Not handled yet
3279 */ 3294 */
3280 3295
3281 unicode_t eh; 3296 string_term st;
3282 char *s = get_to_st (eh); 3297 char *s = get_to_st (st);
3283 if (s) 3298 if (s)
3284 free (s); 3299 free (s);
3285 3300
3286 return; 3301 return;
3287} 3302}
… …
3299 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3314 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3300 arg = arg * 10 + (ch - '0'); 3315 arg = arg * 10 + (ch - '0');
3301 3316
3302 if (ch == ';') 3317 if (ch == ';')
3303 { 3318 {
3304 unicode_t eh; 3319 string_term st;
3305 char *s = get_to_st (eh); 3320 char *s = get_to_st (st);
3306 3321
3307 if (s) 3322 if (s)
3308 { 3323 {
3309 process_xterm_seq (arg, s, eh); 3324 process_xterm_seq (arg, s, st);
3310 free (s); 3325 free (s);
3311 } 3326 }
3312 } 3327 }
3313} 3328}
3314 3329
3330static unsigned int
3331colorcube_index (unsigned int idx_r,
3332 unsigned int idx_g,
3333 unsigned int idx_b)
3334{
3335 assert (idx_r < Red_levels);
3336 assert (idx_g < Green_levels);
3337 assert (idx_b < Blue_levels);
3338
3339 return idx_r * Blue_levels * Green_levels +
3340 idx_g * Blue_levels +
3341 idx_b;
3342}
3343
3344/*
3345 * Find the nearest color slot in the hidden color cube,
3346 * adapt its value to the 32bit RGBA color.
3347 */
3348unsigned int
3349rxvt_term::map_rgb24_color (unsigned int r, unsigned int g, unsigned int b, unsigned int a)
3350{
3351 r &= 0xff;
3352 g &= 0xff;
3353 b &= 0xff;
3354 a &= 0xff;
3355
3356 uint32_t color = (a << 24) | (r << 16) | (g << 8) | b;
3357
3358 /* we allow one of the 6 closest neighbouring colours */
3359 /* to replace the current color, if they not used recently */
3360 #if 0
3361 static const unsigned char dxyz[][3] = {
3362 0, 0, 0,
3363 0, 0, 4,
3364 0, 4, 4,
3365 4, 4, 0,
3366 4, 0, 4,
3367 0, 4, 0,
3368 4, 0, 0,
3369 };
3370 #else
3371 // silly compressed verlapping triplets version of above
3372 static const unsigned char dxyz[] = {
3373 0, 0, 0, 4, 4, 0, 4, 0, 0,
3374 };
3375 #endif
3376
3377 static const unsigned char color_level[8][32] = {
3378 // neighbour index
3379 {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},
3380 {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},
3381 {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},
3382 {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},
3383 // Red_levels/Green_levels/Blue_levels index
3384 {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},
3385 {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},
3386 {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},
3387 {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},
3388 };
3389
3390 unsigned int idx;
3391
3392 for (int n = 0; n < ecb_array_length (dxyz) - 2; ++n)
3393 {
3394 unsigned int idx_r = color_level[ Red_levels - dxyz[n + 0]][r / 8];
3395 unsigned int idx_g = color_level[Green_levels - dxyz[n + 1]][g / 8];
3396 unsigned int idx_b = color_level[ Blue_levels - dxyz[n + 2]][b / 8];
3397 unsigned int index = colorcube_index (idx_r, idx_g, idx_b);
3398
3399 if (n == 0)
3400 idx = index;
3401
3402 if (rgb24_color[index] == color)
3403 {
3404 rgb24_seqno[index] = ++rgb24_sequence;
3405 return index + minTermCOLOR24;
3406 }
3407
3408 // minor issue: could update index 0 few more times
3409 if ((rgb24_seqno[index] | rgb24_color[index]) == 0)
3410 {
3411 idx = index;
3412 goto update;
3413 }
3414
3415 // like (rgb24_seqno[idx] > rgb24_seqno[index])
3416 // but also handles wrap around values well enough
3417 if ((uint16_t)(rgb24_seqno[idx] - rgb24_seqno[index]) < 0x8000)
3418 idx = index;
3419 }
3420
3421update:
3422 rgb24_color[idx] = color;
3423 rgb24_seqno[idx] = ++rgb24_sequence;
3424
3425 idx += minTermCOLOR24;
3426 pix_colors_focused [idx].free (this);
3427 pix_colors_focused [idx].set (this, rgba (r * 0x0101, g * 0x0101, b * 0x0101, a * 0x0101));
3428 update_fade_color (idx, false);
3429
3430 return idx;
3431}
3432
3315void 3433void
3316rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3434rxvt_term::process_color_seq (int report, int color, const char *str, string_term &st)
3317{ 3435{
3318 if (str[0] == '?' && !str[1]) 3436 if (str[0] == '?' && !str[1])
3319 { 3437 {
3320 rgba c; 3438 rgba c;
3321 pix_colors_focused[color].get (c); 3439 pix_colors_focused[color].get (c);
3440 char rgba_str[32];
3322 3441
3323#if XFT 3442#if XFT
3324 if (c.a != rgba::MAX_CC) 3443 if (c.a != rgba::MAX_CC)
3325 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3444 snprintf (rgba_str, sizeof (rgba_str), "rgba:%04x/%04x/%04x/%04x", c.r, c.g, c.b, c.a);
3326 else 3445 else
3327#endif 3446#endif
3328 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3447 snprintf (rgba_str, sizeof (rgba_str), "rgb:%04x/%04x/%04x", c.r, c.g, c.b);
3448
3449 if (IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3450 tt_printf ("\033]%d;%d;%s%s", report, color - minCOLOR, rgba_str, st.v);
3451 else
3452 tt_printf ("\033]%d;%s%s", report, rgba_str, st.v);
3329 } 3453 }
3330 else 3454 else
3331 set_window_color (color, str); 3455 set_window_color (color, str);
3332} 3456}
3333 3457
3334/* 3458/*
3335 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3459 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3336 */ 3460 */
3337void 3461void
3338rxvt_term::process_xterm_seq (int op, char *str, char resp) 3462rxvt_term::process_xterm_seq (int op, char *str, string_term &st)
3339{ 3463{
3340 int color; 3464 int color;
3341 char *buf, *name; 3465 char *buf, *name;
3342 bool query = str[0] == '?' && !str[1]; 3466 bool query = str[0] == '?' && !str[1];
3343 int saveop = op; 3467 int saveop = op;
… …
3378 &nitems, &bytes_after, &value) == Success 3502 &nitems, &bytes_after, &value) == Success
3379 && actual_type != None 3503 && actual_type != None
3380 && actual_format == 8) 3504 && actual_format == 8)
3381 str = (const char *)(value); 3505 str = (const char *)(value);
3382 3506
3383 tt_printf ("\033]%d;%s%c", op, str, resp); 3507 tt_printf ("\033]%d;%s%s", op, option (Opt_insecure) ? str : "", st.v);
3384 3508
3385 XFree (value); 3509 XFree (value);
3386 } 3510 }
3387 else 3511 else
3388 { 3512 {
… …
3412 break; 3536 break;
3413 3537
3414 if ((buf = strchr (name, ';')) != NULL) 3538 if ((buf = strchr (name, ';')) != NULL)
3415 *buf++ = '\0'; 3539 *buf++ = '\0';
3416 3540
3417 process_color_seq (op, color, name, resp); 3541 process_color_seq (op, color, name, st);
3418 } 3542 }
3419 break; 3543 break;
3420 case Rxvt_restoreFG: 3544 case Rxvt_restoreFG:
3421 case XTerm_Color00: 3545 case XTerm_Color00:
3422 process_color_seq (op, Color_fg, str, resp); 3546 process_color_seq (op, Color_fg, str, st);
3423 break; 3547 break;
3424 case Rxvt_restoreBG: 3548 case Rxvt_restoreBG:
3425 case XTerm_Color01: 3549 case XTerm_Color01:
3426 process_color_seq (op, Color_bg, str, resp); 3550 process_color_seq (op, Color_bg, str, st);
3427 break; 3551 break;
3428#ifndef NO_CURSORCOLOR 3552#ifndef NO_CURSORCOLOR
3429 case XTerm_Color_cursor: 3553 case XTerm_Color_cursor:
3430 process_color_seq (op, Color_cursor, str, resp); 3554 process_color_seq (op, Color_cursor, str, st);
3431 break; 3555 break;
3432#endif 3556#endif
3433 case XTerm_Color_pointer_fg: 3557 case XTerm_Color_pointer_fg:
3434 process_color_seq (op, Color_pointer_fg, str, resp); 3558 process_color_seq (op, Color_pointer_fg, str, st);
3435 break; 3559 break;
3436 case XTerm_Color_pointer_bg: 3560 case XTerm_Color_pointer_bg:
3437 process_color_seq (op, Color_pointer_bg, str, resp); 3561 process_color_seq (op, Color_pointer_bg, str, st);
3438 break; 3562 break;
3439#ifdef OPTION_HC 3563#ifdef OPTION_HC
3440 case XTerm_Color_HC: 3564 case XTerm_Color_HC:
3441 process_color_seq (op, Color_HC, str, resp); 3565 process_color_seq (op, Color_HC, str, st);
3442 break; 3566 break;
3443 case XTerm_Color_HTC: 3567 case XTerm_Color_HTC:
3444 process_color_seq (op, Color_HTC, str, resp); 3568 process_color_seq (op, Color_HTC, str, st);
3445 break; 3569 break;
3446#endif 3570#endif
3447#ifndef NO_BOLD_UNDERLINE_REVERSE 3571#ifndef NO_BOLD_UNDERLINE_REVERSE
3448 case URxvt_Color_BD: 3572 case URxvt_Color_BD:
3449 process_color_seq (op, Color_BD, str, resp); 3573 process_color_seq (op, Color_BD, str, st);
3450 break; 3574 break;
3451 case URxvt_Color_UL: 3575 case URxvt_Color_UL:
3452 process_color_seq (op, Color_UL, str, resp); 3576 process_color_seq (op, Color_UL, str, st);
3453 break; 3577 break;
3454 case URxvt_Color_IT: 3578 case URxvt_Color_IT:
3455 process_color_seq (op, Color_IT, str, resp); 3579 process_color_seq (op, Color_IT, str, st);
3456 break; 3580 break;
3457#endif 3581#endif
3458 case URxvt_Color_border: 3582 case URxvt_Color_border:
3459 process_color_seq (op, Color_border, str, resp); 3583 process_color_seq (op, Color_border, str, st);
3460 break; 3584 break;
3461
3462#if BG_IMAGE_FROM_ROOT
3463 case URxvt_Color_tint:
3464 process_color_seq (op, Color_tint, str, resp);
3465 {
3466 bool changed = false;
3467
3468 if (ISSET_PIXCOLOR (Color_tint))
3469 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3470
3471 if (changed)
3472 update_background ();
3473 }
3474
3475 break;
3476#endif
3477
3478#if BG_IMAGE_FROM_FILE
3479 case Rxvt_Pixmap:
3480 if (!strcmp (str, "?"))
3481 {
3482 char str[256];
3483 int h_scale = fimage.h_scale;
3484 int v_scale = fimage.v_scale;
3485 int h_align = fimage.h_align;
3486 int v_align = fimage.v_align;
3487
3488 sprintf (str, "[%dx%d+%d+%d]",
3489 h_scale, v_scale,
3490 h_align, v_align);
3491 process_xterm_seq (XTerm_title, str, CHAR_ST);
3492 }
3493 else
3494 {
3495 bool changed = false;
3496
3497 if (*str != ';')
3498 {
3499 try
3500 {
3501 fimage.set_file_geometry (this, str);
3502 changed = true;
3503 }
3504 catch (const class rxvt_failure_exception &e)
3505 {
3506 }
3507 }
3508 else
3509 {
3510 str++;
3511 if (fimage.set_geometry (str, true))
3512 changed = true;
3513 }
3514
3515 if (changed)
3516 {
3517 if (bg_window_position_sensitive ())
3518 {
3519 int x, y;
3520 get_window_origin (x, y);
3521 parent_x = x;
3522 parent_y = y;
3523 }
3524 update_background ();
3525 }
3526 }
3527 break;
3528#endif
3529 3585
3530 case XTerm_logfile: 3586 case XTerm_logfile:
3531 // TODO, when secure mode? 3587 // TODO, when secure mode?
3532 break; 3588 break;
3533 3589
… …
3550 case URxvt_boldFont: 3606 case URxvt_boldFont:
3551 case URxvt_italicFont: 3607 case URxvt_italicFont:
3552 case URxvt_boldItalicFont: 3608 case URxvt_boldItalicFont:
3553#endif 3609#endif
3554 if (query) 3610 if (query)
3555 tt_printf ("\33]%d;%-.250s%c", saveop, 3611 tt_printf ("\33]%d;%-.250s%s", saveop,
3556 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3612 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3557 ? fontset[op - URxvt_font]->fontdesc : "", 3613 ? fontset[op - URxvt_font]->fontdesc : "",
3558 resp); 3614 st.v);
3559 else 3615 else
3560 { 3616 {
3561 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3617 const char *&res = rs[Rs_font + (op - URxvt_font)];
3562 3618
3563 res = strdup (str); 3619 res = strdup (str);
… …
3566 } 3622 }
3567 break; 3623 break;
3568 3624
3569 case URxvt_version: 3625 case URxvt_version:
3570 if (query) 3626 if (query)
3571 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", 3627 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%s",
3572 op, 3628 op,
3573 rs[Rs_name], VERSION[0], VERSION[2], 3629 rs[Rs_name], VERSION[0], VERSION[2],
3574 resp); 3630 st.v);
3575 break; 3631 break;
3576 3632
3577#if !ENABLE_MINIMAL 3633#if !ENABLE_MINIMAL
3634 case URxvt_cellinfo:
3635 if (query)
3636 tt_printf ("\33]%d;%d;%d;%d%s", saveop,
3637 fwidth, fheight, fbase,
3638 st.v);
3639 break;
3640
3578 case URxvt_locale: 3641 case URxvt_locale:
3579 if (query) 3642 if (query)
3580 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp); 3643 tt_printf ("\33]%d;%-.250s%s", op, option (Opt_insecure) ? locale : "", st.v);
3581 else 3644 else
3582 { 3645 {
3583 set_locale (str); 3646 set_locale (str);
3584 pty->set_utf8_mode (enc_utf8); 3647 pty->set_utf8_mode (enc_utf8);
3585 init_xlocale (); 3648 init_xlocale ();
… …
3600 break; 3663 break;
3601#endif 3664#endif
3602 3665
3603#if ENABLE_PERL 3666#if ENABLE_PERL
3604 case URxvt_perl: 3667 case URxvt_perl:
3605 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END)); 3668 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR, st.v, DT_END));
3606 break; 3669 break;
3607#endif 3670#endif
3608 } 3671 }
3609} 3672}
3610/*----------------------------------------------------------------------*/ 3673/*----------------------------------------------------------------------*/
… …
3667 { 5, PrivMode_rVideo }, // DECSCNM 3730 { 5, PrivMode_rVideo }, // DECSCNM
3668 { 6, PrivMode_relOrigin }, // DECOM 3731 { 6, PrivMode_relOrigin }, // DECOM
3669 { 7, PrivMode_Autowrap }, // DECAWM 3732 { 7, PrivMode_Autowrap }, // DECAWM
3670 // 8, auto-repeat keys // DECARM 3733 // 8, auto-repeat keys // DECARM
3671 { 9, PrivMode_MouseX10 }, 3734 { 9, PrivMode_MouseX10 },
3735 { 12, PrivMode_BlinkingCursor },
3672 // 18 end FF to printer after print screen 3736 // 18 end FF to printer after print screen
3673 // 19 Print screen prints full screen/scroll region 3737 // 19 Print screen prints full screen/scroll region
3674 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis 3738 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3675#ifdef scrollBar_esc 3739#ifdef scrollBar_esc
3676 { scrollBar_esc, PrivMode_scrollBar }, 3740 { scrollBar_esc, PrivMode_scrollBar },
… …
3688#endif 3752#endif
3689 { 1000, PrivMode_MouseX11 }, 3753 { 1000, PrivMode_MouseX11 },
3690 { 1002, PrivMode_MouseBtnEvent }, 3754 { 1002, PrivMode_MouseBtnEvent },
3691 { 1003, PrivMode_MouseAnyEvent }, 3755 { 1003, PrivMode_MouseAnyEvent },
3692#if ENABLE_FRILLS 3756#if ENABLE_FRILLS
3757 { 1004, PrivMode_FocusEvent },
3693 { 1005, PrivMode_ExtModeMouse }, 3758 { 1005, PrivMode_ExtMouseUTF8 },
3759 { 1006, PrivMode_ExtMouseSGR },
3694#endif 3760#endif
3695 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3761 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3696 { 1011, PrivMode_Keypress }, // rxvt extension 3762 { 1011, PrivMode_Keypress }, // rxvt extension
3697#if ENABLE_FRILLS 3763#if ENABLE_FRILLS
3698 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 3764 { 1015, PrivMode_ExtMouseUrxvt }, // urxvt extension of 1005
3699#endif 3765#endif
3700 // 1035 enable modifiers for alt, numlock NYI 3766 // 1035 enable modifiers for alt, numlock NYI
3701 // 1036 send ESC for meta keys NYI 3767 // 1036 send ESC for meta keys NYI
3702 // 1037 send DEL for keypad delete NYI 3768 // 1037 send DEL for keypad delete NYI
3703 { 1047, PrivMode_Screen }, 3769 { 1047, PrivMode_Screen },
3704 // 1048 save and restore cursor, implemented in code 3770 // 1048 save and restore cursor, implemented in code
3705 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3771 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3706 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3772 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3773#if ENABLE_FRILLS
3707 { 2004, PrivMode_BracketPaste }, 3774 { 2004, PrivMode_BracketPaste },
3775#endif
3708 }; 3776 };
3709 3777
3710 if (nargs == 0) 3778 if (nargs == 0)
3711 return; 3779 return;
3780
3781 // DECRQM
3782 if (mode == 'p')
3783 {
3784 int status = 0;
3785 if (nargs != 1)
3786 return;
3787
3788 for (j = 0; j < ecb_array_length (argtopriv); j++)
3789 if (argtopriv[j].argval == arg[0])
3790 {
3791 status = (priv_modes & argtopriv[j].bit) ? 1 : 2;
3792 break;
3793 }
3794
3795 tt_printf ("\33[?%d;%d$y", arg[0], status);
3796 return;
3797 }
3712 3798
3713 /* make lo/hi boolean */ 3799 /* make lo/hi boolean */
3714 if (mode == 'l') 3800 if (mode == 'l')
3715 mode = 0; /* reset */ 3801 mode = 0; /* reset */
3716 else if (mode == 'h') 3802 else if (mode == 'h')
… …
3785 scrollBar.map (state); 3871 scrollBar.map (state);
3786 resize_all_windows (0, 0, 0); 3872 resize_all_windows (0, 0, 0);
3787 scr_touch (true); 3873 scr_touch (true);
3788 break; 3874 break;
3789#endif 3875#endif
3876#ifdef CURSOR_BLINK
3877 case 12:
3878 cursor_blink_reset ();
3879 break;
3880#endif
3790 case 25: /* visible/invisible cursor */ 3881 case 25: /* visible/invisible cursor */
3791 scr_cursor_visible (state); 3882 scr_cursor_visible (state);
3792 break; 3883 break;
3793 /* case 35: - shift keys */ 3884 /* case 35: - shift keys */
3794 /* case 40: - 80 <--> 132 mode */ 3885 /* case 40: - 80 <--> 132 mode */
… …
3899 //case 19: // ninth alt font 3990 //case 19: // ninth alt font
3900 //case 20: // gothic 3991 //case 20: // gothic
3901 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) 3992 case 21: // disable bold, faint, sometimes doubly underlined (iso 8613)
3902 rendset = 0, rendstyle = RS_Bold; 3993 rendset = 0, rendstyle = RS_Bold;
3903 break; 3994 break;
3904 case 22: // normal intensity 3995 case 22: // bold off (vt220)
3905 rendset = 0, rendstyle = RS_Bold; 3996 rendset = 0, rendstyle = RS_Bold;
3906 break; 3997 break;
3907 case 23: // disable italic 3998 case 23: // disable italic
3908 rendset = 0, rendstyle = RS_Italic; 3999 rendset = 0, rendstyle = RS_Italic;
3909 break; 4000 break;
3910 case 24: 4001 case 24: // underline off (vt220)
3911 rendset = 0, rendstyle = RS_Uline; 4002 rendset = 0, rendstyle = RS_Uline;
3912 break; 4003 break;
3913 case 25: 4004 case 25: // blink off (vt220)
3914 rendset = 0, rendstyle = RS_Blink; 4005 rendset = 0, rendstyle = RS_Blink;
3915 break; 4006 break;
3916 case 26: // variable spacing (iso 8613) 4007 case 26: // variable spacing (iso 8613)
3917 rendset = 0, rendstyle = RS_Blink; 4008 rendset = 0, rendstyle = RS_Blink;
3918 break; 4009 break;
3919 case 27: 4010 case 27: // reverse off (vt220)
3920 rendset = 0, rendstyle = RS_RVid; 4011 rendset = 0, rendstyle = RS_RVid;
3921 break; 4012 break;
3922 //case 28: // visible. NYI 4013 //case 28: // visible. NYI
3923 //case 29: // not crossed-out 4014 //case 29: // not crossed-out
3924 } 4015 }
… …
3939 case 35: 4030 case 35:
3940 case 36: 4031 case 36:
3941 case 37: 4032 case 37:
3942 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); 4033 scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg);
3943 break; 4034 break;
3944 case 38: // set fg color, ISO 8613-6
3945 if (nargs > i + 2 && arg[i + 1] == 5)
3946 {
3947 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg);
3948 i += 2;
3949 }
3950 break;
3951 case 39: /* default fg */ 4035 case 39: /* default fg */
3952 scr_color (Color_fg, Color_fg); 4036 scr_color (Color_fg, Color_fg);
3953 break; 4037 break;
3954 4038
3955 case 40: 4039 case 40:
… …
3960 case 45: 4044 case 45:
3961 case 46: 4045 case 46:
3962 case 47: 4046 case 47:
3963 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); 4047 scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg);
3964 break; 4048 break;
3965 case 48: // set bg color, ISO 8613-6
3966 if (nargs > i + 2 && arg[i + 1] == 5)
3967 {
3968 scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg);
3969 i += 2;
3970 }
3971 break;
3972 case 49: /* default bg */ 4049 case 49: /* default bg */
3973 scr_color (Color_bg, Color_bg); 4050 scr_color (Color_bg, Color_bg);
4051 break;
4052
4053 case 38: // set fg color, ISO 8613-6
4054 case 48: // set bg color, ISO 8613-6
4055 {
4056 unsigned int fgbg = arg[i] == 38 ? Color_fg : Color_bg;
4057 unsigned int idx;
4058
4059 if (nargs > i + 2 && arg[i + 1] == 5)
4060 {
4061 idx = minCOLOR + arg[i + 2];
4062 i += 2;
4063
4064 scr_color (idx, fgbg);
4065 }
4066 else if (nargs > i + 4 && arg[i + 1] == 2)
4067 {
4068 unsigned int r = arg[i + 2];
4069 unsigned int g = arg[i + 3];
4070 unsigned int b = arg[i + 4];
4071 unsigned int a = 0xff;
4072
4073 idx = map_rgb24_color (r, g, b, a);
4074
4075 i += 4;
4076
4077 scr_color (idx, fgbg);
4078 }
4079 }
3974 break; 4080 break;
3975 4081
3976 //case 50: // not variable spacing 4082 //case 50: // not variable spacing
3977 4083
3978#if !ENABLE_MINIMAL 4084#if !ENABLE_MINIMAL
… …
4002} 4108}
4003 4109
4004void 4110void
4005rxvt_term::set_cursor_style (int style) 4111rxvt_term::set_cursor_style (int style)
4006{ 4112{
4007 if (!IN_RANGE_INC (style, 0, 4)) 4113 if (!IN_RANGE_INC (style, 0, 6))
4008 return; 4114 return;
4009 4115
4116 if (style == 0)
4117 style = 1;
4118
4119 cursor_type = (style - 1) / 2;
4010 set_option (Opt_cursorUnderline, style >= 3); 4120 set_option (Opt_cursorUnderline, cursor_type == 1);
4011 4121
4012#ifdef CURSOR_BLINK 4122#ifdef CURSOR_BLINK
4013 set_option (Opt_cursorBlink, !style || (style & 1)); 4123 set_option (Opt_cursorBlink, style & 1);
4014 cursor_blink_reset (); 4124 cursor_blink_reset ();
4015#endif 4125#endif
4016 4126
4017 want_refresh = 1; 4127 want_refresh = 1;
4018} 4128}
4019/*}}} */ 4129/*}}} */
4020 4130
4021/* ------------------------------------------------------------------------- */ 4131/* ---------------------------------------------------------------------- */
4132/* Write data to the pty as typed by the user, pasted with the mouse,
4133 * or generated by us in response to a query ESC sequence.
4134 */
4022 4135
4023/* 4136/*
4024 * Send printf () formatted output to the command. 4137 * Send printf () formatted output to the command.
4025 * Only use for small amounts of data. 4138 * Only use for small amounts of data.
4026 */ 4139 */
… …
4034 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4147 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4035 va_end (arg_ptr); 4148 va_end (arg_ptr);
4036 tt_write (buf, strlen (buf)); 4149 tt_write (buf, strlen (buf));
4037} 4150}
4038 4151
4039/* ---------------------------------------------------------------------- */
4040/* Write data to the pty as typed by the user, pasted with the mouse, 4152/* Write data to the pty as typed by the user. */
4041 * or generated by us in response to a query ESC sequence. 4153void
4042 */ 4154rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4043static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4155{
4156 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4157 return;
4158
4159 if (option (Opt_scrollTtyKeypress))
4160 if (view_start)
4161 {
4162 view_start = 0;
4163 want_refresh = 1;
4164 }
4165
4166 tt_write_ (data, len);
4167}
4044 4168
4045void 4169void
4046rxvt_term::tt_write (const char *data, unsigned int len) 4170rxvt_term::tt_write (const char *data, unsigned int len)
4047{ 4171{
4048 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4172 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4049 return; 4173 return;
4050 4174
4175 tt_write_ (data, len);
4176}
4177
4178static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4179
4180void
4181rxvt_term::tt_write_ (const char *data, unsigned int len)
4182{
4051 if (pty->pty < 0) 4183 if (pty->pty < 0)
4052 return; 4184 return;
4053 4185
4054 if (v_buflen == 0) 4186 if (v_buflen == 0)
4055 { 4187 {

Diff Legend

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