--- rxvt-unicode/src/screen.C 2008/11/04 14:25:10 1.313 +++ rxvt-unicode/src/screen.C 2009/12/26 10:24:04 1.329 @@ -145,7 +145,7 @@ rend_t rend = l.r[col] & ~RS_baseattrMask; rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); - // found begin, nuke + // found start, nuke do { l.t[col] = ' '; l.r[col] = rend; @@ -160,11 +160,6 @@ void rxvt_term::scr_reset () { -#if ENABLE_OVERLAY - scr_overlay_off (); -#endif - - rvideo_mode = false; view_start = 0; num_scr = 0; @@ -177,9 +172,6 @@ if (ncol == prev_ncol && nrow == prev_nrow) return; - if (current_screen != PRIMARY) - scr_swap_screen (); - // we need at least two lines for wrapping to work correctly while (nrow + saveLines < 2) { @@ -288,6 +280,7 @@ { // Re-wrap lines. This is rather ugly, possibly because I am too dumb // to come up with a lean and mean algorithm. + // TODO: maybe optimise when width didn't change row_col_t ocur = screen.cur; ocur.row = MOD (term_start + ocur.row, prev_total_rows); @@ -295,9 +288,7 @@ 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; @@ -401,22 +392,18 @@ clamp_it (screen.cur.row, 0, nrow - 1); clamp_it (screen.cur.col, 0, ncol - 1); - - free (tabs); } - CLEAR_ALL_SELECTION (); - - prev_nrow = nrow; - prev_ncol = ncol; - + free (tabs); tabs = (char *)rxvt_malloc (ncol); for (int col = ncol; --col; ) tabs [col] = col % TABSIZE == 0; - if (current_screen != PRIMARY) - scr_swap_screen (); + CLEAR_ALL_SELECTION (); + + prev_nrow = nrow; + prev_ncol = ncol; tt_winch (); @@ -438,27 +425,46 @@ free (row_buf); free (swap_buf); free (drawn_buf); - free (tabs); + row_buf = 0; // signal that we freed all the arrays above - row_buf = 0; // signal that we freed all the arrays + free (tabs); + tabs = 0; } } /* ------------------------------------------------------------------------- */ /* - * Hard reset + * Hard/Soft reset */ void rxvt_term::scr_poweron () { scr_release (); prev_nrow = prev_ncol = 0; + rvideo_mode = false; + scr_soft_reset (); scr_reset (); scr_clear (true); scr_refresh (); } +void +rxvt_term::scr_soft_reset () +{ + /* only affects modes, nothing drastic such as clearing the screen */ +#if ENABLE_OVERLAY + scr_overlay_off (); +#endif + + if (current_screen != PRIMARY) + scr_swap_screen (); + + scr_scroll_region (0, MAX_ROWS - 1); + scr_rendition (0, ~RS_None); + scr_insert_mode (0); +} + /* ------------------------------------------------------------------------- * * PROCESS SCREEN COMMANDS * * ------------------------------------------------------------------------- */ @@ -504,10 +510,8 @@ /* boundary check in case screen size changed between SAVE and RESTORE */ min_it (s->cur.row, nrow - 1); min_it (s->cur.col, ncol - 1); -#ifdef DEBUG_STRICT assert (s->cur.row >= 0); assert (s->cur.col >= 0); -#endif } void @@ -777,11 +781,9 @@ } } -#ifdef DEBUG_STRICT assert (screen.cur.col < ncol); assert (screen.cur.row < nrow && screen.cur.row >= top_row); -#endif int row = screen.cur.row; checksel = selection.op && current_screen == selection.screen ? 1 : 0; @@ -908,8 +910,8 @@ // if the character doesn't fit into the remaining columns... if (expect_false (screen.cur.col > ncol - width && ncol >= width)) { - // ...output spaces - c = ' '; + // ... artificially enlargen the previous one + c = NOCHAR; // and try the same character next loop iteration --str; } @@ -995,9 +997,7 @@ max_it (line->l, screen.cur.col); -#ifdef DEBUG_STRICT assert (screen.cur.row >= 0); -#endif } /* ------------------------------------------------------------------------- */ @@ -1335,36 +1335,43 @@ min_it (num, nrow - row); - /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ + // TODO: the code below does not work when view_start != 0 + // the workaround is to disable the clear and use a normal refresh + // when view_start != 0. mysterious. if (rstyle & (RS_RVid | RS_Uline)) ren = (rend_t) ~RS_None; else if (GET_BASEBG (rstyle) == Color_bg) { ren = DEFAULT_RSTYLE; - if (mapped) + if (mapped && !view_start) XClearArea (dpy, vt, 0, - Row2Pixel (row), (unsigned int)width, + Row2Pixel (row - view_start), (unsigned int)width, (unsigned int)Height2Pixel (num), False); } else { ren = rstyle & (RS_fgMask | RS_bgMask); - gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; - XChangeGC (dpy, gc, GCForeground, &gcvalue); - XFillRectangle (dpy, vt, gc, - 0, Row2Pixel (row), - (unsigned int)width, - (unsigned int)Height2Pixel (num)); - gcvalue.foreground = pix_colors[Color_fg]; - XChangeGC (dpy, gc, GCForeground, &gcvalue); + if (mapped && !view_start) + { + gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; + XChangeGC (dpy, gc, GCForeground, &gcvalue); + XFillRectangle (dpy, vt, gc, + 0, Row2Pixel (row - view_start), + (unsigned int)width, + (unsigned int)Height2Pixel (num)); + gcvalue.foreground = pix_colors[Color_fg]; + XChangeGC (dpy, gc, GCForeground, &gcvalue); + } } for (; num--; row++) { scr_blank_screen_mem (ROW(row), rstyle); - scr_blank_line (drawn_buf [row], 0, ncol, ren); + + if (!view_start) + scr_blank_line (drawn_buf [row], 0, ncol, ren); } } @@ -1448,9 +1455,6 @@ void rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW { - int col, row; - rend_t tr; - want_refresh = 1; ZERO_SCROLLBACK (); @@ -1462,24 +1466,31 @@ selection_check (1); min_it (count, ncol - screen.cur.col); - row = screen.cur.row; + int row = screen.cur.row; line_t *line = &ROW(row); line->touch (); line->is_longer (0); + // nuke wide spanning the start + if (line->t[screen.cur.col] == NOCHAR) + scr_kill_char (*line, screen.cur.col); + switch (insdel) { case INSERT: - for (col = ncol - 1; (col - count) >= screen.cur.col; col--) + line->l = min (line->l + count, ncol); + + if (line->t[screen.cur.col] == NOCHAR) + scr_kill_char (*line, screen.cur.col); + + for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) { line->t[col] = line->t[col - count]; line->r[col] = line->r[col - count]; } - line->l = min (line->l + count, ncol); - if (selection.op && current_screen == selection.screen && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) { @@ -1503,20 +1514,27 @@ selection_check (1); screen.cur.col -= count; + // nuke wide char after the end + if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) + scr_kill_char (*line, screen.cur.col + count); + scr_blank_line (*line, screen.cur.col, count, rstyle); break; case DELETE: - tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); + line->l = max (line->l - count, 0); - for (col = screen.cur.col; (col + count) < ncol; col++) + // nuke wide char spanning the end + if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) + scr_kill_char (*line, screen.cur.col + count); + + for (int col = screen.cur.col; (col + count) < ncol; col++) { line->t[col] = line->t[col + count]; line->r[col] = line->r[col + count]; } - line->l = max (line->l - count, 0); - scr_blank_line (*line, ncol - count, count, tr); + scr_blank_line (*line, ncol - count, count, rstyle); if (selection.op && current_screen == selection.screen && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) @@ -1984,8 +2002,6 @@ void rxvt_term::scr_refresh () NOTHROW { - unsigned char have_bg, - showcursor; /* show the cursor */ int16_t col, row, /* column/row we're processing */ ocrow; /* old cursor row */ int i; /* tmp */ @@ -2006,7 +2022,8 @@ */ refresh_count = 0; - have_bg = 0; + unsigned int old_screen_flags = screen.flags; + char have_bg = 0; #ifdef HAVE_BG_PIXMAP have_bg = bgPixmap.pixmap != None; #endif @@ -2017,13 +2034,19 @@ */ scr_reverse_selection (); + HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); +#if ENABLE_OVERLAY + scr_swap_overlay (); +#endif + + char showcursor = screen.flags & Screen_VisibleCursor; + /* * C: set the cursor character (s) */ { unsigned char setoldcursor; - showcursor = (screen.flags & Screen_VisibleCursor); #ifdef CURSOR_BLINK if (hidden_cursor) showcursor = 0; @@ -2106,11 +2129,6 @@ } } - HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); -#if ENABLE_OVERLAY - scr_swap_overlay (); -#endif - #ifndef NO_SLOW_LINK_SUPPORT /* * D: CopyArea pass - very useful for slower links @@ -2226,7 +2244,8 @@ if (stp[col] == NOCHAR) { dtp[col] = stp[col]; - drp[col] = rend; + drp[col] = srp[col]; + count++; i++; @@ -2392,11 +2411,6 @@ } /* for (col....) */ } /* for (row....) */ -#if ENABLE_OVERLAY - scr_swap_overlay (); -#endif - HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); - /* * G: cleanup cursor and display outline cursor if necessary */ @@ -2444,8 +2458,14 @@ /* * H: cleanup selection */ +#if ENABLE_OVERLAY + scr_swap_overlay (); +#endif + HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); + scr_reverse_selection (); + screen.flags = old_screen_flags; num_scr = 0; num_scr_allow = 1; } @@ -3714,16 +3734,16 @@ x -= 1; clamp_it (x, 0, ncol - w); y -= 1; clamp_it (y, 0, nrow - h); - ov_x = x; ov_y = y; - ov_w = w; ov_h = h; + ov.x = x; ov.y = y; + ov.w = w; ov.h = h; - ov_text = new text_t *[h]; - ov_rend = new rend_t *[h]; + ov.text = new text_t *[h]; + ov.rend = new rend_t *[h]; for (y = 0; y < h; y++) { - text_t *tp = ov_text[y] = new text_t[w]; - rend_t *rp = ov_rend[y] = new rend_t[w]; + text_t *tp = ov.text[y] = new text_t[w]; + rend_t *rp = ov.rend[y] = new rend_t[w]; text_t t0, t1, t2; rend_t r = OVERLAY_RSTYLE; @@ -3752,31 +3772,31 @@ void rxvt_term::scr_overlay_off () NOTHROW { - if (!ov_text) + if (!ov.text) return; want_refresh = 1; - for (int y = 0; y < ov_h; y++) + for (int y = 0; y < ov.h; y++) { - delete [] ov_text[y]; - delete [] ov_rend[y]; + delete [] ov.text[y]; + delete [] ov.rend[y]; } - delete [] ov_text; ov_text = 0; - delete [] ov_rend; ov_rend = 0; + delete [] ov.text; ov.text = 0; + delete [] ov.rend; ov.rend = 0; } void rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW { - if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) + if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) return; x++, y++; - ov_text[y][x] = text; - ov_rend[y][x] = rend; + ov.text[y][x] = text; + ov.rend[y][x] = rend; } void @@ -3805,19 +3825,24 @@ void rxvt_term::scr_swap_overlay () NOTHROW { - if (!ov_text) + if (!ov.text) return; + // hide cursor if it is within the overlay area + if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) + && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) + screen.flags &= ~Screen_VisibleCursor; + // swap screen mem with overlay - for (int y = ov_h; y--; ) + for (int y = ov.h; y--; ) { - text_t *t1 = ov_text[y]; - rend_t *r1 = ov_rend[y]; + text_t *t1 = ov.text[y]; + rend_t *r1 = ov.rend[y]; - text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; - rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; + text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; + rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; - for (int x = ov_w; x--; ) + for (int x = ov.w; x--; ) { text_t t = *t1; *t1++ = *t2; *t2++ = t; rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));