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.155 by root, Thu Feb 3 07:45:39 2005 UTC vs.
Revision 1.156 by root, Fri Feb 4 11:41:23 2005 UTC

… …
3535 */ 3535 */
3536void 3536void
3537rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3537rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3538{ 3538{
3539 XSelectionEvent ev; 3539 XSelectionEvent ev;
3540 dDisp;
3540 3541
3541 ev.type = SelectionNotify; 3542 ev.type = SelectionNotify;
3542 ev.property = None; 3543 ev.property = None;
3543 ev.display = rq.display; 3544 ev.display = rq.display;
3544 ev.requestor = rq.requestor; 3545 ev.requestor = rq.requestor;
… …
3558 *target++ = xa[XA_COMPOUND_TEXT]; 3559 *target++ = xa[XA_COMPOUND_TEXT];
3559#if X_HAVE_UTF8_STRING 3560#if X_HAVE_UTF8_STRING
3560 *target++ = xa[XA_UTF8_STRING]; 3561 *target++ = xa[XA_UTF8_STRING];
3561#endif 3562#endif
3562 3563
3563 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3564 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3564 32, PropModeReplace, 3565 32, PropModeReplace,
3565 (unsigned char *)target_list, target - target_list); 3566 (unsigned char *)target_list, target - target_list);
3566 ev.property = rq.property; 3567 ev.property = rq.property;
3567 } 3568 }
3568#if TODO // TODO 3569#if TODO // TODO
… …
3571 /* TODO: Handle MULTIPLE */ 3572 /* TODO: Handle MULTIPLE */
3572 } 3573 }
3573#endif 3574#endif
3574 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3575 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3575 { 3576 {
3576 XChangeProperty (display->display, rq.requestor, rq.property, rq.target, 3577 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3577 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3578 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3578 ev.property = rq.property; 3579 ev.property = rq.property;
3579 } 3580 }
3580 else if (rq.target == XA_STRING 3581 else if (rq.target == XA_STRING
3581 || rq.target == xa[XA_TEXT] 3582 || rq.target == xa[XA_TEXT]
… …
3639 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3640 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3640 ct.nitems = strlen ((char *)ct.value); 3641 ct.nitems = strlen ((char *)ct.value);
3641 } 3642 }
3642 else 3643 else
3643#endif 3644#endif
3644 if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3645 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3645 freect = 1; 3646 freect = 1;
3646 else 3647 else
3647 { 3648 {
3648 /* if we failed to convert then send it raw */ 3649 /* if we failed to convert then send it raw */
3649 ct.value = (unsigned char *)cl; 3650 ct.value = (unsigned char *)cl;
3650 ct.nitems = selectlen; 3651 ct.nitems = selectlen;
3651 ct.encoding = target; 3652 ct.encoding = target;
3652 } 3653 }
3653 3654
3654 XChangeProperty (display->display, rq.requestor, rq.property, 3655 XChangeProperty (disp, rq.requestor, rq.property,
3655 ct.encoding, 8, PropModeReplace, 3656 ct.encoding, 8, PropModeReplace,
3656 ct.value, (int)ct.nitems); 3657 ct.value, (int)ct.nitems);
3657 ev.property = rq.property; 3658 ev.property = rq.property;
3658 3659
3659 if (freect) 3660 if (freect)
3660 XFree (ct.value); 3661 XFree (ct.value);
3661 } 3662 }
3662 3663
3663 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3664 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3664} 3665}
3665 3666
3666/* ------------------------------------------------------------------------- * 3667/* ------------------------------------------------------------------------- *
3667 * MOUSE ROUTINES * 3668 * MOUSE ROUTINES *
3668 * ------------------------------------------------------------------------- */ 3669 * ------------------------------------------------------------------------- */

Diff Legend

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