Basic conversion of cookie manager to core window

slightly broken; blank window until resized; scroll bar wrong; no menu

frontends/amiga/cookies.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008, 2009 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ * Copyright 2017 Chris Young <chris@unsatisfactorysoftware.co.uk>
  *
  * This file is part of NetSurf, http://www.netsurf-browser.org/
  *
@@ -16,26 +16,216 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <proto/exec.h>
+/**
+ * \file
+ * Implementation of Amiga cookie viewer using core windows.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#include <proto/intuition.h>
+
+#include <classes/window.h>
+#include <gadgets/layout.h>
+#include <gadgets/space.h>
+
+#include <reaction/reaction_macros.h>
 
 #include "desktop/cookie_manager.h"
-#include "netsurf/mouse.h"
-#include "netsurf/window.h"
+#include "netsurf/keypress.h"
+#include "netsurf/plotters.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/nsoption.h"
 
-#include "amiga/cookies.h"
-#include "amiga/tree.h"
+#include "amiga/corewindow.h"
+#include "amiga/libs.h"
+#include "amiga/utf8.h"
 
-struct treeview_window *cookies_window;
 
-void ami_cookies_initialise(void)
+/**
+ * Amiga cookie viewer window context
+ */
+struct ami_cookie_window {
+	/** Amiga core window context */
+	struct ami_corewindow core;
+};
+
+static struct ami_cookie_window *cookie_window = NULL;
+
+/**
+ * destroy a previously created cookie view
+ */
+static nserror
+ami_cookies_destroy(void)
 {
-	cookies_window = ami_tree_create(TREE_COOKIES, NULL);
+	nserror res;
 
-	if(!cookies_window) return;
+	if(cookie_window == NULL)
+		return NSERROR_OK;
+
+	res = cookie_manager_fini();
+	if (res == NSERROR_OK) {
+		res = ami_corewindow_fini(&cookie_window->core); /* closes the window for us */
+		cookie_window = NULL;
+	}
+	return res;
 }
 
-void ami_cookies_free()
+
+/**
+ * callback for mouse action for cookie viewer on core window
+ *
+ * \param ami_cw The Amiga core window structure.
+ * \param mouse_state netsurf mouse state on event
+ * \param x location of event
+ * \param y location of event
+ * \return NSERROR_OK on success otherwise apropriate error code
+ */
+static nserror
+ami_cookies_mouse(struct ami_corewindow *ami_cw,
+					browser_mouse_state mouse_state,
+					int x, int y)
 {
-	ami_tree_destroy(cookies_window);
-	cookies_window = NULL;
+	cookie_manager_mouse_action(mouse_state, x, y);
+
+	return NSERROR_OK;
 }
