ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.150 by root, Mon Dec 13 19:16:36 2004 UTC

… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 29
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 31
34#include <inttypes.h> 32#include <inttypes.h>
35#include <wchar.h> 33#include <wchar.h>
… …
41 while (len--) 39 while (len--)
42 *start++ = value; 40 *start++ = value;
43} 41}
44 42
45/* ------------------------------------------------------------------------- */ 43/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384 44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
47#define TABSIZE 8 /* default tab size */ 46#define TABSIZE 8 /* default tab size */
48 47
49/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
53 if (Options & Opt_scrollTtyOutput) \ 52 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 53 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
113 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
114 113
115/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 121{
122 efs &= ~RS_baseattrMask; 122 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); 123 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 124
125 while (width--) 125 while (width--)
126 { 126 {
127 *et++ = ' '; 127 *et++ = ' ';
128 *er++ = efs; 128 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 155 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 156 unsigned int p, q;
157 int k; 157 int k;
158 rend_t setrstyle; 158 rend_t setrstyle;
159 159
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
161 163
162 TermWin.view_start = 0; 164 TermWin.view_start = 0;
163 num_scr = 0; 165 num_scr = 0;
164 166
165 if (TermWin.ncol == 0) 167 if (TermWin.ncol == 0)
… …
222 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 224 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
223 screen.tlen[q] = swap.tlen[p] = 0; 225 screen.tlen[q] = swap.tlen[p] = 0;
224 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 226 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
225 } 227 }
226 228
227 MEMSET (charsets, 'B', sizeof (charsets)); 229 memset (charsets, 'B', sizeof (charsets));
228 TermWin.nscrolled = 0; /* no saved lines */ 230 TermWin.nscrolled = 0; /* no saved lines */
229 rstyle = DEFAULT_RSTYLE; 231 rstyle = DEFAULT_RSTYLE;
230 screen.flags = Screen_DefaultFlags; 232 screen.flags = Screen_DefaultFlags;
231 screen.cur.row = screen.cur.col = 0; 233 screen.cur.row = screen.cur.col = 0;
232 screen.charset = 0; 234 screen.charset = 0;
… …
416} 418}
417 419
418void 420void
419rxvt_term::scr_reset_realloc () 421rxvt_term::scr_reset_realloc ()
420{ 422{
421 uint16_t total_rows, nrow; 423 unsigned int total_rows, nrow;
422 424
423 nrow = TermWin.nrow; 425 nrow = TermWin.nrow;
424 total_rows = nrow + TermWin.saveLines; 426 total_rows = nrow + TermWin.saveLines;
425 /* *INDENT-OFF* */ 427 /* *INDENT-OFF* */
426 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 428 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
443 * Free everything. That way malloc debugging can find leakage. 445 * Free everything. That way malloc debugging can find leakage.
444 */ 446 */
445void 447void
446rxvt_term::scr_release () 448rxvt_term::scr_release ()
447{ 449{
448 uint16_t total_rows; 450 unsigned int total_rows;
449 int i; 451 int i;
450 452
451 total_rows = TermWin.nrow + TermWin.saveLines; 453 total_rows = TermWin.nrow + TermWin.saveLines;
452 454
453 delete talloc; talloc = 0; 455 delete talloc; talloc = 0;
… …
479 * Hard reset 481 * Hard reset
480 */ 482 */
481void 483void
482rxvt_term::scr_poweron () 484rxvt_term::scr_poweron ()
483{ 485{
484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
485
486 scr_release (); 486 scr_release ();
487 prev_nrow = prev_ncol = 0; 487 prev_nrow = prev_ncol = 0;
488 scr_reset (); 488 scr_reset ();
489 489
490 scr_clear (true); 490 scr_clear (true);
… …
501 */ 501 */
502void 502void
503rxvt_term::scr_cursor (int mode) 503rxvt_term::scr_cursor (int mode)
504{ 504{
505 screen_t *s; 505 screen_t *s;
506
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 506
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 508 if (current_screen == SECONDARY)
511 s = &swap; 509 s = &swap;
512 else 510 else
… …
514 s = &screen; 512 s = &screen;
515 513
516 switch (mode) 514 switch (mode)
517 { 515 {
518 case SAVE: 516 case SAVE:
519 s->s_cur.row = s->cur.row; 517 s->s_cur.row = screen.cur.row;
520 s->s_cur.col = s->cur.col; 518 s->s_cur.col = screen.cur.col;
521 s->s_rstyle = rstyle; 519 s->s_rstyle = rstyle;
522 s->s_charset = s->charset; 520 s->s_charset = screen.charset;
523 s->s_charset_char = charsets[s->charset]; 521 s->s_charset_char = charsets[screen.charset];
524 break; 522 break;
525 523
526 case RESTORE: 524 case RESTORE:
527 want_refresh = 1; 525 want_refresh = 1;
528 s->cur.row = s->s_cur.row; 526 screen.cur.row = s->s_cur.row;
529 s->cur.col = s->s_cur.col; 527 screen.cur.col = s->s_cur.col;
530 s->flags &= ~Screen_WrapNext; 528 screen.flags &= ~Screen_WrapNext;
531 rstyle = s->s_rstyle; 529 rstyle = s->s_rstyle;
532 s->charset = s->s_charset; 530 screen.charset = s->s_charset;
533 charsets[s->charset] = s->s_charset_char; 531 charsets[screen.charset] = s->s_charset_char;
534 set_font_style (); 532 set_font_style ();
535 break; 533 break;
536 } 534 }
537 535
538 /* boundary check in case screen size changed between SAVE and RESTORE */ 536 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
561 int offset; 559 int offset;
562#endif 560#endif
563 561
564 want_refresh = 1; 562 want_refresh = 1;
565 563
566 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
567
568 TermWin.view_start = 0; 564 TermWin.view_start = 0;
569 565
570 if (current_screen == scrn) 566 if (current_screen == scrn)
571 return scrn; 567 return scrn;
572 568
573 selection_check (2); /* check for boundary cross */ 569 selection_check (2); /* check for boundary cross */
574 570
575 SWAP_IT (current_screen, scrn, int); 571 SWAP_IT (current_screen, scrn, int);
572
573 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
574 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
575# ifdef DEBUG_STRICT
576 assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
577 assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
578# else /* drive with your eyes closed */
579 MAX_IT (screen.cur.row, 0);
580 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
581 MAX_IT (screen.cur.col, 0);
582 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
583# endif
584
576#if NSCREENS 585#if NSCREENS
577 if (Options & Opt_secondaryScreen) 586 if (options & Opt_secondaryScreen)
578 { 587 {
579 num_scr = 0; 588 num_scr = 0;
580 offset = TermWin.saveLines; 589 offset = TermWin.saveLines;
590
581 for (i = prev_nrow; i--;) 591 for (i = prev_nrow; i--;)
582 { 592 {
583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 593 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 594 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 595 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586 } 596 }
587 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 597
588 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
589# ifdef DEBUG_STRICT
590 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
591 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
592# else /* drive with your eyes closed */
593 MAX_IT (screen.cur.row, 0);
594 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
595 MAX_IT (screen.cur.col, 0);
596 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
597# endif
598 SWAP_IT (screen.charset, swap.charset, int16_t); 598 SWAP_IT (screen.charset, swap.charset, int16_t);
599 SWAP_IT (screen.flags, swap.flags, int); 599 SWAP_IT (screen.flags, swap.flags, int);
600 screen.flags |= Screen_VisibleCursor; 600 screen.flags |= Screen_VisibleCursor;
601 swap.flags |= Screen_VisibleCursor; 601 swap.flags |= Screen_VisibleCursor;
602 } 602 }
603 else 603 else
604#endif 604#endif
605 if (Options & Opt_secondaryScroll) 605 if (options & Opt_secondaryScroll)
606 //if (current_screen == PRIMARY)
607 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 606 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
607
608 return scrn; 608 return scrn;
609} 609}
610 610
611// clear WrapNext indicator, solidifying position on next line
612void
613rxvt_term::scr_do_wrap ()
614{
615 if (!(screen.flags & Screen_WrapNext))
616 return;
617
618 screen.flags &= ~Screen_WrapNext;
619
620 screen.cur.col = 0;
621
622 if (screen.cur.row == screen.bscroll)
623 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
624 else if (screen.cur.row < TermWin.nrow - 1)
625 screen.cur.row++;
626}
627
611/* ------------------------------------------------------------------------- */ 628/* ------------------------------------------------------------------------- */
612/* 629/*
613 * Change the colour for following text 630 * Change the colour for following text
614 */ 631 */
615void 632void
616rxvt_term::scr_color (unsigned int color, int fgbg) 633rxvt_term::scr_color (unsigned int color, int fgbg)
617{ 634{
618 color &= RS_fgMask; 635 if (color > maxTermCOLOR)
636 color = fgbg;
637
619 if (fgbg == Color_fg) 638 if (fgbg == Color_fg)
620 rstyle = SET_FGCOLOR (rstyle, color); 639 rstyle = SET_FGCOLOR (rstyle, color);
621 else 640 else
622 rstyle = SET_BGCOLOR (rstyle, color); 641 rstyle = SET_BGCOLOR (rstyle, color);
623} 642}
… …
652 671
653 if (count == 0 || (row1 > row2)) 672 if (count == 0 || (row1 > row2))
654 return 0; 673 return 0;
655 674
656 want_refresh = 1; 675 want_refresh = 1;
657 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
658 676
659 if (row1 == 0 && count > 0 677 if (row1 == 0 && count > 0
660 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 678 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
661 { 679 {
662 nscrolled = (long)TermWin.nscrolled + (long)count; 680 nscrolled = (long)TermWin.nscrolled + (long)count;
663 681
664 if (nscrolled > (long)TermWin.saveLines) 682 if (nscrolled > (long)TermWin.saveLines)
665 TermWin.nscrolled = TermWin.saveLines; 683 TermWin.nscrolled = TermWin.saveLines;
666 else 684 else
667 TermWin.nscrolled = (uint16_t)nscrolled; 685 TermWin.nscrolled = (unsigned int)nscrolled;
668 686
669 if ((Options & Opt_scrollWithBuffer) 687 if ((options & Opt_scrollWithBuffer)
670 && TermWin.view_start != 0 688 && TermWin.view_start != 0
671 && TermWin.view_start != TermWin.saveLines) 689 && TermWin.view_start != TermWin.saveLines)
672 scr_page (UP, count); 690 scr_page (UP, count);
673 } 691 }
674 else if (!spec) 692 else if (!spec)
… …
765 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
766 */ 784 */
767void 785void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 786rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
769{ 787{
770 unsigned char checksel, clearsel; 788 unsigned char checksel;
771 unicode_t c; 789 unicode_t c;
772 int i, row, last_col; 790 int i, row, last_col;
773 text_t *stp; 791 text_t *stp;
774 rend_t *srp; 792 rend_t *srp;
775 793
776 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
777 return; 795 return;
778 796
779 want_refresh = 1; 797 want_refresh = 1;
798 ZERO_SCROLLBACK ();
780 last_col = TermWin.ncol; 799 last_col = TermWin.ncol;
781 800
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 801 if (nlines > 0)
785 { 802 {
786 nlines += screen.cur.row - screen.bscroll; 803 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 804 if ((nlines > 0)
788 && (screen.tscroll == 0) 805 && (screen.tscroll == 0)
… …
804 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 821 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
805#endif 822#endif
806 row = screen.cur.row + TermWin.saveLines; 823 row = screen.cur.row + TermWin.saveLines;
807 824
808 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 825 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
809 clearsel = 0;
810 826
811 stp = screen.text[row]; 827 stp = screen.text[row];
812 srp = screen.rend[row]; 828 srp = screen.rend[row];
813 829
814 while (len--) 830 while (len--)
… …
817 833
818 if (c < 0x20) 834 if (c < 0x20)
819 switch (c) 835 switch (c)
820 { 836 {
821 case C0_HT: 837 case C0_HT:
822 scr_tab (1); 838 scr_tab (1, true);
823 continue; 839 continue;
824 840
825 case C0_LF: 841 case C0_LF:
826 if (screen.tlen[row] != -1) /* XXX: think about this */ 842 if (screen.tlen[row] != -1) /* XXX: think about this */
827 MAX_IT (screen.tlen[row], screen.cur.col); 843 MAX_IT (screen.tlen[row], screen.cur.col);
… …
849 if (checksel /* see if we're writing within selection */ 865 if (checksel /* see if we're writing within selection */
850 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
851 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
852 { 868 {
853 checksel = 0; 869 checksel = 0;
854 clearsel = 1; 870 /*
871 * If we wrote anywhere in the selected area, kill the selection
872 * XXX: should we kill the mark too? Possibly, but maybe that
873 * should be a similar check.
874 */
875 CLEAR_SELECTION ();
855 } 876 }
856 877
857 if (screen.flags & Screen_WrapNext) 878 if (screen.flags & Screen_WrapNext)
858 { 879 {
859 screen.tlen[row] = -1; 880 screen.tlen[row] = -1;
860 if (screen.cur.row == screen.bscroll) 881
861 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
862 else if (screen.cur.row < (TermWin.nrow - 1))
863 row = (++screen.cur.row) + TermWin.saveLines; 882 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
864 883
865 stp = screen.text[row]; /* _must_ refresh */ 884 stp = screen.text[row]; /* _must_ refresh */
866 srp = screen.rend[row]; /* _must_ refresh */ 885 srp = screen.rend[row]; /* _must_ refresh */
867 screen.cur.col = 0;
868 screen.flags &= ~Screen_WrapNext;
869 } 886 }
870
871 if (screen.flags & Screen_Insert)
872 scr_insdel_chars (1, INSERT);
873 887
874 // rely on wcwidth to tell us the character width, at least for non-latin1 888 // rely on wcwidth to tell us the character width, at least for non-latin1
875 // do wcwidth before further replacements, as wcwidth says that line-drawing 889 // do wcwidth before further replacements, as wcwidth says that line-drawing
876 // characters have width -1 (DOH!) on GNU/Linux sometimes. 890 // characters have width -1 (DOH!) on GNU/Linux sometimes.
877 int width = c < 0x100 ? 1 : wcwidth (c); 891 int width = c < 0x100 ? 1 : wcwidth (c);
878 892
879 if (charsets[screen.charset] == '0') // DEC SPECIAL 893 if (charsets[screen.charset] == '0') // DEC SPECIAL
880 { 894 {
881 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
896 // 5f-7e standard vt100
897 // 40-5e rxvt extension for extra curses acs chars
882 static uint16_t vt100_0[32] = { // 5f .. 7e 898 static uint16_t vt100_0[63] = { // 40 .. 7e
899 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
900 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
901 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
902 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
883 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 903 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
884 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 904 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
885 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 905 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
886 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 906 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
887 }; 907 };
888 908
889 if (c >= 0x5f && c <= 0x7e) 909 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
890 { 910 {
891 c = vt100_0[c - 0x5f]; 911 c = vt100_0[c - 0x40];
892 width = 1; 912 width = 1;
893 } 913 }
894 } 914 }
895 915
916 if (screen.flags & Screen_Insert)
917 scr_insdel_chars (width, INSERT);
918
896 if (width != 0) 919 if (width != 0)
897 { 920 {
898#if !UNICODE_3 && ENABLE_COMBINING 921 // some utf-8 decoders decode surrogate characters.
922 if (0xd800 <= c && c <= 0xdfff)
923 c = 0xfffd;
924
925#if !UNICODE_3
899 // trim characters we can't store directly :( 926 // trim characters we can't store directly :(
900 if (c >= 0x10000) 927 if (c >= 0x10000)
928# if ENABLE_COMBINING
901 c = rxvt_composite.compose (c); // map to lower 16 bits 929 c = rxvt_composite.compose (c); // map to lower 16 bits
930# else
931 c = 0xfffd;
902#endif 932# endif
903 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 933#endif
904 rend_t rend = SET_FONT (rstyle, 934
905 c > 0x7f || bold || c < 0x20 935 // nuke the character at this position, if required
906 ? TermWin.fontset->find_font (c, bold) 936 if (stp[screen.cur.col] == NOCHAR
907 : TermWin.ascii_map [c - 0x20]); 937 || (screen.cur.col < TermWin.ncol - 1
938 && stp[screen.cur.col + 1] == NOCHAR))
939 {
940 int col = screen.cur.col;
941
942 // find begin
943 while (col > 0 && stp[col] == NOCHAR)
944 col--;
945
946 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
947
948 // found begin, nuke
949 do {
950 stp[col] = ' ';
951 srp[col] = rend;
952 col++;
953 } while (col < TermWin.ncol && stp[col] == NOCHAR);
954 }
955
956 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908 957
909 do 958 do
910 { 959 {
911 stp[screen.cur.col] = c; 960 stp[screen.cur.col] = c;
912 srp[screen.cur.col] = rend; 961 srp[screen.cur.col] = rend;
… …
924 c = NOCHAR; 973 c = NOCHAR;
925 } 974 }
926 while (--width > 0); 975 while (--width > 0);
927 976
928 // pad with spaces when overwriting wide character with smaller one 977 // pad with spaces when overwriting wide character with smaller one
978 if (!width)
929 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 979 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
930 { 980 {
931 stp[c] = ' '; 981 stp[c] = ' ';
932 srp[c] = rend; 982 srp[c] = rend;
933 } 983 }
934 } 984 }
935 else if (width == 0) 985 else if (width == 0)
936 { 986 {
937#if ENABLE_COMBINING 987#if ENABLE_COMBINING
938 // handle combining characters 988 // handle combining characters
… …
945 995
946 if (screen.cur.col > 0) 996 if (screen.cur.col > 0)
947 { 997 {
948 tp = stp + screen.cur.col - 1; 998 tp = stp + screen.cur.col - 1;
949 rp = srp + screen.cur.col - 1; 999 rp = srp + screen.cur.col - 1;
1000
1001 while (*tp == NOCHAR && tp > stp)
1002 tp--, rp--;
950 } 1003 }
951 else if (screen.cur.row > 0 1004 else if (screen.cur.row > 0
952 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1005 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
953 { 1006 {
954 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1007 int line = screen.cur.row - 1 + TermWin.saveLines;
955 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1008
1009 tp = screen.text[line] + last_col - 1;
1010 rp = screen.rend[line] + last_col - 1;
1011
1012 while (*tp == NOCHAR && tp > screen.text[line])
1013 tp--, rp--;
956 } 1014 }
957 else 1015 else
958 continue; 1016 continue;
959
960 // handle double-width-chars by making them look extremely ugly
961 if (*tp == NOCHAR)
962 *tp = ' '; // hack //D //TODO //--tp, --rp;
963 1017
964 // first try to find a precomposed character 1018 // first try to find a precomposed character
965 unicode_t n = rxvt_compose (*tp, c); 1019 unicode_t n = rxvt_compose (*tp, c);
966 if (n == NOCHAR) 1020 if (n == NOCHAR)
967 n = rxvt_composite.compose (*tp, c); 1021 n = rxvt_composite.compose (*tp, c);
968 1022
969 *tp = n; 1023 *tp = n;
970 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1024 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
971#endif 1025#endif
972 } 1026 }
973 } 1027 }
974 1028
975 if (screen.tlen[row] != -1) /* XXX: think about this */ 1029 if (screen.tlen[row] != -1) /* XXX: think about this */
976 MAX_IT (screen.tlen[row], screen.cur.col); 1030 MAX_IT (screen.tlen[row], screen.cur.col);
977
978 /*
979 * If we wrote anywhere in the selected area, kill the selection
980 * XXX: should we kill the mark too? Possibly, but maybe that
981 * should be a similar check.
982 */
983 if (clearsel)
984 CLEAR_SELECTION ();
985 1031
986#ifdef DEBUG_STRICT 1032#ifdef DEBUG_STRICT
987 assert (screen.cur.row >= 0); 1033 assert (screen.cur.row >= 0);
988#else /* drive with your eyes closed */ 1034#else /* drive with your eyes closed */
989 MAX_IT (screen.cur.row, 0); 1035 MAX_IT (screen.cur.row, 0);
… …
1007#ifdef TERMCAP_HAS_BW 1053#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = TermWin.ncol - 1; 1054 screen.cur.col = TermWin.ncol - 1;
1009 screen.cur.row--; 1055 screen.cur.row--;
1010 return; 1056 return;
1011#endif 1057#endif
1012
1013 } 1058 }
1014 } 1059 }
1015 else if ((screen.flags & Screen_WrapNext) == 0) 1060 else if (!(screen.flags & Screen_WrapNext))
1016 scr_gotorc (0, -1, RELATIVE); 1061 scr_gotorc (0, -1, RELATIVE);
1017 1062
1018 screen.flags &= ~Screen_WrapNext; 1063 screen.flags &= ~Screen_WrapNext;
1019} 1064}
1020 1065
… …
1023 * Process Horizontal Tab 1068 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1069 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1070 * XTERM_SEQ: CTRL-I
1026 */ 1071 */
1027void 1072void
1028rxvt_term::scr_tab (int count) 1073rxvt_term::scr_tab (int count, bool ht)
1029{ 1074{
1030 int i, x; 1075 int i, x;
1031 1076
1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1033 want_refresh = 1; 1077 want_refresh = 1;
1034 i = x = screen.cur.col; 1078 i = x = screen.cur.col;
1035 1079
1036 if (count == 0) 1080 if (count == 0)
1037 return; 1081 return;
1038 else if (count > 0) 1082 else if (count > 0)
1039 { 1083 {
1084 int row = TermWin.saveLines + screen.cur.row;
1085 text_t *tp = screen.text[row];
1086 rend_t *rp = screen.rend[row];
1087 rend_t base_rend = rp[i];
1088 ht &= tp[i] == ' ';
1089
1040 for (; ++i < TermWin.ncol; ) 1090 for (; ++i < TermWin.ncol; )
1041 if (tabs[i]) 1091 if (tabs[i])
1042 { 1092 {
1043 x = i; 1093 x = i;
1044 if (!--count) 1094 if (!--count)
1045 break; 1095 break;
1046 } 1096 }
1097 else
1098 ht &= tp[i] == ' '
1099 && RS_SAME (rp[i], base_rend);
1047 1100
1048 if (count) 1101 if (count)
1049 x = TermWin.ncol - 1; 1102 x = TermWin.ncol - 1;
1103
1104 // store horizontal tab commands as characters inside the text
1105 // buffer so they can be selected and pasted.
1106 if (ht && options & Opt_pastableTabs)
1107 {
1108 base_rend = SET_FONT (base_rend, 0);
1109
1110 if (screen.tlen[row] != -1) /* XXX: think about this */
1111 MAX_IT (screen.tlen[row], x);
1112
1113 i = screen.cur.col;
1114
1115 tp[i] = '\t';
1116 rp[i] = base_rend;
1117
1118 while (++i < x)
1119 {
1120 tp[i] = NOCHAR;
1121 rp[i] = base_rend;
1122 }
1123 }
1050 } 1124 }
1051 else /* if (count < 0) */ 1125 else /* if (count < 0) */
1052 { 1126 {
1053 for (; --i >= 0; ) 1127 for (; --i >= 0; )
1054 if (tabs[i]) 1128 if (tabs[i])
… …
1071 * Process DEC Back Index 1145 * Process DEC Back Index
1072 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1073 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1074 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1075 */ 1149 */
1076#ifndef NO_FRILLS 1150#if ENABLE_FRILLS
1077void 1151void
1078rxvt_term::scr_backindex () 1152rxvt_term::scr_backindex ()
1079{ 1153{
1080 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1081 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1082 else 1156 else
1083 { 1157 {
1084 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1158 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1085 return; /* um, yeah? */ 1159 return; /* um, yeah? */
1160
1086 scr_insdel_chars (1, INSERT); 1161 scr_insdel_chars (1, INSERT);
1087 } 1162 }
1088} 1163}
1089#endif 1164#endif
1090/* ------------------------------------------------------------------------- */ 1165/* ------------------------------------------------------------------------- */
… …
1092 * Process DEC Forward Index 1167 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1096 */ 1171 */
1097#ifndef NO_FRILLS 1172#if ENABLE_FRILLS
1098void 1173void
1099rxvt_term::scr_forwardindex () 1174rxvt_term::scr_forwardindex ()
1100{ 1175{
1101 int row; 1176 int row;
1102 1177
1103 if (screen.cur.col < TermWin.ncol - 1) 1178 if (screen.cur.col < TermWin.ncol - 1)
1104 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1179 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1105 else 1180 else
1106 { 1181 {
1107 row = screen.cur.row + TermWin.saveLines; 1182 row = screen.cur.row + TermWin.saveLines;
1183
1108 if (screen.tlen[row] == 0) 1184 if (screen.tlen[row] == 0)
1109 return; /* um, yeah? */ 1185 return; /* um, yeah? */
1110 else if (screen.tlen[row] == -1) 1186 else if (screen.tlen[row] == -1)
1111 screen.tlen[row] = TermWin.ncol; 1187 screen.tlen[row] = TermWin.ncol;
1188
1112 scr_gotorc (0, 0, R_RELATIVE); 1189 scr_gotorc (0, 0, R_RELATIVE);
1113 scr_insdel_chars (1, DELETE); 1190 scr_insdel_chars (1, DELETE);
1114 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1191 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1115 } 1192 }
1116} 1193}
… …
1124rxvt_term::scr_gotorc (int row, int col, int relative) 1201rxvt_term::scr_gotorc (int row, int col, int relative)
1125{ 1202{
1126 want_refresh = 1; 1203 want_refresh = 1;
1127 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1128 1205
1129 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1130
1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1206 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1132 MAX_IT (screen.cur.col, 0); 1207 MAX_IT (screen.cur.col, 0);
1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1208 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1134 1209
1135 screen.flags &= ~Screen_WrapNext; 1210 screen.flags &= ~Screen_WrapNext;
1211
1136 if (relative & R_RELATIVE) 1212 if (relative & R_RELATIVE)
1137 { 1213 {
1138 if (row > 0) 1214 if (row > 0)
1139 { 1215 {
1140 if (screen.cur.row <= screen.bscroll 1216 if (screen.cur.row <= screen.bscroll
… …
1160 MIN_IT (screen.cur.row, screen.bscroll); 1236 MIN_IT (screen.cur.row, screen.bscroll);
1161 } 1237 }
1162 else 1238 else
1163 screen.cur.row = row; 1239 screen.cur.row = row;
1164 } 1240 }
1241
1165 MAX_IT (screen.cur.row, 0); 1242 MAX_IT (screen.cur.row, 0);
1166 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1243 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1167
1168 while (screen.cur.col > 0
1169 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1170 screen.cur.col--;
1171} 1244}
1172 1245
1173/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1174/* 1247/*
1175 * direction should be UP or DN 1248 * direction should be UP or DN
1176 */ 1249 */
1177void 1250void
1178rxvt_term::scr_index (enum page_dirn direction) 1251rxvt_term::scr_index (enum page_dirn direction)
1179{ 1252{
1180 int dirn; 1253 int dirn;
1181 1254
1182 want_refresh = 1; 1255 want_refresh = 1;
1256 ZERO_SCROLLBACK ();
1257
1183 dirn = ((direction == UP) ? 1 : -1); 1258 dirn = ((direction == UP) ? 1 : -1);
1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1185
1186 ZERO_SCROLLBACK ();
1187 1259
1188 screen.flags &= ~Screen_WrapNext; 1260 screen.flags &= ~Screen_WrapNext;
1261
1189 if ((screen.cur.row == screen.bscroll && direction == UP) 1262 if ((screen.cur.row == screen.bscroll && direction == UP)
1190 || (screen.cur.row == screen.tscroll && direction == DN)) 1263 || (screen.cur.row == screen.tscroll && direction == DN))
1191 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1264 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1192 else 1265 else
1193 screen.cur.row += dirn; 1266 screen.cur.row += dirn;
1267
1194 MAX_IT (screen.cur.row, 0); 1268 MAX_IT (screen.cur.row, 0);
1195 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1269 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1196 selection_check (0); 1270 selection_check (0);
1197} 1271}
1198 1272
… …
1207rxvt_term::scr_erase_line (int mode) 1281rxvt_term::scr_erase_line (int mode)
1208{ 1282{
1209 unsigned int row, col, num; 1283 unsigned int row, col, num;
1210 1284
1211 want_refresh = 1; 1285 want_refresh = 1;
1212 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1213 ZERO_SCROLLBACK (); 1286 ZERO_SCROLLBACK ();
1214 1287
1215 selection_check (1); 1288 selection_check (1);
1216
1217 screen.flags &= ~Screen_WrapNext;
1218 1289
1219 row = TermWin.saveLines + screen.cur.row; 1290 row = TermWin.saveLines + screen.cur.row;
1220 switch (mode) 1291 switch (mode)
1221 { 1292 {
1222 case 0: /* erase to end of line */ 1293 case 0: /* erase to end of line */
… …
1266 int32_t row, row_offset; 1337 int32_t row, row_offset;
1267 rend_t ren; 1338 rend_t ren;
1268 XGCValues gcvalue; 1339 XGCValues gcvalue;
1269 1340
1270 want_refresh = 1; 1341 want_refresh = 1;
1271 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1272 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1343
1273 row_offset = (int32_t)TermWin.saveLines; 1344 row_offset = (int32_t)TermWin.saveLines;
1274 1345
1275 switch (mode) 1346 switch (mode)
1276 { 1347 {
1277 case 0: /* erase to end of screen */ 1348 case 0: /* erase to end of screen */
… …
1313 ren = DEFAULT_RSTYLE; 1384 ren = DEFAULT_RSTYLE;
1314 CLEAR_ROWS (row, num); 1385 CLEAR_ROWS (row, num);
1315 } 1386 }
1316 else 1387 else
1317 { 1388 {
1318 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1319 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1390 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1391 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1321 ERASE_ROWS (row, num); 1392 ERASE_ROWS (row, num);
1322 gcvalue.foreground = PixColors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1394 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1324 } 1395 }
1325 1396
1326 for (; num--; row++) 1397 for (; num--; row++)
1327 { 1398 {
1328 scr_blank_screen_mem (screen.text, screen.rend, 1399 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1329 (unsigned int) (row + row_offset), rstyle);
1330 screen.tlen[row + row_offset] = 0; 1400 screen.tlen[row + row_offset] = 0;
1331 scr_blank_line (drawn_text[row], drawn_rend[row], 1401 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1332 (unsigned int)TermWin.ncol, ren);
1333 } 1402 }
1334} 1403}
1335 1404
1336/* ------------------------------------------------------------------------- */ 1405/* ------------------------------------------------------------------------- */
1337/* 1406/*
… …
1343{ 1412{
1344 int i, j, k; 1413 int i, j, k;
1345 rend_t *r1, fs; 1414 rend_t *r1, fs;
1346 1415
1347 want_refresh = 1; 1416 want_refresh = 1;
1417 ZERO_SCROLLBACK ();
1418
1348 num_scr_allow = 0; 1419 num_scr_allow = 0;
1349 ZERO_SCROLLBACK ();
1350 selection_check (3); 1420 selection_check (3);
1351 1421
1352 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1422 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1353 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1423 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1354 { 1424 {
1355 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1425 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1356 fill_text (screen.text[k], 'E', TermWin.ncol); 1426 fill_text (screen.text[k], 'E', TermWin.ncol);
1357 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1427 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1381 if (insdel == DELETE) 1451 if (insdel == DELETE)
1382 return; 1452 return;
1383 else if (insdel == INSERT) 1453 else if (insdel == INSERT)
1384 count = end; 1454 count = end;
1385 } 1455 }
1386 screen.flags &= ~Screen_WrapNext; 1456
1457 scr_do_wrap ();
1387 1458
1388 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1459 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1389} 1460}
1390 1461
1391/* ------------------------------------------------------------------------- */ 1462/* ------------------------------------------------------------------------- */
… …
1405 ZERO_SCROLLBACK (); 1476 ZERO_SCROLLBACK ();
1406 1477
1407 if (count <= 0) 1478 if (count <= 0)
1408 return; 1479 return;
1409 1480
1481 scr_do_wrap ();
1482
1410 selection_check (1); 1483 selection_check (1);
1411 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1484 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1412 1485
1413 row = screen.cur.row + TermWin.saveLines; 1486 row = screen.cur.row + TermWin.saveLines;
1414 screen.flags &= ~Screen_WrapNext;
1415 1487
1416 stp = screen.text[row]; 1488 stp = screen.text[row];
1417 srp = screen.rend[row]; 1489 srp = screen.rend[row];
1418 slp = & (screen.tlen[row]); 1490 slp = &screen.tlen[row];
1419 1491
1420 switch (insdel) 1492 switch (insdel)
1421 { 1493 {
1422 case INSERT: 1494 case INSERT:
1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1495 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1424 col--)
1425 { 1496 {
1426 stp[col] = stp[col - count]; 1497 stp[col] = stp[col - count];
1427 srp[col] = srp[col - count]; 1498 srp[col] = srp[col - count];
1428 } 1499 }
1429 1500
… …
1439 if (selection.end.row != screen.cur.row 1510 if (selection.end.row != screen.cur.row
1440 || (selection.end.col + count >= TermWin.ncol)) 1511 || (selection.end.col + count >= TermWin.ncol))
1441 CLEAR_SELECTION (); 1512 CLEAR_SELECTION ();
1442 else 1513 else
1443 { /* shift selection */ 1514 { /* shift selection */
1444 selection.beg.col += count; 1515 selection.beg.col += count;
1445 selection.mark.col += count; /* XXX: yes? */ 1516 selection.mark.col += count; /* XXX: yes? */
1446 selection.end.col += count; 1517 selection.end.col += count;
1447 } 1518 }
1448 } 1519 }
1449 1520
1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1521 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1451 (unsigned int)count, rstyle); 1522 (unsigned int)count, rstyle);
1452 break; 1523 break;
1453 1524
1454 case ERASE: 1525 case ERASE:
1455 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1526 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1456 selection_check (1); 1527 selection_check (1);
1457 screen.cur.col -= count; 1528 screen.cur.col -= count;
1458 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1529 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1459 (unsigned int)count, rstyle); 1530 (unsigned int)count, rstyle);
1460 break; 1531 break;
1461 1532
1462 case DELETE: 1533 case DELETE:
1463 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1466 { 1537 {
1467 stp[col] = stp[col + count]; 1538 stp[col] = stp[col + count];
1468 srp[col] = srp[col + count]; 1539 srp[col] = srp[col + count];
1469 } 1540 }
1470 1541
1471 scr_blank_line (& (stp[TermWin.ncol - count]), 1542 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1472 & (srp[TermWin.ncol - count]),
1473 (unsigned int)count, tr); 1543 (unsigned int)count, tr);
1474 1544
1475 if (*slp == -1) /* break line continuation */ 1545 if (*slp == -1) /* break line continuation */
1476 *slp = TermWin.ncol; 1546 *slp = TermWin.ncol;
1477 1547
… …
1486 || selection.end.col >= TermWin.ncol) 1556 || selection.end.col >= TermWin.ncol)
1487 CLEAR_SELECTION (); 1557 CLEAR_SELECTION ();
1488 else 1558 else
1489 { 1559 {
1490 /* shift selection */ 1560 /* shift selection */
1491 selection.beg.col -= count; 1561 selection.beg.col -= count;
1492 selection.mark.col -= count; /* XXX: yes? */ 1562 selection.mark.col -= count; /* XXX: yes? */
1493 selection.end.col -= count; 1563 selection.end.col -= count;
1494 } 1564 }
1495 } 1565 }
1496 1566
1497 break; 1567 break;
1498 } 1568 }
… …
1544rxvt_term::scr_autowrap (int mode) 1614rxvt_term::scr_autowrap (int mode)
1545{ 1615{
1546 if (mode) 1616 if (mode)
1547 screen.flags |= Screen_Autowrap; 1617 screen.flags |= Screen_Autowrap;
1548 else 1618 else
1549 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1619 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1550} 1620}
1551 1621
1552/* ------------------------------------------------------------------------- */ 1622/* ------------------------------------------------------------------------- */
1553/* 1623/*
1554 * Set/unset margin origin mode 1624 * Set/unset margin origin mode
… …
1564{ 1634{
1565 if (mode) 1635 if (mode)
1566 screen.flags |= Screen_Relative; 1636 screen.flags |= Screen_Relative;
1567 else 1637 else
1568 screen.flags &= ~Screen_Relative; 1638 screen.flags &= ~Screen_Relative;
1639
1569 scr_gotorc (0, 0, 0); 1640 scr_gotorc (0, 0, 0);
1570} 1641}
1571 1642
1572/* ------------------------------------------------------------------------- */ 1643/* ------------------------------------------------------------------------- */
1573/* 1644/*
… …
1593 */ 1664 */
1594void 1665void
1595rxvt_term::scr_set_tab (int mode) 1666rxvt_term::scr_set_tab (int mode)
1596{ 1667{
1597 if (mode < 0) 1668 if (mode < 0)
1598 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1669 memset (tabs, 0, TermWin.ncol * sizeof (char));
1599 else if (screen.cur.col < TermWin.ncol) 1670 else if (screen.cur.col < TermWin.ncol)
1600 tabs[screen.cur.col] = (mode ? 1 : 0); 1671 tabs[screen.cur.col] = (mode ? 1 : 0);
1601} 1672}
1602 1673
1603/* ------------------------------------------------------------------------- */ 1674/* ------------------------------------------------------------------------- */
… …
1607 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1678 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1608 */ 1679 */
1609void 1680void
1610rxvt_term::scr_rvideo_mode (int mode) 1681rxvt_term::scr_rvideo_mode (int mode)
1611{ 1682{
1612 XGCValues gcvalue; 1683 XGCValues gcvalue;
1613 1684
1614 if (rvideo != mode) 1685 if (rvideo != mode)
1615 { 1686 {
1616 rvideo = mode; 1687 rvideo = mode;
1617 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1688 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1618#if defined(XPM_BACKGROUND) 1689#if XPM_BACKGROUND
1619 if (bgPixmap.pixmap == None) 1690 if (bgPixmap.pixmap == None)
1620#endif 1691#endif
1621#if defined(TRANSPARENT) 1692#if TRANSPARENT
1622 if (! (Options & Opt_transparent) || am_transparent == 0) 1693 if (! (options & Opt_transparent) || am_transparent == 0)
1623#endif 1694#endif
1624 XSetWindowBackground (display->display, TermWin.vt, 1695 XSetWindowBackground (display->display, TermWin.vt,
1625 PixColors[Color_bg]); 1696 pix_colors[Color_bg]);
1626 1697
1627 gcvalue.foreground = PixColors[Color_fg]; 1698 gcvalue.foreground = pix_colors[Color_fg];
1628 gcvalue.background = PixColors[Color_bg]; 1699 gcvalue.background = pix_colors[Color_bg];
1629 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1700 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1630 &gcvalue); 1701 &gcvalue);
1631 scr_clear (); 1702 scr_clear ();
1632 scr_touch (true); 1703 scr_touch (true);
1633 } 1704 }
… …
1681 * XTERM_SEQ: Invoke G2 character set: ESC N 1752 * XTERM_SEQ: Invoke G2 character set: ESC N
1682 * XTERM_SEQ: Invoke G3 character set: ESC O 1753 * XTERM_SEQ: Invoke G3 character set: ESC O
1683 */ 1754 */
1684void 1755void
1685rxvt_term::scr_charset_choose (int set) 1756rxvt_term::scr_charset_choose (int set)
1686 { 1757{
1687 screen.charset = set; 1758 screen.charset = set;
1688 set_font_style (); 1759 set_font_style ();
1689 } 1760}
1690 1761
1691/* ------------------------------------------------------------------------- */ 1762/* ------------------------------------------------------------------------- */
1692/* 1763/*
1693 * Set a font 1764 * Set a font
1694 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1765 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1697 * XTERM_SEQ: Set G3 character set: ESC + <C> 1768 * XTERM_SEQ: Set G3 character set: ESC + <C>
1698 * See set_font_style for possible values for <C> 1769 * See set_font_style for possible values for <C>
1699 */ 1770 */
1700void 1771void
1701rxvt_term::scr_charset_set (int set, unsigned int ch) 1772rxvt_term::scr_charset_set (int set, unsigned int ch)
1702 { 1773{
1703 charsets[set] = (unsigned char)ch; 1774 charsets[set] = (unsigned char)ch;
1704 set_font_style (); 1775 set_font_style ();
1705 } 1776}
1706 1777
1707 1778
1708/* ------------------------------------------------------------------------- * 1779/* ------------------------------------------------------------------------- *
1709 * MAJOR SCREEN MANIPULATION * 1780 * MAJOR SCREEN MANIPULATION *
1710 * ------------------------------------------------------------------------- */ 1781 * ------------------------------------------------------------------------- */
… …
1778 { 1849 {
1779 MIN_IT (rc[i].col, TermWin.ncol - 1); 1850 MIN_IT (rc[i].col, TermWin.ncol - 1);
1780 MIN_IT (rc[i].row, TermWin.nrow - 1); 1851 MIN_IT (rc[i].row, TermWin.nrow - 1);
1781 } 1852 }
1782 1853
1783 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1784
1785 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1854 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1786 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1855 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1787 1856
1788 if (refresh) 1857 if (refresh)
1789 scr_refresh (SLOW_REFRESH); 1858 scr_refresh (SLOW_REFRESH);
… …
1806 */ 1875 */
1807int 1876int
1808rxvt_term::scr_move_to (int y, int len) 1877rxvt_term::scr_move_to (int y, int len)
1809{ 1878{
1810 long p = 0; 1879 long p = 0;
1811 uint16_t oldviewstart; 1880 unsigned int oldviewstart;
1812 1881
1813 oldviewstart = TermWin.view_start; 1882 oldviewstart = TermWin.view_start;
1883
1814 if (y < len) 1884 if (y < len)
1815 { 1885 {
1816 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1886 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1817 p -= (long) (TermWin.nrow - 1); 1887 p -= (long) (TermWin.nrow - 1);
1818 p = max (p, 0); 1888 p = max (p, 0);
1819 } 1889 }
1890
1820 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1891 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1821 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1822 1892
1823 return scr_changeview (oldviewstart); 1893 return scr_changeview (oldviewstart);
1824} 1894}
1825 1895
1826/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
… …
1830 */ 1900 */
1831int 1901int
1832rxvt_term::scr_page (enum page_dirn direction, int nlines) 1902rxvt_term::scr_page (enum page_dirn direction, int nlines)
1833{ 1903{
1834 int n; 1904 int n;
1835 uint16_t oldviewstart; 1905 unsigned int oldviewstart;
1836 1906
1837 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1838#ifdef DEBUG_STRICT 1907#ifdef DEBUG_STRICT
1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1908 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1840#endif 1909#endif
1841 oldviewstart = TermWin.view_start; 1910 oldviewstart = TermWin.view_start;
1842 if (direction == UP) 1911 if (direction == UP)
… …
1851 } 1920 }
1852 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1853} 1922}
1854 1923
1855int 1924int
1856rxvt_term::scr_changeview (uint16_t oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
1857{ 1926{
1858 if (TermWin.view_start != oldviewstart) 1927 if (TermWin.view_start != oldviewstart)
1859 { 1928 {
1860 want_refresh = 1; 1929 want_refresh = 1;
1861 num_scr -= (TermWin.view_start - oldviewstart); 1930 num_scr -= (TermWin.view_start - oldviewstart);
… …
1869rxvt_term::scr_bell () 1938rxvt_term::scr_bell ()
1870{ 1939{
1871#ifndef NO_BELL 1940#ifndef NO_BELL
1872# ifndef NO_MAPALERT 1941# ifndef NO_MAPALERT
1873# ifdef MAPALERT_OPTION 1942# ifdef MAPALERT_OPTION
1874 if (Options & Opt_mapAlert) 1943 if (options & Opt_mapAlert)
1875# endif 1944# endif
1876 XMapWindow (display->display, TermWin.parent[0]); 1945 XMapWindow (display->display, TermWin.parent[0]);
1877# endif 1946# endif
1878 if (Options & Opt_visualBell) 1947 if (options & Opt_visualBell)
1879 { 1948 {
1880 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1950 scr_rvideo_mode (!rvideo); /* refresh also done */
1882 } 1951 }
1883 else 1952 else
… …
1889/* ARGSUSED */ 1958/* ARGSUSED */
1890void 1959void
1891rxvt_term::scr_printscreen (int fullhist) 1960rxvt_term::scr_printscreen (int fullhist)
1892{ 1961{
1893#ifdef PRINTPIPE 1962#ifdef PRINTPIPE
1894 int i, r1, nrows, row_offset; 1963 int i, r1, nrows, row_offset;
1895 text_t *t; 1964 FILE *fd;
1896 FILE *fd;
1897 1965
1898 if ((fd = popen_printer ()) == NULL) 1966 if ((fd = popen_printer ()) == NULL)
1899 return; 1967 return;
1968
1900 nrows = TermWin.nrow; 1969 nrows = TermWin.nrow;
1901 row_offset = TermWin.saveLines; 1970 row_offset = TermWin.saveLines;
1971
1902 if (!fullhist) 1972 if (!fullhist)
1903 row_offset -= TermWin.view_start; 1973 row_offset -= TermWin.view_start;
1904 else 1974 else
1905 { 1975 {
1906 nrows += TermWin.nscrolled; 1976 nrows += TermWin.nscrolled;
1907 row_offset -= TermWin.nscrolled; 1977 row_offset -= TermWin.nscrolled;
1908 } 1978 }
1909 1979
1980 wctomb (0, 0);
1981
1910 for (r1 = 0; r1 < nrows; r1++) 1982 for (r1 = 0; r1 < nrows; r1++)
1911 { 1983 {
1912 t = screen.text[r1 + row_offset]; 1984 text_t *tp = screen.text[r1 + row_offset];
1913 for (i = TermWin.ncol - 1; i >= 0; i--) 1985 int len = screen.tlen[r1 + row_offset];
1914 if (!isspace (t[i])) 1986
1915 break; 1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1916 fprintf (fd, "%.*s\n", (i + 1), t); 1988 {
1989 char mb[MB_LEN_MAX];
1990 text_t t = *tp++;
1991 if (t == NOCHAR)
1992 continue;
1993
1994 len = wctomb (mb, t);
1995
1996 if (len <= 0)
1997 {
1998 mb[0] = ' ';
1999 len = 1;
2000 }
2001
2002 fwrite (mb, 1, len, fd);
2003 }
2004
2005 fputc ('\n', fd);
1917 } 2006 }
2007
1918 pclose_printer (fd); 2008 pclose_printer (fd);
1919#endif 2009#endif
1920} 2010}
1921 2011
1922/* ------------------------------------------------------------------------- */ 2012/* ------------------------------------------------------------------------- */
… …
1937 2027
1938void 2028void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 2029rxvt_term::scr_refresh (unsigned char refresh_type)
1940{ 2030{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 2031 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 rvid, /* reverse video this position */
1943 showcursor; /* show the cursor */ 2032 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
1946 int i, /* tmp */ 2035 int i, /* tmp */
1947 row_offset; /* basic offset in screen structure */ 2036 row_offset; /* basic offset in screen structure */
1948#ifndef NO_CURSORCOLOR 2037#ifndef NO_CURSORCOLOR
1949 rend_t cc1; /* store colours at cursor position (s) */ 2038 rend_t cc1; /* store colours at cursor position (s) */
1950#endif 2039#endif
1951 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2040 rend_t *crp; // cursor rendition pointer
1952 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2041
2042 want_refresh = 0; /* screen is current */
1953 2043
1954 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2044 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1955 return; 2045 return;
1956 2046
1957 /* 2047 /*
1958 * A: set up vars 2048 * A: set up vars
1959 */ 2049 */
1960 must_clear = 0; 2050 must_clear = 0;
1961
1962 refresh_count = 0; 2051 refresh_count = 0;
1963 2052
1964 row_offset = TermWin.saveLines - TermWin.view_start; 2053 row_offset = TermWin.saveLines - TermWin.view_start;
1965 2054
1966#ifdef XPM_BACKGROUND 2055#if XPM_BACKGROUND
1967 must_clear |= (bgPixmap.pixmap != None); 2056 must_clear |= (bgPixmap.pixmap != None);
1968#endif 2057#endif
1969#ifdef TRANSPARENT 2058#if TRANSPARENT
1970 must_clear |= ((Options & Opt_transparent) && am_transparent); 2059 must_clear |= ((options & Opt_transparent) && am_transparent);
1971#endif 2060#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 2062
1974 /* 2063 /*
1975 * B: reverse any characters which are selected 2064 * B: reverse any characters which are selected
… …
1990 showcursor = 0; 2079 showcursor = 0;
1991#endif 2080#endif
1992 2081
1993 if (showcursor) 2082 if (showcursor)
1994 { 2083 {
2084 int col = screen.cur.col;
2085
2086 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2087 col--;
2088
1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2089 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1996 2090
1997 if (showcursor && TermWin.focus) 2091 if (showcursor && TermWin.focus)
1998 { 2092 {
1999 *srp ^= RS_RVid; 2093 *crp ^= RS_RVid;
2000#ifndef NO_CURSORCOLOR 2094#ifndef NO_CURSORCOLOR
2001 cc1 = *srp & (RS_fgMask | RS_bgMask); 2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2002 if (ISSET_PIXCOLOR (Color_cursor)) 2096 if (ISSET_PIXCOLOR (Color_cursor))
2003 ccol1 = Color_cursor; 2097 ccol1 = Color_cursor;
2004 else 2098 else
2005#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2006 ccol1 = GET_FGCOLOR (rstyle); 2100 ccol1 = GET_FGCOLOR (rstyle);
… …
2013#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2014 ccol2 = GET_BGCOLOR (rstyle); 2108 ccol2 = GET_BGCOLOR (rstyle);
2015#else 2109#else
2016 ccol2 = Color_bg; 2110 ccol2 = Color_bg;
2017#endif 2111#endif
2018 *srp = SET_FGCOLOR (*srp, ccol1); 2112 *crp = SET_FGCOLOR (*crp, ccol1);
2019 *srp = SET_BGCOLOR (*srp, ccol2); 2113 *crp = SET_BGCOLOR (*crp, ccol2);
2020#endif 2114#endif
2021 } 2115 }
2022 } 2116 }
2023 2117
2024 /* make sure no outline cursor is left around */ 2118 /* make sure no outline cursor is left around */
… …
2051 oldcursor.col = screen.cur.col; 2145 oldcursor.col = screen.cur.col;
2052 } 2146 }
2053 } 2147 }
2054 } 2148 }
2055 2149
2150#if ENABLE_OVERLAY
2151 scr_swap_overlay ();
2152#endif
2153
2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156
2056#ifndef NO_SLOW_LINK_SUPPORT 2157#ifndef NO_SLOW_LINK_SUPPORT
2057 /* 2158 /*
2058 * D: CopyArea pass - very useful for slower links 2159 * D: CopyArea pass - very useful for slower links
2059 * This has been deliberately kept simple. 2160 * This has been deliberately kept simple.
2060 */ 2161 */
… …
2063 && refresh_type == FAST_REFRESH && num_scr_allow && i 2164 && refresh_type == FAST_REFRESH && num_scr_allow && i
2064 && abs (i) < TermWin.nrow && !must_clear) 2165 && abs (i) < TermWin.nrow && !must_clear)
2065 { 2166 {
2066 int16_t nits; 2167 int16_t nits;
2067 int j; 2168 int j;
2068 rend_t *drp2;
2069 text_t *dtp2;
2070 int len, wlen; 2169 int len, wlen;
2071 2170
2072 j = TermWin.nrow; 2171 j = TermWin.nrow;
2073 wlen = len = -1; 2172 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1; 2173 row = i > 0 ? 0 : j - 1;
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2174 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2175 {
2077 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2176 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2078 { 2177 {
2079 stp = screen.text[row + row_offset]; 2178 text_t *stp = screen.text[row + row_offset];
2080 srp = screen.rend[row + row_offset]; 2179 rend_t *srp = screen.rend[row + row_offset];
2081 dtp = drawn_text[row]; 2180 text_t *dtp = drawn_text[row];
2082 dtp2 = drawn_text[row + i]; 2181 text_t *dtp2 = drawn_text[row + i];
2083 drp = drawn_rend[row]; 2182 rend_t *drp = drawn_rend[row];
2084 drp2 = drawn_rend[row + i]; 2183 rend_t *drp2 = drawn_rend[row + i];
2085 2184
2086 for (nits = 0, col = TermWin.ncol; col--; ) 2185 for (nits = 0, col = TermWin.ncol; col--; )
2087 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2186 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2088 nits--; 2187 nits--;
2089 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2188 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2109 { 2208 {
2110 /* also comes here at end if needed because of >= above */ 2209 /* also comes here at end if needed because of >= above */
2111 if (wlen < len) 2210 if (wlen < len)
2112 SWAP_IT (wlen, len, int); 2211 SWAP_IT (wlen, len, int);
2113 2212
2114 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2115 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2213 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2116 TermWin.gc, 0, Row2Pixel (len + i), 2214 TermWin.gc, 0, Row2Pixel (len + i),
2117 (unsigned int)TermWin_TotalWidth (), 2215 (unsigned int)TermWin_TotalWidth (),
2118 (unsigned int)Height2Pixel (wlen - len + 1), 2216 (unsigned int)Height2Pixel (wlen - len + 1),
2119 0, Row2Pixel (len)); 2217 0, Row2Pixel (len));
… …
2126 /* 2224 /*
2127 * E: main pass across every character 2225 * E: main pass across every character
2128 */ 2226 */
2129 for (row = 0; row < TermWin.nrow; row++) 2227 for (row = 0; row < TermWin.nrow; row++)
2130 { 2228 {
2131 stp = screen.text[row + row_offset]; 2229 text_t *stp = screen.text[row + row_offset];
2132 srp = screen.rend[row + row_offset]; 2230 rend_t *srp = screen.rend[row + row_offset];
2133 dtp = drawn_text[row]; 2231 text_t *dtp = drawn_text[row];
2134 drp = drawn_rend[row]; 2232 rend_t *drp = drawn_rend[row];
2135 2233
2136 /* 2234 /*
2137 * E2: OK, now the real pass 2235 * E2: OK, now the real pass
2138 */ 2236 */
2139 int ypixel = (int)Row2Pixel (row); 2237 int ypixel = (int)Row2Pixel (row);
2140 2238
2141 for (col = 0; col < TermWin.ncol; col++) 2239 for (col = 0; col < TermWin.ncol; col++)
2142 { 2240 {
2143 /* compare new text with old - if exactly the same then continue */ 2241 /* compare new text with old - if exactly the same then continue */
2144 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2242 if (stp[col] == dtp[col] /* Must match characters to skip. */
2145 && (srp[col] == drp[col] /* Either rendition the same or */ 2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2146 || (stp[col] == ' ' /* space w/ no background change */ 2244 || (stp[col] == ' ' /* space w/ no background change */
2147 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2148 continue; 2246 continue;
2149 2247
2150 // redraw one or more characters 2248 // redraw one or more characters
2151 2249
2152 // seek to the beginning if wide characters 2250 // seek to the beginning of wide characters
2153 while (stp[col] == NOCHAR && col > 0) 2251 while (stp[col] == NOCHAR && col > 0)
2154 --col; 2252 --col;
2155 2253
2156 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2157 text_t *text = stp + col; 2255 text_t *text = stp + col;
… …
2160 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2161 drp[col] = rend; 2259 drp[col] = rend;
2162 2260
2163 int xpixel = Col2Pixel (col); 2261 int xpixel = Col2Pixel (col);
2164 2262
2165 // this loop looks very messy, it can probably be optimized
2166 // and cleaned a bit by you?
2167 for (i = 0; ++col < TermWin.ncol; ) 2263 for (i = 0; ++col < TermWin.ncol; )
2168 { 2264 {
2169 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2170 { 2266 {
2171 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2172 drp[col] = rend; 2268 drp[col] = rend;
2173 count++; 2269 count++;
2174
2175 if (i) // only possible skip if char unchanged
2176 i++; 2270 i++;
2177 2271
2178 continue; 2272 continue;
2179 } 2273 }
2180 2274
2181 if (rend != srp[col]) 2275 if (!RS_SAME (rend, srp[col]))
2182 break; 2276 break;
2183 2277
2184 count++; 2278 count++;
2185 2279
2186 if (stp[col] != dtp[col] 2280 if (stp[col] != dtp[col]
2187 || srp[col] != drp[col]) 2281 || !RS_SAME (srp[col], drp[col]))
2188 { 2282 {
2189 if (must_clear && (i++ > (count / 2))) 2283 if (must_clear && (i++ > count / 2))
2190 break; 2284 break;
2191 2285
2192 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
2193 drp[col] = rend; 2287 drp[col] = rend;
2194 i = 0; 2288 i = 0;
2195 } 2289 }
2196 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2290 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2197 break; 2291 break;
2198 } 2292 }
2199 2293
2200 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2201 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2296
2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2298 while (i && text[count] == NOCHAR)
2299 count++, i--;
2300
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2202 2312
2203 /* 2313 /*
2204 * Determine the attributes for the string 2314 * Determine the attributes for the string
2205 */ 2315 */
2206 int fid = GET_FONT (rend);
2207 int fore = GET_FGCOLOR (rend); // desired foreground 2316 int fore = GET_FGCOLOR (rend); // desired foreground
2208 int back = GET_BGCOLOR (rend); // desired background 2317 int back = GET_BGCOLOR (rend); // desired background
2209 2318
2210 rend = GET_ATTR (rend); 2319 // only do special processing if ana attributes are set, which is rare
2211 2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2212 rvid = !!(rend & RS_RVid); 2321 {
2322 bool invert = rend & RS_RVid;
2213 2323
2214#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2325 if (rend & RS_Bold
2326 && fore == Color_fg)
2216 { 2327 {
2217 if (ISSET_PIXCOLOR (Color_BD)) 2328 if (ISSET_PIXCOLOR (Color_BD))
2218 fore = Color_BD; 2329 fore = Color_BD;
2330# if !ENABLE_STYLES
2219 else 2331 else
2220 rvid = !rvid; 2332 invert = !invert;
2333# endif
2334 }
2335
2336 if (rend & RS_Italic
2337 && fore == Color_fg)
2338 {
2339 if (ISSET_PIXCOLOR (Color_IT))
2340 fore = Color_IT;
2341# if !ENABLE_STYLES
2342 else
2343 invert = !invert;
2344# endif
2345 }
2346
2347 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2348 fore = Color_UL;
2349#endif
2350
2351 if (invert)
2352 {
2353 SWAP_IT (fore, back, int);
2354
2355#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV;
2358#endif
2359 }
2360
2361#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2363 {
2364 if (!text_blink_ev.active)
2365 {
2366 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2367 hidden_text = 0;
2368 }
2369 else if (hidden_text)
2370 fore = back;
2371 }
2372#endif
2221 } 2373 }
2222
2223 if (rend & RS_Uline)
2224 if (ISSET_PIXCOLOR (Color_UL))
2225 fore = Color_UL;
2226#endif
2227
2228 if (rvid)
2229 {
2230 SWAP_IT (fore, back, int);
2231
2232#ifndef NO_BOLD_UNDERLINE_REVERSE
2233 if (ISSET_PIXCOLOR (Color_RV)
2234# ifndef NO_CURSORCOLOR
2235 && !ISSET_PIXCOLOR (Color_cursor)
2236# endif
2237 )
2238 back = Color_RV;
2239#endif
2240 }
2241
2242#ifdef TEXT_BLINK
2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2244 {
2245 if (!text_blink_ev.active)
2246 {
2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2248 hidden_text = 0;
2249 }
2250 else if (hidden_text)
2251 fore = back;
2252 }
2253#endif
2254 2374
2255 /* 2375 /*
2256 * Actually do the drawing of the string here 2376 * Actually do the drawing of the string here
2257 */ 2377 */
2258 rxvt_font *font = (*TermWin.fontset)[fid]; 2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2259 2379
2260 if (back == fore) 2380 if (back == fore)
2261 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2262 TermWin.fwidth * count, TermWin.fheight, 2382 TermWin.fwidth * count, TermWin.fheight,
2263 back); 2383 back);
… …
2279 } 2399 }
2280 else 2400 else
2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2282 2402
2283 if (rend & RS_Uline && font->descent > 1 && fore != back) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 {
2405 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2284 XDrawLine (display->display, drawBuffer, TermWin.gc, 2406 XDrawLine (display->display, drawBuffer, TermWin.gc,
2285 xpixel, ypixel + font->ascent + 1, 2407 xpixel, ypixel + font->ascent + 1,
2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2408 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2409 }
2287 } /* for (col....) */ 2410 } /* for (col....) */
2288 } /* for (row....) */ 2411 } /* for (row....) */
2412
2413#if ENABLE_OVERLAY
2414 scr_swap_overlay ();
2415#endif
2289 2416
2290 /* 2417 /*
2291 * G: cleanup cursor and display outline cursor if necessary 2418 * G: cleanup cursor and display outline cursor if necessary
2292 */ 2419 */
2293 if (showcursor) 2420 if (showcursor)
2294 { 2421 {
2295 if (TermWin.focus) 2422 if (TermWin.focus)
2296 { 2423 {
2297 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2298 [screen.cur.col]);
2299 *srp ^= RS_RVid; 2424 *crp ^= RS_RVid;
2300#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2301 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2426 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2302#endif 2427#endif
2303 } 2428 }
2304 else if (oldcursor.row >= 0) 2429 else if (oldcursor.row >= 0)
2305 { 2430 {
2306#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2307 if (ISSET_PIXCOLOR (Color_cursor)) 2432 if (ISSET_PIXCOLOR (Color_cursor))
2308 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2433 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2309#endif 2434#endif
2310 int cursorwidth = 1; 2435 int cursorwidth = 1;
2311 while (oldcursor.col + cursorwidth < TermWin.ncol 2436 while (oldcursor.col + cursorwidth < TermWin.ncol
2312 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2437 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2313 cursorwidth++; 2438 cursorwidth++;
… …
2328 if (refresh_type & SMOOTH_REFRESH) 2453 if (refresh_type & SMOOTH_REFRESH)
2329 XFlush (display->display); 2454 XFlush (display->display);
2330 2455
2331 num_scr = 0; 2456 num_scr = 0;
2332 num_scr_allow = 1; 2457 num_scr_allow = 1;
2333 want_refresh = 0; /* screen is current */
2334} 2458}
2335 2459
2336void 2460void
2337rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2461rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2338{ 2462{
2339 if (!rp || !tp) 2463 if (!rp || !tp)
2340 return; 2464 return;
2341 2465
2342 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2466 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2343 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2467 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2344} 2468}
2345 2469
2346void 2470void
2347rxvt_term::scr_remap_chars () 2471rxvt_term::scr_remap_chars ()
2348{ 2472{
… …
2354 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2478 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2355 scr_remap_chars (swap.text[i], swap.rend[i]); 2479 scr_remap_chars (swap.text[i], swap.rend[i]);
2356 } 2480 }
2357} 2481}
2358 2482
2483void
2484rxvt_term::scr_recolour ()
2485{
2486 if (1
2487#if TRANSPARENT
2488 && !am_transparent
2489#endif
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 )
2494 {
2495 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2496 XClearWindow (display->display, TermWin.parent[0]);
2497 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS
2499 if (scrollBar.win)
2500 {
2501 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle ();
2503 scrollbar_show (0);
2504 }
2505#endif
2506 }
2507
2508 scr_clear ();
2509 scr_touch (true);
2510 want_refresh = 1;
2511}
2512
2359/* ------------------------------------------------------------------------- */ 2513/* ------------------------------------------------------------------------- */
2360void 2514void
2361rxvt_term::scr_clear (bool really) 2515rxvt_term::scr_clear (bool really)
2362{ 2516{
2363 if (!TermWin.mapped) 2517 if (!TermWin.mapped)
2364 return; 2518 return;
2365 2519
2366 num_scr_allow = 0; 2520 num_scr_allow = 0;
2367 want_refresh = 1; 2521 want_refresh = 1;
2368 2522
2369#ifdef TRANSPARENT 2523#if TRANSPARENT
2370 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2524 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2371 { 2525 {
2372 int i; 2526 int i;
2373 2527
2374 if (! (Options & Opt_transparent_all)) 2528 if (!(options & Opt_transparent_all))
2375 i = 0; 2529 i = 0;
2376 else 2530 else
2377 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2531 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2378 2532
2379 while (i--) 2533 while (i--)
… …
2395 int end_row = TermWin.saveLines - TermWin.view_start; 2549 int end_row = TermWin.saveLines - TermWin.view_start;
2396 int i = selection.beg.row + TermWin.saveLines; 2550 int i = selection.beg.row + TermWin.saveLines;
2397 int col, row = selection.end.row + TermWin.saveLines; 2551 int col, row = selection.end.row + TermWin.saveLines;
2398 rend_t *srp; 2552 rend_t *srp;
2399 2553
2400 if (i >= end_row) 2554#if ENABLE_FRILLS
2401 col = selection.beg.col; 2555 if (selection.rect)
2556 {
2557 end_row += TermWin.nrow;
2558
2559 for (; i <= row && i <= end_row; i++)
2560 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2561 srp[col] ^= RS_RVid;
2562 }
2402 else 2563 else
2564#endif
2565 {
2566 if (i >= end_row)
2567 col = selection.beg.col;
2568 else
2403 { 2569 {
2404 col = 0; 2570 col = 0;
2405 i = end_row; 2571 i = end_row;
2406 } 2572 }
2407 2573
2408 end_row += TermWin.nrow; 2574 end_row += TermWin.nrow;
2575
2409 for (; i < row && i < end_row; i++, col = 0) 2576 for (; i < row && i < end_row; i++, col = 0)
2410 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2577 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2411 srp[col] ^= RS_RVid; 2578 srp[col] ^= RS_RVid;
2412 2579
2413 if (i == row && i < end_row) 2580 if (i == row && i < end_row)
2414 for (srp = screen.rend[i]; col < selection.end.col; col++) 2581 for (srp = screen.rend[i]; col < selection.end.col; col++)
2415 srp[col] ^= RS_RVid; 2582 srp[col] ^= RS_RVid;
2583 }
2416 } 2584 }
2417} 2585}
2418 2586
2419/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2420/* 2588/*
… …
2456 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2624 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2457 */ 2625 */
2458void 2626void
2459rxvt_term::selection_check (int check_more) 2627rxvt_term::selection_check (int check_more)
2460{ 2628{
2461 row_col_t pos; 2629 row_col_t pos;
2462 2630
2463 if (!selection.op) 2631 if (!selection.op)
2464 return; 2632 return;
2465 2633
2466 pos.row = pos.col = 0; 2634 pos.row = pos.col = 0;
… …
2488/* ------------------------------------------------------------------------- */ 2656/* ------------------------------------------------------------------------- */
2489/* 2657/*
2490 * Paste a selection direct to the command fd 2658 * Paste a selection direct to the command fd
2491 */ 2659 */
2492void 2660void
2493rxvt_term::paste (const unsigned char *data, unsigned int len) 2661rxvt_term::paste (unsigned char *data, unsigned int len)
2494{ 2662{
2495 unsigned int i, j, n;
2496 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2497
2498#if 0
2499 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2500 ZERO_SCROLLBACK (r);
2501#endif
2502
2503 /* convert normal newline chars into common keyboard Return key sequence */ 2663 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (i = 0; i < len; i += PROP_SIZE) 2664 for (unsigned int i = 0; i < len; i++)
2505 {
2506 n = min (len - i, PROP_SIZE);
2507 MEMCPY (ds, data + i, n);
2508
2509 for (j = 0; j < n; j++)
2510 if (ds[j] == C0_LF) 2665 if (data[i] == C0_LF)
2511 ds[j] = C0_CR; 2666 data[i] = C0_CR;
2512 2667
2513 tt_write (ds, (int)n); 2668 tt_write (data, len);
2514 }
2515
2516 free (ds);
2517} 2669}
2518 2670
2519/* ------------------------------------------------------------------------- */ 2671/* ------------------------------------------------------------------------- */
2520/* 2672/*
2521 * Respond to a notification that a primary selection has been sent 2673 * Respond to a notification that a primary selection has been sent
2522 * EXT: SelectionNotify 2674 * EXT: SelectionNotify
2523 */ 2675 */
2524int 2676void
2525rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2677rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2526{ 2678{
2527 long nread = 0;
2528 unsigned long bytes_after;
2529 XTextProperty ct;
2530
2531 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2532
2533 if (prop == None) /* check for failed XConvertSelection */ 2679 if (prop == None) /* check for failed XConvertSelection */
2534 { 2680 {
2535 if ((selection_type & Sel_CompoundText)) 2681 if ((selection_type & Sel_CompoundText))
2536 { 2682 {
2537 int selnum = selection_type & Sel_whereMask; 2683 int selnum = selection_type & Sel_whereMask;
… …
2550 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2696 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2551 else 2697 else
2552 selection_type = 0; 2698 selection_type = 0;
2553 } 2699 }
2554 2700
2555 return 0; 2701 return;
2556 }
2557
2558 for (;;)
2559 { 2702 }
2703
2704 unsigned long bytes_after;
2705 XTextProperty ct;
2706
2707 if (XGetWindowProperty (display->display, win, prop,
2708 0, PROP_SIZE / 4,
2709 delete_prop, AnyPropertyType,
2710 &ct.encoding, &ct.format,
2711 &ct.nitems, &bytes_after,
2712 &ct.value) != Success)
2713 {
2714 ct.value = 0;
2715 goto bailout;
2716 }
2717
2718 if (ct.encoding == None)
2719 goto bailout;
2720
2721 if (bytes_after)
2722 {
2723 // fetch and append remaining data
2724 XTextProperty ct2;
2725
2560 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2726 if (XGetWindowProperty (display->display, win, prop,
2561 (long) (PROP_SIZE / 4), delete_prop, 2727 ct.nitems / 4, (bytes_after + 3) / 4,
2728 delete_prop, AnyPropertyType,
2562 AnyPropertyType, &ct.encoding, &ct.format, 2729 &ct2.encoding, &ct2.format,
2563 &ct.nitems, &bytes_after, 2730 &ct2.nitems, &bytes_after,
2564 &ct.value) != Success) 2731 &ct2.value) != Success)
2565 break; 2732 goto bailout;
2566 2733
2567 if (ct.encoding == 0) 2734 // realloc should be compatible to XFree, here, and elsewhere, too
2568 { 2735 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2736 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2570 break; 2737 ct.nitems += ct2.nitems;
2571 } 2738
2739 XFree (ct2.value);
2740 }
2741
2742 if (ct.value == 0)
2743 goto bailout;
2744
2572 else if (ct.encoding == xa[XA_INCR]) 2745 if (ct.encoding == xa[XA_INCR])
2573 { 2746 {
2574 // INCR selection, start handshake 2747 // INCR selection, start handshake
2748 if (!delete_prop)
2575 XDeleteProperty (display->display, win, prop); 2749 XDeleteProperty (display->display, win, prop);
2750
2576 selection_wait = Sel_incr; 2751 selection_wait = Sel_incr;
2752 incr_buf_fill = 0;
2577 incr_ev.start (NOW + 10); 2753 incr_ev.start (NOW + 10);
2578 break;
2579 }
2580 2754
2581 if (ct.value == NULL) 2755 goto bailout;
2582 { 2756 }
2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2584 continue;
2585 }
2586 2757
2587 if (ct.nitems == 0) 2758 if (ct.nitems == 0)
2759 {
2760 if (selection_wait == Sel_incr)
2761 {
2762 XFree (ct.value);
2763
2764 // finally complete, now paste the whole thing
2765 selection_wait = Sel_normal;
2766 ct.value = (unsigned char *)incr_buf;
2767 ct.nitems = incr_buf_fill;
2768 incr_buf = 0;
2769 incr_buf_size = 0;
2770 incr_ev.stop ();
2588 { 2771 }
2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2772 else
2590 2773 {
2591 if (selection_wait == Sel_normal && nread == 0 2774 if (selection_wait == Sel_normal
2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2593 { 2776 {
2594 /* 2777 /*
2595 * pass through again trying CUT_BUFFER0 if we've come from 2778 * pass through again trying CUT_BUFFER0 if we've come from
2596 * XConvertSelection () but nothing was presented 2779 * XConvertSelection () but nothing was presented
2597 */ 2780 */
2598 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2599 selection_paste (display->root, XA_CUT_BUFFER0, False); 2781 selection_paste (display->root, XA_CUT_BUFFER0, False);
2600 } 2782 }
2601 2783
2602 nread = -1; /* discount any previous stuff */ 2784 goto bailout;
2603 break; 2785 }
2786 }
2787 else if (selection_wait == Sel_incr)
2788 {
2789 incr_ev.start (NOW + 10);
2790
2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2604 } 2792 {
2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2795 }
2605 2796
2797 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2606 nread += ct.nitems; 2798 incr_buf_fill += ct.nitems;
2607 2799
2800 goto bailout;
2801 }
2802
2608 char **cl; 2803 char **cl;
2609 int cr; 2804 int cr;
2805
2806#if ENABLE_FRILLS
2807 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2808 // so recode it manually
2809 if (ct.encoding == xa[XA_UTF8_STRING])
2810 {
2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2812 char *s = rxvt_wcstombs (w);
2813 free (w);
2814 // TODO: strlen == only the first element will be converted. well...
2815 paste ((unsigned char *)s, strlen (s));
2816 free (s);
2817 }
2818 else
2819#endif
2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2820 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2611 { 2821 && cl)
2822 {
2612 for (int i = 0; i < cr; i++) 2823 for (int i = 0; i < cr; i++)
2613 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2824 paste ((unsigned char *)cl[i], strlen (cl[i]));
2614 2825
2615 XFreeStringList (cl); 2826 XFreeStringList (cl);
2616 } 2827 }
2617 else 2828 else
2618 paste (ct.value, ct.nitems); 2829 paste (ct.value, ct.nitems); // paste raw
2619 2830
2620 if (bytes_after == 0) 2831bailout:
2621 break;
2622
2623 XFree (ct.value);
2624 }
2625
2626 if (ct.value)
2627 XFree (ct.value); 2832 XFree (ct.value);
2628 2833
2629 if (selection_wait == Sel_normal) 2834 if (selection_wait == Sel_normal)
2630 selection_wait = Sel_none; 2835 selection_wait = Sel_none;
2631
2632 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2633 return (int)nread;
2634} 2836}
2635 2837
2636void 2838void
2637rxvt_term::incr_cb (time_watcher &w) 2839rxvt_term::incr_cb (time_watcher &w)
2638{ 2840{
2639 selection_wait = Sel_none; 2841 selection_wait = Sel_none;
2640 2842
2843 incr_buf_size = 0;
2844 free (incr_buf);
2845
2641 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2846 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2642} 2847}
2643 2848
2644/*
2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2646 */
2647void 2849void
2648rxvt_term::selection_property (Window win, Atom prop) 2850rxvt_term::selection_property (Window win, Atom prop)
2649{ 2851{
2650 if (prop == None || selection_wait != Sel_incr) 2852 if (prop == None || selection_wait != Sel_incr)
2651 return; 2853 return;
2652 2854
2653 if (selection_paste (win, prop, 1) > 0) 2855 selection_paste (win, prop, true);
2654 incr_ev.start (NOW + 10);
2655 else
2656 {
2657 selection_wait = Sel_none;
2658 incr_ev.stop ();
2659 }
2660} 2856}
2661 2857
2662/* ------------------------------------------------------------------------- */ 2858/* ------------------------------------------------------------------------- */
2663/* 2859/*
2664 * Request the current selection: 2860 * Request the current selection:
… …
2670 * EXT: button 2 release 2866 * EXT: button 2 release
2671 */ 2867 */
2672void 2868void
2673rxvt_term::selection_request (Time tm, int x, int y) 2869rxvt_term::selection_request (Time tm, int x, int y)
2674{ 2870{
2675 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2676
2677 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2871 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2678 return; /* outside window */ 2872 return; /* outside window */
2679 2873
2680 if (selection.text) 2874 if (selection.text)
2681 { /* internal selection */ 2875 { /* internal selection */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2683 char *str = rxvt_wcstombs (selection.text, selection.len); 2876 char *str = rxvt_wcstombs (selection.text, selection.len);
2684 paste ((unsigned char *)str, strlen (str)); 2877 paste ((unsigned char *)str, strlen (str));
2685 free (str); 2878 free (str);
2686 return; 2879 return;
2687 } 2880 }
… …
2701#else 2894#else
2702 selection_type = Sel_CompoundText; 2895 selection_type = Sel_CompoundText;
2703 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2896 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2704 return; 2897 return;
2705#endif 2898#endif
2706
2707 } 2899 }
2708 } 2900 }
2709 2901
2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2902 selection_wait = Sel_none; /* don't loop in selection_paste () */
2711 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2712 selection_paste (display->root, XA_CUT_BUFFER0, False); 2903 selection_paste (display->root, XA_CUT_BUFFER0, false);
2713} 2904}
2714 2905
2715int 2906int
2716rxvt_term::selection_request_other (Atom target, int selnum) 2907rxvt_term::selection_request_other (Atom target, int selnum)
2717{ 2908{
… …
2729 else 2920 else
2730 sel = xa[XA_CLIPBOARD]; 2921 sel = xa[XA_CLIPBOARD];
2731 2922
2732 if (XGetSelectionOwner (display->display, sel) != None) 2923 if (XGetSelectionOwner (display->display, sel) != None)
2733 { 2924 {
2734 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2925 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2736 TermWin.vt, selection_request_time); 2926 TermWin.vt, selection_request_time);
2737 return 1; 2927 return 1;
2738 } 2928 }
2739 2929
… …
2746 * EXT: SelectionClear 2936 * EXT: SelectionClear
2747 */ 2937 */
2748void 2938void
2749rxvt_term::selection_clear () 2939rxvt_term::selection_clear ()
2750{ 2940{
2751 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2752
2753 want_refresh = 1; 2941 want_refresh = 1;
2754 free (selection.text); 2942 free (selection.text);
2755 selection.text = NULL; 2943 selection.text = NULL;
2756 selection.len = 0; 2944 selection.len = 0;
2757 CLEAR_SELECTION (); 2945 CLEAR_SELECTION ();
… …
2770{ 2958{
2771 int i, col, end_col, row, end_row; 2959 int i, col, end_col, row, end_row;
2772 wchar_t *new_selection_text; 2960 wchar_t *new_selection_text;
2773 text_t *t; 2961 text_t *t;
2774 2962
2775 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2776 switch (selection.op) 2963 switch (selection.op)
2777 { 2964 {
2778 case SELECTION_CONT: 2965 case SELECTION_CONT:
2779 break; 2966 break;
2780 case SELECTION_INIT: 2967 case SELECTION_INIT:
… …
2794 2981
2795 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2982 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2796 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2983 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2797 2984
2798 col = selection.beg.col; 2985 col = selection.beg.col;
2799 MAX_IT (col, 0);
2800 row = selection.beg.row + TermWin.saveLines; 2986 row = selection.beg.row + TermWin.saveLines;
2801 end_row = selection.end.row + TermWin.saveLines; 2987 end_row = selection.end.row + TermWin.saveLines;
2802 int ofs = 0; 2988 int ofs = 0;
2803 int extra = 0; 2989 int extra = 0;
2804 2990
2805 for (; row <= end_row; row++, col = 0) 2991 for (; row <= end_row; row++, col = 0)
2806 { 2992 {
2807 t = &(screen.text[row][col]);
2808
2809 end_col = screen.tlen[row]; 2993 end_col = screen.tlen[row];
2994
2995#if ENABLE_FRILLS
2996 if (selection.rect)
2997 {
2998 col = selection.beg.col;
2999 end_col = TermWin.ncol + 1;
3000 }
3001#endif
3002
3003 MAX_IT (col, 0);
2810 3004
2811 if (end_col == -1) 3005 if (end_col == -1)
2812 end_col = TermWin.ncol; 3006 end_col = TermWin.ncol;
2813 3007
2814 if (row == end_row) 3008 if (row == end_row || selection.rect)
2815 MIN_IT (end_col, selection.end.col); 3009 MIN_IT (end_col, selection.end.col);
2816 3010
3011 t = &screen.text[row][col];
2817 for (; col < end_col; col++) 3012 for (; col < end_col; col++)
2818 { 3013 {
2819 if (*t == NOCHAR) 3014 if (*t == NOCHAR)
2820 t++; 3015 t++;
2821#if ENABLE_COMBINING 3016#if ENABLE_COMBINING
… …
2869#if 0 3064#if 0
2870 XTextProperty ct; 3065 XTextProperty ct;
2871 3066
2872 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3067 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2873 { 3068 {
2874 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3069 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2875 PropModeReplace, ct.value, ct.nitems);
2876 XFree (ct.value); 3070 XFree (ct.value);
2877 } 3071 }
2878#endif 3072#endif
2879 3073
2880 selection_time = tm; 3074 selection_time = tm;
2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2882} 3075}
2883 3076
2884/* ------------------------------------------------------------------------- */ 3077/* ------------------------------------------------------------------------- */
2885/* 3078/*
2886 * Mark or select text based upon number of clicks: 1, 2, or 3 3079 * Mark or select text based upon number of clicks: 1, 2, or 3
2887 * EXT: button 1 press 3080 * EXT: button 1 press
2888 */ 3081 */
2889void 3082void
2890rxvt_term::selection_click (int clicks, int x, int y) 3083rxvt_term::selection_click (int clicks, int x, int y)
2891{ 3084{
2892 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2893
2894 clicks = ((clicks - 1) % 3) + 1; 3085 clicks = ((clicks - 1) % 3) + 1;
2895 selection.clicks = clicks; /* save clicks so extend will work */ 3086 selection.clicks = clicks; /* save clicks so extend will work */
2896 3087
2897 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3088 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2898 3089
… …
2940 * We now only find out the boundary in one direction 3131 * We now only find out the boundary in one direction
2941 */ 3132 */
2942 3133
2943/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3134/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2944#define DELIMIT_TEXT(x) \ 3135#define DELIMIT_TEXT(x) \
2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3136 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2946#define DELIMIT_REND(x) 1 3137#define DELIMIT_REND(x) 1
2947 3138
2948void 3139void
2949rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3140rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2950{ 3141{
… …
2968 3159
2969 row = mark->row + TermWin.saveLines; 3160 row = mark->row + TermWin.saveLines;
2970 col = mark->col; 3161 col = mark->col;
2971 MAX_IT (col, 0); 3162 MAX_IT (col, 0);
2972 /* find the edge of a word */ 3163 /* find the edge of a word */
2973 stp = & (screen.text[row][col]); 3164 stp = &screen.text[row][col];
2974 w1 = DELIMIT_TEXT (*stp); 3165 w1 = DELIMIT_TEXT (*stp);
2975 3166
2976 srp = (&screen.rend[row][col]); 3167 srp = &screen.rend[row][col];
2977 w2 = DELIMIT_REND (*srp); 3168 w2 = DELIMIT_REND (*srp);
2978 3169
2979 for (;;) 3170 for (;;)
2980 { 3171 {
2981 for (; col != bound.col; col += dirnadd) 3172 for (; col != bound.col; col += dirnadd)
… …
3015 } 3206 }
3016 break; 3207 break;
3017 } 3208 }
3018 3209
3019Old_Word_Selection_You_Die: 3210Old_Word_Selection_You_Die:
3020 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
3021
3022 if (dirn == DN) 3211 if (dirn == DN)
3023 col++; /* put us on one past the end */ 3212 col++; /* put us on one past the end */
3024 3213
3025 /* Poke the values back in */ 3214 /* Poke the values back in */
3026 ret->row = row - TermWin.saveLines; 3215 ret->row = row - TermWin.saveLines;
… …
3060 /* select nothing */ 3249 /* select nothing */
3061 selection.beg.row = selection.end.row = 0; 3250 selection.beg.row = selection.end.row = 0;
3062 selection.beg.col = selection.end.col = 0; 3251 selection.beg.col = selection.end.col = 0;
3063 selection.clicks = 4; 3252 selection.clicks = 4;
3064 want_refresh = 1; 3253 want_refresh = 1;
3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3066 return; 3254 return;
3067 } 3255 }
3068 3256
3069 if (selection.clicks == 4) 3257 if (selection.clicks == 4)
3070 selection.clicks = 1; 3258 selection.clicks = 1;
… …
3086 row_col_t pos; 3274 row_col_t pos;
3087 enum { 3275 enum {
3088 LEFT, RIGHT 3276 LEFT, RIGHT
3089 } closeto = RIGHT; 3277 } closeto = RIGHT;
3090 3278
3091 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3092 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3093
3094 want_refresh = 1; 3279 want_refresh = 1;
3280
3095 switch (selection.op) 3281 switch (selection.op)
3096 { 3282 {
3097 case SELECTION_INIT: 3283 case SELECTION_INIT:
3098 CLEAR_SELECTION (); 3284 CLEAR_SELECTION ();
3099 selection.op = SELECTION_BEGIN; 3285 selection.op = SELECTION_BEGIN;
… …
3112 selection_start_colrow (col, row); 3298 selection_start_colrow (col, row);
3113 /* FALLTHROUGH */ 3299 /* FALLTHROUGH */
3114 default: 3300 default:
3115 return; 3301 return;
3116 } 3302 }
3303
3117 if (selection.beg.col == selection.end.col 3304 if (selection.beg.col == selection.end.col
3118 && selection.beg.col != selection.mark.col 3305 && selection.beg.col != selection.mark.col
3119 && selection.beg.row == selection.end.row 3306 && selection.beg.row == selection.end.row
3120 && selection.beg.row != selection.mark.row) 3307 && selection.beg.row != selection.mark.row)
3121 { 3308 {
3122 selection.beg.col = selection.end.col = selection.mark.col; 3309 selection.beg.col = selection.end.col = selection.mark.col;
3123 selection.beg.row = selection.end.row = selection.mark.row; 3310 selection.beg.row = selection.end.row = selection.mark.row;
3124 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3125 } 3311 }
3126 3312
3127 pos.col = col; 3313 pos.col = col;
3128 pos.row = row; 3314 pos.row = row;
3129 3315
… …
3172 } 3358 }
3173 else 3359 else
3174 { /* button1 drag or button3 drag */ 3360 { /* button1 drag or button3 drag */
3175 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3361 if (ROWCOL_IS_AFTER (selection.mark, pos))
3176 { 3362 {
3177 if ((selection.mark.row == selection.end.row) 3363 if (selection.mark.row == selection.end.row
3178 && (selection.mark.col == selection.end.col) 3364 && selection.mark.col == selection.end.col
3365 && clickchange
3179 && clickchange && selection.clicks == 2) 3366 && selection.clicks == 2)
3180 selection.mark.col--; 3367 selection.mark.col--;
3181 3368
3182 selection.beg.row = pos.row; 3369 selection.beg.row = pos.row;
3183 selection.beg.col = pos.col; 3370 selection.beg.col = pos.col;
3184 selection.end.row = selection.mark.row; 3371 selection.end.row = selection.mark.row;
… …
3195 3382
3196 if (selection.clicks == 1) 3383 if (selection.clicks == 1)
3197 { 3384 {
3198 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3385 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3199 3386
3200 if (end_col != -1 && selection.beg.col > end_col) 3387 if (selection.beg.col > end_col
3388 && end_col != -1
3389#if ENABLE_FRILLS
3390 && !selection.rect
3391#endif
3201 { 3392 )
3202#if 1
3203 selection.beg.col = ncol; 3393 selection.beg.col = ncol;
3204#else
3205 if (selection.beg.row != selection.end.row)
3206 selection.beg.col = ncol;
3207 else
3208 selection.beg.col = selection.mark.col;
3209#endif
3210 }
3211 3394
3212 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3395 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3213 3396
3214 if (end_col != -1 && selection.end.col > end_col) 3397 if (
3398 selection.end.col > end_col
3399 && end_col != -1
3400#if ENABLE_FRILLS
3401 && !selection.rect
3402#endif
3403 )
3215 selection.end.col = ncol; 3404 selection.end.col = ncol;
3216 } 3405 }
3217 else if (selection.clicks == 2) 3406 else if (selection.clicks == 2)
3218 { 3407 {
3219 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3408 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3220 selection.end.col--; 3409 selection.end.col--;
3221 3410
3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3411 selection_delimit_word (UP, &selection.beg, &selection.beg);
3412 selection_delimit_word (DN, &selection.end, &selection.end);
3224 } 3413 }
3225 else if (selection.clicks == 3) 3414 else if (selection.clicks == 3)
3226 { 3415 {
3227#ifndef NO_FRILLS 3416#if ENABLE_FRILLS
3228 if ((Options & Opt_tripleclickwords)) 3417 if ((options & Opt_tripleclickwords))
3229 { 3418 {
3230 int end_row; 3419 int end_row;
3231 3420
3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3421 selection_delimit_word (UP, &selection.beg, &selection.beg);
3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3422 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3234 3423
3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3424 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3236 { 3425 {
3237 end_col = screen.tlen[end_row + TermWin.saveLines]; 3426 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3248 else 3437 else
3249#endif 3438#endif
3250 { 3439 {
3251 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3440 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3252 selection.mark.col++; 3441 selection.mark.col++;
3442
3253 selection.beg.col = 0; 3443 selection.beg.col = 0;
3254 selection.end.col = ncol; 3444 selection.end.col = ncol;
3255 } 3445 }
3256 } 3446 }
3257 3447
3258 if (button3 && buttonpress) 3448 if (button3 && buttonpress)
3259 { /* mark may need to be changed */ 3449 { /* mark may need to be changed */
3260 if (closeto == LEFT) 3450 if (closeto == LEFT)
3261 { 3451 {
3262 selection.mark.row = selection.end.row; 3452 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3453 selection.mark.col = selection.end.col - (selection.clicks == 2);
3264 - (selection.clicks == 2);
3265 } 3454 }
3266 else 3455 else
3267 { 3456 {
3268 selection.mark.row = selection.beg.row; 3457 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3458 selection.mark.col = selection.beg.col;
3270 } 3459 }
3271 } 3460 }
3272 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3273}
3274 3461
3275#ifndef NO_FRILLS 3462#if ENABLE_FRILLS
3463 if (selection.rect && selection.beg.col > selection.end.col)
3464 SWAP_IT (selection.beg.col, selection.end.col, int);
3465#endif
3466}
3467
3468#if ENABLE_FRILLS
3276void 3469void
3277rxvt_term::selection_remove_trailing_spaces () 3470rxvt_term::selection_remove_trailing_spaces ()
3278{ 3471{
3279 int32_t end_col, end_row; 3472 int32_t end_col, end_row;
3280 text_t *stp; 3473 text_t *stp;
3281 3474
3282 end_col = selection.end.col; 3475 end_col = selection.end.col;
3283 end_row = selection.end.row; 3476 end_row = selection.end.row;
3477
3284 for ( ; end_row >= selection.beg.row; ) 3478 for ( ; end_row >= selection.beg.row; )
3285 { 3479 {
3286 stp = screen.text[end_row + TermWin.saveLines]; 3480 stp = screen.text[end_row + TermWin.saveLines];
3481
3287 while (--end_col >= 0) 3482 while (--end_col >= 0)
3288 { 3483 {
3289 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3484 if (stp[end_col] != ' '
3485 && stp[end_col] != '\t'
3486 && stp[end_col] != NOCHAR)
3290 break; 3487 break;
3291 } 3488 }
3489
3292 if (end_col >= 0 3490 if (end_col >= 0
3293 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3491 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3294 { 3492 {
3295 selection.end.col = end_col + 1; 3493 selection.end.col = end_col + 1;
3296 selection.end.row = end_row; 3494 selection.end.row = end_row;
3297 break; 3495 break;
3298 } 3496 }
3497
3299 end_row--; 3498 end_row--;
3300 end_col = TermWin.ncol; 3499 end_col = TermWin.ncol;
3301 } 3500 }
3501
3302 if (selection.mark.row > selection.end.row) 3502 if (selection.mark.row > selection.end.row)
3303 { 3503 {
3304 selection.mark.row = selection.end.row; 3504 selection.mark.row = selection.end.row;
3305 selection.mark.col = selection.end.col; 3505 selection.mark.col = selection.end.col;
3306 } 3506 }
… …
3322 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3522 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3323} 3523}
3324 3524
3325/* ------------------------------------------------------------------------- */ 3525/* ------------------------------------------------------------------------- */
3326/* 3526/*
3327 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3328 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3329 * the X11 protocol.
3330 */
3331typedef CARD32 Atom32;
3332
3333/* ------------------------------------------------------------------------- */
3334/*
3335 * Respond to a request for our current selection 3527 * Respond to a request for our current selection
3336 * EXT: SelectionRequest 3528 * EXT: SelectionRequest
3337 */ 3529 */
3338void 3530void
3339rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3531rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3340{ 3532{
3341 XSelectionEvent ev; 3533 XSelectionEvent ev;
3342 XTextProperty ct;
3343 XICCEncodingStyle style;
3344 Atom target;
3345 3534
3346 ev.type = SelectionNotify; 3535 ev.type = SelectionNotify;
3347 ev.property = None; 3536 ev.property = None;
3348 ev.display = rq.display; 3537 ev.display = rq.display;
3349 ev.requestor = rq.requestor; 3538 ev.requestor = rq.requestor;
… …
3351 ev.target = rq.target; 3540 ev.target = rq.target;
3352 ev.time = rq.time; 3541 ev.time = rq.time;
3353 3542
3354 if (rq.target == xa[XA_TARGETS]) 3543 if (rq.target == xa[XA_TARGETS])
3355 { 3544 {
3356 Atom32 target_list[6]; 3545 Atom target_list[6];
3357 Atom32 *target = target_list; 3546 Atom *target = target_list;
3358 3547
3359 *target++ = (Atom32) xa[XA_TARGETS]; 3548 *target++ = xa[XA_TARGETS];
3360 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3549 *target++ = xa[XA_TIMESTAMP];
3361 *target++ = (Atom32) XA_STRING; 3550 *target++ = XA_STRING;
3362 *target++ = (Atom32) xa[XA_TEXT]; 3551 *target++ = xa[XA_TEXT];
3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3552 *target++ = xa[XA_COMPOUND_TEXT];
3364#if X_HAVE_UTF8_STRING 3553#if X_HAVE_UTF8_STRING
3365 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3554 *target++ = xa[XA_UTF8_STRING];
3366#endif 3555#endif
3367 3556
3368 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3557 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3369 (8 * sizeof (target_list[0])), PropModeReplace, 3558 32, PropModeReplace,
3370 (unsigned char *)target_list, 3559 (unsigned char *)target_list, target - target_list);
3371 target - target_list);
3372 ev.property = rq.property; 3560 ev.property = rq.property;
3373 } 3561 }
3374#if TODO // TODO 3562#if TODO // TODO
3375 else if (rq.target == xa[XA_MULTIPLE]) 3563 else if (rq.target == xa[XA_MULTIPLE])
3376 { 3564 {
3377 /* TODO: Handle MULTIPLE */ 3565 /* TODO: Handle MULTIPLE */
3378 } 3566 }
3379#endif 3567#endif
3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3568 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3381 { 3569 {
3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3570 XChangeProperty (display->display, rq.requestor, rq.property, rq.target,
3383 (8 * sizeof (Time)), PropModeReplace,
3384 (unsigned char *)&selection_time, 1); 3571 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3385 ev.property = rq.property; 3572 ev.property = rq.property;
3386 } 3573 }
3387 else if (rq.target == XA_STRING 3574 else if (rq.target == XA_STRING
3388 || rq.target == xa[XA_TEXT] 3575 || rq.target == xa[XA_TEXT]
3389 || rq.target == xa[XA_COMPOUND_TEXT] 3576 || rq.target == xa[XA_COMPOUND_TEXT]
3390 || rq.target == xa[XA_UTF8_STRING] 3577 || rq.target == xa[XA_UTF8_STRING]
3391 ) 3578 )
3392 { 3579 {
3580 XTextProperty ct;
3581 Atom target = rq.target;
3393 short freect = 0; 3582 short freect = 0;
3394 int selectlen; 3583 int selectlen;
3395 wchar_t *cl; 3584 wchar_t *cl;
3396 3585 enum {
3397 target = rq.target; 3586 enc_string = XStringStyle,
3587 enc_text = XStdICCTextStyle,
3588 enc_compound_text = XCompoundTextStyle,
3589#ifdef X_HAVE_UTF8_STRING
3590 enc_utf8 = XUTF8StringStyle,
3591#else
3592 enc_utf8 = -1,
3593#endif
3594 } style;
3398 3595
3399 if (target == XA_STRING) 3596 if (target == XA_STRING)
3400 // we actually don't do XA_STRING, but who cares, as i18n clients 3597 // we actually don't do XA_STRING, but who cares, as i18n clients
3401 // will ask for another format anyways. 3598 // will ask for another format anyways.
3402 style = XStringStyle; 3599 style = enc_string;
3403 else if (target == xa[XA_TEXT]) 3600 else if (target == xa[XA_TEXT])
3404 style = XStdICCTextStyle; 3601 style = enc_text;
3405 else if (target == xa[XA_COMPOUND_TEXT]) 3602 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle; 3603 style = enc_compound_text;
3407#if X_HAVE_UTF8_STRING 3604#if ENABLE_FRILLS
3408 else if (target == xa[XA_UTF8_STRING]) 3605 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle; 3606 style = enc_utf8;
3410#endif 3607#endif
3411 else 3608 else
3412 { 3609 {
3413 target = xa[XA_COMPOUND_TEXT]; 3610 target = xa[XA_COMPOUND_TEXT];
3414 style = XCompoundTextStyle; 3611 style = enc_compound_text;
3415 } 3612 }
3416 3613
3417 if (selection.text) 3614 if (selection.text)
3418 { 3615 {
3419 cl = selection.text; 3616 cl = selection.text;
… …
3423 { 3620 {
3424 cl = L""; 3621 cl = L"";
3425 selectlen = 0; 3622 selectlen = 0;
3426 } 3623 }
3427 3624
3428 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3625#if ENABLE_FRILLS
3429 // manually for XUTF8StringStyle. 3626 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3627 // so recode it manually
3628 if (style == enc_utf8)
3629 {
3630 freect = 1;
3631 ct.encoding = target;
3632 ct.format = 8;
3633 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3634 ct.nitems = strlen ((char *)ct.value);
3635 }
3636 else
3637#endif
3430 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3638 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3431 freect = 1; 3639 freect = 1;
3432 else 3640 else
3433 { 3641 {
3434 /* if we failed to convert then send it raw */ 3642 /* if we failed to convert then send it raw */
3435 ct.value = (unsigned char *)cl; 3643 ct.value = (unsigned char *)cl;
3436 ct.nitems = selectlen; 3644 ct.nitems = selectlen;
3645 ct.encoding = target;
3437 } 3646 }
3438 3647
3439 XChangeProperty (display->display, rq.requestor, rq.property, 3648 XChangeProperty (display->display, rq.requestor, rq.property,
3440 target, 8, PropModeReplace, 3649 ct.encoding, 8, PropModeReplace,
3441 ct.value, (int)ct.nitems); 3650 ct.value, (int)ct.nitems);
3442 ev.property = rq.property; 3651 ev.property = rq.property;
3443 3652
3444 if (freect) 3653 if (freect)
3445 XFree (ct.value); 3654 XFree (ct.value);
… …
3465} 3674}
3466 3675
3467/* ------------------------------------------------------------------------- */ 3676/* ------------------------------------------------------------------------- */
3468#ifdef USE_XIM 3677#ifdef USE_XIM
3469void 3678void
3470rxvt_term::im_set_position (XPoint *pos) 3679rxvt_term::im_set_position (XPoint &pos)
3471{ 3680{
3472 XWindowAttributes xwa; 3681 XWindowAttributes xwa;
3473 3682
3474 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3683 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3684
3475 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3685 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3686 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3477} 3687}
3478
3479#endif 3688#endif
3689
3690#if ENABLE_OVERLAY
3691void
3692rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3693{
3694 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3695 return;
3696
3697 want_refresh = 1;
3698
3699 scr_overlay_off ();
3700
3701 if (x < 0) x = TermWin.ncol - w;
3702 if (y < 0) y = TermWin.nrow - h;
3703
3704 // make space for border
3705 w += 2; MIN_IT (w, TermWin.ncol);
3706 h += 2; MIN_IT (h, TermWin.nrow);
3707
3708 x -= 1; MAX_IT (x, 0);
3709 y -= 1; MAX_IT (y, 0);
3710
3711 MIN_IT (x, TermWin.ncol - w);
3712 MIN_IT (y, TermWin.nrow - h);
3713
3714 ov_x = x; ov_y = y;
3715 ov_w = w; ov_h = h;
3716
3717 ov_text = new text_t *[h];
3718 ov_rend = new rend_t *[h];
3719
3720 for (y = 0; y < h; y++)
3721 {
3722 text_t *tp = ov_text[y] = new text_t[w];
3723 rend_t *rp = ov_rend[y] = new rend_t[w];
3724
3725 text_t t0, t1, t2;
3726 rend_t r = OVERLAY_RSTYLE;
3727
3728 if (y == 0)
3729 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3730 else if (y < h - 1)
3731 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3732 else
3733 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3734
3735 *tp++ = t0;
3736 *rp++ = r;
3737
3738 for (x = w - 2; x > 0; --x)
3739 {
3740 *tp++ = t1;
3741 *rp++ = r;
3742 }
3743
3744 *tp = t2;
3745 *rp = r;
3746 }
3747}
3748
3749void
3750rxvt_term::scr_overlay_off ()
3751{
3752 if (!ov_text)
3753 return;
3754
3755 want_refresh = 1;
3756
3757 for (int y = 0; y < ov_h; y++)
3758 {
3759 delete [] ov_text[y];
3760 delete [] ov_rend[y];
3761 }
3762
3763 delete [] ov_text; ov_text = 0;
3764 delete [] ov_rend; ov_rend = 0;
3765}
3766
3767void
3768rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3769{
3770 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3771 return;
3772
3773 x++, y++;
3774
3775 ov_text[y][x] = text;
3776 ov_rend[y][x] = rend;
3777}
3778
3779void
3780rxvt_term::scr_overlay_set (int x, int y, const char *s)
3781{
3782 while (*s)
3783 scr_overlay_set (x++, y, *s++);
3784}
3785
3786void
3787rxvt_term::scr_swap_overlay ()
3788{
3789 if (!ov_text)
3790 return;
3791
3792 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3793
3794 // swap screen mem with overlay
3795 for (int y = ov_h; y--; )
3796 {
3797 text_t *t1 = ov_text[y];
3798 rend_t *r1 = ov_rend[y];
3799
3800 text_t *t2 = screen.text[y + row_offset] + ov_x;
3801 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3802
3803 for (int x = ov_w; x--; )
3804 {
3805 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3806 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3807 }
3808 }
3809}
3810
3811#endif
3480/* ------------------------------------------------------------------------- */ 3812/* ------------------------------------------------------------------------- */

Diff Legend

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