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.74 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.104 by root, Tue Aug 17 01:29:12 2004 UTC

… …
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN 28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 30
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 32
34#include <stdint.h> 33#include <inttypes.h>
35#include <wchar.h> 34#include <wchar.h>
36 35
37#include "salloc.C" // HACK, should be a seperate compile! 36#include "salloc.C" // HACK, should be a seperate compile!
38 37
39inline void fill_text (text_t *start, text_t value, int len) 38inline void fill_text (text_t *start, text_t value, int len)
… …
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) == 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() \
59 selection.beg.row = selection.beg.col \ 58 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 59 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 60 = selection.end.row = selection.end.col = 0
62 61
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 62#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 63 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 64#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 65 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 66#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 67 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 68#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 69 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 70#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 71 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 72#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 73 (((A) == (C)) && ((B) <= (D)))
75 74
76/* these must be row_col_t */ 75/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 76#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 77 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 78#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 79 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 80#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 81 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 82#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 88
90/* 89/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 93 */
95#define drawBuffer TermWin.vt 94#define drawBuffer TermWin.vt
96 95
97#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \ 97 if (TermWin.mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 98 XClearArea (display->display, drawBuffer, 0, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \ 99 Row2Pixel (row), (unsigned int)TermWin.width, \
101 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
102 101
103#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 103 if (TermWin.mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (display->display, drawBuffer, x, y, \
106 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
108 107
109#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 109 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \ 111 (unsigned int)TermWin.width, \
113 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
114 113
115/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
118/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
119void 118void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 120{
122 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 122 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);
124 123
125 while (width--) 124 while (width--)
126 { 125 {
127 *et++ = ' '; 126 *et++ = ' ';
128 *er++ = efs; 127 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 155 unsigned int p, q;
157 int k; 156 int k;
158 rend_t setrstyle; 157 rend_t setrstyle;
159 158
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
161 162
162 TermWin.view_start = 0; 163 TermWin.view_start = 0;
163 num_scr = 0; 164 num_scr = 0;
164 165
165 if (TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
… …
172 nrow = TermWin.nrow; 173 nrow = TermWin.nrow;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2)
180 {
181 TermWin.saveLines++;
182 prev_nrow--;
183 TermWin.nscrolled++;
184 }
185
177 want_refresh = 1; 186 want_refresh = 1;
178 187
188 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 189 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 190
182 screen.tscroll = 0; 191 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 192 screen.bscroll = nrow - 1;
184 193
185 if (!talloc) 194 if (!talloc)
186 { 195 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 198 }
190 199
191 if (prev_nrow == 0) 200 if (!screen.text)
192 { 201 {
193 /* 202 /*
194 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 205 */
… …
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 226 }
218 227
219 MEMSET (charsets, 'B', sizeof (charsets)); 228 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 233 screen.charset = 0;
… …
471 * Hard reset 480 * Hard reset
472 */ 481 */
473void 482void
474rxvt_term::scr_poweron () 483rxvt_term::scr_poweron ()
475{ 484{
476 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
477
478 scr_release (); 485 scr_release ();
479 prev_nrow = prev_ncol = 0; 486 prev_nrow = prev_ncol = 0;
480 scr_reset (); 487 scr_reset ();
481 488
482 scr_clear (true); 489 scr_clear (true);
… …
493 */ 500 */
494void 501void
495rxvt_term::scr_cursor (int mode) 502rxvt_term::scr_cursor (int mode)
496{ 503{
497 screen_t *s; 504 screen_t *s;
498
499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
500 505
501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 506#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
502 if (current_screen == SECONDARY) 507 if (current_screen == SECONDARY)
503 s = &swap; 508 s = &swap;
504 else 509 else
… …
553 int offset; 558 int offset;
554#endif 559#endif
555 560
556 want_refresh = 1; 561 want_refresh = 1;
557 562
558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
559
560 TermWin.view_start = 0; 563 TermWin.view_start = 0;
561 564
562 if (current_screen == scrn) 565 if (current_screen == scrn)
563 return scrn; 566 return scrn;
564 567
565 selection_check (2); /* check for boundary cross */ 568 selection_check (2); /* check for boundary cross */
566 569
567 SWAP_IT (current_screen, scrn, int); 570 SWAP_IT (current_screen, scrn, int);
568#if NSCREENS 571#if NSCREENS
569 if (Options & Opt_secondaryScreen) 572 if (options & Opt_secondaryScreen)
570 { 573 {
571 num_scr = 0; 574 num_scr = 0;
572 offset = TermWin.saveLines; 575 offset = TermWin.saveLines;
573 for (i = prev_nrow; i--;) 576 for (i = prev_nrow; i--;)
574 { 577 {
… …
592 screen.flags |= Screen_VisibleCursor; 595 screen.flags |= Screen_VisibleCursor;
593 swap.flags |= Screen_VisibleCursor; 596 swap.flags |= Screen_VisibleCursor;
594 } 597 }
595 else 598 else
596#endif 599#endif
597 if (Options & Opt_secondaryScroll) 600 if (options & Opt_secondaryScroll)
598 //if (current_screen == PRIMARY) 601 //if (current_screen == PRIMARY)
599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
600 return scrn; 603 return scrn;
604}
605
606// clear WrapNext indicator, solidifying position on next line
607void
608rxvt_term::scr_do_wrap ()
609{
610 if (!(screen.flags & Screen_WrapNext))
611 return;
612
613 screen.flags &= ~Screen_WrapNext;
614
615 screen.cur.col = 0;
616
617 if (screen.cur.row == screen.bscroll)
618 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
619 else if (screen.cur.row < TermWin.nrow - 1)
620 screen.cur.row++;
601} 621}
602 622
603/* ------------------------------------------------------------------------- */ 623/* ------------------------------------------------------------------------- */
604/* 624/*
605 * Change the colour for following text 625 * Change the colour for following text
… …
644 664
645 if (count == 0 || (row1 > row2)) 665 if (count == 0 || (row1 > row2))
646 return 0; 666 return 0;
647 667
648 want_refresh = 1; 668 want_refresh = 1;
649 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
650 669
651 if (row1 == 0 && count > 0 670 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 671 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
653 { 672 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 673 nscrolled = (long)TermWin.nscrolled + (long)count;
655 674
656 if (nscrolled > (long)TermWin.saveLines) 675 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 676 TermWin.nscrolled = TermWin.saveLines;
658 else 677 else
659 TermWin.nscrolled = (uint16_t)nscrolled; 678 TermWin.nscrolled = (uint16_t)nscrolled;
660 679
661 if ((Options & Opt_scrollWithBuffer) 680 if ((options & Opt_scrollWithBuffer)
662 && TermWin.view_start != 0 681 && TermWin.view_start != 0
663 && TermWin.view_start != TermWin.saveLines) 682 && TermWin.view_start != TermWin.saveLines)
664 scr_page (UP, count); 683 scr_page (UP, count);
665 } 684 }
666 else if (!spec) 685 else if (!spec)
… …
705 if (j > 0) 724 if (j > 0)
706 { 725 {
707 /* A: scroll up */ 726 /* A: scroll up */
708 727
709 /* A1: Copy lines that will get clobbered by the rotation */ 728 /* A1: Copy lines that will get clobbered by the rotation */
729 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
730 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
731
732 /* A2: Rotate lines */
733 i = row2 - row1 - count + 1;
734 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
735 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
736 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
737
738 j = row2 - count + 1, i = count;
739 }
740 else /* if (j < 0) */
741 {
742 /* B: scroll down */
743
744 /* B1: Copy lines that will get clobbered by the rotation */
710 for (i = 0, j = row1; i < count; i++, j++) 745 for (i = 0, j = row2; i < count; i++, j--)
711 { 746 {
712 buf_text[i] = screen.text[j]; 747 buf_text[i] = screen.text[j];
713 buf_rend[i] = screen.rend[j]; 748 buf_rend[i] = screen.rend[j];
714 } 749 }
715 750
716 /* A2: Rotate lines */ 751 /* B2: Rotate lines */
717 for (j = row1, i = j + count; i <= row2; i++, j++) 752 for (j = row2, i = j - count; i >= row1; i--, j--)
718 { 753 {
719 screen.tlen[j] = screen.tlen[i]; 754 screen.tlen[j] = screen.tlen[i];
720 screen.text[j] = screen.text[i]; 755 screen.text[j] = screen.text[i];
721 screen.rend[j] = screen.rend[i]; 756 screen.rend[j] = screen.rend[i];
722 } 757 }
723 758
724 j = row2 - count + 1, i = count;
725 }
726 else /* if (j < 0) */
727 {
728 /* B: scroll down */
729
730 /* B1: Copy lines that will get clobbered by the rotation */
731 for (i = 0, j = row2; i < count; i++, j--)
732 {
733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j];
735 }
736
737 /* B2: Rotate lines */
738 for (j = row2, i = j - count; i >= row1; i--, j--)
739 {
740 screen.tlen[j] = screen.tlen[i];
741 screen.text[j] = screen.text[i];
742 screen.rend[j] = screen.rend[i];
743 }
744
745 j = row1, i = count; 759 j = row1, i = count;
746 count = -count; 760 count = -count;
747 } 761 }
748 762
749 /* C: Resurrect lines */ 763 /* C: Resurrect lines */
764 memset (screen.tlen + j, 0, i * sizeof (int16_t));
765 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
766 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
767 if (!spec) /* line length may not equal TermWin.ncol */
750 for (; i--; j++) 768 for (; i--; j++)
751 {
752 screen.tlen[j] = 0;
753 screen.text[j] = buf_text[i];
754 screen.rend[j] = buf_rend[i];
755
756 if (!spec) /* line length may not equal TermWin.ncol */
757 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); 769 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
758 }
759 770
760 return count; 771 return count;
761} 772}
762 773
763/* ------------------------------------------------------------------------- */ 774/* ------------------------------------------------------------------------- */
… …
765 * Add text given in <str> of length <len> to screen struct 776 * Add text given in <str> of length <len> to screen struct
766 */ 777 */
767void 778void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 779rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
769{ 780{
770 unsigned char checksel, clearsel; 781 unsigned char checksel;
771 unicode_t c; 782 unicode_t c;
772 int i, row, last_col; 783 int i, row, last_col;
773 text_t *stp; 784 text_t *stp;
774 rend_t *srp; 785 rend_t *srp;
775 786
776 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
777 return; 788 return;
778 789
779 want_refresh = 1; 790 want_refresh = 1;
791 ZERO_SCROLLBACK ();
780 last_col = TermWin.ncol; 792 last_col = TermWin.ncol;
781 793
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 794 if (nlines > 0)
785 { 795 {
786 nlines += (screen.cur.row - screen.bscroll); 796 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 797 if ((nlines > 0)
788 && (screen.tscroll == 0) 798 && (screen.tscroll == 0)
789 && (screen.bscroll == (TermWin.nrow - 1))) 799 && (screen.bscroll == (TermWin.nrow - 1)))
790 { 800 {
791 /* _at least_ this many lines need to be scrolled */ 801 /* _at least_ this many lines need to be scrolled */
792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 802 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
793 screen.cur.row -= nlines; 803 screen.cur.row -= nlines;
794 } 804 }
795 } 805 }
806
796#ifdef DEBUG_STRICT 807#ifdef DEBUG_STRICT
797 assert (screen.cur.col < last_col); 808 assert (screen.cur.col < last_col);
798 assert ((screen.cur.row < TermWin.nrow) 809 assert ((screen.cur.row < TermWin.nrow)
799 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 810 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
800#else /* drive with your eyes closed */ 811#else /* drive with your eyes closed */
801 MIN_IT (screen.cur.col, last_col - 1); 812 MIN_IT (screen.cur.col, last_col - 1);
802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 813 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 814 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
804#endif 815#endif
805 row = screen.cur.row + TermWin.saveLines; 816 row = screen.cur.row + TermWin.saveLines;
806 817
807 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
808 clearsel = 0;
809 819
810 stp = screen.text[row]; 820 stp = screen.text[row];
811 srp = screen.rend[row]; 821 srp = screen.rend[row];
812 822
813 while (len--) 823 while (len--)
… …
848 if (checksel /* see if we're writing within selection */ 858 if (checksel /* see if we're writing within selection */
849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 860 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
851 { 861 {
852 checksel = 0; 862 checksel = 0;
853 clearsel = 1; 863 /*
864 * If we wrote anywhere in the selected area, kill the selection
865 * XXX: should we kill the mark too? Possibly, but maybe that
866 * should be a similar check.
867 */
868 CLEAR_SELECTION ();
854 } 869 }
855 870
856 if (screen.flags & Screen_WrapNext) 871 if (screen.flags & Screen_WrapNext)
857 { 872 {
858 screen.tlen[row] = -1; 873 screen.tlen[row] = -1;
859 if (screen.cur.row == screen.bscroll) 874
860 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
861 else if (screen.cur.row < (TermWin.nrow - 1))
862 row = (++screen.cur.row) + TermWin.saveLines; 875 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
863 876
864 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
865 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
866 screen.cur.col = 0;
867 screen.flags &= ~Screen_WrapNext;
868 } 879 }
869 880
870 if (screen.flags & Screen_Insert) 881 if (screen.flags & Screen_Insert)
871 scr_insdel_chars (1, INSERT); 882 scr_insdel_chars (1, INSERT);
872 883
873 // rely on wcwidth to tell us the character width, at least for non-latin1 884 // rely on wcwidth to tell us the character width, at least for non-latin1
874 // do wcwidth before further replacements, as wcwidth says that line-drawing 885 // do wcwidth before further replacements, as wcwidth says that line-drawing
875 // characters have width -1 (DOH!) on GNU/Linux sometimes. 886 // characters have width -1 (DOH!) on GNU/Linux sometimes.
876 int width = c < 256 ? 1 : wcwidth (c); 887 int width = c < 0x100 ? 1 : wcwidth (c);
877 888
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 889 if (charsets[screen.charset] == '0') // DEC SPECIAL
879 { 890 {
880 // vt100 special graphics and line drawing 891 // vt100 special graphics and line drawing
881 static uint16_t vt100_0[32] = { // 5f .. 7e 892 static uint16_t vt100_0[32] = { // 5f .. 7e
… …
892 } 903 }
893 } 904 }
894 905
895 if (width != 0) 906 if (width != 0)
896 { 907 {
897#if !UNICODE_3 && ENABLE_COMBINING 908#if !UNICODE_3
898 // trim characters we can't store directly :( 909 // trim characters we can't store directly :(
899 if (c >= 0x10000) 910 if (c >= 0x10000)
911# if ENABLE_COMBINING
900 c = rxvt_composite.compose (c); // map to lower 16 bits 912 c = rxvt_composite.compose (c); // map to lower 16 bits
913# else
914 c = 0xfffd;
901#endif 915# endif
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 916#endif
917 bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
918 rend_t rend = SET_FONT (rstyle,
919 c > 0x7f || bold || c < 0x20
920 ? TermWin.fontset->find_font (c, bold)
921 : TermWin.ascii_map [c - 0x20]);
903 922
904 do 923 do
905 { 924 {
906 stp[screen.cur.col] = c; 925 stp[screen.cur.col] = c;
907 srp[screen.cur.col] = rend; 926 srp[screen.cur.col] = rend;
… …
968 } 987 }
969 988
970 if (screen.tlen[row] != -1) /* XXX: think about this */ 989 if (screen.tlen[row] != -1) /* XXX: think about this */
971 MAX_IT (screen.tlen[row], screen.cur.col); 990 MAX_IT (screen.tlen[row], screen.cur.col);
972 991
973 /*
974 * If we wrote anywhere in the selected area, kill the selection
975 * XXX: should we kill the mark too? Possibly, but maybe that
976 * should be a similar check.
977 */
978 if (clearsel)
979 CLEAR_SELECTION ();
980
981#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
982 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
983#else /* drive with your eyes closed */ 994#else /* drive with your eyes closed */
984 MAX_IT (screen.cur.row, 0); 995 MAX_IT (screen.cur.row, 0);
985#endif 996#endif
… …
1002#ifdef TERMCAP_HAS_BW 1013#ifdef TERMCAP_HAS_BW
1003 screen.cur.col = TermWin.ncol - 1; 1014 screen.cur.col = TermWin.ncol - 1;
1004 screen.cur.row--; 1015 screen.cur.row--;
1005 return; 1016 return;
1006#endif 1017#endif
1007
1008 } 1018 }
1009 } 1019 }
1010 else if ((screen.flags & Screen_WrapNext) == 0) 1020 else if (!(screen.flags & Screen_WrapNext))
1011 scr_gotorc (0, -1, RELATIVE); 1021 scr_gotorc (0, -1, RELATIVE);
1012 1022
1013 screen.flags &= ~Screen_WrapNext; 1023 screen.flags &= ~Screen_WrapNext;
1014} 1024}
1015 1025
… …
1022void 1032void
1023rxvt_term::scr_tab (int count) 1033rxvt_term::scr_tab (int count)
1024{ 1034{
1025 int i, x; 1035 int i, x;
1026 1036
1027 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1028 want_refresh = 1; 1037 want_refresh = 1;
1029 i = x = screen.cur.col; 1038 i = x = screen.cur.col;
1030 1039
1031 if (count == 0) 1040 if (count == 0)
1032 return; 1041 return;
… …
1066 * Process DEC Back Index 1075 * Process DEC Back Index
1067 * XTERM_SEQ: ESC 6 1076 * XTERM_SEQ: ESC 6
1068 * Move cursor left in row. If we're at the left boundary, shift everything 1077 * Move cursor left in row. If we're at the left boundary, shift everything
1069 * in that row right. Clear left column. 1078 * in that row right. Clear left column.
1070 */ 1079 */
1071#ifndef NO_FRILLS 1080#if ENABLE_FRILLS
1072void 1081void
1073rxvt_term::scr_backindex () 1082rxvt_term::scr_backindex ()
1074{ 1083{
1075 if (screen.cur.col > 0) 1084 if (screen.cur.col > 0)
1076 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1077 else 1086 else
1078 { 1087 {
1079 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1088 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1080 return; /* um, yeah? */ 1089 return; /* um, yeah? */
1090
1081 scr_insdel_chars (1, INSERT); 1091 scr_insdel_chars (1, INSERT);
1082 } 1092 }
1083} 1093}
1084#endif 1094#endif
1085/* ------------------------------------------------------------------------- */ 1095/* ------------------------------------------------------------------------- */
… …
1087 * Process DEC Forward Index 1097 * Process DEC Forward Index
1088 * XTERM_SEQ: ESC 9 1098 * XTERM_SEQ: ESC 9
1089 * Move cursor right in row. If we're at the right boundary, shift everything 1099 * Move cursor right in row. If we're at the right boundary, shift everything
1090 * in that row left. Clear right column. 1100 * in that row left. Clear right column.
1091 */ 1101 */
1092#ifndef NO_FRILLS 1102#if ENABLE_FRILLS
1093void 1103void
1094rxvt_term::scr_forwardindex () 1104rxvt_term::scr_forwardindex ()
1095{ 1105{
1096 int row; 1106 int row;
1097 1107
1098 if (screen.cur.col < TermWin.ncol - 1) 1108 if (screen.cur.col < TermWin.ncol - 1)
1099 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1109 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1100 else 1110 else
1101 { 1111 {
1102 row = screen.cur.row + TermWin.saveLines; 1112 row = screen.cur.row + TermWin.saveLines;
1113
1103 if (screen.tlen[row] == 0) 1114 if (screen.tlen[row] == 0)
1104 return; /* um, yeah? */ 1115 return; /* um, yeah? */
1105 else if (screen.tlen[row] == -1) 1116 else if (screen.tlen[row] == -1)
1106 screen.tlen[row] = TermWin.ncol; 1117 screen.tlen[row] = TermWin.ncol;
1118
1107 scr_gotorc (0, 0, R_RELATIVE); 1119 scr_gotorc (0, 0, R_RELATIVE);
1108 scr_insdel_chars (1, DELETE); 1120 scr_insdel_chars (1, DELETE);
1109 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1121 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1110 } 1122 }
1111} 1123}
… …
1119rxvt_term::scr_gotorc (int row, int col, int relative) 1131rxvt_term::scr_gotorc (int row, int col, int relative)
1120{ 1132{
1121 want_refresh = 1; 1133 want_refresh = 1;
1122 ZERO_SCROLLBACK (); 1134 ZERO_SCROLLBACK ();
1123 1135
1124 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));
1125
1126 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1136 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1127 MAX_IT (screen.cur.col, 0); 1137 MAX_IT (screen.cur.col, 0);
1128 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1138 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1129 1139
1130 screen.flags &= ~Screen_WrapNext; 1140 screen.flags &= ~Screen_WrapNext;
1141
1131 if (relative & R_RELATIVE) 1142 if (relative & R_RELATIVE)
1132 { 1143 {
1133 if (row > 0) 1144 if (row > 0)
1134 { 1145 {
1135 if (screen.cur.row <= screen.bscroll 1146 if (screen.cur.row <= screen.bscroll
… …
1155 MIN_IT (screen.cur.row, screen.bscroll); 1166 MIN_IT (screen.cur.row, screen.bscroll);
1156 } 1167 }
1157 else 1168 else
1158 screen.cur.row = row; 1169 screen.cur.row = row;
1159 } 1170 }
1171
1160 MAX_IT (screen.cur.row, 0); 1172 MAX_IT (screen.cur.row, 0);
1161 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1173 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1162
1163 while (screen.cur.col > 0
1164 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1165 screen.cur.col--;
1166} 1174}
1167 1175
1168/* ------------------------------------------------------------------------- */ 1176/* ------------------------------------------------------------------------- */
1169/* 1177/*
1170 * direction should be UP or DN 1178 * direction should be UP or DN
1171 */ 1179 */
1172void 1180void
1173rxvt_term::scr_index (enum page_dirn direction) 1181rxvt_term::scr_index (enum page_dirn direction)
1174{ 1182{
1175 int dirn; 1183 int dirn;
1176 1184
1177 want_refresh = 1; 1185 want_refresh = 1;
1186 ZERO_SCROLLBACK ();
1187
1178 dirn = ((direction == UP) ? 1 : -1); 1188 dirn = ((direction == UP) ? 1 : -1);
1179 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1180
1181 ZERO_SCROLLBACK ();
1182 1189
1183 screen.flags &= ~Screen_WrapNext; 1190 screen.flags &= ~Screen_WrapNext;
1191
1184 if ((screen.cur.row == screen.bscroll && direction == UP) 1192 if ((screen.cur.row == screen.bscroll && direction == UP)
1185 || (screen.cur.row == screen.tscroll && direction == DN)) 1193 || (screen.cur.row == screen.tscroll && direction == DN))
1186 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1194 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1187 else 1195 else
1188 screen.cur.row += dirn; 1196 screen.cur.row += dirn;
1197
1189 MAX_IT (screen.cur.row, 0); 1198 MAX_IT (screen.cur.row, 0);
1190 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1199 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1191 selection_check (0); 1200 selection_check (0);
1192} 1201}
1193 1202
… …
1202rxvt_term::scr_erase_line (int mode) 1211rxvt_term::scr_erase_line (int mode)
1203{ 1212{
1204 unsigned int row, col, num; 1213 unsigned int row, col, num;
1205 1214
1206 want_refresh = 1; 1215 want_refresh = 1;
1207 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1208 ZERO_SCROLLBACK (); 1216 ZERO_SCROLLBACK ();
1209 1217
1210 selection_check (1); 1218 selection_check (1);
1211
1212 screen.flags &= ~Screen_WrapNext;
1213 1219
1214 row = TermWin.saveLines + screen.cur.row; 1220 row = TermWin.saveLines + screen.cur.row;
1215 switch (mode) 1221 switch (mode)
1216 { 1222 {
1217 case 0: /* erase to end of line */ 1223 case 0: /* erase to end of line */
… …
1261 int32_t row, row_offset; 1267 int32_t row, row_offset;
1262 rend_t ren; 1268 rend_t ren;
1263 XGCValues gcvalue; 1269 XGCValues gcvalue;
1264 1270
1265 want_refresh = 1; 1271 want_refresh = 1;
1266 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1267 ZERO_SCROLLBACK (); 1272 ZERO_SCROLLBACK ();
1273
1268 row_offset = (int32_t)TermWin.saveLines; 1274 row_offset = (int32_t)TermWin.saveLines;
1269 1275
1270 switch (mode) 1276 switch (mode)
1271 { 1277 {
1272 case 0: /* erase to end of screen */ 1278 case 0: /* erase to end of screen */
… …
1288 break; 1294 break;
1289 default: 1295 default:
1290 return; 1296 return;
1291 } 1297 }
1292 1298
1293 refresh_type |= REFRESH_BOUNDS;
1294
1295 if (selection.op && current_screen == selection.screen 1299 if (selection.op && current_screen == selection.screen
1296 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1300 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1297 || (selection.end.row >= row 1301 || (selection.end.row >= row
1298 && selection.end.row <= row + num))) 1302 && selection.end.row <= row + num)))
1299 CLEAR_SELECTION (); 1303 CLEAR_SELECTION ();
… …
1311 CLEAR_ROWS (row, num); 1315 CLEAR_ROWS (row, num);
1312 } 1316 }
1313 else 1317 else
1314 { 1318 {
1315 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1319 ren = (rstyle & (RS_fgMask | RS_bgMask));
1316 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1318 ERASE_ROWS (row, num); 1322 ERASE_ROWS (row, num);
1319 gcvalue.foreground = PixColors[Color_fg]; 1323 gcvalue.foreground = pix_colors[Color_fg];
1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1321 } 1325 }
1322 1326
1323 for (; num--; row++) 1327 for (; num--; row++)
1324 { 1328 {
… …
1340{ 1344{
1341 int i, j, k; 1345 int i, j, k;
1342 rend_t *r1, fs; 1346 rend_t *r1, fs;
1343 1347
1344 want_refresh = 1; 1348 want_refresh = 1;
1349 ZERO_SCROLLBACK ();
1350
1345 num_scr_allow = 0; 1351 num_scr_allow = 0;
1346 ZERO_SCROLLBACK ();
1347 selection_check (3); 1352 selection_check (3);
1348 1353
1349 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1354 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1350 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1355 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1351 { 1356 {
… …
1378 if (insdel == DELETE) 1383 if (insdel == DELETE)
1379 return; 1384 return;
1380 else if (insdel == INSERT) 1385 else if (insdel == INSERT)
1381 count = end; 1386 count = end;
1382 } 1387 }
1383 screen.flags &= ~Screen_WrapNext; 1388
1389 scr_do_wrap ();
1384 1390
1385 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1391 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1386} 1392}
1387 1393
1388/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
… …
1402 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1403 1409
1404 if (count <= 0) 1410 if (count <= 0)
1405 return; 1411 return;
1406 1412
1413 scr_do_wrap ();
1414
1407 selection_check (1); 1415 selection_check (1);
1408 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1416 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1409 1417
1410 row = screen.cur.row + TermWin.saveLines; 1418 row = screen.cur.row + TermWin.saveLines;
1411 screen.flags &= ~Screen_WrapNext;
1412 1419
1413 stp = screen.text[row]; 1420 stp = screen.text[row];
1414 srp = screen.rend[row]; 1421 srp = screen.rend[row];
1415 slp = & (screen.tlen[row]); 1422 slp = &screen.tlen[row];
1416 1423
1417 switch (insdel) 1424 switch (insdel)
1418 { 1425 {
1419 case INSERT: 1426 case INSERT:
1420 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1427 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
… …
1541rxvt_term::scr_autowrap (int mode) 1548rxvt_term::scr_autowrap (int mode)
1542{ 1549{
1543 if (mode) 1550 if (mode)
1544 screen.flags |= Screen_Autowrap; 1551 screen.flags |= Screen_Autowrap;
1545 else 1552 else
1546 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1553 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1547} 1554}
1548 1555
1549/* ------------------------------------------------------------------------- */ 1556/* ------------------------------------------------------------------------- */
1550/* 1557/*
1551 * Set/unset margin origin mode 1558 * Set/unset margin origin mode
… …
1590 */ 1597 */
1591void 1598void
1592rxvt_term::scr_set_tab (int mode) 1599rxvt_term::scr_set_tab (int mode)
1593{ 1600{
1594 if (mode < 0) 1601 if (mode < 0)
1595 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1602 memset (tabs, 0, TermWin.ncol * sizeof (char));
1596 else if (screen.cur.col < TermWin.ncol) 1603 else if (screen.cur.col < TermWin.ncol)
1597 tabs[screen.cur.col] = (mode ? 1 : 0); 1604 tabs[screen.cur.col] = (mode ? 1 : 0);
1598} 1605}
1599 1606
1600/* ------------------------------------------------------------------------- */ 1607/* ------------------------------------------------------------------------- */
… …
1604 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1611 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1605 */ 1612 */
1606void 1613void
1607rxvt_term::scr_rvideo_mode (int mode) 1614rxvt_term::scr_rvideo_mode (int mode)
1608{ 1615{
1609 XGCValues gcvalue; 1616 XGCValues gcvalue;
1610 1617
1611 if (rvideo != mode) 1618 if (rvideo != mode)
1612 { 1619 {
1613 rvideo = mode; 1620 rvideo = mode;
1614 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1621 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1615#if defined(XPM_BACKGROUND) 1622#if defined(XPM_BACKGROUND)
1616 if (bgPixmap.pixmap == None) 1623 if (bgPixmap.pixmap == None)
1617#endif 1624#endif
1618#if defined(TRANSPARENT) 1625#if defined(TRANSPARENT)
1619 if (! (Options & Opt_transparent) || am_transparent == 0) 1626 if (! (options & Opt_transparent) || am_transparent == 0)
1620#endif 1627#endif
1621 XSetWindowBackground (display->display, TermWin.vt, 1628 XSetWindowBackground (display->display, TermWin.vt,
1622 PixColors[Color_bg]); 1629 pix_colors[Color_bg]);
1623 1630
1624 gcvalue.foreground = PixColors[Color_fg]; 1631 gcvalue.foreground = pix_colors[Color_fg];
1625 gcvalue.background = PixColors[Color_bg]; 1632 gcvalue.background = pix_colors[Color_bg];
1626 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1633 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1627 &gcvalue); 1634 &gcvalue);
1628 scr_clear (); 1635 scr_clear ();
1629 scr_touch (true); 1636 scr_touch (true);
1630 } 1637 }
… …
1746 row_col_t rc[RC_COUNT]; 1753 row_col_t rc[RC_COUNT];
1747 1754
1748 if (drawn_text == NULL) /* sanity check */ 1755 if (drawn_text == NULL) /* sanity check */
1749 return; 1756 return;
1750 1757
1758#ifndef NO_SLOW_LINK_SUPPORT
1759 if (refresh_type == FAST_REFRESH && !display->is_local)
1760 {
1761 y = 0;
1762 height = TermWin.height;
1763 }
1764#endif
1765
1751#ifdef DEBUG_STRICT 1766#ifdef DEBUG_STRICT
1752 x = max (x, (int)TermWin.int_bwidth); 1767 x = max (x, 0);
1753 x = min (x, (int)TermWin.width); 1768 x = min (x, (int)TermWin.width);
1754 y = max (y, (int)TermWin.int_bwidth); 1769 y = max (y, 0);
1755 y = min (y, (int)TermWin.height); 1770 y = min (y, (int)TermWin.height);
1756#endif 1771#endif
1757 1772
1758 /* round down */ 1773 /* round down */
1759 rc[PART_BEG].col = Pixel2Col (x); 1774 rc[PART_BEG].col = Pixel2Col (x);
… …
1767 { 1782 {
1768 MIN_IT (rc[i].col, TermWin.ncol - 1); 1783 MIN_IT (rc[i].col, TermWin.ncol - 1);
1769 MIN_IT (rc[i].row, TermWin.nrow - 1); 1784 MIN_IT (rc[i].row, TermWin.nrow - 1);
1770 } 1785 }
1771 1786
1772 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));
1773
1774 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1787 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1775 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1788 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1776 1789
1777 if (refresh) 1790 if (refresh)
1778 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1791 scr_refresh (SLOW_REFRESH);
1779} 1792}
1780 1793
1781/* ------------------------------------------------------------------------- */ 1794/* ------------------------------------------------------------------------- */
1782/* 1795/*
1783 * Refresh the entire screen 1796 * Refresh the entire screen
… …
1798{ 1811{
1799 long p = 0; 1812 long p = 0;
1800 uint16_t oldviewstart; 1813 uint16_t oldviewstart;
1801 1814
1802 oldviewstart = TermWin.view_start; 1815 oldviewstart = TermWin.view_start;
1816
1803 if (y < len) 1817 if (y < len)
1804 { 1818 {
1805 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1819 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1806 p -= (long) (TermWin.nrow - 1); 1820 p -= (long) (TermWin.nrow - 1);
1807 p = max (p, 0); 1821 p = max (p, 0);
1808 } 1822 }
1823
1809 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1824 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1810 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1811 1825
1812 return scr_changeview (oldviewstart); 1826 return scr_changeview (oldviewstart);
1813} 1827}
1814 1828
1815/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
… …
1818 * direction should be UP or DN 1832 * direction should be UP or DN
1819 */ 1833 */
1820int 1834int
1821rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines)
1822{ 1836{
1823 int n; 1837 int n;
1824 uint16_t oldviewstart; 1838 uint16_t oldviewstart;
1825 1839
1826 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1827#ifdef DEBUG_STRICT 1840#ifdef DEBUG_STRICT
1828 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1841 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1829#endif 1842#endif
1830 oldviewstart = TermWin.view_start; 1843 oldviewstart = TermWin.view_start;
1831 if (direction == UP) 1844 if (direction == UP)
… …
1858rxvt_term::scr_bell () 1871rxvt_term::scr_bell ()
1859{ 1872{
1860#ifndef NO_BELL 1873#ifndef NO_BELL
1861# ifndef NO_MAPALERT 1874# ifndef NO_MAPALERT
1862# ifdef MAPALERT_OPTION 1875# ifdef MAPALERT_OPTION
1863 if (Options & Opt_mapAlert) 1876 if (options & Opt_mapAlert)
1864# endif 1877# endif
1865 XMapWindow (display->display, TermWin.parent[0]); 1878 XMapWindow (display->display, TermWin.parent[0]);
1866# endif 1879# endif
1867 if (Options & Opt_visualBell) 1880 if (options & Opt_visualBell)
1868 { 1881 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1882 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1883 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 } 1884 }
1872 else 1885 else
… …
1878/* ARGSUSED */ 1891/* ARGSUSED */
1879void 1892void
1880rxvt_term::scr_printscreen (int fullhist) 1893rxvt_term::scr_printscreen (int fullhist)
1881{ 1894{
1882#ifdef PRINTPIPE 1895#ifdef PRINTPIPE
1883 int i, r1, nrows, row_offset; 1896 int i, r1, nrows, row_offset;
1884 text_t *t; 1897 FILE *fd;
1885 FILE *fd;
1886 1898
1887 if ((fd = popen_printer ()) == NULL) 1899 if ((fd = popen_printer ()) == NULL)
1888 return; 1900 return;
1901
1889 nrows = TermWin.nrow; 1902 nrows = TermWin.nrow;
1890 row_offset = TermWin.saveLines; 1903 row_offset = TermWin.saveLines;
1904
1891 if (!fullhist) 1905 if (!fullhist)
1892 row_offset -= TermWin.view_start; 1906 row_offset -= TermWin.view_start;
1893 else 1907 else
1894 { 1908 {
1895 nrows += TermWin.nscrolled; 1909 nrows += TermWin.nscrolled;
1896 row_offset -= TermWin.nscrolled; 1910 row_offset -= TermWin.nscrolled;
1897 } 1911 }
1898 1912
1913 wctomb (0, 0);
1914
1899 for (r1 = 0; r1 < nrows; r1++) 1915 for (r1 = 0; r1 < nrows; r1++)
1900 { 1916 {
1901 t = screen.text[r1 + row_offset]; 1917 text_t *tp = screen.text[r1 + row_offset];
1902 for (i = TermWin.ncol - 1; i >= 0; i--) 1918 int len = screen.tlen[r1 + row_offset];
1903 if (!isspace (t[i])) 1919
1904 break; 1920 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1905 fprintf (fd, "%.*s\n", (i + 1), t); 1921 {
1922 char mb[MB_LEN_MAX];
1923 text_t t = *tp++;
1924 if (t == NOCHAR)
1925 continue;
1926
1927 len = wctomb (mb, t);
1928
1929 if (len <= 0)
1930 {
1931 mb[0] = ' ';
1932 len = 1;
1933 }
1934
1935 fwrite (mb, 1, len, fd);
1936 }
1937
1938 fputc ('\n', fd);
1906 } 1939 }
1940
1907 pclose_printer (fd); 1941 pclose_printer (fd);
1908#endif 1942#endif
1909} 1943}
1910 1944
1911/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
… …
1925 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1959 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1926 1960
1927void 1961void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 1962rxvt_term::scr_refresh (unsigned char refresh_type)
1929{ 1963{
1930 unsigned char clearfirst, /* first character writes before cell */
1931 clearlast, /* last character writes beyond cell */
1932 must_clear, /* use draw_string not draw_image_string */ 1964 unsigned char must_clear, /* use draw_string not draw_image_string */
1933 rvid, /* reverse video this position */ 1965 rvid, /* reverse video this position */
1934 showcursor; /* show the cursor */ 1966 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 1967 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 1968 ocrow; /* old cursor row */
1937 int i, /* tmp */ 1969 int i, /* tmp */
1938 row_offset; /* basic offset in screen structure */ 1970 row_offset; /* basic offset in screen structure */
1939#ifndef NO_CURSORCOLOR 1971#ifndef NO_CURSORCOLOR
1940 rend_t cc1; /* store colours at cursor position (s) */ 1972 rend_t cc1; /* store colours at cursor position (s) */
1941#endif 1973#endif
1942 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1974 rend_t *crp; // cursor rendition pointer
1943 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1944 1975
1945 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1976 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1946 return; 1977 return;
1947 1978
1948 /* 1979 /*
1949 * A: set up vars 1980 * A: set up vars
1950 */ 1981 */
1951 clearfirst = clearlast = must_clear = 0; 1982 must_clear = 0;
1952
1953 refresh_count = 0; 1983 refresh_count = 0;
1954 1984
1955 row_offset = TermWin.saveLines - TermWin.view_start; 1985 row_offset = TermWin.saveLines - TermWin.view_start;
1956
1957 if ((refresh_type & REFRESH_BOUNDS))
1958 {
1959 clearfirst = clearlast = 1;
1960 refresh_type &= ~REFRESH_BOUNDS;
1961 }
1962 1986
1963#ifdef XPM_BACKGROUND 1987#ifdef XPM_BACKGROUND
1964 must_clear |= (bgPixmap.pixmap != None); 1988 must_clear |= (bgPixmap.pixmap != None);
1965#endif 1989#endif
1966#ifdef TRANSPARENT 1990#ifdef TRANSPARENT
1967 must_clear |= ((Options & Opt_transparent) && am_transparent); 1991 must_clear |= ((options & Opt_transparent) && am_transparent);
1968#endif 1992#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1993 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 1994
1971 /* 1995 /*
1972 * B: reverse any characters which are selected 1996 * B: reverse any characters which are selected
1973 */ 1997 */
1974 scr_reverse_selection (); 1998 scr_reverse_selection ();
1999#if ENABLE_OVERLAY
2000 scr_swap_overlay ();
2001#endif
1975 2002
1976 /* 2003 /*
1977 * C: set the cursor character (s) 2004 * C: set the cursor character (s)
1978 */ 2005 */
1979 { 2006 {
… …
1987 showcursor = 0; 2014 showcursor = 0;
1988#endif 2015#endif
1989 2016
1990 if (showcursor) 2017 if (showcursor)
1991 { 2018 {
2019 int col = screen.cur.col;
2020
2021 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2022 col--;
2023
1992 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2024 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1993 2025
1994 if (showcursor && TermWin.focus) 2026 if (showcursor && TermWin.focus)
1995 { 2027 {
1996 *srp ^= RS_RVid; 2028 *crp ^= RS_RVid;
1997#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
1998 cc1 = *srp & (RS_fgMask | RS_bgMask); 2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
1999 if (ISSET_PIXCOLOR (Color_cursor)) 2031 if (ISSET_PIXCOLOR (Color_cursor))
2000 ccol1 = Color_cursor; 2032 ccol1 = Color_cursor;
2001 else 2033 else
2002#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2003 ccol1 = GET_FGCOLOR (rstyle); 2035 ccol1 = GET_FGCOLOR (rstyle);
… …
2010#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2011 ccol2 = GET_BGCOLOR (rstyle); 2043 ccol2 = GET_BGCOLOR (rstyle);
2012#else 2044#else
2013 ccol2 = Color_bg; 2045 ccol2 = Color_bg;
2014#endif 2046#endif
2015 *srp = SET_FGCOLOR (*srp, ccol1); 2047 *crp = SET_FGCOLOR (*crp, ccol1);
2016 *srp = SET_BGCOLOR (*srp, ccol2); 2048 *crp = SET_BGCOLOR (*crp, ccol2);
2017#endif 2049#endif
2018 } 2050 }
2019 } 2051 }
2020 2052
2021 /* make sure no outline cursor is left around */ 2053 /* make sure no outline cursor is left around */
… …
2048 oldcursor.col = screen.cur.col; 2080 oldcursor.col = screen.cur.col;
2049 } 2081 }
2050 } 2082 }
2051 } 2083 }
2052 2084
2085 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2053#ifndef NO_SLOW_LINK_SUPPORT 2087#ifndef NO_SLOW_LINK_SUPPORT
2054 /* 2088 /*
2055 * D: CopyArea pass - very useful for slower links 2089 * D: CopyArea pass - very useful for slower links
2056 * This has been deliberately kept simple. 2090 * This has been deliberately kept simple.
2057 */ 2091 */
2058 i = num_scr; 2092 i = num_scr;
2093 if (!display->is_local
2059 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2094 && refresh_type == FAST_REFRESH && num_scr_allow && i
2060 && abs (i) < TermWin.nrow && !must_clear) 2095 && abs (i) < TermWin.nrow && !must_clear)
2061 { 2096 {
2062 int16_t nits; 2097 int16_t nits;
2063 int j; 2098 int j;
2064 rend_t *drp2;
2065 text_t *dtp2;
2066 int len, wlen; 2099 int len, wlen;
2067 2100
2068 j = TermWin.nrow; 2101 j = TermWin.nrow;
2069 wlen = len = -1; 2102 wlen = len = -1;
2070 row = i > 0 ? 0 : j - 1; 2103 row = i > 0 ? 0 : j - 1;
2071 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2104 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2072 { 2105 {
2073 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2106 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2074 { 2107 {
2075 stp = screen.text[row + row_offset]; 2108 text_t *stp = screen.text[row + row_offset];
2076 srp = screen.rend[row + row_offset]; 2109 rend_t *srp = screen.rend[row + row_offset];
2077 dtp = drawn_text[row]; 2110 text_t *dtp = drawn_text[row];
2078 dtp2 = drawn_text[row + i]; 2111 text_t *dtp2 = drawn_text[row + i];
2079 drp = drawn_rend[row]; 2112 rend_t *drp = drawn_rend[row];
2080 drp2 = drawn_rend[row + i]; 2113 rend_t *drp2 = drawn_rend[row + i];
2081 2114
2082 for (nits = 0, col = TermWin.ncol; col--; ) 2115 for (nits = 0, col = TermWin.ncol; col--; )
2083 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2116 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2084 nits--; 2117 nits--;
2085 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2118 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2105 { 2138 {
2106 /* also comes here at end if needed because of >= above */ 2139 /* also comes here at end if needed because of >= above */
2107 if (wlen < len) 2140 if (wlen < len)
2108 SWAP_IT (wlen, len, int); 2141 SWAP_IT (wlen, len, int);
2109 2142
2110 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2111 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2143 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2112 TermWin.gc, 0, Row2Pixel (len + i), 2144 TermWin.gc, 0, Row2Pixel (len + i),
2113 (unsigned int)TermWin_TotalWidth (), 2145 (unsigned int)TermWin_TotalWidth (),
2114 (unsigned int)Height2Pixel (wlen - len + 1), 2146 (unsigned int)Height2Pixel (wlen - len + 1),
2115 0, Row2Pixel (len)); 2147 0, Row2Pixel (len));
… …
2122 /* 2154 /*
2123 * E: main pass across every character 2155 * E: main pass across every character
2124 */ 2156 */
2125 for (row = 0; row < TermWin.nrow; row++) 2157 for (row = 0; row < TermWin.nrow; row++)
2126 { 2158 {
2127 stp = screen.text[row + row_offset]; 2159 text_t *stp = screen.text[row + row_offset];
2128 srp = screen.rend[row + row_offset]; 2160 rend_t *srp = screen.rend[row + row_offset];
2129 dtp = drawn_text[row]; 2161 text_t *dtp = drawn_text[row];
2130 drp = drawn_rend[row]; 2162 rend_t *drp = drawn_rend[row];
2131 2163
2132 /* 2164 /*
2133 * E2: OK, now the real pass 2165 * E2: OK, now the real pass
2134 */ 2166 */
2135 int ypixel = (int)Row2Pixel (row); 2167 int ypixel = (int)Row2Pixel (row);
… …
2165 if (stp[col] == NOCHAR) 2197 if (stp[col] == NOCHAR)
2166 { 2198 {
2167 dtp[col] = stp[col]; 2199 dtp[col] = stp[col];
2168 drp[col] = rend; 2200 drp[col] = rend;
2169 count++; 2201 count++;
2170
2171 if (i) // only possible skip if char unchanged
2172 i++; 2202 i++;
2173 2203
2174 continue; 2204 continue;
2175 } 2205 }
2176 2206
2177 if (rend != srp[col]) 2207 if (rend != srp[col])
… …
2180 count++; 2210 count++;
2181 2211
2182 if (stp[col] != dtp[col] 2212 if (stp[col] != dtp[col]
2183 || srp[col] != drp[col]) 2213 || srp[col] != drp[col])
2184 { 2214 {
2185 if (must_clear && (i++ > (count / 2))) 2215 if (must_clear && (i++ > count / 2))
2186 break; 2216 break;
2187 2217
2188 dtp[col] = stp[col]; 2218 dtp[col] = stp[col];
2189 drp[col] = rend; 2219 drp[col] = rend;
2190 i = 0; 2220 i = 0;
2191 } 2221 }
2192 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2222 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2193 break; 2223 break;
2194 } 2224 }
2195 2225
2196 col--; /* went one too far. move back */ 2226 col--; /* went one too far. move back */
2197 count -= i; /* dump any matching trailing chars */ 2227 count -= i; /* dump any matching trailing chars */
2228
2229 // sometimes we optimize away the trailing NOCHAR's, add them back
2230 while (i && text[count] == NOCHAR)
2231 count++, i--;
2198 2232
2199 /* 2233 /*
2200 * Determine the attributes for the string 2234 * Determine the attributes for the string
2201 */ 2235 */
2202 int fid = GET_FONT (rend); 2236 int fid = GET_FONT (rend);
… …
2206 rend = GET_ATTR (rend); 2240 rend = GET_ATTR (rend);
2207 2241
2208 rvid = !!(rend & RS_RVid); 2242 rvid = !!(rend & RS_RVid);
2209 2243
2210#ifndef NO_BOLD_UNDERLINE_REVERSE 2244#ifndef NO_BOLD_UNDERLINE_REVERSE
2211 if (rend & RS_Bold && fore == Color_fg) 2245 if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold))
2212 { 2246 {
2213 if (ISSET_PIXCOLOR (Color_BD)) 2247 if (ISSET_PIXCOLOR (Color_BD))
2214 fore = Color_BD; 2248 fore = Color_BD;
2215 else 2249 else
2216 rvid = !rvid; 2250 rvid = !rvid;
… …
2234 back = Color_RV; 2268 back = Color_RV;
2235#endif 2269#endif
2236 } 2270 }
2237 2271
2238#ifdef TEXT_BLINK 2272#ifdef TEXT_BLINK
2239 if (rend & RS_Blink && back == Color_bg) 2273 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2240 { 2274 {
2241 if (!text_blink_ev.active) 2275 if (!text_blink_ev.active)
2242 { 2276 {
2243 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2277 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2244 hidden_text = 0; 2278 hidden_text = 0;
… …
2274 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2308 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2275 } 2309 }
2276 else 2310 else
2277 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2311 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2278 2312
2279 if ((rend & RS_Uline) && (font->descent > 1)) 2313 if (rend & RS_Uline && font->descent > 1 && fore != back)
2280 XDrawLine (display->display, drawBuffer, TermWin.gc, 2314 XDrawLine (display->display, drawBuffer, TermWin.gc,
2281 xpixel, ypixel + font->ascent + 1, 2315 xpixel, ypixel + font->ascent + 1,
2282 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2316 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2283 } /* for (col....) */ 2317 } /* for (col....) */
2284 } /* for (row....) */ 2318 } /* for (row....) */
… …
2288 */ 2322 */
2289 if (showcursor) 2323 if (showcursor)
2290 { 2324 {
2291 if (TermWin.focus) 2325 if (TermWin.focus)
2292 { 2326 {
2293 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2294 [screen.cur.col]);
2295 *srp ^= RS_RVid; 2327 *crp ^= RS_RVid;
2296#ifndef NO_CURSORCOLOR 2328#ifndef NO_CURSORCOLOR
2297 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2329 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2298#endif 2330#endif
2299 } 2331 }
2300 else if (oldcursor.row >= 0) 2332 else if (oldcursor.row >= 0)
2301 { 2333 {
2302#ifndef NO_CURSORCOLOR 2334#ifndef NO_CURSORCOLOR
2303 if (ISSET_PIXCOLOR (Color_cursor)) 2335 if (ISSET_PIXCOLOR (Color_cursor))
2304 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2336 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2305#endif 2337#endif
2306 int cursorwidth = 1; 2338 int cursorwidth = 1;
2307 while (oldcursor.col + cursorwidth < TermWin.ncol 2339 while (oldcursor.col + cursorwidth < TermWin.ncol
2308 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2340 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2309 cursorwidth++; 2341 cursorwidth++;
… …
2317 } 2349 }
2318 2350
2319 /* 2351 /*
2320 * H: cleanup selection 2352 * H: cleanup selection
2321 */ 2353 */
2354#if ENABLE_OVERLAY
2355 scr_swap_overlay ();
2356#endif
2322 scr_reverse_selection (); 2357 scr_reverse_selection ();
2323 2358
2324 /*
2325 * I: other general cleanup
2326 */
2327 if (clearfirst && TermWin.int_bwidth)
2328 /*
2329 * clear the whole screen height, note that width == 0 is treated
2330 * specially by XClearArea
2331 */
2332 XClearArea (display->display, TermWin.vt, 0, 0,
2333 (unsigned int)TermWin.int_bwidth,
2334 (unsigned int)TermWin_TotalHeight (), False);
2335
2336 if (clearlast && TermWin.int_bwidth)
2337 /*
2338 * clear the whole screen height, note that width == 0 is treated
2339 * specially by XClearArea
2340 */
2341 XClearArea (display->display, TermWin.vt,
2342 TermWin.width + TermWin.int_bwidth, 0,
2343 (unsigned int)TermWin.int_bwidth,
2344 (unsigned int)TermWin_TotalHeight (), False);
2345
2346 if (refresh_type & SMOOTH_REFRESH) 2359 if (refresh_type & SMOOTH_REFRESH)
2347 XSync (display->display, False); 2360 XFlush (display->display);
2348 2361
2349 num_scr = 0; 2362 num_scr = 0;
2350 num_scr_allow = 1; 2363 num_scr_allow = 1;
2351 want_refresh = 0; /* screen is current */ 2364 want_refresh = 0; /* screen is current */
2352} 2365}
… …
2383 2396
2384 num_scr_allow = 0; 2397 num_scr_allow = 0;
2385 want_refresh = 1; 2398 want_refresh = 1;
2386 2399
2387#ifdef TRANSPARENT 2400#ifdef TRANSPARENT
2388 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2401 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2389 { 2402 {
2390 int i; 2403 int i;
2391 2404
2392 if (! (Options & Opt_transparent_all)) 2405 if (! (options & Opt_transparent_all))
2393 i = 0; 2406 i = 0;
2394 else 2407 else
2395 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2408 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2396 2409
2397 while (i--) 2410 while (i--)
… …
2474 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2487 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2475 */ 2488 */
2476void 2489void
2477rxvt_term::selection_check (int check_more) 2490rxvt_term::selection_check (int check_more)
2478{ 2491{
2479 row_col_t pos; 2492 row_col_t pos;
2480 2493
2481 if (!selection.op) 2494 if (!selection.op)
2482 return; 2495 return;
2483 2496
2484 pos.row = pos.col = 0; 2497 pos.row = pos.col = 0;
… …
2511rxvt_term::paste (const unsigned char *data, unsigned int len) 2524rxvt_term::paste (const unsigned char *data, unsigned int len)
2512{ 2525{
2513 unsigned int i, j, n; 2526 unsigned int i, j, n;
2514 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2527 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2515 2528
2516#if 0
2517 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2518 ZERO_SCROLLBACK (r);
2519#endif
2520
2521 /* convert normal newline chars into common keyboard Return key sequence */ 2529 /* convert normal newline chars into common keyboard Return key sequence */
2522 for (i = 0; i < len; i += PROP_SIZE) 2530 for (i = 0; i < len; i += PROP_SIZE)
2523 { 2531 {
2524 n = min (len - i, PROP_SIZE); 2532 n = min (len - i, PROP_SIZE);
2525 MEMCPY (ds, data + i, n); 2533 memcpy (ds, data + i, n);
2526 2534
2527 for (j = 0; j < n; j++) 2535 for (j = 0; j < n; j++)
2528 if (ds[j] == C0_LF) 2536 if (ds[j] == C0_LF)
2529 ds[j] = C0_CR; 2537 ds[j] = C0_CR;
2530 2538
… …
2543rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2544{ 2552{
2545 long nread = 0; 2553 long nread = 0;
2546 unsigned long bytes_after; 2554 unsigned long bytes_after;
2547 XTextProperty ct; 2555 XTextProperty ct;
2548
2549 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2550 2556
2551 if (prop == None) /* check for failed XConvertSelection */ 2557 if (prop == None) /* check for failed XConvertSelection */
2552 { 2558 {
2553 if ((selection_type & Sel_CompoundText)) 2559 if ((selection_type & Sel_CompoundText))
2554 { 2560 {
… …
2581 &ct.nitems, &bytes_after, 2587 &ct.nitems, &bytes_after,
2582 &ct.value) != Success) 2588 &ct.value) != Success)
2583 break; 2589 break;
2584 2590
2585 if (ct.encoding == 0) 2591 if (ct.encoding == 0)
2592 break;
2593
2594 if (ct.encoding == xa[XA_INCR])
2586 { 2595 {
2587 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2596 // INCR selection, start handshake
2597 XDeleteProperty (display->display, win, prop);
2598 selection_wait = Sel_incr;
2599 incr_ev.start (NOW + 10);
2588 break; 2600 break;
2589 } 2601 }
2590 2602
2591 if (ct.value == NULL) 2603 if (ct.value == NULL)
2592 {
2593 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2594 continue; 2604 continue;
2595 }
2596 2605
2597 if (ct.nitems == 0) 2606 if (ct.nitems == 0)
2598 { 2607 {
2599 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2600
2601 if (selection_wait == Sel_normal && nread == 0 2608 if (selection_wait == Sel_normal && nread == 0
2602 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2609 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2603 { 2610 {
2604 /* 2611 /*
2605 * pass through again trying CUT_BUFFER0 if we've come from 2612 * pass through again trying CUT_BUFFER0 if we've come from
2606 * XConvertSelection () but nothing was presented 2613 * XConvertSelection () but nothing was presented
2607 */ 2614 */
2608 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2609 selection_paste (display->root, XA_CUT_BUFFER0, False); 2615 selection_paste (display->root, XA_CUT_BUFFER0, False);
2610 } 2616 }
2611 2617
2612 nread = -1; /* discount any previous stuff */ 2618 nread = -1; /* discount any previous stuff */
2613 break; 2619 break;
… …
2618 char **cl; 2624 char **cl;
2619 int cr; 2625 int cr;
2620 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2626 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2621 { 2627 {
2622 for (int i = 0; i < cr; i++) 2628 for (int i = 0; i < cr; i++)
2623 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2629 paste ((unsigned char *)cl[i], strlen (cl[i]));
2624 2630
2625 XFreeStringList (cl); 2631 XFreeStringList (cl);
2626 } 2632 }
2627 else 2633 else
2628 paste (ct.value, ct.nitems); 2634 paste (ct.value, ct.nitems);
… …
2637 XFree (ct.value); 2643 XFree (ct.value);
2638 2644
2639 if (selection_wait == Sel_normal) 2645 if (selection_wait == Sel_normal)
2640 selection_wait = Sel_none; 2646 selection_wait = Sel_none;
2641 2647
2642 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2643 return (int)nread; 2648 return (int)nread;
2644} 2649}
2645 2650
2646void 2651void
2647rxvt_term::incr_cb (time_watcher &w) 2652rxvt_term::incr_cb (time_watcher &w)
… …
2655 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2660 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2656 */ 2661 */
2657void 2662void
2658rxvt_term::selection_property (Window win, Atom prop) 2663rxvt_term::selection_property (Window win, Atom prop)
2659{ 2664{
2660 int reget_time = 0; 2665 if (prop == None || selection_wait != Sel_incr)
2661
2662 if (prop == None)
2663 return; 2666 return;
2664 2667
2665 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2666 if (selection_wait == Sel_normal)
2667 {
2668 int a, afmt;
2669 Atom atype;
2670 unsigned long bytes_after, nitems;
2671 unsigned char *s = NULL;
2672
2673 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2674 xa[XA_INCR], &atype, &afmt, &nitems,
2675 &bytes_after, &s);
2676 if (s)
2677 XFree (s);
2678 if (a != Success)
2679 return;
2680
2681#ifndef __CYGWIN32__
2682 if (atype == xa[XA_INCR])
2683 { /* start an INCR transfer */
2684 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2685 XDeleteProperty (display->display, win, prop);
2686 XFlush (display->display);
2687 reget_time = 1;
2688 selection_wait = Sel_incr;
2689 }
2690#endif
2691
2692 }
2693 else if (selection_wait == Sel_incr)
2694 {
2695 reget_time = 1;
2696
2697 if (selection_paste (win, prop, True) == -1) 2668 if (selection_paste (win, prop, 1) > 0)
2698 {
2699 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2700 selection_wait = Sel_none;
2701 incr_ev.stop ();
2702 }
2703 }
2704 if (reget_time) /* received more data so reget time */
2705 incr_ev.start (NOW + 10); 2669 incr_ev.start (NOW + 10);
2670 else
2671 {
2672 selection_wait = Sel_none;
2673 incr_ev.stop ();
2674 }
2706} 2675}
2707 2676
2708/* ------------------------------------------------------------------------- */ 2677/* ------------------------------------------------------------------------- */
2709/* 2678/*
2710 * Request the current selection: 2679 * Request the current selection:
… …
2716 * EXT: button 2 release 2685 * EXT: button 2 release
2717 */ 2686 */
2718void 2687void
2719rxvt_term::selection_request (Time tm, int x, int y) 2688rxvt_term::selection_request (Time tm, int x, int y)
2720{ 2689{
2721 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2722
2723 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2690 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2724 return; /* outside window */ 2691 return; /* outside window */
2725 2692
2726 if (selection.text) 2693 if (selection.text)
2727 { /* internal selection */ 2694 { /* internal selection */
2728 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2695 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2696 paste ((unsigned char *)str, strlen (str));
2731 free (str); 2697 free (str);
2732 return; 2698 return;
2733 } 2699 }
… …
2752 2718
2753 } 2719 }
2754 } 2720 }
2755 2721
2756 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2722 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2757 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2758 selection_paste (display->root, XA_CUT_BUFFER0, False); 2723 selection_paste (display->root, XA_CUT_BUFFER0, False);
2759} 2724}
2760 2725
2761int 2726int
2762rxvt_term::selection_request_other (Atom target, int selnum) 2727rxvt_term::selection_request_other (Atom target, int selnum)
… …
2775 else 2740 else
2776 sel = xa[XA_CLIPBOARD]; 2741 sel = xa[XA_CLIPBOARD];
2777 2742
2778 if (XGetSelectionOwner (display->display, sel) != None) 2743 if (XGetSelectionOwner (display->display, sel) != None)
2779 { 2744 {
2780 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2781 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2745 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2782 TermWin.vt, selection_request_time); 2746 TermWin.vt, selection_request_time);
2783 return 1; 2747 return 1;
2784 } 2748 }
2785 2749
… …
2792 * EXT: SelectionClear 2756 * EXT: SelectionClear
2793 */ 2757 */
2794void 2758void
2795rxvt_term::selection_clear () 2759rxvt_term::selection_clear ()
2796{ 2760{
2797 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2798
2799 want_refresh = 1; 2761 want_refresh = 1;
2800 free (selection.text); 2762 free (selection.text);
2801 selection.text = NULL; 2763 selection.text = NULL;
2802 selection.len = 0; 2764 selection.len = 0;
2803 CLEAR_SELECTION (); 2765 CLEAR_SELECTION ();
… …
2816{ 2778{
2817 int i, col, end_col, row, end_row; 2779 int i, col, end_col, row, end_row;
2818 wchar_t *new_selection_text; 2780 wchar_t *new_selection_text;
2819 text_t *t; 2781 text_t *t;
2820 2782
2821 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2822 switch (selection.op) 2783 switch (selection.op)
2823 { 2784 {
2824 case SELECTION_CONT: 2785 case SELECTION_CONT:
2825 break; 2786 break;
2826 case SELECTION_INIT: 2787 case SELECTION_INIT:
… …
2848 int ofs = 0; 2809 int ofs = 0;
2849 int extra = 0; 2810 int extra = 0;
2850 2811
2851 for (; row <= end_row; row++, col = 0) 2812 for (; row <= end_row; row++, col = 0)
2852 { 2813 {
2853 t = &(screen.text[row][col]); 2814 t = &screen.text[row][col];
2854 2815
2855 end_col = screen.tlen[row]; 2816 end_col = screen.tlen[row];
2856 2817
2857 if (end_col == -1) 2818 if (end_col == -1)
2858 end_col = TermWin.ncol; 2819 end_col = TermWin.ncol;
… …
2922 XFree (ct.value); 2883 XFree (ct.value);
2923 } 2884 }
2924#endif 2885#endif
2925 2886
2926 selection_time = tm; 2887 selection_time = tm;
2927 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2928} 2888}
2929 2889
2930/* ------------------------------------------------------------------------- */ 2890/* ------------------------------------------------------------------------- */
2931/* 2891/*
2932 * Mark or select text based upon number of clicks: 1, 2, or 3 2892 * Mark or select text based upon number of clicks: 1, 2, or 3
2933 * EXT: button 1 press 2893 * EXT: button 1 press
2934 */ 2894 */
2935void 2895void
2936rxvt_term::selection_click (int clicks, int x, int y) 2896rxvt_term::selection_click (int clicks, int x, int y)
2937{ 2897{
2938 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2939
2940 clicks = ((clicks - 1) % 3) + 1; 2898 clicks = ((clicks - 1) % 3) + 1;
2941 selection.clicks = clicks; /* save clicks so extend will work */ 2899 selection.clicks = clicks; /* save clicks so extend will work */
2942 2900
2943 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2901 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2944 2902
… …
2986 * We now only find out the boundary in one direction 2944 * We now only find out the boundary in one direction
2987 */ 2945 */
2988 2946
2989/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2947/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2990#define DELIMIT_TEXT(x) \ 2948#define DELIMIT_TEXT(x) \
2991 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 2949 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2992#define DELIMIT_REND(x) 1 2950#define DELIMIT_REND(x) 1
2993 2951
2994void 2952void
2995rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2953rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2996{ 2954{
… …
3014 2972
3015 row = mark->row + TermWin.saveLines; 2973 row = mark->row + TermWin.saveLines;
3016 col = mark->col; 2974 col = mark->col;
3017 MAX_IT (col, 0); 2975 MAX_IT (col, 0);
3018 /* find the edge of a word */ 2976 /* find the edge of a word */
3019 stp = & (screen.text[row][col]); 2977 stp = &screen.text[row][col];
3020 w1 = DELIMIT_TEXT (*stp); 2978 w1 = DELIMIT_TEXT (*stp);
3021 2979
3022 srp = (&screen.rend[row][col]); 2980 srp = &screen.rend[row][col];
3023 w2 = DELIMIT_REND (*srp); 2981 w2 = DELIMIT_REND (*srp);
3024 2982
3025 for (;;) 2983 for (;;)
3026 { 2984 {
3027 for (; col != bound.col; col += dirnadd) 2985 for (; col != bound.col; col += dirnadd)
… …
3061 } 3019 }
3062 break; 3020 break;
3063 } 3021 }
3064 3022
3065Old_Word_Selection_You_Die: 3023Old_Word_Selection_You_Die:
3066 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));
3067
3068 if (dirn == DN) 3024 if (dirn == DN)
3069 col++; /* put us on one past the end */ 3025 col++; /* put us on one past the end */
3070 3026
3071 /* Poke the values back in */ 3027 /* Poke the values back in */
3072 ret->row = row - TermWin.saveLines; 3028 ret->row = row - TermWin.saveLines;
… …
3106 /* select nothing */ 3062 /* select nothing */
3107 selection.beg.row = selection.end.row = 0; 3063 selection.beg.row = selection.end.row = 0;
3108 selection.beg.col = selection.end.col = 0; 3064 selection.beg.col = selection.end.col = 0;
3109 selection.clicks = 4; 3065 selection.clicks = 4;
3110 want_refresh = 1; 3066 want_refresh = 1;
3111 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3112 return; 3067 return;
3113 } 3068 }
3114 3069
3115 if (selection.clicks == 4) 3070 if (selection.clicks == 4)
3116 selection.clicks = 1; 3071 selection.clicks = 1;
… …
3131 int end_col; 3086 int end_col;
3132 row_col_t pos; 3087 row_col_t pos;
3133 enum { 3088 enum {
3134 LEFT, RIGHT 3089 LEFT, RIGHT
3135 } closeto = RIGHT; 3090 } closeto = RIGHT;
3136
3137 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));
3138 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));
3139 3091
3140 want_refresh = 1; 3092 want_refresh = 1;
3141 switch (selection.op) 3093 switch (selection.op)
3142 { 3094 {
3143 case SELECTION_INIT: 3095 case SELECTION_INIT:
… …
3165 && selection.beg.row == selection.end.row 3117 && selection.beg.row == selection.end.row
3166 && selection.beg.row != selection.mark.row) 3118 && selection.beg.row != selection.mark.row)
3167 { 3119 {
3168 selection.beg.col = selection.end.col = selection.mark.col; 3120 selection.beg.col = selection.end.col = selection.mark.col;
3169 selection.beg.row = selection.end.row = selection.mark.row; 3121 selection.beg.row = selection.end.row = selection.mark.row;
3170 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));
3171 } 3122 }
3172 3123
3173 pos.col = col; 3124 pos.col = col;
3174 pos.row = row; 3125 pos.row = row;
3175 3126
… …
3268 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3219 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3269 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3220 selection_delimit_word (DN, & (selection.end), & (selection.end));
3270 } 3221 }
3271 else if (selection.clicks == 3) 3222 else if (selection.clicks == 3)
3272 { 3223 {
3273#ifndef NO_FRILLS 3224#if ENABLE_FRILLS
3274 if ((Options & Opt_tripleclickwords)) 3225 if ((options & Opt_tripleclickwords))
3275 { 3226 {
3276 int end_row; 3227 int end_row;
3277 3228
3278 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3229 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3279 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3230 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
… …
3304 if (button3 && buttonpress) 3255 if (button3 && buttonpress)
3305 { /* mark may need to be changed */ 3256 { /* mark may need to be changed */
3306 if (closeto == LEFT) 3257 if (closeto == LEFT)
3307 { 3258 {
3308 selection.mark.row = selection.end.row; 3259 selection.mark.row = selection.end.row;
3309 selection.mark.col = selection.end.col 3260 selection.mark.col = selection.end.col - (selection.clicks == 2);
3310 - (selection.clicks == 2);
3311 } 3261 }
3312 else 3262 else
3313 { 3263 {
3314 selection.mark.row = selection.beg.row; 3264 selection.mark.row = selection.beg.row;
3315 selection.mark.col = selection.beg.col; 3265 selection.mark.col = selection.beg.col;
3316 } 3266 }
3317 } 3267 }
3318 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));
3319} 3268}
3320 3269
3321#ifndef NO_FRILLS 3270#if ENABLE_FRILLS
3322void 3271void
3323rxvt_term::selection_remove_trailing_spaces () 3272rxvt_term::selection_remove_trailing_spaces ()
3324{ 3273{
3325 int32_t end_col, end_row; 3274 int32_t end_col, end_row;
3326 text_t *stp; 3275 text_t *stp;
… …
3415 (8 * sizeof (target_list[0])), PropModeReplace, 3364 (8 * sizeof (target_list[0])), PropModeReplace,
3416 (unsigned char *)target_list, 3365 (unsigned char *)target_list,
3417 target - target_list); 3366 target - target_list);
3418 ev.property = rq.property; 3367 ev.property = rq.property;
3419 } 3368 }
3369#if TODO // TODO
3420 else if (rq.target == xa[XA_MULTIPLE]) 3370 else if (rq.target == xa[XA_MULTIPLE])
3421 { 3371 {
3422 /* TODO: Handle MULTIPLE */ 3372 /* TODO: Handle MULTIPLE */
3423 } 3373 }
3374#endif
3424 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3375 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3425 { 3376 {
3426 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3377 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3427 (8 * sizeof (Time)), PropModeReplace, 3378 (8 * sizeof (Time)), PropModeReplace,
3428 (unsigned char *)&selection_time, 1); 3379 (unsigned char *)&selection_time, 1);
… …
3509} 3460}
3510 3461
3511/* ------------------------------------------------------------------------- */ 3462/* ------------------------------------------------------------------------- */
3512#ifdef USE_XIM 3463#ifdef USE_XIM
3513void 3464void
3514rxvt_term::im_set_position (XPoint *pos) 3465rxvt_term::im_set_position (XPoint &pos)
3515{ 3466{
3516 XWindowAttributes xwa; 3467 XWindowAttributes xwa;
3517 3468
3518 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3469 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3470
3519 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3471 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3520 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3472 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3521} 3473}
3522
3523#endif 3474#endif
3475
3476#if ENABLE_OVERLAY
3477void
3478rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3479{
3480 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3481 return;
3482
3483 want_refresh = 1;
3484
3485 scr_overlay_off ();
3486
3487 if (x < 0) x = TermWin.ncol - w;
3488 if (y < 0) y = TermWin.nrow - h;
3489
3490 // make space for border
3491 w += 2; MIN_IT (w, TermWin.ncol);
3492 h += 2; MIN_IT (h, TermWin.nrow);
3493
3494 x -= 1; MAX_IT (x, 0);
3495 y -= 1; MAX_IT (y, 0);
3496
3497 MIN_IT (x, TermWin.ncol - w);
3498 MIN_IT (y, TermWin.nrow - h);
3499
3500 ov_x = x; ov_y = y;
3501 ov_w = w; ov_h = h;
3502
3503 ov_text = new text_t *[h];
3504 ov_rend = new rend_t *[h];
3505
3506 for (y = 0; y < h; y++)
3507 {
3508 text_t *tp = ov_text[y] = new text_t[w];
3509 rend_t *rp = ov_rend[y] = new rend_t[w];
3510
3511 text_t t0, t1, t2;
3512 rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg);
3513
3514 if (y == 0)
3515 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516 else if (y < h - 1)
3517 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3518 else
3519 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3520
3521 *tp++ = t0;
3522 *rp++ = r;
3523
3524 for (x = w - 2; x > 0; --x)
3525 {
3526 *tp++ = t1;
3527 *rp++ = r;
3528 }
3529
3530 *tp = t2;
3531 *rp = r;
3532 }
3533}
3534
3535void
3536rxvt_term::scr_overlay_off ()
3537{
3538 if (!ov_text)
3539 return;
3540
3541 want_refresh = 1;
3542
3543 for (int y = 0; y < ov_h; y++)
3544 {
3545 delete [] ov_text[y];
3546 delete [] ov_rend[y];
3547 }
3548
3549 delete [] ov_text; ov_text = 0;
3550 delete [] ov_rend; ov_rend = 0;
3551}
3552
3553void
3554rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555{
3556 if (!ov_text || x >= ov_w - 2 || y >= ov_h)
3557 return;
3558
3559 x++, y++;
3560
3561 ov_text[y][x] = text;
3562 ov_rend[y][x] = rend;
3563}
3564
3565void
3566rxvt_term::scr_overlay_set (int x, int y, const char *s)
3567{
3568 while (*s)
3569 scr_overlay_set (x++, y, *s++);
3570}
3571
3572void
3573rxvt_term::scr_swap_overlay ()
3574{
3575 if (!ov_text)
3576 return;
3577
3578 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3579
3580 // swap screen mem with overlay
3581 for (int y = ov_h; y--; )
3582 {
3583 text_t *t1 = ov_text[y];
3584 rend_t *r1 = ov_rend[y];
3585
3586 text_t *t2 = screen.text[y + row_offset] + ov_x;
3587 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588
3589 for (int x = ov_w; x--; )
3590 {
3591 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3592 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false));
3593 }
3594 }
3595}
3596
3597#endif
3524/* ------------------------------------------------------------------------- */ 3598/* ------------------------------------------------------------------------- */

Diff Legend

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