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

clean up desktop/gui.h include usage

Browse Source
This commit is contained in:
Vincent Sanders 2014-01-29 21:35:53 +00:00
parent 829b4fd454
commit db33103fa3
20 changed files with 69 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/fetchers/resource.c
View File

@ -41,7 +41,6 @@
#include "content/fetch.h"
#include "content/fetchers/resource.h"
#include "content/urldb.h"
#include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "utils/corestrings.h"
#include "utils/nsoption.h"

1
desktop/browser.c
View File

@ -45,7 +45,6 @@
#include "desktop/download.h"
#include "desktop/frames.h"
#include "desktop/global_history.h"
#include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "desktop/hotlist.h"
#include "desktop/knockout.h"

2
desktop/browser.h
View File

@ -27,8 +27,8 @@
#include <stdbool.h>
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/frame_types.h"
#include "desktop/gui.h"
#include "desktop/mouse.h"
#include "utils/types.h"

2
desktop/download.c
View File

@ -23,10 +23,10 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include "content/llcache.h"
#include "desktop/download.h"
#include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "utils/corestrings.h"
#include "utils/http.h"

2
desktop/frames.c
View File

@ -28,12 +28,12 @@
#include <string.h>
#include <time.h>
#include <math.h>
#include "utils/config.h"
#include "content/hlcache.h"
#include "desktop/browser_private.h"
#include "desktop/frames.h"
#include "desktop/local_history.h"
#include "desktop/gui.h"
#include "desktop/scrollbar.h"
#include "desktop/selection.h"
#include "utils/log.h"

58
desktop/gui.h
View File

