mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 21:16:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use selection_copy_to_clipboard instead of peering at core innards.

Browse Source
This commit is contained in:
Michael Drake 2012-08-02 14:38:47 +01:00
parent 408dd00ed4
commit 5747465437
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/selection.c
View File

@ -22,21 +22,13 @@
#include "utils/log.h" #include "utils/log.h"
#include "desktop/gui.h" #include "desktop/gui.h"
#include "desktop/textinput.h"
#include "desktop/selection.h" #include "desktop/selection.h"
#include "desktop/browser.h" #include "desktop/browser.h"
#include "gtk/selection.h" #include "gtk/selection.h"
#include "gtk/window.h" #include "gtk/window.h"
#include "utils/utf8.h"
#include "render/box.h"
static GString *current_selection = NULL; static GString *current_selection = NULL;
static GtkClipboard *clipboard; static GtkClipboard *clipboard;
static bool copy_handler(const char *text, size_t length, struct box *box,
void *handle, const char *whitespace_text,
size_t whitespace_length);
bool gui_add_to_clipboard(const char *text, size_t length, bool space) bool gui_add_to_clipboard(const char *text, size_t length, bool space)
@ -48,31 +40,10 @@ bool gui_add_to_clipboard(const char *text, size_t length, bool space)
return true; return true;
} }
bool copy_handler(const char *text, size_t length, struct box *box,
void *handle, const char *whitespace_text,
size_t whitespace_length)
{
bool add_space = box != NULL ? box->space != 0 : false;
/* add any whitespace which precedes the text from this box */
if (whitespace_text != NULL && whitespace_length > 0) {
if (!gui_add_to_clipboard(whitespace_text,
whitespace_length, false)) {
return false;
}
}
/* add the text from this box */
if (!gui_add_to_clipboard(text, length, add_space))
return false;
return true;
}
bool gui_copy_to_clipboard(struct selection *s) bool gui_copy_to_clipboard(struct selection *s)
{ {
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
if (s->defined && selection_traverse(s, copy_handler, NULL)) if (s->defined && selection_copy_to_clipboard(s))
gui_commit_clipboard(); gui_commit_clipboard();
return TRUE; return TRUE;
} }