diff options
| -rw-r--r-- | amiga/Makefile.target | 5 | ||||
| -rw-r--r-- | amiga/context_menu.c | 1342 | ||||
| -rw-r--r-- | amiga/gui.c | 39 | ||||
| -rwxr-xr-x | amiga/gui_options.c | 18 | ||||
| -rw-r--r-- | amiga/options.h | 1 | ||||
| -rw-r--r-- | amiga/selectmenu.c | 114 | ||||
| -rwxr-xr-x | amiga/selectmenu.h (renamed from amiga/context_menu.h) | 11 | ||||
| -rw-r--r-- | render/form.h | 1 |
8 files changed, 124 insertions, 1407 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 62c26b21d..29b3905d3 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -70,12 +70,13 @@ MESSAGES_FILTER=ami S_AMIGA := gui.c tree.c history.c hotlist.c schedule.c file.c \ misc.c bitmap.c font.c filetype.c utf8.c login.c \ plotters.c object.c menu.c save_pdf.c arexx.c version.c \ - cookies.c context_menu.c ctxmenu.c clipboard.c help.c font_scan.c \ + cookies.c ctxmenu.c clipboard.c help.c font_scan.c \ launch.c search.c history_local.c download.c iff_dr2d.c \ sslcert.c gui_options.c print.c theme.c drag.c icon.c libs.c \ datatypes.c dt_picture.c dt_anim.c dt_sound.c plugin_hack.c \ stringview/stringview.c stringview/urlhistory.c rtg.c \ - agclass/amigaguide_class.c os3support.c font_bitmap.c + agclass/amigaguide_class.c os3support.c font_bitmap.c \ + selectmenu.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # This is the final source build list diff --git a/amiga/context_menu.c b/amiga/context_menu.c deleted file mode 100644 index 9c31bd6f3..000000000 --- a/amiga/context_menu.c +++ /dev/null @@ -1,1342 +0,0 @@ -/* - * Copyright 2008 - 2011 Chris Young <chris@unsatisfactorysoftware.co.uk> - * - * This file is part of NetSurf, http://www.netsurf-browser.org/ - * - * NetSurf is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * NetSurf is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifdef __amigaos4__ - -#include <proto/popupmenu.h> -#include <proto/intuition.h> -#include <proto/asl.h> -#include <proto/dos.h> -#include <proto/exec.h> -#include <reaction/reaction_macros.h> -#include <string.h> - -#include "utils/nsoption.h" -#include "utils/utf8.h" -#include "utils/messages.h" -#include "utils/utils.h" -#include "render/form.h" -#include "desktop/browser_history.h" -#include "desktop/browser.h" -#include "desktop/hotlist.h" -#include "desktop/searchweb.h" -#include "desktop/textinput.h" -#include "desktop/gui_window.h" - -#include "amiga/clipboard.h" -#include "amiga/bitmap.h" -#include "amiga/file.h" -#include "amiga/filetype.h" -#include "amiga/gui.h" -#include "amiga/history_local.h" -#include "amiga/iff_dr2d.h" -#include "amiga/plugin_hack.h" -#include "amiga/theme.h" -#include "amiga/tree.h" -#include "amiga/utf8.h" -#include "amiga/context_menu.h" - - -HOOKF(uint32, ami_context_menu_hook, Object *, item, APTR); -HOOKF(uint32, ami_popup_hook, Object *, item, APTR); - -static bool ami_context_menu_history(const struct browser_window *bw, int x0, int y0, - int x1, int y1, const struct history_entry *entry, void *user_data); - -enum { - CMID_SELECTFILE, - CMID_COPYURL, - CMID_URLOPEN, - CMID_URLOPENWIN, - CMID_URLOPENTAB, - CMID_URLHOTLIST, - CMID_SAVEURL, - CMID_SHOWOBJ, - CMID_COPYOBJ, - CMID_CLIPOBJ, - CMID_SAVEOBJ, - CMID_SAVEIFFOBJ, - CMID_RELOADOBJ, - CMID_SELALL, - CMID_SELCLEAR, - CMID_SELCUT, - CMID_SELCOPY, - CMID_SELPASTE, - CMID_SELSEARCH, - CMID_SELSAVE, - CMID_FRAMEWIN, - CMID_FRAMETAB, - CMID_FRAMESHOW, - CMID_FRAMERELOAD, - CMID_FRAMECOPYURL, - CMID_FRAMESAVE, - CMID_FRAMESAVECOMPLETE, - CMID_PLUGINCMD, - CMID_NAVHOME, - CMID_NAVBACK, - CMID_NAVFORWARD, - CMID_NAVRELOAD, - CMID_NAVSTOP, - CMID_PAGEOPEN, - CMID_PAGESAVE, - CMID_PAGESAVECOMPLETE, - CMID_PAGEHOTLIST, - CMID_PAGECLOSE, - - CMID_TREE_EXPAND, - CMID_TREE_COLLAPSE, - CMID_TREE_LAUNCH, - CMID_TREE_NEWFOLDER, - CMID_TREE_NEWITEM, - CMID_TREE_SETDEFAULT, - CMID_TREE_CLEARDEFAULT, - CMID_TREE_DELETE, - CMID_TREE_EDITTITLE, - CMID_TREE_EDITLINK, - CMID_TREE_EDITFOLDER, - CMID_TREE_ADDHOTLIST, - - CMSUB_OBJECT, - CMSUB_URL, - CMSUB_SEL, - CMSUB_PAGE, - CMSUB_FRAME, - CMSUB_NAVIGATE, - CMID_HISTORY, - CMID_LAST -}; - -struct ami_file_input_menu_data { - int x; - int y; - struct browser_window *bw; -}; - -struct Library *PopupMenuBase = NULL; -struct PopupMenuIFace *IPopupMenu = NULL; -static char *ctxmenulab[CMID_LAST]; -static Object *ctxmenuobj = NULL; -static struct Hook ctxmenuhook; - -void ami_context_menu_init(void) -{ - if((PopupMenuBase = OpenLibrary("popupmenu.class",0))) { - IPopupMenu = (struct PopupMenuIFace *)GetInterface(PopupMenuBase,"main",1,NULL); - } - - ctxmenulab[CMID_SELECTFILE] = ami_utf8_easy((char *)messages_get("SelectFile")); - - ctxmenulab[CMID_SHOWOBJ] = ami_utf8_easy((char *)messages_get("ObjShow")); - ctxmenulab[CMID_RELOADOBJ] = ami_utf8_easy((char *)messages_get("ObjReload")); - ctxmenulab[CMID_COPYOBJ] = ami_utf8_easy((char *)messages_get("CopyURL")); - ctxmenulab[CMID_CLIPOBJ] = ami_utf8_easy((char *)messages_get("CopyClip")); - ctxmenulab[CMID_SAVEOBJ] = ami_utf8_easy((char *)messages_get("SaveAs")); - ctxmenulab[CMID_SAVEIFFOBJ] = ami_utf8_easy((char *)messages_get("SaveIFF")); - - ctxmenulab[CMID_PAGEOPEN] = ami_utf8_easy((char *)messages_get("OpenFile")); - ctxmenulab[CMID_PAGESAVE] = ami_utf8_easy((char *)messages_get("SaveAs")); - ctxmenulab[CMID_PAGESAVECOMPLETE] = ami_utf8_easy((char *)messages_get("SaveComplete")); - ctxmenulab[CMID_PAGEHOTLIST] = ami_utf8_easy((char *)messages_get("HotlistAdd")); - ctxmenulab[CMID_PAGECLOSE] = ami_utf8_easy((char *)messages_get("Close")); - - ctxmenulab[CMID_FRAMEWIN] = ami_utf8_easy((char *)messages_get("FrameNewWin")); - ctxmenulab[CMID_FRAMETAB] = ami_utf8_easy((char *)messages_get("FrameNewTab")); - ctxmenulab[CMID_FRAMESHOW] = ami_utf8_easy((char *)messages_get("FrameOnly")); - ctxmenulab[CMID_FRAMESAVE] = ami_utf8_easy((char *)messages_get("SaveAs")); - ctxmenulab[CMID_FRAMESAVECOMPLETE] = ami_utf8_easy((char *)messages_get("SaveComplete")); - ctxmenulab[CMID_FRAMECOPYURL] = ami_utf8_easy((char *)messages_get("CopyURL")); - ctxmenulab[CMID_FRAMERELOAD] = ami_utf8_easy((char *)messages_get("ObjReload")); - - ctxmenulab[CMID_SAVEURL] = ami_utf8_easy((char *)messages_get("LinkDload")); - ctxmenulab[CMID_URLOPEN] = ami_utf8_easy((char *)messages_get("Open")); - ctxmenulab[CMID_URLOPENWIN] = ami_utf8_easy((char *)messages_get("LinkNewWin")); - ctxmenulab[CMID_URLOPENTAB] = ami_utf8_easy((char *)messages_get("LinkNewTab")); - ctxmenulab[CMID_URLHOTLIST] = ami_utf8_easy((char *)messages_get("HotlistAdd")); - ctxmenulab[CMID_COPYURL] = ami_utf8_easy((char *)messages_get("CopyURL")); - - ctxmenulab[CMID_NAVHOME] = ami_utf8_easy((char *)messages_get("Home")); - ctxmenulab[CMID_NAVBACK] = ami_utf8_easy((char *)messages_get("Back")); - ctxmenulab[CMID_NAVFORWARD] = ami_utf8_easy((char *)messages_get("Forward")); - ctxmenulab[CMID_NAVRELOAD] = ami_utf8_easy((char *)messages_get("ObjReload")); - ctxmenulab[CMID_NAVSTOP] = ami_utf8_easy((char *)messages_get("Stop")); - - ctxmenulab[CMID_SELCUT] = ami_utf8_easy((char *)messages_get("CutNS")); - ctxmenulab[CMID_SELCOPY] = ami_utf8_easy((char *)messages_get("CopyNS")); - ctxmenulab[CMID_SELPASTE] = ami_utf8_easy((char *)messages_get("PasteNS")); - ctxmenulab[CMID_SELALL] = ami_utf8_easy((char *)messages_get("SelectAllNS")); - ctxmenulab[CMID_SELCLEAR] = ami_utf8_easy((char *)messages_get("ClearNS")); - ctxmenulab[CMID_SELSEARCH] = ami_utf8_easy((char *)messages_get("SearchWeb")); - ctxmenulab[CMID_SELSAVE] = ami_utf8_easy((char *)messages_get("SaveAs")); - - ctxmenulab[CMID_PLUGINCMD] = ami_utf8_easy((char *)messages_get("ExternalApp")); - - ctxmenulab[CMSUB_PAGE] = ami_utf8_easy((char *)messages_get("Page")); - ctxmenulab[CMSUB_FRAME] = ami_utf8_easy((char *)messages_get("Frame")); - ctxmenulab[CMSUB_OBJECT] = ami_utf8_easy((char *)messages_get("Object")); - ctxmenulab[CMSUB_NAVIGATE] = ami_utf8_easy((char *)messages_get("Navigate")); - ctxmenulab[CMSUB_URL] = ami_utf8_easy((char *)messages_get("Link")); - ctxmenulab[CMSUB_SEL] = ami_utf8_easy((char *)messages_get("Selection")); - - /* Back button */ - ctxmenulab[CMID_HISTORY] = ami_utf8_easy((char *)messages_get("HistLocalNS")); - - /* treeviews */ - ctxmenulab[CMID_TREE_EXPAND] = ami_utf8_easy((char *)messages_get("Expand")); - ctxmenulab[CMID_TREE_COLLAPSE] = ami_utf8_easy((char *)messages_get("Collapse")); - ctxmenulab[CMID_TREE_LAUNCH] = ami_utf8_easy((char *)messages_get("TreeLaunch")); - ctxmenulab[CMID_TREE_NEWFOLDER] = ami_utf8_easy((char *)messages_get("TreeNewFolder")); - ctxmenulab[CMID_TREE_NEWITEM] = ami_utf8_easy((char *)messages_get("TreeNewLink")); - ctxmenulab[CMID_TREE_SETDEFAULT] = ami_utf8_easy((char *)messages_get("TreeDefault")); - ctxmenulab[CMID_TREE_CLEARDEFAULT] = ami_utf8_easy((char *)messages_get("TreeClear")); - ctxmenulab[CMID_TREE_DELETE] = ami_utf8_easy((char *)messages_get("TreeDelete")); - ctxmenulab[CMID_TREE_EDITTITLE] = ami_utf8_easy((char *)messages_get("EditTitle")); - ctxmenulab[CMID_TREE_EDITLINK] = ami_utf8_easy((char *)messages_get("EditLink")); - ctxmenulab[CMID_TREE_EDITFOLDER] = ami_utf8_easy((char *)messages_get("EditFolder")); - ctxmenulab[CMID_TREE_ADDHOTLIST] = ami_utf8_easy((char *)messages_get("HotlistAdd")); - -} - -static void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdata) -{ - /* - * CMSUB_PAGE - userdata = hlcache_object * - * CMSUB_FRAME - userdata = hlcache_object * - * CMSUB_URL - userdata = char * - * CMSUB_OBJECT - userdata = hlcache_object * - * CMSUB_SEL - userdata = gui_window * (only for menu construction) - * CMSUB_NAVIGATE - userdata = browser_window * - * CMID_SELECTFILE - userdata = ami_file_input_menu_data * - */ - - struct gui_window *gw = NULL; - - switch(cmsub) - { - case CMSUB_PAGE: - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMSUB_PAGE], - PMSIMPLESUB, - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_PAGEOPEN], - PMIA_ID, CMID_PAGEOPEN, - PMIA_UserData, userdata, - PMIA_CommKey, "O", - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_PAGESAVE], - PMIA_ID, CMID_PAGESAVE, - PMIA_UserData, userdata, - PMIA_CommKey, "S", - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_PAGESAVECOMPLETE], - PMIA_ID, CMID_PAGESAVECOMPLETE, - PMIA_UserData, userdata, - PMIA_Disabled, (content_get_type(userdata) != CONTENT_HTML), - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_PAGECLOSE], - PMIA_ID, CMID_PAGECLOSE, - PMIA_UserData, userdata, - PMIA_CommKey, "K", - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_PAGEHOTLIST], - PMIA_ID, CMID_PAGEHOTLIST, - PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)), - PMIA_CommKey, "B", - TAG_DONE), - PMEND, - TAG_DONE), - ~0); - break; - - case CMSUB_FRAME: - IDoMethod(ctxmenuobj,PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMSUB_FRAME], - PMSIMPLESUB, - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMEWIN], - PMIA_ID, CMID_FRAMEWIN, - PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)), - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMETAB], - PMIA_ID, CMID_FRAMETAB, - PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)), - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMESHOW], - PMIA_ID, CMID_FRAMESHOW, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMERELOAD], - PMIA_ID, CMID_FRAMERELOAD, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMECOPYURL], - PMIA_ID, CMID_FRAMECOPYURL, - PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)), - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMESAVE], - PMIA_ID, CMID_FRAMESAVE, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMESAVECOMPLETE], - PMIA_ID, CMID_FRAMESAVECOMPLETE, - PMIA_UserData, userdata, - PMIA_Disabled, (content_get_type(userdata) != CONTENT_HTML), - TAG_DONE), - PMEND, - TAG_DONE), - ~0); - break; - - case CMSUB_NAVIGATE: - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMSUB_NAVIGATE], - PMSIMPLESUB, - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_NAVHOME], - PMIA_ID, CMID_NAVHOME, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_NAVBACK], - PMIA_ID, CMID_NAVBACK, - PMIA_UserData, userdata, - PMIA_Disabled, !browser_window_back_available(userdata), - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_NAVFORWARD], - PMIA_ID, CMID_NAVFORWARD, - PMIA_UserData, userdata, - PMIA_Disabled, !browser_window_forward_available(userdata), - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_NAVRELOAD], - PMIA_ID, CMID_NAVRELOAD, - PMIA_UserData, userdata, - PMIA_CommKey, "R", - PMIA_Disabled, !browser_window_reload_available(userdata), - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_NAVSTOP], - PMIA_ID, CMID_NAVSTOP, - PMIA_UserData, userdata, - PMIA_Disabled, !browser_window_stop_available(userdata), - TAG_DONE), - PMEND, - TAG_DONE), - ~0); - break; - - case CMSUB_URL: - IDoMethod(ctxmenuobj,PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMSUB_URL], - PMSIMPLESUB, - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_URLOPEN], - PMIA_ID, CMID_URLOPEN, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_URLOPENWIN], - PMIA_ID, CMID_URLOPENWIN, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_URLOPENTAB], - PMIA_ID, CMID_URLOPENTAB, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_COPYURL], - PMIA_ID, CMID_COPYURL, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_URLHOTLIST], - PMIA_ID, CMID_URLHOTLIST, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SAVEURL], - PMIA_ID, CMID_SAVEURL, - PMIA_UserData, userdata, - TAG_DONE), - PMEND, - TAG_DONE), - ~0); - break; - - case CMSUB_OBJECT: - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMSUB_OBJECT], - PMSIMPLESUB, - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SHOWOBJ], - PMIA_ID, CMID_SHOWOBJ, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_RELOADOBJ], - PMIA_ID, CMID_RELOADOBJ, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_COPYOBJ], - PMIA_ID, CMID_COPYOBJ, - PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)), - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_CLIPOBJ], - PMIA_ID, CMID_CLIPOBJ, - PMIA_UserData, userdata, - PMIA_Disabled, (content_get_type(userdata) != CONTENT_IMAGE), - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SAVEOBJ], - PMIA_ID, CMID_SAVEOBJ, - PMIA_UserData, userdata, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SAVEIFFOBJ], - PMIA_ID, CMID_SAVEIFFOBJ, - PMIA_UserData, userdata, - PMIA_Disabled, (content_get_type(userdata) != CONTENT_IMAGE), - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_PLUGINCMD], - PMIA_ID, CMID_PLUGINCMD, - PMIA_UserData, userdata, - PMIA_Disabled, !ami_mime_content_to_cmd(userdata), - TAG_DONE), - PMEND, - TAG_DONE), - ~0); - break; - - case CMSUB_SEL: - gw = userdata; - BOOL disabled_noselection = !(browser_window_get_editor_flags(gw->bw) & BW_EDITOR_CAN_COPY); - - IDoMethod(ctxmenuobj,PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMSUB_SEL], - PMIA_SubMenu, NewObject(POPUPMENU_GetClass(), NULL, - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SELCUT], - PMIA_ID,CMID_SELCUT, - PMIA_Disabled, !(browser_window_get_editor_flags(gw->bw) & BW_EDITOR_CAN_CUT), - PMIA_CommKey, "X", - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SELCOPY], - PMIA_ID,CMID_SELCOPY, - PMIA_Disabled, disabled_noselection, - PMIA_CommKey, "C", - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SELPASTE], - PMIA_ID,CMID_SELPASTE, - PMIA_Disabled, (gw->c_h == 0), - PMIA_CommKey, "V", - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SELALL], - PMIA_ID,CMID_SELALL, - PMIA_CommKey, "A", - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SELCLEAR], - PMIA_ID,CMID_SELCLEAR, - PMIA_Disabled, disabled_noselection, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SELSEARCH], - PMIA_ID,CMID_SELSEARCH, - PMIA_Disabled, disabled_noselection, - TAG_DONE), - PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SELSAVE], - PMIA_ID,CMID_SELSAVE, - PMIA_Disabled, disabled_noselection, - TAG_DONE), - TAG_DONE), - TAG_DONE), - ~0); - break; - - case CMID_SELECTFILE: - IDoMethod(ctxmenuobj,PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SELECTFILE], - PMIA_ID, CMID_SELECTFILE, - PMIA_UserData, userdata, - TAG_DONE), - ~0); - break; - } -} - -void ami_context_menu_free(void) -{ - int i; - - if(ctxmenuobj) DisposeObject(ctxmenuobj); - - for(i=0;i<CMID_LAST;i++) - { - ami_utf8_free(ctxmenulab[i]); - } - - if(IPopupMenu) DropInterface((struct Interface *)IPopupMenu); - if(PopupMenuBase) CloseLibrary(PopupMenuBase); -} - -BOOL ami_context_menu_mouse_trap(struct gui_window_2 *gwin, BOOL trap) -{ - return FALSE; - - if(nsoption_bool(context_menu) == false) return FALSE; - - if((nsoption_bool(kiosk_mode) == false) && (trap == FALSE)) - { - if(browser_window_back_available(gwin->gw->bw) && - ami_gadget_hit(gwin->objects[GID_BACK], - gwin->win->MouseX, gwin->win->MouseY)) - trap = TRUE; - - if(browser_window_forward_available(gwin->gw->bw) && - ami_gadget_hit(gwin->objects[GID_FORWARD], - gwin->win->MouseX, gwin->win->MouseY)) - trap = TRUE; - } - - if(gwin->rmbtrapped == trap) return trap; - - SetWindowAttr(gwin->win, WA_RMBTrap, (APTR)(ULONG)trap, sizeof(BOOL)); - gwin->rmbtrapped = trap; - - return trap; -} - -void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) -{ - struct hlcache_handle *cc = browser_window_get_content(gwin->gw->bw); - bool no_more_menus = false; - bool menuhascontent = false; - struct browser_window_features ccdata; - - if(!cc) return; - if(ctxmenuobj) DisposeObject(ctxmenuobj); - - ctxmenuhook.h_Entry = ami_context_menu_hook; - ctxmenuhook.h_SubEntry = NULL; - ctxmenuhook.h_Data = gwin; - - ctxmenuobj = NewObject( POPUPMENU_GetClass(), NULL, - PMA_MenuHandler, &ctxmenuhook, - TAG_DONE); - - if(gwin->gw->bw && ami_gadget_hit(gwin->objects[GID_BACK], - gwin->win->MouseX, gwin->win->MouseY)) - { - gwin->temp = 0; - browser_window_history_enumerate_back(gwin->gw->bw, ami_context_menu_history, gwin); - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - ~0); - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_HISTORY], - PMIA_ID, CMID_HISTORY, - PMIA_UserData, NULL, - TAG_DONE), - ~0); - - menuhascontent = true; - } - else if(gwin->gw->bw && ami_gadget_hit(gwin->objects[GID_FORWARD], - gwin->win->MouseX, gwin->win->MouseY)) - { - gwin->temp = 0; - browser_window_history_enumerate_forward(gwin->gw->bw, ami_context_menu_history, gwin); - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - ~0); - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_HISTORY], - PMIA_ID, CMID_HISTORY, - PMIA_UserData, NULL, - TAG_DONE), - ~0); - - menuhascontent = true; - } - else - { - if(no_more_menus == false) - { - browser_window_get_features(gwin->gw->bw, x, y, &ccdata); - - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_PAGE, cc); - menuhascontent = true; - - if(ccdata.main && (ccdata.main != cc)) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_FRAME, ccdata.main); - menuhascontent = true; - } - - if(ccdata.link) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_URL, (char *)nsurl_access(ccdata.link)); - menuhascontent = true; - } - - if(ccdata.object) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_OBJECT, ccdata.object); - menuhascontent = true; - } - - if(ccdata.form_features == CTX_FORM_FILE) - { - struct ami_file_input_menu_data file_input = { - .x = x, - .y = y, - .bw = gwin->gw->bw - }; - ami_context_menu_add_submenu(ctxmenuobj, CMID_SELECTFILE, &file_input); - menuhascontent = true; - } - - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_NAVIGATE, gwin->gw->bw); - menuhascontent = true; - - if(browser_window_can_select(gwin->gw->bw)) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_SEL, gwin->gw); - menuhascontent = true; - } - } - } - - if(!menuhascontent) return; - - gui_window_set_pointer(gwin->gw, GUI_POINTER_DEFAULT); - - IDoMethod(ctxmenuobj, PM_OPEN, gwin->win); -} - -HOOKF(uint32, ami_context_menu_hook, Object *, item, APTR) -{ - int32 itemid = 0; - struct gui_window_2 *gwin = hook->h_Data; - APTR userdata = NULL; - struct browser_window *bw; - struct hlcache_handle *object; - struct bitmap *bm; - nsurl *url; - nserror error; - - if(GetAttrs(item, PMIA_ID, &itemid, - PMIA_UserData, &userdata, - TAG_DONE)) { - switch(itemid) - { - case CMID_SELECTFILE: - if(AslRequestTags(filereq, - ASLFR_Window, gwin->win, - ASLFR_SleepWindow, TRUE, - ASLFR_TitleText,messages_get("NetSurf"), - ASLFR_Screen,scrn, - ASLFR_DoSaveMode,FALSE, - TAG_DONE)) - { - struct ami_file_input_menu_data - *file_input = userdata; - char fname[1024]; - - strlcpy(fname,filereq->fr_Drawer,1024); - AddPart(fname,filereq->fr_File,1024); - - browser_window_drop_file_at_point( - file_input->bw, - file_input->x, - file_input->y, - fname); - } - break; - - case CMID_PAGEOPEN: - ami_file_open(gwin); - break; - - case CMID_PAGECLOSE: - browser_window_destroy(gwin->gw->bw); - break; - - case CMID_URLHOTLIST: - case CMID_PAGEHOTLIST: - { - if (nsurl_create(userdata, &url) != NSERROR_OK) - break; - - hotlist_add_url(url); - nsurl_unref(url); - ami_gui_update_hotlist_button(gwin); - } - break; - - case CMID_FRAMECOPYURL: - case CMID_COPYURL: - case CMID_COPYOBJ: - ami_easy_clipboard((char *)userdata); - break; - - case CMID_FRAMEWIN: - case CMID_URLOPENWIN: - error = nsurl_create(userdata, &url); - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY, - url, - browser_window_get_url(gwin->gw->bw), - gwin->gw->bw, - &bw); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); - } - - - break; - - case CMID_FRAMETAB: - case CMID_URLOPENTAB: - error = nsurl_create(userdata, &url); - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY | BW_CREATE_TAB, - url, - browser_window_get_url(gwin->gw->bw), - gwin->gw->bw, - &bw); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); - } - - break; - - case CMID_FRAMESAVE: - case CMID_SAVEURL: - { - nsurl *url; - if (nsurl_create(userdata, &url) != NSERROR_OK) { - warn_user("NoMemory", 0); - } else { - browser_window_navigate(gwin->gw->bw, - url, - browser_window_get_url(gwin->gw->bw), - BW_NAVIGATE_DOWNLOAD, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - } - break; - - case CMID_FRAMESHOW: - case CMID_SHOWOBJ: - browser_window_navigate(gwin->gw->bw, - hlcache_handle_get_url(userdata), - browser_window_get_url(gwin->gw->bw), - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - - break; - - case CMID_URLOPEN: - { - nsurl *url; - if (nsurl_create(userdata, &url) != NSERROR_OK) { - warn_user("NoMemory", 0); - } else { - browser_window_navigate(gwin->gw->bw, - url, - browser_window_get_url(gwin->gw->bw), - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - } - break; - - case CMID_FRAMERELOAD: - case CMID_RELOADOBJ: - object = (struct hlcache_handle *)userdata; - content_invalidate_reuse_data(object); - browser_window_reload(gwin->gw->bw, false); - break; - - case CMID_CLIPOBJ: - object = (struct hlcache_handle *)userdata; - if((bm = content_get_bitmap(object))) - { - bm->url = (char *)nsurl_access(hlcache_handle_get_url(object)); - bm->title = (char *)content_get_title(object); - ami_easy_clipboard_bitmap(bm); - } -#ifdef WITH_NS_SVG - else if(ami_mime_compare(object, "svg") == true) - { - ami_easy_clipboard_svg(object); - } -#endif - break; - - case CMID_SAVEOBJ: - case CMID_PAGESAVE: - ami_file_save_req(AMINS_SAVE_SOURCE, gwin, - (struct hlcache_handle *)userdata); - break; - - case CMID_PAGESAVECOMPLETE: - case CMID_FRAMESAVECOMPLETE: - ami_file_save_req(AMINS_SAVE_COMPLETE, gwin, - (struct hlcache_handle *)userdata); - break; - - case CMID_SAVEIFFOBJ: - ami_file_save_req(AMINS_SAVE_IFF, gwin, - (struct hlcache_handle *)userdata); - break; - - case CMID_PLUGINCMD: - amiga_plugin_hack_execute((struct hlcache_handle *)userdata); - break; - - case CMID_HISTORY: - if(userdata == NULL) - { - ami_history_open(gwin->gw); - } - else - { - browser_window_history_go(gwin->gw->bw, - (struct history_entry *)userdata, false); - } - break; - - case CMID_NAVHOME: - { - nsurl *url; - - if (nsurl_create(nsoption_charp(homepage_url), &url) != NSERROR_OK) { - warn_user("NoMemory", 0); - } else { - browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - - } - break; - - case CMID_NAVBACK: - ami_gui_history(gwin, true); - break; - - case CMID_NAVFORWARD: - ami_gui_history(gwin, false); - break; - - case CMID_NAVSTOP: - if(browser_window_stop_available(gwin->gw->bw)) - browser_window_stop(gwin->gw->bw); - break; - - case CMID_NAVRELOAD: - if(browser_window_reload_available(gwin->gw->bw)) - browser_window_reload(gwin->gw->bw, true); - break; - - case CMID_SELCUT: - browser_window_key_press(gwin->gw->bw, NS_KEY_CUT_SELECTION); - break; - - case CMID_SELCOPY: - browser_window_key_press(gwin->gw->bw, NS_KEY_COPY_SELECTION); - browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); - break; - - case CMID_SELPASTE: - browser_window_key_press(gwin->gw->bw, NS_KEY_PASTE); - break; - - case CMID_SELALL: - browser_window_key_press(gwin->gw->bw, NS_KEY_SELECT_ALL); - gui_start_selection(gwin->gw); - break; - - case CMID_SELCLEAR: - browser_window_key_press(gwin->gw->bw, NS_KEY_CLEAR_SELECTION); - break; - - case CMID_SELSAVE: - ami_file_save_req(AMINS_SAVE_SELECTION, gwin, NULL); - break; - - case CMID_SELSEARCH: - { - char *sel; - - if((sel = browser_window_get_selection(gwin->gw->bw))) - { - nserror ret; - nsurl *url; - - ret = search_web_omni(sel, SEARCH_WEB_OMNI_SEARCHONLY, &url); - free(sel); - if (ret == NSERROR_OK) { - ret = browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - if (ret != NSERROR_OK) { - warn_user(messages_get_errorcode(ret), 0); - } - } - } - break; - } - } - - return itemid; -} - -#if 0 -/* \todo This is the context menu for the treeviews which needs fixing */ -static uint32 ami_context_menu_hook_tree(struct Hook *hook, Object *item, APTR reserved) -{ - int32 itemid = 0; - struct tree *tree = hook->h_Data; - APTR userdata = NULL; - - if(GetAttrs(item,PMIA_ID, &itemid, - PMIA_UserData, &userdata, - TAG_DONE)) - { - switch(itemid) - { - case CMID_TREE_LAUNCH: - tree_keypress(tree, NS_KEY_CR); - break; - - case CMID_TREE_EDITFOLDER: - hotlist_edit_selection(); - break; - - case CMID_TREE_EDITTITLE: - warn_user("TODO.", 0); - break; - - case CMID_TREE_EDITLINK: - warn_user("TODO.", 0); - break; - - case CMID_TREE_NEWFOLDER: - hotlist_add_folder(NULL, false, 0); - break; - - case CMID_TREE_NEWITEM: - hotlist_add_entry(NULL, NULL, false, 0); - break; - - case CMID_TREE_SETDEFAULT: - warn_user("TODO.", 0); - break; - - case CMID_TREE_CLEARDEFAULT: - warn_user("TODO.", 0); - break; - - case CMID_TREE_ADDHOTLIST: - warn_user("TODO.", 0); - break; - - case CMID_TREE_DELETE: - tree_keypress(tree, NS_KEY_DELETE_RIGHT); - break; - } - } - return itemid; -} - -void ami_context_menu_show_tree(struct tree *tree, struct Window *win, int type) -{ - struct node *root = tree_get_root(tree); - struct node *sel_node = tree_get_selected_node(root); - bool has_selection = tree_node_has_selection(root); - bool menu_content = false; - - if(ctxmenuobj) DisposeObject(ctxmenuobj); - - ctxmenuhook.h_Entry = ami_context_menu_hook_tree; - ctxmenuhook.h_SubEntry = NULL; - ctxmenuhook.h_Data = tree; - - ctxmenuobj = NewObject( POPUPMENU_GetClass(), NULL, - PMA_MenuHandler, &ctxmenuhook, - TAG_DONE); - - if(has_selection && (type != AMI_TREE_COOKIES) && - ((sel_node == NULL) || - (tree_node_is_folder(sel_node) == false))) { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_LAUNCH], - PMIA_ID, CMID_TREE_LAUNCH, - PMIA_UserData, NULL, - TAG_DONE), - ~0); - - menu_content = true; - } - - if(type == AMI_TREE_HOTLIST) { - if(menu_content == true) { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - ~0); - - menu_content = false; - } - - if(has_selection && (sel_node != NULL)) { - if(tree_node_is_folder(sel_node) == true) { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_EDITFOLDER], - PMIA_ID, CMID_TREE_EDITFOLDER, - PMIA_UserData, NULL, - TAG_DONE), - ~0); - } - else - { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_EDITTITLE], - PMIA_ID, CMID_TREE_EDITTITLE, - PMIA_UserData, sel_node, - TAG_DONE), - ~0); - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_EDITLINK], - PMIA_ID, CMID_TREE_EDITLINK, - PMIA_UserData, sel_node, - TAG_DONE), - ~0); - } - menu_content = true; - } - - if(menu_content == true) { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - ~0); - - menu_content = false; - } - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_NEWFOLDER], - PMIA_ID, CMID_TREE_NEWFOLDER, - PMIA_UserData, NULL, - TAG_DONE), - ~0); - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_NEWITEM], - PMIA_ID, CMID_TREE_NEWITEM, - PMIA_UserData, NULL, - TAG_DONE), - ~0); - - if(has_selection && (sel_node != NULL) && - (tree_node_is_folder(sel_node) == true)) { - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - ~0); - - if(tree_node_is_default(sel_node) == true) - { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_CLEARDEFAULT], - PMIA_ID, CMID_TREE_CLEARDEFAULT, - PMIA_UserData, NULL, - TAG_DONE), - ~0); - } - else - { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_SETDEFAULT], - PMIA_ID, CMID_TREE_SETDEFAULT, - PMIA_UserData, NULL, - TAG_DONE), - ~0); - } - } - - menu_content = true; - } - - if((type == AMI_TREE_HISTORY) && has_selection && - (sel_node != NULL) && (tree_node_is_folder(sel_node) == false)) { - if(menu_content == true) { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - ~0); - } - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_ADDHOTLIST], - PMIA_ID, CMID_TREE_ADDHOTLIST, - PMIA_UserData, sel_node, - TAG_DONE), - ~0); - - menu_content = true; - } - - if(has_selection) { - if(menu_content == true) { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, ~0, - TAG_DONE), - ~0); - } - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_TREE_DELETE], - PMIA_ID, CMID_TREE_DELETE, - PMIA_UserData, root, - TAG_DONE), - ~0); - - menu_content = true; - } - - if(menu_content == true) - IDoMethod(ctxmenuobj, PM_OPEN, win); -} -#endif - -static bool ami_context_menu_history(const struct browser_window *bw, - int x0, int y0, int x1, int y1, - const struct history_entry *entry, void *user_data) -{ - struct gui_window_2 *gwin = (struct gui_window_2 *)user_data; - - gwin->temp++; - if(gwin->temp > 10) return false; - - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)browser_window_history_entry_get_title(entry), - PMIA_ID, CMID_HISTORY, - PMIA_UserData, entry, - TAG_DONE), - ~0); - - return true; -} - -HOOKF(uint32, ami_popup_hook, Object *, item, APTR) -{ - uint32 itemid = 0; - struct gui_window *gwin = hook->h_Data; - - if(GetAttr(PMIA_ID, item, &itemid)) - { - form_select_process_selection(gwin->shared->control,itemid); - } - - return itemid; -} - -void gui_create_form_select_menu(struct gui_window *g, - struct form_control *control) -{ - /* TODO: PMIA_Title memory leaks as we don't free the strings. - * We use the core menu anyway, but in future when popupmenu.class - * improves we will probably start using this again. - */ - - struct gui_window *gwin = g; - struct form_option *opt = form_select_get_option(control, 0); - ULONG i = 0; - - if(ctxmenuobj) DisposeObject(ctxmenuobj); - - ctxmenuhook.h_Entry = ami_popup_hook; - ctxmenuhook.h_SubEntry = NULL; - ctxmenuhook.h_Data = gwin; - - gwin->shared->control = control; - - ctxmenuobj = PMMENU(ami_utf8_easy(form_control_get_name(control))), - PMA_MenuHandler, &ctxmenuhook, End; - - while(opt) - { - IDoMethod(ctxmenuobj, PM_INSERT, - NewObject( POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ami_utf8_easy(opt->text), - PMIA_ID, i, - PMIA_CheckIt, TRUE, - PMIA_Checked, opt->selected, - TAG_DONE), - ~0); - - opt = opt->next; - i++; - } - - gui_window_set_pointer(gwin, GUI_POINTER_DEFAULT); // Clear the menu-style pointer - - IDoMethod(ctxmenuobj, PM_OPEN, gwin->shared->win); -} - -#else - -#include <proto/dos.h> -#include "amiga/context_menu.h" - -void ami_context_menu_init(void) -{ -} - -void ami_context_menu_free(void) -{ -} - -BOOL ami_context_menu_mouse_trap(struct gui_window_2 *gwin, BOOL trap) -{ - return FALSE; -} - -void ami_context_menu_show(struct gui_window_2 *gwin, int x, int y) -{ -} - -void gui_create_form_select_menu(struct gui_window *g, struct form_control *control) -{ -} -#endif - diff --git a/amiga/gui.c b/amiga/gui.c index d65f2254a..47bd2c715 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -34,9 +34,6 @@ #include <proto/intuition.h> #include <proto/keymap.h> #include <proto/locale.h> -#ifdef __amigaos4__ -#include <proto/popupmenu.h> -#endif #include <proto/utility.h> #include <proto/wb.h> @@ -119,7 +116,6 @@ #include "amiga/arexx.h" #include "amiga/bitmap.h" #include "amiga/clipboard.h" -#include "amiga/context_menu.h" #include "amiga/cookies.h" #include "amiga/ctxmenu.h" #include "amiga/datatypes.h" @@ -145,6 +141,7 @@ #include "amiga/print.h" #include "amiga/schedule.h" #include "amiga/search.h" +#include "amiga/selectmenu.h" #include "amiga/theme.h" #include "amiga/tree.h" #include "amiga/utf8.h" @@ -542,9 +539,8 @@ static nserror ami_set_options(struct nsoption_s *defaults) STRPTR tempacceptlangs; char temp[1024]; - /* The following line disables the popupmenu.class select menu - ** This will become a user option when/if popupmenu.class is - ** updated to show more items than can fit in one column vertically + /* The following line disables the popupmenu.class select menu. + ** It's not recommended to use it! */ nsoption_set_bool(core_select_menu, true); @@ -627,9 +623,6 @@ static nserror ami_set_options(struct nsoption_s *defaults) } } - if(popupmenu_lib_ok == FALSE) - nsoption_set_bool(context_menu, false); - #ifndef __amigaos4__ nsoption_set_bool(download_notify, false); nsoption_set_bool(font_antialiasing, false); @@ -1923,7 +1916,6 @@ static void ami_handle_msg(void) if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) { ami_update_quals(gwin); - ami_context_menu_mouse_trap(gwin, TRUE); if(gwin->mouse_state & BROWSER_MOUSE_PRESS_1) { @@ -1939,11 +1931,7 @@ static void ami_handle_msg(void) { browser_window_mouse_track(gwin->gw->bw,gwin->mouse_state | gwin->key_state,x,y); } - } - else - { - ami_context_menu_mouse_trap(gwin, FALSE); - + } else { if(!gwin->mouse_state) ami_set_pointer(gwin, GUI_POINTER_DEFAULT, true); } break; @@ -1993,10 +1981,6 @@ static void ami_handle_msg(void) switch(code) { - case MENUDOWN: - ami_context_menu_show(gwin,x,y); - break; - case SELECTUP: if(gwin->mouse_state & BROWSER_MOUSE_PRESS_1) { @@ -2948,7 +2932,6 @@ static void gui_quit(void) if(nsscreentitle) FreeVec(nsscreentitle); LOG("Freeing menu items"); - ami_context_menu_free(); ami_ctxmenu_free(); ami_menu_free_glyphs(); @@ -5369,19 +5352,6 @@ int main(int argc, char** argv) /* Open splash window */ Object *splash_window = ami_gui_splash_open(); - /* Open popupmenu.library just to check the version. - * Versions older than 53.11 are dangerous, so we - * forcibly disable context menus if these are in use. - */ - popupmenu_lib_ok = FALSE; -#ifdef __amigaos4__ - if((PopupMenuBase = OpenLibrary("popupmenu.library", 53))) { - LOG("popupmenu.library v%d.%d", PopupMenuBase->lib_Version, PopupMenuBase->lib_Revision); - if(LIB_IS_AT_LEAST((struct Library *)PopupMenuBase, 53, 11)) - popupmenu_lib_ok = TRUE; - CloseLibrary(PopupMenuBase); - } -#endif if (ami_open_resources() == false) { /* alloc message ports */ ami_misc_fatal_error("Unable to allocate resources"); return RETURN_FAIL; @@ -5446,7 +5416,6 @@ int main(int argc, char** argv) ami_openurl_open(); ami_amiupdate(); /* set env-vars for AmiUpdate */ ami_init_fonts(); - ami_context_menu_init(); save_complete_init(); ami_theme_init(); ami_init_mouse_pointers(); diff --git a/amiga/gui_options.c b/amiga/gui_options.c index 42ee09a5b..2f16b9001 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -132,7 +132,6 @@ enum GID_OPTS_TAB_CLOSE, GID_OPTS_SEARCH_PROV, GID_OPTS_CLIPBOARD, - GID_OPTS_CONTEXTMENU, GID_OPTS_STARTUP_NO_WIN, GID_OPTS_CLOSE_NO_QUIT, GID_OPTS_DOCKY, @@ -328,7 +327,6 @@ static void ami_gui_opts_setup(struct ami_gui_opts_window *gow) gadlab[GID_OPTS_TAB_CLOSE] = (char *)ami_utf8_easy((char *)messages_get("TabClose")); gadlab[GID_OPTS_SEARCH_PROV] = (char *)ami_utf8_easy((char *)messages_get("SearchProvider")); gadlab[GID_OPTS_CLIPBOARD] = (char *)ami_utf8_easy((char *)messages_get("ClipboardUTF8")); - gadlab[GID_OPTS_CONTEXTMENU] = (char *)ami_utf8_easy((char *)messages_get("ContextMenu")); gadlab[GID_OPTS_STARTUP_NO_WIN] = (char *)ami_utf8_easy((char *)messages_get("OptionNoWindow")); gadlab[GID_OPTS_CLOSE_NO_QUIT] = (char *)ami_utf8_easy((char *)messages_get("OptionNoQuit")); gadlab[GID_OPTS_DOCKY] = (char *)ami_utf8_easy((char *)messages_get("OptionDocky")); @@ -1360,15 +1358,6 @@ void ami_gui_opts_open(void) LAYOUT_BevelStyle, BVS_GROUP, LAYOUT_Label, gadlab[GRP_OPTS_MISC], LAYOUT_SpaceOuter, TRUE, -#ifdef __amigaos4__ - LAYOUT_AddChild, gow->objects[GID_OPTS_CONTEXTMENU] = CheckBoxObj, - GA_ID, GID_OPTS_CONTEXTMENU, - GA_RelVerify, TRUE, - GA_Text, gadlab[GID_OPTS_CONTEXTMENU], - GA_Selected, nsoption_bool(context_menu), - GA_Disabled, !popupmenu_lib_ok, - CheckBoxEnd, -#endif LAYOUT_AddChild, gow->objects[GID_OPTS_FASTSCROLL] = CheckBoxObj, GA_ID, GID_OPTS_FASTSCROLL, GA_RelVerify, TRUE, @@ -1855,13 +1844,6 @@ static void ami_gui_opts_use(bool save) nsoption_set_bool(clipboard_write_utf8, false); } - GetAttr(GA_Selected,gow->objects[GID_OPTS_CONTEXTMENU],(ULONG *)&data); - if (data) { - nsoption_set_bool(context_menu, true); - } else { - nsoption_set_bool(context_menu, false); - } - GetAttr(GA_Selected,gow->objects[GID_OPTS_STARTUP_NO_WIN],(ULONG *)&data); if (data) { nsoption_set_bool(startup_no_window, true); diff --git a/amiga/options.h b/amiga/options.h index b28a4f0a2..317e5dfdc 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -34,7 +34,6 @@ NSOPTION_INTEGER(screen_ydpi, 85) NSOPTION_INTEGER(cache_bitmaps, 0) NSOPTION_STRING(theme, "PROGDIR:Resources/Themes/Default") NSOPTION_BOOL(clipboard_write_utf8, false) -NSOPTION_BOOL(context_menu, true) NSOPTION_BOOL(truecolour_mouse_pointers, false) NSOPTION_BOOL(os_mouse_pointers, true) NSOPTION_BOOL(use_openurl_lib, false) diff --git a/amiga/selectmenu.c b/amiga/selectmenu.c new file mode 100644 index 000000000..642362b4d --- /dev/null +++ b/amiga/selectmenu.c @@ -0,0 +1,114 @@ +/* + * Copyright 2008 - 2011 Chris Young <chris@unsatisfactorysoftware.co.uk> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifdef __amigaos4__ + +#include <stdbool.h> +#include <proto/exec.h> +#include <proto/intuition.h> +#include <proto/popupmenu.h> +#include <reaction/reaction_macros.h> + +#include "utils/errors.h" +#include "render/form.h" +#include "desktop/mouse.h" + +#include "amiga/gui.h" +#include "amiga/selectmenu.h" +#include "amiga/theme.h" +#include "amiga/utf8.h" + + + +HOOKF(uint32, ami_popup_hook, Object *, item, APTR) +{ + uint32 itemid = 0; + struct gui_window *gwin = hook->h_Data; + + if(GetAttr(PMIA_ID, item, &itemid)) { + form_select_process_selection(gwin->shared->control, itemid); + } + + return itemid; +} + +void gui_create_form_select_menu(struct gui_window *g, + struct form_control *control) +{ + struct Library *PopupMenuBase = NULL; + struct PopupMenuIFace *IPopupMenu = NULL; + struct Hook ctxmenuhook; + Object *selectmenuobj; + struct form_option *opt = form_select_get_option(control, 0); + ULONG i = 0; + + /**\todo Open popupmenu.library to check the version. + * Versions older than 53.11 are dangerous! */ + if((PopupMenuBase = OpenLibrary("popupmenu.class", 0))) { + IPopupMenu = (struct PopupMenuIFace *)GetInterface(PopupMenuBase, "main", 1, NULL); + } + + if(IPopupMenu == NULL) return; + + ctxmenuhook.h_Entry = ami_popup_hook; + ctxmenuhook.h_SubEntry = NULL; + ctxmenuhook.h_Data = g; + + g->shared->control = control; + + /**\todo PMIA_Title memory leaks as we don't free the strings. + * We use the core menu anyway, but in future when popupmenu.class + * improves we will probably start using this again. + */ + + selectmenuobj = PMMENU(ami_utf8_easy(form_control_get_name(control))), + PMA_MenuHandler, &ctxmenuhook, End; + + while(opt) { + IDoMethod(selectmenuobj, PM_INSERT, + NewObject(POPUPMENU_GetItemClass(), NULL, + PMIA_Title, (ULONG)ami_utf8_easy(opt->text), + PMIA_ID, i, + PMIA_CheckIt, TRUE, + PMIA_Checked, opt->selected, + TAG_DONE), + ~0); + + opt = opt->next; + i++; + } + + ami_set_pointer(g->shared, GUI_POINTER_DEFAULT, false); // Clear the menu-style pointer + + IDoMethod(selectmenuobj, PM_OPEN, g->shared->win); + + /* I believe PM_OPEN is blocking, so dispose menu immediately... */ + if(selectmenuobj) DisposeObject(selectmenuobj); + + /* ...and get rid of popupmenu.class ASAP */ + if(IPopupMenu) DropInterface((struct Interface *)IPopupMenu); + if(PopupMenuBase) CloseLibrary(PopupMenuBase); +} + +#else +#include "amiga/selectmenu.h" +void gui_create_form_select_menu(struct gui_window *g, struct form_control *control) +{ +} +#endif + diff --git a/amiga/context_menu.h b/amiga/selectmenu.h index 5697b5611..97f288add 100755 --- a/amiga/context_menu.h +++ b/amiga/selectmenu.h @@ -16,19 +16,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef AMIGA_CONTEXT_MENU_H -#define AMIGA_CONTEXT_MENU_H +#ifndef AMIGA_SELECTMENU_H +#define AMIGA_SELECTMENU_H -struct tree; struct gui_window; -struct gui_window_2; struct form_control; -void ami_context_menu_init(void); -void ami_context_menu_free(void); -BOOL ami_context_menu_mouse_trap(struct gui_window_2 *gwin, BOOL trap); -void ami_context_menu_show(struct gui_window_2 *gwin, int x, int y); - void gui_create_form_select_menu(struct gui_window *g, struct form_control *control); #endif diff --git a/render/form.h b/render/form.h index 44f383960..744ac32e7 100644 --- a/render/form.h +++ b/render/form.h @@ -26,6 +26,7 @@ #define _NETSURF_RENDER_FORM_H_ struct form_control; +struct rect; /** Option in a select. */ struct form_option { |