mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 17:52:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Disable the popupmenu-based context menu and the emulated menu keyboard shortcuts in preparation for test implementing an Intuition-based context menu.

Browse Source
This commit is contained in:
Chris Young 2015-09-02 17:34:24 +01:00
parent 2e4bfc5dc3
commit 52d182e71e
2 changed files with 4 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amiga/context_menu.c
View File

@ -554,6 +554,8 @@ void ami_context_menu_free(void)
BOOL ami_context_menu_mouse_trap(struct gui_window_2 *gwin, BOOL trap) 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(context_menu) == false) return FALSE;
if((nsoption_bool(kiosk_mode) == false) && (trap == FALSE)) if((nsoption_bool(kiosk_mode) == false) && (trap == FALSE))

98
amiga/gui.c
View File

@ -2265,104 +2265,10 @@ static void ami_handle_msg(void)
if((ie->ie_Qualifier & IEQUALIFIER_RCOMMAND) && if((ie->ie_Qualifier & IEQUALIFIER_RCOMMAND) &&
((31 < nskey) && (nskey < 127))) { ((31 < nskey) && (nskey < 127))) {
/* We are duplicating the menu shortcuts here, as if RMBTRAP is /* NB: Some keypresses are converted to generic keypresses above
* active (ie. when context menus are enabled and the mouse is over * rather than being "menu-emulated" here. */
* the browser rendering area), Intuition also does not catch the
* menu shortcut key presses. Context menus possibly need to be
* changed to use MENUVERIFY not RMBTRAP.
* NB: Some keypresses are converted to generic keypresses above
* rather than being "menu-emulated" here.
*/
switch(nskey) switch(nskey)
{ {
case 'n':
if ((nsoption_bool(kiosk_mode) == false)) {
nsurl *urlns;
nserror error;
error = nsurl_create(nsoption_charp(homepage_url), &urlns);
if (error == NSERROR_OK) {
error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY,
urlns,
NULL,
gwin->gw->bw,
NULL);
nsurl_unref(urlns);
}
if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0);
}
}
break;
case 't':
if((nsoption_bool(kiosk_mode) == false)) {
nsurl *urlns;
nserror error;
error = nsurl_create(nsoption_charp(homepage_url), &urlns);
if (error == NSERROR_OK) {
error = browser_window_create(BW_CREATE_CLONE | BW_CREATE_HISTORY |
BW_CREATE_TAB,
urlns,
NULL,
gwin->gw->bw,
NULL);
nsurl_unref(urlns);
}
if (error != NSERROR_OK) {
warn_user(messages_get_errorcode(error), 0);
}
}
break;
case 'k':
if((nsoption_bool(kiosk_mode) == false))
browser_window_destroy(gwin->gw->bw);
break;
case 'o':
ami_file_open(gwin);
break;
case 's':
ami_file_save_req(AMINS_SAVE_SOURCE, gwin,
browser_window_get_content(gwin->gw->bw));
break;
case 'p':
ami_print_ui(browser_window_get_content(gwin->gw->bw));
break;
case 'q':
if((nsoption_bool(kiosk_mode) == false))
ami_quit_netsurf();
break;
case 'f':
ami_search_open(gwin->gw);
break;
case 'h':
if((nsoption_bool(kiosk_mode) == false))
ami_tree_open(hotlist_window, AMI_TREE_HOTLIST);
break;
case '-':
if(gwin->gw->scale > 0.1)
ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1);
break;
case '=':
ami_gui_set_scale(gwin->gw, 1.0);
break;
case '+':
ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1);
break;
/* The following aren't available from the menu at the moment */ /* The following aren't available from the menu at the moment */
case 'r': // reload case 'r': // reload