--- rxvt-unicode/src/screen.C 2006/01/25 21:09:21 1.252 +++ rxvt-unicode/src/screen.C 2006/02/18 15:24:39 1.260 @@ -95,18 +95,18 @@ #define CLEAR_ROWS(row, num) \ if (mapped) \ - XClearArea (xdisp, drawBuffer, 0, \ + XClearArea (dpy, drawBuffer, 0, \ Row2Pixel (row), (unsigned int)width, \ (unsigned int)Height2Pixel (num), False) #define CLEAR_CHARS(x, y, num) \ if (mapped) \ - XClearArea (xdisp, drawBuffer, x, y, \ + XClearArea (dpy, drawBuffer, x, y, \ (unsigned int)Width2Pixel (num), \ (unsigned int)Height2Pixel (1), False) #define ERASE_ROWS(row, num) \ - XFillRectangle (xdisp, drawBuffer, gc, \ + XFillRectangle (dpy, drawBuffer, gc, \ 0, Row2Pixel (row), \ (unsigned int)width, \ (unsigned int)Height2Pixel (num)) @@ -128,7 +128,7 @@ l.touch (); - efs &= ~RS_baseattrMask; + efs &= ~RS_baseattrMask; // remove italic etc. fontstyles efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); text_t *et = l.t + col; @@ -643,14 +643,18 @@ // erase newly scrolled-in lines for (int i = count; i--; ) { - // basically this is a slightly optimized scr_blank_screen_mem - // it is worth the effort on slower machines line_t &l = ROW(nrow - 1 - i); - scr_blank_line (l, 0, l.l, rstyle); - - l.l = 0; - l.f = 0; + // optimize if already cleared, can be significant on slow machines + // could be rolled into scr_blank_screen_mem + if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) + { + scr_blank_line (l, 0, l.l, rstyle); + l.l = 0; + l.f = 0; + } + else + scr_blank_screen_mem (l, rstyle); } // now copy lines below the scroll region bottom to the @@ -1112,7 +1116,7 @@ * Move cursor left in row. If we're at the left boundary, shift everything * in that row right. Clear left column. */ -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL void rxvt_term::scr_backindex () NOTHROW { @@ -1129,7 +1133,7 @@ * Move cursor right in row. If we're at the right boundary, shift everything * in that row left. Clear right column. */ -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL void rxvt_term::scr_forwardindex () NOTHROW { @@ -1340,10 +1344,10 @@ { ren = rstyle & (RS_fgMask | RS_bgMask); gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; - XChangeGC (xdisp, gc, GCForeground, &gcvalue); + XChangeGC (dpy, gc, GCForeground, &gcvalue); ERASE_ROWS (row, num); gcvalue.foreground = pix_colors[Color_fg]; - XChangeGC (xdisp, gc, GCForeground, &gcvalue); + XChangeGC (dpy, gc, GCForeground, &gcvalue); } for (; num--; row++) @@ -1353,7 +1357,7 @@ } } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL void rxvt_term::scr_erase_savelines () NOTHROW { @@ -1652,12 +1656,12 @@ #if TRANSPARENT if (!OPTION (Opt_transparent) || am_transparent == 0) #endif - XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); + XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); XGCValues gcvalue; gcvalue.foreground = pix_colors[Color_fg]; gcvalue.background = pix_colors[Color_bg]; - XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); + XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); scr_clear (); scr_touch (true); @@ -1752,10 +1756,9 @@ for (int i = 0; i < nrow; i++) { - int col = 0; rend_t *drp = drawn_buf[i].r; - for (; col < ncol; col++, drp++) + for (int col = 0; col < ncol; col++, drp++) if ((*drp & mask) == value) { found = true; @@ -1887,7 +1890,7 @@ # ifdef MAPALERT_OPTION if (OPTION (Opt_mapAlert)) # endif - XMapWindow (xdisp, parent[0]); + XMapWindow (dpy, parent[0]); # endif if (OPTION (Opt_visualBell)) @@ -1899,7 +1902,7 @@ bell_ev.start (NOW + VISUAL_BELL_DURATION); } else - XBell (xdisp, 0); + XBell (dpy, 0); #endif } @@ -1968,7 +1971,7 @@ void rxvt_term::scr_refresh () NOTHROW { - unsigned char must_clear, /* use draw_string not draw_image_string */ + unsigned char have_bg, showcursor; /* show the cursor */ int16_t col, row, /* column/row we're processing */ ocrow; /* old cursor row */ @@ -1986,14 +1989,14 @@ /* * A: set up vars */ - must_clear = 0; + have_bg = 0; refresh_count = 0; #if XPM_BACKGROUND - must_clear |= bgPixmap.pixmap != None; + have_bg |= bgPixmap.pixmap != None; #endif #if TRANSPARENT - must_clear |= OPTION (Opt_transparent) && am_transparent; + have_bg |= OPTION (Opt_transparent) && am_transparent; #endif ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ @@ -2102,7 +2105,7 @@ */ if (!display->is_local && refresh_type == FAST_REFRESH && num_scr_allow && num_scr - && abs (num_scr) < nrow && !must_clear) + && abs (num_scr) < nrow && !have_bg) { int16_t nits; int j; @@ -2148,11 +2151,16 @@ if (wlen < len) ::swap (wlen, len); - XCopyArea (xdisp, vt, vt, + XGCValues gcv; + + gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); + XCopyArea (dpy, vt, vt, gc, 0, Row2Pixel (len + i), (unsigned int)this->width, (unsigned int)Height2Pixel (wlen - len + 1), 0, Row2Pixel (len)); + gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); + len = -1; } } @@ -2218,14 +2226,14 @@ if (stp[col] != dtp[col] || !RS_SAME (srp[col], drp[col])) { - if (must_clear && (i++ > count / 2)) + if (have_bg && (i++ > count / 2)) break; dtp[col] = stp[col]; drp[col] = rend; i = 0; } - else if (must_clear || (stp[col] != ' ' && ++i >= 16)) + else if (have_bg || (stp[col] != ' ' && ++i >= 16)) break; } @@ -2256,11 +2264,11 @@ // force redraw after "careful" characters to avoid pixel droppings for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) - drp[col + i + 1] = ~srp[col + i + 1]; + drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; // force redraw before "careful" characters to avoid pixel droppings for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) - drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; + drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; #endif bool invert = rend & RS_RVid; @@ -2328,24 +2336,20 @@ rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; if (back == fore) - font->clear_rect (*drawable, xpixel, ypixel, - fwidth * count, fheight, - back); - else if (back == Color_bg) + font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); + else if (back == Color_bg && have_bg) { - if (must_clear) - { - CLEAR_CHARS (xpixel, ypixel, count); + // this is very ugly, maybe push it into ->draw? - for (i = 0; i < count; i++) /* don't draw empty strings */ - if (text[i] != ' ') - { - font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); - break; - } - } - else - font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); + for (i = 0; i < count; i++) /* don't draw empty strings */ + if (text[i] != ' ') + { + font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); + goto did_clear; + } + + CLEAR_CHARS (xpixel, ypixel, count); + did_clear: ; } else font->draw (*drawable, xpixel, ypixel, text, count, fore, back); @@ -2354,12 +2358,12 @@ { #if ENABLE_FRILLS if (ISSET_PIXCOLOR (Color_underline)) - XSetForeground (xdisp, gc, pix_colors[Color_underline]); + XSetForeground (dpy, gc, pix_colors[Color_underline]); else #endif - XSetForeground (xdisp, gc, pix_colors[fore]); + XSetForeground (dpy, gc, pix_colors[fore]); - XDrawLine (xdisp, drawBuffer, gc, + XDrawLine (dpy, drawBuffer, gc, xpixel, ypixel + font->ascent + 1, xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); } @@ -2402,10 +2406,10 @@ #ifndef NO_CURSORCOLOR if (ISSET_PIXCOLOR (Color_cursor)) - XSetForeground (xdisp, gc, pix_colors[Color_cursor]); + XSetForeground (dpy, gc, pix_colors[Color_cursor]); #endif - XDrawRectangle (xdisp, drawBuffer, gc, + XDrawRectangle (dpy, drawBuffer, gc, Col2Pixel (col), Row2Pixel (oldcursor.row), (unsigned int) (Width2Pixel (cursorwidth) - 1), @@ -2459,13 +2463,13 @@ #endif ) { - XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); - XClearWindow (xdisp, parent[0]); - XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); + XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); + XClearWindow (dpy, parent[0]); + XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); #if HAVE_SCROLLBARS if (scrollBar.win) { - XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); + XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); scrollBar.setIdle (); scrollbar_show (0); } @@ -2488,7 +2492,7 @@ want_refresh = 1; if (really) - XClearWindow (xdisp, vt); + XClearWindow (dpy, vt); } void @@ -2547,7 +2551,7 @@ && current_screen == selection.screen && selection.end.row >= view_start) { -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL if (selection.rect) scr_xor_rect (selection.beg.row, selection.beg.col, selection.end.row, selection.end.col, @@ -2673,7 +2677,7 @@ unsigned long bytes_after; XTextProperty ct; - if (XGetWindowProperty (xdisp, win, prop, + if (XGetWindowProperty (dpy, win, prop, 0, PROP_SIZE / 4, delete_prop, AnyPropertyType, &ct.encoding, &ct.format, @@ -2692,7 +2696,7 @@ // fetch and append remaining data XTextProperty ct2; - if (XGetWindowProperty (xdisp, win, prop, + if (XGetWindowProperty (dpy, win, prop, ct.nitems / 4, (bytes_after + 3) / 4, delete_prop, AnyPropertyType, &ct2.encoding, &ct2.format, @@ -2715,7 +2719,7 @@ { // INCR selection, start handshake if (!delete_prop) - XDeleteProperty (xdisp, win, prop); + XDeleteProperty (dpy, win, prop); selection_wait = Sel_incr; incr_buf_fill = 0; @@ -2772,7 +2776,7 @@ char **cl; int cr; -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it // so recode it manually if (ct.encoding == xa[XA_UTF8_STRING]) @@ -2786,7 +2790,7 @@ } else #endif - if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 + if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 && cl) { for (int i = 0; i < cr; i++) @@ -2878,9 +2882,9 @@ else sel = xa[XA_CLIPBOARD]; - if (XGetSelectionOwner (xdisp, sel) != None) + if (XGetSelectionOwner (dpy, sel) != None) { - XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], + XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], vt, selection_request_time); return 1; } @@ -2953,7 +2957,7 @@ for (; row <= selection.end.row; row++, col = 0) { -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL if (selection.rect) { col = selection.beg.col; @@ -2966,7 +2970,7 @@ col = max (col, 0); if (row == selection.end.row -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL || selection.rect #endif ) @@ -2999,7 +3003,7 @@ new_selection_text[ofs++] = *t++; } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL if (selection.rect) { while (ofs @@ -3043,8 +3047,8 @@ { selection_time = tm; - XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); - if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) + XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); + if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) { display->set_selection_owner (this); return true; @@ -3058,7 +3062,7 @@ #if 0 XTextProperty ct; - if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) + if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) { set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); XFree (ct.value); @@ -3370,7 +3374,7 @@ { if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN && !ROW(selection.beg.row).is_longer () -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL && !selection.rect #endif ) @@ -3379,7 +3383,7 @@ if ( selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN && !ROW(selection.end.row).is_longer () -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL && !selection.rect #endif ) @@ -3406,7 +3410,9 @@ { selection.end.row = end_row; selection.end.col = ROW(end_row).l; +# if !ENABLE_MINIMAL selection_remove_trailing_spaces (); +# endif break; } } @@ -3445,13 +3451,13 @@ } } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL if (selection.rect && selection.beg.col > selection.end.col) ::swap (selection.beg.col, selection.end.col); #endif } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL void rxvt_term::selection_remove_trailing_spaces () NOTHROW { @@ -3539,7 +3545,7 @@ *target++ = xa[XA_UTF8_STRING]; #endif - XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, + XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 32, PropModeReplace, (unsigned char *)target_list, target - target_list); ev.property = rq.property; @@ -3552,7 +3558,7 @@ #endif else if (rq.target == xa[XA_TIMESTAMP] && selection.text) { - XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, + XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 32, PropModeReplace, (unsigned char *)&selection_time, 1); ev.property = rq.property; } @@ -3586,7 +3592,7 @@ style = enc_text; else if (target == xa[XA_COMPOUND_TEXT]) style = enc_compound_text; -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL else if (target == xa[XA_UTF8_STRING]) style = enc_utf8; #endif @@ -3607,7 +3613,7 @@ selectlen = 0; } -#if ENABLE_FRILLS +#if !ENABLE_MINIMAL // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it // so recode it manually if (style == enc_utf8) @@ -3620,7 +3626,7 @@ } else #endif - if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) + if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) freect = 1; else { @@ -3630,7 +3636,7 @@ ct.encoding = target; } - XChangeProperty (xdisp, rq.requestor, rq.property, + XChangeProperty (dpy, rq.requestor, rq.property, ct.encoding, 8, PropModeReplace, ct.value, (int)ct.nitems); ev.property = rq.property; @@ -3639,7 +3645,7 @@ XFree (ct.value); } - XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); + XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); } /* ------------------------------------------------------------------------- * @@ -3665,7 +3671,7 @@ { XWindowAttributes xwa; - XGetWindowAttributes (xdisp, vt, &xwa); + XGetWindowAttributes (dpy, vt, &xwa); pos.x = xwa.x + Col2Pixel (screen.cur.col); pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;