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.515 by root, Tue Jun 5 11:00:40 2012 UTC vs.
Revision 1.546 by sf-exg, Tue Apr 29 07:50:53 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 (valid_keysym)
704 {
487#ifdef KEYSYM_RESOURCE 705#ifdef KEYSYM_RESOURCE
488 if (keyboard->dispatch (this, keysym, ev.state)) 706 if (keyboard->dispatch (this, keysym, ev.state, kbuf, len))
489 return; 707 return;
490#endif 708#endif
491 709
492 if (saveLines) 710 if (saveLines)
493 { 711 {
… …
506#endif 724#endif
507 max_it (lnsppg, 1); 725 max_it (lnsppg, 1);
508 726
509 if (keysym == XK_Prior) 727 if (keysym == XK_Prior)
510 { 728 {
511 scr_page (UP, lnsppg); 729 scr_page (lnsppg);
512 return; 730 return;
513 } 731 }
514 else if (keysym == XK_Next) 732 else if (keysym == XK_Next)
515 { 733 {
516 scr_page (DN, lnsppg); 734 scr_page (-lnsppg);
517 return; 735 return;
518 } 736 }
519 } 737 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 738#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 739 if (IS_SCROLL_MOD)
522 { 740 {
523 if (keysym == XK_Up) 741 if (keysym == XK_Up)
524 { 742 {
525 scr_page (UP, 1); 743 scr_page (1);
526 return; 744 return;
527 } 745 }
528 else if (keysym == XK_Down) 746 else if (keysym == XK_Down)
529 { 747 {
530 scr_page (DN, 1); 748 scr_page (-1);
531 return; 749 return;
532 } 750 }
533 } 751 }
534#endif 752#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 753#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 754 if (IS_SCROLL_MOD)
537 { 755 {
538 if (keysym == XK_Home) 756 if (keysym == XK_Home)
539 { 757 {
540 scr_move_to (0, 1); 758 scr_changeview (top_row);
541 return; 759 return;
542 } 760 }
543 else if (keysym == XK_End) 761 else if (keysym == XK_End)
544 { 762 {
545 scr_move_to (1, 1); 763 scr_changeview (0);
546 return; 764 return;
547 } 765 }
548 } 766 }
549#endif 767#endif
550 } 768 }
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 790 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 791 return;
574#endif 792#endif
575 } 793 }
576 } 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;
577 } 810 }
578 811
579#if ENABLE_FRILLS || ISO_14755 812#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 813 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
636 { 869 {
637 scr_printscreen (ctrl | shft); 870 scr_printscreen (ctrl | shft);
638 return; 871 return;
639 } 872 }
640#endif 873#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 } 874 }
832 875
833 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)))
834 return; 877 return;
835 878
… …
840 if (view_start) 883 if (view_start)
841 { 884 {
842 view_start = 0; 885 view_start = 0;
843 want_refresh = 1; 886 want_refresh = 1;
844 } 887 }
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 888
857 tt_write (kbuf, (unsigned int)len); 889 tt_write (kbuf, (unsigned int)len);
858} 890}
859 891
860void ecb_cold 892void ecb_cold
… …
937void 969void
938rxvt_term::flush () 970rxvt_term::flush ()
939{ 971{
940 flush_ev.stop (); 972 flush_ev.stop ();
941 973
942#ifdef HAVE_BG_PIXMAP 974#ifdef HAVE_IMG
943 if (bg_flags & BG_NEEDS_REFRESH) 975 if (bg_flags & BG_NEEDS_REFRESH)
944 { 976 {
945 bg_flags &= ~BG_NEEDS_REFRESH; 977 bg_flags &= ~BG_NEEDS_REFRESH;
946 scr_touch (false); 978 scr_touch (false);
947 } 979 }
… …
1073 1105
1074#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1075void 1107void
1076rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1077{ 1109{
1078 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_lines))
1079 { 1111 {
1080 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1081 want_refresh = 1; 1113 want_refresh = 1;
1082 refresh_check (); 1114 refresh_check ();
1083 } 1115 }
… …
1088 1120
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1122void
1091rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1124{
1093 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1125 if (scr_page (mouse_slip_wheel_speed))
1094 { 1126 {
1095 want_refresh = 1; 1127 want_refresh = 1;
1096 refresh_check (); 1128 refresh_check ();
1097 } 1129 }
1098 1130
… …
1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1495 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1464 ; 1496 ;
1465 1497
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE); 1498 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467 1499
1500 bool moved = false;
1468#ifdef HAVE_BG_PIXMAP 1501#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ()) 1502 if (bg_window_position_sensitive ())
1503 {
1470 want_position_change = true; 1504 want_position_change = true;
1505 if (bg_img == 0)
1506 moved = true;
1507 }
1471#endif 1508#endif
1472
1473 bool moved = false;
1474 1509
1475 if (want_position_change) 1510 if (want_position_change)
1476 { 1511 {
1477 int x, y; 1512 int x, y;
1478 1513
… …
1484 else 1519 else
1485 get_window_origin (x, y); 1520 get_window_origin (x, y);
1486 1521
1487 if (x != parent_x || y != parent_y) 1522 if (x != parent_x || y != parent_y)
1488 { 1523 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x; 1524 parent_x = x;
1491 parent_y = y; 1525 parent_y = y;
1526 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1527 moved = true;
1492 } 1528 }
1493
1494 if (bg_set_position (x, y)
1495 || !(bg_flags & BG_IS_VALID))
1496 moved = true;
1497 } 1529 }
1498 1530
1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1531 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1500 { 1532 {
1501 seen_resize = 1; 1533 seen_resize = 1;
… …
1525 selection_send (ev.xselectionrequest); 1557 selection_send (ev.xselectionrequest);
1526 break; 1558 break;
1527 1559
1528 case MapNotify: 1560 case MapNotify:
1529#ifdef HAVE_BG_PIXMAP 1561#ifdef HAVE_BG_PIXMAP
1530 /* This is needed specifically to fix the case of no window manager or a 1562 // This is needed at startup for the case of no window manager
1531 * non-reparenting window manager. In those cases we never get first 1563 // or a non-reparenting window manager and also because we
1532 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1564 // defer bg image updates if the window is not mapped. The
1533 * care of multiplicity of ConfigureNotify events arriving while WM does 1565 // short delay is to optimize for multiple ConfigureNotify
1534 * reparenting. 1566 // events at startup when the window manager reparents the
1535 * We should not render background immediately, as there could be several 1567 // window, so as to perform the computation after we have
1536 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1568 // received all of them.
1537 * by scheduling background redraw as soon as we can, but giving a short 1569 if (bg_img == 0)
1538 * bit of time for ConfigureNotifies to arrive.
1539 * We should render background PRIOR to drawing any text, but AFTER all
1540 * of ConfigureNotifys for the best results.
1541 */
1542 if (!(bg_flags & BG_IS_VALID))
1543 update_background_ev.start (0.025); 1570 update_background_ev.start (0.025);
1544#endif 1571#endif
1545 mapped = 1; 1572 mapped = 1;
1546#ifdef TEXT_BLINK 1573#ifdef TEXT_BLINK
1547 text_blink_ev.start (); 1574 text_blink_ev.start ();
… …
1639 1666
1640#ifdef SELECTION_SCROLLING 1667#ifdef SELECTION_SCROLLING
1641 if (ev.xbutton.y < int_bwidth 1668 if (ev.xbutton.y < int_bwidth
1642 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1669 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1643 { 1670 {
1671 page_dirn scroll_selection_dir;
1644 int dist; 1672 int dist;
1645 1673
1646 /* don't clobber the current delay if we are 1674 /* don't clobber the current delay if we are
1647 * already in the middle of scrolling. 1675 * already in the middle of scrolling.
1648 */ 1676 */
… …
1671 scroll_selection_lines = Pixel2Height (dist) 1699 scroll_selection_lines = Pixel2Height (dist)
1672 / SELECTION_SCROLL_LINE_SPEEDUP 1700 / SELECTION_SCROLL_LINE_SPEEDUP
1673 + 1; 1701 + 1;
1674 min_it (scroll_selection_lines, 1702 min_it (scroll_selection_lines,
1675 SELECTION_SCROLL_MAX_LINES); 1703 SELECTION_SCROLL_MAX_LINES);
1704 scroll_selection_lines *= scroll_selection_dir;
1676 } 1705 }
1677 else 1706 else
1678 { 1707 {
1679 /* we are within the text window, so we 1708 /* we are within the text window, so we
1680 * shouldn't be scrolling 1709 * shouldn't be scrolling
… …
1834 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1863 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1835 } 1864 }
1836#endif 1865#endif
1837} 1866}
1838 1867
1839#if ENABLE_TRANSPARENCY || ENABLE_PERL 1868#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1840void ecb_hot 1869void ecb_hot
1841rxvt_term::rootwin_cb (XEvent &ev) 1870rxvt_term::rootwin_cb (XEvent &ev)
1842{ 1871{
1843 make_current (); 1872 make_current ();
1844 1873
1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1874 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1875 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1847 return; 1876 return;
1848 1877
1849# if ENABLE_TRANSPARENCY
1850 switch (ev.type) 1878 switch (ev.type)
1851 { 1879 {
1852 case PropertyNotify: 1880 case PropertyNotify:
1853 /* 1881 /*
1854 * if user used some Esetroot compatible prog to set the root bg, 1882 * if user used some Esetroot compatible prog to set the root bg,
1855 * use the property to determine the pixmap. We use it later on. 1883 * use the property to determine the pixmap. We use it later on.
1856 */ 1884 */
1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1885 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1886 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1859 { 1887 {
1860 bg_set_root_pixmap (); 1888#if BG_IMAGE_FROM_ROOT
1889 if (option (Opt_transparent))
1890 {
1891 rxvt_img::new_from_root (this)->replace (root_img);
1861 update_background (); 1892 update_background ();
1893 }
1894#endif
1895 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1862 } 1896 }
1863 1897
1864 break; 1898 break;
1865 } 1899 }
1866# endif
1867 1900
1868 refresh_check (); 1901 refresh_check ();
1869} 1902}
1870#endif 1903#endif
1871 1904
… …
2192 2225
2193#ifdef MOUSE_WHEEL 2226#ifdef MOUSE_WHEEL
2194 case Button4: 2227 case Button4:
2195 case Button5: 2228 case Button5:
2196 { 2229 {
2197 int i; 2230 int lines;
2198 page_dirn v; 2231 page_dirn dirn;
2199 2232
2200 v = ev.button == Button4 ? UP : DN; 2233 dirn = ev.button == Button4 ? UP : DN;
2201 2234
2202 if (ev.state & ShiftMask) 2235 if (ev.state & ShiftMask)
2203 i = 1; 2236 lines = 1;
2204 else if (option (Opt_mouseWheelScrollPage)) 2237 else if (option (Opt_mouseWheelScrollPage))
2205 i = nrow - 1; 2238 lines = nrow - 1;
2206 else 2239 else
2207 i = 5; 2240 lines = 5;
2208 2241
2209# ifdef MOUSE_SLIP_WHEELING 2242# ifdef MOUSE_SLIP_WHEELING
2210 if (ev.state & ControlMask) 2243 if (ev.state & ControlMask)
2211 { 2244 {
2212 mouse_slip_wheel_speed += v ? -1 : 1; 2245 mouse_slip_wheel_speed += dirn;
2213 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2246 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2214 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2215 2247
2216 if (!slip_wheel_ev.is_active ()) 2248 if (!slip_wheel_ev.is_active ())
2217 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2249 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2218 } 2250 }
2219 else 2251 else
2220# endif 2252# endif
2221 { 2253 {
2222 scr_page (v, i); 2254 scr_page (dirn, lines);
2223 scrollBar.show (1); 2255 scrollBar.show (1);
2224 } 2256 }
2225 } 2257 }
2226 break; 2258 break;
2227#endif 2259#endif
… …
2380 } 2412 }
2381 2413
2382 if (len == (size_t)-1) 2414 if (len == (size_t)-1)
2383 { 2415 {
2384 mbstate.reset (); // reset now undefined conversion state 2416 mbstate.reset (); // reset now undefined conversion state
2417 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2418 // in which case we "erroneously" return the next byte which might be valid.
2385 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2419 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2386 } 2420 }
2387 2421
2388 // assume wchar == unicode 2422 // assume wchar == unicode
2389 cmdbuf_ptr += len; 2423 cmdbuf_ptr += len;
… …
2794 }; 2828 };
2795 2829
2796void ecb_hot 2830void ecb_hot
2797rxvt_term::process_csi_seq () 2831rxvt_term::process_csi_seq ()
2798{ 2832{
2799 unicode_t ch, priv, i; 2833 unicode_t ch, priv, prev_ch, i;
2800 unsigned int nargs, p; 2834 unsigned int nargs, p;
2801 int n, ndef; 2835 int n, ndef;
2802 int arg[ESC_ARGS] = { }; 2836 int arg[ESC_ARGS] = { };
2803 2837
2804 nargs = 0; 2838 nargs = 0;
… …
2810 /* '<' '=' '>' '?' '!' */ 2844 /* '<' '=' '>' '?' '!' */
2811 priv = ch; 2845 priv = ch;
2812 ch = cmd_getc (); 2846 ch = cmd_getc ();
2813 } 2847 }
2814 2848
2849 prev_ch = 0;
2815 /* read any numerical arguments */ 2850 /* read any numerical arguments */
2816 for (n = -1; ch < CSI_ICH; ) 2851 for (n = -1; ch < CSI_ICH; )
2817 { 2852 {
2818 if (isdigit (ch)) 2853 if (isdigit (ch))
2819 { 2854 {
… …
2829 n = -1; 2864 n = -1;
2830 } 2865 }
2831 else if (IS_CONTROL (ch)) 2866 else if (IS_CONTROL (ch))
2832 process_nonprinting (ch); 2867 process_nonprinting (ch);
2833 2868
2869 prev_ch = ch;
2834 ch = cmd_getc (); 2870 ch = cmd_getc ();
2835 } 2871 }
2836 2872
2837 if (ch > CSI_7F) 2873 if (ch > CSI_7F)
2838 return; 2874 return;
… …
3072 scr_insert_mode (1); 3108 scr_insert_mode (1);
3073 else if (arg[0] == 20) 3109 else if (arg[0] == 20)
3074 priv_modes |= PrivMode_LFNL; 3110 priv_modes |= PrivMode_LFNL;
3075 break; 3111 break;
3076 3112
3113 case CSI_71: // DESCUSR: set cursor style
3114 if (prev_ch == ' ')
3115 set_cursor_style (arg[0]);
3116 break;
3117
3077 /* 3118 /*
3078 * PRIVATE USE beyond this point. All CSI_7? sequences here 3119 * PRIVATE USE beyond this point. All CSI_7? sequences here
3079 */ 3120 */
3080 case CSI_72: /* DECSTBM: set top and bottom margins */ 3121 case CSI_72: /* DECSTBM: set top and bottom margins */
3081 if (nargs == 1) 3122 if (nargs == 1)
… …
3214rxvt_term::get_to_st (unicode_t &ends_how) 3255rxvt_term::get_to_st (unicode_t &ends_how)
3215{ 3256{
3216 unicode_t ch; 3257 unicode_t ch;
3217 bool seen_esc = false; 3258 bool seen_esc = false;
3218 unsigned int n = 0; 3259 unsigned int n = 0;
3219 wchar_t string[STRING_MAX]; 3260 wchar_t string[CBUFSIZ];
3220 3261
3221 while ((ch = cmd_getc ()) != NOCHAR) 3262 while ((ch = cmd_getc ()) != NOCHAR)
3222 { 3263 {
3223 if (seen_esc) 3264 if (seen_esc)
3224 { 3265 {
… …
3239 else if (ch < 0x20) 3280 else if (ch < 0x20)
3240 return NULL; /* other control character - exit */ 3281 return NULL; /* other control character - exit */
3241 3282
3242 seen_esc = false; 3283 seen_esc = false;
3243 3284
3244 if (n >= STRING_MAX - 1) 3285 if (n >= sizeof (string) - 1)
3245 // stop at some sane length 3286 // stop at some sane length
3246 return NULL; 3287 return NULL;
3247 3288
3248 string[n++] = ch; 3289 string[n++] = ch;
3249 } 3290 }
… …
3366 &nitems, &bytes_after, &value) == Success 3407 &nitems, &bytes_after, &value) == Success
3367 && actual_type != None 3408 && actual_type != None
3368 && actual_format == 8) 3409 && actual_format == 8)
3369 str = (const char *)(value); 3410 str = (const char *)(value);
3370 3411
3371 tt_printf ("\033]%d;%s%c", op, str, resp); 3412 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3372 3413
3373 XFree (value); 3414 XFree (value);
3374 } 3415 }
3375 else 3416 else
3376 { 3417 {
… …
3444 break; 3485 break;
3445#endif 3486#endif
3446 case URxvt_Color_border: 3487 case URxvt_Color_border:
3447 process_color_seq (op, Color_border, str, resp); 3488 process_color_seq (op, Color_border, str, resp);
3448 break; 3489 break;
3449#if ENABLE_TRANSPARENCY 3490
3491#if BG_IMAGE_FROM_ROOT
3450 case URxvt_Color_tint: 3492 case URxvt_Color_tint:
3451 process_color_seq (op, Color_tint, str, resp); 3493 process_color_seq (op, Color_tint, str, resp);
3452 { 3494 {
3453 bool changed = false; 3495 bool changed = false;
3454 3496
… …
3465#if BG_IMAGE_FROM_FILE 3507#if BG_IMAGE_FROM_FILE
3466 case Rxvt_Pixmap: 3508 case Rxvt_Pixmap:
3467 if (!strcmp (str, "?")) 3509 if (!strcmp (str, "?"))
3468 { 3510 {
3469 char str[256]; 3511 char str[256];
3470 int h_scale = 0, v_scale = 0;
3471 int h_align = 0, v_align = 0;
3472 if (image_vec.size () > 0)
3473 {
3474 h_scale = image_vec[0].h_scale; 3512 int h_scale = fimage.h_scale;
3475 v_scale = image_vec[0].v_scale; 3513 int v_scale = fimage.v_scale;
3476 h_align = image_vec[0].h_align; 3514 int h_align = fimage.h_align;
3477 v_align = image_vec[0].v_align; 3515 int v_align = fimage.v_align;
3478 }
3479 3516
3480 sprintf (str, "[%dx%d+%d+%d]", 3517 sprintf (str, "[%dx%d+%d+%d]",
3481 h_scale, v_scale, 3518 h_scale, v_scale,
3482 h_align, v_align); 3519 h_align, v_align);
3483 process_xterm_seq (XTerm_title, str, CHAR_ST); 3520 process_xterm_seq (XTerm_title, str, CHAR_ST);
… …
3486 { 3523 {
3487 bool changed = false; 3524 bool changed = false;
3488 3525
3489 if (*str != ';') 3526 if (*str != ';')
3490 { 3527 {
3491 if (image_vec.size () > 0)
3492 changed = image_vec[0].set_file_geometry (str);
3493 else 3528 try
3494 { 3529 {
3495 rxvt_image *image = new_image ();
3496 if (!image->set_file_geometry (str)) 3530 fimage.set_file_geometry (this, str);
3497 image_vec.pop_back ();
3498 else
3499 changed = true; 3531 changed = true;
3532 }
3533 catch (const class rxvt_failure_exception &e)
3534 {
3500 } 3535 }
3501 } 3536 }
3502 else 3537 else
3503 { 3538 {
3504 str++; 3539 str++;
3505 if (image_vec.size () > 0)
3506 changed = image_vec[0].set_geometry (str, true); 3540 if (fimage.set_geometry (str, true))
3541 changed = true;
3507 } 3542 }
3508 3543
3509 if (changed) 3544 if (changed)
3510 { 3545 {
3511 if (bg_window_position_sensitive ()) 3546 if (bg_window_position_sensitive ())
3512 { 3547 {
3513 int x, y; 3548 int x, y;
3514 get_window_origin (x, y); 3549 get_window_origin (x, y);
3515 bg_set_position (x, y); 3550 parent_x = x;
3551 parent_y = y;
3516 } 3552 }
3517 update_background (); 3553 update_background ();
3518 } 3554 }
3519 } 3555 }
3520 break; 3556 break;
… …
3991 break; 4027 break;
3992#endif 4028#endif
3993 } 4029 }
3994 } 4030 }
3995} 4031}
4032
4033void
4034rxvt_term::set_cursor_style (int style)
4035{
4036 if (!IN_RANGE_INC (style, 0, 4))
4037 return;
4038
4039 set_option (Opt_cursorUnderline, style >= 3);
4040
4041#ifdef CURSOR_BLINK
4042 set_option (Opt_cursorBlink, !style || (style & 1));
4043 cursor_blink_reset ();
4044#endif
4045
4046 want_refresh = 1;
4047}
3996/*}}} */ 4048/*}}} */
3997 4049
3998/* ------------------------------------------------------------------------- */ 4050/* ------------------------------------------------------------------------- */
3999 4051
4000/* 4052/*

Diff Legend

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