+
+/**
+ * callback for keypress for cookies viewer on core window
+ *
+ * \param example_cw The Amiga core window structure.
+ * \param nskey The netsurf key code
+ * \return NSERROR_OK on success otherwise apropriate error code
+ */
+static nserror
+ami_cookies_key(struct ami_corewindow *ami_cw, uint32_t nskey)
+{
+	if (cookie_manager_keypress(nskey)) {
+			return NSERROR_OK;
+	}
+	return NSERROR_NOT_IMPLEMENTED;
+}
+
+/**
+ * callback on draw event for cookies viewer on core window
+ *
+ * \param ami_cw The Amiga core window structure.
+ * \param r The rectangle of the window that needs updating.
+ * \param ctx The drawing context
+ * \return NSERROR_OK on success otherwise apropriate error code
+ */
+static nserror
+ami_cookies_draw(struct ami_corewindow *ami_cw, int x, int y, struct rect *r, struct redraw_context *ctx)
+{
+	cookie_manager_redraw(x, y, r, ctx);
+
+	return NSERROR_OK;
+}
+
+static nserror
+ami_cookies_create_window(struct ami_cookie_window *cookie_win)
+{
+	struct ami_corewindow *ami_cw = (struct ami_corewindow *)&cookie_win->core;
+
+	ami_cw->objects[GID_CW_WIN] = WindowObj,
+  	    WA_ScreenTitle, ami_gui_get_screen_title(),
+       	WA_Title, ami_cw->wintitle,
+       	WA_Activate, TRUE,
+       	WA_DepthGadget, TRUE,
+       	WA_DragBar, TRUE,
+       	WA_CloseGadget, TRUE,
+       	WA_SizeGadget, TRUE,
+		WA_SizeBRight, TRUE,
+		WA_Top, nsoption_int(cookies_window_ypos),
+		WA_Left, nsoption_int(cookies_window_xpos),
+		WA_Width, nsoption_int(cookies_window_xsize),
+		WA_Height, nsoption_int(cookies_window_ysize),
+		WA_PubScreen, scrn,
+		WA_ReportMouse, TRUE,
+       	WA_IDCMP, IDCMP_MOUSEMOVE | IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE |
+				IDCMP_RAWKEY | IDCMP_GADGETUP | IDCMP_IDCMPUPDATE |
+				IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY,
+		WINDOW_IDCMPHook, &ami_cw->idcmp_hook,
+		WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE,
+		WINDOW_SharedPort, sport,
+		WINDOW_HorizProp, 1,
+		WINDOW_VertProp, 1,
+		WINDOW_UserData, cookie_win,
+		/* WINDOW_NewMenu, twin->menu,   -> No menu for SSL Cert */
+		WINDOW_IconifyGadget, FALSE,
+		WINDOW_Position, WPOS_CENTERSCREEN,
+		WINDOW_ParentGroup, ami_cw->objects[GID_CW_MAIN] = LayoutVObj,
+			LAYOUT_AddChild, ami_cw->objects[GID_CW_DRAW] = SpaceObj,
+				GA_ID, GID_CW_DRAW,
+				SPACE_Transparent, TRUE,
+				SPACE_BevelStyle, BVS_DISPLAY,
+				GA_RelVerify, TRUE,
+   			SpaceEnd,
+		EndGroup,
+	EndWindow;
+
+	if(ami_cw->objects[GID_CW_WIN] == NULL) {
+		return NSERROR_NOMEM;
+	}
+
+	return NSERROR_OK;
+}
+
+/* exported interface documented in amiga/cookies.h */
+nserror ami_cookies_present(void)
+{
+	struct ami_cookie_window *ncwin;
+	nserror res;
+
+	if(cookie_window != NULL) {
+		//windowtofront()
+		return NSERROR_OK;
+	}
+
+	ncwin = calloc(1, sizeof(struct ami_cookie_window));
+	if (ncwin == NULL) {
+		return NSERROR_NOMEM;
+	}
+
+	ncwin->core.wintitle = ami_utf8_easy((char *)messages_get("Cookies"));
+
+	res = ami_cookies_create_window(ncwin);
+	if (res != NSERROR_OK) {
+		LOG("SSL UI builder init failed");
+		ami_utf8_free(ncwin->core.wintitle);
+		free(ncwin);
+		return res;
+	}
+
+	/* initialise Amiga core window */
+	ncwin->core.draw = ami_cookies_draw;
+	ncwin->core.key = ami_cookies_key;
+	ncwin->core.mouse = ami_cookies_mouse;
+	ncwin->core.close = ami_cookies_destroy;
+	ncwin->core.event = NULL;
+
+	res = ami_corewindow_init(&ncwin->core);
+	if (res != NSERROR_OK) {
+		ami_utf8_free(ncwin->core.wintitle);
+		DisposeObject(ncwin->core.objects[GID_CW_WIN]);
+		free(ncwin);
+		return res;
+	}
+
+	res = cookie_manager_init(ncwin->core.cb_table, (struct core_window *)ncwin);
+	if (res != NSERROR_OK) {
+		ami_utf8_free(ncwin->core.wintitle);
+		DisposeObject(ncwin->core.objects[GID_CW_WIN]);
+		free(ncwin);
+		return res;
+	}
+
+	cookie_window = ncwin;
+
+	return NSERROR_OK;
+}
+

