mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove any forcing of UTF-8 in the clipboard, as internally NetSurf will use the UTF8 chunks now.

This commit is contained in:
Chris Young 2012-08-03 21:04:38 +01:00
parent 3a00eca535
commit 2694a98f81
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
amiga/clipboard.c
View File

@ -46,7 +46,6 @@
#define ID_UTF8 MAKE_ID('U','T','F','8')
struct IFFHandle *iffh = NULL;
bool ami_utf8_clipboard = false; // force UTF-8 in clipboard
bool ami_add_to_clipboard(const char *text, size_t length, bool space);
static bool ami_copy_selection(const char *text, size_t length,
@ -226,7 +225,7 @@ bool gui_empty_clipboard(void)
{
if(!(PushChunk(iffh,ID_FTXT,ID_FORM,IFFSIZE_UNKNOWN)))
{
if(nsoption_bool(utf8_clipboard) || ami_utf8_clipboard)
if(nsoption_bool(utf8_clipboard))
{
if(!(PushChunk(iffh,0,ID_CSET,32)))
{
@ -258,7 +257,7 @@ bool gui_add_to_clipboard(const char *text, size_t length, bool space)
if(text == NULL) return true;
if(!(PushChunk(iffh,0,ID_CHRS,IFFSIZE_UNKNOWN))) {
if(nsoption_bool(utf8_clipboard) || ami_utf8_clipboard) {
if(nsoption_bool(utf8_clipboard)) {
WriteChunkBytes(iffh,text,length);
} else {
buffer = ami_utf8_easy(text);
@ -371,8 +370,6 @@ void ami_drag_selection(struct selection *s)
if(text_box = ami_text_box_at_point(gwin, (ULONG *)&x, (ULONG *)&y))
{
ami_utf8_clipboard = true;
iffh = ami_clipboard_init_internal(1);
if(gui_copy_to_clipboard(s))
@ -383,7 +380,6 @@ void ami_drag_selection(struct selection *s)
ami_clipboard_free_internal(iffh);
iffh = old_iffh;
ami_utf8_clipboard = false;
}
else
{