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

Use selection_get_copy instead of selection_traverse. Note: untested.

This commit is contained in:
Michael Drake 2012-08-13 17:42:23 +01:00
parent 86f3e70f1a
commit 4d6ada8c9a
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
amiga/clipboard.c
View File

@ -48,11 +48,6 @@
struct IFFHandle *iffh = NULL;
bool ami_add_to_clipboard(const char *text, size_t length, bool space);
static bool ami_copy_selection(const char *text, size_t length,
struct box *box, void *handle, const char *whitespace_text,
size_t whitespace_length);
static LONG ami_clipboard_iffp_do_nothing(struct Hook *hook, void *object, LONG *cmd)
{
return 0;
@ -322,35 +317,32 @@ bool gui_copy_to_clipboard(struct selection *s)
struct ami_text_selection *ami_selection_to_text(struct gui_window_2 *gwin)
{
struct ami_text_selection *sel;
int len;
char *ss;
sel = AllocVec(sizeof(struct ami_text_selection),
MEMF_PRIVATE | MEMF_CLEAR);
if(sel) selection_traverse(browser_window_get_selection(gwin->bw), ami_copy_selection, sel);
if (sel) {
/* Get selection string */
ss = selection_get_copy(browser_window_get_selection(gwin->bw));
if (ss == NULL)
return sel;
len = strlen(ss);
if (len > sizeof(sel->text))
len = sizeof(sel->text) - 1;
memcpy(sel->text, ss, len);
sel->length = len;
sel->text[sel->length] = '\0';
free(ss);
}
return sel;
}
static bool ami_copy_selection(const char *text, size_t length,
struct box *box, void *handle, const char *whitespace_text,
size_t whitespace_length)
{
struct ami_text_selection *sel = handle;
int len = length;
if((length + (sel->length)) > (sizeof(sel->text)))
len = sizeof(sel->text) - (sel->length);
if(len <= 0) return false;
memcpy((sel->text) + (sel->length), text, len);
sel->length += len;
sel->text[sel->length] = '\0';
return true;
}
void ami_drag_selection(struct selection *s)
{
struct box *text_box;