--- rxvt-unicode/src/screen.C 2010/04/17 23:00:45 1.340 +++ rxvt-unicode/src/screen.C 2011/02/09 23:07:18 1.371 @@ -30,17 +30,16 @@ #include -#include "salloc.C" // HACK, should be a seperate compile! +#include "salloc.C" // HACK, should be a separate compile! -static inline void fill_text (text_t *start, text_t value, int len) +static inline void +fill_text (text_t *start, text_t value, int len) { while (len--) *start++ = value; } /* ------------------------------------------------------------------------- */ -#define PROP_SIZE 256*1024 -#define PASTE_SIZE 32768 #define TABSIZE 8 /* default tab size */ /* ------------------------------------------------------------------------- * @@ -145,6 +144,8 @@ rend_t rend = l.r[col] & ~RS_baseattrMask; rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); + l.touch (); + // found start, nuke do { l.t[col] = ' '; @@ -399,7 +400,7 @@ free (tabs); tabs = (char *)rxvt_malloc (ncol); - for (int col = ncol; --col; ) + for (int col = ncol; col--; ) tabs [col] = col % TABSIZE == 0; CLEAR_ALL_SELECTION (); @@ -899,25 +900,29 @@ # endif #endif - // nuke the character at this position, if required - if (expect_false ( - line->t[screen.cur.col] == NOCHAR - || (screen.cur.col < ncol - 1 - && line->t[screen.cur.col + 1] == NOCHAR) - )) - scr_kill_char (*line, screen.cur.col); - 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)) { - // ... artificially enlargen the previous one - c = NOCHAR; - // and try the same character next loop iteration - --str; + if (screen.flags & Screen_Autowrap) + { + // ... artificially enlargen the previous one + c = NOCHAR; + // and try the same character next loop iteration + --str; + } + else + screen.cur.col = ncol - width; } + // nuke the character at this position, if required + // 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)) + scr_kill_char (*line, screen.cur.col); + line->touch (); do @@ -932,7 +937,8 @@ line->l = ncol; if (screen.flags & Screen_Autowrap) screen.flags |= Screen_WrapNext; - break; + + goto end_of_line; } c = NOCHAR; @@ -940,16 +946,14 @@ while (expect_false (--width > 0)); // pad with spaces when overwriting wide character with smaller one - if (expect_false (!width)) + for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) { - line->touch (); - - for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) - { - line->t[c] = ' '; - line->r[c] = rend; - } + line->t[c] = ' '; + line->r[c] = rend; } + +end_of_line: + ; } #if ENABLE_COMBINING else // width == 0 @@ -1022,6 +1026,8 @@ #endif } } + else if (screen.flags & Screen_WrapNext) + screen.flags &= ~Screen_WrapNext; else scr_gotorc (0, -1, RELATIVE); } @@ -1337,16 +1343,13 @@ min_it (num, nrow - row); - // 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)) + if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) ren = (rend_t) ~RS_None; else if (GET_BASEBG (rstyle) == Color_bg) { ren = DEFAULT_RSTYLE; - if (mapped && !view_start) + if (mapped) XClearArea (dpy, vt, 0, Row2Pixel (row - view_start), (unsigned int)width, (unsigned int)Height2Pixel (num), False); @@ -1355,7 +1358,7 @@ { ren = rstyle & (RS_fgMask | RS_bgMask); - if (mapped && !view_start) + if (mapped) { gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; XChangeGC (dpy, gc, GCForeground, &gcvalue); @@ -1372,8 +1375,8 @@ { scr_blank_screen_mem (ROW(row), rstyle); - if (!view_start) - scr_blank_line (drawn_buf [row], 0, ncol, ren); + if (row - view_start < nrow) + scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); } } @@ -1682,7 +1685,7 @@ ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); #ifdef HAVE_BG_PIXMAP - if (bgPixmap.pixmap == None) + if (bg_pixmap == None) #endif XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); @@ -2028,7 +2031,7 @@ unsigned int old_screen_flags = screen.flags; char have_bg = 0; #ifdef HAVE_BG_PIXMAP - have_bg = bgPixmap.pixmap != None; + have_bg = bg_pixmap != None; #endif ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ @@ -2330,6 +2333,7 @@ // if invert is 0 reverse video is set so we use bg color as fg color else if (!invert) fore = back; + back = Color_HC; invert = 0; } @@ -2504,28 +2508,52 @@ } void -rxvt_term::scr_recolour () NOTHROW +rxvt_term::scr_recolour (bool refresh) NOTHROW { + bool transparent = false; + #ifdef HAVE_BG_PIXMAP - bgPixmap.apply (); -#else + if (bg_pixmap != None) + { +# ifdef ENABLE_TRANSPARENCY + if (bg_flags & BG_IS_TRANSPARENT) + { + XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); + XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); + + transparent = true; + } + else +# endif + { + XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); + XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); + } + } + else +#endif + { + XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); + XSetWindowBackground (dpy, 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 (scrollBar.win) - { - XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); - scrollBar.state = STATE_IDLE; - scrollBar.show (0); - } - -#endif + { + if (transparent) + XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); + else + XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); + scrollBar.state = STATE_IDLE; + scrollBar.show (0); + } - /* bgPixmap.apply () does not do the following : */ - scr_clear (); - scr_touch (true); + if (refresh) + { + scr_clear (); + scr_touch (true); + } want_refresh = 1; } @@ -2623,7 +2651,7 @@ { int row, wrote; unsigned int width, towrite; - char r1[] = "\n"; + const char r1[] = "\n"; for (row = saveLines + top_row; row < saveLines + nrow - 1; row++) @@ -2679,7 +2707,7 @@ * Paste a selection direct to the command fd */ void -rxvt_term::paste (char *data, unsigned int len) NOTHROW +rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW { /* convert normal newline chars into common keyboard Return key sequence */ for (unsigned int i = 0; i < len; i++) @@ -2695,6 +2723,15 @@ tt_printf ("\e[201~"); } +void +rxvt_term::paste (char *data, unsigned int len) NOTHROW +{ + if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) + return; + + tt_paste (data, len); +} + /* ------------------------------------------------------------------------- */ /* * Respond to a notification that a primary selection has been sent @@ -2705,24 +2742,18 @@ { if (prop == None) /* check for failed XConvertSelection */ { + int selnum = selection_type & Sel_whereMask; + if ((selection_type & Sel_CompoundText)) { - int selnum = selection_type & Sel_whereMask; - selection_type = 0; - if (selnum != Sel_direct) - selection_request_other (XA_STRING, selnum); + 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; + selection_request_other (xa[XA_COMPOUND_TEXT], selnum); } return; @@ -2731,8 +2762,9 @@ unsigned long bytes_after; XTextProperty ct; + // length == (2^31 - 1) / 4, as gdk if (XGetWindowProperty (dpy, win, prop, - 0, PROP_SIZE / 4, + 0, 0x1fffffff, delete_prop, AnyPropertyType, &ct.encoding, &ct.format, &ct.nitems, &bytes_after, @@ -2745,27 +2777,6 @@ 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 *)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; @@ -2805,7 +2816,7 @@ * pass through again trying CUT_BUFFER0 if we've come from * XConvertSelection () but nothing was presented */ - selection_paste (display->root, XA_CUT_BUFFER0, False); + selection_paste (display->root, XA_CUT_BUFFER0, false); } goto bailout; @@ -2818,7 +2829,7 @@ while (incr_buf_fill + ct.nitems > incr_buf_size) { incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; - incr_buf = (char *)realloc (incr_buf, incr_buf_size); + incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size); } memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); @@ -2869,6 +2880,7 @@ incr_buf_size = 0; free (incr_buf); + incr_buf = 0; rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); } @@ -2977,20 +2989,6 @@ } } -void -rxvt_term::clipboard_copy (Time tm) -{ - if (selection.len > 0) - { - free (selection.clip_text); - selection.clip_len = selection.len; - selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); - memcpy (selection.clip_text, selection.text, - sizeof (wchar_t) * selection.clip_len); - selection_grab (tm, true); - } -} - /* ------------------------------------------------------------------------- */ /* * Copy a selection into the cut buffer @@ -2999,7 +2997,7 @@ void rxvt_term::selection_make (Time tm) { - int i; + int size; wchar_t *new_selection_text; text_t *t; @@ -3025,8 +3023,8 @@ if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) return; - i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); - new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); + size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); + new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); int ofs = 0; int extra = 0; @@ -3042,7 +3040,7 @@ if (selection.rect) { col = selection.beg.col; - end_col = ncol + 1; + end_col = selection.end.col; } else #endif @@ -3050,11 +3048,7 @@ col = max (col, 0); - if (row == selection.end.row -#if !ENABLE_MINIMAL - || selection.rect -#endif - ) + if (row == selection.end.row) min_it (end_col, selection.end.col); t = ROW(row).t + col; @@ -3072,9 +3066,9 @@ if (extra < 0) { - extra += i; - i += i; - new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); + extra += size; + size += size; + new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); } ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); @@ -3096,13 +3090,12 @@ } else #endif - if (!ROW(row).is_longer () && row != selection.end.row) + if (!ROW(row).is_longer () + && (row != selection.end.row || end_col != selection.end.col) + && (row != selection.beg.row || selection.beg.col < ncol)) new_selection_text[ofs++] = C0_LF; } - if (end_col != selection.end.col) - new_selection_text[ofs++] = C0_LF; - new_selection_text[ofs] = 0; if (ofs == 0)