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.514 by root, Mon Jun 4 15:18:52 2012 UTC vs.
Revision 1.548 by sf-exg, Tue Apr 29 13:10:06 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void ecb_cold 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
… …
396 break; 400 break;
397 } 401 }
398 return param; 402 return param;
399} 403}
400 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
401void ecb_cold 414void ecb_cold
402rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
403{ 416{
404 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
405 KeySym keysym; 418 KeySym keysym;
406 int valid_keysym; 419 int valid_keysym;
407 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ + 1];
421 char *kbuf = rkbuf + 1;
408 422
409#if ISO_14755 423#if ISO_14755
410 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
411 return; 425 return;
412#endif 426#endif
… …
482 valid_keysym = keysym != NoSymbol; 496 valid_keysym = keysym != NoSymbol;
483 } 497 }
484 498
485 if (valid_keysym) 499 if (valid_keysym)
486 { 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 (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
704 return;
705
706 if (valid_keysym)
707 {
487#ifdef KEYSYM_RESOURCE 708#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 709 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 710 return;
490#endif 711#endif
491 712
492 if (saveLines) 713 if (saveLines)
493 { 714 {
… …
506#endif 727#endif
507 max_it (lnsppg, 1); 728 max_it (lnsppg, 1);
508 729
509 if (keysym == XK_Prior) 730 if (keysym == XK_Prior)
510 { 731 {
511 scr_page (UP, lnsppg); 732 scr_page (lnsppg);
512 return; 733 return;
513 } 734 }
514 else if (keysym == XK_Next) 735 else if (keysym == XK_Next)
515 { 736 {
516 scr_page (DN, lnsppg); 737 scr_page (-lnsppg);
517 return; 738 return;
518 } 739 }
519 } 740 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 741#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 742 if (IS_SCROLL_MOD)
522 { 743 {
523 if (keysym == XK_Up) 744 if (keysym == XK_Up)
524 { 745 {
525 scr_page (UP, 1); 746 scr_page (1);
526 return; 747 return;
527 } 748 }
528 else if (keysym == XK_Down) 749 else if (keysym == XK_Down)
529 { 750 {
530 scr_page (DN, 1); 751 scr_page (-1);
531 return; 752 return;
532 } 753 }
533 } 754 }
534#endif 755#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 756#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 757 if (IS_SCROLL_MOD)
537 { 758 {
538 if (keysym == XK_Home) 759 if (keysym == XK_Home)
539 { 760 {
540 scr_move_to (0, 1); 761 scr_changeview (top_row);
541 return; 762 return;
542 } 763 }
543 else if (keysym == XK_End) 764 else if (keysym == XK_End)
544 { 765 {
545 scr_move_to (1, 1); 766 scr_changeview (0);
546 return; 767 return;
547 } 768 }
548 } 769 }
549#endif 770#endif
550 } 771 }
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 793 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 794 return;
574#endif 795#endif
575 } 796 }
576 } 797 }
798 }
799
800 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
801 {
802 if (keysym == XK_v)
803 selection_request (ev.time, Sel_Clipboard);
804 else if (selection.len > 0)
805 {
806 free (selection.clip_text);
807 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
808 selection.clip_len = selection.len;
809 selection_grab (CurrentTime, true);
810 }
811
812 return;
577 } 813 }
578 814
579#if ENABLE_FRILLS || ISO_14755 815#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 816 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 817 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 872 {
637 scr_printscreen (ctrl | shft); 873 scr_printscreen (ctrl | shft);
638 return; 874 return;
639 } 875 }
640#endif 876#endif
641
642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
643 {
644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
645 unsigned int newlen = 1;
646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
653 {
654#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace)
657 {
658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
659 ^ !!ctrl) ? '\b' : '\177';
660 kbuf[1] = '\0';
661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
687
688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
768 {
769 int param = map_function_key (keysym);
770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
774 }
775 break;
776 }
777
778 if (newlen)
779 len = strlen (kbuf);
780
781 if (len > 0)
782 {
783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
796 * Pass meta for all function keys, if 'meta' option set
797 */
798#ifdef META8_OPTION
799 if (meta && (meta_char == 0x80))
800 kbuf[len - 1] |= 0x80;
801#endif
802 }
803
804 }
805 else if (ctrl && keysym == XK_minus)
806 {
807 len = 1;
808 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
809 }
810 else if (keysym == XK_ISO_Left_Tab)
811 {
812 strcpy (kbuf, "\033[Z");
813 len = 3;
814 }
815 else
816 {
817#ifdef META8_OPTION
818 /* set 8-bit on */
819 if (meta && (meta_char == 0x80))
820 {
821 char *ch;
822
823 for (ch = kbuf; ch < kbuf + len; ch++)
824 *ch |= 0x80;
825
826 meta = 0;
827 }
828#endif
829 /* nil */ ;
830 }
831 } 877 }
832
833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
834 return;
835 878
836 if (len <= 0) 879 if (len <= 0)
837 return; /* not mapped */ 880 return; /* not mapped */
838 881
839 if (option (Opt_scrollTtyKeypress))
840 if (view_start)
841 {
842 view_start = 0;
843 want_refresh = 1;
844 }
845
846 /* escape prefix */
847 if (meta
848#ifdef META8_OPTION
849 && meta_char == C0_ESC
850#endif
851 )
852 {
853 const char ch = C0_ESC;
854 tt_write (&ch, 1);
855 }
856
857 tt_write (kbuf, (unsigned int)len); 882 tt_write_user_input (kbuf, (unsigned int)len);
858} 883}
859 884
860void ecb_cold 885void ecb_cold
861rxvt_term::key_release (XKeyEvent &ev) 886rxvt_term::key_release (XKeyEvent &ev)
862{ 887{
… …
937void 962void
938rxvt_term::flush () 963rxvt_term::flush ()
939{ 964{
940 flush_ev.stop (); 965 flush_ev.stop ();
941 966
942#ifdef HAVE_BG_PIXMAP 967#ifdef HAVE_IMG
943 if (bg_flags & BG_NEEDS_REFRESH) 968 if (bg_flags & BG_NEEDS_REFRESH)
944 { 969 {
945 bg_flags &= ~BG_NEEDS_REFRESH; 970 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false); 971 scr_touch (false);
947 } 972 }
… …
1073 1098
1074#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1075void 1100void
1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077{ 1102{
1078 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_lines))
1079 { 1104 {
1080 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081 want_refresh = 1; 1106 want_refresh = 1;
1082 refresh_check (); 1107 refresh_check ();
1083 } 1108 }
… …
1088 1113
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1114#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1115void
1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1116rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1117{
1093 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1118 if (scr_page (mouse_slip_wheel_speed))
1094 { 1119 {
1095 want_refresh = 1; 1120 want_refresh = 1;
1096 refresh_check (); 1121 refresh_check ();
1097 } 1122 }
1098 1123
… …
1461 if (ev.xconfigure.window == parent) 1486 if (ev.xconfigure.window == parent)
1462 { 1487 {
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1488 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1489 ;
1465 1490
1491 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1492
1493 bool moved = false;
1466#ifdef HAVE_BG_PIXMAP 1494#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ()) 1495 if (bg_window_position_sensitive ())
1469 { 1496 {
1497 want_position_change = true;
1498 if (bg_img == 0)
1499 moved = true;
1500 }
1501#endif
1502
1503 if (want_position_change)
1504 {
1470 int x, y; 1505 int x, y;
1506
1471 if (ev.xconfigure.send_event) 1507 if (ev.xconfigure.send_event)
1472 { 1508 {
1473 x = ev.xconfigure.x; 1509 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y; 1510 y = ev.xconfigure.y;
1475 } 1511 }
1476 else 1512 else
1477 get_window_origin (x, y); 1513 get_window_origin (x, y);
1478 1514
1479 if (bg_set_position (x, y) 1515 if (x != parent_x || y != parent_y)
1480 || !(bg_flags & BG_IS_VALID)) 1516 {
1517 parent_x = x;
1518 parent_y = y;
1519 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1481 moved = true; 1520 moved = true;
1521 }
1482 } 1522 }
1483#endif
1484 1523
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1524 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1525 {
1487 seen_resize = 1; 1526 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1527 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1511 selection_send (ev.xselectionrequest); 1550 selection_send (ev.xselectionrequest);
1512 break; 1551 break;
1513 1552
1514 case MapNotify: 1553 case MapNotify:
1515#ifdef HAVE_BG_PIXMAP 1554#ifdef HAVE_BG_PIXMAP
1516 /* This is needed specifically to fix the case of no window manager or a 1555 // This is needed at startup for the case of no window manager
1517 * non-reparenting window manager. In those cases we never get first 1556 // or a non-reparenting window manager and also because we
1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1557 // defer bg image updates if the window is not mapped. The
1519 * care of multiplicity of ConfigureNotify events arriving while WM does 1558 // short delay is to optimize for multiple ConfigureNotify
1520 * reparenting. 1559 // events at startup when the window manager reparents the
1521 * We should not render background immediately, as there could be several 1560 // window, so as to perform the computation after we have
1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1561 // received all of them.
1523 * by scheduling background redraw as soon as we can, but giving a short 1562 if (bg_img == 0)
1524 * bit of time for ConfigureNotifies to arrive.
1525 * We should render background PRIOR to drawing any text, but AFTER all
1526 * of ConfigureNotifys for the best results.
1527 */
1528 if (!(bg_flags & BG_IS_VALID))
1529 update_background_ev.start (0.025); 1563 update_background_ev.start (0.025);
1530#endif 1564#endif
1531 mapped = 1; 1565 mapped = 1;
1532#ifdef TEXT_BLINK 1566#ifdef TEXT_BLINK
1533 text_blink_ev.start (); 1567 text_blink_ev.start ();
… …
1625 1659
1626#ifdef SELECTION_SCROLLING 1660#ifdef SELECTION_SCROLLING
1627 if (ev.xbutton.y < int_bwidth 1661 if (ev.xbutton.y < int_bwidth
1628 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1662 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1629 { 1663 {
1664 page_dirn scroll_selection_dir;
1630 int dist; 1665 int dist;
1631 1666
1632 /* don't clobber the current delay if we are 1667 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1668 * already in the middle of scrolling.
1634 */ 1669 */
… …
1657 scroll_selection_lines = Pixel2Height (dist) 1692 scroll_selection_lines = Pixel2Height (dist)
1658 / SELECTION_SCROLL_LINE_SPEEDUP 1693 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1; 1694 + 1;
1660 min_it (scroll_selection_lines, 1695 min_it (scroll_selection_lines,
1661 SELECTION_SCROLL_MAX_LINES); 1696 SELECTION_SCROLL_MAX_LINES);
1697 scroll_selection_lines *= scroll_selection_dir;
1662 } 1698 }
1663 else 1699 else
1664 { 1700 {
1665 /* we are within the text window, so we 1701 /* we are within the text window, so we
1666 * shouldn't be scrolling 1702 * shouldn't be scrolling
… …
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1856 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 } 1857 }
1822#endif 1858#endif
1823} 1859}
1824 1860
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL 1861#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1826void ecb_hot 1862void ecb_hot
1827rxvt_term::rootwin_cb (XEvent &ev) 1863rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1864{
1829 make_current (); 1865 make_current ();
1830 1866
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1867 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1868 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1869 return;
1834 1870
1835# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1871 switch (ev.type)
1837 { 1872 {
1838 case PropertyNotify: 1873 case PropertyNotify:
1839 /* 1874 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1875 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1876 * use the property to determine the pixmap. We use it later on.
1842 */ 1877 */
1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1878 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1879 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 { 1880 {
1846 bg_set_root_pixmap (); 1881#if BG_IMAGE_FROM_ROOT
1882 if (option (Opt_transparent))
1883 {
1884 rxvt_img::new_from_root (this)->replace (root_img);
1847 update_background (); 1885 update_background ();
1886 }
1887#endif
1888 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1848 } 1889 }
1849 1890
1850 break; 1891 break;
1851 } 1892 }
1852# endif
1853 1893
1854 refresh_check (); 1894 refresh_check ();
1855} 1895}
1856#endif 1896#endif
1857 1897
… …
2178 2218
2179#ifdef MOUSE_WHEEL 2219#ifdef MOUSE_WHEEL
2180 case Button4: 2220 case Button4:
2181 case Button5: 2221 case Button5:
2182 { 2222 {
2183 int i; 2223 int lines;
2184 page_dirn v; 2224 page_dirn dirn;
2185 2225
2186 v = ev.button == Button4 ? UP : DN; 2226 dirn = ev.button == Button4 ? UP : DN;
2187 2227
2188 if (ev.state & ShiftMask) 2228 if (ev.state & ShiftMask)
2189 i = 1; 2229 lines = 1;
2190 else if (option (Opt_mouseWheelScrollPage)) 2230 else if (option (Opt_mouseWheelScrollPage))
2191 i = nrow - 1; 2231 lines = nrow - 1;
2192 else 2232 else
2193 i = 5; 2233 lines = 5;
2194 2234
2195# ifdef MOUSE_SLIP_WHEELING 2235# ifdef MOUSE_SLIP_WHEELING
2196 if (ev.state & ControlMask) 2236 if (ev.state & ControlMask)
2197 { 2237 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2238 mouse_slip_wheel_speed += dirn;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2239 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2240
2202 if (!slip_wheel_ev.is_active ()) 2241 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2242 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204 } 2243 }
2205 else 2244 else
2206# endif 2245# endif
2207 { 2246 {
2208 scr_page (v, i); 2247 scr_page (dirn, lines);
2209 scrollBar.show (1); 2248 scrollBar.show (1);
2210 } 2249 }
2211 } 2250 }
2212 break; 2251 break;
2213#endif 2252#endif
… …
2366 } 2405 }
2367 2406
2368 if (len == (size_t)-1) 2407 if (len == (size_t)-1)
2369 { 2408 {
2370 mbstate.reset (); // reset now undefined conversion state 2409 mbstate.reset (); // reset now undefined conversion state
2410 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2411 // in which case we "erroneously" return the next byte which might be valid.
2371 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2412 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372 } 2413 }
2373 2414
2374 // assume wchar == unicode 2415 // assume wchar == unicode
2375 cmdbuf_ptr += len; 2416 cmdbuf_ptr += len;
… …
2780 }; 2821 };
2781 2822
2782void ecb_hot 2823void ecb_hot
2783rxvt_term::process_csi_seq () 2824rxvt_term::process_csi_seq ()
2784{ 2825{
2785 unicode_t ch, priv, i; 2826 unicode_t ch, priv, prev_ch, i;
2786 unsigned int nargs, p; 2827 unsigned int nargs, p;
2787 int n, ndef; 2828 int n, ndef;
2788 int arg[ESC_ARGS] = { }; 2829 int arg[ESC_ARGS] = { };
2789 2830
2790 nargs = 0; 2831 nargs = 0;
… …
2796 /* '<' '=' '>' '?' '!' */ 2837 /* '<' '=' '>' '?' '!' */
2797 priv = ch; 2838 priv = ch;
2798 ch = cmd_getc (); 2839 ch = cmd_getc ();
2799 } 2840 }
2800 2841
2842 prev_ch = 0;
2801 /* read any numerical arguments */ 2843 /* read any numerical arguments */
2802 for (n = -1; ch < CSI_ICH; ) 2844 for (n = -1; ch < CSI_ICH; )
2803 { 2845 {
2804 if (isdigit (ch)) 2846 if (isdigit (ch))
2805 { 2847 {
… …
2815 n = -1; 2857 n = -1;
2816 } 2858 }
2817 else if (IS_CONTROL (ch)) 2859 else if (IS_CONTROL (ch))
2818 process_nonprinting (ch); 2860 process_nonprinting (ch);
2819 2861
2862 prev_ch = ch;
2820 ch = cmd_getc (); 2863 ch = cmd_getc ();
2821 } 2864 }
2822 2865
2823 if (ch > CSI_7F) 2866 if (ch > CSI_7F)
2824 return; 2867 return;
… …
3058 scr_insert_mode (1); 3101 scr_insert_mode (1);
3059 else if (arg[0] == 20) 3102 else if (arg[0] == 20)
3060 priv_modes |= PrivMode_LFNL; 3103 priv_modes |= PrivMode_LFNL;
3061 break; 3104 break;
3062 3105
3106 case CSI_71: // DESCUSR: set cursor style
3107 if (prev_ch == ' ')
3108 set_cursor_style (arg[0]);
3109 break;
3110
3063 /* 3111 /*
3064 * PRIVATE USE beyond this point. All CSI_7? sequences here 3112 * PRIVATE USE beyond this point. All CSI_7? sequences here
3065 */ 3113 */
3066 case CSI_72: /* DECSTBM: set top and bottom margins */ 3114 case CSI_72: /* DECSTBM: set top and bottom margins */
3067 if (nargs == 1) 3115 if (nargs == 1)
… …
3200rxvt_term::get_to_st (unicode_t &ends_how) 3248rxvt_term::get_to_st (unicode_t &ends_how)
3201{ 3249{
3202 unicode_t ch; 3250 unicode_t ch;
3203 bool seen_esc = false; 3251 bool seen_esc = false;
3204 unsigned int n = 0; 3252 unsigned int n = 0;
3205 wchar_t string[STRING_MAX]; 3253 wchar_t string[CBUFSIZ];
3206 3254
3207 while ((ch = cmd_getc ()) != NOCHAR) 3255 while ((ch = cmd_getc ()) != NOCHAR)
3208 { 3256 {
3209 if (seen_esc) 3257 if (seen_esc)
3210 { 3258 {
… …
3225 else if (ch < 0x20) 3273 else if (ch < 0x20)
3226 return NULL; /* other control character - exit */ 3274 return NULL; /* other control character - exit */
3227 3275
3228 seen_esc = false; 3276 seen_esc = false;
3229 3277
3230 if (n >= STRING_MAX - 1) 3278 if (n >= sizeof (string) - 1)
3231 // stop at some sane length 3279 // stop at some sane length
3232 return NULL; 3280 return NULL;
3233 3281
3234 string[n++] = ch; 3282 string[n++] = ch;
3235 } 3283 }
… …
3352 &nitems, &bytes_after, &value) == Success 3400 &nitems, &bytes_after, &value) == Success
3353 && actual_type != None 3401 && actual_type != None
3354 && actual_format == 8) 3402 && actual_format == 8)
3355 str = (const char *)(value); 3403 str = (const char *)(value);
3356 3404
3357 tt_printf ("\033]%d;%s%c", op, str, resp); 3405 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3358 3406
3359 XFree (value); 3407 XFree (value);
3360 } 3408 }
3361 else 3409 else
3362 { 3410 {
… …
3430 break; 3478 break;
3431#endif 3479#endif
3432 case URxvt_Color_border: 3480 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp); 3481 process_color_seq (op, Color_border, str, resp);
3434 break; 3482 break;
3435#if ENABLE_TRANSPARENCY 3483
3484#if BG_IMAGE_FROM_ROOT
3436 case URxvt_Color_tint: 3485 case URxvt_Color_tint:
3437 process_color_seq (op, Color_tint, str, resp); 3486 process_color_seq (op, Color_tint, str, resp);
3438 { 3487 {
3439 bool changed = false; 3488 bool changed = false;
3440 3489
… …
3451#if BG_IMAGE_FROM_FILE 3500#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3501 case Rxvt_Pixmap:
3453 if (!strcmp (str, "?")) 3502 if (!strcmp (str, "?"))
3454 { 3503 {
3455 char str[256]; 3504 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale; 3505 int h_scale = fimage.h_scale;
3461 v_scale = image_vec[0].v_scale; 3506 int v_scale = fimage.v_scale;
3462 h_align = image_vec[0].h_align; 3507 int h_align = fimage.h_align;
3463 v_align = image_vec[0].v_align; 3508 int v_align = fimage.v_align;
3464 }
3465 3509
3466 sprintf (str, "[%dx%d+%d+%d]", 3510 sprintf (str, "[%dx%d+%d+%d]",
3467 h_scale, v_scale, 3511 h_scale, v_scale,
3468 h_align, v_align); 3512 h_align, v_align);
3469 process_xterm_seq (XTerm_title, str, CHAR_ST); 3513 process_xterm_seq (XTerm_title, str, CHAR_ST);
… …
3472 { 3516 {
3473 bool changed = false; 3517 bool changed = false;
3474 3518
3475 if (*str != ';') 3519 if (*str != ';')
3476 { 3520 {
3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else 3521 try
3480 { 3522 {
3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str)) 3523 fimage.set_file_geometry (this, str);
3483 image_vec.pop_back ();
3484 else
3485 changed = true; 3524 changed = true;
3525 }
3526 catch (const class rxvt_failure_exception &e)
3527 {
3486 } 3528 }
3487 } 3529 }
3488 else 3530 else
3489 { 3531 {
3490 str++; 3532 str++;
3491 if (image_vec.size () > 0)
3492 changed = image_vec[0].set_geometry (str, true); 3533 if (fimage.set_geometry (str, true))
3534 changed = true;
3493 } 3535 }
3494 3536
3495 if (changed) 3537 if (changed)
3496 { 3538 {
3497 if (bg_window_position_sensitive ()) 3539 if (bg_window_position_sensitive ())
3498 { 3540 {
3499 int x, y; 3541 int x, y;
3500 get_window_origin (x, y); 3542 get_window_origin (x, y);
3501 bg_set_position (x, y); 3543 parent_x = x;
3544 parent_y = y;
3502 } 3545 }
3503 update_background (); 3546 update_background ();
3504 } 3547 }
3505 } 3548 }
3506 break; 3549 break;
… …
3977 break; 4020 break;
3978#endif 4021#endif
3979 } 4022 }
3980 } 4023 }
3981} 4024}
4025
4026void
4027rxvt_term::set_cursor_style (int style)
4028{
4029 if (!IN_RANGE_INC (style, 0, 4))
4030 return;
4031
4032 set_option (Opt_cursorUnderline, style >= 3);
4033
4034#ifdef CURSOR_BLINK
4035 set_option (Opt_cursorBlink, !style || (style & 1));
4036 cursor_blink_reset ();
4037#endif
4038
4039 want_refresh = 1;
4040}
3982/*}}} */ 4041/*}}} */
3983 4042
3984/* ------------------------------------------------------------------------- */ 4043/* ------------------------------------------------------------------------- */
3985 4044
3986/* 4045/*
… …
3997 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4056 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3998 va_end (arg_ptr); 4057 va_end (arg_ptr);
3999 tt_write (buf, strlen (buf)); 4058 tt_write (buf, strlen (buf));
4000} 4059}
4001 4060
4061/* Write data to the pty as typed by the user. */
4062void
4063rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4064{
4065 if (option (Opt_scrollTtyKeypress))
4066 if (view_start)
4067 {
4068 view_start = 0;
4069 want_refresh = 1;
4070 }
4071
4072 tt_write (data, len);
4073}
4074
4002/* ---------------------------------------------------------------------- */ 4075/* ---------------------------------------------------------------------- */
4003/* Write data to the pty as typed by the user, pasted with the mouse, 4076/* Write data to the pty as typed by the user, pasted with the mouse,
4004 * or generated by us in response to a query ESC sequence. 4077 * or generated by us in response to a query ESC sequence.
4005 */ 4078 */
4006static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4079static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT

Diff Legend

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