@ -24,10 +24,13 @@
#define _NETSURF_DESKTOP_GUI_H_
#include <stdbool.h>
#include <stdlib.h>
#include "content/hlcache.h"
#include "desktop/download.h"
#include "utils/types.h"
#include "utils/errors.h"
#include "utils/nsurl.h"
#include "desktop/plot_style.h"
#include "desktop/mouse.h"
typedef enum {
GUI_SAVE_SOURCE,
@ -58,6 +61,8 @@ struct gui_download_window;
struct browser_window;
struct form_control;
struct ssl_cert_info;
struct hlcache_handle;
struct download_context;
typedef struct nsnsclipboard_styles {
size_t start; /**< Start of run */
@ -155,7 +160,7 @@ struct gui_window_table {
void (*set_url)(struct gui_window *g, const char *url);
/** set favicon */
void (*set_icon)(struct gui_window *g, hlcache_handle *icon);
void (*set_icon)(struct gui_window *g, struct hlcache_handle *icon);
/**
* Set the status bar of a browser window.
@ -232,10 +237,10 @@ struct gui_window_table {
/**
* Called when file chooser gadget is activated
*/
void (*file_gadget_open)(struct gui_window *g, hlcache_handle *hl, struct form_control *gadget);
void (*file_gadget_open)(struct gui_window *g, struct hlcache_handle *hl, struct form_control *gadget);
/** object dragged to window*/
void (*drag_save_object)(struct gui_window *g, hlcache_handle *c, gui_save_type type);
void (*drag_save_object)(struct gui_window *g, struct hlcache_handle *c, gui_save_type type);
/** drag selection save */
void (*drag_save_selection)(struct gui_window *g, const char *selection);
@ -248,7 +253,7 @@ struct gui_window_table {
* function table for download windows
*/
struct gui_download_table {
struct gui_download_window *(*create)(download_context *ctx, struct gui_window *parent);
struct gui_download_window *(*create)(struct download_context *ctx, struct gui_window *parent);
nserror (*data)(struct gui_download_window *dw, const char *data, unsigned int size);
@ -365,6 +370,31 @@ struct gui_fetch_table {
};
/**
* User interface utf8 characterset conversion routines
*/
struct gui_utf8_table {
/**
* Convert a UTF-8 encoded string into the system local encoding
*
* \param string The string to convert
* \param len The length (in bytes) of the string, or 0
* \param result Pointer to location in which to store result
* \return An nserror code
*/
nserror (*utf8_to_local)(const char *string, size_t len, char **result);
/**
* Convert a string encoded in the system local encoding to UTF-8
*
* \param string The string to convert
* \param len The length (in bytes) of the string, or 0
* \param result Pointer to location in which to store result
* \return An nserror code
*/
nserror (*local_to_utf8)(const char *string, size_t len, char **result);
};
/** Graphical user interface browser misc function table
*
* function table implementing GUI interface to miscelaneous browser
@ -392,7 +422,7 @@ struct gui_browser_table {
* \param ico may be NULL for local calls; then access current
* cache from search_web_ico()
*/
void (*set_search_ico)(hlcache_handle *ico);
void (*set_search_ico)(struct hlcache_handle *ico);
/**
* core has no fetcher for url
@ -424,7 +454,11 @@ struct gui_browser_table {
*/
struct gui_table {
/** Browser table */
/** Browser table.
*
* Provides miscellaneous browser functionality. The table
* is mandantory and must be provided.
*/
struct gui_browser_table *browser;
/** Window table */
@ -438,6 +472,14 @@ struct gui_table {
/** Fetcher table */
struct gui_fetch_table *fetch;
/** UTF8 table
*
* Provides for conversion between the gui local character
* encoding and utf8. The table optional and may be NULL which
* implies the local encoding is utf8.
*/
struct gui_utf8_table *utf8;
};

3
desktop/gui_factory.c
View File

@ -16,7 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "desktop/gui.h"
#include "content/hlcache.h"
#include "desktop/download.h"
#include "desktop/gui_factory.h"
/** The global GUI interface table */

2
desktop/local_history.c
View File

@ -26,12 +26,12 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
#include "css/css.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/local_history.h"
#include "desktop/plotters.h"
#include "desktop/thumbnail.h"

1
desktop/search.c
View File

@ -29,7 +29,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser_private.h"
#include "desktop/gui.h"
#include "utils/nsoption.h"
#include "desktop/search.h"
#include "desktop/selection.h"

1
desktop/searchweb.c
View File

@ -26,7 +26,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "utils/nsoption.h"
#include "desktop/searchweb.h"

1
desktop/selection.c
View File

@ -29,7 +29,6 @@
#include <dom/dom.h>
#include "desktop/browser_private.h"
#include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"

1
desktop/textinput.c
View File

@ -30,7 +30,6 @@
#include <dom/dom.h>
#include "desktop/browser_private.h"
#include "desktop/gui.h"
#include "desktop/gui_factory.h"
#include "desktop/mouse.h"
#include "desktop/scrollbar.h"

1
framebuffer/fetch.c
View File

@ -22,6 +22,7 @@
#include <stdio.h>
#include <string.h>
#include <limits.h>
#include "desktop/gui.h"
#include "utils/url.h"

4
gtk/download.c
View File

@ -27,10 +27,12 @@
#include "utils/utils.h"
#include "utils/url.h"
#include "utils/messages.h"
#include "utils/nsoption.h"
#include "desktop/download.h"
#include "desktop/gui.h"
#include "gtk/gui.h"
#include "gtk/scaffolding.h"
#include "utils/nsoption.h"
#include "gtk/download.h"
#include "gtk/window.h"
#include "gtk/compat.h"

2
gtk/fetch.c
View File

@ -20,6 +20,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <ctype.h>
#include <string.h>
#include "utils/hashtable.h"
#include "utils/url.h"

2
gtk/scaffolding.h
View File

@ -20,9 +20,9 @@
#define NETSURF_GTK_SCAFFOLDING_H 1
#include <gtk/gtk.h>
//#include <glade/glade.h>
#include <glib.h>
#include "content/hlcache.h"
#include "desktop/gui.h"
#include "desktop/plotters.h"
#include "gtk/menu.h"

8
monkey/download.c
View File

@ -16,11 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "desktop/browser.h"
#include "monkey/browser.h"
#include <stdio.h>
#include "desktop/gui.h"
#include "desktop/download.h"
#include "utils/ring.h"
#include <stdio.h>
#include "monkey/browser.h"
static uint32_t dwin_ctr = 0;

3
render/form.c
View File

@ -32,12 +32,11 @@
#include <stdio.h>
#include <string.h>
#include <dom/dom.h>
#include "content/fetch.h"
#include "content/hlcache.h"
#include "css/css.h"
#include "css/utils.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/mouse.h"
#include "desktop/knockout.h"
#include "desktop/plot_style.h"

1
render/search.c
View File

@ -30,7 +30,6 @@
#include "content/content.h"
#include "content/hlcache.h"
#include "desktop/gui.h"
#include "desktop/selection.h"
#include "render/box.h"
#include "render/html.h"

1
render/textplain.c
View File

@ -35,7 +35,6 @@
#include "css/css.h"
#include "css/utils.h"
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "utils/nsoption.h"
#include "desktop/plotters.h"
#include "desktop/search.h"