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.326 by root, Wed Nov 5 13:04:51 2008 UTC vs.
Revision 1.366 by sf-exg, Fri Jan 28 00:08:58 2011 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
… …
143 col--; 144 col--;
144 145
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 148
149 l.touch ();
150
148 // found start, nuke 151 // found start, nuke
149 do { 152 do {
150 l.t[col] = ' '; 153 l.t[col] = ' ';
151 l.r[col] = rend; 154 l.r[col] = rend;
152 col++; 155 col++;
… …
231 selection.text = NULL; 234 selection.text = NULL;
232 selection.len = 0; 235 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
235 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
236 } 241 }
237 else 242 else
238 { 243 {
239 /* 244 /*
240 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 292
288 do 293 do
289 { 294 {
290 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 297 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 299
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 301 {
… …
397 } 400 }
398 401
399 free (tabs); 402 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
401 404
402 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
404 407
405 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
406 409
407 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
510 } 513 }
511 514
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
518#endif
519} 520}
520 521
521void 522void
522rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
523{ 524{
… …
548 want_refresh = 1; 549 want_refresh = 1;
549 view_start = 0; 550 view_start = 0;
550 551
551 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
552 553
553 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
554 555
555#if NSCREENS 556#if NSCREENS
556 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
557 { 558 {
558 num_scr = 0; 559 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
785 } 786 }
786 } 787 }
787 788
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 792 int row = screen.cur.row;
794 793
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 795
797 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
901# else 900# else
902 c = 0xfffd; 901 c = 0xfffd;
903# endif 902# endif
904#endif 903#endif
905 904
906 // nuke the character at this position, if required
907 if (expect_false (
908 line->t[screen.cur.col] == NOCHAR
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 906
916 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
919 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
920 c = NOCHAR; 913 c = NOCHAR;
921 // and try the same character next loop iteration 914 // and try the same character next loop iteration
922 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
923 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
924 927
925 line->touch (); 928 line->touch ();
926 929
927 do 930 do
928 { 931 {
… …
934 else 937 else
935 { 938 {
936 line->l = ncol; 939 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
939 break; 942
943 goto end_of_line;
940 } 944 }
941 945
942 c = NOCHAR; 946 c = NOCHAR;
943 } 947 }
944 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
945 949
946 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 952 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 953 line->t[c] = ' ';
954 line->r[c] = rend; 954 line->r[c] = rend;
955 }
956 } 955 }
956
957end_of_line:
958 ;
957 } 959 }
958#if ENABLE_COMBINING 960#if ENABLE_COMBINING
959 else // width == 0 961 else // width == 0
960 { 962 {
961 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1003#endif
1002 } 1004 }
1003 1005
1004 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1005 1007
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1008#endif
1009} 1009}
1010 1010
1011/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1012/* 1012/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1026
1027 want_refresh = 1; 1027 want_refresh = 1;
1028#endif 1028#endif
1029 } 1029 }
1030 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1031 else 1033 else
1032 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1033} 1035}
1034 1036
1035/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1342 return; 1344 return;
1343 1345
1344 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1345 1347
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1351 {
1353 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1354 1353
1355 if (mapped && !view_start) 1354 if (mapped)
1356 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1359 } 1358 }
1360 else 1359 else
1361 { 1360 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1362
1364 if (mapped && !view_start) 1363 if (mapped)
1365 { 1364 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1376 1375
1377 for (; num--; row++) 1376 for (; num--; row++)
1378 { 1377 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1380 1379
1381 if (!view_start) 1380 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1382 }
1384} 1383}
1385 1384
1386#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1387void 1386void
… …
1686 { 1685 {
1687 rvideo_state = on; 1686 rvideo_state = on;
1688 1687
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1692#endif 1691#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1693
1695 XGCValues gcvalue; 1694 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1840 {
1842 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1844 } 1843 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1847
1849 num_scr_allow = 0; 1848 num_scr_allow = 0;
1850 1849
… …
1941 1940
1942 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1942 }
1944 else 1943 else
1945 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1946#endif
1947} 1947}
1948 1948
1949/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1950/* ARGSUSED */
… …
1969 row_start = view_start; 1969 row_start = view_start;
1970 } 1970 }
1971 1971
1972 wctomb (0, 0); 1972 wctomb (0, 0);
1973 1973
1974 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1975 {
1976 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1978 1978
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2008 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2009 */
2010void 2010void
2011rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
2012{ 2012{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2015 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2030 /* 2028 /*
2031 * A: set up vars 2029 * A: set up vars
2032 */ 2030 */
2033 refresh_count = 0; 2031 refresh_count = 0;
2034 2032
2033 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2034 char have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2038#endif 2037#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2039
2041 /* 2040 /*
2042 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2043 */ 2042 */
2044 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2045 2051
2046 /* 2052 /*
2047 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2048 */ 2054 */
2049 { 2055 {
2050 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2051 2057
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2059 if (hidden_cursor)
2055 showcursor = 0; 2060 showcursor = 0;
2056#endif 2061#endif
2057 2062
… …
2085 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2086#else 2091#else
2087 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2088#endif 2093#endif
2089 2094
2090 if (showcursor && focus) 2095 if (focus)
2091 { 2096 {
2092 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2094 else 2099 else
2095 { 2100 {
… …
2130 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2131 } 2136 }
2132 } 2137 }
2133 } 2138 }
2134 2139
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139
2140#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2141 /*
2142 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2144 */ 2144 */
… …
2236 2236
2237 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2239 --col;
2240 2240
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2242 text_t *text = stp + col;
2243 int count = 1; 2243 int count = 1;
2244 2244
2245 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2246 drp[col] = rend; 2246 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2251 { 2251 {
2252 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2253 { 2253 {
2254 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2255 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2256 count++; 2257 count++;
2257 i++; 2258 i++;
2258 2259
2259 continue; 2260 continue;
2260 } 2261 }
… …
2290 */ 2291 */
2291 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2293 2294
2294 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2297 {
2297 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2298 2299
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2320
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2322 fore = Color_UL;
2322#endif 2323#endif
2323 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2324 if (invert) 2345 if (invert)
2325 { 2346 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2347 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2348
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2350 if (fore == back)
2344 { 2351 {
2345 fore = Color_bg; 2352 fore = Color_bg;
2346 back = Color_fg; 2353 back = Color_fg;
2347 } 2354 }
… …
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2424 }
2418 } /* for (col....) */ 2425 } /* for (col....) */
2419 } /* for (row....) */ 2426 } /* for (row....) */
2420 2427
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425
2426 /* 2428 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2430 */
2429 if (showcursor) 2431 if (showcursor)
2430 { 2432 {
… …
2468 } 2470 }
2469 2471
2470 /* 2472 /*
2471 * H: cleanup selection 2473 * H: cleanup selection
2472 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2473 scr_reverse_selection (); 2480 scr_reverse_selection ();
2474 2481
2482 screen.flags = old_screen_flags;
2475 num_scr = 0; 2483 num_scr = 0;
2476 num_scr_allow = 1; 2484 num_scr_allow = 1;
2477} 2485}
2478 2486
2479void 2487void
… …
2500 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2501 } 2509 }
2502} 2510}
2503 2511
2504void 2512void
2505rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2506{ 2514{
2515 bool transparent = false;
2516
2507#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2508 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2509#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2510 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2511 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2512 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2513 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2514 2543
2515 if (scrollBar.win) 2544 if (scrollBar.win)
2516 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2518 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2519 scrollBar.show (0); 2551 scrollBar.show (0);
2520 } 2552 }
2521 2553
2522#endif 2554 if (refresh)
2523 2555 {
2524 /* bgPixmap.apply () does not do the following : */
2525 scr_clear (); 2556 scr_clear ();
2526 scr_touch (true); 2557 scr_touch (true);
2558 }
2527 want_refresh = 1; 2559 want_refresh = 1;
2528} 2560}
2529 2561
2530/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2531void 2563void
… …
2599 { 2631 {
2600#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2601 if (selection.rect) 2633 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2637 else
2606#endif 2638#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2609 RS_RVid); 2641 RS_Sel | RS_RVid);
2610 } 2642 }
2611} 2643}
2612 2644
2613/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2614/* 2646/*
… …
2619void 2651void
2620rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2621{ 2653{
2622 int row, wrote; 2654 int row, wrote;
2623 unsigned int width, towrite; 2655 unsigned int width, towrite;
2624 char r1[] = "\n"; 2656 const char r1[] = "\n";
2625 2657
2626 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2627 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2628 { 2660 {
2629 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2675/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2676/* 2708/*
2677 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2678 */ 2710 */
2679void 2711void
2680rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2681{ 2713{
2682 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2683 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2684 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2685 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2689 2721
2690 tt_write (data, len); 2722 tt_write (data, len);
2691 2723
2692 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2726}
2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2694} 2735}
2695 2736
2696/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2697/* 2738/*
2698 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
… …
2755 &ct2.nitems, &bytes_after, 2796 &ct2.nitems, &bytes_after,
2756 &ct2.value) != Success) 2797 &ct2.value) != Success)
2757 goto bailout; 2798 goto bailout;
2758 2799
2759 // realloc should be compatible to XFree, here, and elsewhere, too 2800 // realloc should be compatible to XFree, here, and elsewhere, too
2760 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2761 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2762 ct.nitems += ct2.nitems; 2803 ct.nitems += ct2.nitems;
2763 2804
2764 XFree (ct2.value); 2805 XFree (ct2.value);
2765 } 2806 }
… …
2814 incr_ev.start (10); 2855 incr_ev.start (10);
2815 2856
2816 while (incr_buf_fill + ct.nitems > incr_buf_size) 2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2817 { 2858 {
2818 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2819 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2820 } 2861 }
2821 2862
2822 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2823 incr_buf_fill += ct.nitems; 2864 incr_buf_fill += ct.nitems;
2824 2865
… …
2907 selection_wait = Sel_normal; 2948 selection_wait = Sel_normal;
2908 2949
2909#if X_HAVE_UTF8_STRING 2950#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String; 2951 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2952 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return; 2953 return;
2913#else 2954#else
2914 selection_type = Sel_CompoundText; 2955 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2956 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return; 2957 return;
2917#endif 2958#endif
2918 } 2959 }
2919 2960
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2961 selection_wait = Sel_none; /* don't loop in selection_paste () */
2921 selection_paste (display->root, XA_CUT_BUFFER0, false); 2962 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2949/* 2990/*
2950 * Clear all selected text 2991 * Clear all selected text
2951 * EXT: SelectionClear 2992 * EXT: SelectionClear
2952 */ 2993 */
2953void 2994void
2954rxvt_term::selection_clear () NOTHROW 2995rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2996{
2997 if (!clipboard)
2998 {
2956 want_refresh = 1; 2999 want_refresh = 1;
2957 free (selection.text); 3000 free (selection.text);
2958 selection.text = NULL; 3001 selection.text = NULL;
2959 selection.len = 0; 3002 selection.len = 0;
2960 CLEAR_SELECTION (); 3003 CLEAR_SELECTION ();
2961 3004
2962 if (display->selection_owner == this) 3005 if (display->selection_owner == this)
2963 display->selection_owner = 0; 3006 display->selection_owner = 0;
3007 }
3008 else
3009 {
3010 free (selection.clip_text);
3011 selection.clip_text = NULL;
3012 selection.clip_len = 0;
3013
3014 if (display->clipboard_owner == this)
3015 display->clipboard_owner = 0;
3016 }
2964} 3017}
2965 3018
2966/* ------------------------------------------------------------------------- */ 3019/* ------------------------------------------------------------------------- */
2967/* 3020/*
2968 * Copy a selection into the cut buffer 3021 * Copy a selection into the cut buffer
2969 * EXT: button 1 or 3 release 3022 * EXT: button 1 or 3 release
2970 */ 3023 */
2971void 3024void
2972rxvt_term::selection_make (Time tm) 3025rxvt_term::selection_make (Time tm)
2973{ 3026{
2974 int i; 3027 int size;
2975 wchar_t *new_selection_text; 3028 wchar_t *new_selection_text;
2976 text_t *t; 3029 text_t *t;
2977 3030
2978 switch (selection.op) 3031 switch (selection.op)
2979 { 3032 {
… …
2995 return; /* nothing selected, go away */ 3048 return; /* nothing selected, go away */
2996 3049
2997 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3050 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2998 return; 3051 return;
2999 3052
3000 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3053 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3001 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3054 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3002 3055
3003 int ofs = 0; 3056 int ofs = 0;
3004 int extra = 0; 3057 int extra = 0;
3005 3058
3006 int col = selection.beg.col; 3059 int col = selection.beg.col;
… …
3012 { 3065 {
3013#if !ENABLE_MINIMAL 3066#if !ENABLE_MINIMAL
3014 if (selection.rect) 3067 if (selection.rect)
3015 { 3068 {
3016 col = selection.beg.col; 3069 col = selection.beg.col;
3017 end_col = ncol + 1; 3070 end_col = selection.end.col;
3018 } 3071 }
3019 else 3072 else
3020#endif 3073#endif
3021 end_col = ROW(row).l; 3074 end_col = ROW(row).l;
3022 3075
3023 col = max (col, 0); 3076 col = max (col, 0);
3024 3077
3025 if (row == selection.end.row 3078 if (row == selection.end.row)
3026#if !ENABLE_MINIMAL
3027 || selection.rect
3028#endif
3029 )
3030 min_it (end_col, selection.end.col); 3079 min_it (end_col, selection.end.col);
3031 3080
3032 t = ROW(row).t + col; 3081 t = ROW(row).t + col;
3033 3082
3034 for (; col < end_col; col++) 3083 for (; col < end_col; col++)
… …
3042 3091
3043 extra -= (len - 1); 3092 extra -= (len - 1);
3044 3093
3045 if (extra < 0) 3094 if (extra < 0)
3046 { 3095 {
3047 extra += i; 3096 extra += size;
3048 i += i; 3097 size += size;
3049 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3098 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3050 } 3099 }
3051 3100
3052 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3101 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3053 } 3102 }
3054#endif 3103#endif
… …
3066 3115
3067 new_selection_text[ofs++] = C0_LF; 3116 new_selection_text[ofs++] = C0_LF;
3068 } 3117 }
3069 else 3118 else
3070#endif 3119#endif
3071 if (!ROW(row).is_longer () && row != selection.end.row) 3120 if (!ROW(row).is_longer ()
3121 && (row != selection.end.row || end_col != selection.end.col)
3122 && (row != selection.beg.row || selection.beg.col < ncol))
3072 new_selection_text[ofs++] = C0_LF; 3123 new_selection_text[ofs++] = C0_LF;
3073 } 3124 }
3074
3075 if (end_col != selection.end.col)
3076 new_selection_text[ofs++] = C0_LF;
3077 3125
3078 new_selection_text[ofs] = 0; 3126 new_selection_text[ofs] = 0;
3079 3127
3080 if (ofs == 0) 3128 if (ofs == 0)
3081 { 3129 {
… …
3094 3142
3095 selection_grab (tm); 3143 selection_grab (tm);
3096} 3144}
3097 3145
3098bool 3146bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 3147rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 3148{
3149 Atom sel;
3150
3151 if (!clipboard)
3152 {
3101 selection_time = tm; 3153 selection_time = tm;
3154 sel = XA_PRIMARY;
3155 }
3156 else
3157 {
3158 clipboard_time = tm;
3159 sel = xa[XA_CLIPBOARD];
3160 }
3102 3161
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3162 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3163 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 3164 {
3106 display->set_selection_owner (this); 3165 display->set_selection_owner (this, clipboard);
3107 return true; 3166 return true;
3108 } 3167 }
3109 else 3168 else
3110 { 3169 {
3111 selection_clear (); 3170 selection_clear (clipboard);
3112 return false; 3171 return false;
3113 } 3172 }
3114 3173
3115#if 0 3174#if 0
3116 XTextProperty ct; 3175 XTextProperty ct;
… …
3611 else if (rq.target == xa[XA_MULTIPLE]) 3670 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3671 {
3613 /* TODO: Handle MULTIPLE */ 3672 /* TODO: Handle MULTIPLE */
3614 } 3673 }
3615#endif 3674#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3675 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3676 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3677 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3619 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3678 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3679 ev.property = rq.property;
3680 }
3681 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3682 {
3683 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3684 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3620 ev.property = rq.property; 3685 ev.property = rq.property;
3621 } 3686 }
3622 else if (rq.target == XA_STRING 3687 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3688 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3689 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3657 { 3722 {
3658 target = xa[XA_COMPOUND_TEXT]; 3723 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3724 style = enc_compound_text;
3660 } 3725 }
3661 3726
3662 if (selection.text) 3727 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3728 {
3664 cl = selection.text; 3729 cl = selection.text;
3665 selectlen = selection.len; 3730 selectlen = selection.len;
3731 }
3732 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3733 {
3734 cl = selection.clip_text;
3735 selectlen = selection.clip_len;
3666 } 3736 }
3667 else 3737 else
3668 { 3738 {
3669 cl = L""; 3739 cl = L"";
3670 selectlen = 0; 3740 selectlen = 0;
… …
3738 h += 2; min_it (h, nrow); 3808 h += 2; min_it (h, nrow);
3739 3809
3740 x -= 1; clamp_it (x, 0, ncol - w); 3810 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3811 y -= 1; clamp_it (y, 0, nrow - h);
3742 3812
3743 ov_x = x; ov_y = y; 3813 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3814 ov.w = w; ov.h = h;
3745 3815
3746 ov_text = new text_t *[h]; 3816 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3817 ov.rend = new rend_t *[h];
3748 3818
3749 for (y = 0; y < h; y++) 3819 for (y = 0; y < h; y++)
3750 { 3820 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3821 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3822 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3823
3754 text_t t0, t1, t2; 3824 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3825 rend_t r = OVERLAY_RSTYLE;
3756 3826
3757 if (y == 0) 3827 if (y == 0)
… …
3776} 3846}
3777 3847
3778void 3848void
3779rxvt_term::scr_overlay_off () NOTHROW 3849rxvt_term::scr_overlay_off () NOTHROW
3780{ 3850{
3781 if (!ov_text) 3851 if (!ov.text)
3782 return; 3852 return;
3783 3853
3784 want_refresh = 1; 3854 want_refresh = 1;
3785 3855
3786 for (int y = 0; y < ov_h; y++) 3856 for (int y = 0; y < ov.h; y++)
3787 { 3857 {
3788 delete [] ov_text[y]; 3858 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3859 delete [] ov.rend[y];
3790 } 3860 }
3791 3861
3792 delete [] ov_text; ov_text = 0; 3862 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3863 delete [] ov.rend; ov.rend = 0;
3794} 3864}
3795 3865
3796void 3866void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3867rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3868{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3869 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3870 return;
3801 3871
3802 x++, y++; 3872 x++, y++;
3803 3873
3804 ov_text[y][x] = text; 3874 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3875 ov.rend[y][x] = rend;
3806} 3876}
3807 3877
3808void 3878void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3879rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3880{
… …
3829} 3899}
3830 3900
3831void 3901void
3832rxvt_term::scr_swap_overlay () NOTHROW 3902rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3903{
3834 if (!ov_text) 3904 if (!ov.text)
3835 return; 3905 return;
3836 3906
3907 // hide cursor if it is within the overlay area
3908 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3909 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3910 screen.flags &= ~Screen_VisibleCursor;
3911
3837 // swap screen mem with overlay 3912 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3913 for (int y = ov.h; y--; )
3839 { 3914 {
3840 text_t *t1 = ov_text[y]; 3915 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3916 rend_t *r1 = ov.rend[y];
3842 3917
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3918 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3919 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3920
3846 for (int x = ov_w; x--; ) 3921 for (int x = ov.w; x--; )
3847 { 3922 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3923 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3924 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3925 }
3851 } 3926 }

Diff Legend

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