1 files changed, 42 insertions, 4 deletions
diff --git a/atari/gui.h b/atari/gui.h
index 76de07f37..fef686a57 100755
--- a/atari/gui.h
+++ b/atari/gui.h
@@ -19,7 +19,22 @@
 #ifndef NS_ATARI_GUI_H_
 #define NS_ATARI_GUI_H_
 
-#include <windom.h>
+#include <stdbool.h>
+#include <mt_gem.h>
+
+#include "atari/search.h"
+#include "atari/redrawslots.h"
+#include "atari/gemtk/gemtk.h"
+
+#define CARET_STATE_VISIBLE		0x01
+#define CARET_STATE_ENABLED		0x02
+
+struct s_caret {
+	GRECT dimensions;
+	MFDB symbol;
+	int fd_size;
+	unsigned short state;
+};
 
 struct point_s {
 	int x;
@@ -60,6 +75,7 @@ struct s_gem_cursors {
 enum focus_element_type {
 	WIDGET_NONE=0,
 	URL_WIDGET,
+	SEARCH_INPUT,
 	BROWSER
 };
 
@@ -96,17 +112,28 @@ typedef struct s_browser * CMP_BROWSER;
 */
 struct s_gui_win_root
 {
-	WINDOW * handle;
+	short aes_handle;
+	GUIWIN *win;
 	CMP_TOOLBAR toolbar;
 	CMP_STATUSBAR statusbar;
-	COMPONENT * cmproot;
-	MFORM_EX cursor;
 	struct s_focus_info focus;
 	float scale;
 	char * title;
+	struct bitmap * icon;
+	struct gui_window *active_gui_window;
+	struct s_redrw_slots redraw_slots;
+	struct s_caret caret;
 	/* current size of window on screen: */
 	GRECT loc;
 };
+typedef struct s_gui_win_root ROOTWIN;
+
+struct s_browser
+{
+	struct browser_window * bw;
+	bool attached;
+	bool reformat_pending;
+};
 
 /*
 	This is the part of the gui which is known by netsurf core.
@@ -117,11 +144,22 @@ struct s_gui_win_root
 struct gui_window {
 	struct s_gui_win_root * root;
 	CMP_BROWSER browser;
+	MFORM_EX *cursor;
     /* icon to be drawn when iconified, or NULL for default resource. */
+    char * status;
+    char * title;
+    char * url;
 	struct bitmap * icon;
+	struct s_caret caret;
+	struct s_search_form_session *search;
 	struct gui_window *next, *prev;
 };
 
 extern struct gui_window *window_list;
 
+/* -------------------------------------------------------------------------- */
+/* Public - non standard gui window functions                                 */
+/* -------------------------------------------------------------------------- */
+void gui_set_input_gui_window(struct gui_window *gw);
+
 #endif