frontends/amiga/cookies.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008, 2009 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ * Copyright 2017 Chris Young <chris@unsatisfactorysoftware.co.uk>
  *
  * This file is part of NetSurf, http://www.netsurf-browser.org/
  *
@@ -18,11 +18,8 @@
 
 #ifndef AMIGA_COOKIES_H
 #define AMIGA_COOKIES_H
-#include "amiga/desktop-tree.h"
-#include "amiga/tree.h"
 
-void ami_cookies_initialise(void);
-void ami_cookies_free(void);
-
-extern struct treeview_window *cookies_window;
+/** Open the cookie viewer */
+nserror ami_cookies_present(void);
 #endif
+

frontends/amiga/corewindow.c

@@ -627,7 +627,7 @@ ami_cw_update_size(struct core_window *cw, int width, int height)
 	if(ami_cw->objects[GID_CW_VSCROLL]) {
 		ami_cw_toggle_scrollbar(ami_cw, true, true);
 		RefreshSetGadgetAttrs((struct Gadget *)ami_cw->objects[GID_CW_VSCROLL], ami_cw->win, NULL,
-			SCROLLER_Total, (ULONG)height,
+			SCROLLER_Total, height,
 			SCROLLER_Visible, win_h,
 		TAG_DONE);
 	}

frontends/amiga/gui.c

@@ -536,6 +536,17 @@ STRPTR ami_gui_get_screen_title(void)
 
 static void ami_set_screen_defaults(struct Screen *screen)
 {
+	/* various window size/position defaults */
+	int width = screen->Width / 2;
+	int height = screen->Height / 2;
+	int top = (screen->Height / 2) - (height / 2);
+	int left = (screen->Width / 2) - (width / 2);
+
+	nsoption_default_set_int(cookies_window_ypos, top);
+	nsoption_default_set_int(cookies_window_xpos, left);
+	nsoption_default_set_int(cookies_window_xsize, width);
+	nsoption_default_set_int(cookies_window_ysize, height);
+
 	nsoption_default_set_int(window_x, 0);
 	nsoption_default_set_int(window_y, screen->BarHeight + 1);
 	nsoption_default_set_int(window_width, screen->Width);
@@ -1003,7 +1014,6 @@ static void gui_init2(int argc, char** argv)
 	/**/
 
 	ami_hotlist_initialise(nsoption_charp(hotlist_file));
-	ami_cookies_initialise();
 	ami_global_history_initialise();
 	search_web_select_provider(nsoption_int(search_provider));
 
@@ -3028,7 +3038,6 @@ static void gui_quit(void)
 	urldb_save(nsoption_charp(url_file));
 	urldb_save_cookies(nsoption_charp(cookie_file));
 	ami_hotlist_free(nsoption_charp(hotlist_file));
-	ami_cookies_free();
 	ami_global_history_free();
 #ifdef __amigaos4__
 	if(IApplication && ami_appid)

frontends/amiga/menu.c

@@ -358,7 +358,7 @@ HOOKF(void, ami_menu_item_browser_globalhistory, APTR, window, struct IntuiMessa
 
 HOOKF(void, ami_menu_item_browser_cookies, APTR, window, struct IntuiMessage *)
 {
-	ami_tree_open(cookies_window,AMI_TREE_COOKIES);
+	ami_cookies_present();
 }
 
 HOOKF(void, ami_menu_item_browser_foreimg, APTR, window, struct IntuiMessage *)

frontends/amiga/sslcert.c

@@ -313,7 +313,7 @@ nserror ami_cert_verify(struct nsurl *url,
 		return res;
 	}
 
-	/* initialise example core window */
+	/* initialise Amiga core window */
 	ncwin->core.draw = ami_crtvrfy_draw;
 	ncwin->core.key = ami_crtvrfy_key;
 	ncwin->core.mouse = ami_crtvrfy_mouse;