--- rxvt-unicode/src/screen.C 2011/04/01 11:06:42 1.379 +++ rxvt-unicode/src/screen.C 2011/07/08 00:08:40 1.388 @@ -640,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 - 1); 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))) { @@ -669,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) { @@ -801,7 +803,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); @@ -830,7 +832,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) @@ -845,7 +847,7 @@ CLEAR_SELECTION (); } - if (expect_false (screen.flags & Screen_WrapNext)) + if (ecb_unlikely (screen.flags & Screen_WrapNext)) { scr_do_wrap (); @@ -857,7 +859,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 @@ -866,7 +868,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 @@ -889,7 +891,7 @@ } } - if (expect_false (screen.flags & Screen_Insert)) + if (ecb_unlikely (screen.flags & Screen_Insert)) scr_insdel_chars (width, INSERT); if (width != 0) @@ -907,7 +909,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) { @@ -924,7 +926,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 (); @@ -934,7 +936,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 { @@ -947,10 +949,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; @@ -1926,7 +1928,7 @@ # ifdef MAPALERT_OPTION if (option (Opt_mapAlert)) # endif - XMapWindow (dpy, parent[0]); + XMapWindow (dpy, parent); # endif # if ENABLE_FRILLS @@ -1949,7 +1951,6 @@ } /* ------------------------------------------------------------------------- */ -/* ARGSUSED */ void rxvt_term::scr_printscreen (int fullhist) NOTHROW { @@ -2237,7 +2238,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) */ @@ -2285,7 +2286,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--; /* @@ -2295,7 +2296,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; @@ -2394,7 +2395,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? @@ -2411,7 +2412,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)) @@ -2522,7 +2523,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; @@ -2530,18 +2531,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) { @@ -2738,12 +2739,9 @@ /* ------------------------------------------------------------------------- */ /* - * 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 @@ -3407,6 +3405,7 @@ void rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW { + Atom property = rq.property == None ? rq.target : rq.property; XSelectionEvent ev; ev.type = SelectionNotify; @@ -3431,10 +3430,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]) @@ -3444,15 +3443,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] @@ -3533,10 +3532,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);