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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.195 by root, Mon Dec 26 23:02:34 2005 UTC

239 { 239 {
240 /* 240 /*
241 * add or delete rows as appropriate 241 * add or delete rows as appropriate
242 */ 242 */
243 243
244 printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
245
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 244 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)); 245 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 246
249#if 0 247#if 0
250 if (nrow < prev_nrow) 248 if (nrow < prev_nrow)
255 lfree (drawn_buf[row]); 253 lfree (drawn_buf[row]);
256 } 254 }
257 } 255 }
258#endif 256#endif
259 257
260 drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 temp_buf = (line_t *) rxvt_realloc (temp_buf , nrow * sizeof (line_t)); 259 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)); 260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
263 261
264 for (int row = min (nrow, prev_nrow); row--; ) 262 for (int row = min (nrow, prev_nrow); row--; )
265 { 263 {
266 lresize (drawn_buf[row]); 264 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]); 265 lresize (swap_buf [row]);
273 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);
274 } 272 }
275 273
276 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));
277 275
278 // re-wrap lines, this is rather ugly, possibly because I am too dumb
279 // to come up with a lean and mean algorithm.
280
281 int p = MOD (term_start + nrow , prev_total_rows); // previous row 276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
282 int pend = MOD (term_start - nsaved, prev_total_rows); 277 int pend = MOD (term_start - nsaved , prev_total_rows);
283 int q = total_rows; // rewrapped row 278 int q = total_rows; // rewrapped row
284 279
285 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
286 { 288 do
287 p = MOD (p - 1, prev_total_rows);
288
289 assert (old_buf [MOD (p, prev_total_rows)].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 ())
295 { 289 {
296 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
297 294
298 llen += prev_ncol;
299 }
300
301 int qlines = llen / ncol + 1;
302 int lofs = 0; 295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 297
304 q -= qlines; 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305
306 int qrow = q;
307
308 for (; qlines--; qrow++)
309 {
310 if (qrow >= 0)
311 { 299 {
300 p = MOD (p - 1, prev_total_rows);
301
302 plines++;
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 {
312 line_t &qline = row_buf [qrow]; 320 qline = row_buf + qrow;
313
314 lalloc (qline); 321 lalloc (*qline);
315 qline.set_is_longer (); 322 qline->set_is_longer ();
316 323
317 int qcol = 0; 324 int qcol = 0;
318 325
319 for (;;) 326 // fill a single destination line
327 while (lofs < llen && qcol < ncol)
320 { 328 {
321 int prow = lofs / prev_ncol + p; 329 int prow = lofs / prev_ncol;
322 int pcol = lofs % prev_ncol; 330 int pcol = lofs % prev_ncol;
323 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
324 line_t &pline = old_buf [p]; 341 line_t &pline = old_buf [prow];
325 342
326 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327 344
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); 345 assert (len);
346 assert (pline.t);
338 347
339 memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t)); 348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
340 memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t)); 349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
341 350
342 lofs += len; 351 lofs += len;
343 qcol += len; 352 qcol += len;
344
345 if (qcol == ncol)
346 break;
347 } 353 }
348 } 354 }
349 else 355
350 lofs += ncol; 356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
357 printf ("qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
358 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
351 } 359 }
360 while (p != pend && q > 0);
361
362 term_start = total_rows - nrow;
363 nsaved = term_start - q;
364
365 // make sure all terminal lines exist
366 while (nsaved < 0)
367 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
368
369 }
370 else
352 } 371 {
372 // if no scrollback exists (yet), wing, instead of wrap
373
374 for (int row = min (nrow, prev_nrow); row--; )
375 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row];
378
379 qline = pline;
380 lresize (qline);
381 }
382
383 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387
388 term_start = 0;
389 }
390
391#ifdef DEBUG_STRICT //TODO: remove
392 for (int i = -nsaved; i < nrow; i++)
393 assert (ROW (i).t);
394#endif
353 395
354 free (old_buf); 396 free (old_buf);
355 delete old_ta; 397 delete old_ta;
356 delete old_ra; 398 delete old_ra;
357 399
358 min_it (screen.cur.row, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
359 min_it (screen.cur.col, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
360 402
361 if (tabs) 403 if (tabs)
362 free (tabs); 404 free (tabs);
363 } 405 }
364 406
386 free (row_buf); 428 free (row_buf);
387 free (swap_buf); 429 free (swap_buf);
388 free (drawn_buf); 430 free (drawn_buf);
389 free (temp_buf); 431 free (temp_buf);
390 free (tabs); 432 free (tabs);
433
434 row_buf = 0; // signal that we freed all the arrays
391} 435}
392 436
393/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
394/* 438/*
395 * Hard reset 439 * Hard reset
451 min_it (s->cur.row, nrow - 1); 495 min_it (s->cur.row, nrow - 1);
452 min_it (s->cur.col, ncol - 1); 496 min_it (s->cur.col, ncol - 1);
453#ifdef DEBUG_STRICT 497#ifdef DEBUG_STRICT
454 assert (s->cur.row >= 0); 498 assert (s->cur.row >= 0);
455 assert (s->cur.col >= 0); 499 assert (s->cur.col >= 0);
456#else /* drive with your eyes closed */
457 max_it (s->cur.row, 0);
458 max_it (s->cur.col, 0);
459#endif 500#endif
460} 501}
461 502
462/* ------------------------------------------------------------------------- */ 503/* ------------------------------------------------------------------------- */
463/* 504/*
487#if NSCREENS 528#if NSCREENS
488 if (options & Opt_secondaryScreen) 529 if (options & Opt_secondaryScreen)
489 { 530 {
490 num_scr = 0; 531 num_scr = 0;
491 532
492 for (int i = nrow; i--; ) 533 for (int i = prev_nrow; i--; )
493 ::swap (ROW(i), swap_buf [i]); 534 ::swap (ROW(i), swap_buf [i]);
494 535
495 ::swap (screen.charset, swap.charset); 536 ::swap (screen.charset, swap.charset);
496 ::swap (screen.flags, swap.flags); 537 ::swap (screen.flags, swap.flags);
497 screen.flags |= Screen_VisibleCursor; 538 screen.flags |= Screen_VisibleCursor;
580 { 621 {
581 selection.beg.row -= count; 622 selection.beg.row -= count;
582 selection.end.row -= count; 623 selection.end.row -= count;
583 selection.mark.row -= count; 624 selection.mark.row -= count;
584 625
585 selection_check (0); 626 if (selection.beg.row < -nsaved
627 || selection.end.row < -nsaved
628 || selection.mark.row < -nsaved)
629 {
630 CLEAR_ALL_SELECTION ();
631 selection.op = SELECTION_CLEAR;
632 }
586 } 633 }
587 634
588 for (int i = count; i--; ) 635 for (int i = count; i--; )
636 {
637 ROW(row2 - i).l = 0;
589 scr_blank_screen_mem (ROW(row2 - i), rstyle); 638 scr_blank_screen_mem (ROW(row2 - i), rstyle);
639 }
590 640
591 if ((options & Opt_scrollWithBuffer) 641 if ((options & Opt_scrollWithBuffer)
592 && view_start != 0 642 && view_start != 0
593 && view_start != saveLines) 643 && view_start != saveLines)
594 scr_page (UP, count); 644 scr_page (UP, count);
595 } 645 }
596 else 646 else
597 { 647 {
598 if (selection.op && current_screen == selection.screen) 648 if (selection.op && current_screen == selection.screen)
599 { 649 {
600 int i = selection.beg.row; 650 if ((selection.beg.row < row1 && selection.end.row > row1)
601 int j = selection.end.row; 651 || (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) 652 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
606 || (i - count > row2 && i <= row2) 653 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
607 || (j - count < row1 && j >= row1) 654 || (selection.end.row - count < row1 && selection.end.row >= row1)
608 || (j - count > row2 && j <= row2)) 655 || (selection.end.row - count > row2 && selection.end.row <= row2))
609 { 656 {
610 CLEAR_ALL_SELECTION (); 657 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 658 selection.op = SELECTION_CLEAR;
612 } 659 }
613 else if (j >= row1 && j <= row2) 660 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 661 {
615 /* move selected region too */ 662 /* move selected region too */
616 selection.beg.row -= count; 663 selection.beg.row -= count;
617 selection.end.row -= count; 664 selection.end.row -= count;
618 selection.mark.row -= count; 665 selection.mark.row -= count;
653 if (len <= 0) /* sanity */ 700 if (len <= 0) /* sanity */
654 return; 701 return;
655 702
656 unsigned char checksel; 703 unsigned char checksel;
657 unicode_t c; 704 unicode_t c;
658 int row, last_col; 705 int last_col;
659 const unicode_t *strend = str + len; 706 const unicode_t *strend = str + len;
660 707
661 want_refresh = 1; 708 want_refresh = 1;
662 ZERO_SCROLLBACK (); 709 ZERO_SCROLLBACK ();
663 last_col = ncol; 710 last_col = ncol;
677 724
678#ifdef DEBUG_STRICT 725#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 726 assert (screen.cur.col < last_col);
680 assert (screen.cur.row < nrow 727 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 728 && screen.cur.row >= -nsaved);
682#else /* drive with your eyes closed */
683 min_it (screen.cur.col, last_col - 1);
684 clamp_it (screen.cur.row, -nsaved, nrow - 1);
685#endif 729#endif
686 row = screen.cur.row; 730 int row = screen.cur.row;
687 731
688 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 732 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
689 733
690 line_t *line = &ROW(row); 734 line_t *line = &ROW(row);
691 735
693 { 737 {
694 c = *str++; 738 c = *str++;
695 739
696 if (c < 0x20) 740 if (c < 0x20)
697 if (c == C0_LF) 741 if (c == C0_LF)
698 { 742 {
699 if (!line->is_longer ()) /* XXX: think about this */ 743 if (!line->is_longer ()) /* XXX: think about this */
700 max_it (line->l, screen.cur.col); 744 max_it (line->l, screen.cur.col);
701 745
702 screen.flags &= ~Screen_WrapNext; 746 screen.flags &= ~Screen_WrapNext;
703 747
900 if (!line->is_longer ()) /* XXX: think about this */ 944 if (!line->is_longer ()) /* XXX: think about this */
901 max_it (line->l, screen.cur.col); 945 max_it (line->l, screen.cur.col);
902 946
903#ifdef DEBUG_STRICT 947#ifdef DEBUG_STRICT
904 assert (screen.cur.row >= 0); 948 assert (screen.cur.row >= 0);
905#else /* drive with your eyes closed */
906 max_it (screen.cur.row, 0);
907#endif 949#endif
908} 950}
909 951
910/* ------------------------------------------------------------------------- */ 952/* ------------------------------------------------------------------------- */
911/* 953/*
950 992
951 if (count == 0) 993 if (count == 0)
952 return; 994 return;
953 else if (count > 0) 995 else if (count > 0)
954 { 996 {
955 int row = screen.cur.row;
956
957 line_t &l = ROW(row); 997 line_t &l = ROW(screen.cur.row);
958 rend_t base_rend = l.r[i]; 998 rend_t base_rend = l.r[i];
959 ht &= l.t[i] == ' '; 999 ht &= l.t[i] == ' ';
960 1000
961 for (; ++i < ncol; ) 1001 for (; ++i < ncol; )
962 if (tabs[i]) 1002 if (tabs[i])
1037 */ 1077 */
1038#if ENABLE_FRILLS 1078#if ENABLE_FRILLS
1039void 1079void
1040rxvt_term::scr_forwardindex () 1080rxvt_term::scr_forwardindex ()
1041{ 1081{
1042 int row;
1043
1044 if (screen.cur.col < ncol - 1) 1082 if (screen.cur.col < ncol - 1)
1045 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1083 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1046 else 1084 else
1047 { 1085 {
1048 row = screen.cur.row;
1049
1050 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1086 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
1051 ROW(row).l = ncol; 1087 ROW(screen.cur.row).l = ncol;
1052 1088
1053 scr_gotorc (0, 0, R_RELATIVE); 1089 scr_gotorc (0, 0, R_RELATIVE);
1054 scr_insdel_chars (1, DELETE); 1090 scr_insdel_chars (1, DELETE);
1055 scr_gotorc (0, ncol - 1, R_RELATIVE); 1091 scr_gotorc (0, ncol - 1, R_RELATIVE);
1056 } 1092 }
1139 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1175 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1140 */ 1176 */
1141void 1177void
1142rxvt_term::scr_erase_line (int mode) 1178rxvt_term::scr_erase_line (int mode)
1143{ 1179{
1144 unsigned int row, col, num; 1180 unsigned int col, num;
1145 1181
1146 want_refresh = 1; 1182 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1183 ZERO_SCROLLBACK ();
1148 1184
1149 selection_check (1); 1185 selection_check (1);
1150 1186
1151 row = screen.cur.row; 1187 line_t &line = ROW(screen.cur.row);
1152 1188
1153 switch (mode) 1189 switch (mode)
1154 { 1190 {
1155 case 0: /* erase to end of line */ 1191 case 0: /* erase to end of line */
1156 col = screen.cur.col; 1192 col = screen.cur.col;
1157 num = ncol - col; 1193 num = ncol - col;
1158 min_it (ROW(row).l, col); 1194 min_it (line.l, col);
1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1195 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1196 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1161 CLEAR_SELECTION (); 1197 CLEAR_SELECTION ();
1162 break; 1198 break;
1163 case 1: /* erase to beginning of line */ 1199 case 1: /* erase to beginning of line */
1168 CLEAR_SELECTION (); 1204 CLEAR_SELECTION ();
1169 break; 1205 break;
1170 case 2: /* erase whole line */ 1206 case 2: /* erase whole line */
1171 col = 0; 1207 col = 0;
1172 num = ncol; 1208 num = ncol;
1173 ROW(row).l = 0; 1209 line.l = 0;
1174 if (selection.beg.row <= screen.cur.row 1210 if (selection.beg.row <= screen.cur.row
1175 && selection.end.row >= screen.cur.row) 1211 && selection.end.row >= screen.cur.row)
1176 CLEAR_SELECTION (); 1212 CLEAR_SELECTION ();
1177 break; 1213 break;
1178 default: 1214 default:
1179 return; 1215 return;
1180 } 1216 }
1181 1217
1182 scr_blank_line (ROW(row), col, num, rstyle); 1218 scr_blank_line (line, col, num, rstyle);
1183} 1219}
1184 1220
1185/* ------------------------------------------------------------------------- */ 1221/* ------------------------------------------------------------------------- */
1186/* 1222/*
1187 * Erase part of whole of the screen 1223 * Erase part of whole of the screen
1251 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1287 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1252 } 1288 }
1253 1289
1254 for (; num--; row++) 1290 for (; num--; row++)
1255 { 1291 {
1292 ROW (row).l = 0;
1256 scr_blank_screen_mem (ROW (row), rstyle); 1293 scr_blank_screen_mem (ROW (row), rstyle);
1257 ROW (row).l = 0;
1258 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1294 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1259 } 1295 }
1260} 1296}
1261 1297
1262#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1691 y = 0; 1727 y = 0;
1692 eheight = height; 1728 eheight = height;
1693 } 1729 }
1694#endif 1730#endif
1695 1731
1696#ifdef DEBUG_STRICT
1697#if 0
1698 // that's not debugging //TODO //FIXME
1699 clamp_it (x, 0, width);
1700 clamp_it (y, 0, height);
1701#endif
1702#endif
1703
1704 /* round down */ 1732 /* round down */
1705 rc[PART_BEG].col = Pixel2Col (x); 1733 rc[PART_BEG].col = Pixel2Col (x);
1706 rc[PART_BEG].row = Pixel2Row (y); 1734 rc[PART_BEG].row = Pixel2Row (y);
1707 /* round up */ 1735 /* round up */
1708 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); 1736 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
2428 row = selection.beg.row; 2456 row = selection.beg.row;
2429 } 2457 }
2430 else 2458 else
2431 { 2459 {
2432 col = 0; 2460 col = 0;
2433 row = view_start; 2461 row = -view_start;
2434 } 2462 }
2435 2463
2436 for (; row < min (selection.end.row, view_end); row++, col = 0) 2464 for (; row < min (selection.end.row, view_end); row++, col = 0)
2437 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2465 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2438 srp[col] ^= RS_RVid; 2466 srp[col] ^= RS_RVid;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines