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.545 by sf-exg, Sat Apr 26 15:05:17 2014 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 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 2 of the License, or
… …
400 break; 400 break;
401 } 401 }
402 return param; 402 return param;
403} 403}
404 404
405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
405void ecb_cold 414void ecb_cold
406rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
407{ 416{
408 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
409 KeySym keysym; 418 KeySym keysym;
410 int valid_keysym; 419 int valid_keysym;
411 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ];
421 char *kbuf = rkbuf + 1;
412 422
413#if ISO_14755 423#if ISO_14755
414 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
415 return; 425 return;
416#endif 426#endif
… …
486 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
487 } 497 }
488 498
489 if (valid_keysym) 499 if (valid_keysym)
490 { 500 {
501 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
502 {
503 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
504 unsigned int newlen = 1;
505
506 if (ev.state & ModNumLockMask)
507 kp = false;
508
509 keysym = translate_keypad (keysym, kp);
510
511 switch (keysym)
512 {
513#ifndef NO_BACKSPACE_KEY
514 case XK_BackSpace:
515 if (priv_modes & PrivMode_HaveBackSpace)
516 {
517 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
518 ^ !!ctrl) ? '\b' : '\177';
519 kbuf[1] = '\0';
520 }
521 else
522 strcpy (kbuf, rs[Rs_backspace_key]);
523 break;
524#endif
525#ifndef NO_DELETE_KEY
526 case XK_Delete:
527 strcpy (kbuf, rs[Rs_delete_key]);
528 break;
529#endif
530 case XK_Tab:
531 if (shft)
532 strcpy (kbuf, "\033[Z");
533 else
534 {
535#ifdef CTRL_TAB_MAKES_META
536 if (ctrl)
537 meta = 1;
538#endif
539#ifdef MOD4_TAB_MAKES_META
540 if (ev.state & Mod4Mask)
541 meta = 1;
542#endif
543 newlen = 0;
544 }
545 break;
546
547 case XK_Up: /* "\033[A" */
548 case XK_Down: /* "\033[B" */
549 case XK_Right: /* "\033[C" */
550 case XK_Left: /* "\033[D" */
551 strcpy (kbuf, "\033[Z");
552 kbuf[2] = "DACB"[keysym - XK_Left];
553 /* do Shift first */
554 if (shft)
555 kbuf[2] = "dacb"[keysym - XK_Left];
556 else if (ctrl)
557 {
558 kbuf[1] = 'O';
559 kbuf[2] = "dacb"[keysym - XK_Left];
560 }
561 else if (priv_modes & PrivMode_aplCUR)
562 kbuf[1] = 'O';
563 break;
564
565 case XK_KP_Enter:
566 /* allow shift to override */
567 if (kp)
568 {
569 strcpy (kbuf, "\033OM");
570 break;
571 }
572
573 /* FALLTHROUGH */
574
575 case XK_Return:
576 if (priv_modes & PrivMode_LFNL)
577 {
578 kbuf[0] = '\015';
579 kbuf[1] = '\012';
580 kbuf[2] = '\0';
581 }
582 else
583 {
584 kbuf[0] = '\015';
585 kbuf[1] = '\0';
586 }
587 break;
588
589 case XK_KP_F1: /* "\033OP" */
590 case XK_KP_F2: /* "\033OQ" */
591 case XK_KP_F3: /* "\033OR" */
592 case XK_KP_F4: /* "\033OS" */
593 strcpy (kbuf, "\033OP");
594 kbuf[2] += (keysym - XK_KP_F1);
595 break;
596
597 case XK_KP_Multiply: /* "\033Oj" : "*" */
598 case XK_KP_Add: /* "\033Ok" : "+" */
599 case XK_KP_Separator: /* "\033Ol" : "," */
600 case XK_KP_Subtract: /* "\033Om" : "-" */
601 case XK_KP_Decimal: /* "\033On" : "." */
602 case XK_KP_Divide: /* "\033Oo" : "/" */
603 case XK_KP_0: /* "\033Op" : "0" */
604 case XK_KP_1: /* "\033Oq" : "1" */
605 case XK_KP_2: /* "\033Or" : "2" */
606 case XK_KP_3: /* "\033Os" : "3" */
607 case XK_KP_4: /* "\033Ot" : "4" */
608 case XK_KP_5: /* "\033Ou" : "5" */
609 case XK_KP_6: /* "\033Ov" : "6" */
610 case XK_KP_7: /* "\033Ow" : "7" */
611 case XK_KP_8: /* "\033Ox" : "8" */
612 case XK_KP_9: /* "\033Oy" : "9" */
613 /* allow shift to override */
614 if (kp)
615 {
616 strcpy (kbuf, "\033Oj");
617 kbuf[2] += (keysym - XK_KP_Multiply);
618 }
619 else
620 {
621 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
622 kbuf[1] = '\0';
623 }
624 break;
625
626 default:
627 {
628 int param = map_function_key (keysym);
629 if (param > 0)
630 sprintf (kbuf,"\033[%d~", param);
631 else
632 newlen = 0;
633 }
634 break;
635 }
636
637 if (newlen)
638 len = strlen (kbuf);
639
640 if (len > 0)
641 {
642 /*
643 * pass Shift/Control indicators for function keys ending with `~'
644 *
645 * eg,
646 * Prior = "ESC[5~"
647 * Shift+Prior = "ESC[5$"
648 * Ctrl+Prior = "ESC[5^"
649 * Ctrl+Shift+Prior = "ESC[5@"
650 */
651 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
652 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
653
654 /*
655 * Pass meta for all function keys, if 'meta' option set
656 */
657#ifdef META8_OPTION
658 if (meta && (meta_char == 0x80))
659 kbuf[len - 1] |= 0x80;
660#endif
661 }
662
663 }
664 else if (ctrl && keysym == XK_minus)
665 {
666 len = 1;
667 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
668 }
669 else if (keysym == XK_ISO_Left_Tab)
670 {
671 strcpy (kbuf, "\033[Z");
672 len = 3;
673 }
674 else
675 {
676#ifdef META8_OPTION
677 /* set 8-bit on */
678 if (meta && (meta_char == 0x80))
679 {
680 char *ch;
681
682 for (ch = kbuf; ch < kbuf + len; ch++)
683 *ch |= 0x80;
684
685 meta = 0;
686 }
687#endif
688 /* nil */ ;
689 }
690 }
691
692 /* escape prefix */
693 if (len && meta
694#ifdef META8_OPTION
695 && meta_char == C0_ESC
696#endif
697 )
698 {
699 *--kbuf = C0_ESC;
700 len++;
701 }
702
703 if (valid_keysym)
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 {
… …
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 }
… …
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 790 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 return; 791 return;
578#endif 792#endif
579 } 793 }
580 } 794 }
795 }
796
797 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
798 {
799 if (keysym == XK_v)
800 selection_request (ev.time, Sel_Clipboard);
801 else if (selection.len > 0)
802 {
803 free (selection.clip_text);
804 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
805 selection.clip_len = selection.len;
806 selection_grab (CurrentTime, true);
807 }
808
809 return;
581 } 810 }
582 811
583#if ENABLE_FRILLS || ISO_14755 812#if ENABLE_FRILLS || ISO_14755
584 // ISO 14755 support 813 // ISO 14755 support
585 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
640 { 869 {
641 scr_printscreen (ctrl | shft); 870 scr_printscreen (ctrl | shft);
642 return; 871 return;
643 } 872 }
644#endif 873#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 } 874 }
836 875
837 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
838 return; 877 return;
839 878
… …
844 if (view_start) 883 if (view_start)
845 { 884 {
846 view_start = 0; 885 view_start = 0;
847 want_refresh = 1; 886 want_refresh = 1;
848 } 887 }
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 888
861 tt_write (kbuf, (unsigned int)len); 889 tt_write (kbuf, (unsigned int)len);
862} 890}
863 891
864void ecb_cold 892void ecb_cold
… …
1077 1105
1078#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1079void 1107void
1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1081{ 1109{
1082 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1083 { 1111 {
1084 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1085 want_refresh = 1; 1113 want_refresh = 1;
1086 refresh_check (); 1114 refresh_check ();
1087 } 1115 }
… …
1092 1120
1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1094void 1122void
1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1096{ 1124{
1097 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1125 if (scr_page (mouse_slip_wheel_speed))
1098 { 1126 {
1099 want_refresh = 1; 1127 want_refresh = 1;
1100 refresh_check (); 1128 refresh_check ();
1101 } 1129 }
1102 1130
… …
1638 1666
1639#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1640 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1641 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1642 { 1670 {
1671 page_dirn scroll_selection_dir;
1643 int dist; 1672 int dist;
1644 1673
1645 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1646 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1647 */ 1676 */
… …
1670 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1671 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1672 + 1; 1701 + 1;
1673 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1674 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1675 } 1705 }
1676 else 1706 else
1677 { 1707 {
1678 /* we are within the text window, so we 1708 /* we are within the text window, so we
1679 * shouldn't be scrolling 1709 * shouldn't be scrolling
… …
2195 2225
2196#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2197 case Button4: 2227 case Button4:
2198 case Button5: 2228 case Button5:
2199 { 2229 {
2200 int i; 2230 int lines;
2201 page_dirn v; 2231 page_dirn dirn;
2202 2232
2203 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2204 2234
2205 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2206 i = 1; 2236 lines = 1;
2207 else if (option (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2208 i = nrow - 1; 2238 lines = nrow - 1;
2209 else 2239 else
2210 i = 5; 2240 lines = 5;
2211 2241
2212# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2213 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2214 { 2244 {
2215 mouse_slip_wheel_speed += v; 2245 mouse_slip_wheel_speed += dirn;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2247
2219 if (!slip_wheel_ev.is_active ()) 2248 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221 } 2250 }
2222 else 2251 else
2223# endif 2252# endif
2224 { 2253 {
2225 scr_page (v, i); 2254 scr_page (dirn, lines);
2226 scrollBar.show (1); 2255 scrollBar.show (1);
2227 } 2256 }
2228 } 2257 }
2229 break; 2258 break;
2230#endif 2259#endif
… …
3226rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3227{ 3256{
3228 unicode_t ch; 3257 unicode_t ch;
3229 bool seen_esc = false; 3258 bool seen_esc = false;
3230 unsigned int n = 0; 3259 unsigned int n = 0;
3231 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3232 3261
3233 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3234 { 3263 {
3235 if (seen_esc) 3264 if (seen_esc)
3236 { 3265 {
… …
3251 else if (ch < 0x20) 3280 else if (ch < 0x20)
3252 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3253 3282
3254 seen_esc = false; 3283 seen_esc = false;
3255 3284
3256 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3257 // stop at some sane length 3286 // stop at some sane length
3258 return NULL; 3287 return NULL;
3259 3288
3260 string[n++] = ch; 3289 string[n++] = ch;
3261 } 3290 }
… …
3378 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3379 && actual_type != None 3408 && actual_type != None
3380 && actual_format == 8) 3409 && actual_format == 8)
3381 str = (const char *)(value); 3410 str = (const char *)(value);
3382 3411
3383 tt_printf ("\033]%d;%s%c", op, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3384 3413
3385 XFree (value); 3414 XFree (value);
3386 } 3415 }
3387 else 3416 else
3388 { 3417 {

Diff Legend

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