--- rxvt-unicode/src/screen.C 2011/01/20 17:39:29 1.364 +++ rxvt-unicode/src/screen.C 2011/03/21 13:46:17 1.377 @@ -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 */ /* ------------------------------------------------------------------------- * @@ -1687,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]); @@ -2033,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? */ @@ -2515,12 +2513,12 @@ bool transparent = false; #ifdef HAVE_BG_PIXMAP - if (bgPixmap.pixmap != None) + if (bg_pixmap != None) { # ifdef ENABLE_TRANSPARENCY - if (bgPixmap.flags & bgPixmap_t::isTransparent) + if (bg_flags & BG_IS_TRANSPARENT) { - XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap); + XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); transparent = true; @@ -2529,7 +2527,7 @@ # endif { XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); - XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap); + XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); } } else @@ -2736,193 +2734,6 @@ /* ------------------------------------------------------------------------- */ /* - * 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 (+) @@ -2940,50 +2751,12 @@ char *str = rxvt_wcstombs (selection.text, selection.len); paste (str, strlen (str)); 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], this); + selection_req->run (); } - - return 0; } /* ------------------------------------------------------------------------- */