Author: chris_y Date: Sun Jan 15 09:58:26 2012 New Revision: 13404 URL: http://source.netsurf-browser.org?rev=13404&view=rev Log: Accept codeset 1 (undefined) as 106 (UTF-8) when pasting from the clipboard. This should allow us to at least paste from broken ports of MorphOS apps. Modified: trunk/netsurf/amiga/clipboard.c Modified: trunk/netsurf/amiga/clipboard.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/clipboard.c?rev=134... ============================================================================== --- trunk/netsurf/amiga/clipboard.c (original) +++ trunk/netsurf/amiga/clipboard.c Sun Jan 15 09:58:26 2012 @@ -111,6 +111,7 @@ struct ContextNode *cn; ULONG rlen=0,error; struct CSet cset; + LONG codeset = 0; char *clip; STRPTR readbuf = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR); @@ -131,13 +132,15 @@ if((cn)&&(cn->cn_Type == ID_FTXT)&&(cn->cn_ID == ID_CSET)) { rlen = ReadChunkBytes(iffh,&cset,24); + if(cset.CodeSet == 1) codeset = 106; + else codeset = cset.CodeSet; } if((cn)&&(cn->cn_Type == ID_FTXT)&&(cn->cn_ID == ID_CHRS)) { while((rlen = ReadChunkBytes(iffh,readbuf,1024)) > 0) { - if(cset.CodeSet == 0) + if(codeset == 0) { utf8_from_local_encoding(readbuf,rlen,&clip); } @@ -145,7 +148,7 @@ { utf8_from_enc(readbuf, (const char *)ObtainCharsetInfo(DFCS_NUMBER, - cset.CodeSet, DFCS_MIMENAME), + codeset, DFCS_MIMENAME), rlen, &clip); }