--- rxvt-unicode/src/screen.C 2005/12/22 15:28:15 1.189 +++ rxvt-unicode/src/screen.C 2005/12/26 23:02:34 1.195 @@ -282,19 +282,24 @@ // re-wrap lines, this is rather ugly, possibly because I am too dumb // to come up with a lean and mean algorithm. - while (p != pend && q > 0) + row_col_t ocur = screen.cur; + ocur.row = MOD (term_start + ocur.row, prev_total_rows); + + do { p = MOD (p - 1, prev_total_rows); #ifdef DEBUG_STRICT assert (old_buf [MOD (p, prev_total_rows)].t); #endif + int plines = 1; int llen = old_buf [MOD (p, prev_total_rows)].l; while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) { p = MOD (p - 1, prev_total_rows); + plines++; llen += prev_ncol; } @@ -324,7 +329,16 @@ int prow = lofs / prev_ncol; int pcol = lofs % prev_ncol; - line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; + prow = MOD (p + prow, prev_total_rows); + + // we only adjust the cursor _row_ and put it into + // the topmost line of "long line" it was in, as + // this seems to upset applications/shells/readline + // least. + if (prow == ocur.row) + screen.cur.row = q - (total_rows - nrow); + + line_t &pline = old_buf [prow]; int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); @@ -340,11 +354,12 @@ } qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; + printf ("qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); } + while (p != pend && q > 0); term_start = total_rows - nrow; - view_start = 0; nsaved = term_start - q; // make sure all terminal lines exist @@ -371,10 +386,9 @@ } term_start = 0; - view_start = 0; } -#ifdef DEBUG_STRICT +#ifdef DEBUG_STRICT //TODO: remove for (int i = -nsaved; i < nrow; i++) assert (ROW (i).t); #endif @@ -609,11 +623,20 @@ selection.end.row -= count; selection.mark.row -= count; - selection_check (0); + if (selection.beg.row < -nsaved + || selection.end.row < -nsaved + || selection.mark.row < -nsaved) + { + CLEAR_ALL_SELECTION (); + selection.op = SELECTION_CLEAR; + } } for (int i = count; i--; ) - scr_blank_screen_mem (ROW(row2 - i), rstyle); + { + ROW(row2 - i).l = 0; + scr_blank_screen_mem (ROW(row2 - i), rstyle); + } if ((options & Opt_scrollWithBuffer) && view_start != 0 @@ -624,20 +647,17 @@ { if (selection.op && current_screen == selection.screen) { - int i = selection.beg.row; - int j = selection.end.row; - - if ((i < row1 && j > row1) - || (i < row2 && j > row2) - || (i - count < row1 && i >= row1) - || (i - count > row2 && i <= row2) - || (j - count < row1 && j >= row1) - || (j - count > row2 && j <= row2)) + if ((selection.beg.row < row1 && selection.end.row > row1) + || (selection.beg.row < row2 && selection.end.row > row2) + || (selection.beg.row - count < row1 && selection.beg.row >= row1) + || (selection.beg.row - count > row2 && selection.beg.row <= row2) + || (selection.end.row - count < row1 && selection.end.row >= row1) + || (selection.end.row - count > row2 && selection.end.row <= row2)) { CLEAR_ALL_SELECTION (); - selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ + selection.op = SELECTION_CLEAR; } - else if (j >= row1 && j <= row2) + else if (selection.end.row >= row1 && selection.end.row <= row2) { /* move selected region too */ selection.beg.row -= count; @@ -682,7 +702,7 @@ unsigned char checksel; unicode_t c; - int row, last_col; + int last_col; const unicode_t *strend = str + len; want_refresh = 1; @@ -707,7 +727,7 @@ assert (screen.cur.row < nrow && screen.cur.row >= -nsaved); #endif - row = screen.cur.row; + int row = screen.cur.row; checksel = selection.op && current_screen == selection.screen ? 1 : 0; @@ -719,7 +739,7 @@ if (c < 0x20) if (c == C0_LF) - { + { if (!line->is_longer ()) /* XXX: think about this */ max_it (line->l, screen.cur.col); @@ -974,9 +994,7 @@ return; else if (count > 0) { - int row = screen.cur.row; - - line_t &l = ROW(row); + line_t &l = ROW(screen.cur.row); rend_t base_rend = l.r[i]; ht &= l.t[i] == ' '; @@ -1061,16 +1079,12 @@ void rxvt_term::scr_forwardindex () { - int row; - if (screen.cur.col < ncol - 1) scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); else { - row = screen.cur.row; - - if (ROW(row).is_longer ()) //TODO//FIXME//LEN - ROW(row).l = ncol; + if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN + ROW(screen.cur.row).l = ncol; scr_gotorc (0, 0, R_RELATIVE); scr_insdel_chars (1, DELETE); @@ -1163,21 +1177,21 @@ void rxvt_term::scr_erase_line (int mode) { - unsigned int row, col, num; + unsigned int col, num; want_refresh = 1; ZERO_SCROLLBACK (); selection_check (1); - row = screen.cur.row; + line_t &line = ROW(screen.cur.row); switch (mode) { case 0: /* erase to end of line */ col = screen.cur.col; num = ncol - col; - min_it (ROW(row).l, col); + min_it (line.l, col); if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) CLEAR_SELECTION (); @@ -1192,7 +1206,7 @@ case 2: /* erase whole line */ col = 0; num = ncol; - ROW(row).l = 0; + line.l = 0; if (selection.beg.row <= screen.cur.row && selection.end.row >= screen.cur.row) CLEAR_SELECTION (); @@ -1201,7 +1215,7 @@ return; } - scr_blank_line (ROW(row), col, num, rstyle); + scr_blank_line (line, col, num, rstyle); } /* ------------------------------------------------------------------------- */ @@ -1275,8 +1289,8 @@ for (; num--; row++) { - scr_blank_screen_mem (ROW (row), rstyle); ROW (row).l = 0; + scr_blank_screen_mem (ROW (row), rstyle); scr_blank_line (drawn_buf [row], 0, ncol, ren); } } @@ -2444,7 +2458,7 @@ else { col = 0; - row = view_start; + row = -view_start; } for (; row < min (selection.end.row, view_end); row++, col = 0)