ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.380 by sf-exg, Thu Apr 7 12:19:41 2011 UTC vs.
Revision 1.382 by sf-exg, Tue Apr 26 16:19:45 2011 UTC

… …
2736 tt_paste (data, len); 2736 tt_paste (data, len);
2737} 2737}
2738 2738
2739/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2740/* 2740/*
2741 * Request the current selection: 2741 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2742 * Order: > internal selection if available 2742 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2743 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2743 * as fallback
2744 * > CUT_BUFFER0
2745 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2746 * will auto fallback to CUT_BUFFER0
2747 * EXT: button 2 release 2744 * EXT: button 2 release
2748 */ 2745 */
2749void 2746void
2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2747rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2751{ 2748{
… …
3405 * EXT: SelectionRequest 3402 * EXT: SelectionRequest
3406 */ 3403 */
3407void 3404void
3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3409{ 3406{
3407 Atom property = rq.property == None ? rq.target : rq.property;
3410 XSelectionEvent ev; 3408 XSelectionEvent ev;
3411 3409
3412 ev.type = SelectionNotify; 3410 ev.type = SelectionNotify;
3413 ev.property = None; 3411 ev.property = None;
3414 ev.display = rq.display; 3412 ev.display = rq.display;
… …
3429 *target++ = xa[XA_COMPOUND_TEXT]; 3427 *target++ = xa[XA_COMPOUND_TEXT];
3430#if X_HAVE_UTF8_STRING 3428#if X_HAVE_UTF8_STRING
3431 *target++ = xa[XA_UTF8_STRING]; 3429 *target++ = xa[XA_UTF8_STRING];
3432#endif 3430#endif
3433 3431
3434 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3432 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3435 32, PropModeReplace, 3433 32, PropModeReplace,
3436 (unsigned char *)target_list, target - target_list); 3434 (unsigned char *)target_list, target - target_list);
3437 ev.property = rq.property; 3435 ev.property = property;
3438 } 3436 }
3439#if TODO // TODO 3437#if TODO // TODO
3440 else if (rq.target == xa[XA_MULTIPLE]) 3438 else if (rq.target == xa[XA_MULTIPLE])
3441 { 3439 {
3442 /* TODO: Handle MULTIPLE */ 3440 /* TODO: Handle MULTIPLE */
3443 } 3441 }
3444#endif 3442#endif
3445 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3443 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3446 { 3444 {
3447 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3445 XChangeProperty (dpy, rq.requestor, property, rq.target,
3448 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3446 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3449 ev.property = rq.property; 3447 ev.property = property;
3450 } 3448 }
3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3452 { 3450 {
3453 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3451 XChangeProperty (dpy, rq.requestor, property, rq.target,
3454 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3452 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3455 ev.property = rq.property; 3453 ev.property = property;
3456 } 3454 }
3457 else if (rq.target == XA_STRING 3455 else if (rq.target == XA_STRING
3458 || rq.target == xa[XA_TEXT] 3456 || rq.target == xa[XA_TEXT]
3459 || rq.target == xa[XA_COMPOUND_TEXT] 3457 || rq.target == xa[XA_COMPOUND_TEXT]
3460 || rq.target == xa[XA_UTF8_STRING] 3458 || rq.target == xa[XA_UTF8_STRING]
… …
3531 ct.value = (unsigned char *)cl; 3529 ct.value = (unsigned char *)cl;
3532 ct.nitems = selectlen; 3530 ct.nitems = selectlen;
3533 ct.encoding = target; 3531 ct.encoding = target;
3534 } 3532 }
3535 3533
3536 XChangeProperty (dpy, rq.requestor, rq.property, 3534 XChangeProperty (dpy, rq.requestor, property,
3537 ct.encoding, 8, PropModeReplace, 3535 ct.encoding, 8, PropModeReplace,
3538 ct.value, (int)ct.nitems); 3536 ct.value, (int)ct.nitems);
3539 ev.property = rq.property; 3537 ev.property = property;
3540 3538
3541 if (freect) 3539 if (freect)
3542 XFree (ct.value); 3540 XFree (ct.value);
3543 } 3541 }
3544 3542

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines