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.309 by root, Mon Jul 21 16:51:31 2008 UTC vs.
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 2010 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
… …
132 133
133 l.l = 0; 134 l.l = 0;
134 l.f = 0; 135 l.f = 0;
135} 136}
136 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
137/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
140 160
141void 161void
142rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
143{ 163{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 164 view_start = 0;
150 num_scr = 0; 165 num_scr = 0;
151 166
152 if (ncol == 0) 167 if (ncol == 0)
153 ncol = 80; 168 ncol = 80;
… …
155 if (nrow == 0) 170 if (nrow == 0)
156 nrow = 24; 171 nrow = 24;
157 172
158 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 174 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 175
164 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
166 { 178 {
167 //TODO//FIXME 179 //TODO//FIXME
… …
220 selection.text = NULL; 232 selection.text = NULL;
221 selection.len = 0; 233 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
224 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
225 } 239 }
226 else 240 else
227 { 241 {
228 /* 242 /*
229 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
267 281
268 if (top_row) 282 if (top_row)
269 { 283 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
272 287
273 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 290
276 do 291 do
277 { 292 {
278 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 295 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 297
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 299 {
… …
380 delete old_ta; 393 delete old_ta;
381 delete old_ra; 394 delete old_ra;
382 395
383 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
385 399
386 free (tabs); 400 free (tabs);
387 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
388 405
389 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
390 407
391 prev_nrow = nrow; 408 prev_nrow = nrow;
392 prev_ncol = ncol; 409 prev_ncol = ncol;
393
394 tabs = (char *)rxvt_malloc (ncol);
395
396 for (int col = ncol; --col; )
397 tabs [col] = col % TABSIZE == 0;
398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401 410
402 tt_winch (); 411 tt_winch ();
403 412
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 414}
… …
417 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
418 427
419 free (row_buf); 428 free (row_buf);
420 free (swap_buf); 429 free (swap_buf);
421 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
422 free (tabs); 433 free (tabs);
423 434 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 435 }
426} 436}
427 437
428/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
429/* 439/*
430 * Hard reset 440 * Hard/Soft reset
431 */ 441 */
432void 442void
433rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
434{ 444{
435 scr_release (); 445 scr_release ();
436 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
437 scr_reset (); 449 scr_reset ();
438 450
439 scr_clear (true); 451 scr_clear (true);
440 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
441} 469}
442 470
443/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
483 } 511 }
484 512
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
491#endif
492} 518}
493 519
494void 520void
495rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
496{ 522{
… …
521 want_refresh = 1; 547 want_refresh = 1;
522 view_start = 0; 548 view_start = 0;
523 549
524 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
525 551
526 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
527 553
528#if NSCREENS 554#if NSCREENS
529 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
530 { 556 {
531 num_scr = 0; 557 num_scr = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
758 } 784 }
759 } 785 }
760 786
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 790 int row = screen.cur.row;
767 791
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 793
770 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
880 if (expect_false ( 904 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR 905 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1 906 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR) 907 && line->t[screen.cur.col + 1] == NOCHAR)
884 )) 908 ))
885 { 909 scr_kill_char (*line, screen.cur.col);
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901 910
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 912
904 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 915 {
907 // ...output spaces 916 // ... artificially enlargen the previous one
908 c = ' '; 917 c = NOCHAR;
909 // and try the same character next loop iteration 918 // and try the same character next loop iteration
910 --str; 919 --str;
911 } 920 }
912 921
913 line->touch (); 922 line->touch ();
… …
989#endif 998#endif
990 } 999 }
991 1000
992 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
993 1002
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
996#endif
997} 1004}
998 1005
999/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1000/* 1007/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1330 return; 1337 return;
1331 1338
1332 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1333 1340
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1344 {
1339 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1340 1346
1341 if (mapped) 1347 if (mapped)
1342 XClearArea (dpy, vt, 0, 1348 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1349 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1350 (unsigned int)Height2Pixel (num), False);
1345 } 1351 }
1346 else 1352 else
1347 { 1353 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1355
1356 if (mapped)
1357 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1360 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1361 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1362 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1363 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1358 } 1367 }
1359 1368
1360 for (; num--; row++) 1369 for (; num--; row++)
1361 { 1370 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1375 }
1365} 1376}
1366 1377
1367#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1368void 1379void
… …
1442 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1443 */ 1454 */
1444void 1455void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1457{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1458 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1452 1460
1453 if (count <= 0) 1461 if (count <= 0)
1454 return; 1462 return;
… …
1456 scr_do_wrap (); 1464 scr_do_wrap ();
1457 1465
1458 selection_check (1); 1466 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1460 1468
1461 row = screen.cur.row; 1469 int row = screen.cur.row;
1462 1470
1463 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1464 1472
1465 line->touch (); 1473 line->touch ();
1466 line->is_longer (0); 1474 line->is_longer (0);
1467 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1468 switch (insdel) 1480 switch (insdel)
1469 { 1481 {
1470 case INSERT: 1482 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1483 line->l = min (line->l + count, ncol);
1484
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1488 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1489 {
1473 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1475 } 1492 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1493
1479 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1496 {
1482 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1512 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1514 selection_check (1);
1500 screen.cur.col -= count; 1515 screen.cur.col -= count;
1501 1516
1502 line->l = max (line->l - count, 0); 1517 // nuke wide char after the end
1518 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1519 scr_kill_char (*line, screen.cur.col + count);
1520
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1522 break;
1505 1523
1506 case DELETE: 1524 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1508 1526
1527 // nuke wide char spanning the end
1528 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1529 scr_kill_char (*line, screen.cur.col + count);
1530
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1532 {
1511 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1513 } 1535 }
1514 1536
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1538
1518 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1541 {
1521 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1832 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1833 {
1813 min_it (rc[i].col, ncol - 1); 1834 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1835 min_it (rc[i].row, nrow - 1);
1815 } 1836 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1837
1817 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1819 1840
1820 num_scr_allow = 0; 1841 num_scr_allow = 0;
1821 1842
… …
1899 XMapWindow (dpy, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1900# endif 1921# endif
1901 1922
1902# if ENABLE_FRILLS 1923# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1924 if (option (Opt_urgentOnBell))
1904 { 1925 set_urgency (1);
1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1906 {
1907 h->flags |= XUrgencyHint;
1908 XSetWMHints (dpy, parent[0], h);
1909 }
1910 }
1911# endif 1926# endif
1912 1927
1913 if (option (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1914 { 1929 {
1915 rvideo_bell = true; 1930 rvideo_bell = true;
… …
1918 1933
1919 bell_ev.start (VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1920 } 1935 }
1921 else 1936 else
1922 XBell (dpy, 0); 1937 XBell (dpy, 0);
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923#endif 1939#endif
1924} 1940}
1925 1941
1926/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1927/* ARGSUSED */ 1943/* ARGSUSED */
… …
1946 row_start = view_start; 1962 row_start = view_start;
1947 } 1963 }
1948 1964
1949 wctomb (0, 0); 1965 wctomb (0, 0);
1950 1966
1951 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952 { 1968 {
1953 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1954 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1955 1971
1956 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1985 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1986 */ 2002 */
1987void 2003void
1988rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
1989{ 2005{
1990 unsigned char have_bg,
1991 showcursor; /* show the cursor */
1992 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
1993 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
1994 int i; /* tmp */ 2008 int i; /* tmp */
1995#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1996 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
… …
2007 /* 2021 /*
2008 * A: set up vars 2022 * A: set up vars
2009 */ 2023 */
2010 refresh_count = 0; 2024 refresh_count = 0;
2011 2025
2026 unsigned int old_screen_flags = screen.flags;
2012 have_bg = 0; 2027 char have_bg = 0;
2013#ifdef HAVE_BG_PIXMAP 2028#ifdef HAVE_BG_PIXMAP
2014 have_bg = bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
2015#endif 2030#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2032
2018 /* 2033 /*
2019 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2020 */ 2035 */
2021 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2022 2044
2023 /* 2045 /*
2024 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2025 */ 2047 */
2026 { 2048 {
2027 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2028 2050
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2052 if (hidden_cursor)
2032 showcursor = 0; 2053 showcursor = 0;
2033#endif 2054#endif
2034 2055
… …
2062 ccol2 = bgcolor_of (rstyle); 2083 ccol2 = bgcolor_of (rstyle);
2063#else 2084#else
2064 ccol2 = Color_bg; 2085 ccol2 = Color_bg;
2065#endif 2086#endif
2066 2087
2067 if (showcursor && focus) 2088 if (focus)
2068 { 2089 {
2069 if (option (Opt_cursorUnderline)) 2090 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2091 *crp ^= RS_Uline;
2071 else 2092 else
2072 { 2093 {
… …
2107 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2108 } 2129 }
2109 } 2130 }
2110 } 2131 }
2111 2132
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116
2117#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2134 /*
2119 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2121 */ 2137 */
… …
2210 continue; 2226 continue;
2211 2227
2212 // redraw one or more characters 2228 // redraw one or more characters
2213 2229
2214 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2216 --col; 2232 --col;
2217 2233
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2235 text_t *text = stp + col;
2220 int count = 1; 2236 int count = 1;
2221 2237
2222 dtp[col] = stp[col]; 2238 dtp[col] = stp[col];
2223 drp[col] = rend; 2239 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2228 { 2244 {
2229 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2230 { 2246 {
2231 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2232 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2233 count++; 2250 count++;
2234 i++; 2251 i++;
2235 2252
2236 continue; 2253 continue;
2237 } 2254 }
… …
2257 2274
2258 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2260 2277
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2263 count++, i--; 2280 count++, i--;
2264 2281
2265 /* 2282 /*
2266 * Determine the attributes for the string 2283 * Determine the attributes for the string
2267 */ 2284 */
2268 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2270 2287
2271 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273 { 2290 {
2274 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2275 2292
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
… …
2296 2313
2297 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2298 fore = Color_UL; 2315 fore = Color_UL;
2299#endif 2316#endif
2300 2317
2318#ifdef OPTION_HC
2319 if (rend & RS_Sel)
2320 {
2321 /* invert the column if no highlightColor is set or it is the
2322 * current cursor column */
2323 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 && ISSET_PIXCOLOR (Color_HC))
2325 {
2326 if (ISSET_PIXCOLOR (Color_HTC))
2327 fore = Color_HTC;
2328 // if invert is 0 reverse video is set so we use bg color as fg color
2329 else if (!invert)
2330 fore = back;
2331
2332 back = Color_HC;
2333 invert = 0;
2334 }
2335 }
2336#endif
2337
2301 if (invert) 2338 if (invert)
2302 { 2339 {
2303#ifdef OPTION_HC
2304 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2305 || !ISSET_PIXCOLOR (Color_HC))
2306#endif
2307 /* invert the column if no highlightColor is set or it is the
2308 * current cursor column */
2309 ::swap (fore, back); 2340 ::swap (fore, back);
2310#ifdef OPTION_HC
2311 else if (ISSET_PIXCOLOR (Color_HC))
2312 back = Color_HC;
2313#endif
2314 2341
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2342#ifndef NO_BOLD_UNDERLINE_REVERSE
2316# ifndef OPTION_HC
2317 if (ISSET_PIXCOLOR (Color_RV))
2318 back = Color_RV;
2319# endif
2320 if (fore == back) 2343 if (fore == back)
2321 { 2344 {
2322 fore = Color_bg; 2345 fore = Color_bg;
2323 back = Color_fg; 2346 back = Color_fg;
2324 } 2347 }
… …
2360 /* 2383 /*
2361 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2362 */ 2385 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2387
2365 if (have_bg && back == Color_bg) 2388 if (expect_true (have_bg && back == Color_bg))
2366 { 2389 {
2367 // this is very ugly, maybe push it into ->draw? 2390 // this is very ugly, maybe push it into ->draw?
2368 2391
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2392 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2393 if (text[i] != ' ')
… …
2377 did_clear: ; 2400 did_clear: ;
2378 } 2401 }
2379 else 2402 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2404
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2406 {
2384#if ENABLE_FRILLS 2407#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2408 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2409 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2410 else
… …
2392 xpixel, ypixel + font->ascent + 1, 2415 xpixel, ypixel + font->ascent + 1,
2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394 } 2417 }
2395 } /* for (col....) */ 2418 } /* for (col....) */
2396 } /* for (row....) */ 2419 } /* for (row....) */
2397
2398#if ENABLE_OVERLAY
2399 scr_swap_overlay ();
2400#endif
2401 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402 2420
2403 /* 2421 /*
2404 * G: cleanup cursor and display outline cursor if necessary 2422 * G: cleanup cursor and display outline cursor if necessary
2405 */ 2423 */
2406 if (showcursor) 2424 if (showcursor)
… …
2445 } 2463 }
2446 2464
2447 /* 2465 /*
2448 * H: cleanup selection 2466 * H: cleanup selection
2449 */ 2467 */
2468#if ENABLE_OVERLAY
2469 scr_swap_overlay ();
2470#endif
2471 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2472
2450 scr_reverse_selection (); 2473 scr_reverse_selection ();
2451 2474
2475 screen.flags = old_screen_flags;
2452 num_scr = 0; 2476 num_scr = 0;
2453 num_scr_allow = 1; 2477 num_scr_allow = 1;
2454} 2478}
2455 2479
2456void 2480void
… …
2576 { 2600 {
2577#if !ENABLE_MINIMAL 2601#if !ENABLE_MINIMAL
2578 if (selection.rect) 2602 if (selection.rect)
2579 scr_xor_rect (selection.beg.row, selection.beg.col, 2603 scr_xor_rect (selection.beg.row, selection.beg.col,
2580 selection.end.row, selection.end.col, 2604 selection.end.row, selection.end.col,
2581 RS_RVid, RS_RVid | RS_Uline); 2605 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2582 else 2606 else
2583#endif 2607#endif
2584 scr_xor_span (selection.beg.row, selection.beg.col, 2608 scr_xor_span (selection.beg.row, selection.beg.col,
2585 selection.end.row, selection.end.col, 2609 selection.end.row, selection.end.col,
2586 RS_RVid); 2610 RS_Sel | RS_RVid);
2587 } 2611 }
2588} 2612}
2589 2613
2590/* ------------------------------------------------------------------------- */ 2614/* ------------------------------------------------------------------------- */
2591/* 2615/*
… …
2652/* ------------------------------------------------------------------------- */ 2676/* ------------------------------------------------------------------------- */
2653/* 2677/*
2654 * Paste a selection direct to the command fd 2678 * Paste a selection direct to the command fd
2655 */ 2679 */
2656void 2680void
2657rxvt_term::paste (char *data, unsigned int len) NOTHROW 2681rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2658{ 2682{
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2683 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (unsigned int i = 0; i < len; i++) 2684 for (unsigned int i = 0; i < len; i++)
2661 if (data[i] == C0_LF) 2685 if (data[i] == C0_LF)
2662 data[i] = C0_CR; 2686 data[i] = C0_CR;
… …
2666 2690
2667 tt_write (data, len); 2691 tt_write (data, len);
2668 2692
2669 if (priv_modes & PrivMode_BracketPaste) 2693 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~"); 2694 tt_printf ("\e[201~");
2695}
2696
2697void
2698rxvt_term::paste (char *data, unsigned int len) NOTHROW
2699{
2700 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2701 return;
2702
2703 tt_paste (data, len);
2671} 2704}
2672 2705
2673/* ------------------------------------------------------------------------- */ 2706/* ------------------------------------------------------------------------- */
2674/* 2707/*
2675 * Respond to a notification that a primary selection has been sent 2708 * Respond to a notification that a primary selection has been sent
… …
2884 selection_wait = Sel_normal; 2917 selection_wait = Sel_normal;
2885 2918
2886#if X_HAVE_UTF8_STRING 2919#if X_HAVE_UTF8_STRING
2887 selection_type = Sel_UTF8String; 2920 selection_type = Sel_UTF8String;
2888 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2921 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2889 return; 2922 return;
2890#else 2923#else
2891 selection_type = Sel_CompoundText; 2924 selection_type = Sel_CompoundText;
2892 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2925 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2893 return; 2926 return;
2894#endif 2927#endif
2895 } 2928 }
2896 2929
2897 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2930 selection_wait = Sel_none; /* don't loop in selection_paste () */
2898 selection_paste (display->root, XA_CUT_BUFFER0, false); 2931 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2926/* 2959/*
2927 * Clear all selected text 2960 * Clear all selected text
2928 * EXT: SelectionClear 2961 * EXT: SelectionClear
2929 */ 2962 */
2930void 2963void
2931rxvt_term::selection_clear () NOTHROW 2964rxvt_term::selection_clear (bool clipboard) NOTHROW
2932{ 2965{
2966 if (!clipboard)
2967 {
2933 want_refresh = 1; 2968 want_refresh = 1;
2934 free (selection.text); 2969 free (selection.text);
2935 selection.text = NULL; 2970 selection.text = NULL;
2936 selection.len = 0; 2971 selection.len = 0;
2937 CLEAR_SELECTION (); 2972 CLEAR_SELECTION ();
2938 2973
2939 if (display->selection_owner == this) 2974 if (display->selection_owner == this)
2940 display->selection_owner = 0; 2975 display->selection_owner = 0;
2976 }
2977 else
2978 {
2979 free (selection.clip_text);
2980 selection.clip_text = NULL;
2981 selection.clip_len = 0;
2982
2983 if (display->clipboard_owner == this)
2984 display->clipboard_owner = 0;
2985 }
2941} 2986}
2942 2987
2943/* ------------------------------------------------------------------------- */ 2988/* ------------------------------------------------------------------------- */
2944/* 2989/*
2945 * Copy a selection into the cut buffer 2990 * Copy a selection into the cut buffer
… …
3071 3116
3072 selection_grab (tm); 3117 selection_grab (tm);
3073} 3118}
3074 3119
3075bool 3120bool
3076rxvt_term::selection_grab (Time tm) NOTHROW 3121rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3077{ 3122{
3123 Atom sel;
3124
3125 if (!clipboard)
3126 {
3078 selection_time = tm; 3127 selection_time = tm;
3128 sel = XA_PRIMARY;
3129 }
3130 else
3131 {
3132 clipboard_time = tm;
3133 sel = xa[XA_CLIPBOARD];
3134 }
3079 3135
3080 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3136 XSetSelectionOwner (dpy, sel, vt, tm);
3081 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3137 if (XGetSelectionOwner (dpy, sel) == vt)
3082 { 3138 {
3083 display->set_selection_owner (this); 3139 display->set_selection_owner (this, clipboard);
3084 return true; 3140 return true;
3085 } 3141 }
3086 else 3142 else
3087 { 3143 {
3088 selection_clear (); 3144 selection_clear (clipboard);
3089 return false; 3145 return false;
3090 } 3146 }
3091 3147
3092#if 0 3148#if 0
3093 XTextProperty ct; 3149 XTextProperty ct;
… …
3588 else if (rq.target == xa[XA_MULTIPLE]) 3644 else if (rq.target == xa[XA_MULTIPLE])
3589 { 3645 {
3590 /* TODO: Handle MULTIPLE */ 3646 /* TODO: Handle MULTIPLE */
3591 } 3647 }
3592#endif 3648#endif
3593 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3594 { 3650 {
3595 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3596 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3652 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3653 ev.property = rq.property;
3654 }
3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3656 {
3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3658 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3597 ev.property = rq.property; 3659 ev.property = rq.property;
3598 } 3660 }
3599 else if (rq.target == XA_STRING 3661 else if (rq.target == XA_STRING
3600 || rq.target == xa[XA_TEXT] 3662 || rq.target == xa[XA_TEXT]
3601 || rq.target == xa[XA_COMPOUND_TEXT] 3663 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3634 { 3696 {
3635 target = xa[XA_COMPOUND_TEXT]; 3697 target = xa[XA_COMPOUND_TEXT];
3636 style = enc_compound_text; 3698 style = enc_compound_text;
3637 } 3699 }
3638 3700
3639 if (selection.text) 3701 if (rq.selection == XA_PRIMARY && selection.text)
3640 { 3702 {
3641 cl = selection.text; 3703 cl = selection.text;
3642 selectlen = selection.len; 3704 selectlen = selection.len;
3705 }
3706 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3707 {
3708 cl = selection.clip_text;
3709 selectlen = selection.clip_len;
3643 } 3710 }
3644 else 3711 else
3645 { 3712 {
3646 cl = L""; 3713 cl = L"";
3647 selectlen = 0; 3714 selectlen = 0;
… …
3715 h += 2; min_it (h, nrow); 3782 h += 2; min_it (h, nrow);
3716 3783
3717 x -= 1; clamp_it (x, 0, ncol - w); 3784 x -= 1; clamp_it (x, 0, ncol - w);
3718 y -= 1; clamp_it (y, 0, nrow - h); 3785 y -= 1; clamp_it (y, 0, nrow - h);
3719 3786
3720 ov_x = x; ov_y = y; 3787 ov.x = x; ov.y = y;
3721 ov_w = w; ov_h = h; 3788 ov.w = w; ov.h = h;
3722 3789
3723 ov_text = new text_t *[h]; 3790 ov.text = new text_t *[h];
3724 ov_rend = new rend_t *[h]; 3791 ov.rend = new rend_t *[h];
3725 3792
3726 for (y = 0; y < h; y++) 3793 for (y = 0; y < h; y++)
3727 { 3794 {
3728 text_t *tp = ov_text[y] = new text_t[w]; 3795 text_t *tp = ov.text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w]; 3796 rend_t *rp = ov.rend[y] = new rend_t[w];
3730 3797
3731 text_t t0, t1, t2; 3798 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE; 3799 rend_t r = OVERLAY_RSTYLE;
3733 3800
3734 if (y == 0) 3801 if (y == 0)
… …
3753} 3820}
3754 3821
3755void 3822void
3756rxvt_term::scr_overlay_off () NOTHROW 3823rxvt_term::scr_overlay_off () NOTHROW
3757{ 3824{
3758 if (!ov_text) 3825 if (!ov.text)
3759 return; 3826 return;
3760 3827
3761 want_refresh = 1; 3828 want_refresh = 1;
3762 3829
3763 for (int y = 0; y < ov_h; y++) 3830 for (int y = 0; y < ov.h; y++)
3764 { 3831 {
3765 delete [] ov_text[y]; 3832 delete [] ov.text[y];
3766 delete [] ov_rend[y]; 3833 delete [] ov.rend[y];
3767 } 3834 }
3768 3835
3769 delete [] ov_text; ov_text = 0; 3836 delete [] ov.text; ov.text = 0;
3770 delete [] ov_rend; ov_rend = 0; 3837 delete [] ov.rend; ov.rend = 0;
3771} 3838}
3772 3839
3773void 3840void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3841rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775{ 3842{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3843 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777 return; 3844 return;
3778 3845
3779 x++, y++; 3846 x++, y++;
3780 3847
3781 ov_text[y][x] = text; 3848 ov.text[y][x] = text;
3782 ov_rend[y][x] = rend; 3849 ov.rend[y][x] = rend;
3783} 3850}
3784 3851
3785void 3852void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3853rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787{ 3854{
… …
3806} 3873}
3807 3874
3808void 3875void
3809rxvt_term::scr_swap_overlay () NOTHROW 3876rxvt_term::scr_swap_overlay () NOTHROW
3810{ 3877{
3811 if (!ov_text) 3878 if (!ov.text)
3812 return; 3879 return;
3813 3880
3881 // hide cursor if it is within the overlay area
3882 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3883 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3884 screen.flags &= ~Screen_VisibleCursor;
3885
3814 // swap screen mem with overlay 3886 // swap screen mem with overlay
3815 for (int y = ov_h; y--; ) 3887 for (int y = ov.h; y--; )
3816 { 3888 {
3817 text_t *t1 = ov_text[y]; 3889 text_t *t1 = ov.text[y];
3818 rend_t *r1 = ov_rend[y]; 3890 rend_t *r1 = ov.rend[y];
3819 3891
3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3892 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3821 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3893 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822 3894
3823 for (int x = ov_w; x--; ) 3895 for (int x = ov.w; x--; )
3824 { 3896 {
3825 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3897 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3898 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827 } 3899 }
3828 } 3900 }

Diff Legend

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