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.183 by root, Wed Dec 21 14:19:19 2005 UTC vs.
Revision 1.209 by root, Thu Jan 5 01:04:10 2006 UTC

… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
147} 148}
148 149
149/* ------------------------------------------------------------------------- * 150/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 151 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 152 * ------------------------------------------------------------------------- */
153
152void 154void
153rxvt_term::scr_reset () 155rxvt_term::scr_reset ()
154{ 156{
155 unsigned int p, q;
156 int k;
157
158#if ENABLE_OVERLAY 157#if ENABLE_OVERLAY
159 scr_overlay_off (); 158 scr_overlay_off ();
160#endif 159#endif
161 160
162 view_start = 0; 161 view_start = 0;
… …
172 return; 171 return;
173 172
174 // we need at least two lines for wrapping to work correctly 173 // we need at least two lines for wrapping to work correctly
175 if (nrow + saveLines < 2) 174 if (nrow + saveLines < 2)
176 { 175 {
176 //TODO//FIXME
177 saveLines++; 177 saveLines++;
178 prev_nrow--; 178 prev_nrow--;
179 nsaved++; 179 nsaved++;
180 } 180 }
181 181
… …
185 total_rows = nrow + saveLines; 185 total_rows = nrow + saveLines;
186 186
187 screen.tscroll = 0; 187 screen.tscroll = 0;
188 screen.bscroll = nrow - 1; 188 screen.bscroll = nrow - 1;
189 189
190 if (!save) 190 if (!row_buf)
191 { 191 {
192 /* 192 /*
193 * first time called so just malloc everything: don't rely on realloc 193 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL 194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 195 */
… …
197 term_start = 0; 197 term_start = 0;
198 198
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 199 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 201
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 206
207 for (p = nrow; p--; ) 207 for (int row = nrow; row--; )
208 { 208 {
209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 } 212 }
213 213
214 memset (charsets, 'B', sizeof (charsets)); 214 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 215 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 216 screen.flags = Screen_DefaultFlags;
… …
240 { 240 {
241 /* 241 /*
242 * add or delete rows as appropriate 242 * add or delete rows as appropriate
243 */ 243 */
244 244
245 rxvt_salloc *old_ta; 245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra; 246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247 247
248#if 0
248 if (nrow < prev_nrow) 249 if (nrow < prev_nrow)
249 { 250 {
250 /* delete rows */
251 k = min (nsaved, prev_nrow - nrow);
252 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
253 scr_scroll_text (0, (int)prev_nrow - 1, k);
254
255 for (p = nrow; p < prev_nrow; p++) 251 for (int row = nrow; row < prev_nrow; row++)
256 { 252 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 253 lfree (swap_buf [row]);
259 lfree (drawn[p]); 254 lfree (drawn_buf[row]);
260 } 255 }
256 }
257#endif
261 258
262 /* we have fewer rows so fix up cursor position */ 259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 min_it (screen.cur.row, (int32_t)nrow - 1); 260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 262
265 scr_reset_realloc (); /* realloc _last_ */ 263 for (int row = min (nrow, prev_nrow); row--; )
264 {
265 lresize (drawn_buf[row]);
266 lresize (swap_buf [row]);
267 }
268
269 for (int row = prev_nrow; row < nrow; row++)
270 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
266 } 276
267 else if (nrow > prev_nrow) 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows);
279 int q = total_rows; // rewrapped row
280
281 if (nsaved)
282 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm.
285
286 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288
268 { 289 do
269 /* add rows */
270 scr_reset_realloc (); /* realloc _first_ */
271
272 int ocol = ncol;
273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
274
275 k = min (nsaved, nrow - prev_nrow);
276
277 for (p = prev_total_rows; p < total_rows; p++)
278 save[p].clear ();
279
280 for (p = prev_total_rows; p < total_rows - k; p++)
281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
282
283 for (p = prev_nrow; p < nrow; p++)
284 { 290 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 291 p = MOD (p - 1, prev_total_rows);
286 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
287 }
288
289 if (k > 0)
290 {
291 scr_scroll_text (0, (int)nrow - 1, -k);
292 screen.cur.row += k;
293 screen.s_cur.row += k;
294 nsaved -= k;
295 }
296
297#ifdef DEBUG_STRICT 292#ifdef DEBUG_STRICT
298 assert (screen.cur.row < nrow); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
299#else /* drive with your eyes closed */
300 min_it (screen.cur.row, nrow - 1);
301#endif 294#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304 295
305 /* resize columns */
306 if (ncol != prev_ncol)
307 {
308 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
309 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
310
311 for (p = total_rows; p--; )
312 lresize (save[p]);
313
314 for (p = nrow; p--; )
315 {
316 lresize (drawn[p]);
317 lresize (swap_save[p]);
318 }
319
320 min_it (screen.cur.col, (int16_t)ncol - 1);
321
322 delete old_ta;
323 delete old_ra;
324 }
325
326#if 0
327 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm.
329 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
330 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
331
332 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
333 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
334 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
335
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
337
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0)
342 {
343 --p;
344
345 printf ("pq %d:%d\n", p, q);
346 if (save[p].t)
347 {
348 int llen = save[p].l; 296 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 298
350 assert (llen >= 0); 299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352 while (p && save[p - 1].l < 0)
353 { 300 {
301 p = MOD (p - 1, prev_total_rows);
302
354 --p; 303 plines++;
355 llen += prev_ncol; 304 llen += prev_ncol;
356 } 305 }
357 306
358 int qlines = llen / ncol + 1; 307 int qlines = max (0, (llen - 1) / ncol) + 1;
308
309 // drop partial lines completely
310 if (q < qlines)
311 break;
312
313 q -= qlines;
314
359 int lofs = 0; 315 int lofs = 0;
316 line_t *qline;
360 317
361 q -= qlines; 318 // re-assemble the full line by destination lines
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++) 319 for (int qrow = q; qlines--; qrow++)
367 { 320 {
321 qline = row_buf + qrow;
322 lalloc (*qline);
323 qline->set_is_longer ();
324
368 if (qrow >= 0) 325 int qcol = 0;
326
327 // fill a single destination line
328 while (lofs < llen && qcol < ncol)
369 { 329 {
370 tp [qrow] = (text_t *)ta->alloc ();
371 rp [qrow] = (rend_t *)ra->alloc ();
372 tl [qrow] = LINE_CONT1;
373
374 int qcol = 0;
375
376 for (;;)
377 {
378 int prow = lofs / prev_ncol + p; 330 int prow = lofs / prev_ncol;
379 int pcol = lofs % prev_ncol; 331 int pcol = lofs % prev_ncol;
380 332
333 prow = MOD (p + prow, prev_total_rows);
334
335 // we only adjust the cursor _row_ and put it into
336 // the topmost line of "long line" it was in, as
337 // this seems to upset applications/shells/readline
338 // least.
339 if (prow == ocur.row)
340 screen.cur.row = q - (total_rows - nrow);
341
342 line_t &pline = old_buf [prow];
343
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 344 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382 345
383 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
384
385 if (len <= 0)
386 {
387 tl [qrow] = qcol;
388
389 TODO
390 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
391 ncol - qcol, DEFAULT_RSTYLE);
392
393 break;
394 }
395
396 assert (lofs < 1000); 346 assert (len);
347 assert (pline.t);
397 348
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400 351
401 lofs += len; 352 lofs += len;
402 qcol += len; 353 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 } 354 }
408 else
409 lofs += ncol;
410 } 355 }
356
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
411 } 366 }
367 while (p != pend && q > 0);
368
369 term_start = total_rows - nrow;
370 nsaved = term_start - q;
371
372 // make sure all terminal lines exist
373 while (nsaved < 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
375
376 }
377 else
412 } 378 {
379 // if no scrollback exists (yet), wing, instead of wrap
380
381 for (int row = min (nrow, prev_nrow); row--; )
382 {
383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
384 line_t &qline = row_buf [row];
413 385
414 free (screen.text); screen.text = tp; 386 qline = pline;
415 free (screen.rend); screen.rend = rp; 387 lresize (qline);
416 free (screen.tlen); screen.tlen = tl; 388 }
417 389
418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 390 for (int row = prev_nrow; row < nrow; row++)
391 {
392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
393 }
394
395 term_start = 0;
396 }
397
398#ifdef DEBUG_STRICT //TODO: remove
399 for (int i = -nsaved; i < nrow; i++)
400 assert (ROW (i).t);
419#endif 401#endif
402
403 free (old_buf);
404 delete old_ta;
405 delete old_ra;
406
407 clamp_it (screen.cur.row, 0, nrow - 1);
408 clamp_it (screen.cur.col, 0, ncol - 1);
420 409
421 if (tabs) 410 if (tabs)
422 free (tabs); 411 free (tabs);
423 } 412 }
424 413
425 prev_nrow = nrow; 414 prev_nrow = nrow;
426 prev_ncol = ncol; 415 prev_ncol = ncol;
427 416
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 417 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 418
430 for (p = 0; p < ncol; p++) 419 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 420 tabs [col] = col % TABSIZE == 0;
432 421
433 tt_winch (); 422 tt_winch ();
434}
435 423
436void 424 PERL_INVOKE ((this, HOOK_RESET, DT_END));
437rxvt_term::scr_reset_realloc ()
438{
439 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
440 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
441 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
442 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
443} 425}
444 426
445/* ------------------------------------------------------------------------- */ 427/* ------------------------------------------------------------------------- */
446/* 428/*
447 * Free everything. That way malloc debugging can find leakage. 429 * Free everything. That way malloc debugging can find leakage.
… …
450rxvt_term::scr_release () 432rxvt_term::scr_release ()
451{ 433{
452 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
454 436
455 free (save); 437 free (row_buf);
456 free (swap_save); 438 free (swap_buf);
457 free (drawn); 439 free (drawn_buf);
458 free (buf); 440 free (temp_buf);
459 free (tabs); 441 free (tabs);
442
443 row_buf = 0; // signal that we freed all the arrays
460} 444}
461 445
462/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
463/* 447/*
464 * Hard reset 448 * Hard reset
… …
520 min_it (s->cur.row, nrow - 1); 504 min_it (s->cur.row, nrow - 1);
521 min_it (s->cur.col, ncol - 1); 505 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
525#else /* drive with your eyes closed */
526 max_it (s->cur.row, 0);
527 max_it (s->cur.col, 0);
528#endif 509#endif
529} 510}
530 511
531/* ------------------------------------------------------------------------- */ 512/* ------------------------------------------------------------------------- */
532/* 513/*
… …
552 533
553 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 534 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
554 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 535 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
555 536
556#if NSCREENS 537#if NSCREENS
557 if (options & Opt_secondaryScreen) 538 if (OPTION (Opt_secondaryScreen))
558 { 539 {
559 num_scr = 0; 540 num_scr = 0;
560 541
561 for (int i = nrow; i--; ) 542 for (int i = prev_nrow; i--; )
562 ::swap (ROW(i), swap_save[i]); 543 ::swap (ROW(i), swap_buf [i]);
563 544
564 ::swap (screen.charset, swap.charset); 545 ::swap (screen.charset, swap.charset);
565 ::swap (screen.flags, swap.flags); 546 ::swap (screen.flags, swap.flags);
566 screen.flags |= Screen_VisibleCursor; 547 screen.flags |= Screen_VisibleCursor;
567 swap.flags |= Screen_VisibleCursor; 548 swap.flags |= Screen_VisibleCursor;
568 } 549 }
569 else 550 else
570#endif 551#endif
571 if (options & Opt_secondaryScroll) 552 if (OPTION (Opt_secondaryScroll))
572 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 553 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
573 554
574 return scrn; 555 return scrn;
575} 556}
576 557
… …
638 num_scr += count; 619 num_scr += count;
639 620
640 if (count > 0 621 if (count > 0
641 && row1 == 0 622 && row1 == 0
642 && row2 == nrow - 1 623 && row2 == nrow - 1
643 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
644 { 625 {
645 nsaved = min (nsaved + count, saveLines); 626 nsaved = min (nsaved + count, saveLines);
627
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
629
646 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
647 631
648 if (selection.op && current_screen == selection.screen) 632 if (selection.op && current_screen == selection.screen)
649 { 633 {
650 selection.beg.row -= count; 634 selection.beg.row -= count;
651 selection.end.row -= count; 635 selection.end.row -= count;
652 selection.mark.row -= count; 636 selection.mark.row -= count;
653 637
654 selection_check (0); 638 if (selection.beg.row < -nsaved
639 || selection.end.row < -nsaved
640 || selection.mark.row < -nsaved)
641 {
642 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR;
644 }
655 } 645 }
656 646
657 for (int i = count; i--; ) 647 for (int i = count; i--; )
648 {
649 ROW(row2 - i).l = 0;
658 scr_blank_screen_mem (ROW(row2 - i), rstyle); 650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
659 652
660 if ((options & Opt_scrollWithBuffer) 653 if (OPTION (Opt_scrollWithBuffer)
661 && view_start != 0 654 && view_start != 0
662 && view_start != saveLines) 655 && view_start != saveLines)
663 scr_page (UP, count); 656 scr_page (UP, count);
664 } 657 }
665 else 658 else
666 { 659 {
667 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
668 { 661 {
669 int i = selection.beg.row; 662 if ((selection.beg.row < row1 && selection.end.row > row1)
670 int j = selection.end.row; 663 || (selection.beg.row < row2 && selection.end.row > row2)
671
672 if ((i < row1 && j > row1)
673 || (i < row2 && j > row2)
674 || (i - count < row1 && i >= row1) 664 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
675 || (i - count > row2 && i <= row2) 665 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
676 || (j - count < row1 && j >= row1) 666 || (selection.end.row - count < row1 && selection.end.row >= row1)
677 || (j - count > row2 && j <= row2)) 667 || (selection.end.row - count > row2 && selection.end.row <= row2))
678 { 668 {
679 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 670 selection.op = SELECTION_CLEAR;
681 } 671 }
682 else if (j >= row1 && j <= row2) 672 else if (selection.end.row >= row1 && selection.end.row <= row2)
683 { 673 {
684 /* move selected region too */ 674 /* move selected region too */
685 selection.beg.row -= count; 675 selection.beg.row -= count;
686 selection.end.row -= count; 676 selection.end.row -= count;
687 selection.mark.row -= count; 677 selection.mark.row -= count;
… …
693 // use a simple and robust scrolling algorithm, this 683 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 684 // part of scr_scroll_text is not time-critical.
695 685
696 int rows = row2 - row1 + 1; 686 int rows = row2 - row1 + 1;
697 687
688 min_it (count, rows);
689
698 for (int row = 0; row < rows; row++) 690 for (int row = 0; row < rows; row++)
699 { 691 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 693
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 694 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 695 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 696 }
705 697
706 for (int row = 0; row < rows; row++) 698 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 699 ROW(row1 + row) = temp_buf [row];
708 } 700 }
709 701
710 return count; 702 return count;
711} 703}
712 704
… …
720 if (len <= 0) /* sanity */ 712 if (len <= 0) /* sanity */
721 return; 713 return;
722 714
723 unsigned char checksel; 715 unsigned char checksel;
724 unicode_t c; 716 unicode_t c;
725 int row, last_col; 717 int last_col;
726 const unicode_t *strend = str + len; 718 const unicode_t *strend = str + len;
727 719
728 want_refresh = 1; 720 want_refresh = 1;
729 ZERO_SCROLLBACK (); 721 ZERO_SCROLLBACK ();
730 last_col = ncol; 722 last_col = ncol;
731 723
732 if (nlines > 0) 724 if (nlines > 0)
733 { 725 {
734 nlines += screen.cur.row - screen.bscroll; 726 nlines += screen.cur.row - screen.bscroll;
727
735 if ((nlines > 0) 728 if (nlines > 0
736 && (screen.tscroll == 0) 729 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 730 && screen.bscroll == (nrow - 1))
738 { 731 {
739 /* _at least_ this many lines need to be scrolled */ 732 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 733 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
741 screen.cur.row -= nlines; 734 screen.cur.row -= nlines;
742 } 735 }
743 } 736 }
744 737
745#ifdef DEBUG_STRICT 738#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 739 assert (screen.cur.col < last_col);
747 assert ((screen.cur.row < nrow) 740 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 741 && screen.cur.row >= -nsaved);
749#else /* drive with your eyes closed */
750 min_it (screen.cur.col, last_col - 1);
751 min_it (screen.cur.row, (int32_t)nrow - 1);
752 max_it (screen.cur.row, - (int32_t)nsaved);
753#endif 742#endif
754 row = screen.cur.row; 743 int row = screen.cur.row;
755 744
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 745 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 746
758 line_t *line = &ROW(row); 747 line_t *line = &ROW(row);
759 748
… …
761 { 750 {
762 c = *str++; 751 c = *str++;
763 752
764 if (c < 0x20) 753 if (c < 0x20)
765 if (c == C0_LF) 754 if (c == C0_LF)
766 { 755 {
767 if (!line->is_longer ()) /* XXX: think about this */ 756 if (!line->is_longer ()) /* XXX: think about this */
768 max_it (line->l, screen.cur.col); 757 max_it (line->l, screen.cur.col);
769 758
770 screen.flags &= ~Screen_WrapNext; 759 screen.flags &= ~Screen_WrapNext;
771 760
… …
968 if (!line->is_longer ()) /* XXX: think about this */ 957 if (!line->is_longer ()) /* XXX: think about this */
969 max_it (line->l, screen.cur.col); 958 max_it (line->l, screen.cur.col);
970 959
971#ifdef DEBUG_STRICT 960#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 961 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 max_it (screen.cur.row, 0);
975#endif 962#endif
976} 963}
977 964
978/* ------------------------------------------------------------------------- */ 965/* ------------------------------------------------------------------------- */
979/* 966/*
… …
1018 1005
1019 if (count == 0) 1006 if (count == 0)
1020 return; 1007 return;
1021 else if (count > 0) 1008 else if (count > 0)
1022 { 1009 {
1023 int row = screen.cur.row;
1024
1025 line_t &l = ROW(row); 1010 line_t &l = ROW(screen.cur.row);
1026 rend_t base_rend = l.r[i]; 1011 rend_t base_rend = l.r[i];
1027 ht &= l.t[i] == ' '; 1012 ht &= l.t[i] == ' ';
1028 1013
1029 for (; ++i < ncol; ) 1014 for (; ++i < ncol; )
1030 if (tabs[i]) 1015 if (tabs[i])
… …
1040 if (count) 1025 if (count)
1041 x = ncol - 1; 1026 x = ncol - 1;
1042 1027
1043 // store horizontal tab commands as characters inside the text 1028 // store horizontal tab commands as characters inside the text
1044 // buffer so they can be selected and pasted. 1029 // buffer so they can be selected and pasted.
1045 if (ht && options & Opt_pastableTabs) 1030 if (ht && OPTION (Opt_pastableTabs))
1046 { 1031 {
1047 base_rend = SET_FONT (base_rend, 0); 1032 base_rend = SET_FONT (base_rend, 0);
1048 1033
1049 if (!l.is_longer ()) /* XXX: think about this */ 1034 if (!l.is_longer ()) /* XXX: think about this */
1050 max_it (l.l, x); 1035 max_it (l.l, x);
… …
1105 */ 1090 */
1106#if ENABLE_FRILLS 1091#if ENABLE_FRILLS
1107void 1092void
1108rxvt_term::scr_forwardindex () 1093rxvt_term::scr_forwardindex ()
1109{ 1094{
1110 int row;
1111
1112 if (screen.cur.col < ncol - 1) 1095 if (screen.cur.col < ncol - 1)
1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1096 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1114 else 1097 else
1115 { 1098 {
1116 row = screen.cur.row;
1117
1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1099 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1119 ROW(row).l = ncol; 1100 ROW(screen.cur.row).l = ncol;
1120 1101
1121 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1122 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1123 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1124 } 1105 }
… …
1134{ 1115{
1135 want_refresh = 1; 1116 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1117 ZERO_SCROLLBACK ();
1137 1118
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 max_it (screen.cur.col, 0);
1140 min_it (screen.cur.col, (int32_t)ncol - 1); 1120 clamp_it (screen.cur.col, 0, ncol - 1);
1141 1121
1142 screen.flags &= ~Screen_WrapNext; 1122 screen.flags &= ~Screen_WrapNext;
1143 1123
1144 if (relative & R_RELATIVE) 1124 if (relative & R_RELATIVE)
1145 { 1125 {
… …
1169 } 1149 }
1170 else 1150 else
1171 screen.cur.row = row; 1151 screen.cur.row = row;
1172 } 1152 }
1173 1153
1174 max_it (screen.cur.row, 0);
1175 min_it (screen.cur.row, (int32_t)nrow - 1); 1154 clamp_it (screen.cur.row, 0, nrow - 1);
1176} 1155}
1177 1156
1178/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1179/* 1158/*
1180 * direction should be UP or DN 1159 * direction should be UP or DN
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1174 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1175 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1176 else
1198 screen.cur.row += dirn; 1177 screen.cur.row += dirn;
1199 1178
1200 max_it (screen.cur.row, 0);
1201 min_it (screen.cur.row, (int32_t)nrow - 1); 1179 clamp_it (screen.cur.row, 0, nrow - 1);
1202 selection_check (0); 1180 selection_check (0);
1203} 1181}
1204 1182
1205/* ------------------------------------------------------------------------- */ 1183/* ------------------------------------------------------------------------- */
1206/* 1184/*
… …
1210 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1211 */ 1189 */
1212void 1190void
1213rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1214{ 1192{
1215 unsigned int row, col, num; 1193 unsigned int col, num;
1216 1194
1217 want_refresh = 1; 1195 want_refresh = 1;
1218 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1219 1197
1220 selection_check (1); 1198 selection_check (1);
1221 1199
1222 row = screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1223 1201
1224 switch (mode) 1202 switch (mode)
1225 { 1203 {
1226 case 0: /* erase to end of line */ 1204 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1205 col = screen.cur.col;
1228 num = ncol - col; 1206 num = ncol - col;
1229 min_it (ROW(row).l, (int16_t)col); 1207 min_it (line.l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1208 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1209 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1210 CLEAR_SELECTION ();
1233 break; 1211 break;
1234 case 1: /* erase to beginning of line */ 1212 case 1: /* erase to beginning of line */
… …
1239 CLEAR_SELECTION (); 1217 CLEAR_SELECTION ();
1240 break; 1218 break;
1241 case 2: /* erase whole line */ 1219 case 2: /* erase whole line */
1242 col = 0; 1220 col = 0;
1243 num = ncol; 1221 num = ncol;
1244 ROW(row).l = 0; 1222 line.l = 0;
1245 if (selection.beg.row <= screen.cur.row 1223 if (selection.beg.row <= screen.cur.row
1246 && selection.end.row >= screen.cur.row) 1224 && selection.end.row >= screen.cur.row)
1247 CLEAR_SELECTION (); 1225 CLEAR_SELECTION ();
1248 break; 1226 break;
1249 default: 1227 default:
1250 return; 1228 return;
1251 } 1229 }
1252 1230
1253 scr_blank_line (ROW(row), col, num, rstyle); 1231 scr_blank_line (line, col, num, rstyle);
1254} 1232}
1255 1233
1256/* ------------------------------------------------------------------------- */ 1234/* ------------------------------------------------------------------------- */
1257/* 1235/*
1258 * Erase part of whole of the screen 1236 * Erase part of whole of the screen
… …
1301 CLEAR_SELECTION (); 1279 CLEAR_SELECTION ();
1302 1280
1303 if (row >= nrow) /* Out Of Bounds */ 1281 if (row >= nrow) /* Out Of Bounds */
1304 return; 1282 return;
1305 1283
1306 min_it (num, (nrow - row)); 1284 min_it (num, nrow - row);
1307 1285
1308 if (rstyle & (RS_RVid | RS_Uline)) 1286 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1287 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1288 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1289 {
… …
1313 CLEAR_ROWS (row, num); 1291 CLEAR_ROWS (row, num);
1314 } 1292 }
1315 else 1293 else
1316 { 1294 {
1317 ren = rstyle & (RS_fgMask | RS_bgMask); 1295 ren = rstyle & (RS_fgMask | RS_bgMask);
1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1296 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1319 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1297 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1320 ERASE_ROWS (row, num); 1298 ERASE_ROWS (row, num);
1321 gcvalue.foreground = pix_colors[Color_fg]; 1299 gcvalue.foreground = pix_colors[Color_fg];
1322 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1323 } 1301 }
1324 1302
1325 for (; num--; row++) 1303 for (; num--; row++)
1326 { 1304 {
1305 ROW (row).l = 0;
1327 scr_blank_screen_mem (ROW (row), rstyle); 1306 scr_blank_screen_mem (ROW (row), rstyle);
1328 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1307 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1308 }
1331} 1309}
1332 1310
1333#if ENABLE_FRILLS 1311#if ENABLE_FRILLS
1334void 1312void
… …
1419 return; 1397 return;
1420 1398
1421 scr_do_wrap (); 1399 scr_do_wrap ();
1422 1400
1423 selection_check (1); 1401 selection_check (1);
1424 min_it (count, (ncol - screen.cur.col)); 1402 min_it (count, ncol - screen.cur.col);
1425 1403
1426 row = screen.cur.row; 1404 row = screen.cur.row;
1427 1405
1428 line_t *line = &ROW(row); 1406 line_t *line = &ROW(row);
1429 1407
… …
1509 */ 1487 */
1510void 1488void
1511rxvt_term::scr_scroll_region (int top, int bot) 1489rxvt_term::scr_scroll_region (int top, int bot)
1512{ 1490{
1513 max_it (top, 0); 1491 max_it (top, 0);
1514 min_it (bot, (int)nrow - 1); 1492 min_it (bot, nrow - 1);
1515 1493
1516 if (top > bot) 1494 if (top > bot)
1517 return; 1495 return;
1518 1496
1519 screen.tscroll = top; 1497 screen.tscroll = top;
… …
1622 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1601#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1602 if (bgPixmap.pixmap == None)
1625#endif 1603#endif
1626#if TRANSPARENT 1604#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1628#endif 1606#endif
1629 XSetWindowBackground (display->display, vt, 1607 XSetWindowBackground (display->display, vt,
1630 pix_colors[Color_bg]); 1608 pix_colors[Color_bg]);
1631 1609
1632 gcvalue.foreground = pix_colors[Color_fg]; 1610 gcvalue.foreground = pix_colors[Color_fg];
… …
1723 bool found = false; 1701 bool found = false;
1724 1702
1725 for (int i = 0; i < nrow; i++) 1703 for (int i = 0; i < nrow; i++)
1726 { 1704 {
1727 int col = 0; 1705 int col = 0;
1728 rend_t *drp = drawn[i].r; 1706 rend_t *drp = drawn_buf[i].r;
1729 1707
1730 for (; col < ncol; col++, drp++) 1708 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1709 if ((*drp & mask) == value)
1732 { 1710 {
1733 found = true; 1711 found = true;
… …
1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1729rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1752{ 1730{
1753 int i; 1731 int i;
1754 row_col_t rc[RC_COUNT]; 1732 row_col_t rc[RC_COUNT];
1755 1733
1756 if (!drawn) /* sanity check */ 1734 if (!drawn_buf) /* sanity check */
1757 return; 1735 return;
1758 1736
1759#ifndef NO_SLOW_LINK_SUPPORT 1737#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1738 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1739 {
1762 y = 0; 1740 y = 0;
1763 eheight = height; 1741 eheight = height;
1764 } 1742 }
1765#endif
1766
1767#ifdef DEBUG_STRICT
1768 x = max (x, 0);
1769 x = min (x, (int)width);
1770 y = max (y, 0);
1771 y = min (y, (int)height);
1772#endif 1743#endif
1773 1744
1774 /* round down */ 1745 /* round down */
1775 rc[PART_BEG].col = Pixel2Col (x); 1746 rc[PART_BEG].col = Pixel2Col (x);
1776 rc[PART_BEG].row = Pixel2Row (y); 1747 rc[PART_BEG].row = Pixel2Row (y);
… …
1784 min_it (rc[i].col, ncol - 1); 1755 min_it (rc[i].col, ncol - 1);
1785 min_it (rc[i].row, nrow - 1); 1756 min_it (rc[i].row, nrow - 1);
1786 } 1757 }
1787 1758
1788 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1759 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1789 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1760 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1790 1761
1791 if (refresh) 1762 if (refresh)
1792 scr_refresh (SLOW_REFRESH); 1763 scr_refresh (SLOW_REFRESH);
1793} 1764}
1794 1765
… …
1855} 1826}
1856 1827
1857int 1828int
1858rxvt_term::scr_changeview (unsigned int oldviewstart) 1829rxvt_term::scr_changeview (unsigned int oldviewstart)
1859{ 1830{
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832
1860 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1861 { 1834 {
1862 want_refresh = 1; 1835 want_refresh = 1;
1863 num_scr -= (view_start - oldviewstart); 1836 num_scr -= (view_start - oldviewstart);
1864 } 1837 }
… …
1872{ 1845{
1873#ifndef NO_BELL 1846#ifndef NO_BELL
1874 1847
1875# ifndef NO_MAPALERT 1848# ifndef NO_MAPALERT
1876# ifdef MAPALERT_OPTION 1849# ifdef MAPALERT_OPTION
1877 if (options & Opt_mapAlert) 1850 if (OPTION (Opt_mapAlert))
1878# endif 1851# endif
1879 XMapWindow (display->display, parent[0]); 1852 XMapWindow (display->display, parent[0]);
1880# endif 1853# endif
1881 1854
1882 if (options & Opt_visualBell) 1855 if (OPTION (Opt_visualBell))
1883 { 1856 {
1884 scr_rvideo_mode (!rvideo); /* refresh also done */ 1857 scr_rvideo_mode (!rvideo); /* refresh also done */
1885 rxvt_usleep (VISUAL_BELL_DURATION); 1858 rxvt_usleep (VISUAL_BELL_DURATION);
1886 scr_rvideo_mode (!rvideo); /* refresh also done */ 1859 scr_rvideo_mode (!rvideo); /* refresh also done */
1887 } 1860 }
… …
1978 1951
1979#if XPM_BACKGROUND 1952#if XPM_BACKGROUND
1980 must_clear |= bgPixmap.pixmap != None; 1953 must_clear |= bgPixmap.pixmap != None;
1981#endif 1954#endif
1982#if TRANSPARENT 1955#if TRANSPARENT
1983 must_clear |= (options & Opt_transparent) && am_transparent; 1956 must_clear |= OPTION (Opt_transparent) && am_transparent;
1984#endif 1957#endif
1985 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1958 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1986 1959
1987 /* 1960 /*
1988 * B: reverse any characters which are selected 1961 * B: reverse any characters which are selected
… …
2012 1985
2013 crp = &ROW(screen.cur.row).r[col]; 1986 crp = &ROW(screen.cur.row).r[col];
2014 1987
2015 if (showcursor && focus) 1988 if (showcursor && focus)
2016 { 1989 {
2017 if (options & Opt_cursorUnderline) 1990 if (OPTION (Opt_cursorUnderline))
2018 *crp ^= RS_Uline; 1991 *crp ^= RS_Uline;
2019 else 1992 else
2020 { 1993 {
2021 *crp ^= RS_RVid; 1994 *crp ^= RS_RVid;
2022 1995
… …
2024 cc1 = *crp & (RS_fgMask | RS_bgMask); 1997 cc1 = *crp & (RS_fgMask | RS_bgMask);
2025 if (ISSET_PIXCOLOR (Color_cursor)) 1998 if (ISSET_PIXCOLOR (Color_cursor))
2026 ccol1 = Color_cursor; 1999 ccol1 = Color_cursor;
2027 else 2000 else
2028#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2001#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2029 ccol1 = GET_FGCOLOR (rstyle); 2002 ccol1 = fgcolor_of (rstyle);
2030#else 2003#else
2031 ccol1 = Color_fg; 2004 ccol1 = Color_fg;
2032#endif 2005#endif
2033 if (ISSET_PIXCOLOR (Color_cursor2)) 2006 if (ISSET_PIXCOLOR (Color_cursor2))
2034 ccol2 = Color_cursor2; 2007 ccol2 = Color_cursor2;
2035 else 2008 else
2036#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2009#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2037 ccol2 = GET_BGCOLOR (rstyle); 2010 ccol2 = bgcolor_of (rstyle);
2038#else 2011#else
2039 ccol2 = Color_bg; 2012 ccol2 = Color_bg;
2040#endif 2013#endif
2041 *crp = SET_FGCOLOR (*crp, ccol1); 2014 *crp = SET_FGCOLOR (*crp, ccol1);
2042 *crp = SET_BGCOLOR (*crp, ccol2); 2015 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2052 if (screen.cur.row + view_start != ocrow 2025 if (screen.cur.row + view_start != ocrow
2053 || screen.cur.col != oldcursor.col) 2026 || screen.cur.col != oldcursor.col)
2054 { 2027 {
2055 if (ocrow < nrow 2028 if (ocrow < nrow
2056 && oldcursor.col < ncol) 2029 && oldcursor.col < ncol)
2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2030 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2058 2031
2059 if (focus || !showcursor) 2032 if (focus || !showcursor)
2060 oldcursor.row = -1; 2033 oldcursor.row = -1;
2061 else 2034 else
2062 setoldcursor = 1; 2035 setoldcursor = 1;
… …
2075 oldcursor.col = screen.cur.col; 2048 oldcursor.col = screen.cur.col;
2076 } 2049 }
2077 } 2050 }
2078 } 2051 }
2079 2052
2053 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2080#if ENABLE_OVERLAY 2054#if ENABLE_OVERLAY
2081 scr_swap_overlay (); 2055 scr_swap_overlay ();
2082#endif 2056#endif
2083 2057
2084#ifndef NO_SLOW_LINK_SUPPORT 2058#ifndef NO_SLOW_LINK_SUPPORT
… …
2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2102 { 2076 {
2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2077 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2104 { 2078 {
2105 line_t s = ROW(row - view_start); 2079 line_t s = ROW(row - view_start);
2106 line_t d = drawn[row]; 2080 line_t d = drawn_buf[row];
2107 line_t d2 = drawn[row + i]; 2081 line_t d2 = drawn_buf[row + i];
2108 2082
2109 for (nits = 0, col = ncol; col--; ) 2083 for (nits = 0, col = ncol; col--; )
2110 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2084 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2111 nits--; 2085 nits--;
2112 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2086 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2134 if (wlen < len) 2108 if (wlen < len)
2135 ::swap (wlen, len); 2109 ::swap (wlen, len);
2136 2110
2137 XCopyArea (display->display, vt, vt, 2111 XCopyArea (display->display, vt, vt,
2138 gc, 0, Row2Pixel (len + i), 2112 gc, 0, Row2Pixel (len + i),
2139 (unsigned int)TermWin_TotalWidth (), 2113 (unsigned int)this->width,
2140 (unsigned int)Height2Pixel (wlen - len + 1), 2114 (unsigned int)Height2Pixel (wlen - len + 1),
2141 0, Row2Pixel (len)); 2115 0, Row2Pixel (len));
2142 len = -1; 2116 len = -1;
2143 } 2117 }
2144 } 2118 }
… …
2150 */ 2124 */
2151 for (row = 0; row < nrow; row++) 2125 for (row = 0; row < nrow; row++)
2152 { 2126 {
2153 text_t *stp = ROW(row - view_start).t; 2127 text_t *stp = ROW(row - view_start).t;
2154 rend_t *srp = ROW(row - view_start).r; 2128 rend_t *srp = ROW(row - view_start).r;
2155 text_t *dtp = drawn[row].t; 2129 text_t *dtp = drawn_buf[row].t;
2156 rend_t *drp = drawn[row].r; 2130 rend_t *drp = drawn_buf[row].r;
2157 2131
2158 /* 2132 /*
2159 * E2: OK, now the real pass 2133 * E2: OK, now the real pass
2160 */ 2134 */
2161 int ypixel = (int)Row2Pixel (row); 2135 int ypixel = (int)Row2Pixel (row);
… …
2223 count++, i--; 2197 count++, i--;
2224 2198
2225 /* 2199 /*
2226 * Determine the attributes for the string 2200 * Determine the attributes for the string
2227 */ 2201 */
2228 int fore = GET_FGCOLOR (rend); // desired foreground 2202 int fore = fgcolor_of (rend); // desired foreground
2229 int back = GET_BGCOLOR (rend); // desired background 2203 int back = bgcolor_of (rend); // desired background
2230 2204
2231 // only do special processing if any attributes are set, which is rare 2205 // only do special processing if any attributes are set, which is unlikely
2232 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2206 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2233 { 2207 {
2234#if ENABLE_STYLES 2208#if ENABLE_STYLES
2235 // force redraw after "careful" characters to avoid pixel droppings 2209 // force redraw after "careful" characters to avoid pixel droppings
2236 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2210 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2347 } /* for (row....) */ 2321 } /* for (row....) */
2348 2322
2349#if ENABLE_OVERLAY 2323#if ENABLE_OVERLAY
2350 scr_swap_overlay (); 2324 scr_swap_overlay ();
2351#endif 2325#endif
2326 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2352 2327
2353 /* 2328 /*
2354 * G: cleanup cursor and display outline cursor if necessary 2329 * G: cleanup cursor and display outline cursor if necessary
2355 */ 2330 */
2356 if (showcursor) 2331 if (showcursor)
2357 { 2332 {
2358 if (focus) 2333 if (focus)
2359 { 2334 {
2360 if (options & Opt_cursorUnderline) 2335 if (OPTION (Opt_cursorUnderline))
2361 *crp ^= RS_Uline; 2336 *crp ^= RS_Uline;
2362 else 2337 else
2363 { 2338 {
2364 *crp ^= RS_RVid; 2339 *crp ^= RS_RVid;
2365#ifndef NO_CURSORCOLOR 2340#ifndef NO_CURSORCOLOR
… …
2374 2349
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2350 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--; 2351 col--;
2377 2352
2378 while (col + cursorwidth < ncol 2353 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2354 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++; 2355 cursorwidth++;
2381 2356
2382#ifndef NO_CURSORCOLOR 2357#ifndef NO_CURSORCOLOR
2383 if (ISSET_PIXCOLOR (Color_cursor)) 2358 if (ISSET_PIXCOLOR (Color_cursor))
2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2359 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2416 2391
2417void 2392void
2418rxvt_term::scr_remap_chars () 2393rxvt_term::scr_remap_chars ()
2419{ 2394{
2420 for (int i = total_rows; i--; ) 2395 for (int i = total_rows; i--; )
2421 scr_remap_chars (save[i]); 2396 scr_remap_chars (row_buf [i]);
2422 2397
2423 for (int i = nrow; i--; ) 2398 for (int i = nrow; i--; )
2424 { 2399 {
2425 scr_remap_chars (drawn[i]); 2400 scr_remap_chars (drawn_buf [i]);
2426 scr_remap_chars (swap_save[i]); 2401 scr_remap_chars (swap_buf [i]);
2427 } 2402 }
2428} 2403}
2429 2404
2430void 2405void
2431rxvt_term::scr_recolour () 2406rxvt_term::scr_recolour ()
… …
2484 2459
2485#if ENABLE_FRILLS 2460#if ENABLE_FRILLS
2486 if (selection.rect) 2461 if (selection.rect)
2487 { 2462 {
2488 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2463 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2464 {
2465 text_t *stp = ROW(row).t;
2466 rend_t *srp = ROW(row).r;
2467
2489 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2468 for (col = selection.beg.col; col < selection.end.col; col++)
2490 srp[col] ^= RS_RVid; 2469 srp[col] ^= RS_RVid;
2470
2471 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2472 srp[col] ^= RS_RVid | RS_Uline;
2473
2474 if (++col < selection.end.col)
2475 srp[col] ^= RS_RVid | RS_Uline;
2476 }
2491 } 2477 }
2492 else 2478 else
2493#endif 2479#endif
2494 { 2480 {
2495 if (selection.beg.row >= -view_start) 2481 if (selection.beg.row >= -view_start)
… …
2498 row = selection.beg.row; 2484 row = selection.beg.row;
2499 } 2485 }
2500 else 2486 else
2501 { 2487 {
2502 col = 0; 2488 col = 0;
2503 row = view_start; 2489 row = -view_start;
2504 } 2490 }
2505 2491
2506 for (; row < min (selection.end.row, view_end); row++, col = 0) 2492 for (; row < min (selection.end.row, view_end); row++, col = 0)
2507 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2493 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2508 srp[col] ^= RS_RVid; 2494 srp[col] ^= RS_RVid;
… …
2528 char r1[] = "\n"; 2514 char r1[] = "\n";
2529 2515
2530 for (row = saveLines - nsaved; 2516 for (row = saveLines - nsaved;
2531 row < saveLines + nrow - 1; row++) 2517 row < saveLines + nrow - 1; row++)
2532 { 2518 {
2533 width = save[row].l >= 0 ? save[row].l 2519 width = row_buf[row].l >= 0 ? row_buf[row].l
2534 : ncol; 2520 : ncol;
2535 for (towrite = width; towrite; towrite -= wrote) 2521 for (towrite = width; towrite; towrite -= wrote)
2536 { 2522 {
2537 wrote = write (fd, & (save[row].t[width - towrite]), 2523 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2538 towrite); 2524 towrite);
2539 if (wrote < 0) 2525 if (wrote < 0)
2540 return; /* XXX: death, no report */ 2526 return; /* XXX: death, no report */
2541 } 2527 }
2542 if (save[row].l >= 0) 2528 if (row_buf[row].l >= 0)
2543 if (write (fd, r1, 1) <= 0) 2529 if (write (fd, r1, 1) <= 0)
2544 return; /* XXX: death, no report */ 2530 return; /* XXX: death, no report */
2545 } 2531 }
2546} 2532}
2547#endif 2533#endif
… …
2579/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2580/* 2566/*
2581 * Paste a selection direct to the command fd 2567 * Paste a selection direct to the command fd
2582 */ 2568 */
2583void 2569void
2584rxvt_term::paste (unsigned char *data, unsigned int len) 2570rxvt_term::paste (char *data, unsigned int len)
2585{ 2571{
2586 /* convert normal newline chars into common keyboard Return key sequence */ 2572 /* convert normal newline chars into common keyboard Return key sequence */
2587 for (unsigned int i = 0; i < len; i++) 2573 for (unsigned int i = 0; i < len; i++)
2588 if (data[i] == C0_LF) 2574 if (data[i] == C0_LF)
2589 data[i] = C0_CR; 2575 data[i] = C0_CR;
… …
2733 { 2719 {
2734 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2720 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2735 char *s = rxvt_wcstombs (w); 2721 char *s = rxvt_wcstombs (w);
2736 free (w); 2722 free (w);
2737 // TODO: strlen == only the first element will be converted. well... 2723 // TODO: strlen == only the first element will be converted. well...
2738 paste ((unsigned char *)s, strlen (s)); 2724 paste (s, strlen (s));
2739 free (s); 2725 free (s);
2740 } 2726 }
2741 else 2727 else
2742#endif 2728#endif
2743 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2729 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2744 && cl) 2730 && cl)
2745 { 2731 {
2746 for (int i = 0; i < cr; i++) 2732 for (int i = 0; i < cr; i++)
2747 paste ((unsigned char *)cl[i], strlen (cl[i])); 2733 paste (cl[i], strlen (cl[i]));
2748 2734
2749 XFreeStringList (cl); 2735 XFreeStringList (cl);
2750 } 2736 }
2751 else 2737 else
2752 paste (ct.value, ct.nitems); // paste raw 2738 paste ((char *)ct.value, ct.nitems); // paste raw
2753 2739
2754bailout: 2740bailout:
2755 XFree (ct.value); 2741 XFree (ct.value);
2756 2742
2757 if (selection_wait == Sel_normal) 2743 if (selection_wait == Sel_normal)
… …
2795 return; /* outside window */ 2781 return; /* outside window */
2796 2782
2797 if (selection.text) 2783 if (selection.text)
2798 { /* internal selection */ 2784 { /* internal selection */
2799 char *str = rxvt_wcstombs (selection.text, selection.len); 2785 char *str = rxvt_wcstombs (selection.text, selection.len);
2800 paste ((unsigned char *)str, strlen (str)); 2786 paste (str, strlen (str));
2801 free (str); 2787 free (str);
2802 return; 2788 return;
2803 } 2789 }
2804 else 2790 else
2805 { 2791 {
… …
2897 selection.op = SELECTION_DONE; 2883 selection.op = SELECTION_DONE;
2898 2884
2899 if (selection.clicks == 4) 2885 if (selection.clicks == 4)
2900 return; /* nothing selected, go away */ 2886 return; /* nothing selected, go away */
2901 2887
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return;
2890
2902 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2903 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2904 2893
2905 int ofs = 0; 2894 int ofs = 0;
2906 int extra = 0; 2895 int extra = 0;
… …
2922#endif 2911#endif
2923 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2924 2913
2925 col = max (col, 0); 2914 col = max (col, 0);
2926 2915
2927 if (row == selection.end.row || selection.rect) 2916 if (row == selection.end.row
2917#if ENABLE_FRILLS
2918 || selection.rect
2919#endif
2920 )
2928 end_col = min (end_col, selection.end.col); 2921 min_it (end_col, selection.end.col);
2929 2922
2930 t = ROW(row).t + col; 2923 t = ROW(row).t + col;
2931 for (; col < end_col; col++) 2924 for (; col < end_col; col++)
2932 { 2925 {
2933 if (*t == NOCHAR) 2926 if (*t == NOCHAR)
… …
2951#endif 2944#endif
2952 else 2945 else
2953 new_selection_text[ofs++] = *t++; 2946 new_selection_text[ofs++] = *t++;
2954 } 2947 }
2955 2948
2949#if ENABLE_FRILLS
2950 if (selection.rect)
2951 {
2952 while (ofs
2953 && new_selection_text[ofs - 1] != C0_LF
2954 && unicode::is_space (new_selection_text[ofs - 1]))
2955 --ofs;
2956
2957 new_selection_text[ofs++] = C0_LF;
2958 }
2959 else
2960#endif
2956 if (!ROW(row).is_longer () && row != selection.end.row) 2961 if (!ROW(row).is_longer () && row != selection.end.row)
2957 new_selection_text[ofs++] = C0_LF; 2962 new_selection_text[ofs++] = C0_LF;
2958 } 2963 }
2959 2964
2960 if (end_col != selection.end.col) 2965 if (end_col != selection.end.col)
2961 new_selection_text[ofs++] = C0_LF; 2966 new_selection_text[ofs++] = C0_LF;
2962 2967
… …
2972 2977
2973 // we usually allocate much more than necessary, so realloc it smaller again 2978 // we usually allocate much more than necessary, so realloc it smaller again
2974 selection.len = ofs; 2979 selection.len = ofs;
2975 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2976 2981
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return;
2984
2985 selection_grab (tm);
2986}
2987
2988bool
2989rxvt_term::selection_grab (Time tm)
2990{
2991 selection_time = tm;
2992
2977 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2993 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2978 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2994 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2995 {
2979 display->set_selection_owner (this); 2996 display->set_selection_owner (this);
2997 return true;
2998 }
2980 else 2999 else
2981 rxvt_warn ("can't get primary selection, ignoring.\n"); 3000 return false;
2982 3001
2983#if 0 3002#if 0
2984 XTextProperty ct; 3003 XTextProperty ct;
2985 3004
2986 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3005 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2987 { 3006 {
2988 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3007 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2989 XFree (ct.value); 3008 XFree (ct.value);
2990 } 3009 }
2991#endif 3010#endif
2992
2993 selection_time = tm;
2994} 3011}
2995 3012
2996/* ------------------------------------------------------------------------- */ 3013/* ------------------------------------------------------------------------- */
2997/* 3014/*
2998 * Mark or select text based upon number of clicks: 1, 2, or 3 3015 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3120 } 3137 }
3121 } 3138 }
3122 break; 3139 break;
3123 } 3140 }
3124 3141
3125Old_Word_Selection_You_Die:
3126 if (dirn == DN) 3142 if (dirn == DN)
3127 col++; /* put us on one past the end */ 3143 col++; /* put us on one past the end */
3128 3144
3129 /* Poke the values back in */ 3145 /* Poke the values back in */
3130 ret->row = row; 3146 ret->row = row;
… …
3307 else if (selection.clicks == 2) 3323 else if (selection.clicks == 2)
3308 { 3324 {
3309 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3310 selection.end.col--; 3326 selection.end.col--;
3311 3327
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3312 selection_delimit_word (UP, &selection.beg, &selection.beg); 3330 selection_delimit_word (UP, &selection.beg, &selection.beg);
3313 selection_delimit_word (DN, &selection.end, &selection.end); 3331 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3314 } 3333 }
3315 else if (selection.clicks == 3) 3334 else if (selection.clicks == 3)
3316 { 3335 {
3317#if ENABLE_FRILLS 3336#if ENABLE_FRILLS
3318 if (options & Opt_tripleclickwords) 3337 if (OPTION (Opt_tripleclickwords))
3319 { 3338 {
3320 selection_delimit_word (UP, &selection.beg, &selection.beg); 3339 selection_delimit_word (UP, &selection.beg, &selection.beg);
3321 3340
3322 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3341 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3323 { 3342 {
… …
3384 { 3403 {
3385 stp = ROW(end_row).t; 3404 stp = ROW(end_row).t;
3386 3405
3387 while (--end_col >= 0) 3406 while (--end_col >= 0)
3388 { 3407 {
3389 if (stp[end_col] != ' ' 3408 if (stp[end_col] != NOCHAR
3390 && stp[end_col] != '\t' 3409 && !unicode::is_space (stp[end_col]))
3391 && stp[end_col] != NOCHAR)
3392 break; 3410 break;
3393 } 3411 }
3394 3412
3395 if (end_col >= 0 3413 if (end_col >= 0
3396 || !ROW(end_row - 1).is_longer ()) 3414 || !ROW(end_row - 1).is_longer ())
… …
3595 3613
3596#if ENABLE_OVERLAY 3614#if ENABLE_OVERLAY
3597void 3615void
3598rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3616rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3599{ 3617{
3600 if (nrow < 3 || ncol < 3) 3618 if (nrow < 1 || ncol < 1)
3601 return; 3619 return;
3602 3620
3603 want_refresh = 1; 3621 want_refresh = 1;
3604 3622
3605 scr_overlay_off (); 3623 scr_overlay_off ();
… …
3609 3627
3610 // make space for border 3628 // make space for border
3611 w += 2; min_it (w, ncol); 3629 w += 2; min_it (w, ncol);
3612 h += 2; min_it (h, nrow); 3630 h += 2; min_it (h, nrow);
3613 3631
3614 x -= 1; max_it (x, 0); 3632 x -= 1; clamp_it (x, 0, ncol - w);
3615 y -= 1; max_it (y, 0); 3633 y -= 1; clamp_it (y, 0, nrow - h);
3616
3617 min_it (x, ncol - w);
3618 min_it (y, nrow - h);
3619 3634
3620 ov_x = x; ov_y = y; 3635 ov_x = x; ov_y = y;
3621 ov_w = w; ov_h = h; 3636 ov_w = w; ov_h = h;
3622 3637
3623 ov_text = new text_t *[h]; 3638 ov_text = new text_t *[h];
… …
3715 for (int y = ov_h; y--; ) 3730 for (int y = ov_h; y--; )
3716 { 3731 {
3717 text_t *t1 = ov_text[y]; 3732 text_t *t1 = ov_text[y];
3718 rend_t *r1 = ov_rend[y]; 3733 rend_t *r1 = ov_rend[y];
3719 3734
3720 text_t *t2 = ROW(y - view_start).t + ov_x; 3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3721 rend_t *r2 = ROW(y - view_start).r + ov_x; 3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3722 3737
3723 for (int x = ov_w; x--; ) 3738 for (int x = ov_w; x--; )
3724 { 3739 {
3725 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3740 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3726 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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