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.551 by sf-exg, Wed Jul 16 14:29:23 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 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
… …
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 KeySym orig_keysym = keysym;
502
503 /* Shift + F1 - F10 generates F11 - F20 */
504 if (shft && keysym >= XK_F1 && keysym <= XK_F10)
505 {
506 keysym += (XK_F11 - XK_F1);
507 shft = 0; /* turn off Shift */
508 }
509
510 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
511 {
512 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
513 unsigned int newlen = 1;
514
515 if (ev.state & ModNumLockMask)
516 kp = false;
517
518 keysym = translate_keypad (keysym, kp);
519
520 switch (keysym)
521 {
522#ifndef NO_BACKSPACE_KEY
523 case XK_BackSpace:
524 if (priv_modes & PrivMode_HaveBackSpace)
525 {
526 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
527 ^ !!ctrl) ? '\b' : '\177';
528 kbuf[1] = '\0';
529 }
530 else
531 strcpy (kbuf, rs[Rs_backspace_key]);
532 break;
533#endif
534#ifndef NO_DELETE_KEY
535 case XK_Delete:
536 strcpy (kbuf, rs[Rs_delete_key]);
537 break;
538#endif
539 case XK_Tab:
540 if (shft)
541 strcpy (kbuf, "\033[Z");
542 else
543 {
544#ifdef CTRL_TAB_MAKES_META
545 if (ctrl)
546 meta = 1;
547#endif
548#ifdef MOD4_TAB_MAKES_META
549 if (ev.state & Mod4Mask)
550 meta = 1;
551#endif
552 newlen = 0;
553 }
554 break;
555
556 case XK_Up: /* "\033[A" */
557 case XK_Down: /* "\033[B" */
558 case XK_Right: /* "\033[C" */
559 case XK_Left: /* "\033[D" */
560 strcpy (kbuf, "\033[Z");
561 kbuf[2] = "DACB"[keysym - XK_Left];
562 /* do Shift first */
563 if (shft)
564 kbuf[2] = "dacb"[keysym - XK_Left];
565 else if (ctrl)
566 {
567 kbuf[1] = 'O';
568 kbuf[2] = "dacb"[keysym - XK_Left];
569 }
570 else if (priv_modes & PrivMode_aplCUR)
571 kbuf[1] = 'O';
572 break;
573
574 case XK_KP_Enter:
575 /* allow shift to override */
576 if (kp)
577 {
578 strcpy (kbuf, "\033OM");
579 break;
580 }
581
582 /* FALLTHROUGH */
583
584 case XK_Return:
585 if (priv_modes & PrivMode_LFNL)
586 {
587 kbuf[0] = '\015';
588 kbuf[1] = '\012';
589 kbuf[2] = '\0';
590 }
591 else
592 {
593 kbuf[0] = '\015';
594 kbuf[1] = '\0';
595 }
596 break;
597
598 case XK_KP_F1: /* "\033OP" */
599 case XK_KP_F2: /* "\033OQ" */
600 case XK_KP_F3: /* "\033OR" */
601 case XK_KP_F4: /* "\033OS" */
602 strcpy (kbuf, "\033OP");
603 kbuf[2] += (keysym - XK_KP_F1);
604 break;
605
606 case XK_KP_Multiply: /* "\033Oj" : "*" */
607 case XK_KP_Add: /* "\033Ok" : "+" */
608 case XK_KP_Separator: /* "\033Ol" : "," */
609 case XK_KP_Subtract: /* "\033Om" : "-" */
610 case XK_KP_Decimal: /* "\033On" : "." */
611 case XK_KP_Divide: /* "\033Oo" : "/" */
612 case XK_KP_0: /* "\033Op" : "0" */
613 case XK_KP_1: /* "\033Oq" : "1" */
614 case XK_KP_2: /* "\033Or" : "2" */
615 case XK_KP_3: /* "\033Os" : "3" */
616 case XK_KP_4: /* "\033Ot" : "4" */
617 case XK_KP_5: /* "\033Ou" : "5" */
618 case XK_KP_6: /* "\033Ov" : "6" */
619 case XK_KP_7: /* "\033Ow" : "7" */
620 case XK_KP_8: /* "\033Ox" : "8" */
621 case XK_KP_9: /* "\033Oy" : "9" */
622 /* allow shift to override */
623 if (kp)
624 {
625 strcpy (kbuf, "\033Oj");
626 kbuf[2] += (keysym - XK_KP_Multiply);
627 }
628 else
629 {
630 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
631 kbuf[1] = '\0';
632 }
633 break;
634
635 default:
636 {
637 int param = map_function_key (keysym);
638 if (param > 0)
639 sprintf (kbuf,"\033[%d~", param);
640 else
641 newlen = 0;
642 }
643 break;
644 }
645
646 if (newlen)
647 len = strlen (kbuf);
648
649 if (len > 0)
650 {
651 /*
652 * pass Shift/Control indicators for function keys ending with `~'
653 *
654 * eg,
655 * Prior = "ESC[5~"
656 * Shift+Prior = "ESC[5$"
657 * Ctrl+Prior = "ESC[5^"
658 * Ctrl+Shift+Prior = "ESC[5@"
659 */
660 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
661 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
662
663 /*
664 * Pass meta for all function keys, if 'meta' option set
665 */
666#ifdef META8_OPTION
667 if (meta && (meta_char == 0x80))
668 kbuf[len - 1] |= 0x80;
669#endif
670 }
671
672 }
673 else if (ctrl && keysym == XK_minus)
674 {
675 len = 1;
676 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
677 }
678 else if (keysym == XK_ISO_Left_Tab)
679 {
680 strcpy (kbuf, "\033[Z");
681 len = 3;
682 }
683 else
684 {
685#ifdef META8_OPTION
686 /* set 8-bit on */
687 if (meta && (meta_char == 0x80))
688 {
689 char *ch;
690
691 for (ch = kbuf; ch < kbuf + len; ch++)
692 *ch |= 0x80;
693
694 meta = 0;
695 }
696#endif
697 /* nil */ ;
698 }
699
700 keysym = orig_keysym;
701 }
702
703 /* escape prefix */
704 if (len && meta
705#ifdef META8_OPTION
706 && meta_char == C0_ESC
707#endif
708 )
709 {
710 *--kbuf = C0_ESC;
711 len++;
712 }
713
714 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
715 return;
716
717 if (valid_keysym)
718 {
487#ifdef KEYSYM_RESOURCE 719#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 720 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 721 return;
490#endif 722#endif
491 723
492 if (saveLines) 724 if (saveLines)
493 { 725 {
… …
506#endif 738#endif
507 max_it (lnsppg, 1); 739 max_it (lnsppg, 1);
508 740
509 if (keysym == XK_Prior) 741 if (keysym == XK_Prior)
510 { 742 {
511 scr_page (UP, lnsppg); 743 scr_page (lnsppg);
512 return; 744 return;
513 } 745 }
514 else if (keysym == XK_Next) 746 else if (keysym == XK_Next)
515 { 747 {
516 scr_page (DN, lnsppg); 748 scr_page (-lnsppg);
517 return; 749 return;
518 } 750 }
519 } 751 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 752#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 753 if (IS_SCROLL_MOD)
522 { 754 {
523 if (keysym == XK_Up) 755 if (keysym == XK_Up)
524 { 756 {
525 scr_page (UP, 1); 757 scr_page (1);
526 return; 758 return;
527 } 759 }
528 else if (keysym == XK_Down) 760 else if (keysym == XK_Down)
529 { 761 {
530 scr_page (DN, 1); 762 scr_page (-1);
531 return; 763 return;
532 } 764 }
533 } 765 }
534#endif 766#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 767#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 768 if (IS_SCROLL_MOD)
537 { 769 {
538 if (keysym == XK_Home) 770 if (keysym == XK_Home)
539 { 771 {
540 scr_move_to (0, 1); 772 scr_changeview (top_row);
541 return; 773 return;
542 } 774 }
543 else if (keysym == XK_End) 775 else if (keysym == XK_End)
544 { 776 {
545 scr_move_to (1, 1); 777 scr_changeview (0);
546 return; 778 return;
547 } 779 }
548 } 780 }
549#endif 781#endif
550 } 782 }
551 783
552 if (shft) 784 if (shft)
553 { 785 {
554 /* Shift + F1 - F10 generates F11 - F20 */
555 if (keysym >= XK_F1 && keysym <= XK_F10)
556 {
557 keysym += (XK_F11 - XK_F1);
558 shft = 0; /* turn off Shift */
559 }
560 else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) 786 if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys))
561 { 787 {
562 switch (keysym) 788 switch (keysym)
563 { 789 {
564 /* normal XTerm key bindings */ 790 /* normal XTerm key bindings */
565 case XK_Insert: /* Shift+Insert = paste mouse selection */ 791 case XK_Insert: /* Shift+Insert = paste mouse selection */
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 798 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 799 return;
574#endif 800#endif
575 } 801 }
576 } 802 }
803 }
804
805 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
806 {
807 if (keysym == XK_v)
808 selection_request (ev.time, Sel_Clipboard);
809 else if (selection.len > 0)
810 {
811 free (selection.clip_text);
812 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
813 selection.clip_len = selection.len;
814 selection_grab (CurrentTime, true);
815 }
816
817 return;
577 } 818 }
578 819
579#if ENABLE_FRILLS || ISO_14755 820#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 821 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 877 {
637 scr_printscreen (ctrl | shft); 878 scr_printscreen (ctrl | shft);
638 return; 879 return;
639 } 880 }
640#endif 881#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 } 882 }
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 883
836 if (len <= 0) 884 if (len <= 0)
837 return; /* not mapped */ 885 return; /* not mapped */
838 886
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); 887 tt_write_user_input (kbuf, (unsigned int)len);
858} 888}
859 889
860void ecb_cold 890void ecb_cold
861rxvt_term::key_release (XKeyEvent &ev) 891rxvt_term::key_release (XKeyEvent &ev)
862{ 892{
… …
937void 967void
938rxvt_term::flush () 968rxvt_term::flush ()
939{ 969{
940 flush_ev.stop (); 970 flush_ev.stop ();
941 971
942#ifdef HAVE_BG_PIXMAP 972#ifdef HAVE_IMG
943 if (bg_flags & BG_NEEDS_REFRESH) 973 if (bg_flags & BG_NEEDS_REFRESH)
944 { 974 {
945 bg_flags &= ~BG_NEEDS_REFRESH; 975 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false); 976 scr_touch (false);
947 } 977 }
… …
1073 1103
1074#ifdef SELECTION_SCROLLING 1104#ifdef SELECTION_SCROLLING
1075void 1105void
1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1106rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077{ 1107{
1078 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1108 if (scr_page (scroll_selection_lines))
1079 { 1109 {
1080 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1110 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081 want_refresh = 1; 1111 want_refresh = 1;
1082 refresh_check (); 1112 refresh_check ();
1083 } 1113 }
… …
1088 1118
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1119#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1120void
1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1121rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1122{
1093 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1123 if (scr_page (mouse_slip_wheel_speed))
1094 { 1124 {
1095 want_refresh = 1; 1125 want_refresh = 1;
1096 refresh_check (); 1126 refresh_check ();
1097 } 1127 }
1098 1128
… …
1461 if (ev.xconfigure.window == parent) 1491 if (ev.xconfigure.window == parent)
1462 { 1492 {
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1493 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1494 ;
1465 1495
1496 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1497
1498 bool moved = false;
1466#ifdef HAVE_BG_PIXMAP 1499#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ()) 1500 if (bg_window_position_sensitive ())
1469 { 1501 {
1502 want_position_change = true;
1503 if (bg_img == 0)
1504 moved = true;
1505 }
1506#endif
1507
1508 if (want_position_change)
1509 {
1470 int x, y; 1510 int x, y;
1511
1471 if (ev.xconfigure.send_event) 1512 if (ev.xconfigure.send_event)
1472 { 1513 {
1473 x = ev.xconfigure.x; 1514 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y; 1515 y = ev.xconfigure.y;
1475 } 1516 }
1476 else 1517 else
1477 get_window_origin (x, y); 1518 get_window_origin (x, y);
1478 1519
1479 if (bg_set_position (x, y) 1520 if (x != parent_x || y != parent_y)
1480 || !(bg_flags & BG_IS_VALID)) 1521 {
1522 parent_x = x;
1523 parent_y = y;
1524 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1481 moved = true; 1525 moved = true;
1526 }
1482 } 1527 }
1483#endif
1484 1528
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1529 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1530 {
1487 seen_resize = 1; 1531 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1532 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1511 selection_send (ev.xselectionrequest); 1555 selection_send (ev.xselectionrequest);
1512 break; 1556 break;
1513 1557
1514 case MapNotify: 1558 case MapNotify:
1515#ifdef HAVE_BG_PIXMAP 1559#ifdef HAVE_BG_PIXMAP
1516 /* This is needed specifically to fix the case of no window manager or a 1560 // This is needed at startup for the case of no window manager
1517 * non-reparenting window manager. In those cases we never get first 1561 // or a non-reparenting window manager and also because we
1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1562 // defer bg image updates if the window is not mapped. The
1519 * care of multiplicity of ConfigureNotify events arriving while WM does 1563 // short delay is to optimize for multiple ConfigureNotify
1520 * reparenting. 1564 // events at startup when the window manager reparents the
1521 * We should not render background immediately, as there could be several 1565 // 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 1566 // received all of them.
1523 * by scheduling background redraw as soon as we can, but giving a short 1567 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); 1568 update_background_ev.start (0.025);
1530#endif 1569#endif
1531 mapped = 1; 1570 mapped = 1;
1532#ifdef TEXT_BLINK 1571#ifdef TEXT_BLINK
1533 text_blink_ev.start (); 1572 text_blink_ev.start ();
… …
1625 1664
1626#ifdef SELECTION_SCROLLING 1665#ifdef SELECTION_SCROLLING
1627 if (ev.xbutton.y < int_bwidth 1666 if (ev.xbutton.y < int_bwidth
1628 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1667 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1629 { 1668 {
1669 page_dirn scroll_selection_dir;
1630 int dist; 1670 int dist;
1631 1671
1632 /* don't clobber the current delay if we are 1672 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1673 * already in the middle of scrolling.
1634 */ 1674 */
… …
1657 scroll_selection_lines = Pixel2Height (dist) 1697 scroll_selection_lines = Pixel2Height (dist)
1658 / SELECTION_SCROLL_LINE_SPEEDUP 1698 / SELECTION_SCROLL_LINE_SPEEDUP
1659 + 1; 1699 + 1;
1660 min_it (scroll_selection_lines, 1700 min_it (scroll_selection_lines,
1661 SELECTION_SCROLL_MAX_LINES); 1701 SELECTION_SCROLL_MAX_LINES);
1702 scroll_selection_lines *= scroll_selection_dir;
1662 } 1703 }
1663 else 1704 else
1664 { 1705 {
1665 /* we are within the text window, so we 1706 /* we are within the text window, so we
1666 * shouldn't be scrolling 1707 * shouldn't be scrolling
… …
1820 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1861 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1821 } 1862 }
1822#endif 1863#endif
1823} 1864}
1824 1865
1825#if ENABLE_TRANSPARENCY || ENABLE_PERL 1866#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1826void ecb_hot 1867void ecb_hot
1827rxvt_term::rootwin_cb (XEvent &ev) 1868rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1869{
1829 make_current (); 1870 make_current ();
1830 1871
1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1872 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1832 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1873 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1833 return; 1874 return;
1834 1875
1835# if ENABLE_TRANSPARENCY
1836 switch (ev.type) 1876 switch (ev.type)
1837 { 1877 {
1838 case PropertyNotify: 1878 case PropertyNotify:
1839 /* 1879 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1880 * 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. 1881 * use the property to determine the pixmap. We use it later on.
1842 */ 1882 */
1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1883 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1884 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 { 1885 {
1846 bg_set_root_pixmap (); 1886#if BG_IMAGE_FROM_ROOT
1887 if (option (Opt_transparent))
1888 {
1889 rxvt_img::new_from_root (this)->replace (root_img);
1847 update_background (); 1890 update_background ();
1891 }
1892#endif
1893 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1848 } 1894 }
1849 1895
1850 break; 1896 break;
1851 } 1897 }
1852# endif
1853 1898
1854 refresh_check (); 1899 refresh_check ();
1855} 1900}
1856#endif 1901#endif
1857 1902
… …
2178 2223
2179#ifdef MOUSE_WHEEL 2224#ifdef MOUSE_WHEEL
2180 case Button4: 2225 case Button4:
2181 case Button5: 2226 case Button5:
2182 { 2227 {
2183 int i; 2228 int lines;
2184 page_dirn v; 2229 page_dirn dirn;
2185 2230
2186 v = ev.button == Button4 ? UP : DN; 2231 dirn = ev.button == Button4 ? UP : DN;
2187 2232
2188 if (ev.state & ShiftMask) 2233 if (ev.state & ShiftMask)
2189 i = 1; 2234 lines = 1;
2190 else if (option (Opt_mouseWheelScrollPage)) 2235 else if (option (Opt_mouseWheelScrollPage))
2191 i = nrow - 1; 2236 lines = nrow - 1;
2192 else 2237 else
2193 i = 5; 2238 lines = 5;
2194 2239
2195# ifdef MOUSE_SLIP_WHEELING 2240# ifdef MOUSE_SLIP_WHEELING
2196 if (ev.state & ControlMask) 2241 if (ev.state & ControlMask)
2197 { 2242 {
2198 mouse_slip_wheel_speed += v ? -1 : 1; 2243 mouse_slip_wheel_speed += dirn;
2199 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2244 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2200 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2201 2245
2202 if (!slip_wheel_ev.is_active ()) 2246 if (!slip_wheel_ev.is_active ())
2203 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2247 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2204 } 2248 }
2205 else 2249 else
2206# endif 2250# endif
2207 { 2251 {
2208 scr_page (v, i); 2252 scr_page (dirn, lines);
2209 scrollBar.show (1); 2253 scrollBar.show (1);
2210 } 2254 }
2211 } 2255 }
2212 break; 2256 break;
2213#endif 2257#endif
… …
2366 } 2410 }
2367 2411
2368 if (len == (size_t)-1) 2412 if (len == (size_t)-1)
2369 { 2413 {
2370 mbstate.reset (); // reset now undefined conversion state 2414 mbstate.reset (); // reset now undefined conversion state
2415 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2416 // 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 2417 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2372 } 2418 }
2373 2419
2374 // assume wchar == unicode 2420 // assume wchar == unicode
2375 cmdbuf_ptr += len; 2421 cmdbuf_ptr += len;
… …
2780 }; 2826 };
2781 2827
2782void ecb_hot 2828void ecb_hot
2783rxvt_term::process_csi_seq () 2829rxvt_term::process_csi_seq ()
2784{ 2830{
2785 unicode_t ch, priv, i; 2831 unicode_t ch, priv, prev_ch, i;
2786 unsigned int nargs, p; 2832 unsigned int nargs, p;
2787 int n, ndef; 2833 int n, ndef;
2788 int arg[ESC_ARGS] = { }; 2834 int arg[ESC_ARGS] = { };
2789 2835
2790 nargs = 0; 2836 nargs = 0;
… …
2796 /* '<' '=' '>' '?' '!' */ 2842 /* '<' '=' '>' '?' '!' */
2797 priv = ch; 2843 priv = ch;
2798 ch = cmd_getc (); 2844 ch = cmd_getc ();
2799 } 2845 }
2800 2846
2847 prev_ch = 0;
2801 /* read any numerical arguments */ 2848 /* read any numerical arguments */
2802 for (n = -1; ch < CSI_ICH; ) 2849 for (n = -1; ch < CSI_ICH; )
2803 { 2850 {
2804 if (isdigit (ch)) 2851 if (isdigit (ch))
2805 { 2852 {
… …
2815 n = -1; 2862 n = -1;
2816 } 2863 }
2817 else if (IS_CONTROL (ch)) 2864 else if (IS_CONTROL (ch))
2818 process_nonprinting (ch); 2865 process_nonprinting (ch);
2819 2866
2867 prev_ch = ch;
2820 ch = cmd_getc (); 2868 ch = cmd_getc ();
2821 } 2869 }
2822 2870
2823 if (ch > CSI_7F) 2871 if (ch > CSI_7F)
2824 return; 2872 return;
… …
3058 scr_insert_mode (1); 3106 scr_insert_mode (1);
3059 else if (arg[0] == 20) 3107 else if (arg[0] == 20)
3060 priv_modes |= PrivMode_LFNL; 3108 priv_modes |= PrivMode_LFNL;
3061 break; 3109 break;
3062 3110
3111 case CSI_71: // DESCUSR: set cursor style
3112 if (prev_ch == ' ')
3113 set_cursor_style (arg[0]);
3114 break;
3115
3063 /* 3116 /*
3064 * PRIVATE USE beyond this point. All CSI_7? sequences here 3117 * PRIVATE USE beyond this point. All CSI_7? sequences here
3065 */ 3118 */
3066 case CSI_72: /* DECSTBM: set top and bottom margins */ 3119 case CSI_72: /* DECSTBM: set top and bottom margins */
3067 if (nargs == 1) 3120 if (nargs == 1)
… …
3200rxvt_term::get_to_st (unicode_t &ends_how) 3253rxvt_term::get_to_st (unicode_t &ends_how)
3201{ 3254{
3202 unicode_t ch; 3255 unicode_t ch;
3203 bool seen_esc = false; 3256 bool seen_esc = false;
3204 unsigned int n = 0; 3257 unsigned int n = 0;
3205 wchar_t string[STRING_MAX]; 3258 wchar_t string[CBUFSIZ];
3206 3259
3207 while ((ch = cmd_getc ()) != NOCHAR) 3260 while ((ch = cmd_getc ()) != NOCHAR)
3208 { 3261 {
3209 if (seen_esc) 3262 if (seen_esc)
3210 { 3263 {
… …
3225 else if (ch < 0x20) 3278 else if (ch < 0x20)
3226 return NULL; /* other control character - exit */ 3279 return NULL; /* other control character - exit */
3227 3280
3228 seen_esc = false; 3281 seen_esc = false;
3229 3282
3230 if (n >= STRING_MAX - 1) 3283 if (n >= sizeof (string) - 1)
3231 // stop at some sane length 3284 // stop at some sane length
3232 return NULL; 3285 return NULL;
3233 3286
3234 string[n++] = ch; 3287 string[n++] = ch;
3235 } 3288 }
… …
3352 &nitems, &bytes_after, &value) == Success 3405 &nitems, &bytes_after, &value) == Success
3353 && actual_type != None 3406 && actual_type != None
3354 && actual_format == 8) 3407 && actual_format == 8)
3355 str = (const char *)(value); 3408 str = (const char *)(value);
3356 3409
3357 tt_printf ("\033]%d;%s%c", op, str, resp); 3410 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3358 3411
3359 XFree (value); 3412 XFree (value);
3360 } 3413 }
3361 else 3414 else
3362 { 3415 {
… …
3430 break; 3483 break;
3431#endif 3484#endif
3432 case URxvt_Color_border: 3485 case URxvt_Color_border:
3433 process_color_seq (op, Color_border, str, resp); 3486 process_color_seq (op, Color_border, str, resp);
3434 break; 3487 break;
3435#if ENABLE_TRANSPARENCY 3488
3489#if BG_IMAGE_FROM_ROOT
3436 case URxvt_Color_tint: 3490 case URxvt_Color_tint:
3437 process_color_seq (op, Color_tint, str, resp); 3491 process_color_seq (op, Color_tint, str, resp);
3438 { 3492 {
3439 bool changed = false; 3493 bool changed = false;
3440 3494
… …
3451#if BG_IMAGE_FROM_FILE 3505#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3506 case Rxvt_Pixmap:
3453 if (!strcmp (str, "?")) 3507 if (!strcmp (str, "?"))
3454 { 3508 {
3455 char str[256]; 3509 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; 3510 int h_scale = fimage.h_scale;
3461 v_scale = image_vec[0].v_scale; 3511 int v_scale = fimage.v_scale;
3462 h_align = image_vec[0].h_align; 3512 int h_align = fimage.h_align;
3463 v_align = image_vec[0].v_align; 3513 int v_align = fimage.v_align;
3464 }
3465 3514
3466 sprintf (str, "[%dx%d+%d+%d]", 3515 sprintf (str, "[%dx%d+%d+%d]",
3467 h_scale, v_scale, 3516 h_scale, v_scale,
3468 h_align, v_align); 3517 h_align, v_align);
3469 process_xterm_seq (XTerm_title, str, CHAR_ST); 3518 process_xterm_seq (XTerm_title, str, CHAR_ST);
… …
3472 { 3521 {
3473 bool changed = false; 3522 bool changed = false;
3474 3523
3475 if (*str != ';') 3524 if (*str != ';')
3476 { 3525 {
3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else 3526 try
3480 { 3527 {
3481 rxvt_image *image = new_image ();
3482 if (!image->set_file_geometry (str)) 3528 fimage.set_file_geometry (this, str);
3483 image_vec.pop_back ();
3484 else
3485 changed = true; 3529 changed = true;
3530 }
3531 catch (const class rxvt_failure_exception &e)
3532 {
3486 } 3533 }
3487 } 3534 }
3488 else 3535 else
3489 { 3536 {
3490 str++; 3537 str++;
3491 if (image_vec.size () > 0)
3492 changed = image_vec[0].set_geometry (str, true); 3538 if (fimage.set_geometry (str, true))
3539 changed = true;
3493 } 3540 }
3494 3541
3495 if (changed) 3542 if (changed)
3496 { 3543 {
3497 if (bg_window_position_sensitive ()) 3544 if (bg_window_position_sensitive ())
3498 { 3545 {
3499 int x, y; 3546 int x, y;
3500 get_window_origin (x, y); 3547 get_window_origin (x, y);
3501 bg_set_position (x, y); 3548 parent_x = x;
3549 parent_y = y;
3502 } 3550 }
3503 update_background (); 3551 update_background ();
3504 } 3552 }
3505 } 3553 }
3506 break; 3554 break;
… …
3977 break; 4025 break;
3978#endif 4026#endif
3979 } 4027 }
3980 } 4028 }
3981} 4029}
4030
4031void
4032rxvt_term::set_cursor_style (int style)
4033{
4034 if (!IN_RANGE_INC (style, 0, 4))
4035 return;
4036
4037 set_option (Opt_cursorUnderline, style >= 3);
4038
4039#ifdef CURSOR_BLINK
4040 set_option (Opt_cursorBlink, !style || (style & 1));
4041 cursor_blink_reset ();
4042#endif
4043
4044 want_refresh = 1;
4045}
3982/*}}} */ 4046/*}}} */
3983 4047
3984/* ------------------------------------------------------------------------- */ 4048/* ---------------------------------------------------------------------- */
4049/* Write data to the pty as typed by the user, pasted with the mouse,
4050 * or generated by us in response to a query ESC sequence.
4051 */
3985 4052
3986/* 4053/*
3987 * Send printf () formatted output to the command. 4054 * Send printf () formatted output to the command.
3988 * Only use for small amounts of data. 4055 * Only use for small amounts of data.
3989 */ 4056 */
… …
3997 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4064 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
3998 va_end (arg_ptr); 4065 va_end (arg_ptr);
3999 tt_write (buf, strlen (buf)); 4066 tt_write (buf, strlen (buf));
4000} 4067}
4001 4068
4002/* ---------------------------------------------------------------------- */
4003/* Write data to the pty as typed by the user, pasted with the mouse, 4069/* Write data to the pty as typed by the user. */
4004 * or generated by us in response to a query ESC sequence. 4070void
4005 */ 4071rxvt_term::tt_write_user_input (const char *data, unsigned int len)
4006static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4072{
4073 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4074 return;
4075
4076 if (option (Opt_scrollTtyKeypress))
4077 if (view_start)
4078 {
4079 view_start = 0;
4080 want_refresh = 1;
4081 }
4082
4083 tt_write_ (data, len);
4084}
4007 4085
4008void 4086void
4009rxvt_term::tt_write (const char *data, unsigned int len) 4087rxvt_term::tt_write (const char *data, unsigned int len)
4010{ 4088{
4011 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4089 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4012 return; 4090 return;
4013 4091
4092 tt_write_ (data, len);
4093}
4094
4095static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4096
4097void
4098rxvt_term::tt_write_ (const char *data, unsigned int len)
4099{
4014 if (pty->pty < 0) 4100 if (pty->pty < 0)
4015 return; 4101 return;
4016 4102
4017 if (v_buflen == 0) 4103 if (v_buflen == 0)
4018 { 4104 {

Diff Legend

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