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.182 by root, Wed Dec 21 10:35:47 2005 UTC vs.
Revision 1.206 by root, Tue Jan 3 17:34:44 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
… …
515 set_font_style (); 499 set_font_style ();
516 break; 500 break;
517 } 501 }
518 502
519 /* boundary check in case screen size changed between SAVE and RESTORE */ 503 /* boundary check in case screen size changed between SAVE and RESTORE */
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;
735 if ((nlines > 0) 727 if (nlines > 0
736 && (screen.tscroll == 0) 728 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 729 && screen.bscroll == (nrow - 1))
738 { 730 {
739 /* _at least_ this many lines need to be scrolled */ 731 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
741 screen.cur.row -= nlines; 733 screen.cur.row -= nlines;
742 } 734 }
743 } 735 }
744 736
745#ifdef DEBUG_STRICT 737#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 738 assert (screen.cur.col < last_col);
747 assert ((screen.cur.row < nrow) 739 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 740 && 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 741#endif
754 row = screen.cur.row; 742 int row = screen.cur.row;
755 743
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 744 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 745
758 line_t *line = &ROW(row); 746 line_t *line = &ROW(row);
759 747
… …
761 { 749 {
762 c = *str++; 750 c = *str++;
763 751
764 if (c < 0x20) 752 if (c < 0x20)
765 if (c == C0_LF) 753 if (c == C0_LF)
766 { 754 {
767 if (!line->is_longer ()) /* XXX: think about this */ 755 if (!line->is_longer ()) /* XXX: think about this */
768 MAX_IT (line->l, screen.cur.col); 756 max_it (line->l, screen.cur.col);
769 757
770 screen.flags &= ~Screen_WrapNext; 758 screen.flags &= ~Screen_WrapNext;
771 759
772 if (screen.cur.row == screen.bscroll) 760 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 761 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
778 continue; 766 continue;
779 } 767 }
780 else if (c == C0_CR) 768 else if (c == C0_CR)
781 { 769 {
782 if (!line->is_longer ()) /* XXX: think about this */ 770 if (!line->is_longer ()) /* XXX: think about this */
783 MAX_IT (line->l, screen.cur.col); 771 max_it (line->l, screen.cur.col);
784 772
785 screen.flags &= ~Screen_WrapNext; 773 screen.flags &= ~Screen_WrapNext;
786 screen.cur.col = 0; 774 screen.cur.col = 0;
787 continue; 775 continue;
788 } 776 }
… …
964#endif 952#endif
965 } 953 }
966 } 954 }
967 955
968 if (!line->is_longer ()) /* XXX: think about this */ 956 if (!line->is_longer ()) /* XXX: think about this */
969 MAX_IT (line->l, screen.cur.col); 957 max_it (line->l, screen.cur.col);
970 958
971#ifdef DEBUG_STRICT 959#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 960 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 MAX_IT (screen.cur.row, 0);
975#endif 961#endif
976} 962}
977 963
978/* ------------------------------------------------------------------------- */ 964/* ------------------------------------------------------------------------- */
979/* 965/*
… …
1018 1004
1019 if (count == 0) 1005 if (count == 0)
1020 return; 1006 return;
1021 else if (count > 0) 1007 else if (count > 0)
1022 { 1008 {
1023 int row = screen.cur.row;
1024
1025 line_t &l = ROW(row); 1009 line_t &l = ROW(screen.cur.row);
1026 rend_t base_rend = l.r[i]; 1010 rend_t base_rend = l.r[i];
1027 ht &= l.t[i] == ' '; 1011 ht &= l.t[i] == ' ';
1028 1012
1029 for (; ++i < ncol; ) 1013 for (; ++i < ncol; )
1030 if (tabs[i]) 1014 if (tabs[i])
… …
1040 if (count) 1024 if (count)
1041 x = ncol - 1; 1025 x = ncol - 1;
1042 1026
1043 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1044 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1045 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1046 { 1030 {
1047 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1048 1032
1049 if (!l.is_longer ()) /* XXX: think about this */ 1033 if (!l.is_longer ()) /* XXX: think about this */
1050 MAX_IT (l.l, x); 1034 max_it (l.l, x);
1051 1035
1052 i = screen.cur.col; 1036 i = screen.cur.col;
1053 1037
1054 l.t[i] = '\t'; 1038 l.t[i] = '\t';
1055 l.r[i] = base_rend; 1039 l.r[i] = base_rend;
… …
1105 */ 1089 */
1106#if ENABLE_FRILLS 1090#if ENABLE_FRILLS
1107void 1091void
1108rxvt_term::scr_forwardindex () 1092rxvt_term::scr_forwardindex ()
1109{ 1093{
1110 int row;
1111
1112 if (screen.cur.col < ncol - 1) 1094 if (screen.cur.col < ncol - 1)
1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1114 else 1096 else
1115 { 1097 {
1116 row = screen.cur.row;
1117
1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1119 ROW(row).l = ncol; 1099 ROW(screen.cur.row).l = ncol;
1120 1100
1121 scr_gotorc (0, 0, R_RELATIVE); 1101 scr_gotorc (0, 0, R_RELATIVE);
1122 scr_insdel_chars (1, DELETE); 1102 scr_insdel_chars (1, DELETE);
1123 scr_gotorc (0, ncol - 1, R_RELATIVE); 1103 scr_gotorc (0, ncol - 1, R_RELATIVE);
1124 } 1104 }
… …
1134{ 1114{
1135 want_refresh = 1; 1115 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1116 ZERO_SCROLLBACK ();
1137 1117
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 MAX_IT (screen.cur.col, 0); 1119 clamp_it (screen.cur.col, 0, ncol - 1);
1140 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1141 1120
1142 screen.flags &= ~Screen_WrapNext; 1121 screen.flags &= ~Screen_WrapNext;
1143 1122
1144 if (relative & R_RELATIVE) 1123 if (relative & R_RELATIVE)
1145 { 1124 {
… …
1163 else 1142 else
1164 { 1143 {
1165 if (screen.flags & Screen_Relative) 1144 if (screen.flags & Screen_Relative)
1166 { /* relative origin mode */ 1145 { /* relative origin mode */
1167 screen.cur.row = row + screen.tscroll; 1146 screen.cur.row = row + screen.tscroll;
1168 MIN_IT (screen.cur.row, screen.bscroll); 1147 min_it (screen.cur.row, screen.bscroll);
1169 } 1148 }
1170 else 1149 else
1171 screen.cur.row = row; 1150 screen.cur.row = row;
1172 } 1151 }
1173 1152
1174 MAX_IT (screen.cur.row, 0); 1153 clamp_it (screen.cur.row, 0, nrow - 1);
1175 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1176} 1154}
1177 1155
1178/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1179/* 1157/*
1180 * direction should be UP or DN 1158 * direction should be UP or DN
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1173 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1174 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1175 else
1198 screen.cur.row += dirn; 1176 screen.cur.row += dirn;
1199 1177
1200 MAX_IT (screen.cur.row, 0); 1178 clamp_it (screen.cur.row, 0, nrow - 1);
1201 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1202 selection_check (0); 1179 selection_check (0);
1203} 1180}
1204 1181
1205/* ------------------------------------------------------------------------- */ 1182/* ------------------------------------------------------------------------- */
1206/* 1183/*
… …
1210 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1187 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1211 */ 1188 */
1212void 1189void
1213rxvt_term::scr_erase_line (int mode) 1190rxvt_term::scr_erase_line (int mode)
1214{ 1191{
1215 unsigned int row, col, num; 1192 unsigned int col, num;
1216 1193
1217 want_refresh = 1; 1194 want_refresh = 1;
1218 ZERO_SCROLLBACK (); 1195 ZERO_SCROLLBACK ();
1219 1196
1220 selection_check (1); 1197 selection_check (1);
1221 1198
1222 row = screen.cur.row; 1199 line_t &line = ROW(screen.cur.row);
1223 1200
1224 switch (mode) 1201 switch (mode)
1225 { 1202 {
1226 case 0: /* erase to end of line */ 1203 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1204 col = screen.cur.col;
1228 num = ncol - col; 1205 num = ncol - col;
1229 MIN_IT (ROW(row).l, (int16_t)col); 1206 min_it (line.l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1207 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1208 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1209 CLEAR_SELECTION ();
1233 break; 1210 break;
1234 case 1: /* erase to beginning of line */ 1211 case 1: /* erase to beginning of line */
… …
1239 CLEAR_SELECTION (); 1216 CLEAR_SELECTION ();
1240 break; 1217 break;
1241 case 2: /* erase whole line */ 1218 case 2: /* erase whole line */
1242 col = 0; 1219 col = 0;
1243 num = ncol; 1220 num = ncol;
1244 ROW(row).l = 0; 1221 line.l = 0;
1245 if (selection.beg.row <= screen.cur.row 1222 if (selection.beg.row <= screen.cur.row
1246 && selection.end.row >= screen.cur.row) 1223 && selection.end.row >= screen.cur.row)
1247 CLEAR_SELECTION (); 1224 CLEAR_SELECTION ();
1248 break; 1225 break;
1249 default: 1226 default:
1250 return; 1227 return;
1251 } 1228 }
1252 1229
1253 scr_blank_line (ROW(row), col, num, rstyle); 1230 scr_blank_line (line, col, num, rstyle);
1254} 1231}
1255 1232
1256/* ------------------------------------------------------------------------- */ 1233/* ------------------------------------------------------------------------- */
1257/* 1234/*
1258 * Erase part of whole of the screen 1235 * Erase part of whole of the screen
… …
1301 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1302 1279
1303 if (row >= nrow) /* Out Of Bounds */ 1280 if (row >= nrow) /* Out Of Bounds */
1304 return; 1281 return;
1305 1282
1306 MIN_IT (num, (nrow - row)); 1283 min_it (num, nrow - row);
1307 1284
1308 if (rstyle & (RS_RVid | RS_Uline)) 1285 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1286 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1287 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1288 {
… …
1313 CLEAR_ROWS (row, num); 1290 CLEAR_ROWS (row, num);
1314 } 1291 }
1315 else 1292 else
1316 { 1293 {
1317 ren = rstyle & (RS_fgMask | RS_bgMask); 1294 ren = rstyle & (RS_fgMask | RS_bgMask);
1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1319 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1296 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1320 ERASE_ROWS (row, num); 1297 ERASE_ROWS (row, num);
1321 gcvalue.foreground = pix_colors[Color_fg]; 1298 gcvalue.foreground = pix_colors[Color_fg];
1322 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1299 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1323 } 1300 }
1324 1301
1325 for (; num--; row++) 1302 for (; num--; row++)
1326 { 1303 {
1304 ROW (row).l = 0;
1327 scr_blank_screen_mem (ROW (row), rstyle); 1305 scr_blank_screen_mem (ROW (row), rstyle);
1328 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1306 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1307 }
1331} 1308}
1332 1309
1333#if ENABLE_FRILLS 1310#if ENABLE_FRILLS
1334void 1311void
… …
1419 return; 1396 return;
1420 1397
1421 scr_do_wrap (); 1398 scr_do_wrap ();
1422 1399
1423 selection_check (1); 1400 selection_check (1);
1424 MIN_IT (count, (ncol - screen.cur.col)); 1401 min_it (count, ncol - screen.cur.col);
1425 1402
1426 row = screen.cur.row; 1403 row = screen.cur.row;
1427 1404
1428 line_t *line = &ROW(row); 1405 line_t *line = &ROW(row);
1429 1406
… …
1437 } 1414 }
1438 1415
1439 if (!line->is_longer ()) 1416 if (!line->is_longer ())
1440 { 1417 {
1441 line->l += count; 1418 line->l += count;
1442 MIN_IT (line->l, ncol); 1419 min_it (line->l, ncol);
1443 } 1420 }
1444 1421
1445 if (selection.op && current_screen == selection.screen 1422 if (selection.op && current_screen == selection.screen
1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1447 { 1424 {
… …
1508 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1509 */ 1486 */
1510void 1487void
1511rxvt_term::scr_scroll_region (int top, int bot) 1488rxvt_term::scr_scroll_region (int top, int bot)
1512{ 1489{
1513 MAX_IT (top, 0); 1490 max_it (top, 0);
1514 MIN_IT (bot, (int)nrow - 1); 1491 min_it (bot, nrow - 1);
1515 1492
1516 if (top > bot) 1493 if (top > bot)
1517 return; 1494 return;
1518 1495
1519 screen.tscroll = top; 1496 screen.tscroll = top;
… …
1622 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1600#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1601 if (bgPixmap.pixmap == None)
1625#endif 1602#endif
1626#if TRANSPARENT 1603#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1628#endif 1605#endif
1629 XSetWindowBackground (display->display, vt, 1606 XSetWindowBackground (display->display, vt,
1630 pix_colors[Color_bg]); 1607 pix_colors[Color_bg]);
1631 1608
1632 gcvalue.foreground = pix_colors[Color_fg]; 1609 gcvalue.foreground = pix_colors[Color_fg];
… …
1723 bool found = false; 1700 bool found = false;
1724 1701
1725 for (int i = 0; i < nrow; i++) 1702 for (int i = 0; i < nrow; i++)
1726 { 1703 {
1727 int col = 0; 1704 int col = 0;
1728 rend_t *drp = drawn[i].r; 1705 rend_t *drp = drawn_buf[i].r;
1729 1706
1730 for (; col < ncol; col++, drp++) 1707 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1708 if ((*drp & mask) == value)
1732 { 1709 {
1733 found = true; 1710 found = true;
… …
1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1728rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1752{ 1729{
1753 int i; 1730 int i;
1754 row_col_t rc[RC_COUNT]; 1731 row_col_t rc[RC_COUNT];
1755 1732
1756 if (!drawn) /* sanity check */ 1733 if (!drawn_buf) /* sanity check */
1757 return; 1734 return;
1758 1735
1759#ifndef NO_SLOW_LINK_SUPPORT 1736#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1737 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1738 {
1762 y = 0; 1739 y = 0;
1763 eheight = height; 1740 eheight = height;
1764 } 1741 }
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 1742#endif
1773 1743
1774 /* round down */ 1744 /* round down */
1775 rc[PART_BEG].col = Pixel2Col (x); 1745 rc[PART_BEG].col = Pixel2Col (x);
1776 rc[PART_BEG].row = Pixel2Row (y); 1746 rc[PART_BEG].row = Pixel2Row (y);
… …
1779 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1749 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1780 1750
1781 /* sanity checks */ 1751 /* sanity checks */
1782 for (i = PART_BEG; i < RC_COUNT; i++) 1752 for (i = PART_BEG; i < RC_COUNT; i++)
1783 { 1753 {
1784 MIN_IT (rc[i].col, ncol - 1); 1754 min_it (rc[i].col, ncol - 1);
1785 MIN_IT (rc[i].row, nrow - 1); 1755 min_it (rc[i].row, nrow - 1);
1786 } 1756 }
1787 1757
1788 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1758 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); 1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1790 1760
1791 if (refresh) 1761 if (refresh)
1792 scr_refresh (SLOW_REFRESH); 1762 scr_refresh (SLOW_REFRESH);
1793} 1763}
1794 1764
… …
1855} 1825}
1856 1826
1857int 1827int
1858rxvt_term::scr_changeview (unsigned int oldviewstart) 1828rxvt_term::scr_changeview (unsigned int oldviewstart)
1859{ 1829{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1860 if (view_start != oldviewstart) 1832 if (view_start != oldviewstart)
1861 { 1833 {
1862 want_refresh = 1; 1834 want_refresh = 1;
1863 num_scr -= (view_start - oldviewstart); 1835 num_scr -= (view_start - oldviewstart);
1864 } 1836 }
… …
1872{ 1844{
1873#ifndef NO_BELL 1845#ifndef NO_BELL
1874 1846
1875# ifndef NO_MAPALERT 1847# ifndef NO_MAPALERT
1876# ifdef MAPALERT_OPTION 1848# ifdef MAPALERT_OPTION
1877 if (options & Opt_mapAlert) 1849 if (OPTION (Opt_mapAlert))
1878# endif 1850# endif
1879 XMapWindow (display->display, parent[0]); 1851 XMapWindow (display->display, parent[0]);
1880# endif 1852# endif
1881 1853
1882 if (options & Opt_visualBell) 1854 if (OPTION (Opt_visualBell))
1883 { 1855 {
1884 scr_rvideo_mode (!rvideo); /* refresh also done */ 1856 scr_rvideo_mode (!rvideo); /* refresh also done */
1885 rxvt_usleep (VISUAL_BELL_DURATION); 1857 rxvt_usleep (VISUAL_BELL_DURATION);
1886 scr_rvideo_mode (!rvideo); /* refresh also done */ 1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1887 } 1859 }
… …
1978 1950
1979#if XPM_BACKGROUND 1951#if XPM_BACKGROUND
1980 must_clear |= bgPixmap.pixmap != None; 1952 must_clear |= bgPixmap.pixmap != None;
1981#endif 1953#endif
1982#if TRANSPARENT 1954#if TRANSPARENT
1983 must_clear |= (options & Opt_transparent) && am_transparent; 1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
1984#endif 1956#endif
1985 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1986 1958
1987 /* 1959 /*
1988 * B: reverse any characters which are selected 1960 * B: reverse any characters which are selected
… …
2012 1984
2013 crp = &ROW(screen.cur.row).r[col]; 1985 crp = &ROW(screen.cur.row).r[col];
2014 1986
2015 if (showcursor && focus) 1987 if (showcursor && focus)
2016 { 1988 {
2017 if (options & Opt_cursorUnderline) 1989 if (OPTION (Opt_cursorUnderline))
2018 *crp ^= RS_Uline; 1990 *crp ^= RS_Uline;
2019 else 1991 else
2020 { 1992 {
2021 *crp ^= RS_RVid; 1993 *crp ^= RS_RVid;
2022 1994
… …
2024 cc1 = *crp & (RS_fgMask | RS_bgMask); 1996 cc1 = *crp & (RS_fgMask | RS_bgMask);
2025 if (ISSET_PIXCOLOR (Color_cursor)) 1997 if (ISSET_PIXCOLOR (Color_cursor))
2026 ccol1 = Color_cursor; 1998 ccol1 = Color_cursor;
2027 else 1999 else
2028#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2029 ccol1 = GET_FGCOLOR (rstyle); 2001 ccol1 = fgcolor_of (rstyle);
2030#else 2002#else
2031 ccol1 = Color_fg; 2003 ccol1 = Color_fg;
2032#endif 2004#endif
2033 if (ISSET_PIXCOLOR (Color_cursor2)) 2005 if (ISSET_PIXCOLOR (Color_cursor2))
2034 ccol2 = Color_cursor2; 2006 ccol2 = Color_cursor2;
2035 else 2007 else
2036#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2037 ccol2 = GET_BGCOLOR (rstyle); 2009 ccol2 = bgcolor_of (rstyle);
2038#else 2010#else
2039 ccol2 = Color_bg; 2011 ccol2 = Color_bg;
2040#endif 2012#endif
2041 *crp = SET_FGCOLOR (*crp, ccol1); 2013 *crp = SET_FGCOLOR (*crp, ccol1);
2042 *crp = SET_BGCOLOR (*crp, ccol2); 2014 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2052 if (screen.cur.row + view_start != ocrow 2024 if (screen.cur.row + view_start != ocrow
2053 || screen.cur.col != oldcursor.col) 2025 || screen.cur.col != oldcursor.col)
2054 { 2026 {
2055 if (ocrow < nrow 2027 if (ocrow < nrow
2056 && oldcursor.col < ncol) 2028 && oldcursor.col < ncol)
2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2058 2030
2059 if (focus || !showcursor) 2031 if (focus || !showcursor)
2060 oldcursor.row = -1; 2032 oldcursor.row = -1;
2061 else 2033 else
2062 setoldcursor = 1; 2034 setoldcursor = 1;
… …
2075 oldcursor.col = screen.cur.col; 2047 oldcursor.col = screen.cur.col;
2076 } 2048 }
2077 } 2049 }
2078 } 2050 }
2079 2051
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2080#if ENABLE_OVERLAY 2053#if ENABLE_OVERLAY
2081 scr_swap_overlay (); 2054 scr_swap_overlay ();
2082#endif 2055#endif
2083 2056
2084#ifndef NO_SLOW_LINK_SUPPORT 2057#ifndef NO_SLOW_LINK_SUPPORT
… …
2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2102 { 2075 {
2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2104 { 2077 {
2105 line_t s = ROW(row - view_start); 2078 line_t s = ROW(row - view_start);
2106 line_t d = drawn[row]; 2079 line_t d = drawn_buf[row];
2107 line_t d2 = drawn[row + i]; 2080 line_t d2 = drawn_buf[row + i];
2108 2081
2109 for (nits = 0, col = ncol; col--; ) 2082 for (nits = 0, col = ncol; col--; )
2110 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2111 nits--; 2084 nits--;
2112 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2085 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2150 */ 2123 */
2151 for (row = 0; row < nrow; row++) 2124 for (row = 0; row < nrow; row++)
2152 { 2125 {
2153 text_t *stp = ROW(row - view_start).t; 2126 text_t *stp = ROW(row - view_start).t;
2154 rend_t *srp = ROW(row - view_start).r; 2127 rend_t *srp = ROW(row - view_start).r;
2155 text_t *dtp = drawn[row].t; 2128 text_t *dtp = drawn_buf[row].t;
2156 rend_t *drp = drawn[row].r; 2129 rend_t *drp = drawn_buf[row].r;
2157 2130
2158 /* 2131 /*
2159 * E2: OK, now the real pass 2132 * E2: OK, now the real pass
2160 */ 2133 */
2161 int ypixel = (int)Row2Pixel (row); 2134 int ypixel = (int)Row2Pixel (row);
… …
2223 count++, i--; 2196 count++, i--;
2224 2197
2225 /* 2198 /*
2226 * Determine the attributes for the string 2199 * Determine the attributes for the string
2227 */ 2200 */
2228 int fore = GET_FGCOLOR (rend); // desired foreground 2201 int fore = fgcolor_of (rend); // desired foreground
2229 int back = GET_BGCOLOR (rend); // desired background 2202 int back = bgcolor_of (rend); // desired background
2230 2203
2231 // only do special processing if any attributes are set, which is rare 2204 // 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)) 2205 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2233 { 2206 {
2234#if ENABLE_STYLES 2207#if ENABLE_STYLES
2235 // force redraw after "careful" characters to avoid pixel droppings 2208 // force redraw after "careful" characters to avoid pixel droppings
2236 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2347 } /* for (row....) */ 2320 } /* for (row....) */
2348 2321
2349#if ENABLE_OVERLAY 2322#if ENABLE_OVERLAY
2350 scr_swap_overlay (); 2323 scr_swap_overlay ();
2351#endif 2324#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2352 2326
2353 /* 2327 /*
2354 * G: cleanup cursor and display outline cursor if necessary 2328 * G: cleanup cursor and display outline cursor if necessary
2355 */ 2329 */
2356 if (showcursor) 2330 if (showcursor)
2357 { 2331 {
2358 if (focus) 2332 if (focus)
2359 { 2333 {
2360 if (options & Opt_cursorUnderline) 2334 if (OPTION (Opt_cursorUnderline))
2361 *crp ^= RS_Uline; 2335 *crp ^= RS_Uline;
2362 else 2336 else
2363 { 2337 {
2364 *crp ^= RS_RVid; 2338 *crp ^= RS_RVid;
2365#ifndef NO_CURSORCOLOR 2339#ifndef NO_CURSORCOLOR
… …
2374 2348
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2349 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--; 2350 col--;
2377 2351
2378 while (col + cursorwidth < ncol 2352 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2353 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++; 2354 cursorwidth++;
2381 2355
2382#ifndef NO_CURSORCOLOR 2356#ifndef NO_CURSORCOLOR
2383 if (ISSET_PIXCOLOR (Color_cursor)) 2357 if (ISSET_PIXCOLOR (Color_cursor))
2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2358 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2416 2390
2417void 2391void
2418rxvt_term::scr_remap_chars () 2392rxvt_term::scr_remap_chars ()
2419{ 2393{
2420 for (int i = total_rows; i--; ) 2394 for (int i = total_rows; i--; )
2421 scr_remap_chars (save[i]); 2395 scr_remap_chars (row_buf [i]);
2422 2396
2423 for (int i = nrow; i--; ) 2397 for (int i = nrow; i--; )
2424 { 2398 {
2425 scr_remap_chars (drawn[i]); 2399 scr_remap_chars (drawn_buf [i]);
2426 scr_remap_chars (swap_save[i]); 2400 scr_remap_chars (swap_buf [i]);
2427 } 2401 }
2428} 2402}
2429 2403
2430void 2404void
2431rxvt_term::scr_recolour () 2405rxvt_term::scr_recolour ()
… …
2484 2458
2485#if ENABLE_FRILLS 2459#if ENABLE_FRILLS
2486 if (selection.rect) 2460 if (selection.rect)
2487 { 2461 {
2488 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2463 {
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2489 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2467 for (col = selection.beg.col; col < selection.end.col; col++)
2490 srp[col] ^= RS_RVid; 2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2491 } 2476 }
2492 else 2477 else
2493#endif 2478#endif
2494 { 2479 {
2495 if (selection.beg.row >= -view_start) 2480 if (selection.beg.row >= -view_start)
… …
2498 row = selection.beg.row; 2483 row = selection.beg.row;
2499 } 2484 }
2500 else 2485 else
2501 { 2486 {
2502 col = 0; 2487 col = 0;
2503 row = view_start; 2488 row = -view_start;
2504 } 2489 }
2505 2490
2506 for (; row < min (selection.end.row, view_end); row++, col = 0) 2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2507 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2508 srp[col] ^= RS_RVid; 2493 srp[col] ^= RS_RVid;
… …
2528 char r1[] = "\n"; 2513 char r1[] = "\n";
2529 2514
2530 for (row = saveLines - nsaved; 2515 for (row = saveLines - nsaved;
2531 row < saveLines + nrow - 1; row++) 2516 row < saveLines + nrow - 1; row++)
2532 { 2517 {
2533 width = save[row].l >= 0 ? save[row].l 2518 width = row_buf[row].l >= 0 ? row_buf[row].l
2534 : ncol; 2519 : ncol;
2535 for (towrite = width; towrite; towrite -= wrote) 2520 for (towrite = width; towrite; towrite -= wrote)
2536 { 2521 {
2537 wrote = write (fd, & (save[row].t[width - towrite]), 2522 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2538 towrite); 2523 towrite);
2539 if (wrote < 0) 2524 if (wrote < 0)
2540 return; /* XXX: death, no report */ 2525 return; /* XXX: death, no report */
2541 } 2526 }
2542 if (save[row].l >= 0) 2527 if (row_buf[row].l >= 0)
2543 if (write (fd, r1, 1) <= 0) 2528 if (write (fd, r1, 1) <= 0)
2544 return; /* XXX: death, no report */ 2529 return; /* XXX: death, no report */
2545 } 2530 }
2546} 2531}
2547#endif 2532#endif
… …
2897 selection.op = SELECTION_DONE; 2882 selection.op = SELECTION_DONE;
2898 2883
2899 if (selection.clicks == 4) 2884 if (selection.clicks == 4)
2900 return; /* nothing selected, go away */ 2885 return; /* nothing selected, go away */
2901 2886
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return;
2889
2902 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2903 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2904 2892
2905 int ofs = 0; 2893 int ofs = 0;
2906 int extra = 0; 2894 int extra = 0;
… …
2922#endif 2910#endif
2923 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2924 2912
2925 col = max (col, 0); 2913 col = max (col, 0);
2926 2914
2927 if (row == selection.end.row || selection.rect) 2915 if (row == selection.end.row
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
2919 )
2928 end_col = min (end_col, selection.end.col); 2920 min_it (end_col, selection.end.col);
2929 2921
2930 t = ROW(row).t + col; 2922 t = ROW(row).t + col;
2931 for (; col < end_col; col++) 2923 for (; col < end_col; col++)
2932 { 2924 {
2933 if (*t == NOCHAR) 2925 if (*t == NOCHAR)
… …
2951#endif 2943#endif
2952 else 2944 else
2953 new_selection_text[ofs++] = *t++; 2945 new_selection_text[ofs++] = *t++;
2954 } 2946 }
2955 2947
2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1]))
2954 --ofs;
2955
2956 new_selection_text[ofs++] = C0_LF;
2957 }
2958 else
2959#endif
2956 if (!ROW(row).is_longer () && row != selection.end.row) 2960 if (!ROW(row).is_longer () && row != selection.end.row)
2957 new_selection_text[ofs++] = C0_LF; 2961 new_selection_text[ofs++] = C0_LF;
2958 } 2962 }
2959 2963
2960 if (end_col != selection.end.col) 2964 if (end_col != selection.end.col)
2961 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
2962 2966
… …
2972 2976
2973 // we usually allocate much more than necessary, so realloc it smaller again 2977 // we usually allocate much more than necessary, so realloc it smaller again
2974 selection.len = ofs; 2978 selection.len = ofs;
2975 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2976 2980
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return;
2983
2984 selection_grab (tm);
2985}
2986
2987bool
2988rxvt_term::selection_grab (Time tm)
2989{
2990 selection_time = tm;
2991
2977 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2978 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 {
2979 display->set_selection_owner (this); 2995 display->set_selection_owner (this);
2996 return true;
2997 }
2980 else 2998 else
2981 rxvt_warn ("can't get primary selection, ignoring.\n"); 2999 return false;
2982 3000
2983#if 0 3001#if 0
2984 XTextProperty ct; 3002 XTextProperty ct;
2985 3003
2986 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2987 { 3005 {
2988 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2989 XFree (ct.value); 3007 XFree (ct.value);
2990 } 3008 }
2991#endif 3009#endif
2992
2993 selection_time = tm;
2994} 3010}
2995 3011
2996/* ------------------------------------------------------------------------- */ 3012/* ------------------------------------------------------------------------- */
2997/* 3013/*
2998 * Mark or select text based upon number of clicks: 1, 2, or 3 3014 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
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 ())
… …
3572 */ 3590 */
3573void 3591void
3574rxvt_term::pixel_position (int *x, int *y) 3592rxvt_term::pixel_position (int *x, int *y)
3575{ 3593{
3576 *x = Pixel2Col (*x); 3594 *x = Pixel2Col (*x);
3577 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3578 *y = Pixel2Row (*y); 3596 *y = Pixel2Row (*y);
3579 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3580} 3598}
3581 3599
3582/* ------------------------------------------------------------------------- */ 3600/* ------------------------------------------------------------------------- */
3583#ifdef USE_XIM 3601#ifdef USE_XIM
3584void 3602void
… …
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 ();
3606 3624
3607 if (x < 0) x = ncol - w; 3625 if (x < 0) x = ncol - w;
3608 if (y < 0) y = nrow - h; 3626 if (y < 0) y = nrow - h;
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