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.180 by root, Wed Dec 21 10:34:24 2005 UTC vs.
Revision 1.186 by root, Wed Dec 21 19:50:17 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 printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
246 rxvt_salloc *old_ra;
247 245
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
248 if (nrow < prev_nrow) 250 if (nrow < prev_nrow)
249 { 251 {
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++) 252 for (int row = nrow; row < prev_nrow; row++)
256 { 253 {
257 lfree (ROW(p));
258 lfree (swap_save[p]); 254 lfree (swap_buf [row]);
259 lfree (drawn[p]); 255 lfree (drawn_buf[row]);
260 } 256 }
257 }
258#endif
261 259
262 /* we have fewer rows so fix up cursor position */ 260 drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 261 temp_buf = (line_t *) rxvt_realloc (temp_buf , nrow * sizeof (line_t));
262 swap_buf = (line_t *) rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 263
265 scr_reset_realloc (); /* realloc _last_ */ 264 for (int row = min (nrow, prev_nrow); row--; )
265 {
266 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]);
268 }
269
270 for (int row = prev_nrow; row < nrow; row++)
271 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 }
275
276 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
266 } 277
267 else if (nrow > prev_nrow)
268 {
269 /* add rows */
270 scr_reset_realloc (); /* realloc _first_ */
271
272 int ocol = ncol;
273 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
274
275 k = min (nsaved, nrow - prev_nrow);
276
277 for (p = prev_total_rows; p < total_rows; p++)
278 save[p].clear ();
279
280 for (p = prev_total_rows; p < total_rows - k; p++)
281 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
282
283 for (p = prev_nrow; p < nrow; p++)
284 {
285 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE);
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
298 assert (screen.cur.row < nrow);
299#else /* drive with your eyes closed */
300 MIN_IT (screen.cur.row, nrow - 1);
301#endif
302 ncol = ocol; // save b/c scr_blank_screen_mem uses this
303 }
304
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 278 // re-wrap lines, this is rather ugly, possibly because I am too dumb
328 // to come up with a lean and mean algorithm. 279 // 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 280
336 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 281 int p = MOD (term_start + nrow , prev_total_rows); // previous row
282 int pend = MOD (term_start - nsaved, prev_total_rows);
283 int q = total_rows; // rewrapped row
337 284
338 p = prev_total_rows;
339 q = total_rows;
340
341 while (p > 0 && q > 0) 285 while (p != pend && q > 0)
342 { 286 {
343 --p; 287 p = MOD (p - 1, prev_total_rows);
344 288
345 printf ("pq %d:%d\n", p, q); 289 assert (old_buf [MOD (p, prev_total_rows)].t);
346 if (save[p].t) 290 assert (!old_buf [MOD (p, prev_total_rows)].is_longer ());
291
292 int llen = old_buf [MOD (p, prev_total_rows)].l;
293
294 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
347 { 295 {
348 int llen = save[p].l; 296 p = MOD (p - 1, prev_total_rows);
349 297
350 assert (llen >= 0); 298 llen += prev_ncol;
299 }
351 300
352 while (p && save[p - 1].l < 0) 301 int qlines = llen / ncol + 1;
302 int lofs = 0;
303
304 q -= qlines;
305
306 int qrow = q;
307
308 for (; qlines--; qrow++)
309 {
310 if (qrow >= 0)
353 { 311 {
312 line_t &qline = row_buf [qrow];
313
314 lalloc (qline);
315 qline.set_is_longer ();
316
317 int qcol = 0;
318
319 for (;;)
354 --p; 320 {
355 llen += prev_ncol; 321 int prow = lofs / prev_ncol + p;
322 int pcol = lofs % prev_ncol;
323
324 line_t &pline = old_buf [p];
325
326 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327
328 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);
329
330 if (len <= 0)
331 {
332 qline.l = qcol;
333 scr_blank_line (qline, qcol, ncol - qcol, DEFAULT_RSTYLE);
334 break;
335 }
336
337 assert (lofs < 1000);
338
339 memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t));
340 memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t));
341
342 lofs += len;
343 qcol += len;
344
345 if (qcol == ncol)
346 break;
347 }
356 } 348 }
357
358 int qlines = llen / ncol + 1;
359 int lofs = 0;
360
361 q -= qlines;
362
363 int qrow = q;
364
365 printf ("QL %d llen %d\n", qlines, llen);//D
366 for (; qlines--; qrow++)
367 {
368 if (qrow >= 0)
369 {
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;
379 int pcol = lofs % prev_ncol;
380
381 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
382
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);
397
398 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t));
399 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t));
400
401 lofs += len;
402 qcol += len;
403
404 if (qcol == ncol)
405 break;
406 }
407 }
408 else 349 else
409 lofs += ncol; 350 lofs += ncol;
410 }
411 } 351 }
412 } 352 }
413 353
414 free (screen.text); screen.text = tp; 354 free (old_buf);
415 free (screen.rend); screen.rend = rp; 355 delete old_ta;
416 free (screen.tlen); screen.tlen = tl; 356 delete old_ra;
417 357
418 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 358 min_it (screen.cur.row, nrow - 1);
419#endif 359 min_it (screen.cur.col, ncol - 1);
420 360
421 if (tabs) 361 if (tabs)
422 free (tabs); 362 free (tabs);
423 } 363 }
424 364
425 prev_nrow = nrow; 365 prev_nrow = nrow;
426 prev_ncol = ncol; 366 prev_ncol = ncol;
427 367
428 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 368 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
429 369
430 for (p = 0; p < ncol; p++) 370 for (int col = ncol; col--; )
431 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 371 tabs [col] = col % TABSIZE == 0;
432 372
433 tt_winch (); 373 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} 374}
444 375
445/* ------------------------------------------------------------------------- */ 376/* ------------------------------------------------------------------------- */
446/* 377/*
447 * Free everything. That way malloc debugging can find leakage. 378 * Free everything. That way malloc debugging can find leakage.
… …
450rxvt_term::scr_release () 381rxvt_term::scr_release ()
451{ 382{
452 delete talloc; talloc = 0; 383 delete talloc; talloc = 0;
453 delete ralloc; ralloc = 0; 384 delete ralloc; ralloc = 0;
454 385
455 free (save); 386 free (row_buf);
456 free (swap_save); 387 free (swap_buf);
457 free (drawn); 388 free (drawn_buf);
458 free (buf); 389 free (temp_buf);
459 free (tabs); 390 free (tabs);
460} 391}
461 392
462/* ------------------------------------------------------------------------- */ 393/* ------------------------------------------------------------------------- */
463/* 394/*
… …
515 set_font_style (); 446 set_font_style ();
516 break; 447 break;
517 } 448 }
518 449
519 /* boundary check in case screen size changed between SAVE and RESTORE */ 450 /* boundary check in case screen size changed between SAVE and RESTORE */
520 MIN_IT (s->cur.row, nrow - 1); 451 min_it (s->cur.row, nrow - 1);
521 MIN_IT (s->cur.col, ncol - 1); 452 min_it (s->cur.col, ncol - 1);
522#ifdef DEBUG_STRICT 453#ifdef DEBUG_STRICT
523 assert (s->cur.row >= 0); 454 assert (s->cur.row >= 0);
524 assert (s->cur.col >= 0); 455 assert (s->cur.col >= 0);
525#else /* drive with your eyes closed */ 456#else /* drive with your eyes closed */
526 MAX_IT (s->cur.row, 0); 457 max_it (s->cur.row, 0);
527 MAX_IT (s->cur.col, 0); 458 max_it (s->cur.col, 0);
528#endif 459#endif
529} 460}
530 461
531/* ------------------------------------------------------------------------- */ 462/* ------------------------------------------------------------------------- */
532/* 463/*
… …
557 if (options & Opt_secondaryScreen) 488 if (options & Opt_secondaryScreen)
558 { 489 {
559 num_scr = 0; 490 num_scr = 0;
560 491
561 for (int i = nrow; i--; ) 492 for (int i = nrow; i--; )
562 ::swap (ROW(i), swap_save[i]); 493 ::swap (ROW(i), swap_buf [i]);
563 494
564 ::swap (screen.charset, swap.charset); 495 ::swap (screen.charset, swap.charset);
565 ::swap (screen.flags, swap.flags); 496 ::swap (screen.flags, swap.flags);
566 screen.flags |= Screen_VisibleCursor; 497 screen.flags |= Screen_VisibleCursor;
567 swap.flags |= Screen_VisibleCursor; 498 swap.flags |= Screen_VisibleCursor;
… …
693 // use a simple and robust scrolling algorithm, this 624 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 625 // part of scr_scroll_text is not time-critical.
695 626
696 int rows = row2 - row1 + 1; 627 int rows = row2 - row1 + 1;
697 628
629 min_it (count, rows);
630
698 for (int row = 0; row < rows; row++) 631 for (int row = 0; row < rows; row++)
699 { 632 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 634
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 635 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 636 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 637 }
705 638
706 for (int row = 0; row < rows; row++) 639 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 640 ROW(row1 + row) = temp_buf [row];
708 } 641 }
709 642
710 return count; 643 return count;
711} 644}
712 645
… …
730 last_col = ncol; 663 last_col = ncol;
731 664
732 if (nlines > 0) 665 if (nlines > 0)
733 { 666 {
734 nlines += screen.cur.row - screen.bscroll; 667 nlines += screen.cur.row - screen.bscroll;
735 if ((nlines > 0) 668 if (nlines > 0
736 && (screen.tscroll == 0) 669 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 670 && screen.bscroll == (nrow - 1))
738 { 671 {
739 /* _at least_ this many lines need to be scrolled */ 672 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
741 screen.cur.row -= nlines; 674 screen.cur.row -= nlines;
742 } 675 }
743 } 676 }
744 677
745#ifdef DEBUG_STRICT 678#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 679 assert (screen.cur.col < last_col);
747 assert ((screen.cur.row < nrow) 680 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 681 && screen.cur.row >= -nsaved);
749#else /* drive with your eyes closed */ 682#else /* drive with your eyes closed */
750 MIN_IT (screen.cur.col, last_col - 1); 683 min_it (screen.cur.col, last_col - 1);
751 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 684 clamp_it (screen.cur.row, -nsaved, nrow - 1);
752 MAX_IT (screen.cur.row, - (int32_t)nsaved);
753#endif 685#endif
754 row = screen.cur.row; 686 row = screen.cur.row;
755 687
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 688 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 689
… …
763 695
764 if (c < 0x20) 696 if (c < 0x20)
765 if (c == C0_LF) 697 if (c == C0_LF)
766 { 698 {
767 if (!line->is_longer ()) /* XXX: think about this */ 699 if (!line->is_longer ()) /* XXX: think about this */
768 MAX_IT (line->l, screen.cur.col); 700 max_it (line->l, screen.cur.col);
769 701
770 screen.flags &= ~Screen_WrapNext; 702 screen.flags &= ~Screen_WrapNext;
771 703
772 if (screen.cur.row == screen.bscroll) 704 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 705 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
778 continue; 710 continue;
779 } 711 }
780 else if (c == C0_CR) 712 else if (c == C0_CR)
781 { 713 {
782 if (!line->is_longer ()) /* XXX: think about this */ 714 if (!line->is_longer ()) /* XXX: think about this */
783 MAX_IT (line->l, screen.cur.col); 715 max_it (line->l, screen.cur.col);
784 716
785 screen.flags &= ~Screen_WrapNext; 717 screen.flags &= ~Screen_WrapNext;
786 screen.cur.col = 0; 718 screen.cur.col = 0;
787 continue; 719 continue;
788 } 720 }
… …
964#endif 896#endif
965 } 897 }
966 } 898 }
967 899
968 if (!line->is_longer ()) /* XXX: think about this */ 900 if (!line->is_longer ()) /* XXX: think about this */
969 MAX_IT (line->l, screen.cur.col); 901 max_it (line->l, screen.cur.col);
970 902
971#ifdef DEBUG_STRICT 903#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 904 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */ 905#else /* drive with your eyes closed */
974 MAX_IT (screen.cur.row, 0); 906 max_it (screen.cur.row, 0);
975#endif 907#endif
976} 908}
977 909
978/* ------------------------------------------------------------------------- */ 910/* ------------------------------------------------------------------------- */
979/* 911/*
… …
1045 if (ht && options & Opt_pastableTabs) 977 if (ht && options & Opt_pastableTabs)
1046 { 978 {
1047 base_rend = SET_FONT (base_rend, 0); 979 base_rend = SET_FONT (base_rend, 0);
1048 980
1049 if (!l.is_longer ()) /* XXX: think about this */ 981 if (!l.is_longer ()) /* XXX: think about this */
1050 MAX_IT (l.l, x); 982 max_it (l.l, x);
1051 983
1052 i = screen.cur.col; 984 i = screen.cur.col;
1053 985
1054 l.t[i] = '\t'; 986 l.t[i] = '\t';
1055 l.r[i] = base_rend; 987 l.r[i] = base_rend;
… …
1134{ 1066{
1135 want_refresh = 1; 1067 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1068 ZERO_SCROLLBACK ();
1137 1069
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1070 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 MAX_IT (screen.cur.col, 0); 1071 clamp_it (screen.cur.col, 0, ncol - 1);
1140 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1141 1072
1142 screen.flags &= ~Screen_WrapNext; 1073 screen.flags &= ~Screen_WrapNext;
1143 1074
1144 if (relative & R_RELATIVE) 1075 if (relative & R_RELATIVE)
1145 { 1076 {
… …
1163 else 1094 else
1164 { 1095 {
1165 if (screen.flags & Screen_Relative) 1096 if (screen.flags & Screen_Relative)
1166 { /* relative origin mode */ 1097 { /* relative origin mode */
1167 screen.cur.row = row + screen.tscroll; 1098 screen.cur.row = row + screen.tscroll;
1168 MIN_IT (screen.cur.row, screen.bscroll); 1099 min_it (screen.cur.row, screen.bscroll);
1169 } 1100 }
1170 else 1101 else
1171 screen.cur.row = row; 1102 screen.cur.row = row;
1172 } 1103 }
1173 1104
1174 MAX_IT (screen.cur.row, 0); 1105 clamp_it (screen.cur.row, 0, nrow - 1);
1175 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1176} 1106}
1177 1107
1178/* ------------------------------------------------------------------------- */ 1108/* ------------------------------------------------------------------------- */
1179/* 1109/*
1180 * direction should be UP or DN 1110 * direction should be UP or DN
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1125 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1126 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1127 else
1198 screen.cur.row += dirn; 1128 screen.cur.row += dirn;
1199 1129
1200 MAX_IT (screen.cur.row, 0); 1130 clamp_it (screen.cur.row, 0, nrow - 1);
1201 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1202 selection_check (0); 1131 selection_check (0);
1203} 1132}
1204 1133
1205/* ------------------------------------------------------------------------- */ 1134/* ------------------------------------------------------------------------- */
1206/* 1135/*
… …
1224 switch (mode) 1153 switch (mode)
1225 { 1154 {
1226 case 0: /* erase to end of line */ 1155 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1156 col = screen.cur.col;
1228 num = ncol - col; 1157 num = ncol - col;
1229 MIN_IT (ROW(row).l, (int16_t)col); 1158 min_it (ROW(row).l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1161 CLEAR_SELECTION ();
1233 break; 1162 break;
1234 case 1: /* erase to beginning of line */ 1163 case 1: /* erase to beginning of line */
… …
1301 CLEAR_SELECTION (); 1230 CLEAR_SELECTION ();
1302 1231
1303 if (row >= nrow) /* Out Of Bounds */ 1232 if (row >= nrow) /* Out Of Bounds */
1304 return; 1233 return;
1305 1234
1306 MIN_IT (num, (nrow - row)); 1235 min_it (num, nrow - row);
1307 1236
1308 if (rstyle & (RS_RVid | RS_Uline)) 1237 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1238 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1239 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1240 {
… …
1324 1253
1325 for (; num--; row++) 1254 for (; num--; row++)
1326 { 1255 {
1327 scr_blank_screen_mem (ROW (row), rstyle); 1256 scr_blank_screen_mem (ROW (row), rstyle);
1328 ROW (row).l = 0; 1257 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1258 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1259 }
1331} 1260}
1332 1261
1333#if ENABLE_FRILLS 1262#if ENABLE_FRILLS
1334void 1263void
… …
1419 return; 1348 return;
1420 1349
1421 scr_do_wrap (); 1350 scr_do_wrap ();
1422 1351
1423 selection_check (1); 1352 selection_check (1);
1424 MIN_IT (count, (ncol - screen.cur.col)); 1353 min_it (count, ncol - screen.cur.col);
1425 1354
1426 row = screen.cur.row; 1355 row = screen.cur.row;
1427 1356
1428 line_t *line = &ROW(row); 1357 line_t *line = &ROW(row);
1429 1358
… …
1437 } 1366 }
1438 1367
1439 if (!line->is_longer ()) 1368 if (!line->is_longer ())
1440 { 1369 {
1441 line->l += count; 1370 line->l += count;
1442 MIN_IT (line->l, ncol); 1371 min_it (line->l, ncol);
1443 } 1372 }
1444 1373
1445 if (selection.op && current_screen == selection.screen 1374 if (selection.op && current_screen == selection.screen
1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1447 { 1376 {
… …
1508 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1437 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1509 */ 1438 */
1510void 1439void
1511rxvt_term::scr_scroll_region (int top, int bot) 1440rxvt_term::scr_scroll_region (int top, int bot)
1512{ 1441{
1513 MAX_IT (top, 0); 1442 max_it (top, 0);
1514 MIN_IT (bot, (int)nrow - 1); 1443 min_it (bot, nrow - 1);
1515 1444
1516 if (top > bot) 1445 if (top > bot)
1517 return; 1446 return;
1518 1447
1519 screen.tscroll = top; 1448 screen.tscroll = top;
… …
1617 XGCValues gcvalue; 1546 XGCValues gcvalue;
1618 1547
1619 if (rvideo != mode) 1548 if (rvideo != mode)
1620 { 1549 {
1621 rvideo = mode; 1550 rvideo = mode;
1622 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1552#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1553 if (bgPixmap.pixmap == None)
1625#endif 1554#endif
1626#if TRANSPARENT 1555#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1556 if (! (options & Opt_transparent) || am_transparent == 0)
… …
1723 bool found = false; 1652 bool found = false;
1724 1653
1725 for (int i = 0; i < nrow; i++) 1654 for (int i = 0; i < nrow; i++)
1726 { 1655 {
1727 int col = 0; 1656 int col = 0;
1728 rend_t *drp = drawn[i].r; 1657 rend_t *drp = drawn_buf[i].r;
1729 1658
1730 for (; col < ncol; col++, drp++) 1659 for (; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1660 if ((*drp & mask) == value)
1732 { 1661 {
1733 found = true; 1662 found = true;
… …
1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1680rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh)
1752{ 1681{
1753 int i; 1682 int i;
1754 row_col_t rc[RC_COUNT]; 1683 row_col_t rc[RC_COUNT];
1755 1684
1756 if (!drawn) /* sanity check */ 1685 if (!drawn_buf) /* sanity check */
1757 return; 1686 return;
1758 1687
1759#ifndef NO_SLOW_LINK_SUPPORT 1688#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1689 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1690 {
… …
1763 eheight = height; 1692 eheight = height;
1764 } 1693 }
1765#endif 1694#endif
1766 1695
1767#ifdef DEBUG_STRICT 1696#ifdef DEBUG_STRICT
1768 x = max (x, 0); 1697#if 0
1769 x = min (x, (int)width); 1698 // that's not debugging //TODO //FIXME
1770 y = max (y, 0); 1699 clamp_it (x, 0, width);
1771 y = min (y, (int)height); 1700 clamp_it (y, 0, height);
1701#endif
1772#endif 1702#endif
1773 1703
1774 /* round down */ 1704 /* round down */
1775 rc[PART_BEG].col = Pixel2Col (x); 1705 rc[PART_BEG].col = Pixel2Col (x);
1776 rc[PART_BEG].row = Pixel2Row (y); 1706 rc[PART_BEG].row = Pixel2Row (y);
… …
1779 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1709 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1780 1710
1781 /* sanity checks */ 1711 /* sanity checks */
1782 for (i = PART_BEG; i < RC_COUNT; i++) 1712 for (i = PART_BEG; i < RC_COUNT; i++)
1783 { 1713 {
1784 MIN_IT (rc[i].col, ncol - 1); 1714 min_it (rc[i].col, ncol - 1);
1785 MIN_IT (rc[i].row, nrow - 1); 1715 min_it (rc[i].row, nrow - 1);
1786 } 1716 }
1787 1717
1788 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1718 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1789 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1719 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1790 1720
1791 if (refresh) 1721 if (refresh)
1792 scr_refresh (SLOW_REFRESH); 1722 scr_refresh (SLOW_REFRESH);
1793} 1723}
1794 1724
… …
2052 if (screen.cur.row + view_start != ocrow 1982 if (screen.cur.row + view_start != ocrow
2053 || screen.cur.col != oldcursor.col) 1983 || screen.cur.col != oldcursor.col)
2054 { 1984 {
2055 if (ocrow < nrow 1985 if (ocrow < nrow
2056 && oldcursor.col < ncol) 1986 && oldcursor.col < ncol)
2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 1987 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2058 1988
2059 if (focus || !showcursor) 1989 if (focus || !showcursor)
2060 oldcursor.row = -1; 1990 oldcursor.row = -1;
2061 else 1991 else
2062 setoldcursor = 1; 1992 setoldcursor = 1;
… …
2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2031 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2102 { 2032 {
2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2033 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2104 { 2034 {
2105 line_t s = ROW(row - view_start); 2035 line_t s = ROW(row - view_start);
2106 line_t d = drawn[row]; 2036 line_t d = drawn_buf[row];
2107 line_t d2 = drawn[row + i]; 2037 line_t d2 = drawn_buf[row + i];
2108 2038
2109 for (nits = 0, col = ncol; col--; ) 2039 for (nits = 0, col = ncol; col--; )
2110 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2040 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2111 nits--; 2041 nits--;
2112 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2042 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2130 2060
2131 if (len != -1) 2061 if (len != -1)
2132 { 2062 {
2133 /* also comes here at end if needed because of >= above */ 2063 /* also comes here at end if needed because of >= above */
2134 if (wlen < len) 2064 if (wlen < len)
2135 SWAP_IT (wlen, len, int); 2065 ::swap (wlen, len);
2136 2066
2137 XCopyArea (display->display, vt, vt, 2067 XCopyArea (display->display, vt, vt,
2138 gc, 0, Row2Pixel (len + i), 2068 gc, 0, Row2Pixel (len + i),
2139 (unsigned int)TermWin_TotalWidth (), 2069 (unsigned int)TermWin_TotalWidth (),
2140 (unsigned int)Height2Pixel (wlen - len + 1), 2070 (unsigned int)Height2Pixel (wlen - len + 1),
… …
2150 */ 2080 */
2151 for (row = 0; row < nrow; row++) 2081 for (row = 0; row < nrow; row++)
2152 { 2082 {
2153 text_t *stp = ROW(row - view_start).t; 2083 text_t *stp = ROW(row - view_start).t;
2154 rend_t *srp = ROW(row - view_start).r; 2084 rend_t *srp = ROW(row - view_start).r;
2155 text_t *dtp = drawn[row].t; 2085 text_t *dtp = drawn_buf[row].t;
2156 rend_t *drp = drawn[row].r; 2086 rend_t *drp = drawn_buf[row].r;
2157 2087
2158 /* 2088 /*
2159 * E2: OK, now the real pass 2089 * E2: OK, now the real pass
2160 */ 2090 */
2161 int ypixel = (int)Row2Pixel (row); 2091 int ypixel = (int)Row2Pixel (row);
… …
2272 fore = Color_UL; 2202 fore = Color_UL;
2273#endif 2203#endif
2274 2204
2275 if (invert) 2205 if (invert)
2276 { 2206 {
2277 SWAP_IT (fore, back, int); 2207 ::swap (fore, back);
2278 2208
2279#ifndef NO_BOLD_UNDERLINE_REVERSE 2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2280 if (ISSET_PIXCOLOR (Color_RV)) 2210 if (ISSET_PIXCOLOR (Color_RV))
2281 back = Color_RV; 2211 back = Color_RV;
2282 2212
… …
2374 2304
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2305 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--; 2306 col--;
2377 2307
2378 while (col + cursorwidth < ncol 2308 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2309 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++; 2310 cursorwidth++;
2381 2311
2382#ifndef NO_CURSORCOLOR 2312#ifndef NO_CURSORCOLOR
2383 if (ISSET_PIXCOLOR (Color_cursor)) 2313 if (ISSET_PIXCOLOR (Color_cursor))
2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2314 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2416 2346
2417void 2347void
2418rxvt_term::scr_remap_chars () 2348rxvt_term::scr_remap_chars ()
2419{ 2349{
2420 for (int i = total_rows; i--; ) 2350 for (int i = total_rows; i--; )
2421 scr_remap_chars (save[i]); 2351 scr_remap_chars (row_buf [i]);
2422 2352
2423 for (int i = nrow; i--; ) 2353 for (int i = nrow; i--; )
2424 { 2354 {
2425 scr_remap_chars (drawn[i]); 2355 scr_remap_chars (drawn_buf [i]);
2426 scr_remap_chars (swap_save[i]); 2356 scr_remap_chars (swap_buf [i]);
2427 } 2357 }
2428} 2358}
2429 2359
2430void 2360void
2431rxvt_term::scr_recolour () 2361rxvt_term::scr_recolour ()
… …
2528 char r1[] = "\n"; 2458 char r1[] = "\n";
2529 2459
2530 for (row = saveLines - nsaved; 2460 for (row = saveLines - nsaved;
2531 row < saveLines + nrow - 1; row++) 2461 row < saveLines + nrow - 1; row++)
2532 { 2462 {
2533 width = save[row].l >= 0 ? save[row].l 2463 width = row_buf[row].l >= 0 ? row_buf[row].l
2534 : ncol; 2464 : ncol;
2535 for (towrite = width; towrite; towrite -= wrote) 2465 for (towrite = width; towrite; towrite -= wrote)
2536 { 2466 {
2537 wrote = write (fd, & (save[row].t[width - towrite]), 2467 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2538 towrite); 2468 towrite);
2539 if (wrote < 0) 2469 if (wrote < 0)
2540 return; /* XXX: death, no report */ 2470 return; /* XXX: death, no report */
2541 } 2471 }
2542 if (save[row].l >= 0) 2472 if (row_buf[row].l >= 0)
2543 if (write (fd, r1, 1) <= 0) 2473 if (write (fd, r1, 1) <= 0)
2544 return; /* XXX: death, no report */ 2474 return; /* XXX: death, no report */
2545 } 2475 }
2546} 2476}
2547#endif 2477#endif
… …
3364 } 3294 }
3365 } 3295 }
3366 3296
3367#if ENABLE_FRILLS 3297#if ENABLE_FRILLS
3368 if (selection.rect && selection.beg.col > selection.end.col) 3298 if (selection.rect && selection.beg.col > selection.end.col)
3369 SWAP_IT (selection.beg.col, selection.end.col, int); 3299 ::swap (selection.beg.col, selection.end.col);
3370#endif 3300#endif
3371} 3301}
3372 3302
3373#if ENABLE_FRILLS 3303#if ENABLE_FRILLS
3374void 3304void
… …
3572 */ 3502 */
3573void 3503void
3574rxvt_term::pixel_position (int *x, int *y) 3504rxvt_term::pixel_position (int *x, int *y)
3575{ 3505{
3576 *x = Pixel2Col (*x); 3506 *x = Pixel2Col (*x);
3577 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3507 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3578 *y = Pixel2Row (*y); 3508 *y = Pixel2Row (*y);
3579 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3509 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3580} 3510}
3581 3511
3582/* ------------------------------------------------------------------------- */ 3512/* ------------------------------------------------------------------------- */
3583#ifdef USE_XIM 3513#ifdef USE_XIM
3584void 3514void
… …
3606 3536
3607 if (x < 0) x = ncol - w; 3537 if (x < 0) x = ncol - w;
3608 if (y < 0) y = nrow - h; 3538 if (y < 0) y = nrow - h;
3609 3539
3610 // make space for border 3540 // make space for border
3611 w += 2; MIN_IT (w, ncol); 3541 w += 2; min_it (w, ncol);
3612 h += 2; MIN_IT (h, nrow); 3542 h += 2; min_it (h, nrow);
3613 3543
3614 x -= 1; MAX_IT (x, 0); 3544 x -= 1; clamp_it (x, 0, ncol - w);
3615 y -= 1; MAX_IT (y, 0); 3545 y -= 1; clamp_it (y, 0, nrow - h);
3616
3617 MIN_IT (x, ncol - w);
3618 MIN_IT (y, nrow - h);
3619 3546
3620 ov_x = x; ov_y = y; 3547 ov_x = x; ov_y = y;
3621 ov_w = w; ov_h = h; 3548 ov_w = w; ov_h = h;
3622 3549
3623 ov_text = new text_t *[h]; 3550 ov_text = new text_t *[h];

Diff Legend

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