--- rxvt-unicode/src/screen.C 2010/04/01 00:58:38 1.337 +++ rxvt-unicode/src/screen.C 2011/02/12 00:30:01 1.373 @@ -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? */ @@ -2233,7 +2236,7 @@ while (expect_false (stp[col] == NOCHAR && col > 0)) --col; - rend_t rend = srp[col]; /* screen rendition (target rendtion) */ + rend_t rend = srp[col]; /* screen rendition (target rendition) */ text_t *text = stp + col; int count = 1; @@ -2288,7 +2291,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_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) + if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) { bool invert = rend & RS_RVid; @@ -2317,25 +2320,31 @@ fore = Color_UL; #endif - if (invert) - { #ifdef OPTION_HC - if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) - || !ISSET_PIXCOLOR (Color_HC)) + if (rend & RS_Sel) + { + /* invert the column if no highlightColor is set or it is the + * current cursor column */ + if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) + && ISSET_PIXCOLOR (Color_HC)) + { + if (ISSET_PIXCOLOR (Color_HTC)) + fore = Color_HTC; + // 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; + } + } #endif - /* invert the column if no highlightColor is set or it is the - * current cursor column */ + + if (invert) + { ::swap (fore, back); -#ifdef OPTION_HC - else if (ISSET_PIXCOLOR (Color_HC)) - back = Color_HC; -#endif #ifndef NO_BOLD_UNDERLINE_REVERSE -# ifndef OPTION_HC - if (ISSET_PIXCOLOR (Color_RV)) - back = Color_RV; -# endif if (fore == back) { fore = Color_bg; @@ -2499,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; } @@ -2598,12 +2631,12 @@ if (selection.rect) scr_xor_rect (selection.beg.row, selection.beg.col, selection.end.row, selection.end.col, - RS_RVid, RS_RVid | RS_Uline); + RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); else #endif scr_xor_span (selection.beg.row, selection.beg.col, selection.end.row, selection.end.col, - RS_RVid); + RS_Sel | RS_RVid); } } @@ -2618,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++) @@ -2674,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++) @@ -2690,191 +2723,13 @@ tt_printf ("\e[201~"); } -/* ------------------------------------------------------------------------- */ -/* - * 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 *)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 *)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 +rxvt_term::paste (char *data, unsigned int len) NOTHROW { - if (prop == None || selection_wait != Sel_incr) + if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) return; - selection_paste (win, prop, true); + tt_paste (data, len); } /* ------------------------------------------------------------------------- */ @@ -2887,6 +2742,18 @@ * will auto fallback to CUT_BUFFER0 * EXT: button 2 release */ + +static void +selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr) +{ + rxvt_term *term = (rxvt_term *)ptr; + + if (data) + term->paste (data, len); + delete rs; + term->selection_req = 0; +} + void rxvt_term::selection_request (Time tm, int selnum) NOTHROW { @@ -2898,48 +2765,11 @@ free (str); return; } - 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) + else if (!selection_req) { - XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], - vt, selection_request_time); - return 1; + selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); + selection_req->run (); } - - return 0; } /* ------------------------------------------------------------------------- */ @@ -2972,20 +2802,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 @@ -2994,7 +2810,7 @@ void rxvt_term::selection_make (Time tm) { - int i; + int size; wchar_t *new_selection_text; text_t *t; @@ -3020,8 +2836,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; @@ -3037,7 +2853,7 @@ if (selection.rect) { col = selection.beg.col; - end_col = ncol + 1; + end_col = selection.end.col; } else #endif @@ -3045,11 +2861,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; @@ -3067,9 +2879,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); @@ -3091,13 +2903,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)