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.184 by root, Wed Dec 21 14:23:30 2005 UTC vs.
Revision 1.191 by root, Thu Dec 22 18:36:55 2005 UTC

… …
147} 147}
148 148
149/* ------------------------------------------------------------------------- * 149/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 150 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 151 * ------------------------------------------------------------------------- */
152
152void 153void
153rxvt_term::scr_reset () 154rxvt_term::scr_reset ()
154{ 155{
155 unsigned int p, q;
156 int k;
157
158#if ENABLE_OVERLAY 156#if ENABLE_OVERLAY
159 scr_overlay_off (); 157 scr_overlay_off ();
160#endif 158#endif
161 159
162 view_start = 0; 160 view_start = 0;
… …
172 return; 170 return;
173 171
174 // we need at least two lines for wrapping to work correctly 172 // we need at least two lines for wrapping to work correctly
175 if (nrow + saveLines < 2) 173 if (nrow + saveLines < 2)
176 { 174 {
175 //TODO//FIXME
177 saveLines++; 176 saveLines++;
178 prev_nrow--; 177 prev_nrow--;
179 nsaved++; 178 nsaved++;
180 } 179 }
181 180
… …
185 total_rows = nrow + saveLines; 184 total_rows = nrow + saveLines;
186 185
187 screen.tscroll = 0; 186 screen.tscroll = 0;
188 screen.bscroll = nrow - 1; 187 screen.bscroll = nrow - 1;
189 188
190 if (!save) 189 if (!row_buf)
191 { 190 {
192 /* 191 /*
193 * 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
194 * 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
195 */ 194 */
… …
197 term_start = 0; 196 term_start = 0;
198 197
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 198 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 200
202 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 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));
204 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 205
207 for (p = nrow; p--; ) 206 for (int row = nrow; row--; )
208 { 207 {
209 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 210 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 } 211 }
213 212
214 memset (charsets, 'B', sizeof (charsets)); 213 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 214 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 215 screen.flags = Screen_DefaultFlags;
… …
240 { 239 {
241 /* 240 /*
242 * add or delete rows as appropriate 241 * add or delete rows as appropriate
243 */ 242 */
244 243
245 rxvt_salloc *old_ta; 244 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra; 245 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247 246
247#if 0
248 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
249 { 249 {
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++) 250 for (int row = nrow; row < prev_nrow; row++)
256 { 251 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 252 lfree (swap_buf [row]);
259 lfree (drawn[p]); 253 lfree (drawn_buf[row]);
260 } 254 }
255 }
256#endif
261 257
262 /* we have fewer rows so fix up cursor position */ 258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 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));
264 261
265 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));
266 } 275
267 else if (nrow > prev_nrow) 276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
268 { 277 int pend = MOD (term_start - nsaved , prev_total_rows);
269 /* add rows */ 278 int q = total_rows; // rewrapped row
270 scr_reset_realloc (); /* realloc _first_ */
271 279
272 int ocol = ncol; 280 if (nsaved)
273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 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.
274 284
275 k = min (nsaved, nrow - prev_nrow); 285 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
276 287
277 for (p = prev_total_rows; p < total_rows; p++) 288 while (p != pend && q > 0)
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 { 289 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 290 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 291#ifdef DEBUG_STRICT
298 assert (screen.cur.row < nrow); 292 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 293#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304 294
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; 295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
349 297
350 assert (llen >= 0); 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
351
352 while (p && save[p - 1].l < 0)
353 { 299 {
300 p = MOD (p - 1, prev_total_rows);
301
354 --p; 302 plines++;
355 llen += prev_ncol; 303 llen += prev_ncol;
356 } 304 }
357 305
358 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
359 int lofs = 0; 314 int lofs = 0;
315 line_t *qline;
360 316
361 q -= qlines; 317 // 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++) 318 for (int qrow = q; qlines--; qrow++)
367 { 319 {
320 qline = row_buf + qrow;
321 lalloc (*qline);
322 qline->set_is_longer ();
323
368 if (qrow >= 0) 324 int qcol = 0;
325
326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
369 { 328 {
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; 329 int prow = lofs / prev_ncol;
379 int pcol = lofs % prev_ncol; 330 int pcol = lofs % prev_ncol;
380 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
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382 344
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); 345 assert (len);
346 assert (pline.t);
397 347
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
400 350
401 lofs += len; 351 lofs += len;
402 qcol += len; 352 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 } 353 }
408 else
409 lofs += ncol;
410 } 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);
411 } 358 }
359
360 term_start = total_rows - nrow;
361 view_start = 0;
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
412 } 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];
413 377
414 free (screen.text); screen.text = tp; 378 qline = pline;
415 free (screen.rend); screen.rend = rp; 379 lresize (qline);
416 free (screen.tlen); screen.tlen = tl; 380 }
417 381
418 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 view_start = 0;
389 }
390
391#ifdef DEBUG_STRICT
392 for (int i = -nsaved; i < nrow; i++)
393 assert (ROW (i).t);
419#endif 394#endif
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399
400 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1);
420 402
421 if (tabs) 403 if (tabs)
422 free (tabs); 404 free (tabs);
423 } 405 }
424 406
425 prev_nrow = nrow; 407 prev_nrow = nrow;
426 prev_ncol = ncol; 408 prev_ncol = ncol;
427 409
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 411
430 for (p = 0; p < ncol; p++) 412 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 413 tabs [col] = col % TABSIZE == 0;
432 414
433 tt_winch (); 415 tt_winch ();
434}
435
436void
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} 416}
444 417
445/* ------------------------------------------------------------------------- */ 418/* ------------------------------------------------------------------------- */
446/* 419/*
447 * Free everything. That way malloc debugging can find leakage. 420 * Free everything. That way malloc debugging can find leakage.
… …
450rxvt_term::scr_release () 423rxvt_term::scr_release ()
451{ 424{
452 delete talloc; talloc = 0; 425 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
454 427
455 free (save); 428 free (row_buf);
456 free (swap_save); 429 free (swap_buf);
457 free (drawn); 430 free (drawn_buf);
458 free (buf); 431 free (temp_buf);
459 free (tabs); 432 free (tabs);
433
434 row_buf = 0; // signal that we freed all the arrays
460} 435}
461 436
462/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
463/* 438/*
464 * Hard reset 439 * Hard reset
… …
520 min_it (s->cur.row, nrow - 1); 495 min_it (s->cur.row, nrow - 1);
521 min_it (s->cur.col, ncol - 1); 496 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 497#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 498 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 499 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 500#endif
529} 501}
530 502
531/* ------------------------------------------------------------------------- */ 503/* ------------------------------------------------------------------------- */
532/* 504/*
… …
556#if NSCREENS 528#if NSCREENS
557 if (options & Opt_secondaryScreen) 529 if (options & Opt_secondaryScreen)
558 { 530 {
559 num_scr = 0; 531 num_scr = 0;
560 532
561 for (int i = nrow; i--; ) 533 for (int i = prev_nrow; i--; )
562 ::swap (ROW(i), swap_save[i]); 534 ::swap (ROW(i), swap_buf [i]);
563 535
564 ::swap (screen.charset, swap.charset); 536 ::swap (screen.charset, swap.charset);
565 ::swap (screen.flags, swap.flags); 537 ::swap (screen.flags, swap.flags);
566 screen.flags |= Screen_VisibleCursor; 538 screen.flags |= Screen_VisibleCursor;
567 swap.flags |= Screen_VisibleCursor; 539 swap.flags |= Screen_VisibleCursor;
… …
693 // use a simple and robust scrolling algorithm, this 665 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 666 // part of scr_scroll_text is not time-critical.
695 667
696 int rows = row2 - row1 + 1; 668 int rows = row2 - row1 + 1;
697 669
670 min_it (count, rows);
671
698 for (int row = 0; row < rows; row++) 672 for (int row = 0; row < rows; row++)
699 { 673 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 674 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 675
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 676 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 677 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 678 }
705 679
706 for (int row = 0; row < rows; row++) 680 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 681 ROW(row1 + row) = temp_buf [row];
708 } 682 }
709 683
710 return count; 684 return count;
711} 685}
712 686
… …
730 last_col = ncol; 704 last_col = ncol;
731 705
732 if (nlines > 0) 706 if (nlines > 0)
733 { 707 {
734 nlines += screen.cur.row - screen.bscroll; 708 nlines += screen.cur.row - screen.bscroll;
735 if ((nlines > 0) 709 if (nlines > 0
736 && (screen.tscroll == 0) 710 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 711 && screen.bscroll == (nrow - 1))
738 { 712 {
739 /* _at least_ this many lines need to be scrolled */ 713 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 714 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
741 screen.cur.row -= nlines; 715 screen.cur.row -= nlines;
742 } 716 }
743 } 717 }
744 718
745#ifdef DEBUG_STRICT 719#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 720 assert (screen.cur.col < last_col);
747 assert ((screen.cur.row < nrow) 721 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 722 && 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 723#endif
754 row = screen.cur.row; 724 row = screen.cur.row;
755 725
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 726 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 727
… …
968 if (!line->is_longer ()) /* XXX: think about this */ 938 if (!line->is_longer ()) /* XXX: think about this */
969 max_it (line->l, screen.cur.col); 939 max_it (line->l, screen.cur.col);
970 940
971#ifdef DEBUG_STRICT 941#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 942 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 max_it (screen.cur.row, 0);
975#endif 943#endif
976} 944}
977 945
978/* ------------------------------------------------------------------------- */ 946/* ------------------------------------------------------------------------- */
979/* 947/*
… …
1134{ 1102{
1135 want_refresh = 1; 1103 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1104 ZERO_SCROLLBACK ();
1137 1105
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1106 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 max_it (screen.cur.col, 0);
1140 min_it (screen.cur.col, (int32_t)ncol - 1); 1107 clamp_it (screen.cur.col, 0, ncol - 1);
1141 1108
1142 screen.flags &= ~Screen_WrapNext; 1109 screen.flags &= ~Screen_WrapNext;
1143 1110
1144 if (relative & R_RELATIVE) 1111 if (relative & R_RELATIVE)
1145 { 1112 {
… …
1169 } 1136 }
1170 else 1137 else
1171 screen.cur.row = row; 1138 screen.cur.row = row;
1172 } 1139 }
1173 1140
1174 max_it (screen.cur.row, 0);
1175 min_it (screen.cur.row, (int32_t)nrow - 1); 1141 clamp_it (screen.cur.row, 0, nrow - 1);
1176} 1142}
1177 1143
1178/* ------------------------------------------------------------------------- */ 1144/* ------------------------------------------------------------------------- */
1179/* 1145/*
1180 * direction should be UP or DN 1146 * direction should be UP or DN
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1161 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1162 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1163 else
1198 screen.cur.row += dirn; 1164 screen.cur.row += dirn;
1199 1165
1200 max_it (screen.cur.row, 0);
1201 min_it (screen.cur.row, (int32_t)nrow - 1); 1166 clamp_it (screen.cur.row, 0, nrow - 1);
1202 selection_check (0); 1167 selection_check (0);
1203} 1168}
1204 1169
1205/* ------------------------------------------------------------------------- */ 1170/* ------------------------------------------------------------------------- */
1206/* 1171/*
… …
1224 switch (mode) 1189 switch (mode)
1225 { 1190 {
1226 case 0: /* erase to end of line */ 1191 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1192 col = screen.cur.col;
1228 num = ncol - col; 1193 num = ncol - col;
1229 min_it (ROW(row).l, (int16_t)col); 1194 min_it (ROW(row).l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1195 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1196 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1197 CLEAR_SELECTION ();
1233 break; 1198 break;
1234 case 1: /* erase to beginning of line */ 1199 case 1: /* erase to beginning of line */
… …
1301 CLEAR_SELECTION (); 1266 CLEAR_SELECTION ();
1302 1267
1303 if (row >= nrow) /* Out Of Bounds */ 1268 if (row >= nrow) /* Out Of Bounds */
1304 return; 1269 return;
1305 1270
1306 min_it (num, (nrow - row)); 1271 min_it (num, nrow - row);
1307 1272
1308 if (rstyle & (RS_RVid | RS_Uline)) 1273 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1274 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1275 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1276 {
… …
1324 1289
1325 for (; num--; row++) 1290 for (; num--; row++)
1326 { 1291 {
1327 scr_blank_screen_mem (ROW (row), rstyle); 1292 scr_blank_screen_mem (ROW (row), rstyle);
1328 ROW (row).l = 0; 1293 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1294 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1295 }
1331} 1296}
1332 1297
1333#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1334void 1299void
… …
1419 return; 1384 return;
1420 1385
1421 scr_do_wrap (); 1386 scr_do_wrap ();
1422 1387
1423 selection_check (1); 1388 selection_check (1);
1424 min_it (count, (ncol - screen.cur.col)); 1389 min_it (count, ncol - screen.cur.col);
1425 1390
1426 row = screen.cur.row; 1391 row = screen.cur.row;
1427 1392
1428 line_t *line = &ROW(row); 1393 line_t *line = &ROW(row);
1429 1394
… …
1478 scr_blank_line (*line, ncol - count, count, tr); 1443 scr_blank_line (*line, ncol - count, count, tr);
1479 1444
1480 if (line->is_longer ()) /* break line continuation */ 1445 if (line->is_longer ()) /* break line continuation */
1481 line->l = ncol; 1446 line->l = ncol;
1482 1447
1483 max_it (line->l - count, 0); 1448 line->l = max (line->l - count, 0);
1484 1449
1485 if (selection.op && current_screen == selection.screen 1450 if (selection.op && current_screen == selection.screen
1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1451 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1487 { 1452 {
1488 if (selection.end.row != screen.cur.row 1453 if (selection.end.row != screen.cur.row
… …
1509 */ 1474 */
1510void 1475void
1511rxvt_term::scr_scroll_region (int top, int bot) 1476rxvt_term::scr_scroll_region (int top, int bot)
1512{ 1477{
1513 max_it (top, 0); 1478 max_it (top, 0);
1514 min_it (bot, (int)nrow - 1); 1479 min_it (bot, nrow - 1);
1515 1480
1516 if (top > bot) 1481 if (top > bot)
1517 return; 1482 return;
1518 1483
1519 screen.tscroll = top; 1484 screen.tscroll = top;
… …
1723 bool found = false; 1688 bool found = false;
1724 1689
1725 for (int i = 0; i < nrow; i++) 1690 for (int i = 0; i < nrow; i++)
1726 { 1691 {
1727 int col = 0; 1692 int col = 0;
1728 rend_t *drp = drawn[i].r; 1693 rend_t *drp = drawn_buf[i].r;
1729 1694
1730 for (; col < ncol; col++, drp++) 1695 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1696 if ((*drp & mask) == value)
1732 { 1697 {
1733 found = true; 1698 found = true;
… …
1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1716rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1752{ 1717{
1753 int i; 1718 int i;
1754 row_col_t rc[RC_COUNT]; 1719 row_col_t rc[RC_COUNT];
1755 1720
1756 if (!drawn) /* sanity check */ 1721 if (!drawn_buf) /* sanity check */
1757 return; 1722 return;
1758 1723
1759#ifndef NO_SLOW_LINK_SUPPORT 1724#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1725 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1726 {
1762 y = 0; 1727 y = 0;
1763 eheight = height; 1728 eheight = height;
1764 } 1729 }
1765#endif
1766
1767#ifdef DEBUG_STRICT
1768#if 0
1769 // that's not debugging //TODO //FIXME
1770 clamp_it (x, 0, width);
1771 clamp_it (y, 0, height);
1772#endif
1773#endif 1730#endif
1774 1731
1775 /* round down */ 1732 /* round down */
1776 rc[PART_BEG].col = Pixel2Col (x); 1733 rc[PART_BEG].col = Pixel2Col (x);
1777 rc[PART_BEG].row = Pixel2Row (y); 1734 rc[PART_BEG].row = Pixel2Row (y);
… …
1785 min_it (rc[i].col, ncol - 1); 1742 min_it (rc[i].col, ncol - 1);
1786 min_it (rc[i].row, nrow - 1); 1743 min_it (rc[i].row, nrow - 1);
1787 } 1744 }
1788 1745
1789 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1746 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1790 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1747 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1791 1748
1792 if (refresh) 1749 if (refresh)
1793 scr_refresh (SLOW_REFRESH); 1750 scr_refresh (SLOW_REFRESH);
1794} 1751}
1795 1752
… …
2053 if (screen.cur.row + view_start != ocrow 2010 if (screen.cur.row + view_start != ocrow
2054 || screen.cur.col != oldcursor.col) 2011 || screen.cur.col != oldcursor.col)
2055 { 2012 {
2056 if (ocrow < nrow 2013 if (ocrow < nrow
2057 && oldcursor.col < ncol) 2014 && oldcursor.col < ncol)
2058 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2015 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2059 2016
2060 if (focus || !showcursor) 2017 if (focus || !showcursor)
2061 oldcursor.row = -1; 2018 oldcursor.row = -1;
2062 else 2019 else
2063 setoldcursor = 1; 2020 setoldcursor = 1;
… …
2102 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2059 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2103 { 2060 {
2104 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2061 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2105 { 2062 {
2106 line_t s = ROW(row - view_start); 2063 line_t s = ROW(row - view_start);
2107 line_t d = drawn[row]; 2064 line_t d = drawn_buf[row];
2108 line_t d2 = drawn[row + i]; 2065 line_t d2 = drawn_buf[row + i];
2109 2066
2110 for (nits = 0, col = ncol; col--; ) 2067 for (nits = 0, col = ncol; col--; )
2111 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2068 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2112 nits--; 2069 nits--;
2113 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2070 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2151 */ 2108 */
2152 for (row = 0; row < nrow; row++) 2109 for (row = 0; row < nrow; row++)
2153 { 2110 {
2154 text_t *stp = ROW(row - view_start).t; 2111 text_t *stp = ROW(row - view_start).t;
2155 rend_t *srp = ROW(row - view_start).r; 2112 rend_t *srp = ROW(row - view_start).r;
2156 text_t *dtp = drawn[row].t; 2113 text_t *dtp = drawn_buf[row].t;
2157 rend_t *drp = drawn[row].r; 2114 rend_t *drp = drawn_buf[row].r;
2158 2115
2159 /* 2116 /*
2160 * E2: OK, now the real pass 2117 * E2: OK, now the real pass
2161 */ 2118 */
2162 int ypixel = (int)Row2Pixel (row); 2119 int ypixel = (int)Row2Pixel (row);
… …
2375 2332
2376 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2333 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2377 col--; 2334 col--;
2378 2335
2379 while (col + cursorwidth < ncol 2336 while (col + cursorwidth < ncol
2380 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2337 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2381 cursorwidth++; 2338 cursorwidth++;
2382 2339
2383#ifndef NO_CURSORCOLOR 2340#ifndef NO_CURSORCOLOR
2384 if (ISSET_PIXCOLOR (Color_cursor)) 2341 if (ISSET_PIXCOLOR (Color_cursor))
2385 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2342 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2417 2374
2418void 2375void
2419rxvt_term::scr_remap_chars () 2376rxvt_term::scr_remap_chars ()
2420{ 2377{
2421 for (int i = total_rows; i--; ) 2378 for (int i = total_rows; i--; )
2422 scr_remap_chars (save[i]); 2379 scr_remap_chars (row_buf [i]);
2423 2380
2424 for (int i = nrow; i--; ) 2381 for (int i = nrow; i--; )
2425 { 2382 {
2426 scr_remap_chars (drawn[i]); 2383 scr_remap_chars (drawn_buf [i]);
2427 scr_remap_chars (swap_save[i]); 2384 scr_remap_chars (swap_buf [i]);
2428 } 2385 }
2429} 2386}
2430 2387
2431void 2388void
2432rxvt_term::scr_recolour () 2389rxvt_term::scr_recolour ()
… …
2529 char r1[] = "\n"; 2486 char r1[] = "\n";
2530 2487
2531 for (row = saveLines - nsaved; 2488 for (row = saveLines - nsaved;
2532 row < saveLines + nrow - 1; row++) 2489 row < saveLines + nrow - 1; row++)
2533 { 2490 {
2534 width = save[row].l >= 0 ? save[row].l 2491 width = row_buf[row].l >= 0 ? row_buf[row].l
2535 : ncol; 2492 : ncol;
2536 for (towrite = width; towrite; towrite -= wrote) 2493 for (towrite = width; towrite; towrite -= wrote)
2537 { 2494 {
2538 wrote = write (fd, & (save[row].t[width - towrite]), 2495 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2539 towrite); 2496 towrite);
2540 if (wrote < 0) 2497 if (wrote < 0)
2541 return; /* XXX: death, no report */ 2498 return; /* XXX: death, no report */
2542 } 2499 }
2543 if (save[row].l >= 0) 2500 if (row_buf[row].l >= 0)
2544 if (write (fd, r1, 1) <= 0) 2501 if (write (fd, r1, 1) <= 0)
2545 return; /* XXX: death, no report */ 2502 return; /* XXX: death, no report */
2546 } 2503 }
2547} 2504}
2548#endif 2505#endif
… …
3610 3567
3611 // make space for border 3568 // make space for border
3612 w += 2; min_it (w, ncol); 3569 w += 2; min_it (w, ncol);
3613 h += 2; min_it (h, nrow); 3570 h += 2; min_it (h, nrow);
3614 3571
3615 x -= 1; max_it (x, 0); 3572 x -= 1; clamp_it (x, 0, ncol - w);
3616 y -= 1; max_it (y, 0); 3573 y -= 1; clamp_it (y, 0, nrow - h);
3617
3618 min_it (x, ncol - w);
3619 min_it (y, nrow - h);
3620 3574
3621 ov_x = x; ov_y = y; 3575 ov_x = x; ov_y = y;
3622 ov_w = w; ov_h = h; 3576 ov_w = w; ov_h = h;
3623 3577
3624 ov_text = new text_t *[h]; 3578 ov_text = new text_t *[h];

Diff Legend

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