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.173 by root, Mon Dec 19 02:16:24 2005 UTC vs.
Revision 1.193 by root, Thu Dec 22 19:39:29 2005 UTC

… …
116 116
117/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
118void 118void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs)
120{ 120{
121 if (!l.t)
122 {
123 lalloc (l);
124 col = 0;
125 width = ncol;
126 }
127
121 efs &= ~RS_baseattrMask; 128 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 130
124 text_t *et = l.t + col; 131 text_t *et = l.t + col;
125 rend_t *er = l.r + col; 132 rend_t *er = l.r + col;
… …
134/* ------------------------------------------------------------------------- */ 141/* ------------------------------------------------------------------------- */
135/* Fill a full line with blanks - make sure it is allocated first */ 142/* Fill a full line with blanks - make sure it is allocated first */
136void 143void
137rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
138{ 145{
139 if (!l.t)
140 lalloc (l);
141
142 scr_blank_line (l, 0, ncol, efs); 146 scr_blank_line (l, 0, ncol, efs);
143} 147}
144 148
145/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
146 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
147 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
152
148void 153void
149rxvt_term::scr_reset () 154rxvt_term::scr_reset ()
150{ 155{
151 unsigned int p, q;
152 int k;
153
154#if ENABLE_OVERLAY 156#if ENABLE_OVERLAY
155 scr_overlay_off (); 157 scr_overlay_off ();
156#endif 158#endif
157 159
158 view_start = 0; 160 view_start = 0;
… …
168 return; 170 return;
169 171
170 // we need at least two lines for wrapping to work correctly 172 // we need at least two lines for wrapping to work correctly
171 if (nrow + saveLines < 2) 173 if (nrow + saveLines < 2)
172 { 174 {
175 //TODO//FIXME
173 saveLines++; 176 saveLines++;
174 prev_nrow--; 177 prev_nrow--;
175 nscrolled++; 178 nsaved++;
176 } 179 }
177 180
178 want_refresh = 1; 181 want_refresh = 1;
179 182
180 int prev_total_rows = prev_nrow + saveLines; 183 int prev_total_rows = prev_nrow + saveLines;
181 int total_rows = nrow + saveLines; 184 total_rows = nrow + saveLines;
182 185
183 screen.tscroll = 0; 186 screen.tscroll = 0;
184 screen.bscroll = nrow - 1; 187 screen.bscroll = nrow - 1;
185 188
186 if (!save) 189 if (!row_buf)
187 { 190 {
188 /* 191 /*
189 * first time called so just malloc everything: don't rely on realloc 192 * first time called so just malloc everything: don't rely on realloc
190 * Note: this is still needed so that all the scrollback lines are NULL 193 * Note: this is still needed so that all the scrollback lines are NULL
191 */ 194 */
192 nscrolled = 0; /* no saved lines */ 195 nsaved = 0; /* no saved lines */
193 term_start = 0; 196 term_start = 0;
194 nsaved = 0;
195 197
196 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 198 talloc = new rxvt_salloc (ncol * sizeof (text_t));
197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
198 200
199 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
200 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
201 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
202 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
203 205
204 screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *));
205
206 scr_update_term ();
207
208 for (p = nrow; p--; ) 206 for (int row = nrow; row--; )
209 { 207 {
210 scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); 208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 210 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 } 211 }
214 212
215 memset (charsets, 'B', sizeof (charsets)); 213 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 214 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 215 screen.flags = Screen_DefaultFlags;
… …
241 { 239 {
242 /* 240 /*
243 * add or delete rows as appropriate 241 * add or delete rows as appropriate
244 */ 242 */
245 243
246 rxvt_salloc *old_ta; 244 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra; 245 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 246
247#if 0
249 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
250 { 249 {
251 /* delete rows */
252 k = min (nscrolled, prev_nrow - nrow);
253 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
254 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
255
256 for (p = nrow; p < prev_nrow; p++) 250 for (int row = nrow; row < prev_nrow; row++)
257 { 251 {
258 lfree (save[p + saveLines]);
259 lfree (swap_save[p]); 252 lfree (swap_buf [row]);
260 lfree (drawn[p]); 253 lfree (drawn_buf[row]);
261 } 254 }
255 }
256#endif
262 257
263 /* we have fewer rows so fix up cursor position */ 258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
264 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
265 261
266 scr_reset_realloc (); /* realloc _last_ */ 262 for (int row = min (nrow, prev_nrow); row--; )
263 {
264 lresize (drawn_buf[row]);
265 lresize (swap_buf [row]);
266 }
267
268 for (int row = prev_nrow; row < nrow; row++)
269 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
267 } 275
268 else if (nrow > prev_nrow) 276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows);
278 int q = total_rows; // rewrapped row
279
280 if (nsaved)
281 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm.
284
285 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287
269 { 288 do
270 /* add rows */
271 scr_reset_realloc (); /* realloc _first_ */
272
273 int ocol = ncol;
274 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
275
276 k = min (nscrolled, nrow - prev_nrow);
277
278 for (p = prev_total_rows; p < total_rows; p++)
279 save[p].clear ();
280
281 for (p = prev_total_rows; p < total_rows - k; p++)
282 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
283
284 scr_update_term ();
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 289 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 290 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k, 1);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nscrolled -= k;
298 }
299
300#ifdef DEBUG_STRICT 291#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 292 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 293#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307 294
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 297
353 assert (llen >= 0); 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 299 {
300 p = MOD (p - 1, prev_total_rows);
301
357 --p; 302 plines++;
358 llen += prev_ncol; 303 llen += prev_ncol;
359 } 304 }
360 305
361 int qlines = llen / ncol + 1; 306 int qlines = max (0, (llen - 1) / ncol) + 1;
307
308 // drop partial lines completely
309 if (q < qlines)
310 break;
311
312 q -= qlines;
313
362 int lofs = 0; 314 int lofs = 0;
315 line_t *qline;
363 316
364 q -= qlines; 317 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 318 for (int qrow = q; qlines--; qrow++)
370 { 319 {
320 qline = row_buf + qrow;
321 lalloc (*qline);
322 qline->set_is_longer ();
323
371 if (qrow >= 0) 324 int qcol = 0;
325
326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
372 { 328 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = -1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 329 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 330 int pcol = lofs % prev_ncol;
383 331
332 prow = MOD (p + prow, prev_total_rows);
333
334 // we only adjust the cursor _row_ and put it into
335 // the topmost line of "long line" it was in, as
336 // this seems to upset applications/shells/readline
337 // least.
338 if (prow == ocur.row)
339 screen.cur.row = q - (total_rows - nrow);
340
341 line_t &pline = old_buf [prow];
342
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 344
386 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);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000); 345 assert (len);
346 assert (pline.t);
400 347
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 350
404 lofs += len; 351 lofs += len;
405 qcol += len; 352 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 353 }
411 else
412 lofs += ncol;
413 } 354 }
355
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 358 }
359 while (p != pend && q > 0);
360
361 term_start = total_rows - nrow;
362 nsaved = term_start - q;
363
364 // make sure all terminal lines exist
365 while (nsaved < 0)
366 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
367
368 }
369 else
415 } 370 {
371 // if no scrollback exists (yet), wing, instead of wrap
372
373 for (int row = min (nrow, prev_nrow); row--; )
374 {
375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
376 line_t &qline = row_buf [row];
416 377
417 free (screen.text); screen.text = tp; 378 qline = pline;
418 free (screen.rend); screen.rend = rp; 379 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 380 }
420 381
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 382 for (int row = prev_nrow; row < nrow; row++)
383 {
384 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
385 }
386
387 term_start = 0;
388 }
389
390#ifdef DEBUG_STRICT //TODO: remove
391 for (int i = -nsaved; i < nrow; i++)
392 assert (ROW (i).t);
422#endif 393#endif
394
395 free (old_buf);
396 delete old_ta;
397 delete old_ra;
398
399 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1);
423 401
424 if (tabs) 402 if (tabs)
425 free (tabs); 403 free (tabs);
426 } 404 }
427 405
428 prev_nrow = nrow; 406 prev_nrow = nrow;
429 prev_ncol = ncol; 407 prev_ncol = ncol;
430 408
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 409 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 410
433 for (p = 0; p < ncol; p++) 411 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 412 tabs [col] = col % TABSIZE == 0;
435 413
436 tt_winch (); 414 tt_winch ();
437} 415}
438 416
439void
440rxvt_term::scr_reset_realloc ()
441{
442 unsigned int total_rows = nrow + saveLines;
443
444 screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *));
445 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
446 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
447 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
448 buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t));
449}
450
451/* ------------------------------------------------------------------------- */ 417/* ------------------------------------------------------------------------- */
452/* 418/*
453 * Free everything. That way malloc debugging can find leakage. 419 * Free everything. That way malloc debugging can find leakage.
454 */ 420 */
455void 421void
456rxvt_term::scr_release () 422rxvt_term::scr_release ()
457{ 423{
458 unsigned int total_rows;
459
460 total_rows = nrow + saveLines;
461
462 delete talloc; talloc = 0; 424 delete talloc; talloc = 0;
463 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
464 426
465 free (screen.line); 427 free (row_buf);
466 free (save);
467 free (swap_save); 428 free (swap_buf);
468 free (drawn); 429 free (drawn_buf);
469 free (buf); 430 free (temp_buf);
470 free (tabs); 431 free (tabs);
432
433 row_buf = 0; // signal that we freed all the arrays
471} 434}
472 435
473/* ------------------------------------------------------------------------- */ 436/* ------------------------------------------------------------------------- */
474/* 437/*
475 * Hard reset 438 * Hard reset
… …
526 set_font_style (); 489 set_font_style ();
527 break; 490 break;
528 } 491 }
529 492
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 493 /* boundary check in case screen size changed between SAVE and RESTORE */
531 MIN_IT (s->cur.row, nrow - 1); 494 min_it (s->cur.row, nrow - 1);
532 MIN_IT (s->cur.col, ncol - 1); 495 min_it (s->cur.col, ncol - 1);
533#ifdef DEBUG_STRICT 496#ifdef DEBUG_STRICT
534 assert (s->cur.row >= 0); 497 assert (s->cur.row >= 0);
535 assert (s->cur.col >= 0); 498 assert (s->cur.col >= 0);
536#else /* drive with your eyes closed */
537 MAX_IT (s->cur.row, 0);
538 MAX_IT (s->cur.col, 0);
539#endif 499#endif
540} 500}
541 501
542/* ------------------------------------------------------------------------- */ 502/* ------------------------------------------------------------------------- */
543/* 503/*
… …
546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 506 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
547 */ 507 */
548int 508int
549rxvt_term::scr_change_screen (int scrn) 509rxvt_term::scr_change_screen (int scrn)
550{ 510{
551 int i;
552#if NSCREENS
553 int offset;
554#endif
555
556 want_refresh = 1; 511 want_refresh = 1;
557
558 view_start = 0; 512 view_start = 0;
559 513
560 if (current_screen == scrn) 514 if (current_screen == scrn)
561 return scrn; 515 return scrn;
562 516
563 selection_check (2); /* check for boundary cross */ 517 selection_check (2); /* check for boundary cross */
564 518
565 i = current_screen; current_screen = scrn; scrn = i; 519 int i = current_screen; current_screen = scrn; scrn = i;
566 520
567 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 521 ::swap (screen.cur.row, swap.cur.row);
568 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 522 ::swap (screen.cur.col, swap.cur.col);
569 MAX_IT (screen.cur.row, 0); 523
570 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
571 MAX_IT (screen.cur.col, 0); 525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
572 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
573 526
574#if NSCREENS 527#if NSCREENS
575 if (options & Opt_secondaryScreen) 528 if (options & Opt_secondaryScreen)
576 { 529 {
577 num_scr = 0; 530 num_scr = 0;
578 offset = saveLines;
579 531
580 for (i = prev_nrow; i--;) 532 for (int i = prev_nrow; i--; )
581 SWAP_IT (*(screen.line[i]), swap_save[i], line_t); 533 ::swap (ROW(i), swap_buf [i]);
582 534
583 SWAP_IT (screen.charset, swap.charset, int16_t); 535 ::swap (screen.charset, swap.charset);
584 SWAP_IT (screen.flags, swap.flags, int); 536 ::swap (screen.flags, swap.flags);
585 screen.flags |= Screen_VisibleCursor; 537 screen.flags |= Screen_VisibleCursor;
586 swap.flags |= Screen_VisibleCursor; 538 swap.flags |= Screen_VisibleCursor;
587 } 539 }
588 else 540 else
589#endif 541#endif
590 if (options & Opt_secondaryScroll) 542 if (options & Opt_secondaryScroll)
591 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); 543 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
592 544
593 return scrn; 545 return scrn;
594} 546}
595 547
596// clear WrapNext indicator, solidifying position on next line 548// clear WrapNext indicator, solidifying position on next line
… …
603 screen.flags &= ~Screen_WrapNext; 555 screen.flags &= ~Screen_WrapNext;
604 556
605 screen.cur.col = 0; 557 screen.cur.col = 0;
606 558
607 if (screen.cur.row == screen.bscroll) 559 if (screen.cur.row == screen.bscroll)
608 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 560 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
609 else if (screen.cur.row < nrow - 1) 561 else if (screen.cur.row < nrow - 1)
610 screen.cur.row++; 562 screen.cur.row++;
611} 563}
612 564
613/* ------------------------------------------------------------------------- */ 565/* ------------------------------------------------------------------------- */
… …
639 rstyle = DEFAULT_RSTYLE; 591 rstyle = DEFAULT_RSTYLE;
640 else 592 else
641 rstyle &= ~style; 593 rstyle &= ~style;
642 } 594 }
643 595
644// set screen.line pointers to the actual lines in the save buffer
645void
646rxvt_term::scr_update_term ()
647{
648 for (int i = nrow; i--; )
649 screen.line[i] = save + saveLines + i;
650}
651
652/* ------------------------------------------------------------------------- */ 596/* ------------------------------------------------------------------------- */
653/* 597/*
654 * Scroll text between <row1> and <row2> inclusive, by <count> lines 598 * Scroll text between <row1> and <row2> inclusive, by <count> lines
655 * count positive ==> scroll up 599 * count positive ==> scroll up
656 * count negative ==> scroll down 600 * count negative ==> scroll down
657 * spec == 0 for normal routines
658 */ 601 */
659int 602int
660rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 603rxvt_term::scr_scroll_text (int row1, int row2, int count)
661{ 604{
662 int i, j;
663
664 if (count == 0 || (row1 > row2)) 605 if (count == 0 || (row1 > row2))
665 return 0; 606 return 0;
666 607
667 want_refresh = 1; 608 want_refresh = 1;
609 num_scr += count;
668 610
669 if (row1 == 0 && count > 0 611 if (count > 0
612 && row1 == 0
613 && row2 == nrow - 1
670 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 614 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
671 { 615 {
672 nscrolled += count; 616 nsaved = min (nsaved + count, saveLines);
617 term_start = (term_start + count) % total_rows;
673 618
674 if (nscrolled > saveLines) 619 if (selection.op && current_screen == selection.screen)
675 nscrolled = saveLines; 620 {
621 selection.beg.row -= count;
622 selection.end.row -= count;
623 selection.mark.row -= count;
676 624
625 selection_check (0);
626 }
627
628 for (int i = count; i--; )
629 scr_blank_screen_mem (ROW(row2 - i), rstyle);
630
677 if ((options & Opt_scrollWithBuffer) 631 if ((options & Opt_scrollWithBuffer)
678 && view_start != 0 632 && view_start != 0
679 && view_start != saveLines) 633 && view_start != saveLines)
680 scr_page (UP, count); 634 scr_page (UP, count);
681 } 635 }
682 else if (!spec) 636 else
683 row1 += saveLines; 637 {
684
685 row2 += saveLines;
686
687 if (selection.op && current_screen == selection.screen) 638 if (selection.op && current_screen == selection.screen)
688 { 639 {
689 i = selection.beg.row + saveLines; 640 int i = selection.beg.row;
690 j = selection.end.row + saveLines; 641 int j = selection.end.row;
691 642
692 if ((i < row1 && j > row1) 643 if ((i < row1 && j > row1)
693 || (i < row2 && j > row2) 644 || (i < row2 && j > row2)
694 || (i - count < row1 && i >= row1) 645 || (i - count < row1 && i >= row1)
695 || (i - count > row2 && i <= row2) 646 || (i - count > row2 && i <= row2)
696 || (j - count < row1 && j >= row1) 647 || (j - count < row1 && j >= row1)
697 || (j - count > row2 && j <= row2)) 648 || (j - count > row2 && j <= row2))
698 { 649 {
699 CLEAR_ALL_SELECTION (); 650 CLEAR_ALL_SELECTION ();
700 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 651 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
701 } 652 }
702 else if (j >= row1 && j <= row2) 653 else if (j >= row1 && j <= row2)
703 { 654 {
704 /* move selected region too */ 655 /* move selected region too */
705 selection.beg.row -= count; 656 selection.beg.row -= count;
706 selection.end.row -= count; 657 selection.end.row -= count;
707 selection.mark.row -= count; 658 selection.mark.row -= count;
659
660 selection_check (0);
661 }
662 }
663
664 // use a simple and robust scrolling algorithm, this
665 // part of scr_scroll_text is not time-critical.
666
667 int rows = row2 - row1 + 1;
668
669 min_it (count, rows);
670
671 for (int row = 0; row < rows; row++)
708 } 672 {
709 } 673 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
710 674
711 selection_check (0); /* _after_ nscrolled update */ 675 if (!IN_RANGE_EXC (row + count, 0, rows))
676 scr_blank_screen_mem (temp_buf [row], rstyle);
677 }
712 678
713 num_scr += count; 679 for (int row = 0; row < rows; row++)
714 j = count; 680 ROW(row1 + row) = temp_buf [row];
715
716 if (count < 0)
717 count = -count;
718
719 i = row2 - row1 + 1;
720 MIN_IT (count, i);
721
722 if (j > 0)
723 { 681 }
724 /* scroll up */
725
726 /* Copy lines that will get clobbered by the rotation */
727 memcpy (buf, save + row1, count * sizeof (line_t));
728
729 /* Rotate lines */
730 i = row2 - row1 - count + 1;
731 memmove (save + row1, save + row1 + count, i * sizeof (line_t));
732
733 j = row2 - count + 1, i = count;
734 }
735 else /* if (j < 0) */
736 {
737 /* scroll down */
738
739 /* Copy lines that will get clobbered by the rotation */
740 for (i = 0, j = row2; i < count; i++, j--)
741 buf[i] = save[j];
742
743 /* Rotate lines */
744 for (j = row2, i = j - count; i >= row1; i--, j--)
745 save[j] = save[i];
746
747 j = row1, i = count;
748 count = -count;
749 }
750
751 /* Resurrect lines */
752 memcpy (save + j, buf, i * sizeof (line_t));
753
754 scr_update_term ();
755
756 if (!spec) /* line length may not equal ncol */
757 for (; i--; j++)
758 scr_blank_screen_mem (save[j], rstyle);
759 682
760 return count; 683 return count;
761} 684}
762 685
763/* ------------------------------------------------------------------------- */ 686/* ------------------------------------------------------------------------- */
… …
770 if (len <= 0) /* sanity */ 693 if (len <= 0) /* sanity */
771 return; 694 return;
772 695
773 unsigned char checksel; 696 unsigned char checksel;
774 unicode_t c; 697 unicode_t c;
775 int row, last_col; 698 int last_col;
776 const unicode_t *strend = str + len; 699 const unicode_t *strend = str + len;
777 700
778 want_refresh = 1; 701 want_refresh = 1;
779 ZERO_SCROLLBACK (); 702 ZERO_SCROLLBACK ();
780 last_col = ncol; 703 last_col = ncol;
781 704
782 if (nlines > 0) 705 if (nlines > 0)
783 { 706 {
784 nlines += screen.cur.row - screen.bscroll; 707 nlines += screen.cur.row - screen.bscroll;
785 if ((nlines > 0) 708 if (nlines > 0
786 && (screen.tscroll == 0) 709 && screen.tscroll == 0
787 && (screen.bscroll == (nrow - 1))) 710 && screen.bscroll == (nrow - 1))
788 { 711 {
789 /* _at least_ this many lines need to be scrolled */ 712 /* _at least_ this many lines need to be scrolled */
790 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 713 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
791 screen.cur.row -= nlines; 714 screen.cur.row -= nlines;
792 } 715 }
793 } 716 }
794 717
795#ifdef DEBUG_STRICT 718#ifdef DEBUG_STRICT
796 assert (screen.cur.col < last_col); 719 assert (screen.cur.col < last_col);
797 assert ((screen.cur.row < nrow) 720 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)nscrolled)); 721 && screen.cur.row >= -nsaved);
799#else /* drive with your eyes closed */
800 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)nscrolled);
803#endif 722#endif
804 row = screen.cur.row + saveLines; 723 int row = screen.cur.row;
805 724
806 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 725 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 726
808 line_t *line = save + row; 727 line_t *line = &ROW(row);
809 728
810 while (str < strend) 729 while (str < strend)
811 { 730 {
812 c = *str++; 731 c = *str++;
813 732
814 if (c < 0x20) 733 if (c < 0x20)
815 if (c == C0_LF) 734 if (c == C0_LF)
816 { 735 {
817 if (line->l != -1) /* XXX: think about this */ 736 if (!line->is_longer ()) /* XXX: think about this */
818 MAX_IT (line->l, screen.cur.col); 737 max_it (line->l, screen.cur.col);
819 738
820 screen.flags &= ~Screen_WrapNext; 739 screen.flags &= ~Screen_WrapNext;
821 740
822 if (screen.cur.row == screen.bscroll) 741 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 742 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
824 else if (screen.cur.row < (nrow - 1)) 743 else if (screen.cur.row < (nrow - 1))
825 row = (++screen.cur.row) + saveLines; 744 row = ++screen.cur.row;
826 745
827 line = save + row; /* _must_ refresh */ 746 line = &ROW(row); /* _must_ refresh */
828 continue; 747 continue;
829 } 748 }
830 else if (c == C0_CR) 749 else if (c == C0_CR)
831 { 750 {
832 if (line->l != -1) /* XXX: think about this */ 751 if (!line->is_longer ()) /* XXX: think about this */
833 MAX_IT (line->l, screen.cur.col); 752 max_it (line->l, screen.cur.col);
834 753
835 screen.flags &= ~Screen_WrapNext; 754 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 755 screen.cur.col = 0;
837 continue; 756 continue;
838 } 757 }
… …
855 CLEAR_SELECTION (); 774 CLEAR_SELECTION ();
856 } 775 }
857 776
858 if (screen.flags & Screen_WrapNext) 777 if (screen.flags & Screen_WrapNext)
859 { 778 {
860 line->l = -1; 779 line->set_is_longer ();
861 780
862 scr_do_wrap (); 781 scr_do_wrap ();
863 782
864 row = screen.cur.row + saveLines; 783 row = screen.cur.row;
865 line = save + row; /* _must_ refresh */ 784 line = &ROW(row); /* _must_ refresh */
866 } 785 }
867 786
868 // some utf-8 decoders "decode" surrogate characters: let's fix this. 787 // some utf-8 decoders "decode" surrogate characters: let's fix this.
869 if (IN_RANGE (c, 0xd800, 0xdfff)) 788 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
870 c = 0xfffd; 789 c = 0xfffd;
871 790
872 // rely on wcwidth to tell us the character width, at least for non-latin1 791 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth might return -1 792 // do wcwidth before further replacements, as wcwidth might return -1
874 // for the line drawing characters below as they might be invalid in the current 793 // for the line drawing characters below as they might be invalid in the current
… …
989 908
990 while (*tp == NOCHAR && tp > line->t) 909 while (*tp == NOCHAR && tp > line->t)
991 tp--, rp--; 910 tp--, rp--;
992 } 911 }
993 else if (screen.cur.row > 0 912 else if (screen.cur.row > 0
994 && save [screen.cur.row - 1 + saveLines].is_cont ()) 913 && ROW(screen.cur.row - 1).is_longer ())
995 { 914 {
996 line_t *line = save + (screen.cur.row - 1 + saveLines); 915 line_t *line = &ROW(screen.cur.row - 1);
997 916
998 tp = line->t + last_col - 1; 917 tp = line->t + last_col - 1;
999 rp = line->r + last_col - 1; 918 rp = line->r + last_col - 1;
1000 919
1001 while (*tp == NOCHAR && tp > line->t) 920 while (*tp == NOCHAR && tp > line->t)
… …
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 932 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
1014#endif 933#endif
1015 } 934 }
1016 } 935 }
1017 936
1018 if (line->l != -1) /* XXX: think about this */ 937 if (!line->is_longer ()) /* XXX: think about this */
1019 MAX_IT (line->l, screen.cur.col); 938 max_it (line->l, screen.cur.col);
1020 939
1021#ifdef DEBUG_STRICT 940#ifdef DEBUG_STRICT
1022 assert (screen.cur.row >= 0); 941 assert (screen.cur.row >= 0);
1023#else /* drive with your eyes closed */
1024 MAX_IT (screen.cur.row, 0);
1025#endif 942#endif
1026} 943}
1027 944
1028/* ------------------------------------------------------------------------- */ 945/* ------------------------------------------------------------------------- */
1029/* 946/*
… …
1068 985
1069 if (count == 0) 986 if (count == 0)
1070 return; 987 return;
1071 else if (count > 0) 988 else if (count > 0)
1072 { 989 {
1073 int row = saveLines + screen.cur.row; 990 line_t &l = ROW(screen.cur.row);
1074
1075 line_t &l = save[row];
1076 rend_t base_rend = l.r[i]; 991 rend_t base_rend = l.r[i];
1077 ht &= l.t[i] == ' '; 992 ht &= l.t[i] == ' ';
1078 993
1079 for (; ++i < ncol; ) 994 for (; ++i < ncol; )
1080 if (tabs[i]) 995 if (tabs[i])
… …
1094 // buffer so they can be selected and pasted. 1009 // buffer so they can be selected and pasted.
1095 if (ht && options & Opt_pastableTabs) 1010 if (ht && options & Opt_pastableTabs)
1096 { 1011 {
1097 base_rend = SET_FONT (base_rend, 0); 1012 base_rend = SET_FONT (base_rend, 0);
1098 1013
1099 if (l.l != -1) /* XXX: think about this */ 1014 if (!l.is_longer ()) /* XXX: think about this */
1100 MAX_IT (l.l, x); 1015 max_it (l.l, x);
1101 1016
1102 i = screen.cur.col; 1017 i = screen.cur.col;
1103 1018
1104 l.t[i] = '\t'; 1019 l.t[i] = '\t';
1105 l.r[i] = base_rend; 1020 l.r[i] = base_rend;
… …
1141rxvt_term::scr_backindex () 1056rxvt_term::scr_backindex ()
1142{ 1057{
1143 if (screen.cur.col > 0) 1058 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1059 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1060 else
1146 {
1147 if (save[screen.cur.row + saveLines].l == 0)
1148 return; /* um, yeah? */
1149
1150 scr_insdel_chars (1, INSERT); 1061 scr_insdel_chars (1, INSERT);
1151 }
1152} 1062}
1153#endif 1063#endif
1154/* ------------------------------------------------------------------------- */ 1064/* ------------------------------------------------------------------------- */
1155/* 1065/*
1156 * Process DEC Forward Index 1066 * Process DEC Forward Index
… …
1160 */ 1070 */
1161#if ENABLE_FRILLS 1071#if ENABLE_FRILLS
1162void 1072void
1163rxvt_term::scr_forwardindex () 1073rxvt_term::scr_forwardindex ()
1164{ 1074{
1165 int row;
1166
1167 if (screen.cur.col < ncol - 1) 1075 if (screen.cur.col < ncol - 1)
1168 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1076 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1169 else 1077 else
1170 { 1078 {
1171 row = screen.cur.row + saveLines; 1079 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1172 1080 ROW(screen.cur.row).l = ncol;
1173 if (save[row].l == 0)
1174 return; /* um, yeah? */
1175 else if (save[row].is_cont ())
1176 save[row].l = ncol;
1177 1081
1178 scr_gotorc (0, 0, R_RELATIVE); 1082 scr_gotorc (0, 0, R_RELATIVE);
1179 scr_insdel_chars (1, DELETE); 1083 scr_insdel_chars (1, DELETE);
1180 scr_gotorc (0, ncol - 1, R_RELATIVE); 1084 scr_gotorc (0, ncol - 1, R_RELATIVE);
1181 } 1085 }
… …
1191{ 1095{
1192 want_refresh = 1; 1096 want_refresh = 1;
1193 ZERO_SCROLLBACK (); 1097 ZERO_SCROLLBACK ();
1194 1098
1195 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1099 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1196 MAX_IT (screen.cur.col, 0); 1100 clamp_it (screen.cur.col, 0, ncol - 1);
1197 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1198 1101
1199 screen.flags &= ~Screen_WrapNext; 1102 screen.flags &= ~Screen_WrapNext;
1200 1103
1201 if (relative & R_RELATIVE) 1104 if (relative & R_RELATIVE)
1202 { 1105 {
… …
1220 else 1123 else
1221 { 1124 {
1222 if (screen.flags & Screen_Relative) 1125 if (screen.flags & Screen_Relative)
1223 { /* relative origin mode */ 1126 { /* relative origin mode */
1224 screen.cur.row = row + screen.tscroll; 1127 screen.cur.row = row + screen.tscroll;
1225 MIN_IT (screen.cur.row, screen.bscroll); 1128 min_it (screen.cur.row, screen.bscroll);
1226 } 1129 }
1227 else 1130 else
1228 screen.cur.row = row; 1131 screen.cur.row = row;
1229 } 1132 }
1230 1133
1231 MAX_IT (screen.cur.row, 0); 1134 clamp_it (screen.cur.row, 0, nrow - 1);
1232 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1233} 1135}
1234 1136
1235/* ------------------------------------------------------------------------- */ 1137/* ------------------------------------------------------------------------- */
1236/* 1138/*
1237 * direction should be UP or DN 1139 * direction should be UP or DN
… …
1248 1150
1249 screen.flags &= ~Screen_WrapNext; 1151 screen.flags &= ~Screen_WrapNext;
1250 1152
1251 if ((screen.cur.row == screen.bscroll && direction == UP) 1153 if ((screen.cur.row == screen.bscroll && direction == UP)
1252 || (screen.cur.row == screen.tscroll && direction == DN)) 1154 || (screen.cur.row == screen.tscroll && direction == DN))
1253 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1155 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1254 else 1156 else
1255 screen.cur.row += dirn; 1157 screen.cur.row += dirn;
1256 1158
1257 MAX_IT (screen.cur.row, 0); 1159 clamp_it (screen.cur.row, 0, nrow - 1);
1258 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1259 selection_check (0); 1160 selection_check (0);
1260} 1161}
1261 1162
1262/* ------------------------------------------------------------------------- */ 1163/* ------------------------------------------------------------------------- */
1263/* 1164/*
… …
1267 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1168 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1268 */ 1169 */
1269void 1170void
1270rxvt_term::scr_erase_line (int mode) 1171rxvt_term::scr_erase_line (int mode)
1271{ 1172{
1272 unsigned int row, col, num; 1173 unsigned int col, num;
1273 1174
1274 want_refresh = 1; 1175 want_refresh = 1;
1275 ZERO_SCROLLBACK (); 1176 ZERO_SCROLLBACK ();
1276 1177
1277 selection_check (1); 1178 selection_check (1);
1278 1179
1279 row = saveLines + screen.cur.row; 1180 line_t &line = ROW(screen.cur.row);
1280 1181
1281 switch (mode) 1182 switch (mode)
1282 { 1183 {
1283 case 0: /* erase to end of line */ 1184 case 0: /* erase to end of line */
1284 col = screen.cur.col; 1185 col = screen.cur.col;
1285 num = ncol - col; 1186 num = ncol - col;
1286 MIN_IT (save[row].l, (int16_t)col); 1187 min_it (line.l, col);
1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1188 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1189 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1289 CLEAR_SELECTION (); 1190 CLEAR_SELECTION ();
1290 break; 1191 break;
1291 case 1: /* erase to beginning of line */ 1192 case 1: /* erase to beginning of line */
… …
1296 CLEAR_SELECTION (); 1197 CLEAR_SELECTION ();
1297 break; 1198 break;
1298 case 2: /* erase whole line */ 1199 case 2: /* erase whole line */
1299 col = 0; 1200 col = 0;
1300 num = ncol; 1201 num = ncol;
1301 save[row].l = 0; 1202 line.l = 0;
1302 if (selection.beg.row <= screen.cur.row 1203 if (selection.beg.row <= screen.cur.row
1303 && selection.end.row >= screen.cur.row) 1204 && selection.end.row >= screen.cur.row)
1304 CLEAR_SELECTION (); 1205 CLEAR_SELECTION ();
1305 break; 1206 break;
1306 default: 1207 default:
1307 return; 1208 return;
1308 } 1209 }
1309 1210
1310 if (save[row].t)
1311 scr_blank_line (save[row], col, num, rstyle); 1211 scr_blank_line (line, col, num, rstyle);
1312 else
1313 scr_blank_screen_mem (save[row], rstyle);
1314} 1212}
1315 1213
1316/* ------------------------------------------------------------------------- */ 1214/* ------------------------------------------------------------------------- */
1317/* 1215/*
1318 * Erase part of whole of the screen 1216 * Erase part of whole of the screen
… …
1322 */ 1220 */
1323void 1221void
1324rxvt_term::scr_erase_screen (int mode) 1222rxvt_term::scr_erase_screen (int mode)
1325{ 1223{
1326 int num; 1224 int num;
1327 int32_t row, row_offset; 1225 int32_t row;
1328 rend_t ren; 1226 rend_t ren;
1329 XGCValues gcvalue; 1227 XGCValues gcvalue;
1330 1228
1331 want_refresh = 1; 1229 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1230 ZERO_SCROLLBACK ();
1333
1334 row_offset = (int32_t)saveLines;
1335 1231
1336 switch (mode) 1232 switch (mode)
1337 { 1233 {
1338 case 0: /* erase to end of screen */ 1234 case 0: /* erase to end of screen */
1339 selection_check (1); 1235 selection_check (1);
… …
1363 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1364 1260
1365 if (row >= nrow) /* Out Of Bounds */ 1261 if (row >= nrow) /* Out Of Bounds */
1366 return; 1262 return;
1367 1263
1368 MIN_IT (num, (nrow - row)); 1264 min_it (num, nrow - row);
1369 1265
1370 if (rstyle & (RS_RVid | RS_Uline)) 1266 if (rstyle & (RS_RVid | RS_Uline))
1371 ren = (rend_t) ~RS_None; 1267 ren = (rend_t) ~RS_None;
1372 else if (GET_BASEBG (rstyle) == Color_bg) 1268 else if (GET_BASEBG (rstyle) == Color_bg)
1373 { 1269 {
… …
1384 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1280 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1385 } 1281 }
1386 1282
1387 for (; num--; row++) 1283 for (; num--; row++)
1388 { 1284 {
1389 scr_blank_screen_mem (save[row + row_offset], rstyle); 1285 scr_blank_screen_mem (ROW (row), rstyle);
1390 save[row + row_offset].l = 0; 1286 ROW (row).l = 0;
1391 scr_blank_line (drawn[row], 0, ncol, ren); 1287 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1392 } 1288 }
1393} 1289}
1394 1290
1395#if ENABLE_FRILLS 1291#if ENABLE_FRILLS
1396void 1292void
1397rxvt_term::scr_erase_savelines () 1293rxvt_term::scr_erase_savelines ()
1398{ 1294{
1399 want_refresh = 1; 1295 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1296 ZERO_SCROLLBACK ();
1401 1297
1402 nscrolled = 0; 1298 nsaved = 0;
1403} 1299}
1404#endif 1300#endif
1405 1301
1406/* ------------------------------------------------------------------------- */ 1302/* ------------------------------------------------------------------------- */
1407/* 1303/*
… …
1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1305 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1410 */ 1306 */
1411void 1307void
1412rxvt_term::scr_E () 1308rxvt_term::scr_E ()
1413{ 1309{
1414 int i, j, k;
1415 rend_t *r1, fs; 1310 rend_t fs;
1416 1311
1417 want_refresh = 1; 1312 want_refresh = 1;
1418 ZERO_SCROLLBACK (); 1313 ZERO_SCROLLBACK ();
1419 1314
1420 num_scr_allow = 0; 1315 num_scr_allow = 0;
1421 selection_check (3); 1316 selection_check (3);
1422 1317
1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1318 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1424 for (k = saveLines, i = nrow; i--; k++) 1319 for (int row = nrow; row--; )
1425 { 1320 {
1426 save[k].l = ncol; /* make the `E's selectable */ 1321 line_t &line = ROW(row);
1322
1427 fill_text (save[k].t, 'E', ncol); 1323 fill_text (line.t, 'E', ncol);
1428 for (r1 = save[k].r, j = ncol; j--; ) 1324 rend_t *r1 = line.r;
1325
1326 for (int j = ncol; j--; )
1429 *r1++ = fs; 1327 *r1++ = fs;
1328
1329 line.l = ncol; /* make the `E's selectable */
1430 } 1330 }
1431} 1331}
1432 1332
1433/* ------------------------------------------------------------------------- */ 1333/* ------------------------------------------------------------------------- */
1434/* 1334/*
… …
1455 count = end; 1355 count = end;
1456 } 1356 }
1457 1357
1458 scr_do_wrap (); 1358 scr_do_wrap ();
1459 1359
1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1360 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1461} 1361}
1462 1362
1463/* ------------------------------------------------------------------------- */ 1363/* ------------------------------------------------------------------------- */
1464/* 1364/*
1465 * Insert/Delete <count> characters from the current position 1365 * Insert/Delete <count> characters from the current position
… …
1477 return; 1377 return;
1478 1378
1479 scr_do_wrap (); 1379 scr_do_wrap ();
1480 1380
1481 selection_check (1); 1381 selection_check (1);
1482 MIN_IT (count, (ncol - screen.cur.col)); 1382 min_it (count, ncol - screen.cur.col);
1483 1383
1484 row = screen.cur.row + saveLines; 1384 row = screen.cur.row;
1485 1385
1486 line_t *line = save + row; 1386 line_t *line = &ROW(row);
1487 1387
1488 switch (insdel) 1388 switch (insdel)
1489 { 1389 {
1490 case INSERT: 1390 case INSERT:
1491 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1391 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1492 { 1392 {
1493 line->t[col] = line->t[col - count]; 1393 line->t[col] = line->t[col - count];
1494 line->r[col] = line->r[col - count]; 1394 line->r[col] = line->r[col - count];
1495 } 1395 }
1496 1396
1497 if (line->l != -1) 1397 if (!line->is_longer ())
1498 { 1398 {
1499 line->l += count; 1399 line->l += count;
1500 MIN_IT (line->l, ncol); 1400 min_it (line->l, ncol);
1501 } 1401 }
1502 1402
1503 if (selection.op && current_screen == selection.screen 1403 if (selection.op && current_screen == selection.screen
1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1404 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1505 { 1405 {
… …
1512 selection.mark.col += count; /* XXX: yes? */ 1412 selection.mark.col += count; /* XXX: yes? */
1513 selection.end.col += count; 1413 selection.end.col += count;
1514 } 1414 }
1515 } 1415 }
1516 1416
1517 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1417 scr_blank_line (*line, screen.cur.col, count, rstyle);
1518 break; 1418 break;
1519 1419
1520 case ERASE: 1420 case ERASE:
1521 screen.cur.col += count; /* don't worry if > ncol */ 1421 screen.cur.col += count; /* don't worry if > ncol */
1522 selection_check (1); 1422 selection_check (1);
1523 screen.cur.col -= count; 1423 screen.cur.col -= count;
1524 scr_blank_line (save[row], screen.cur.col, count, rstyle); 1424 scr_blank_line (*line, screen.cur.col, count, rstyle);
1525 break; 1425 break;
1526 1426
1527 case DELETE: 1427 case DELETE:
1528 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1428 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1529 1429
… …
1533 line->r[col] = line->r[col + count]; 1433 line->r[col] = line->r[col + count];
1534 } 1434 }
1535 1435
1536 scr_blank_line (*line, ncol - count, count, tr); 1436 scr_blank_line (*line, ncol - count, count, tr);
1537 1437
1538 if (line->is_cont ()) /* break line continuation */ 1438 if (line->is_longer ()) /* break line continuation */
1539 line->l = ncol; 1439 line->l = ncol;
1540 1440
1541 line->l -= count; 1441 line->l = max (line->l - count, 0);
1542 MAX_IT (line->l, 0);
1543 1442
1544 if (selection.op && current_screen == selection.screen 1443 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1444 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1445 {
1547 if (selection.end.row != screen.cur.row 1446 if (selection.end.row != screen.cur.row
… …
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1466 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1467 */
1569void 1468void
1570rxvt_term::scr_scroll_region (int top, int bot) 1469rxvt_term::scr_scroll_region (int top, int bot)
1571{ 1470{
1572 MAX_IT (top, 0); 1471 max_it (top, 0);
1573 MIN_IT (bot, (int)nrow - 1); 1472 min_it (bot, nrow - 1);
1574 1473
1575 if (top > bot) 1474 if (top > bot)
1576 return; 1475 return;
1577 1476
1578 screen.tscroll = top; 1477 screen.tscroll = top;
… …
1676 XGCValues gcvalue; 1575 XGCValues gcvalue;
1677 1576
1678 if (rvideo != mode) 1577 if (rvideo != mode)
1679 { 1578 {
1680 rvideo = mode; 1579 rvideo = mode;
1681 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1580 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#if XPM_BACKGROUND 1581#if XPM_BACKGROUND
1683 if (bgPixmap.pixmap == None) 1582 if (bgPixmap.pixmap == None)
1684#endif 1583#endif
1685#if TRANSPARENT 1584#if TRANSPARENT
1686 if (! (options & Opt_transparent) || am_transparent == 0) 1585 if (! (options & Opt_transparent) || am_transparent == 0)
… …
1782 bool found = false; 1681 bool found = false;
1783 1682
1784 for (int i = 0; i < nrow; i++) 1683 for (int i = 0; i < nrow; i++)
1785 { 1684 {
1786 int col = 0; 1685 int col = 0;
1787 rend_t *drp = drawn[i].r; 1686 rend_t *drp = drawn_buf[i].r;
1788 1687
1789 for (; col < ncol; col++, drp++) 1688 for (; col < ncol; col++, drp++)
1790 if ((*drp & mask) == value) 1689 if ((*drp & mask) == value)
1791 { 1690 {
1792 found = true; 1691 found = true;
… …
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1709rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1811{ 1710{
1812 int i; 1711 int i;
1813 row_col_t rc[RC_COUNT]; 1712 row_col_t rc[RC_COUNT];
1814 1713
1815 if (!drawn) /* sanity check */ 1714 if (!drawn_buf) /* sanity check */
1816 return; 1715 return;
1817 1716
1818#ifndef NO_SLOW_LINK_SUPPORT 1717#ifndef NO_SLOW_LINK_SUPPORT
1819 if (refresh_type == FAST_REFRESH && !display->is_local) 1718 if (refresh_type == FAST_REFRESH && !display->is_local)
1820 { 1719 {
1821 y = 0; 1720 y = 0;
1822 eheight = height; 1721 eheight = height;
1823 } 1722 }
1824#endif
1825
1826#ifdef DEBUG_STRICT
1827 x = max (x, 0);
1828 x = min (x, (int)width);
1829 y = max (y, 0);
1830 y = min (y, (int)height);
1831#endif 1723#endif
1832 1724
1833 /* round down */ 1725 /* round down */
1834 rc[PART_BEG].col = Pixel2Col (x); 1726 rc[PART_BEG].col = Pixel2Col (x);
1835 rc[PART_BEG].row = Pixel2Row (y); 1727 rc[PART_BEG].row = Pixel2Row (y);
… …
1838 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1730 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1839 1731
1840 /* sanity checks */ 1732 /* sanity checks */
1841 for (i = PART_BEG; i < RC_COUNT; i++) 1733 for (i = PART_BEG; i < RC_COUNT; i++)
1842 { 1734 {
1843 MIN_IT (rc[i].col, ncol - 1); 1735 min_it (rc[i].col, ncol - 1);
1844 MIN_IT (rc[i].row, nrow - 1); 1736 min_it (rc[i].row, nrow - 1);
1845 } 1737 }
1846 1738
1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1739 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1848 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1740 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1849 1741
1850 if (refresh) 1742 if (refresh)
1851 scr_refresh (SLOW_REFRESH); 1743 scr_refresh (SLOW_REFRESH);
1852} 1744}
1853 1745
… …
1874 1766
1875 oldviewstart = view_start; 1767 oldviewstart = view_start;
1876 1768
1877 if (y < len) 1769 if (y < len)
1878 { 1770 {
1879 p = (nrow + nscrolled) * (len - y) / len; 1771 p = (nrow + nsaved) * (len - y) / len;
1880 p -= (long) (nrow - 1); 1772 p -= (long) (nrow - 1);
1881 p = max (p, 0); 1773 p = max (p, 0);
1882 } 1774 }
1883 1775
1884 view_start = (unsigned int)min (p, nscrolled); 1776 view_start = (unsigned int)min (p, nsaved);
1885 1777
1886 return scr_changeview (oldviewstart); 1778 return scr_changeview (oldviewstart);
1887} 1779}
1888 1780
1889/* ------------------------------------------------------------------------- */ 1781/* ------------------------------------------------------------------------- */
… …
1900 oldviewstart = view_start; 1792 oldviewstart = view_start;
1901 1793
1902 if (direction == UP) 1794 if (direction == UP)
1903 { 1795 {
1904 n = view_start + nlines; 1796 n = view_start + nlines;
1905 view_start = min (n, nscrolled); 1797 view_start = min (n, nsaved);
1906 } 1798 }
1907 else 1799 else
1908 { 1800 {
1909 n = view_start - nlines; 1801 n = view_start - nlines;
1910 view_start = max (n, 0); 1802 view_start = max (n, 0);
… …
1954/* ARGSUSED */ 1846/* ARGSUSED */
1955void 1847void
1956rxvt_term::scr_printscreen (int fullhist) 1848rxvt_term::scr_printscreen (int fullhist)
1957{ 1849{
1958#ifdef PRINTPIPE 1850#ifdef PRINTPIPE
1959 int i, r1, nrows, row_offset; 1851 int nrows, row_start;
1960 FILE *fd; 1852 FILE *fd;
1961 1853
1962 if ((fd = popen_printer ()) == NULL) 1854 if ((fd = popen_printer ()) == NULL)
1963 return; 1855 return;
1964 1856
1965 nrows = nrow;
1966 row_offset = saveLines;
1967
1968 if (!fullhist) 1857 if (fullhist)
1969 row_offset -= view_start; 1858 {
1859 nrows = nrow + nsaved;
1860 row_start = -nsaved;
1861 }
1970 else 1862 else
1971 { 1863 {
1972 nrows += nscrolled; 1864 nrows = nrow;
1973 row_offset -= nscrolled; 1865 row_start = -view_start;
1974 } 1866 }
1975 1867
1976 wctomb (0, 0); 1868 wctomb (0, 0);
1977 1869
1978 for (r1 = 0; r1 < nrows; r1++) 1870 for (int r1 = 0; r1 < nrows; r1++)
1979 { 1871 {
1980 text_t *tp = save[r1 + row_offset].t; 1872 text_t *tp = ROW(r1).t;
1981 int len = save[r1 + row_offset].l; 1873 int len = ROW(r1).l;
1982 1874
1983 for (i = len >= 0 ? len : ncol - 1; i--; ) 1875 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1984 { 1876 {
1985 char mb[MB_LEN_MAX]; 1877 char mb[MB_LEN_MAX];
1986 text_t t = *tp++; 1878 text_t t = *tp++;
1987 if (t == NOCHAR) 1879 if (t == NOCHAR)
1988 continue; 1880 continue;
… …
2016{ 1908{
2017 unsigned char must_clear, /* use draw_string not draw_image_string */ 1909 unsigned char must_clear, /* use draw_string not draw_image_string */
2018 showcursor; /* show the cursor */ 1910 showcursor; /* show the cursor */
2019 int16_t col, row, /* column/row we're processing */ 1911 int16_t col, row, /* column/row we're processing */
2020 ocrow; /* old cursor row */ 1912 ocrow; /* old cursor row */
2021 int i, /* tmp */ 1913 int i; /* tmp */
2022 row_offset; /* basic offset in screen structure */
2023#ifndef NO_CURSORCOLOR 1914#ifndef NO_CURSORCOLOR
2024 rend_t cc1; /* store colours at cursor position (s) */ 1915 rend_t cc1; /* store colours at cursor position (s) */
2025#endif 1916#endif
2026 rend_t *crp; // cursor rendition pointer 1917 rend_t *crp; // cursor rendition pointer
2027 1918
… …
2033 /* 1924 /*
2034 * A: set up vars 1925 * A: set up vars
2035 */ 1926 */
2036 must_clear = 0; 1927 must_clear = 0;
2037 refresh_count = 0; 1928 refresh_count = 0;
2038
2039 row_offset = saveLines - view_start;
2040 1929
2041#if XPM_BACKGROUND 1930#if XPM_BACKGROUND
2042 must_clear |= bgPixmap.pixmap != None; 1931 must_clear |= bgPixmap.pixmap != None;
2043#endif 1932#endif
2044#if TRANSPARENT 1933#if TRANSPARENT
… …
2067 1956
2068 if (showcursor) 1957 if (showcursor)
2069 { 1958 {
2070 int col = screen.cur.col; 1959 int col = screen.cur.col;
2071 1960
2072 while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) 1961 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2073 col--; 1962 col--;
2074 1963
2075 crp = &screen.line[screen.cur.row]->r[col]; 1964 crp = &ROW(screen.cur.row).r[col];
2076 1965
2077 if (showcursor && focus) 1966 if (showcursor && focus)
2078 { 1967 {
2079 if (options & Opt_cursorUnderline) 1968 if (options & Opt_cursorUnderline)
2080 *crp ^= RS_Uline; 1969 *crp ^= RS_Uline;
… …
2114 if (screen.cur.row + view_start != ocrow 2003 if (screen.cur.row + view_start != ocrow
2115 || screen.cur.col != oldcursor.col) 2004 || screen.cur.col != oldcursor.col)
2116 { 2005 {
2117 if (ocrow < nrow 2006 if (ocrow < nrow
2118 && oldcursor.col < ncol) 2007 && oldcursor.col < ncol)
2119 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2008 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120 2009
2121 if (focus || !showcursor) 2010 if (focus || !showcursor)
2122 oldcursor.row = -1; 2011 oldcursor.row = -1;
2123 else 2012 else
2124 setoldcursor = 1; 2013 setoldcursor = 1;
… …
2148 * D: CopyArea pass - very useful for slower links 2037 * D: CopyArea pass - very useful for slower links
2149 * This has been deliberately kept simple. 2038 * This has been deliberately kept simple.
2150 */ 2039 */
2151 i = num_scr; 2040 i = num_scr;
2152 if (!display->is_local 2041 if (!display->is_local
2153 && refresh_type == FAST_REFRESH && num_scr_allow && i 2042 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2154 && abs (i) < nrow && !must_clear) 2043 && abs (num_scr) < nrow && !must_clear)
2155 { 2044 {
2156 int16_t nits; 2045 int16_t nits;
2157 int j; 2046 int j;
2158 int len, wlen; 2047 int len, wlen;
2159 2048
… …
2162 row = i > 0 ? 0 : j - 1; 2051 row = i > 0 ? 0 : j - 1;
2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2052 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2164 { 2053 {
2165 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2054 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2166 { 2055 {
2167 line_t s = save[row + row_offset]; 2056 line_t s = ROW(row - view_start);
2168 line_t d = drawn[row]; 2057 line_t d = drawn_buf[row];
2169 line_t d2 = drawn[row + i]; 2058 line_t d2 = drawn_buf[row + i];
2170 2059
2171 for (nits = 0, col = ncol; col--; ) 2060 for (nits = 0, col = ncol; col--; )
2172 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2061 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2173 nits--; 2062 nits--;
2174 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2063 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2192 2081
2193 if (len != -1) 2082 if (len != -1)
2194 { 2083 {
2195 /* also comes here at end if needed because of >= above */ 2084 /* also comes here at end if needed because of >= above */
2196 if (wlen < len) 2085 if (wlen < len)
2197 SWAP_IT (wlen, len, int); 2086 ::swap (wlen, len);
2198 2087
2199 XCopyArea (display->display, vt, vt, 2088 XCopyArea (display->display, vt, vt,
2200 gc, 0, Row2Pixel (len + i), 2089 gc, 0, Row2Pixel (len + i),
2201 (unsigned int)TermWin_TotalWidth (), 2090 (unsigned int)TermWin_TotalWidth (),
2202 (unsigned int)Height2Pixel (wlen - len + 1), 2091 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2210 /* 2099 /*
2211 * E: main pass across every character 2100 * E: main pass across every character
2212 */ 2101 */
2213 for (row = 0; row < nrow; row++) 2102 for (row = 0; row < nrow; row++)
2214 { 2103 {
2215 text_t *stp = save[row + row_offset].t; 2104 text_t *stp = ROW(row - view_start).t;
2216 rend_t *srp = save[row + row_offset].r; 2105 rend_t *srp = ROW(row - view_start).r;
2217 text_t *dtp = drawn[row].t; 2106 text_t *dtp = drawn_buf[row].t;
2218 rend_t *drp = drawn[row].r; 2107 rend_t *drp = drawn_buf[row].r;
2219 2108
2220 /* 2109 /*
2221 * E2: OK, now the real pass 2110 * E2: OK, now the real pass
2222 */ 2111 */
2223 int ypixel = (int)Row2Pixel (row); 2112 int ypixel = (int)Row2Pixel (row);
… …
2334 fore = Color_UL; 2223 fore = Color_UL;
2335#endif 2224#endif
2336 2225
2337 if (invert) 2226 if (invert)
2338 { 2227 {
2339 SWAP_IT (fore, back, int); 2228 ::swap (fore, back);
2340 2229
2341#ifndef NO_BOLD_UNDERLINE_REVERSE 2230#ifndef NO_BOLD_UNDERLINE_REVERSE
2342 if (ISSET_PIXCOLOR (Color_RV)) 2231 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV; 2232 back = Color_RV;
2344 2233
… …
2432 else if (oldcursor.row >= 0) 2321 else if (oldcursor.row >= 0)
2433 { 2322 {
2434 int cursorwidth = 1; 2323 int cursorwidth = 1;
2435 int col = oldcursor.col; 2324 int col = oldcursor.col;
2436 2325
2437 while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) 2326 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438 col--; 2327 col--;
2439 2328
2440 while (col + cursorwidth < ncol 2329 while (col + cursorwidth < ncol
2441 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2330 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++; 2331 cursorwidth++;
2443 2332
2444#ifndef NO_CURSORCOLOR 2333#ifndef NO_CURSORCOLOR
2445 if (ISSET_PIXCOLOR (Color_cursor)) 2334 if (ISSET_PIXCOLOR (Color_cursor))
2446 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2335 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2477} 2366}
2478 2367
2479void 2368void
2480rxvt_term::scr_remap_chars () 2369rxvt_term::scr_remap_chars ()
2481{ 2370{
2482 for (int i = nrow + saveLines; i--; ) 2371 for (int i = total_rows; i--; )
2483 scr_remap_chars (save[i]); 2372 scr_remap_chars (row_buf [i]);
2484 2373
2485 for (int i = nrow; i--; ) 2374 for (int i = nrow; i--; )
2486 { 2375 {
2487 scr_remap_chars (drawn[i]); 2376 scr_remap_chars (drawn_buf [i]);
2488 scr_remap_chars (swap_save[i]); 2377 scr_remap_chars (swap_buf [i]);
2489 } 2378 }
2490} 2379}
2491 2380
2492void 2381void
2493rxvt_term::scr_recolour () 2382rxvt_term::scr_recolour ()
… …
2535 2424
2536/* ------------------------------------------------------------------------- */ 2425/* ------------------------------------------------------------------------- */
2537void 2426void
2538rxvt_term::scr_reverse_selection () 2427rxvt_term::scr_reverse_selection ()
2539{ 2428{
2429 if (selection.op
2540 if (selection.op && current_screen == selection.screen) 2430 && current_screen == selection.screen
2431 && selection.end.row >= -view_start)
2541 { 2432 {
2542 int end_row = saveLines - view_start; 2433 int view_end = -view_start + nrow;
2543 int i = selection.beg.row + saveLines; 2434 int row, col;
2544 int col, row = selection.end.row + saveLines;
2545 rend_t *srp;
2546 2435
2547#if ENABLE_FRILLS 2436#if ENABLE_FRILLS
2548 if (selection.rect) 2437 if (selection.rect)
2549 { 2438 {
2550 end_row += nrow; 2439 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2551
2552 for (; i <= row && i <= end_row; i++)
2553 for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) 2440 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
2554 srp[col] ^= RS_RVid; 2441 srp[col] ^= RS_RVid;
2555 } 2442 }
2556 else 2443 else
2557#endif 2444#endif
2558 { 2445 {
2559 if (i >= end_row) 2446 if (selection.beg.row >= -view_start)
2447 {
2560 col = selection.beg.col; 2448 col = selection.beg.col;
2449 row = selection.beg.row;
2450 }
2561 else 2451 else
2562 { 2452 {
2563 col = 0; 2453 col = 0;
2564 i = end_row; 2454 row = view_start;
2565 } 2455 }
2566 2456
2567 end_row += nrow; 2457 for (; row < min (selection.end.row, view_end); row++, col = 0)
2568
2569 for (; i < row && i < end_row; i++, col = 0)
2570 for (srp = save[i].r; col < ncol; col++) 2458 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571 srp[col] ^= RS_RVid; 2459 srp[col] ^= RS_RVid;
2572 2460
2573 if (i == row && i < end_row) 2461 if (row == selection.end.row)
2574 for (srp = save[i].r; col < selection.end.col; col++) 2462 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2575 srp[col] ^= RS_RVid; 2463 srp[col] ^= RS_RVid;
2576 } 2464 }
2577 } 2465 }
2578} 2466}
2579 2467
… …
2588{ 2476{
2589 int row, wrote; 2477 int row, wrote;
2590 unsigned int width, towrite; 2478 unsigned int width, towrite;
2591 char r1[] = "\n"; 2479 char r1[] = "\n";
2592 2480
2593 for (row = saveLines - nscrolled; 2481 for (row = saveLines - nsaved;
2594 row < saveLines + nrow - 1; row++) 2482 row < saveLines + nrow - 1; row++)
2595 { 2483 {
2596 width = save[row].l >= 0 ? save[row].l 2484 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2485 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2486 for (towrite = width; towrite; towrite -= wrote)
2599 { 2487 {
2600 wrote = write (fd, & (save[row].t[width - towrite]), 2488 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2601 towrite); 2489 towrite);
2602 if (wrote < 0) 2490 if (wrote < 0)
2603 return; /* XXX: death, no report */ 2491 return; /* XXX: death, no report */
2604 } 2492 }
2605 if (save[row].l >= 0) 2493 if (row_buf[row].l >= 0)
2606 if (write (fd, r1, 1) <= 0) 2494 if (write (fd, r1, 1) <= 0)
2607 return; /* XXX: death, no report */ 2495 return; /* XXX: death, no report */
2608 } 2496 }
2609} 2497}
2610#endif 2498#endif
2611 2499
2612/* ------------------------------------------------------------------------- * 2500/* ------------------------------------------------------------------------- *
2613 * CHARACTER SELECTION * 2501 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2502 * ------------------------------------------------------------------------- */
2615
2616/*
2617 * -nscrolled <= (selection row) <= nrow - 1
2618 */
2619void 2503void
2620rxvt_term::selection_check (int check_more) 2504rxvt_term::selection_check (int check_more)
2621{ 2505{
2622 row_col_t pos; 2506 row_col_t pos;
2623 2507
2624 if (!selection.op) 2508 if (!selection.op)
2625 return; 2509 return;
2626 2510
2627 pos.row = pos.col = 0; 2511 pos.row = pos.col = 0;
2628 if ((selection.beg.row < - (int32_t)nscrolled) 2512 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow)
2629 || (selection.beg.row >= nrow) 2513 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2630 || (selection.mark.row < - (int32_t)nscrolled) 2514 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow)
2631 || (selection.mark.row >= nrow)
2632 || (selection.end.row < - (int32_t)nscrolled)
2633 || (selection.end.row >= nrow)
2634 || (check_more == 1 2515 || (check_more == 1
2635 && current_screen == selection.screen 2516 && current_screen == selection.screen
2636 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2517 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2637 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2518 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2638 || (check_more == 2 2519 || (check_more == 2
… …
2944 * EXT: button 1 or 3 release 2825 * EXT: button 1 or 3 release
2945 */ 2826 */
2946void 2827void
2947rxvt_term::selection_make (Time tm) 2828rxvt_term::selection_make (Time tm)
2948{ 2829{
2949 int i, col, end_col, row, end_row; 2830 int i;
2950 wchar_t *new_selection_text; 2831 wchar_t *new_selection_text;
2951 text_t *t; 2832 text_t *t;
2952 2833
2953 switch (selection.op) 2834 switch (selection.op)
2954 { 2835 {
… …
2970 return; /* nothing selected, go away */ 2851 return; /* nothing selected, go away */
2971 2852
2972 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2853 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2973 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2854 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2974 2855
2975 col = selection.beg.col;
2976 row = selection.beg.row + saveLines;
2977 end_row = selection.end.row + saveLines;
2978 int ofs = 0; 2856 int ofs = 0;
2979 int extra = 0; 2857 int extra = 0;
2980 2858
2859 int col = selection.beg.col;
2860 int row = selection.beg.row;
2861
2862 int end_col;
2863
2981 for (; row <= end_row; row++, col = 0) 2864 for (; row <= selection.end.row; row++, col = 0)
2982 { 2865 {
2983#if ENABLE_FRILLS 2866#if ENABLE_FRILLS
2984 if (selection.rect) 2867 if (selection.rect)
2985 { 2868 {
2986 col = selection.beg.col; 2869 col = selection.beg.col;
2987 end_col = ncol + 1; 2870 end_col = ncol + 1;
2988 } 2871 }
2989 else 2872 else
2990#endif 2873#endif
2991 end_col = save[row].is_cont () ? ncol : save[row].l; //TODO//FIXME 2874 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2992 2875
2993 MAX_IT (col, 0); 2876 col = max (col, 0);
2994 2877
2995 if (row == end_row || selection.rect) 2878 if (row == selection.end.row || selection.rect)
2996 MIN_IT (end_col, selection.end.col); 2879 end_col = min (end_col, selection.end.col);
2997 2880
2998 t = &save[row].t[col]; 2881 t = ROW(row).t + col;
2999 for (; col < end_col; col++) 2882 for (; col < end_col; col++)
3000 { 2883 {
3001 if (*t == NOCHAR) 2884 if (*t == NOCHAR)
3002 t++; 2885 t++;
3003#if ENABLE_COMBINING 2886#if ENABLE_COMBINING
… …
3019#endif 2902#endif
3020 else 2903 else
3021 new_selection_text[ofs++] = *t++; 2904 new_selection_text[ofs++] = *t++;
3022 } 2905 }
3023 2906
3024 if (save[row].l != -1 && row != end_row) 2907 if (!ROW(row).is_longer () && row != selection.end.row)
3025 new_selection_text[ofs++] = C0_LF; 2908 new_selection_text[ofs++] = C0_LF;
3026 } 2909 }
3027 2910
3028 if (end_col != selection.end.col) 2911 if (end_col != selection.end.col)
3029 new_selection_text[ofs++] = C0_LF; 2912 new_selection_text[ofs++] = C0_LF;
… …
3088 */ 2971 */
3089void 2972void
3090rxvt_term::selection_start_colrow (int col, int row) 2973rxvt_term::selection_start_colrow (int col, int row)
3091{ 2974{
3092 want_refresh = 1; 2975 want_refresh = 1;
2976
2977 selection.mark.row = row - view_start;
3093 selection.mark.col = col; 2978 selection.mark.col = col;
3094 selection.mark.row = row - view_start;
3095 2979
3096 MAX_IT (selection.mark.row, - (int32_t)nscrolled); 2980 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1);
3097 MIN_IT (selection.mark.row, (int32_t)nrow - 1); 2981 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3098 MAX_IT (selection.mark.col, 0);
3099 MIN_IT (selection.mark.col, (int32_t)ncol - 1);
3100 2982
3101 while (selection.mark.col > 0 2983 while (selection.mark.col > 0
3102 && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) 2984 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3103 --selection.mark.col; 2985 --selection.mark.col;
3104 2986
3105 if (selection.op) 2987 if (selection.op)
3106 { /* clear the old selection */ 2988 { /* clear the old selection */
3107 selection.beg.row = selection.end.row = selection.mark.row; 2989 selection.beg.row = selection.end.row = selection.mark.row;
… …
3131 text_t *stp; 3013 text_t *stp;
3132 rend_t *srp; 3014 rend_t *srp;
3133 3015
3134 if (dirn == UP) 3016 if (dirn == UP)
3135 { 3017 {
3136 bound.row = saveLines - nscrolled - 1; 3018 bound.row = - nsaved - 1;
3137 bound.col = 0; 3019 bound.col = 0;
3138 dirnadd = -1; 3020 dirnadd = -1;
3139 } 3021 }
3140 else 3022 else
3141 { 3023 {
3142 bound.row = saveLines + nrow; 3024 bound.row = nrow;
3143 bound.col = ncol - 1; 3025 bound.col = ncol - 1;
3144 dirnadd = 1; 3026 dirnadd = 1;
3145 } 3027 }
3146 3028
3147 row = mark->row + saveLines; 3029 row = mark->row;
3148 col = mark->col; 3030 col = max (mark->col, 0);
3149 MAX_IT (col, 0); 3031
3150 /* find the edge of a word */ 3032 /* find the edge of a word */
3151 stp = &save[row].t[col]; 3033 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
3152 w1 = DELIMIT_TEXT (*stp); 3034 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
3153
3154 srp = &save[row].r[col];
3155 w2 = DELIMIT_REND (*srp);
3156 3035
3157 for (;;) 3036 for (;;)
3158 { 3037 {
3159 for (; col != bound.col; col += dirnadd) 3038 for (; col != bound.col; col += dirnadd)
3160 { 3039 {
… …
3170 break; 3049 break;
3171 } 3050 }
3172 3051
3173 if ((col == bound.col) && (row != bound.row)) 3052 if ((col == bound.col) && (row != bound.row))
3174 { 3053 {
3175 if (save[ (row - (dirn == UP ? 1 : 0))].is_cont ()) 3054 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3176 { 3055 {
3177 trow = row + dirnadd; 3056 trow = row + dirnadd;
3178 tcol = dirn == UP ? ncol - 1 : 0; 3057 tcol = dirn == UP ? ncol - 1 : 0;
3179 3058
3180 if (save[trow].t == NULL) 3059 if (!ROW(trow).t)
3181 break; 3060 break;
3182 3061
3183 stp = & (save[trow].t[tcol]); 3062 stp = ROW(trow).t + tcol;
3184 srp = & (save[trow].r[tcol]); 3063 srp = ROW(trow).r + tcol;
3185 3064
3186 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3065 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3187 break; 3066 break;
3188 3067
3189 row = trow; 3068 row = trow;
… …
3197Old_Word_Selection_You_Die: 3076Old_Word_Selection_You_Die:
3198 if (dirn == DN) 3077 if (dirn == DN)
3199 col++; /* put us on one past the end */ 3078 col++; /* put us on one past the end */
3200 3079
3201 /* Poke the values back in */ 3080 /* Poke the values back in */
3202 ret->row = row - saveLines; 3081 ret->row = row;
3203 ret->col = col; 3082 ret->col = col;
3204} 3083}
3205 3084
3206/* ------------------------------------------------------------------------- */ 3085/* ------------------------------------------------------------------------- */
3207/* 3086/*
… …
3212 * flag == 2 ==> button 3 motion 3091 * flag == 2 ==> button 3 motion
3213 */ 3092 */
3214void 3093void
3215rxvt_term::selection_extend (int x, int y, int flag) 3094rxvt_term::selection_extend (int x, int y, int flag)
3216{ 3095{
3217 int col, row; 3096 int col = clamp (Pixel2Col (x), 0, ncol);
3218 3097 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3219 col = Pixel2Col (x);
3220 row = Pixel2Row (y);
3221 MAX_IT (row, 0);
3222 MIN_IT (row, (int)nrow - 1);
3223 MAX_IT (col, 0);
3224 MIN_IT (col, (int)ncol);
3225 3098
3226 /* 3099 /*
3227 * If we're selecting characters (single click) then we must check first 3100 * If we're selecting characters (single click) then we must check first
3228 * if we are at the same place as the original mark. If we are then 3101 * if we are at the same place as the original mark. If we are then
3229 * select nothing. Otherwise, if we're to the right of the mark, you have to 3102 * select nothing. Otherwise, if we're to the right of the mark, you have to
… …
3254 * Extend the selection to the specified col/row 3127 * Extend the selection to the specified col/row
3255 */ 3128 */
3256void 3129void
3257rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3130rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3258{ 3131{
3259 int end_col;
3260 row_col_t pos; 3132 row_col_t pos;
3261 enum { 3133 enum {
3262 LEFT, RIGHT 3134 LEFT, RIGHT
3263 } closeto = RIGHT; 3135 } closeto = RIGHT;
3264 3136
… …
3295 selection.beg.col = selection.end.col = selection.mark.col; 3167 selection.beg.col = selection.end.col = selection.mark.col;
3296 selection.beg.row = selection.end.row = selection.mark.row; 3168 selection.beg.row = selection.end.row = selection.mark.row;
3297 } 3169 }
3298 3170
3299 pos.col = col; 3171 pos.col = col;
3300 pos.row = row; 3172 pos.row = row - view_start;
3301
3302 pos.row -= view_start; /* adjust for scroll */
3303 3173
3304 /* 3174 /*
3305 * This is mainly xterm style selection with a couple of differences, mainly 3175 * This is mainly xterm style selection with a couple of differences, mainly
3306 * in the way button3 drag extension works. 3176 * in the way button3 drag extension works.
3307 * We're either doing: button1 drag; button3 press; or button3 drag 3177 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3366 } 3236 }
3367 } 3237 }
3368 3238
3369 if (selection.clicks == 1) 3239 if (selection.clicks == 1)
3370 { 3240 {
3371 end_col = save[selection.beg.row + saveLines].l; 3241 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372 3242 && !ROW(selection.beg.row).is_longer ()
3373 if (selection.beg.col > end_col
3374 && end_col != -1
3375#if ENABLE_FRILLS 3243#if ENABLE_FRILLS
3376 && !selection.rect 3244 && !selection.rect
3377#endif 3245#endif
3378 ) 3246 )
3379 selection.beg.col = ncol; 3247 selection.beg.col = ncol;
3380 3248
3381 end_col = save[selection.end.row + saveLines].l;
3382
3383 if ( 3249 if (
3384 selection.end.col > end_col 3250 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && end_col != -1 3251 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3252#if ENABLE_FRILLS
3387 && !selection.rect 3253 && !selection.rect
3388#endif 3254#endif
3389 ) 3255 )
3390 selection.end.col = ncol; 3256 selection.end.col = ncol;
… …
3400 else if (selection.clicks == 3) 3266 else if (selection.clicks == 3)
3401 { 3267 {
3402#if ENABLE_FRILLS 3268#if ENABLE_FRILLS
3403 if (options & Opt_tripleclickwords) 3269 if (options & Opt_tripleclickwords)
3404 { 3270 {
3405 int end_row;
3406
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3271 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 end_row = save[selection.mark.row + saveLines].l;
3409 3272
3410 for (end_row = selection.mark.row; end_row < nrow; end_row++) 3273 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3411 { 3274 {
3412 end_col = save[end_row + saveLines].l; 3275 if (!ROW(end_row).is_longer ())
3413
3414 if (end_col != -1)
3415 { 3276 {
3416 selection.end.row = end_row; 3277 selection.end.row = end_row;
3417 selection.end.col = end_col; 3278 selection.end.col = ROW(end_row).l;
3418 selection_remove_trailing_spaces (); 3279 selection_remove_trailing_spaces ();
3419 break; 3280 break;
3420 } 3281 }
3421 } 3282 }
3422 } 3283 }
… …
3429 selection.beg.col = 0; 3290 selection.beg.col = 0;
3430 selection.end.col = ncol; 3291 selection.end.col = ncol;
3431 3292
3432 // select a complete logical line 3293 // select a complete logical line
3433 while (selection.beg.row > -saveLines 3294 while (selection.beg.row > -saveLines
3434 && save[selection.beg.row - 1 + saveLines].is_cont ()) 3295 && ROW(selection.beg.row - 1).is_longer ())
3435 selection.beg.row--; 3296 selection.beg.row--;
3436 3297
3437 while (selection.end.row < nrow 3298 while (selection.end.row < nrow
3438 && save[selection.end.row + saveLines].is_cont ()) 3299 && ROW(selection.end.row).is_longer ())
3439 selection.end.row++; 3300 selection.end.row++;
3440 } 3301 }
3441 } 3302 }
3442 3303
3443 if (button3 && buttonpress) 3304 if (button3 && buttonpress)
… …
3454 } 3315 }
3455 } 3316 }
3456 3317
3457#if ENABLE_FRILLS 3318#if ENABLE_FRILLS
3458 if (selection.rect && selection.beg.col > selection.end.col) 3319 if (selection.rect && selection.beg.col > selection.end.col)
3459 SWAP_IT (selection.beg.col, selection.end.col, int); 3320 ::swap (selection.beg.col, selection.end.col);
3460#endif 3321#endif
3461} 3322}
3462 3323
3463#if ENABLE_FRILLS 3324#if ENABLE_FRILLS
3464void 3325void
… …
3468 text_t *stp; 3329 text_t *stp;
3469 3330
3470 end_col = selection.end.col; 3331 end_col = selection.end.col;
3471 end_row = selection.end.row; 3332 end_row = selection.end.row;
3472 3333
3473 for ( ; end_row >= selection.beg.row; ) 3334 for (; end_row >= selection.beg.row; )
3474 { 3335 {
3475 stp = save[end_row + saveLines].t; 3336 stp = ROW(end_row).t;
3476 3337
3477 while (--end_col >= 0) 3338 while (--end_col >= 0)
3478 { 3339 {
3479 if (stp[end_col] != ' ' 3340 if (stp[end_col] != ' '
3480 && stp[end_col] != '\t' 3341 && stp[end_col] != '\t'
3481 && stp[end_col] != NOCHAR) 3342 && stp[end_col] != NOCHAR)
3482 break; 3343 break;
3483 } 3344 }
3484 3345
3485 if (end_col >= 0 3346 if (end_col >= 0
3486 || save[end_row - 1 + saveLines].l != -1) 3347 || !ROW(end_row - 1).is_longer ())
3487 { 3348 {
3488 selection.end.col = end_col + 1; 3349 selection.end.col = end_col + 1;
3489 selection.end.row = end_row; 3350 selection.end.row = end_row;
3490 break; 3351 break;
3491 } 3352 }
… …
3662 */ 3523 */
3663void 3524void
3664rxvt_term::pixel_position (int *x, int *y) 3525rxvt_term::pixel_position (int *x, int *y)
3665{ 3526{
3666 *x = Pixel2Col (*x); 3527 *x = Pixel2Col (*x);
3667 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3528 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3668 *y = Pixel2Row (*y); 3529 *y = Pixel2Row (*y);
3669 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3530 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3670} 3531}
3671 3532
3672/* ------------------------------------------------------------------------- */ 3533/* ------------------------------------------------------------------------- */
3673#ifdef USE_XIM 3534#ifdef USE_XIM
3674void 3535void
… …
3696 3557
3697 if (x < 0) x = ncol - w; 3558 if (x < 0) x = ncol - w;
3698 if (y < 0) y = nrow - h; 3559 if (y < 0) y = nrow - h;
3699 3560
3700 // make space for border 3561 // make space for border
3701 w += 2; MIN_IT (w, ncol); 3562 w += 2; min_it (w, ncol);
3702 h += 2; MIN_IT (h, nrow); 3563 h += 2; min_it (h, nrow);
3703 3564
3704 x -= 1; MAX_IT (x, 0); 3565 x -= 1; clamp_it (x, 0, ncol - w);
3705 y -= 1; MAX_IT (y, 0); 3566 y -= 1; clamp_it (y, 0, nrow - h);
3706
3707 MIN_IT (x, ncol - w);
3708 MIN_IT (y, nrow - h);
3709 3567
3710 ov_x = x; ov_y = y; 3568 ov_x = x; ov_y = y;
3711 ov_w = w; ov_h = h; 3569 ov_w = w; ov_h = h;
3712 3570
3713 ov_text = new text_t *[h]; 3571 ov_text = new text_t *[h];
… …
3799rxvt_term::scr_swap_overlay () 3657rxvt_term::scr_swap_overlay ()
3800{ 3658{
3801 if (!ov_text) 3659 if (!ov_text)
3802 return; 3660 return;
3803 3661
3804 int row_offset = ov_y + saveLines - view_start;
3805
3806 // swap screen mem with overlay 3662 // swap screen mem with overlay
3807 for (int y = ov_h; y--; ) 3663 for (int y = ov_h; y--; )
3808 { 3664 {
3809 text_t *t1 = ov_text[y]; 3665 text_t *t1 = ov_text[y];
3810 rend_t *r1 = ov_rend[y]; 3666 rend_t *r1 = ov_rend[y];
3811 3667
3812 text_t *t2 = save[y + row_offset].t + ov_x; 3668 text_t *t2 = ROW(y - view_start).t + ov_x;
3813 rend_t *r2 = save[y + row_offset].r + ov_x; 3669 rend_t *r2 = ROW(y - view_start).r + ov_x;
3814 3670
3815 for (int x = ov_w; x--; ) 3671 for (int x = ov_w; x--; )
3816 { 3672 {
3817 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3673 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3818 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3674 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
… …
3820 } 3676 }
3821} 3677}
3822 3678
3823#endif 3679#endif
3824/* ------------------------------------------------------------------------- */ 3680/* ------------------------------------------------------------------------- */
3681

Diff Legend

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