From 68eaec5cb4208ee80e7c0610361405fd01fc1b69 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 15 Jan 2014 12:28:55 +0000 Subject: complete move of remaining core gui functions --- beos/gui.cpp | 24 ++++++++---------------- beos/window.h | 3 +++ cocoa/gui.m | 18 +++++++++++++----- cocoa/selection.h | 2 ++ cocoa/selection.m | 1 + desktop/selection.c | 2 +- desktop/textarea.c | 2 ++ framebuffer/findfile.h | 2 ++ gtk/gui.c | 16 ++++++++++++---- gtk/selection.h | 4 ++++ monkey/browser.c | 32 -------------------------------- monkey/cert.c | 6 ++++-- monkey/cert.h | 4 ++++ monkey/main.c | 8 ++++++-- 14 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 cocoa/selection.h create mode 100644 monkey/cert.h diff --git a/beos/gui.cpp b/beos/gui.cpp index 45a0e6bc7..33337d8ff 100644 --- a/beos/gui.cpp +++ b/beos/gui.cpp @@ -346,7 +346,7 @@ static int32 bapp_thread(void *arg) return 0; } -nsurl *gui_get_resource_url(const char *path) +static nsurl *gui_get_resource_url(const char *path) { nsurl *url = NULL; BString u("rsrc:///"); @@ -784,13 +784,6 @@ static void gui_quit(void) } - -void gui_create_form_select_menu(struct browser_window *bw, - struct form_control *control) -{ - CALLED(); -} - /** * Send the source of a content to a text editor. */ @@ -888,7 +881,7 @@ void nsbeos_gui_view_source(struct hlcache_handle *content) * Broadcast an URL that we can't handle. */ -void gui_launch_url(const char *url) +static void gui_launch_url(const char *url) { status_t status; // try to open it as an URI @@ -949,13 +942,6 @@ void die(const char * const error) exit(EXIT_FAILURE); } -void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, - unsigned long num, nserror (*cb)(bool proceed, void *pw), - void *cbpw) -{ - CALLED(); -} - static void nsbeos_create_ssl_verify_window(struct browser_window *bw, hlcache_handle *c, const struct ssl_cert_info *certs, unsigned long num) @@ -1076,6 +1062,12 @@ bool path_add_part(char *path, int length, const char *newpart) static struct gui_table beos_gui_table = { .poll = gui_poll, .quit = gui_quit, + + .get_resource_url = gui_get_resource_url, + .launch_url = gui_launch_url, + + .get_clipboard = gui_get_clipboard, + .set_clipboard = gui_set_clipboard, }; diff --git a/beos/window.h b/beos/window.h index 4bd38de4e..8e98841c7 100644 --- a/beos/window.h +++ b/beos/window.h @@ -62,4 +62,7 @@ void nsbeos_window_destroy_browser(struct gui_window *g); struct browser_window *nsbeos_get_browser_window(struct gui_window *g); +void gui_get_clipboard(char **buffer, size_t *length); +void gui_set_clipboard(const char *buffer, size_t length, nsclipboard_styles styles[], int n_styles); + #endif /* NETSURF_BEOS_WINDOW_H */ diff --git a/cocoa/gui.m b/cocoa/gui.m index 40dc8e191..2c3680994 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -24,6 +24,7 @@ #import "cocoa/BrowserViewController.h" #import "cocoa/BrowserWindowController.h" #import "cocoa/FormSelectMenu.h" +#import "cocoa/selection.h" #import "desktop/gui.h" #import "desktop/netsurf.h" @@ -46,7 +47,7 @@ NSString * const kAlwaysCloseMultipleTabs = @"AlwaysCloseMultipleTabs"; #define UNIMPL() NSLog( @"Function '%s' unimplemented", __func__ ) -nsurl *gui_get_resource_url(const char *path) +static nsurl *gui_get_resource_url(const char *path) { nsurl *url = NULL; NSString *nspath = [[NSBundle mainBundle] pathForResource: [NSString stringWithUTF8String: path] ofType: @""]; @@ -251,7 +252,7 @@ static void gui_window_new_content(struct gui_window *g) } -void gui_create_form_select_menu(struct browser_window *bw, +static void gui_create_form_select_menu(struct browser_window *bw, struct form_control *control) { FormSelectMenu *menu = [[FormSelectMenu alloc] initWithControl: control forWindow: bw]; @@ -259,14 +260,14 @@ void gui_create_form_select_menu(struct browser_window *bw, [menu release]; } -void gui_launch_url(const char *url) +static void gui_launch_url(const char *url) { [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: [NSString stringWithUTF8String: url]]]; } struct ssl_cert_info; -void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, +static void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw) { @@ -304,7 +305,14 @@ static struct gui_window_table cocoa_window_table = { }; static struct gui_table gui_table = { - .poll = &gui_poll, + .poll = gui_poll, + .get_resource_url = gui_get_resource_url, + .launch_url = gui_launch_url, + .create_form_select_menu = gui_create_form_select_menu, + .cert_verify = gui_cert_verify, + + .get_clipboard = gui_get_clipboard, + .set_clipboard = gui_set_clipboard, .window = &cocoa_window_table, }; diff --git a/cocoa/selection.h b/cocoa/selection.h new file mode 100644 index 000000000..14b6e763f --- /dev/null +++ b/cocoa/selection.h @@ -0,0 +1,2 @@ +void gui_get_clipboard(char **buffer, size_t *length); +void gui_set_clipboard(const char *buffer, size_t length, nsclipboard_styles styles[], int n_styles); diff --git a/cocoa/selection.m b/cocoa/selection.m index daa64bf08..e95a78441 100644 --- a/cocoa/selection.m +++ b/cocoa/selection.m @@ -19,6 +19,7 @@ #import #import "cocoa/BrowserViewController.h" +#import "cocoa/selection.h" #import "desktop/browser_private.h" diff --git a/desktop/selection.c b/desktop/selection.c index fc91f1dbb..7535f6915 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -845,7 +845,7 @@ bool selection_copy_to_clipboard(struct selection *s) return false; } - gui_set_clipboard(sel_string.buffer, sel_string.length, + guit->set_clipboard(sel_string.buffer, sel_string.length, sel_string.styles, sel_string.n_styles); free(sel_string.buffer); diff --git a/desktop/textarea.c b/desktop/textarea.c index 423767274..14747252d 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -24,11 +24,13 @@ #include #include #include "css/utils.h" + #include "desktop/mouse.h" #include "desktop/textarea.h" #include "desktop/textinput.h" #include "desktop/plotters.h" #include "desktop/scrollbar.h" +#include "desktop/gui_factory.h" #include "render/font.h" #include "utils/log.h" #include "utils/utf8.h" diff --git a/framebuffer/findfile.h b/framebuffer/findfile.h index 130bd3eb4..ca40c7751 100644 --- a/framebuffer/findfile.h +++ b/framebuffer/findfile.h @@ -19,6 +19,8 @@ #ifndef NETSURF_FB_FINDFILE_H #define NETSURF_FB_FINDFILE_H +#include "utils/nsurl.h" + extern char **respaths; /** Create an array of valid paths to search for resources. diff --git a/gtk/gui.c b/gtk/gui.c index 0501ec3f6..9dea700e4 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -55,6 +55,7 @@ #include "desktop/textinput.h" #include "desktop/tree.h" #include "css/utils.h" + #include "gtk/compat.h" #include "gtk/completion.h" #include "gtk/cookies.h" @@ -67,6 +68,7 @@ #include "gtk/treeview.h" #include "gtk/window.h" #include "gtk/schedule.h" +#include "gtk/selection.h" #include "render/form.h" #include "utils/filepath.h" @@ -322,7 +324,7 @@ static void check_options(char **respath) } -nsurl *gui_get_resource_url(const char *path) +static nsurl *gui_get_resource_url(const char *path) { char buf[PATH_MAX]; char *raw; @@ -635,7 +637,7 @@ static void nsgtk_select_menu_clicked(GtkCheckMenuItem *checkmenuitem, select_menu_control, (intptr_t)user_data); } -void gui_create_form_select_menu(struct browser_window *bw, +static void gui_create_form_select_menu(struct browser_window *bw, struct form_control *control) { @@ -676,7 +678,7 @@ void gui_create_form_select_menu(struct browser_window *bw, } -void gui_launch_url(const char *url) +static void gui_launch_url(const char *url) { gboolean ok; GError *error = NULL; @@ -714,7 +716,7 @@ void die(const char * const error) } -void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, +static void gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, unsigned long num, nserror (*cb)(bool proceed, void *pw), void *cbpw) { @@ -1132,6 +1134,12 @@ static struct gui_table nsgtk_gui_table = { .poll = gui_poll, .quit = gui_quit, .set_search_ico = gui_set_search_ico, + .get_resource_url = gui_get_resource_url, + .launch_url = gui_launch_url, + .create_form_select_menu = gui_create_form_select_menu, + .get_clipboard = gui_get_clipboard, + .set_clipboard = gui_set_clipboard, + .cert_verify = gui_cert_verify, }; /** diff --git a/gtk/selection.h b/gtk/selection.h index c2a0b35f4..0d3ec7371 100644 --- a/gtk/selection.h +++ b/gtk/selection.h @@ -22,4 +22,8 @@ #include #include "desktop/gui.h" +void gui_get_clipboard(char **buffer, size_t *length); +void gui_set_clipboard(const char *buffer, size_t length, nsclipboard_styles styles[], int n_styles); + + #endif diff --git a/monkey/browser.c b/monkey/browser.c index 7cada343e..97bd0be8b 100644 --- a/monkey/browser.c +++ b/monkey/browser.c @@ -302,30 +302,6 @@ gui_window_scroll_visible(struct gui_window *g, int x0, int y0, g->win_num, x0, y0, x1, y1); } -/** - * Core asks front end for clipboard contents. - * - * \param buffer UTF-8 text, allocated by front end, ownership yeilded to core - * \param length Byte length of UTF-8 text in buffer - */ -void gui_get_clipboard(char **buffer, size_t *length) -{ -} - - -/** - * Core tells front end to put given text in clipboard - * - * \param buffer UTF-8 text, owned by core - * \param length Byte length of UTF-8 text in buffer - * \param styles Array of styles given to text runs, owned by core, or NULL - * \param n_styles Number of text run styles in array - */ -void gui_set_clipboard(const char *buffer, size_t length, - nsclipboard_styles styles[], int n_styles) -{ -} - static void gui_window_place_caret(struct gui_window *g, int x, int y, int height, const struct rect *clip) @@ -348,14 +324,6 @@ gui_window_drag_start(struct gui_window *g, gui_drag_type type, return false; } -void -gui_create_form_select_menu(struct browser_window *bw, - struct form_control *control) -{ - fprintf(stdout, "WINDOW SELECT_MENU WIN %u\n", - bw->window->win_num); -} - static void gui_window_save_link(struct gui_window *g, const char *url, const char *title) diff --git a/monkey/cert.c b/monkey/cert.c index 0aa01f3a7..48359e8c2 100644 --- a/monkey/cert.c +++ b/monkey/cert.c @@ -16,11 +16,13 @@ * along with this program. If not, see . */ +#include +#include + #include "desktop/gui.h" #include "utils/ring.h" -#include -#include +#include "monkey/cert.h" typedef struct monkey_cert { struct monkey_cert *r_next, *r_prev; diff --git a/monkey/cert.h b/monkey/cert.h new file mode 100644 index 000000000..2780f4f57 --- /dev/null +++ b/monkey/cert.h @@ -0,0 +1,4 @@ +void +gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs, + unsigned long num, nserror (*cb)(bool proceed, void *pw), + void *cbpw); diff --git a/monkey/main.c b/monkey/main.c index ce7906e03..419543e29 100644 --- a/monkey/main.c +++ b/monkey/main.c @@ -25,6 +25,7 @@ #include "monkey/poll.h" #include "monkey/dispatch.h" #include "monkey/browser.h" +#include "monkey/cert.h" #include "content/urldb.h" #include "content/fetchers/resource.h" @@ -64,7 +65,7 @@ static void monkey_quit(void) gtk_fetch_filetype_fin(); } -nsurl *gui_get_resource_url(const char *path) +static nsurl *gui_get_resource_url(const char *path) { char buf[PATH_MAX]; char *raw; @@ -79,7 +80,7 @@ nsurl *gui_get_resource_url(const char *path) return url; } -void +static void gui_launch_url(const char *url) { fprintf(stdout, "GENERIC LAUNCH URL %s\n", url); @@ -116,6 +117,9 @@ static bool nslog_stream_configure(FILE *fptr) static struct gui_table monkey_gui_table = { .poll = monkey_poll, .quit = monkey_quit, + .get_resource_url = gui_get_resource_url, + .launch_url = gui_launch_url, + .cert_verify = gui_cert_verify, }; int -- cgit v1.2.3