andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XQuartz: pbproxy: Fix a bug that rxvt brought out in STRING copying. Now I can copy and paste to/from rxvt correctly.

Browse Source 
(cherry picked from commit 82a4dc5f0f)
This commit is contained in:
George Peter Staplin 2008-09-25 12:29:57 -06:00 committed by Jeremy Huddleston
parent 12a59c44cb
commit edfa3f8233
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/xquartz/pbproxy/x-selection.m
View File

@ -890,8 +890,10 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
return; return;
} }
DB ("e->selection %s\n", XGetAtomName (x_dpy, e->selection)); #if 0
DB ("e->property %s\n", XGetAtomName (x_dpy, e->property)); printf ("e->selection %s\n", XGetAtomName (x_dpy, e->selection));
printf ("e->property %s\n", XGetAtomName (x_dpy, e->property));
#endif
if ([self is_incr_type:e]) if ([self is_incr_type:e])
{ {
@ -1114,11 +1116,14 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil]; pbtypes = [NSArray arrayWithObjects:NSStringPboardType, nil];
if (nil != pbtypes) if (nil == pbtypes)
{ {
[pb declareTypes:pbtypes owner:nil]; [string autorelease];
[pb setString:string forType:NSStringPboardType]; return;
} }
[pb declareTypes:pbtypes owner:nil];
[pb setString:string forType:NSStringPboardType];
[string autorelease]; [string autorelease];
} }
@ -1138,7 +1143,14 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
free_propdata (pdata); free_propdata (pdata);
return; return;
} }
#if 0
if (None != request_atom)
printf ("request_atom %s\n", XGetAtomName (x_dpy, request_atom));
printf ("type %s\n", XGetAtomName (x_dpy, type));
#endif
if (request_atom == atoms->targets && type == atoms->atom) if (request_atom == atoms->targets && type == atoms->atom)
{ {
[self handle_targets:selection propdata:pdata]; [self handle_targets:selection propdata:pdata];
@ -1159,7 +1171,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
{ {
[self handle_string:pdata pasteboard:pb]; [self handle_string:pdata pasteboard:pb];
} }
free_propdata(pdata); free_propdata(pdata);
[self copy_completed:selection]; [self copy_completed:selection];
@ -1244,6 +1256,7 @@ get_property(Window win, Atom property, struct propdata *pdata, Bool delete, Ato
atoms->clipboard = XInternAtom (x_dpy, "CLIPBOARD", False); atoms->clipboard = XInternAtom (x_dpy, "CLIPBOARD", False);
atoms->text = XInternAtom (x_dpy, "TEXT", False); atoms->text = XInternAtom (x_dpy, "TEXT", False);
atoms->utf8_string = XInternAtom (x_dpy, "UTF8_STRING", False); atoms->utf8_string = XInternAtom (x_dpy, "UTF8_STRING", False);
atoms->string = XInternAtom (x_dpy, "STRING", False);
atoms->targets = XInternAtom (x_dpy, "TARGETS", False); atoms->targets = XInternAtom (x_dpy, "TARGETS", False);
atoms->multiple = XInternAtom (x_dpy, "MULTIPLE", False); atoms->multiple = XInternAtom (x_dpy, "MULTIPLE", False);
atoms->cstring = XInternAtom (x_dpy, "CSTRING", False); atoms->cstring = XInternAtom (x_dpy, "CSTRING", False);