Author: chris_y Date: Tue Sep 28 13:03:03 2010 New Revision: 10855 URL: http://source.netsurf-browser.org?rev=10855&view=rev Log: Ensure kiosk_mode and frame windows are (a) handled the same wrt menus and (b) not trying to manipulate non-existant menus Modified: trunk/netsurf/amiga/clipboard.c trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/menu.c trunk/netsurf/amiga/theme.c Modified: trunk/netsurf/amiga/clipboard.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/clipboard.c?rev=108... ============================================================================== --- trunk/netsurf/amiga/clipboard.c (original) +++ trunk/netsurf/amiga/clipboard.c Tue Sep 28 13:03:03 2010 @@ -64,6 +64,8 @@ { if(!g) return; if(!g->shared->win) return; + if(g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL) return; + if(option_kiosk_mode == true) return; OnMenu(g->shared->win, AMI_MENU_CLEAR); OnMenu(g->shared->win, AMI_MENU_COPY); @@ -76,6 +78,8 @@ { if(!g) return; if(!g->shared->win) return; + if(g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL) return; + if(option_kiosk_mode == true) return; OffMenu(g->shared->win, AMI_MENU_CLEAR); OffMenu(g->shared->win, AMI_MENU_CUT); Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10855&... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Tue Sep 28 13:03:03 2010 @@ -1274,19 +1274,22 @@ switch(nskey) { case 'n': - if(option_kiosk_mode == false) + if((option_kiosk_mode == false) && + (gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) browser_window_create(NULL, gwin->bw, 0, true, false); break; case 't': - if(option_kiosk_mode == false) + if((option_kiosk_mode == false) && + (gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) browser_window_create(NULL, gwin->bw, 0, true, true); break; case 'k': - if(option_kiosk_mode == false) + if((option_kiosk_mode == false) && + (gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) browser_window_destroy(gwin->bw); break; @@ -1295,7 +1298,8 @@ break; case 'q': - if(option_kiosk_mode == false) + if((option_kiosk_mode == false) && + (gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) ami_quit_netsurf(); break; @@ -1325,7 +1329,8 @@ break; case 'h': - if(option_kiosk_mode == false) + if((option_kiosk_mode == false) && + (gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) ami_open_tree(hotlist,AMI_TREE_HOTLIST); break; @@ -1337,7 +1342,8 @@ break; case 'u': // open url - if(option_kiosk_mode == false) + if((option_kiosk_mode == false) && + (gwin->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) ActivateGadget((struct Gadget *)gwin->objects[GID_URL], gwin->win, NULL); break; @@ -3490,6 +3496,7 @@ if(option_kiosk_mode == true) return; if(!g) return; + if(g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL) return; if(g->tab_node && (g->shared->tabs > 1)) GetAttr(CLICKTAB_Current, g->shared->objects[GID_TABS], @@ -3638,7 +3645,8 @@ g->c_y = y; g->c_h = height; - if(option_kiosk_mode == false) + if((option_kiosk_mode == false) && + (g->shared->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) OnMenu(g->shared->win, AMI_MENU_PASTE); } @@ -3650,7 +3658,8 @@ if(!g) return; if(g->c_h == 0) return; - if(option_kiosk_mode == false) + if((option_kiosk_mode == false) && + (g->shared->bw->browser_window_type == BROWSER_WINDOW_NORMAL)) OffMenu(g->shared->win, AMI_MENU_PASTE); GetAttr(SPACE_AreaBox, g->shared->objects[GID_BROWSER], (ULONG *)&bbox); @@ -3678,9 +3687,6 @@ g->shared->oldv = 0; g->favicon = NULL; - if(g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL || - option_kiosk_mode == true) return; - ami_menu_update_disabled(g, c); } Modified: trunk/netsurf/amiga/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=10855&am... ============================================================================== --- trunk/netsurf/amiga/menu.c (original) +++ trunk/netsurf/amiga/menu.c Tue Sep 28 13:03:03 2010 @@ -847,6 +847,9 @@ { struct Window *win = g->shared->win; + if(g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL) return; + if(option_kiosk_mode == true) return; + OffMenu(win,AMI_MENU_CUT); OffMenu(win,AMI_MENU_COPY); OffMenu(win,AMI_MENU_PASTE); Modified: trunk/netsurf/amiga/theme.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/theme.c?rev=10855&a... ============================================================================== --- trunk/netsurf/amiga/theme.c (original) +++ trunk/netsurf/amiga/theme.c Tue Sep 28 13:03:03 2010 @@ -390,6 +390,7 @@ if(!g) return; if(option_kiosk_mode) return; + if(g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL) return; if(g->tab_node && (g->shared->tabs > 1)) { @@ -420,6 +421,7 @@ if(!g) return; if(option_kiosk_mode) return; + if(g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL) return; if(g->tab_node && (g->shared->tabs > 1)) {