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.89 by root, Fri Aug 13 22:38:57 2004 UTC

… …
29#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */ 30#include "screen.intpro" /* PROTOS for internal routines */
31 31
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 33
34#include <stdint.h> 34#include <inttypes.h>
35#include <wchar.h> 35#include <wchar.h>
36 36
37#include "salloc.C" // HACK, should be a seperate compile! 37#include "salloc.C" // HACK, should be a seperate compile!
38 38
39inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
… …
48 48
49/* ------------------------------------------------------------------------- * 49/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 51 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 52#define ZERO_SCROLLBACK() \
53 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 53 if (Options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 54 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 55#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 56 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 57 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 58#define CLEAR_ALL_SELECTION() \
59 selection.beg.row = selection.beg.col \ 59 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 60 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 61 = selection.end.row = selection.end.col = 0
62 62
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 64 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 66 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 68 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 70 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 72 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 74 (((A) == (C)) && ((B) <= (D)))
75 75
76/* these must be row_col_t */ 76/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 77#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 79#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 81#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 85#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) 86 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) \ 87#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) 88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 89
90/* 90/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row> 91 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 92 * 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 93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 94 */
95#define drawBuffer TermWin.vt 95#define drawBuffer TermWin.vt
96 96
97#define CLEAR_ROWS(row, num) \ 97#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \ 98 if (TermWin.mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \ 99 XClearArea (display->display, drawBuffer, 0, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \ 100 Row2Pixel (row), (unsigned int)TermWin.width, \
101 (unsigned int)Height2Pixel (num), False) 101 (unsigned int)Height2Pixel (num), False)
102 102
103#define CLEAR_CHARS(x, y, num) \ 103#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 104 if (TermWin.mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 105 XClearArea (display->display, drawBuffer, x, y, \
106 (unsigned int)Width2Pixel (num), \ 106 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 107 (unsigned int)Height2Pixel (1), False)
108 108
109#define ERASE_ROWS(row, num) \ 109#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \ 110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \ 111 0, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \ 112 (unsigned int)TermWin.width, \
113 (unsigned int)Height2Pixel (num)) 113 (unsigned int)Height2Pixel (num))
114 114
115/* ------------------------------------------------------------------------- * 115/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 116 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 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.fontset->find_font (' ')); 123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]);
124 124
125 while (width--) 125 while (width--)
126 { 126 {
127 *et++ = ' '; 127 *et++ = ' ';
128 *er++ = efs; 128 *er++ = efs;
… …
172 nrow = TermWin.nrow; 172 nrow = TermWin.nrow;
173 173
174 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 175 return;
176 176
177 // we need at least two lines for wrapping to work correctly
178 if (nrow + TermWin.saveLines < 2)
179 {
180 TermWin.saveLines++;
181 prev_nrow--;
182 TermWin.nscrolled++;
183 }
184
177 want_refresh = 1; 185 want_refresh = 1;
178 186
187 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 188 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 189
182 screen.tscroll = 0; 190 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 191 screen.bscroll = nrow - 1;
184 192
185 if (!talloc) 193 if (!talloc)
186 { 194 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 195 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 196 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 197 }
190 198
191 if (prev_nrow == 0) 199 if (!screen.text)
192 { 200 {
193 /* 201 /*
194 * first time called so just malloc everything: don't rely on realloc 202 * 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 203 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 204 */
… …
705 if (j > 0) 713 if (j > 0)
706 { 714 {
707 /* A: scroll up */ 715 /* A: scroll up */
708 716
709 /* A1: Copy lines that will get clobbered by the rotation */ 717 /* A1: Copy lines that will get clobbered by the rotation */
718 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
719 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
720
721 /* A2: Rotate lines */
722 i = row2 - row1 - count + 1;
723 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
724 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
725 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
726
727 j = row2 - count + 1, i = count;
728 }
729 else /* if (j < 0) */
730 {
731 /* B: scroll down */
732
733 /* B1: Copy lines that will get clobbered by the rotation */
710 for (i = 0, j = row1; i < count; i++, j++) 734 for (i = 0, j = row2; i < count; i++, j--)
711 { 735 {
712 buf_text[i] = screen.text[j]; 736 buf_text[i] = screen.text[j];
713 buf_rend[i] = screen.rend[j]; 737 buf_rend[i] = screen.rend[j];
714 } 738 }
715 739
716 /* A2: Rotate lines */ 740 /* B2: Rotate lines */
717 for (j = row1, i = j + count; i <= row2; i++, j++) 741 for (j = row2, i = j - count; i >= row1; i--, j--)
718 { 742 {
719 screen.tlen[j] = screen.tlen[i]; 743 screen.tlen[j] = screen.tlen[i];
720 screen.text[j] = screen.text[i]; 744 screen.text[j] = screen.text[i];
721 screen.rend[j] = screen.rend[i]; 745 screen.rend[j] = screen.rend[i];
722 } 746 }
723 747
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; 748 j = row1, i = count;
746 count = -count; 749 count = -count;
747 } 750 }
748 751
749 /* C: Resurrect lines */ 752 /* C: Resurrect lines */
753 memset (screen.tlen + j, 0, i * sizeof (int16_t));
754 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
755 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
756 if (!spec) /* line length may not equal TermWin.ncol */
750 for (; i--; j++) 757 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); 758 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
758 }
759 759
760 return count; 760 return count;
761} 761}
762 762
763/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
… …
781 781
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); 782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK (); 783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 784 if (nlines > 0)
785 { 785 {
786 nlines += (screen.cur.row - screen.bscroll); 786 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 787 if ((nlines > 0)
788 && (screen.tscroll == 0) 788 && (screen.tscroll == 0)
789 && (screen.bscroll == (TermWin.nrow - 1))) 789 && (screen.bscroll == (TermWin.nrow - 1)))
790 { 790 {
791 /* _at least_ this many lines need to be scrolled */ 791 /* _at least_ this many lines need to be scrolled */
792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
793 screen.cur.row -= nlines; 793 screen.cur.row -= nlines;
794 } 794 }
795 } 795 }
796
796#ifdef DEBUG_STRICT 797#ifdef DEBUG_STRICT
797 assert (screen.cur.col < last_col); 798 assert (screen.cur.col < last_col);
798 assert ((screen.cur.row < TermWin.nrow) 799 assert ((screen.cur.row < TermWin.nrow)
799 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 800 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
800#else /* drive with your eyes closed */ 801#else /* drive with your eyes closed */
801 MIN_IT (screen.cur.col, last_col - 1); 802 MIN_IT (screen.cur.col, last_col - 1);
802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 803 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 804 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
804#endif 805#endif
… …
871 scr_insdel_chars (1, INSERT); 872 scr_insdel_chars (1, INSERT);
872 873
873 // rely on wcwidth to tell us the character width, at least for non-latin1 874 // 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 875 // do wcwidth before further replacements, as wcwidth says that line-drawing
875 // characters have width -1 (DOH!) on GNU/Linux sometimes. 876 // characters have width -1 (DOH!) on GNU/Linux sometimes.
876 int width = c < 256 ? 1 : wcwidth (c); 877 int width = c < 0x100 ? 1 : wcwidth (c);
877 878
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 879 if (charsets[screen.charset] == '0') // DEC SPECIAL
879 { 880 {
880 // vt100 special graphics and line drawing 881 // vt100 special graphics and line drawing
881 static uint16_t vt100_0[32] = { // 5f .. 7e 882 static uint16_t vt100_0[32] = { // 5f .. 7e
… …
897#if !UNICODE_3 && ENABLE_COMBINING 898#if !UNICODE_3 && ENABLE_COMBINING
898 // trim characters we can't store directly :( 899 // trim characters we can't store directly :(
899 if (c >= 0x10000) 900 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits 901 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif 902#endif
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 903 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0);
904 rend_t rend = SET_FONT (rstyle,
905 c > 0x7f || bold || c < 0x20
906 ? TermWin.fontset->find_font (c, bold)
907 : TermWin.ascii_map [c - 0x20]);
903 908
904 do 909 do
905 { 910 {
906 stp[screen.cur.col] = c; 911 stp[screen.cur.col] = c;
907 srp[screen.cur.col] = rend; 912 srp[screen.cur.col] = rend;
… …
1288 break; 1293 break;
1289 default: 1294 default:
1290 return; 1295 return;
1291 } 1296 }
1292 1297
1293 refresh_type |= REFRESH_BOUNDS;
1294
1295 if (selection.op && current_screen == selection.screen 1298 if (selection.op && current_screen == selection.screen
1296 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1299 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1297 || (selection.end.row >= row 1300 || (selection.end.row >= row
1298 && selection.end.row <= row + num))) 1301 && selection.end.row <= row + num)))
1299 CLEAR_SELECTION (); 1302 CLEAR_SELECTION ();
… …
1746 row_col_t rc[RC_COUNT]; 1749 row_col_t rc[RC_COUNT];
1747 1750
1748 if (drawn_text == NULL) /* sanity check */ 1751 if (drawn_text == NULL) /* sanity check */
1749 return; 1752 return;
1750 1753
1754#ifndef NO_SLOW_LINK_SUPPORT
1755 if (refresh_type == FAST_REFRESH && !display->is_local)
1756 {
1757 y = 0;
1758 height = TermWin.height;
1759 }
1760#endif
1761
1751#ifdef DEBUG_STRICT 1762#ifdef DEBUG_STRICT
1752 x = max (x, (int)TermWin.int_bwidth); 1763 x = max (x, 0);
1753 x = min (x, (int)TermWin.width); 1764 x = min (x, (int)TermWin.width);
1754 y = max (y, (int)TermWin.int_bwidth); 1765 y = max (y, 0);
1755 y = min (y, (int)TermWin.height); 1766 y = min (y, (int)TermWin.height);
1756#endif 1767#endif
1757 1768
1758 /* round down */ 1769 /* round down */
1759 rc[PART_BEG].col = Pixel2Col (x); 1770 rc[PART_BEG].col = Pixel2Col (x);
… …
1773 1784
1774 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1785 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); 1786 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1776 1787
1777 if (refresh) 1788 if (refresh)
1778 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1789 scr_refresh (SLOW_REFRESH);
1779} 1790}
1780 1791
1781/* ------------------------------------------------------------------------- */ 1792/* ------------------------------------------------------------------------- */
1782/* 1793/*
1783 * Refresh the entire screen 1794 * Refresh the entire screen
… …
1818 * direction should be UP or DN 1829 * direction should be UP or DN
1819 */ 1830 */
1820int 1831int
1821rxvt_term::scr_page (enum page_dirn direction, int nlines) 1832rxvt_term::scr_page (enum page_dirn direction, int nlines)
1822{ 1833{
1823 int n; 1834 int n;
1824 uint16_t oldviewstart; 1835 uint16_t oldviewstart;
1825 1836
1826 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); 1837 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1827#ifdef DEBUG_STRICT 1838#ifdef DEBUG_STRICT
1828 assert ((nlines >= 0) && (nlines <= TermWin.nrow)); 1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1829#endif 1840#endif
… …
1925 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1936 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1926 1937
1927void 1938void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 1939rxvt_term::scr_refresh (unsigned char refresh_type)
1929{ 1940{
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 */ 1941 unsigned char must_clear, /* use draw_string not draw_image_string */
1933 rvid, /* reverse video this position */ 1942 rvid, /* reverse video this position */
1934 showcursor; /* show the cursor */ 1943 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 1944 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 1945 ocrow; /* old cursor row */
1937 int i, /* tmp */ 1946 int i, /* tmp */
… …
1946 return; 1955 return;
1947 1956
1948 /* 1957 /*
1949 * A: set up vars 1958 * A: set up vars
1950 */ 1959 */
1951 clearfirst = clearlast = must_clear = 0; 1960 must_clear = 0;
1952 1961
1953 refresh_count = 0; 1962 refresh_count = 0;
1954 1963
1955 row_offset = TermWin.saveLines - TermWin.view_start; 1964 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 1965
1963#ifdef XPM_BACKGROUND 1966#ifdef XPM_BACKGROUND
1964 must_clear |= (bgPixmap.pixmap != None); 1967 must_clear |= (bgPixmap.pixmap != None);
1965#endif 1968#endif
1966#ifdef TRANSPARENT 1969#ifdef TRANSPARENT
… …
2054 /* 2057 /*
2055 * D: CopyArea pass - very useful for slower links 2058 * D: CopyArea pass - very useful for slower links
2056 * This has been deliberately kept simple. 2059 * This has been deliberately kept simple.
2057 */ 2060 */
2058 i = num_scr; 2061 i = num_scr;
2062 if (!display->is_local
2059 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2063 && refresh_type == FAST_REFRESH && num_scr_allow && i
2060 && abs (i) < TermWin.nrow && !must_clear) 2064 && abs (i) < TermWin.nrow && !must_clear)
2061 { 2065 {
2062 int16_t nits; 2066 int16_t nits;
2063 int j; 2067 int j;
2064 rend_t *drp2; 2068 rend_t *drp2;
… …
2206 rend = GET_ATTR (rend); 2210 rend = GET_ATTR (rend);
2207 2211
2208 rvid = !!(rend & RS_RVid); 2212 rvid = !!(rend & RS_RVid);
2209 2213
2210#ifndef NO_BOLD_UNDERLINE_REVERSE 2214#ifndef NO_BOLD_UNDERLINE_REVERSE
2211 if (rend & RS_Bold && fore == Color_fg) 2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold))
2212 { 2216 {
2213 if (ISSET_PIXCOLOR (Color_BD)) 2217 if (ISSET_PIXCOLOR (Color_BD))
2214 fore = Color_BD; 2218 fore = Color_BD;
2215 else 2219 else
2216 rvid = !rvid; 2220 rvid = !rvid;
… …
2234 back = Color_RV; 2238 back = Color_RV;
2235#endif 2239#endif
2236 } 2240 }
2237 2241
2238#ifdef TEXT_BLINK 2242#ifdef TEXT_BLINK
2239 if (rend & RS_Blink && back == Color_bg) 2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2240 { 2244 {
2241 if (!text_blink_ev.active) 2245 if (!text_blink_ev.active)
2242 { 2246 {
2243 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2244 hidden_text = 0; 2248 hidden_text = 0;
… …
2274 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2275 } 2279 }
2276 else 2280 else
2277 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2278 2282
2279 if ((rend & RS_Uline) && (font->descent > 1)) 2283 if (rend & RS_Uline && font->descent > 1 && fore != back)
2280 XDrawLine (display->display, drawBuffer, TermWin.gc, 2284 XDrawLine (display->display, drawBuffer, TermWin.gc,
2281 xpixel, ypixel + font->ascent + 1, 2285 xpixel, ypixel + font->ascent + 1,
2282 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2283 } /* for (col....) */ 2287 } /* for (col....) */
2284 } /* for (row....) */ 2288 } /* for (row....) */
… …
2319 /* 2323 /*
2320 * H: cleanup selection 2324 * H: cleanup selection
2321 */ 2325 */
2322 scr_reverse_selection (); 2326 scr_reverse_selection ();
2323 2327
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) 2328 if (refresh_type & SMOOTH_REFRESH)
2347 XSync (display->display, False); 2329 XFlush (display->display);
2348 2330
2349 num_scr = 0; 2331 num_scr = 0;
2350 num_scr_allow = 1; 2332 num_scr_allow = 1;
2351 want_refresh = 0; /* screen is current */ 2333 want_refresh = 0; /* screen is current */
2352} 2334}
… …
2585 if (ct.encoding == 0) 2567 if (ct.encoding == 0)
2586 { 2568 {
2587 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2588 break; 2570 break;
2589 } 2571 }
2572 else if (ct.encoding == xa[XA_INCR])
2573 {
2574 // INCR selection, start handshake
2575 XDeleteProperty (display->display, win, prop);
2576 selection_wait = Sel_incr;
2577 incr_ev.start (NOW + 10);
2578 break;
2579 }
2590 2580
2591 if (ct.value == NULL) 2581 if (ct.value == NULL)
2592 { 2582 {
2593 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); 2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2594 continue; 2584 continue;
… …
2655 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2656 */ 2646 */
2657void 2647void
2658rxvt_term::selection_property (Window win, Atom prop) 2648rxvt_term::selection_property (Window win, Atom prop)
2659{ 2649{
2660 int reget_time = 0; 2650 if (prop == None || selection_wait != Sel_incr)
2661
2662 if (prop == None)
2663 return; 2651 return;
2664 2652
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) 2653 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); 2654 incr_ev.start (NOW + 10);
2655 else
2656 {
2657 selection_wait = Sel_none;
2658 incr_ev.stop ();
2659 }
2706} 2660}
2707 2661
2708/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2709/* 2663/*
2710 * Request the current selection: 2664 * Request the current selection:
… …
3415 (8 * sizeof (target_list[0])), PropModeReplace, 3369 (8 * sizeof (target_list[0])), PropModeReplace,
3416 (unsigned char *)target_list, 3370 (unsigned char *)target_list,
3417 target - target_list); 3371 target - target_list);
3418 ev.property = rq.property; 3372 ev.property = rq.property;
3419 } 3373 }
3374#if TODO // TODO
3420 else if (rq.target == xa[XA_MULTIPLE]) 3375 else if (rq.target == xa[XA_MULTIPLE])
3421 { 3376 {
3422 /* TODO: Handle MULTIPLE */ 3377 /* TODO: Handle MULTIPLE */
3423 } 3378 }
3379#endif
3424 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3425 { 3381 {
3426 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3427 (8 * sizeof (Time)), PropModeReplace, 3383 (8 * sizeof (Time)), PropModeReplace,
3428 (unsigned char *)&selection_time, 1); 3384 (unsigned char *)&selection_time, 1);

Diff Legend

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