From a487f7e611550b0058a780cf673480eb8de6f799 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 12 Mar 2015 23:48:53 +0000 Subject: Move win32 window operations into their own module This splits up a great deal of the win32 window code out from other gui code. It also remove large quantities of unused and junk variables and functions. --- windows/gui.h | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) (limited to 'windows/gui.h') diff --git a/windows/gui.h b/windows/gui.h index 7eb24e32e..e4b69e0c2 100644 --- a/windows/gui.h +++ b/windows/gui.h @@ -20,12 +20,12 @@ #ifndef _NETSURF_WINDOWS_GUI_H_ #define _NETSURF_WINDOWS_GUI_H_ +struct gui_window; struct gui_file_table *win32_file_table; -extern struct gui_window_table *win32_window_table; -extern struct gui_clipboard_table *win32_clipboard_table; -extern struct gui_fetch_table *win32_fetch_table; -extern struct gui_browser_table *win32_browser_table; -extern struct gui_utf8_table *win32_utf8_table; +struct gui_clipboard_table *win32_clipboard_table; +struct gui_fetch_table *win32_fetch_table; +struct gui_browser_table *win32_browser_table; +struct gui_utf8_table *win32_utf8_table; extern HINSTANCE hInstance; @@ -54,35 +54,15 @@ struct nsws_pointers { }; -extern struct gui_window *window_list; extern char *options_file_location; HWND gui_window_main_window(struct gui_window *); -HWND gui_window_toolbar(struct gui_window *); -HWND gui_window_urlbar(struct gui_window *); -HWND gui_window_statusbar(struct gui_window *); -HWND gui_window_drawingarea(struct gui_window *); struct nsws_localhistory *gui_window_localhistory(struct gui_window *); -void gui_window_set_localhistory(struct gui_window *, - struct nsws_localhistory *); - -RECT *gui_window_redraw_rect(struct gui_window *); - -int gui_window_voffset(struct gui_window *); -int gui_window_width(struct gui_window *); -int gui_window_height(struct gui_window *); -int gui_window_scrollingx(struct gui_window *w); -int gui_window_scrollingy(struct gui_window *w); - -struct gui_window *gui_window_iterate(struct gui_window *); -struct browser_window *gui_window_browser_window(struct gui_window *); - -struct nsws_pointers *nsws_get_pointers(void); void nsws_window_init_pointers(HINSTANCE hinstance); +struct nsws_pointers *nsws_get_pointers(void); -nserror nsws_create_main_class(HINSTANCE hinstance); /** * Cause a browser window to navigate to a url @@ -97,4 +77,7 @@ bool nsws_window_go(HWND hwnd, const char *url); */ void win32_run(void); +/** cause the main message loop to exit */ +void win32_set_quit(bool q); + #endif -- cgit v1.2.3