gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-22 15:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve RTF format handling and add TIFF handling in X pasteboard.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@26015 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2008-01-31 21:27:36 +00:00
parent dfed2b09c7
commit e6bb6f08ad
2 changed files with 63 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2008-01-31 Fred Kiefer <FredKiefer@gmx.de>
* Tools/xpbs.m: Improve support for RTF and add TIFF support.
2008-01-29 Fred Kiefer <FredKiefer@gmx.de>
* Tools/xpbs.m: Add support for variable available clipboard

69
Tools/xpbs.m
View file

@ -61,7 +61,7 @@ static char *atom_names[] = {
"COMPOUND_TEXT",
"INCR",
// MIME types
// some MIME types
"text/plain",
"text/uri-list",
"application/postscript",
@ -76,6 +76,7 @@ static char *atom_names[] = {
"application/xhtml+xml",
"image/png",
"image/svg"
"application/rtf",
};
static Atom atoms[sizeof(atom_names)/sizeof(char*)];
@ -117,6 +118,7 @@ static Atom atoms[sizeof(atom_names)/sizeof(char*)];
#define XG_MIME_XHTML atoms[31]
#define XG_MIME_PNG atoms[32]
#define XG_MIME_SVG atoms[33]
#define XG_MIME_APP_RTF atoms[34]
@ -606,16 +608,23 @@ static NSString *xWaitMode = @"XPasteboardWaitMode";
}
else if ([type isEqual: NSFilenamesPboardType])
{
[self requestData: XG_FILE_NAME];
}
else if ([type isEqual: NSRTFPboardType])
{
[self requestData: XG_MIME_RTF];
if ([self data] == nil)
[self requestData: XG_MIME_APP_RTF];
}
else if ([type isEqual: NSTIFFPboardType])
{
[self requestData: XG_MIME_TIFF];
}
// FIXME: Support more types
else
{
NSLog(@"Request for non-string info from X pasteboard: %@", type);
NSDebugLLog(@"Pbs", @"Request for non-string info from X pasteboard: %@", type);
}
[pb setData: [self data] forType: type];
}
@ -700,10 +709,15 @@ xErrorHandler(Display *d, XErrorEvent *e)
{
[types addObject: NSFilenamesPboardType];
}
else if (type == XG_MIME_RTF)
else if ((type == XG_MIME_RTF)
|| (type == XG_MIME_APP_RTF))
{
[types addObject: NSRTFPboardType];
}
else if (type == XG_MIME_TIFF)
{
[types addObject: NSTIFFPboardType];
}
else if ((type == XG_TARGETS)
|| (type == XG_TIMESTAMP)
|| (type == XG_OWNER_OS)
@ -721,7 +735,8 @@ xErrorHandler(Display *d, XErrorEvent *e)
// FIXME: We should rather add this type to the
// pasteboard as a string.
NSLog(@"Unsupported selection type '%s'", name);
NSDebugLLog(@"Pbs", @"Unsupported selection type '%s' available",
name);
XFree(name);
}
}
@ -930,7 +945,12 @@ xErrorHandler(Display *d, XErrorEvent *e)
}
RELEASE(url);
}
else if (actual_type == XG_MIME_RTF)
else if ((actual_type == XG_MIME_RTF)
|| (actual_type == XG_MIME_APP_RTF))
{
[self setData: md];
}
else if (actual_type == XG_MIME_TIFF)
{
[self setData: md];
}
@ -943,7 +963,8 @@ xErrorHandler(Display *d, XErrorEvent *e)
{
char *name = XGetAtomName(xDisplay, actual_type);
NSLog(@"Unsupported data type '%s' from X selection.", name);
NSDebugLLog(@"Pbs", @"Unsupported data type '%s' from X selection.",
name);
XFree(name);
}
}
@ -1030,6 +1051,12 @@ xErrorHandler(Display *d, XErrorEvent *e)
if ([types containsObject: NSRTFPboardType])
{
xTypes[numTypes++] = XG_MIME_RTF;
xTypes[numTypes++] = XG_MIME_APP_RTF;
}
if ([types containsObject: NSTIFFPboardType])
{
xTypes[numTypes++] = XG_MIME_TIFF;
}
xType = XA_ATOM;
@ -1116,6 +1143,11 @@ xErrorHandler(Display *d, XErrorEvent *e)
xEvent->target = XG_MIME_RTF;
[self xProvideSelection: xEvent];
}
else if ([types containsObject: NSTIFFPboardType])
{
xEvent->target = XG_MIME_TIFF;
[self xProvideSelection: xEvent];
}
}
else if (xEvent->target == XG_MULTIPLE)
{
@ -1233,10 +1265,10 @@ xErrorHandler(Display *d, XErrorEvent *e)
NSString *s = [url absoluteString];
NSData *d;
xType = xEvent->target;
format = 8;
RELEASE(url);
d = [s dataUsingEncoding: NSISOLatin1StringEncoding];
xType = xEvent->target;
format = 8;
if (d != nil)
{
numItems = [d length];
@ -1245,8 +1277,9 @@ xErrorHandler(Display *d, XErrorEvent *e)
[d getBytes: data];
}
}
else if ((xEvent->target == XG_MIME_RTF) &&
[types containsObject: NSRTFPboardType])
else if (((xEvent->target == XG_MIME_RTF)
|| (xEvent->target == XG_MIME_APP_RTF))
&& [types containsObject: NSRTFPboardType])
{
NSData *d = [_pb dataForType: NSRTFPboardType];
@ -1260,6 +1293,22 @@ xErrorHandler(Display *d, XErrorEvent *e)
[d getBytes: data];
}
}
else if ((xEvent->target == XG_MIME_TIFF) &&
[types containsObject: NSTIFFPboardType])
{
NSData *d = [_pb dataForType: NSTIFFPboardType];
xType = xEvent->target;
format = 8;
if (d != nil)
{
numItems = [d length];
data = malloc(numItems + 1);
if (data)
[d getBytes: data];
}
}
// FIXME: Support more types
else
{
char *name = XGetAtomName(xDisplay, xEvent->target);