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.188 by root, Thu Dec 22 00:07:47 2005 UTC vs.
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC

… …
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 272 }
273 273
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
275 275
276 // re-wrap lines, this is rather ugly, possibly because I am too dumb
277 // to come up with a lean and mean algorithm.
278
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows); 277 int pend = MOD (term_start - nsaved , prev_total_rows);
281 int q = total_rows; // rewrapped row 278 int q = total_rows; // rewrapped row
282 279
283 while (p != pend && q > 0) 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
284 { 288 do
285 p = MOD (p - 1, prev_total_rows);
286#ifdef DEBUG_STRICT
287 assert (old_buf [MOD (p, prev_total_rows)].t);
288#endif
289
290 int llen = old_buf [MOD (p, prev_total_rows)].l;
291
292 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
293 { 289 {
294 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
295 294
295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
297
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 {
300 p = MOD (p - 1, prev_total_rows);
301
302 plines++;
296 llen += prev_ncol; 303 llen += prev_ncol;
304 }
305
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
314 int lofs = 0;
315 line_t *qline;
316
317 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++)
319 {
320 qline = row_buf + qrow;
321 lalloc (*qline);
322 qline->set_is_longer ();
323
324 int qcol = 0;
325
326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
328 {
329 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol;
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
343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
344
345 assert (len);
346 assert (pline.t);
347
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350
351 lofs += len;
352 qcol += len;
353 }
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);
297 } 358 }
359 while (p != pend && q > 0);
298 360
299 int qlines = max (0, (llen - 1) / ncol) + 1; 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);
300 367
301 // drop partial lines completely 368 }
302 if (q < qlines) 369 else
303 break; 370 {
304 371 // if no scrollback exists (yet), wing, instead of wrap
305 q -= qlines; 372
306 373 for (int row = min (nrow, prev_nrow); row--; )
307 int lofs = 0;
308 line_t *qline;
309
310 // re-assemble the full line by destination lines
311 for (int qrow = q; qlines--; qrow++)
312 { 374 {
313 qline = row_buf + qrow;
314 lalloc (*qline);
315 qline->set_is_longer ();
316
317 int qcol = 0;
318
319 // fill a single destination line
320 while (lofs < llen && qcol < ncol)
321 {
322 int prow = lofs / prev_ncol;
323 int pcol = lofs % prev_ncol;
324
325 line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; 375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
376 line_t &qline = row_buf [row];
326 377
327 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 378 qline = pline;
328 379 lresize (qline);
329 assert (len);
330 assert (pline.t);
331
332 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
333 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
334
335 lofs += len;
336 qcol += len;
337 }
338 } 380 }
339 381
340 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 382 for (int row = prev_nrow; row < nrow; row++)
341 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 383 {
384 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
342 } 385 }
343 386
344 term_start = total_rows - nrow;
345 view_start = 0; 387 term_start = 0;
346 nsaved = term_start - q; 388 }
347 389
348 // make sure all terminal lines exist 390#ifdef DEBUG_STRICT //TODO: remove
349 while (nsaved < 0)
350 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
351
352 for (int i = -nsaved; i < nrow; i++) 391 for (int i = -nsaved; i < nrow; i++)
353 assert (ROW (i).t);//D 392 assert (ROW (i).t);
393#endif
354 394
355 free (old_buf); 395 free (old_buf);
356 delete old_ta; 396 delete old_ta;
357 delete old_ra; 397 delete old_ra;
358 398
359 min_it (screen.cur.row, nrow - 1); 399 clamp_it (screen.cur.row, 0, nrow - 1);
360 min_it (screen.cur.col, ncol - 1); 400 clamp_it (screen.cur.col, 0, ncol - 1);
361 401
362 if (tabs) 402 if (tabs)
363 free (tabs); 403 free (tabs);
364 } 404 }
365 405
… …
580 { 620 {
581 selection.beg.row -= count; 621 selection.beg.row -= count;
582 selection.end.row -= count; 622 selection.end.row -= count;
583 selection.mark.row -= count; 623 selection.mark.row -= count;
584 624
585 selection_check (0); 625 if (selection.beg.row < -nsaved
626 || selection.end.row < -nsaved
627 || selection.mark.row < -nsaved)
628 {
629 CLEAR_ALL_SELECTION ();
630 selection.op = SELECTION_CLEAR;
631 }
586 } 632 }
587 633
588 for (int i = count; i--; ) 634 for (int i = count; i--; )
589 scr_blank_screen_mem (ROW(row2 - i), rstyle); 635 scr_blank_screen_mem (ROW(row2 - i), rstyle);
590 636
… …
595 } 641 }
596 else 642 else
597 { 643 {
598 if (selection.op && current_screen == selection.screen) 644 if (selection.op && current_screen == selection.screen)
599 { 645 {
600 int i = selection.beg.row; 646 if ((selection.beg.row < row1 && selection.end.row > row1)
601 int j = selection.end.row; 647 || (selection.beg.row < row2 && selection.end.row > row2)
602
603 if ((i < row1 && j > row1)
604 || (i < row2 && j > row2)
605 || (i - count < row1 && i >= row1) 648 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
606 || (i - count > row2 && i <= row2) 649 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
607 || (j - count < row1 && j >= row1) 650 || (selection.end.row - count < row1 && selection.end.row >= row1)
608 || (j - count > row2 && j <= row2)) 651 || (selection.end.row - count > row2 && selection.end.row <= row2))
609 { 652 {
610 CLEAR_ALL_SELECTION (); 653 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 654 selection.op = SELECTION_CLEAR;
612 } 655 }
613 else if (j >= row1 && j <= row2) 656 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 657 {
615 /* move selected region too */ 658 /* move selected region too */
616 selection.beg.row -= count; 659 selection.beg.row -= count;
617 selection.end.row -= count; 660 selection.end.row -= count;
618 selection.mark.row -= count; 661 selection.mark.row -= count;
… …
653 if (len <= 0) /* sanity */ 696 if (len <= 0) /* sanity */
654 return; 697 return;
655 698
656 unsigned char checksel; 699 unsigned char checksel;
657 unicode_t c; 700 unicode_t c;
658 int row, last_col; 701 int last_col;
659 const unicode_t *strend = str + len; 702 const unicode_t *strend = str + len;
660 703
661 want_refresh = 1; 704 want_refresh = 1;
662 ZERO_SCROLLBACK (); 705 ZERO_SCROLLBACK ();
663 last_col = ncol; 706 last_col = ncol;
… …
678#ifdef DEBUG_STRICT 721#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 722 assert (screen.cur.col < last_col);
680 assert (screen.cur.row < nrow 723 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 724 && screen.cur.row >= -nsaved);
682#endif 725#endif
683 row = screen.cur.row; 726 int row = screen.cur.row;
684 727
685 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 728 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
686 729
687 line_t *line = &ROW(row); 730 line_t *line = &ROW(row);
688 731
… …
945 988
946 if (count == 0) 989 if (count == 0)
947 return; 990 return;
948 else if (count > 0) 991 else if (count > 0)
949 { 992 {
950 int row = screen.cur.row;
951
952 line_t &l = ROW(row); 993 line_t &l = ROW(screen.cur.row);
953 rend_t base_rend = l.r[i]; 994 rend_t base_rend = l.r[i];
954 ht &= l.t[i] == ' '; 995 ht &= l.t[i] == ' ';
955 996
956 for (; ++i < ncol; ) 997 for (; ++i < ncol; )
957 if (tabs[i]) 998 if (tabs[i])
… …
1032 */ 1073 */
1033#if ENABLE_FRILLS 1074#if ENABLE_FRILLS
1034void 1075void
1035rxvt_term::scr_forwardindex () 1076rxvt_term::scr_forwardindex ()
1036{ 1077{
1037 int row;
1038
1039 if (screen.cur.col < ncol - 1) 1078 if (screen.cur.col < ncol - 1)
1040 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1079 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1041 else 1080 else
1042 { 1081 {
1043 row = screen.cur.row;
1044
1045 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1082 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1046 ROW(row).l = ncol; 1083 ROW(screen.cur.row).l = ncol;
1047 1084
1048 scr_gotorc (0, 0, R_RELATIVE); 1085 scr_gotorc (0, 0, R_RELATIVE);
1049 scr_insdel_chars (1, DELETE); 1086 scr_insdel_chars (1, DELETE);
1050 scr_gotorc (0, ncol - 1, R_RELATIVE); 1087 scr_gotorc (0, ncol - 1, R_RELATIVE);
1051 } 1088 }
… …
1134 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1171 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1135 */ 1172 */
1136void 1173void
1137rxvt_term::scr_erase_line (int mode) 1174rxvt_term::scr_erase_line (int mode)
1138{ 1175{
1139 unsigned int row, col, num; 1176 unsigned int col, num;
1140 1177
1141 want_refresh = 1; 1178 want_refresh = 1;
1142 ZERO_SCROLLBACK (); 1179 ZERO_SCROLLBACK ();
1143 1180
1144 selection_check (1); 1181 selection_check (1);
1145 1182
1146 row = screen.cur.row; 1183 line_t &line = ROW(screen.cur.row);
1147 1184
1148 switch (mode) 1185 switch (mode)
1149 { 1186 {
1150 case 0: /* erase to end of line */ 1187 case 0: /* erase to end of line */
1151 col = screen.cur.col; 1188 col = screen.cur.col;
1152 num = ncol - col; 1189 num = ncol - col;
1153 min_it (ROW(row).l, col); 1190 min_it (line.l, col);
1154 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1191 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1155 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1192 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1156 CLEAR_SELECTION (); 1193 CLEAR_SELECTION ();
1157 break; 1194 break;
1158 case 1: /* erase to beginning of line */ 1195 case 1: /* erase to beginning of line */
… …
1163 CLEAR_SELECTION (); 1200 CLEAR_SELECTION ();
1164 break; 1201 break;
1165 case 2: /* erase whole line */ 1202 case 2: /* erase whole line */
1166 col = 0; 1203 col = 0;
1167 num = ncol; 1204 num = ncol;
1168 ROW(row).l = 0; 1205 line.l = 0;
1169 if (selection.beg.row <= screen.cur.row 1206 if (selection.beg.row <= screen.cur.row
1170 && selection.end.row >= screen.cur.row) 1207 && selection.end.row >= screen.cur.row)
1171 CLEAR_SELECTION (); 1208 CLEAR_SELECTION ();
1172 break; 1209 break;
1173 default: 1210 default:
1174 return; 1211 return;
1175 } 1212 }
1176 1213
1177 scr_blank_line (ROW(row), col, num, rstyle); 1214 scr_blank_line (line, col, num, rstyle);
1178} 1215}
1179 1216
1180/* ------------------------------------------------------------------------- */ 1217/* ------------------------------------------------------------------------- */
1181/* 1218/*
1182 * Erase part of whole of the screen 1219 * Erase part of whole of the screen

Diff Legend

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