From 944248ce3205881df9268d2c3f9f0cb52fc2f075 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 3 Sep 2015 00:24:04 +0100 Subject: Rough outline for Intuition-based context menu --- amiga/gui.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'amiga/gui.c') diff --git a/amiga/gui.c b/amiga/gui.c index 3de20bf88..46973f282 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2014 Chris Young + * Copyright 2008-2015 Chris Young * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -121,6 +121,7 @@ #include "amiga/clipboard.h" #include "amiga/context_menu.h" #include "amiga/cookies.h" +#include "amiga/ctxmenu.h" #include "amiga/datatypes.h" #include "amiga/download.h" #include "amiga/drag.h" @@ -2944,6 +2945,7 @@ static void gui_quit(void) LOG("Freeing menu items"); ami_context_menu_free(); + ami_ctxmenu_free(); ami_menu_free_glyphs(); LOG("Freeing mouse pointers"); @@ -3755,7 +3757,7 @@ gui_window_create(struct browser_window *bw, } ami_NewMinList(&g->shared->shared_pens); - + g->shared->scrollerhook.h_Entry = (void *)ami_scroller_hook; g->shared->scrollerhook.h_Data = g->shared; @@ -3930,6 +3932,7 @@ gui_window_create(struct browser_window *bw, WA_ReportMouse,TRUE, refresh_mode, TRUE, WA_SizeBBottom, TRUE, + WA_ContextMenuHook, ami_ctxmenu_get_hook(), WA_IDCMP, IDCMP_MENUPICK | IDCMP_MOUSEMOVE | IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE | IDCMP_RAWKEY | idcmp_sizeverify | @@ -5430,6 +5433,7 @@ int main(int argc, char** argv) ami_amiupdate(); /* set env-vars for AmiUpdate */ ami_init_fonts(); ami_context_menu_init(); + ami_ctxmenu_init(); save_complete_init(); ami_theme_init(); ami_init_mouse_pointers(); -- cgit v1.2.3