Implemented the tools button with CSS options. Also removed nav.h from html.cc

1 files changed, 20 insertions, 3 deletions

diff --git a/src/uicmd.cc b/src/uicmd.cc
index da416dcd..844518a7 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -439,6 +439,14 @@ void a_UIcmd_reload(void *vbw)
 }
 
 /*
+ * Repush current URL
+ */
+void a_UIcmd_repush(void *vbw)
+{
+   a_Nav_repush((BrowserWindow*)vbw);
+}
+
+/*
  * Return a suitable filename for a given URL path.
  */
 static char *UIcmd_make_save_filename(const char *pathstr)
@@ -526,6 +534,14 @@ void a_UIcmd_stop(void *vbw)
 }
 
 /*
+ * Popup the tools menu
+ */
+void a_UIcmd_tools(void *vbw, void *v_wid)
+{
+   a_Menu_tools_popup((BrowserWindow*)vbw, v_wid);
+}
+
+/*
  * Open URL with dialog chooser
  */
 void a_UIcmd_open_file(void *vbw)
@@ -643,10 +659,11 @@ void a_UIcmd_add_bookmark(BrowserWindow *bw, const DilloUrl *url)
 /*
  * Popup the page menu
  */
-void a_UIcmd_page_popup(void *vbw, const DilloUrl *url,
-                        bool_t has_bugs, bool_t unloaded_imgs)
+void a_UIcmd_page_popup(void *vbw, bool_t has_bugs, bool_t unloaded_imgs)
 {
-   a_Menu_page_popup((BrowserWindow*)vbw, url, has_bugs, unloaded_imgs);
+   BrowserWindow *bw = (BrowserWindow*)vbw;
+   DilloUrl *url = a_History_get_url(NAV_TOP_UIDX(bw));
+   a_Menu_page_popup(bw, url, has_bugs, unloaded_imgs);
 }
 
 /*