--- rxvt-unicode/src/screen.C 2011/01/28 00:08:58 1.366 +++ rxvt-unicode/src/screen.C 2011/07/10 00:40:17 1.393 @@ -3,7 +3,7 @@ *---------------------------------------------------------------------------* * * Copyright (c) 1997-2001 Geoff Wing - * Copyright (c) 2003-2007 Marc Lehmann + * Copyright (c) 2003-2007 Marc Lehmann * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -40,8 +40,6 @@ } /* ------------------------------------------------------------------------- */ -#define PROP_SIZE 256*1024 -#define PASTE_SIZE 32768 #define TABSIZE 8 /* default tab size */ /* ------------------------------------------------------------------------- * @@ -163,6 +161,10 @@ void rxvt_term::scr_reset () { +#if ENABLE_OVERLAY + scr_overlay_off (); +#endif + view_start = 0; num_scr = 0; @@ -203,7 +205,7 @@ talloc = new rxvt_salloc (ncol * sizeof (text_t)); ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); - row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); + row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); @@ -275,7 +277,7 @@ } line_t *old_buf = row_buf; - row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); + row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row int pend = MOD (term_start + top_row , prev_total_rows); @@ -638,24 +640,38 @@ && row1 == 0 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) { - top_row = max (top_row - count, -saveLines); + min_it (count, total_rows - (nrow - (row2 + 1))); - // scroll everything up 'count' lines - term_start = (term_start + count) % total_rows; + top_row = max (top_row - count, -saveLines); // sever bottommost line { - line_t &l = ROW(row2 - count); + line_t &l = ROW(row2); l.is_longer (0); l.touch (); } + // scroll everything up 'count' lines + term_start = (term_start + count) % total_rows; + + // now copy lines below the scroll region bottom to the + // bottom of the screen again, so they look as if they + // hadn't moved. + for (int i = nrow; --i > row2; ) + { + line_t &l1 = ROW(i - count); + line_t &l2 = ROW(i); + + ::swap (l1, l2); + l2.touch (); + } + // erase newly scrolled-in lines for (int i = count; i--; ) { - line_t &l = ROW(nrow - 1 - i); + line_t &l = ROW(row2 - i); - // optimize if already cleared, can be significant on slow machines + // optimise 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))) { @@ -667,18 +683,6 @@ scr_blank_screen_mem (l, rstyle); } - // now copy lines below the scroll region bottom to the - // bottom of the screen again, so they look as if they - // hadn't moved. - for (int i = nrow; --i > row2; ) - { - line_t &l1 = ROW(i - count); - line_t &l2 = ROW(i); - - ::swap (l1, l2); - l2.touch (); - } - // move and/or clear selection, if any if (selection.op && current_screen == selection.screen) { @@ -732,11 +736,19 @@ // use a simple and robust scrolling algorithm, this // part of scr_scroll_text is not time-critical. + // sever line above scroll region + if (row1) + { + line_t &l = ROW(row1 - 1); + l.is_longer (0); + l.touch (); + } + int rows = row2 - row1 + 1; min_it (count, rows); - line_t *temp_buf = row_buf + total_rows; + line_t *temp_buf = rxvt_temp_buf (rows); for (int row = 0; row < rows; row++) { @@ -748,6 +760,13 @@ for (int row = 0; row < rows; row++) ROW(row1 + row) = temp_buf [row]; + + // sever bottommost line + { + line_t &l = ROW(row2); + l.is_longer (0); + l.touch (); + } } return count; @@ -799,7 +818,7 @@ { c = (unicode_t)*str++; // convert to rxvt-unicodes representation - if (expect_false (c < 0x20)) + if (ecb_unlikely (c < 0x20)) if (c == C0_LF) { max_it (line->l, screen.cur.col); @@ -828,7 +847,7 @@ continue; } - if (expect_false ( + if (ecb_unlikely ( checksel /* see if we're writing within selection */ && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) && ROWCOL_IS_BEFORE (screen.cur, selection.end) @@ -843,7 +862,7 @@ CLEAR_SELECTION (); } - if (expect_false (screen.flags & Screen_WrapNext)) + if (ecb_unlikely (screen.flags & Screen_WrapNext)) { scr_do_wrap (); @@ -855,7 +874,7 @@ } // some utf-8 decoders "decode" surrogate characters: let's fix this. - if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) + if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) c = 0xfffd; // rely on wcwidth to tell us the character width, do wcwidth before @@ -864,7 +883,7 @@ // locale. int width = WCWIDTH (c); - if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL + if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL { // vt100 special graphics and line drawing // 5f-7e standard vt100 @@ -887,7 +906,7 @@ } } - if (expect_false (screen.flags & Screen_Insert)) + if (ecb_unlikely (screen.flags & Screen_Insert)) scr_insdel_chars (width, INSERT); if (width != 0) @@ -905,7 +924,7 @@ rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); // if the character doesn't fit into the remaining columns... - if (expect_false (screen.cur.col > ncol - width && ncol >= width)) + if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) { if (screen.flags & Screen_Autowrap) { @@ -922,7 +941,7 @@ // due to wonderful coincidences everywhere else in this loop // we never have to check for overwriting a wide char itself, // only its tail. - if (expect_false (line->t[screen.cur.col] == NOCHAR)) + if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) scr_kill_char (*line, screen.cur.col); line->touch (); @@ -932,7 +951,7 @@ line->t[screen.cur.col] = c; line->r[screen.cur.col] = rend; - if (expect_true (screen.cur.col < ncol - 1)) + if (ecb_likely (screen.cur.col < ncol - 1)) screen.cur.col++; else { @@ -945,10 +964,10 @@ c = NOCHAR; } - while (expect_false (--width > 0)); + while (ecb_unlikely (--width > 0)); // pad with spaces when overwriting wide character with smaller one - for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) + for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) { line->t[c] = ' '; line->r[c] = rend; @@ -1924,7 +1943,7 @@ # ifdef MAPALERT_OPTION if (option (Opt_mapAlert)) # endif - XMapWindow (dpy, parent[0]); + XMapWindow (dpy, parent); # endif # if ENABLE_FRILLS @@ -1947,7 +1966,6 @@ } /* ------------------------------------------------------------------------- */ -/* ARGSUSED */ void rxvt_term::scr_printscreen (int fullhist) NOTHROW { @@ -2235,7 +2253,7 @@ // redraw one or more characters // seek to the beginning of wide characters - while (expect_false (stp[col] == NOCHAR && col > 0)) + while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) --col; rend_t rend = srp[col]; /* screen rendition (target rendition) */ @@ -2283,7 +2301,7 @@ count -= i; /* dump any matching trailing chars */ // sometimes we optimize away the trailing NOCHAR's, add them back - while (expect_false (i && text[count] == NOCHAR)) + while (ecb_unlikely (i && text[count] == NOCHAR)) count++, i--; /* @@ -2293,7 +2311,7 @@ int back = bgcolor_of (rend); // desired background // only do special processing if any attributes are set, which is unlikely - if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) + if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) { bool invert = rend & RS_RVid; @@ -2392,7 +2410,7 @@ */ rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; - if (expect_true (have_bg && back == Color_bg)) + if (ecb_likely (have_bg && back == Color_bg)) { // this is very ugly, maybe push it into ->draw? @@ -2409,7 +2427,7 @@ else font->draw (*drawable, xpixel, ypixel, text, count, fore, back); - if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) + if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) { #if ENABLE_FRILLS if (ISSET_PIXCOLOR (Color_underline)) @@ -2520,7 +2538,7 @@ # ifdef ENABLE_TRANSPARENCY if (bg_flags & BG_IS_TRANSPARENT) { - XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); + XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); transparent = true; @@ -2528,18 +2546,18 @@ else # endif { - XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); + XSetWindowBackground (dpy, parent, pix_colors[Color_border]); XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); } } else #endif { - XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); + XSetWindowBackground (dpy, parent, pix_colors[Color_border]); XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); } - XClearWindow (dpy, parent[0]); + XClearWindow (dpy, parent); if (scrollBar.win) { @@ -2736,254 +2754,19 @@ /* ------------------------------------------------------------------------- */ /* - * Respond to a notification that a primary selection has been sent - * EXT: SelectionNotify - */ -void -rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW -{ - if (prop == None) /* check for failed XConvertSelection */ - { - if ((selection_type & Sel_CompoundText)) - { - int selnum = selection_type & Sel_whereMask; - - selection_type = 0; - if (selnum != Sel_direct) - selection_request_other (XA_STRING, selnum); - } - - if ((selection_type & Sel_UTF8String)) - { - int selnum = selection_type & Sel_whereMask; - - selection_type = Sel_CompoundText; - if (selnum != Sel_direct) - selection_request_other (xa[XA_COMPOUND_TEXT], selnum); - else - selection_type = 0; - } - - return; - } - - unsigned long bytes_after; - XTextProperty ct; - - if (XGetWindowProperty (dpy, win, prop, - 0, PROP_SIZE / 4, - delete_prop, AnyPropertyType, - &ct.encoding, &ct.format, - &ct.nitems, &bytes_after, - &ct.value) != Success) - { - ct.value = 0; - goto bailout; - } - - if (ct.encoding == None) - goto bailout; - - if (bytes_after) - { - // fetch and append remaining data - XTextProperty ct2; - - if (XGetWindowProperty (dpy, win, prop, - ct.nitems / 4, (bytes_after + 3) / 4, - delete_prop, AnyPropertyType, - &ct2.encoding, &ct2.format, - &ct2.nitems, &bytes_after, - &ct2.value) != Success) - goto bailout; - - // realloc should be compatible to XFree, here, and elsewhere, too - ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1); - memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); - ct.nitems += ct2.nitems; - - XFree (ct2.value); - } - - if (ct.value == 0) - goto bailout; - - if (ct.encoding == xa[XA_INCR]) - { - // INCR selection, start handshake - if (!delete_prop) - XDeleteProperty (dpy, win, prop); - - selection_wait = Sel_incr; - incr_buf_fill = 0; - incr_ev.start (10); - - goto bailout; - } - - if (ct.nitems == 0) - { - if (selection_wait == Sel_incr) - { - XFree (ct.value); - - // finally complete, now paste the whole thing - selection_wait = Sel_normal; - ct.value = (unsigned char *)incr_buf; - ct.nitems = incr_buf_fill; - incr_buf = 0; - incr_buf_size = 0; - incr_ev.stop (); - } - else - { - if (selection_wait == Sel_normal - && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion - { - /* - * pass through again trying CUT_BUFFER0 if we've come from - * XConvertSelection () but nothing was presented - */ - selection_paste (display->root, XA_CUT_BUFFER0, False); - } - - goto bailout; - } - } - else if (selection_wait == Sel_incr) - { - incr_ev.start (10); - - while (incr_buf_fill + ct.nitems > incr_buf_size) - { - incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; - incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size); - } - - memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); - incr_buf_fill += ct.nitems; - - goto bailout; - } - - char **cl; - int cr; - -#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]) - { - wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); - char *s = rxvt_wcstombs (w); - free (w); - // TODO: strlen == only the first element will be converted. well... - paste (s, strlen (s)); - free (s); - } - else -#endif - if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 - && cl) - { - for (int i = 0; i < cr; i++) - paste (cl[i], strlen (cl[i])); - - XFreeStringList (cl); - } - else - paste ((char *)ct.value, ct.nitems); // paste raw - -bailout: - XFree (ct.value); - - if (selection_wait == Sel_normal) - selection_wait = Sel_none; -} - -void -rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW -{ - selection_wait = Sel_none; - - incr_buf_size = 0; - free (incr_buf); - - rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); -} - -void -rxvt_term::selection_property (Window win, Atom prop) NOTHROW -{ - if (prop == None || selection_wait != Sel_incr) - return; - - selection_paste (win, prop, true); -} - -/* ------------------------------------------------------------------------- */ -/* - * Request the current selection: - * Order: > internal selection if available - * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) - * > CUT_BUFFER0 - * (+) if ownership is claimed but property is empty, rxvt_selection_paste () - * will auto fallback to CUT_BUFFER0 + * Request PRIMARY, SECONDARY or CLIPBOARD selection. + * if the requested selection has no owner or is empty CUT_BUFFER0 is used + * as fallback * EXT: button 2 release */ void rxvt_term::selection_request (Time tm, int selnum) NOTHROW { - if (selection.text && selnum == Sel_Primary) + if (!selection_req) { - /* internal selection */ - char *str = rxvt_wcstombs (selection.text, selection.len); - paste (str, strlen (str)); - free (str); - return; + selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); + selection_req->run (); } - else - { - selection_request_time = tm; - selection_wait = Sel_normal; - -#if X_HAVE_UTF8_STRING - selection_type = Sel_UTF8String; - if (selection_request_other (xa[XA_UTF8_STRING], selnum)) - return; -#else - selection_type = Sel_CompoundText; - if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) - return; -#endif - } - - selection_wait = Sel_none; /* don't loop in selection_paste () */ - selection_paste (display->root, XA_CUT_BUFFER0, false); -} - -int -rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW -{ - Atom sel; - - selection_type |= selnum; - - if (selnum == Sel_Primary) - sel = XA_PRIMARY; - else if (selnum == Sel_Secondary) - sel = XA_SECONDARY; - else - sel = xa[XA_CLIPBOARD]; - - if (XGetSelectionOwner (dpy, sel) != None) - { - XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], - vt, selection_request_time); - return 1; - } - - return 0; } /* ------------------------------------------------------------------------- */ @@ -3637,6 +3420,7 @@ void rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW { + Atom property = rq.property == None ? rq.target : rq.property; XSelectionEvent ev; ev.type = SelectionNotify; @@ -3661,10 +3445,10 @@ *target++ = xa[XA_UTF8_STRING]; #endif - XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, + XChangeProperty (dpy, rq.requestor, property, XA_ATOM, 32, PropModeReplace, (unsigned char *)target_list, target - target_list); - ev.property = rq.property; + ev.property = property; } #if TODO // TODO else if (rq.target == xa[XA_MULTIPLE]) @@ -3674,15 +3458,15 @@ #endif else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) { - XChangeProperty (dpy, rq.requestor, rq.property, rq.target, + XChangeProperty (dpy, rq.requestor, property, rq.target, 32, PropModeReplace, (unsigned char *)&selection_time, 1); - ev.property = rq.property; + ev.property = property; } else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) { - XChangeProperty (dpy, rq.requestor, rq.property, rq.target, + XChangeProperty (dpy, rq.requestor, property, rq.target, 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); - ev.property = rq.property; + ev.property = property; } else if (rq.target == XA_STRING || rq.target == xa[XA_TEXT] @@ -3763,10 +3547,10 @@ ct.encoding = target; } - XChangeProperty (dpy, rq.requestor, rq.property, + XChangeProperty (dpy, rq.requestor, property, ct.encoding, 8, PropModeReplace, ct.value, (int)ct.nitems); - ev.property = rq.property; + ev.property = property; if (freect) XFree (ct.value);