Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/a92f2aa0a6405682084fe040960e710fd3c3179d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/a92f2aa0a6405682084fe040960e710fd3c3179d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/a92f2aa0a6405682084fe040960e710fd3c3179d
The branch, master has been updated
via a92f2aa0a6405682084fe040960e710fd3c3179d (commit)
from 75212235f8064d1d263132aca4049ceec342ae9a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commitdiff/a92f2aa0a6405682084fe040960e710fd3c3179d
commit a92f2aa0a6405682084fe040960e710fd3c3179d
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Simple clipboard support. Only used within browser window.
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 3992aff..37341ee 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -136,7 +136,7 @@ $(eval $(foreach V,$(filter
FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V
# S_FRAMEBUFFER are sources purely for the framebuffer build
S_FRAMEBUFFER := gui.c framebuffer.c tree.c save.c schedule.c \
thumbnail.c misc.c bitmap.c filetype.c login.c findfile.c \
- localhistory.c system_colour.c
+ localhistory.c system_colour.c clipboard.c
S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c \
text.c scroll.c osk.c
diff --git a/framebuffer/clipboard.c b/framebuffer/clipboard.c
new file mode 100644
index 0000000..16831ff
--- /dev/null
+++ b/framebuffer/clipboard.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2012 Michael Drake <[email protected]>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * nsfb internal clipboard handling
+ */
+
+#include <assert.h>
+#include <stdint.h>
+#include <string.h>
+#include "desktop/selection.h"
+#include "framebuffer/gui.h"
+#include "render/box.h"
+#include "utils/log.h"
+
+
+static struct gui_clipboard {
+ char *buffer;
+ size_t buffer_len;
+ size_t length;
+} gui_clipboard;
+
+
+/**
+ * Selection traversal routine for appending text to the current contents
+ * of the clipboard.
+ *
+ * \param text pointer to text being added, or NULL for newline
+ * \param length length of text to be appended (bytes)
+ * \param box pointer to text box, or NULL if from textplain
+ * \param handle unused handle, we don't need one
+ * \param whitespace_text whitespace to place before text for formatting
+ * may be NULL
+ * \param whitespace_length length of whitespace_text
+ * \return true iff successful and traversal should continue
+ */
+
+static 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;
+}
+
+
+/**
+ * Empty the clipboard, called prior to gui_add_to_clipboard and
+ * gui_commit_clipboard
+ *
+ * \return true iff successful
+ */
+
+bool gui_empty_clipboard(void)
+{
+ const size_t init_size = 1024;
+
+ if (gui_clipboard.buffer_len == 0) {
+ gui_clipboard.buffer = malloc(init_size);
+ if (gui_clipboard.buffer == NULL)
+ return false;
+
+ gui_clipboard.buffer_len = init_size;
+ }
+
+ gui_clipboard.length = 0;
+
+ return true;
+}
+
+
+/**
+ * Add some text to the clipboard, optionally appending a trailing space.
+ *
+ * \param text text to be added
+ * \param length length of text in bytes
+ * \param space indicates whether a trailing space should be appended
+ * \return true iff successful
+ */
+
+bool gui_add_to_clipboard(const char *text, size_t length, bool space)
+{
+ size_t new_length = gui_clipboard.length + length + (space ? 1 : 0) + 1;
+
+ if (new_length > gui_clipboard.buffer_len) {
+ size_t new_alloc = new_length + (new_length / 4);
+ char *new_buff;
+
+ new_buff = realloc(gui_clipboard.buffer, new_alloc);
+ if (new_buff == NULL)
+ return false;
+
+ gui_clipboard.buffer = new_buff;
+ gui_clipboard.buffer_len = new_alloc;
+ }
+
+ memcpy(gui_clipboard.buffer + gui_clipboard.length, text, length);
+ gui_clipboard.length += length;
+
+ if (space)
+ gui_clipboard.buffer[gui_clipboard.length++] = ' ';
+
+ gui_clipboard.buffer[gui_clipboard.length] = '\0';
+
+ return true;
+}
+
+
+/**
+ * Commit the changes made by gui_empty_clipboard and gui_add_to_clipboard.
+ *
+ * \return true iff successful
+ */
+
+bool gui_commit_clipboard(void)
+{
+ /* TODO: Stick the clipboard in some fbtk buffer? */
+ return true;
+}
+
+
+/**
+ * Copy the selected contents to the clipboard
+ *
+ * \param s selection
+ * \return true iff successful, ie. cut operation can proceed without losing
data
+ */
+
+bool gui_copy_to_clipboard(struct selection *s)
+{
+ if (!gui_empty_clipboard())
+ return false;
+
+ selection_traverse(s, copy_handler, NULL);
+
+ return gui_commit_clipboard();
+}
+
+
+/**
+ * Request to paste the clipboard contents into a textarea/input field
+ * at a given position.
+ *
+ * \param g gui window
+ * \param x x ordinate at which to paste text
+ * \param y y ordinate at which to paste text
+ */
+
+void gui_paste_from_clipboard(struct gui_window *g, int x, int y)
+{
+ if (gui_clipboard.length > 0) {
+ LOG(("Pasting %i chars: \"%s\"\n", gui_clipboard.length,
+ gui_clipboard.buffer));
+ browser_window_paste_text(g->bw, gui_clipboard.buffer,
+ gui_clipboard.length, true);
+ }
+}
+
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 652c5b8..6fad346 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -1764,35 +1764,6 @@ gui_clear_selection(struct gui_window *g)
}
void
-gui_paste_from_clipboard(struct gui_window *g, int x, int y)
-{
-}
-
-bool
-gui_empty_clipboard(void)
-{
- return false;
-}
-
-bool
-gui_add_to_clipboard(const char *text, size_t length, bool space)
-{
- return false;
-}
-
-bool
-gui_commit_clipboard(void)
-{
- return false;
-}
-
-bool
-gui_copy_to_clipboard(struct selection *s)
-{
- return false;
-}
-
-void
gui_create_form_select_menu(struct browser_window *bw,
struct form_control *control)
{
-----------------------------------------------------------------------
Summary of changes:
framebuffer/Makefile.target | 2 +-
framebuffer/clipboard.c | 186 +++++++++++++++++++++++++++++++++++++++++++
framebuffer/gui.c | 29 -------
3 files changed, 187 insertions(+), 30 deletions(-)
create mode 100644 framebuffer/clipboard.c
diff --git a/framebuffer/Makefile.target b/framebuffer/Makefile.target
index 3992aff..37341ee 100644
--- a/framebuffer/Makefile.target
+++ b/framebuffer/Makefile.target
@@ -136,7 +136,7 @@ $(eval $(foreach V,$(filter
FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V
# S_FRAMEBUFFER are sources purely for the framebuffer build
S_FRAMEBUFFER := gui.c framebuffer.c tree.c save.c schedule.c \
thumbnail.c misc.c bitmap.c filetype.c login.c findfile.c \
- localhistory.c system_colour.c
+ localhistory.c system_colour.c clipboard.c
S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c \
text.c scroll.c osk.c
diff --git a/framebuffer/clipboard.c b/framebuffer/clipboard.c
new file mode 100644
index 0000000..16831ff
--- /dev/null
+++ b/framebuffer/clipboard.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2012 Michael Drake <[email protected]>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * nsfb internal clipboard handling
+ */
+
+#include <assert.h>
+#include <stdint.h>
+#include <string.h>
+#include "desktop/selection.h"
+#include "framebuffer/gui.h"
+#include "render/box.h"
+#include "utils/log.h"
+
+
+static struct gui_clipboard {
+ char *buffer;
+ size_t buffer_len;
+ size_t length;
+} gui_clipboard;
+
+
+/**
+ * Selection traversal routine for appending text to the current contents
+ * of the clipboard.
+ *
+ * \param text pointer to text being added, or NULL for newline
+ * \param length length of text to be appended (bytes)
+ * \param box pointer to text box, or NULL if from textplain
+ * \param handle unused handle, we don't need one
+ * \param whitespace_text whitespace to place before text for formatting
+ * may be NULL
+ * \param whitespace_length length of whitespace_text
+ * \return true iff successful and traversal should continue
+ */
+
+static 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;
+}
+
+
+/**
+ * Empty the clipboard, called prior to gui_add_to_clipboard and
+ * gui_commit_clipboard
+ *
+ * \return true iff successful
+ */
+
+bool gui_empty_clipboard(void)
+{
+ const size_t init_size = 1024;
+
+ if (gui_clipboard.buffer_len == 0) {
+ gui_clipboard.buffer = malloc(init_size);
+ if (gui_clipboard.buffer == NULL)
+ return false;
+
+ gui_clipboard.buffer_len = init_size;
+ }
+
+ gui_clipboard.length = 0;
+
+ return true;
+}
+
+
+/**
+ * Add some text to the clipboard, optionally appending a trailing space.
+ *
+ * \param text text to be added
+ * \param length length of text in bytes
+ * \param space indicates whether a trailing space should be appended
+ * \return true iff successful
+ */
+
+bool gui_add_to_clipboard(const char *text, size_t length, bool space)
+{
+ size_t new_length = gui_clipboard.length + length + (space ? 1 : 0) + 1;
+
+ if (new_length > gui_clipboard.buffer_len) {
+ size_t new_alloc = new_length + (new_length / 4);
+ char *new_buff;
+
+ new_buff = realloc(gui_clipboard.buffer, new_alloc);
+ if (new_buff == NULL)
+ return false;
+
+ gui_clipboard.buffer = new_buff;
+ gui_clipboard.buffer_len = new_alloc;
+ }
+
+ memcpy(gui_clipboard.buffer + gui_clipboard.length, text, length);
+ gui_clipboard.length += length;
+
+ if (space)
+ gui_clipboard.buffer[gui_clipboard.length++] = ' ';
+
+ gui_clipboard.buffer[gui_clipboard.length] = '\0';
+
+ return true;
+}
+
+
+/**
+ * Commit the changes made by gui_empty_clipboard and gui_add_to_clipboard.
+ *
+ * \return true iff successful
+ */
+
+bool gui_commit_clipboard(void)
+{
+ /* TODO: Stick the clipboard in some fbtk buffer? */
+ return true;
+}
+
+
+/**
+ * Copy the selected contents to the clipboard
+ *
+ * \param s selection
+ * \return true iff successful, ie. cut operation can proceed without losing
data
+ */
+
+bool gui_copy_to_clipboard(struct selection *s)
+{
+ if (!gui_empty_clipboard())
+ return false;
+
+ selection_traverse(s, copy_handler, NULL);
+
+ return gui_commit_clipboard();
+}
+
+
+/**
+ * Request to paste the clipboard contents into a textarea/input field
+ * at a given position.
+ *
+ * \param g gui window
+ * \param x x ordinate at which to paste text
+ * \param y y ordinate at which to paste text
+ */
+
+void gui_paste_from_clipboard(struct gui_window *g, int x, int y)
+{
+ if (gui_clipboard.length > 0) {
+ LOG(("Pasting %i chars: \"%s\"\n", gui_clipboard.length,
+ gui_clipboard.buffer));
+ browser_window_paste_text(g->bw, gui_clipboard.buffer,
+ gui_clipboard.length, true);
+ }
+}
+
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 652c5b8..6fad346 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -1764,35 +1764,6 @@ gui_clear_selection(struct gui_window *g)
}
void
-gui_paste_from_clipboard(struct gui_window *g, int x, int y)
-{
-}
-
-bool
-gui_empty_clipboard(void)
-{
- return false;
-}
-
-bool
-gui_add_to_clipboard(const char *text, size_t length, bool space)
-{
- return false;
-}
-
-bool
-gui_commit_clipboard(void)
-{
- return false;
-}
-
-bool
-gui_copy_to_clipboard(struct selection *s)
-{
- return false;
-}
-
-void
gui_create_form_select_menu(struct browser_window *bw,
struct form_control *control)
{
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
