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.30 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.37 by pcg, Tue Feb 24 23:58:13 2004 UTC

… …
485 prev_nrow = prev_ncol = 0; 485 prev_nrow = prev_ncol = 0;
486 scr_reset (); 486 scr_reset ();
487 487
488 scr_clear (); 488 scr_clear ();
489 scr_refresh (SLOW_REFRESH); 489 scr_refresh (SLOW_REFRESH);
490#ifdef RXVT_GRAPHICS
491 Gr_reset ();
492#endif
493} 490}
494 491
495/* ------------------------------------------------------------------------- * 492/* ------------------------------------------------------------------------- *
496 * PROCESS SCREEN COMMANDS * 493 * PROCESS SCREEN COMMANDS *
497 * ------------------------------------------------------------------------- */ 494 * ------------------------------------------------------------------------- */
… …
593# endif 590# endif
594 SWAP_IT (screen.charset, swap.charset, int16_t); 591 SWAP_IT (screen.charset, swap.charset, int16_t);
595 SWAP_IT (screen.flags, swap.flags, int); 592 SWAP_IT (screen.flags, swap.flags, int);
596 screen.flags |= Screen_VisibleCursor; 593 screen.flags |= Screen_VisibleCursor;
597 swap.flags |= Screen_VisibleCursor; 594 swap.flags |= Screen_VisibleCursor;
598
599# ifdef RXVT_GRAPHICS
600
601 if (Gr_Displayed ())
602 {
603 Gr_scroll (0);
604 Gr_ChangeScreen ();
605 }
606# endif
607#else 595#else
608# ifdef SCROLL_ON_NO_SECONDARY 596# ifdef SCROLL_ON_NO_SECONDARY
609# ifdef RXVT_GRAPHICS
610 if (Gr_Displayed ())
611 Gr_ClearScreen ();
612# endif
613 if (current_screen == PRIMARY 597 if (current_screen == PRIMARY)
614# ifdef RXVT_GRAPHICS
615 && !Gr_Displayed ()
616# endif
617 )
618 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
619# endif 599# endif
620#endif 600#endif
621 return scrn; 601 return scrn;
622} 602}
… …
771 751
772 if (!spec) /* line length may not equal TermWin.ncol */ 752 if (!spec) /* line length may not equal TermWin.ncol */
773 scr_blank_screen_mem (screen.text, screen.rend, 753 scr_blank_screen_mem (screen.text, screen.rend,
774 (unsigned int)j, rstyle); 754 (unsigned int)j, rstyle);
775 } 755 }
776
777#ifdef RXVT_GRAPHICS
778 if (Gr_Displayed ())
779 Gr_scroll (count);
780#endif
781 756
782 return count; 757 return count;
783} 758}
784 759
785/* ------------------------------------------------------------------------- */ 760/* ------------------------------------------------------------------------- */
… …
887 scr_insdel_chars (1, INSERT); 862 scr_insdel_chars (1, INSERT);
888 863
889 if (charsets[screen.charset] == '0') // DEC SPECIAL 864 if (charsets[screen.charset] == '0') // DEC SPECIAL
890 switch (c) 865 switch (c)
891 { 866 {
867 // dunno where these come from
868#if 0
892 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 869 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
893 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 870 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
871#endif
872 // vt100 special graphics and line drawing
873 case '`': c = 0x25c6; break; case '_': c = 0x0020; break;
894 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 874 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break;
895 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
896 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 875 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break;
876 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break;
897 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 877 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break;
898 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break; 878 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
899 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break; 879 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
900 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break; 880 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
901 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break; 881 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
882 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
902 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 883 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
903 } 884 }
904 885
905 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 886 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
906 // rely on wcwidth to tell us the character width, at least for non-ascii 887 // rely on wcwidth to tell us the character width, at least for non-ascii
907 int width = c <= 128 ? 1 : wcwidth (c); 888 int width = c <= 128 ? 1 : wcwidth (c);
… …
1075void 1056void
1076rxvt_term::scr_gotorc (int row, int col, int relative) 1057rxvt_term::scr_gotorc (int row, int col, int relative)
1077{ 1058{
1078 want_refresh = 1; 1059 want_refresh = 1;
1079 ZERO_SCROLLBACK (); 1060 ZERO_SCROLLBACK ();
1080#ifdef RXVT_GRAPHICS
1081 if (Gr_Displayed ())
1082 Gr_scroll (0);
1083#endif
1084 1061
1085 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)); 1062 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));
1086 1063
1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1064 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1088 : col); 1065 : col);
… …
1135 want_refresh = 1; 1112 want_refresh = 1;
1136 dirn = ((direction == UP) ? 1 : -1); 1113 dirn = ((direction == UP) ? 1 : -1);
1137 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1114 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1138 1115
1139 ZERO_SCROLLBACK (); 1116 ZERO_SCROLLBACK ();
1140
1141#ifdef RXVT_GRAPHICS
1142 if (Gr_Displayed ())
1143 Gr_scroll (0);
1144#endif
1145 1117
1146 screen.flags &= ~Screen_WrapNext; 1118 screen.flags &= ~Screen_WrapNext;
1147 if ((screen.cur.row == screen.bscroll && direction == UP) 1119 if ((screen.cur.row == screen.bscroll && direction == UP)
1148 || (screen.cur.row == screen.tscroll && direction == DN)) 1120 || (screen.cur.row == screen.tscroll && direction == DN))
1149 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1121 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
… …
1167 unsigned int row, col, num; 1139 unsigned int row, col, num;
1168 1140
1169 want_refresh = 1; 1141 want_refresh = 1;
1170 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); 1142 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1171 ZERO_SCROLLBACK (); 1143 ZERO_SCROLLBACK ();
1172
1173#ifdef RXVT_GRAPHICS
1174 if (Gr_Displayed ())
1175 Gr_scroll (0);
1176#endif
1177 1144
1178 selection_check (1); 1145 selection_check (1);
1179 1146
1180 screen.flags &= ~Screen_WrapNext; 1147 screen.flags &= ~Screen_WrapNext;
1181 1148
… …
1250 row = 0; 1217 row = 0;
1251 num = screen.cur.row; 1218 num = screen.cur.row;
1252 break; 1219 break;
1253 case 2: /* erase whole screen */ 1220 case 2: /* erase whole screen */
1254 selection_check (3); 1221 selection_check (3);
1255#ifdef RXVT_GRAPHICS
1256 Gr_ClearScreen ();
1257#endif
1258 row = 0; 1222 row = 0;
1259 num = TermWin.nrow; 1223 num = TermWin.nrow;
1260 break; 1224 break;
1261 default: 1225 default:
1262 return; 1226 return;
… …
1331{ 1295{
1332 int end; 1296 int end;
1333 1297
1334 ZERO_SCROLLBACK (); 1298 ZERO_SCROLLBACK ();
1335 1299
1336#ifdef RXVT_GRAPHICS
1337 if (Gr_Displayed ())
1338 Gr_scroll (0);
1339#endif
1340
1341 selection_check (1); 1300 selection_check (1);
1342 1301
1343 if (screen.cur.row > screen.bscroll) 1302 if (screen.cur.row > screen.bscroll)
1344 return; 1303 return;
1345 1304
… …
1369 rend_t *srp; 1328 rend_t *srp;
1370 int16_t *slp; 1329 int16_t *slp;
1371 1330
1372 want_refresh = 1; 1331 want_refresh = 1;
1373 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1374
1375#ifdef RXVT_GRAPHICS
1376 if (Gr_Displayed ())
1377 Gr_scroll (0);
1378#endif
1379 1333
1380 if (count <= 0) 1334 if (count <= 0)
1381 return; 1335 return;
1382 1336
1383 selection_check (1); 1337 selection_check (1);
… …
1808rxvt_term::scr_changeview (uint16_t oldviewstart) 1762rxvt_term::scr_changeview (uint16_t oldviewstart)
1809{ 1763{
1810 if (TermWin.view_start != oldviewstart) 1764 if (TermWin.view_start != oldviewstart)
1811 { 1765 {
1812 want_refresh = 1; 1766 want_refresh = 1;
1813#ifdef RXVT_GRAPHICS
1814 if (Gr_Displayed ())
1815 Gr_scroll (0);
1816#endif
1817 num_scr -= (TermWin.view_start - oldviewstart); 1767 num_scr -= (TermWin.view_start - oldviewstart);
1818 } 1768 }
1819 return (int) (TermWin.view_start - oldviewstart); 1769 return (int) (TermWin.view_start - oldviewstart);
1820} 1770}
1821 1771
… …
1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1841 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1892 1842
1893void 1843void
1894rxvt_term::scr_refresh (unsigned char refresh_type) 1844rxvt_term::scr_refresh (unsigned char refresh_type)
1895{ 1845{
1896 unsigned char clearfirst, /* first character writes before cell */ 1846 unsigned char clearfirst, /* first character writes before cell */
1897 clearlast, /* last character writes beyond cell */ 1847 clearlast, /* last character writes beyond cell */
1898 must_clear, /* use draw_string not draw_image_string */ 1848 must_clear, /* use draw_string not draw_image_string */
1899 rvid, /* reverse video this position */ 1849 rvid, /* reverse video this position */
1900 showcursor; /* show the cursor */ 1850 showcursor; /* show the cursor */
1901 int16_t col, row, /* column/row we're processing */ 1851 int16_t col, row, /* column/row we're processing */
1902 ocrow; /* old cursor row */ 1852 ocrow; /* old cursor row */
1903 int cursorwidth;
1904 int i, /* tmp */ 1853 int i, /* tmp */
1905 row_offset; /* basic offset in screen structure */ 1854 row_offset; /* basic offset in screen structure */
1906#ifndef NO_CURSORCOLOR 1855#ifndef NO_CURSORCOLOR
1907 rend_t cc1; /* store colours at cursor position (s) */ 1856 rend_t cc1; /* store colours at cursor position (s) */
1908#endif 1857#endif
1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1858 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1859 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1911 1860
1912 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1861 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1913 return; 1862 return;
1914 1863
1915 /* 1864 /*
… …
1947 unsigned char setoldcursor; 1896 unsigned char setoldcursor;
1948 rend_t ccol1, /* Cursor colour */ 1897 rend_t ccol1, /* Cursor colour */
1949 ccol2; /* Cursor colour2 */ 1898 ccol2; /* Cursor colour2 */
1950 1899
1951 showcursor = (screen.flags & Screen_VisibleCursor); 1900 showcursor = (screen.flags & Screen_VisibleCursor);
1952 cursorwidth = 0;
1953#ifdef CURSOR_BLINK 1901#ifdef CURSOR_BLINK
1954 if (hidden_cursor) 1902 if (hidden_cursor)
1955 showcursor = 0; 1903 showcursor = 0;
1956#endif 1904#endif
1957 1905
1958 cursorwidth = 0;
1959
1960 if (showcursor) 1906 if (showcursor)
1961 { 1907 {
1962 cursorwidth++;
1963
1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1908 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
1965 [screen.cur.col]); 1909 [screen.cur.col]);
1966 1910
1967 if (showcursor && TermWin.focus) 1911 if (showcursor && TermWin.focus)
1968 { 1912 {
… …
1986 ccol2 = Color_bg; 1930 ccol2 = Color_bg;
1987#endif 1931#endif
1988 *srp = SET_FGCOLOR (*srp, ccol1); 1932 *srp = SET_FGCOLOR (*srp, ccol1);
1989 *srp = SET_BGCOLOR (*srp, ccol2); 1933 *srp = SET_BGCOLOR (*srp, ccol2);
1990#endif 1934#endif
1991
1992 } 1935 }
1993 } 1936 }
1994 1937
1995 /* make sure no outline cursor is left around */ 1938 /* make sure no outline cursor is left around */
1996 setoldcursor = 0; 1939 setoldcursor = 0;
… …
2177 int fore = GET_FGCOLOR (rend); // desired foreground 2120 int fore = GET_FGCOLOR (rend); // desired foreground
2178 int back = GET_BGCOLOR (rend); // desired background 2121 int back = GET_BGCOLOR (rend); // desired background
2179 2122
2180 rend = GET_ATTR (rend); 2123 rend = GET_ATTR (rend);
2181 2124
2182 rvid = !! (rend & RS_RVid); 2125 rvid = !!(rend & RS_RVid);
2126
2127#ifndef NO_BOLD_UNDERLINE_REVERSE
2128 if (rend & RS_Bold && fore == Color_fg)
2129 {
2130 if (ISSET_PIXCOLOR (Color_BD))
2131 fore = Color_BD;
2132 else
2133 rvid = !rvid;
2134 }
2135
2136 if (rend & RS_Uline)
2137 {
2138 if (ISSET_PIXCOLOR (Color_UL))
2139 fore = Color_UL;
2140 }
2141#endif
2142
2183 if (rvid) 2143 if (rvid)
2184 { 2144 {
2185 SWAP_IT (fore, back, int); 2145 SWAP_IT (fore, back, int);
2186 2146
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2147#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2190 && !ISSET_PIXCOLOR (Color_cursor) 2150 && !ISSET_PIXCOLOR (Color_cursor)
2191# endif 2151# endif
2192 ) 2152 )
2193 back = Color_RV; 2153 back = Color_RV;
2194#endif 2154#endif
2195
2196 } 2155 }
2156
2197#ifdef TEXT_BLINK 2157#ifdef TEXT_BLINK
2198 if (rend & RS_Blink) 2158 if (rend & RS_Blink)
2199 { 2159 {
2200 if (!text_blink_ev.active) 2160 if (!text_blink_ev.active)
2201 { 2161 {
… …
2204 } 2164 }
2205 else if (hidden_text) 2165 else if (hidden_text)
2206 fore = back; 2166 fore = back;
2207 } 2167 }
2208#endif 2168#endif
2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2210 else if (rend & RS_Bold)
2211 {
2212 if (ISSET_PIXCOLOR (Color_BD))
2213 fore = Color_BD;
2214 else if (fore == Color_fg)
2215 fore = Color_White;
2216 }
2217 else if (rend & RS_Uline)
2218 {
2219 if (ISSET_PIXCOLOR (Color_UL))
2220 fore = Color_UL;
2221 }
2222#endif
2223 2169
2224 /* 2170 /*
2225 * Actually do the drawing of the string here 2171 * Actually do the drawing of the string here
2226 */ 2172 */
2227 rxvt_font *font = (*TermWin.fontset)[fid]; 2173 rxvt_font *font = (*TermWin.fontset)[fid];
2228 2174
2229 if (back == fore) 2175 if (back == fore)
2230 font->clear_rect (xpixel, ypixel, 2176 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight, 2177 TermWin.fwidth * count, TermWin.fheight,
2232 back); 2178 back);
2233 else if (back == Color_bg) 2179 else if (back == Color_bg)
2234 { 2180 {
2235 if (must_clear) 2181 if (must_clear)
… …
2237 CLEAR_CHARS (xpixel, ypixel, count); 2183 CLEAR_CHARS (xpixel, ypixel, count);
2238 2184
2239 for (i = 0; i < count; i++) /* don't draw empty strings */ 2185 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ') 2186 if (text[i] != ' ')
2241 { 2187 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1); 2188 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2243 break; 2189 break;
2244 } 2190 }
2245 } 2191 }
2246 else 2192 else
2247 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2193 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2248 } 2194 }
2249 else 2195 else
2250 font->draw (xpixel, ypixel, text, count, fore, back); 2196 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2251 2197
2252 if ((rend & RS_Uline) && (font->descent > 1)) 2198 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine (display->display, drawBuffer, TermWin.gc, 2199 XDrawLine (display->display, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1, 2200 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2201 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
… …
2267 [screen.cur.col]); 2213 [screen.cur.col]);
2268 *srp ^= RS_RVid; 2214 *srp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR 2215#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2216 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2271#endif 2217#endif
2272
2273 } 2218 }
2274 else if (oldcursor.row >= 0) 2219 else if (oldcursor.row >= 0)
2275 { 2220 {
2276#ifndef NO_CURSORCOLOR 2221#ifndef NO_CURSORCOLOR
2277 if (ISSET_PIXCOLOR (Color_cursor)) 2222 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2223 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2279#endif 2224#endif
2225 int cursorwidth = 1;
2226 while (oldcursor.col + cursorwidth < TermWin.ncol
2227 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2228 cursorwidth++;
2229
2280 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2230 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2281 Col2Pixel (oldcursor.col), 2231 Col2Pixel (oldcursor.col),
2282 Row2Pixel (oldcursor.row), 2232 Row2Pixel (oldcursor.row),
2283 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2233 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2284 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2234 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
… …
2316 num_scr = 0; 2266 num_scr = 0;
2317 num_scr_allow = 1; 2267 num_scr_allow = 1;
2318 want_refresh = 0; /* screen is current */ 2268 want_refresh = 0; /* screen is current */
2319} 2269}
2320 2270
2271void
2272rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2273{
2274 if (!rp || !tp)
2275 return;
2276
2277 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2278 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2279}
2280
2281void
2282rxvt_term::scr_remap_chars ()
2283{
2284 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2285 scr_remap_chars (screen.text[i], screen.rend[i]);
2286
2287 for (int i = TermWin.nrow; i--; )
2288 {
2289 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2290 scr_remap_chars (swap.text[i], swap.rend[i]);
2291 }
2292}
2293
2321/* ------------------------------------------------------------------------- */ 2294/* ------------------------------------------------------------------------- */
2322void 2295void
2323rxvt_term::scr_clear () 2296rxvt_term::scr_clear ()
2324{ 2297{
2325 if (!TermWin.mapped) 2298 if (!TermWin.mapped)
… …
2723rxvt_term::selection_clear () 2696rxvt_term::selection_clear ()
2724{ 2697{
2725 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2698 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2726 2699
2727 want_refresh = 1; 2700 want_refresh = 1;
2728 if (selection.text)
2729 free (selection.text); 2701 free (selection.text);
2730 selection.text = NULL; 2702 selection.text = NULL;
2731 selection.len = 0; 2703 selection.len = 0;
2732 CLEAR_SELECTION (); 2704 CLEAR_SELECTION ();
2733} 2705}
2734 2706

Diff Legend

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