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.323 by root, Tue Nov 4 23:53:29 2008 UTC vs.
Revision 1.363 by sf-exg, Thu Jan 20 14:02:35 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++;
… …
158 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
159 162
160void 163void
161rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
162{ 165{
163 scr_soft_reset ();
164
165 view_start = 0; 166 view_start = 0;
166 num_scr = 0; 167 num_scr = 0;
167 168
168 if (ncol == 0) 169 if (ncol == 0)
169 ncol = 80; 170 ncol = 80;
… …
233 selection.text = NULL; 234 selection.text = NULL;
234 selection.len = 0; 235 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
237 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
238 } 241 }
239 else 242 else
240 { 243 {
241 /* 244 /*
242 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
280 283
281 if (top_row) 284 if (top_row)
282 { 285 {
283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
285 289
286 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 292
289 do 293 do
290 { 294 {
291 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 297 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 299
298 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 ())
299 { 301 {
… …
395 397
396 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 400 }
399 401
402 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0;
407
400 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
401 409
402 prev_nrow = nrow; 410 prev_nrow = nrow;
403 prev_ncol = ncol; 411 prev_ncol = ncol;
404 412
… …
436void 444void
437rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
438{ 446{
439 scr_release (); 447 scr_release ();
440 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
441 scr_reset (); 451 scr_reset ();
442 452
443 scr_clear (true); 453 scr_clear (true);
444 scr_refresh (); 454 scr_refresh ();
445} 455}
… …
450 /* only affects modes, nothing drastic such as clearing the screen */ 460 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 461#if ENABLE_OVERLAY
452 scr_overlay_off (); 462 scr_overlay_off ();
453#endif 463#endif
454 464
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 465 if (current_screen != PRIMARY)
458 scr_swap_screen (); 466 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465 467
466 scr_scroll_region (0, MAX_ROWS - 1); 468 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 469 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 470 scr_insert_mode (0);
469} 471}
… …
511 } 513 }
512 514
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
519#endif
520} 520}
521 521
522void 522void
523rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
524{ 524{
… …
549 want_refresh = 1; 549 want_refresh = 1;
550 view_start = 0; 550 view_start = 0;
551 551
552 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
553 553
554 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
555 555
556#if NSCREENS 556#if NSCREENS
557 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
558 { 558 {
559 num_scr = 0; 559 num_scr = 0;
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
786 } 786 }
787 } 787 }
788 788
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 792 int row = screen.cur.row;
795 793
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 795
798 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
902# else 900# else
903 c = 0xfffd; 901 c = 0xfffd;
904# endif 902# endif
905#endif 903#endif
906 904
907 // nuke the character at this position, if required
908 if (expect_false (
909 line->t[screen.cur.col] == NOCHAR
910 || (screen.cur.col < ncol - 1
911 && line->t[screen.cur.col + 1] == NOCHAR)
912 ))
913 scr_kill_char (*line, screen.cur.col);
914
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916 906
917 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
919 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
920 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
921 c = NOCHAR; 913 c = NOCHAR;
922 // and try the same character next loop iteration 914 // and try the same character next loop iteration
923 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
924 } 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);
925 927
926 line->touch (); 928 line->touch ();
927 929
928 do 930 do
929 { 931 {
… …
935 else 937 else
936 { 938 {
937 line->l = ncol; 939 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
939 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
940 break; 942
943 goto end_of_line;
941 } 944 }
942 945
943 c = NOCHAR; 946 c = NOCHAR;
944 } 947 }
945 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
946 949
947 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
948 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
949 { 952 {
950 line->touch ();
951
952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
953 {
954 line->t[c] = ' '; 953 line->t[c] = ' ';
955 line->r[c] = rend; 954 line->r[c] = rend;
956 }
957 } 955 }
956
957end_of_line:
958 ;
958 } 959 }
959#if ENABLE_COMBINING 960#if ENABLE_COMBINING
960 else // width == 0 961 else // width == 0
961 { 962 {
962 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1002#endif 1003#endif
1003 } 1004 }
1004 1005
1005 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1006 1007
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1009#endif
1010} 1009}
1011 1010
1012/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1013/* 1012/*
1014 * 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
… …
1027 1026
1028 want_refresh = 1; 1027 want_refresh = 1;
1029#endif 1028#endif
1030 } 1029 }
1031 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1032 else 1033 else
1033 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1034} 1035}
1035 1036
1036/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1343 return; 1344 return;
1344 1345
1345 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1346 1347
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1348 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1351 {
1352 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1353 1353
1354 if (mapped && !view_start) 1354 if (mapped)
1355 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1358 } 1358 }
1359 else 1359 else
1360 { 1360 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1362
1363 if (mapped && !view_start) 1363 if (mapped)
1364 { 1364 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1374 } 1374 }
1375 1375
1376 for (; num--; row++) 1376 for (; num--; row++)
1377 { 1377 {
1378 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1379 if (!view_start) 1380 if (row - view_start < nrow)
1380 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1381 } 1382 }
1382} 1383}
1383 1384
1384#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1385void 1386void
… …
1538 { 1539 {
1539 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1540 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1541 } 1542 }
1542 1543
1543 scr_blank_line (*line, ncol - count, count, 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1544 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1545 1545
1546 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1548 { 1548 {
1549 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1839 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1840 { 1840 {
1841 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1842 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1843 } 1843 }
1844// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1845 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++)
1846 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);
1847 1847
1848 num_scr_allow = 0; 1848 num_scr_allow = 0;
1849 1849
… …
1940 1940
1941 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1942 } 1942 }
1943 else 1943 else
1944 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1945#endif 1946#endif
1946} 1947}
1947 1948
1948/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1949/* ARGSUSED */ 1950/* ARGSUSED */
… …
1968 row_start = view_start; 1969 row_start = view_start;
1969 } 1970 }
1970 1971
1971 wctomb (0, 0); 1972 wctomb (0, 0);
1972 1973
1973 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1974 { 1975 {
1975 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1976 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1977 1978
1978 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
… …
2007 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
2008 */ 2009 */
2009void 2010void
2010rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
2011{ 2012{
2012 unsigned char have_bg,
2013 showcursor; /* show the cursor */
2014 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2015 int i; /* tmp */
2017#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2018 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2029 /* 2028 /*
2030 * A: set up vars 2029 * A: set up vars
2031 */ 2030 */
2032 refresh_count = 0; 2031 refresh_count = 0;
2033 2032
2033 unsigned int old_screen_flags = screen.flags;
2034 have_bg = 0; 2034 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2037#endif 2037#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2039
2040 /* 2040 /*
2041 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2042 */ 2042 */
2043 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;
2044 2051
2045 /* 2052 /*
2046 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2047 */ 2054 */
2048 { 2055 {
2049 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2050 2057
2051 showcursor = (screen.flags & Screen_VisibleCursor);
2052#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2053 if (hidden_cursor) 2059 if (hidden_cursor)
2054 showcursor = 0; 2060 showcursor = 0;
2055#endif 2061#endif
2056 2062
… …
2084 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2085#else 2091#else
2086 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2087#endif 2093#endif
2088 2094
2089 if (showcursor && focus) 2095 if (focus)
2090 { 2096 {
2091 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2092 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2093 else 2099 else
2094 { 2100 {
… …
2129 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2130 } 2136 }
2131 } 2137 }
2132 } 2138 }
2133 2139
2134 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2135#if ENABLE_OVERLAY
2136 scr_swap_overlay ();
2137#endif
2138
2139#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2140 /* 2141 /*
2141 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2142 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2143 */ 2144 */
… …
2235 2236
2236 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2237 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2238 --col; 2239 --col;
2239 2240
2240 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2241 text_t *text = stp + col; 2242 text_t *text = stp + col;
2242 int count = 1; 2243 int count = 1;
2243 2244
2244 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2245 drp[col] = rend; 2246 drp[col] = rend;
… …
2249 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2250 { 2251 {
2251 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2252 { 2253 {
2253 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2254 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2255 count++; 2257 count++;
2256 i++; 2258 i++;
2257 2259
2258 continue; 2260 continue;
2259 } 2261 }
… …
2289 */ 2291 */
2290 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2292 2294
2293 // 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
2294 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)))
2295 { 2297 {
2296 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2297 2299
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2318 2320
2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2320 fore = Color_UL; 2322 fore = Color_UL;
2321#endif 2323#endif
2322 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
2323 if (invert) 2345 if (invert)
2324 { 2346 {
2325#ifdef OPTION_HC
2326 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 || !ISSET_PIXCOLOR (Color_HC))
2328#endif
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 ::swap (fore, back); 2347 ::swap (fore, back);
2332#ifdef OPTION_HC
2333 else if (ISSET_PIXCOLOR (Color_HC))
2334 back = Color_HC;
2335#endif
2336 2348
2337#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2338# ifndef OPTION_HC
2339 if (ISSET_PIXCOLOR (Color_RV))
2340 back = Color_RV;
2341# endif
2342 if (fore == back) 2350 if (fore == back)
2343 { 2351 {
2344 fore = Color_bg; 2352 fore = Color_bg;
2345 back = Color_fg; 2353 back = Color_fg;
2346 } 2354 }
… …
2415 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2416 } 2424 }
2417 } /* for (col....) */ 2425 } /* for (col....) */
2418 } /* for (row....) */ 2426 } /* for (row....) */
2419 2427
2420#if ENABLE_OVERLAY
2421 scr_swap_overlay ();
2422#endif
2423 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2424
2425 /* 2428 /*
2426 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2427 */ 2430 */
2428 if (showcursor) 2431 if (showcursor)
2429 { 2432 {
… …
2467 } 2470 }
2468 2471
2469 /* 2472 /*
2470 * H: cleanup selection 2473 * H: cleanup selection
2471 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2472 scr_reverse_selection (); 2480 scr_reverse_selection ();
2473 2481
2482 screen.flags = old_screen_flags;
2474 num_scr = 0; 2483 num_scr = 0;
2475 num_scr_allow = 1; 2484 num_scr_allow = 1;
2476} 2485}
2477 2486
2478void 2487void
… …
2510 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2511 XClearWindow (dpy, parent[0]); 2520 XClearWindow (dpy, parent[0]);
2512 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2513 2522
2514 if (scrollBar.win) 2523 if (scrollBar.win)
2515 { 2524 {
2516 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2517 scrollBar.state = STATE_IDLE; 2526 scrollBar.state = STATE_IDLE;
2518 scrollBar.show (0); 2527 scrollBar.show (0);
2519 } 2528 }
2520 2529
2521#endif 2530#endif
2522 2531
2523 /* bgPixmap.apply () does not do the following : */ 2532 /* bgPixmap.apply () does not do the following : */
2524 scr_clear (); 2533 scr_clear ();
… …
2598 { 2607 {
2599#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2600 if (selection.rect) 2609 if (selection.rect)
2601 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2603 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2604 else 2613 else
2605#endif 2614#endif
2606 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2607 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2608 RS_RVid); 2617 RS_Sel | RS_RVid);
2609 } 2618 }
2610} 2619}
2611 2620
2612/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2613/* 2622/*
… …
2618void 2627void
2619rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2620{ 2629{
2621 int row, wrote; 2630 int row, wrote;
2622 unsigned int width, towrite; 2631 unsigned int width, towrite;
2623 char r1[] = "\n"; 2632 const char r1[] = "\n";
2624 2633
2625 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2626 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2627 { 2636 {
2628 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2674/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2675/* 2684/*
2676 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2677 */ 2686 */
2678void 2687void
2679rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2680{ 2689{
2681 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2682 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2683 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2684 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2688 2697
2689 tt_write (data, len); 2698 tt_write (data, len);
2690 2699
2691 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[201~"); 2701 tt_printf ("\e[201~");
2702}
2703
2704void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{
2707 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 return;
2709
2710 tt_paste (data, len);
2693} 2711}
2694 2712
2695/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2696/* 2714/*
2697 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2754 &ct2.nitems, &bytes_after, 2772 &ct2.nitems, &bytes_after,
2755 &ct2.value) != Success) 2773 &ct2.value) != Success)
2756 goto bailout; 2774 goto bailout;
2757 2775
2758 // realloc should be compatible to XFree, here, and elsewhere, too 2776 // realloc should be compatible to XFree, here, and elsewhere, too
2759 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2777 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2760 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2761 ct.nitems += ct2.nitems; 2779 ct.nitems += ct2.nitems;
2762 2780
2763 XFree (ct2.value); 2781 XFree (ct2.value);
2764 } 2782 }
… …
2813 incr_ev.start (10); 2831 incr_ev.start (10);
2814 2832
2815 while (incr_buf_fill + ct.nitems > incr_buf_size) 2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2816 { 2834 {
2817 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2818 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2836 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2819 } 2837 }
2820 2838
2821 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2822 incr_buf_fill += ct.nitems; 2840 incr_buf_fill += ct.nitems;
2823 2841
… …
2906 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2907 2925
2908#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2909 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2910 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2911 return; 2929 return;
2912#else 2930#else
2913 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2914 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2915 return; 2933 return;
2916#endif 2934#endif
2917 } 2935 }
2918 2936
2919 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2920 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2948/* 2966/*
2949 * Clear all selected text 2967 * Clear all selected text
2950 * EXT: SelectionClear 2968 * EXT: SelectionClear
2951 */ 2969 */
2952void 2970void
2953rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2954{ 2972{
2973 if (!clipboard)
2974 {
2955 want_refresh = 1; 2975 want_refresh = 1;
2956 free (selection.text); 2976 free (selection.text);
2957 selection.text = NULL; 2977 selection.text = NULL;
2958 selection.len = 0; 2978 selection.len = 0;
2959 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2960 2980
2961 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2962 display->selection_owner = 0; 2982 display->selection_owner = 0;
2983 }
2984 else
2985 {
2986 free (selection.clip_text);
2987 selection.clip_text = NULL;
2988 selection.clip_len = 0;
2989
2990 if (display->clipboard_owner == this)
2991 display->clipboard_owner = 0;
2992 }
2963} 2993}
2964 2994
2965/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2966/* 2996/*
2967 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
2968 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
2969 */ 2999 */
2970void 3000void
2971rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
2972{ 3002{
2973 int i; 3003 int size;
2974 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
2975 text_t *t; 3005 text_t *t;
2976 3006
2977 switch (selection.op) 3007 switch (selection.op)
2978 { 3008 {
… …
2994 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
2995 3025
2996 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2997 return; 3027 return;
2998 3028
2999 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3000 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3030 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3001 3031
3002 int ofs = 0; 3032 int ofs = 0;
3003 int extra = 0; 3033 int extra = 0;
3004 3034
3005 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
3011 { 3041 {
3012#if !ENABLE_MINIMAL 3042#if !ENABLE_MINIMAL
3013 if (selection.rect) 3043 if (selection.rect)
3014 { 3044 {
3015 col = selection.beg.col; 3045 col = selection.beg.col;
3016 end_col = ncol + 1; 3046 end_col = selection.end.col;
3017 } 3047 }
3018 else 3048 else
3019#endif 3049#endif
3020 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
3021 3051
3022 col = max (col, 0); 3052 col = max (col, 0);
3023 3053
3024 if (row == selection.end.row 3054 if (row == selection.end.row)
3025#if !ENABLE_MINIMAL
3026 || selection.rect
3027#endif
3028 )
3029 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
3030 3056
3031 t = ROW(row).t + col; 3057 t = ROW(row).t + col;
3032 3058
3033 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
… …
3041 3067
3042 extra -= (len - 1); 3068 extra -= (len - 1);
3043 3069
3044 if (extra < 0) 3070 if (extra < 0)
3045 { 3071 {
3046 extra += i; 3072 extra += size;
3047 i += i; 3073 size += size;
3048 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3049 } 3075 }
3050 3076
3051 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3052 } 3078 }
3053#endif 3079#endif
… …
3065 3091
3066 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3067 } 3093 }
3068 else 3094 else
3069#endif 3095#endif
3070 if (!ROW(row).is_longer () && row != selection.end.row) 3096 if (!ROW(row).is_longer ()
3097 && (row != selection.end.row || end_col != selection.end.col)
3098 && (row != selection.beg.row || selection.beg.col < ncol))
3071 new_selection_text[ofs++] = C0_LF; 3099 new_selection_text[ofs++] = C0_LF;
3072 } 3100 }
3073
3074 if (end_col != selection.end.col)
3075 new_selection_text[ofs++] = C0_LF;
3076 3101
3077 new_selection_text[ofs] = 0; 3102 new_selection_text[ofs] = 0;
3078 3103
3079 if (ofs == 0) 3104 if (ofs == 0)
3080 { 3105 {
… …
3093 3118
3094 selection_grab (tm); 3119 selection_grab (tm);
3095} 3120}
3096 3121
3097bool 3122bool
3098rxvt_term::selection_grab (Time tm) NOTHROW 3123rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3099{ 3124{
3125 Atom sel;
3126
3127 if (!clipboard)
3128 {
3100 selection_time = tm; 3129 selection_time = tm;
3130 sel = XA_PRIMARY;
3131 }
3132 else
3133 {
3134 clipboard_time = tm;
3135 sel = xa[XA_CLIPBOARD];
3136 }
3101 3137
3102 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3138 XSetSelectionOwner (dpy, sel, vt, tm);
3103 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3139 if (XGetSelectionOwner (dpy, sel) == vt)
3104 { 3140 {
3105 display->set_selection_owner (this); 3141 display->set_selection_owner (this, clipboard);
3106 return true; 3142 return true;
3107 } 3143 }
3108 else 3144 else
3109 { 3145 {
3110 selection_clear (); 3146 selection_clear (clipboard);
3111 return false; 3147 return false;
3112 } 3148 }
3113 3149
3114#if 0 3150#if 0
3115 XTextProperty ct; 3151 XTextProperty ct;
… …
3610 else if (rq.target == xa[XA_MULTIPLE]) 3646 else if (rq.target == xa[XA_MULTIPLE])
3611 { 3647 {
3612 /* TODO: Handle MULTIPLE */ 3648 /* TODO: Handle MULTIPLE */
3613 } 3649 }
3614#endif 3650#endif
3615 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3651 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3616 { 3652 {
3617 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3653 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3618 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3654 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3655 ev.property = rq.property;
3656 }
3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3658 {
3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3660 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3619 ev.property = rq.property; 3661 ev.property = rq.property;
3620 } 3662 }
3621 else if (rq.target == XA_STRING 3663 else if (rq.target == XA_STRING
3622 || rq.target == xa[XA_TEXT] 3664 || rq.target == xa[XA_TEXT]
3623 || rq.target == xa[XA_COMPOUND_TEXT] 3665 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3656 { 3698 {
3657 target = xa[XA_COMPOUND_TEXT]; 3699 target = xa[XA_COMPOUND_TEXT];
3658 style = enc_compound_text; 3700 style = enc_compound_text;
3659 } 3701 }
3660 3702
3661 if (selection.text) 3703 if (rq.selection == XA_PRIMARY && selection.text)
3662 { 3704 {
3663 cl = selection.text; 3705 cl = selection.text;
3664 selectlen = selection.len; 3706 selectlen = selection.len;
3707 }
3708 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3709 {
3710 cl = selection.clip_text;
3711 selectlen = selection.clip_len;
3665 } 3712 }
3666 else 3713 else
3667 { 3714 {
3668 cl = L""; 3715 cl = L"";
3669 selectlen = 0; 3716 selectlen = 0;
… …
3737 h += 2; min_it (h, nrow); 3784 h += 2; min_it (h, nrow);
3738 3785
3739 x -= 1; clamp_it (x, 0, ncol - w); 3786 x -= 1; clamp_it (x, 0, ncol - w);
3740 y -= 1; clamp_it (y, 0, nrow - h); 3787 y -= 1; clamp_it (y, 0, nrow - h);
3741 3788
3742 ov_x = x; ov_y = y; 3789 ov.x = x; ov.y = y;
3743 ov_w = w; ov_h = h; 3790 ov.w = w; ov.h = h;
3744 3791
3745 ov_text = new text_t *[h]; 3792 ov.text = new text_t *[h];
3746 ov_rend = new rend_t *[h]; 3793 ov.rend = new rend_t *[h];
3747 3794
3748 for (y = 0; y < h; y++) 3795 for (y = 0; y < h; y++)
3749 { 3796 {
3750 text_t *tp = ov_text[y] = new text_t[w]; 3797 text_t *tp = ov.text[y] = new text_t[w];
3751 rend_t *rp = ov_rend[y] = new rend_t[w]; 3798 rend_t *rp = ov.rend[y] = new rend_t[w];
3752 3799
3753 text_t t0, t1, t2; 3800 text_t t0, t1, t2;
3754 rend_t r = OVERLAY_RSTYLE; 3801 rend_t r = OVERLAY_RSTYLE;
3755 3802
3756 if (y == 0) 3803 if (y == 0)
… …
3775} 3822}
3776 3823
3777void 3824void
3778rxvt_term::scr_overlay_off () NOTHROW 3825rxvt_term::scr_overlay_off () NOTHROW
3779{ 3826{
3780 if (!ov_text) 3827 if (!ov.text)
3781 return; 3828 return;
3782 3829
3783 want_refresh = 1; 3830 want_refresh = 1;
3784 3831
3785 for (int y = 0; y < ov_h; y++) 3832 for (int y = 0; y < ov.h; y++)
3786 { 3833 {
3787 delete [] ov_text[y]; 3834 delete [] ov.text[y];
3788 delete [] ov_rend[y]; 3835 delete [] ov.rend[y];
3789 } 3836 }
3790 3837
3791 delete [] ov_text; ov_text = 0; 3838 delete [] ov.text; ov.text = 0;
3792 delete [] ov_rend; ov_rend = 0; 3839 delete [] ov.rend; ov.rend = 0;
3793} 3840}
3794 3841
3795void 3842void
3796rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3843rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3797{ 3844{
3798 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3845 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3799 return; 3846 return;
3800 3847
3801 x++, y++; 3848 x++, y++;
3802 3849
3803 ov_text[y][x] = text; 3850 ov.text[y][x] = text;
3804 ov_rend[y][x] = rend; 3851 ov.rend[y][x] = rend;
3805} 3852}
3806 3853
3807void 3854void
3808rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3855rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3809{ 3856{
… …
3828} 3875}
3829 3876
3830void 3877void
3831rxvt_term::scr_swap_overlay () NOTHROW 3878rxvt_term::scr_swap_overlay () NOTHROW
3832{ 3879{
3833 if (!ov_text) 3880 if (!ov.text)
3834 return; 3881 return;
3835 3882
3883 // hide cursor if it is within the overlay area
3884 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3885 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3886 screen.flags &= ~Screen_VisibleCursor;
3887
3836 // swap screen mem with overlay 3888 // swap screen mem with overlay
3837 for (int y = ov_h; y--; ) 3889 for (int y = ov.h; y--; )
3838 { 3890 {
3839 text_t *t1 = ov_text[y]; 3891 text_t *t1 = ov.text[y];
3840 rend_t *r1 = ov_rend[y]; 3892 rend_t *r1 = ov.rend[y];
3841 3893
3842 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3894 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3843 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3895 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3844 3896
3845 for (int x = ov_w; x--; ) 3897 for (int x = ov.w; x--; )
3846 { 3898 {
3847 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3899 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3900 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3849 } 3901 }
3850 } 3902 }

Diff Legend

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