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

Replace OnMenu/OffMenu with MenuClass compatible abstraction

Browse Source
This commit is contained in:
Chris Young 2017-01-14 20:51:51 +00:00
parent 9f10babe64
commit 313aaabdde
4 changed files with 164 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontends/amiga/clipboard.c
View File

@ -89,11 +89,11 @@ void gui_start_selection(struct gui_window *g)
if(!g->shared->win) return;
if(nsoption_bool(kiosk_mode) == true) return;
OnMenu(g->shared->win, AMI_MENU_CLEAR);
OnMenu(g->shared->win, AMI_MENU_COPY);
ami_menu_set_disabled(g->shared->win, g->shared->imenu, M_COPY, false);
ami_menu_set_disabled(g->shared->win, g->shared->imenu, M_CLEAR, false);
if (browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_CUT)
OnMenu(g->shared->win, AMI_MENU_CUT);
ami_menu_set_disabled(g->shared->win, g->shared->imenu, M_CUT, false);
}
static char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codeset, size_t *text_length)

18
frontends/amiga/gui.c
View File

@ -1206,16 +1206,12 @@ static void ami_update_buttons(struct gui_window_2 *gwin)
if(!browser_window_reload_available(gwin->gw->bw))
reload=TRUE;
if(nsoption_bool(kiosk_mode) == false)
{
if(gwin->tabs <= 1)
{
if(nsoption_bool(kiosk_mode) == false) {
if(gwin->tabs <= 1) {
tabclose=TRUE;
OffMenu(gwin->win,AMI_MENU_CLOSETAB);
}
else
{
OnMenu(gwin->win,AMI_MENU_CLOSETAB);
ami_menu_set_disabled(gwin->win, gwin->imenu, M_CLOSETAB, true);
} else {
ami_menu_set_disabled(gwin->win, gwin->imenu, M_CLOSETAB, false);
}
}
@ -5262,7 +5258,7 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh
g->c_h = height;
if((nsoption_bool(kiosk_mode) == false))
OnMenu(g->shared->win, AMI_MENU_PASTE);
ami_menu_set_disabled(g->shared->win, g->shared->imenu, M_PASTE, false);
}
static void gui_window_remove_caret(struct gui_window *g)
@ -5271,7 +5267,7 @@ static void gui_window_remove_caret(struct gui_window *g)
if(g->c_h == 0) return;
if((nsoption_bool(kiosk_mode) == false))
OffMenu(g->shared->win, AMI_MENU_PASTE);
ami_menu_set_disabled(g->shared->win, g->shared->imenu, M_PASTE, true);
ami_do_redraw_limits(g, g->bw, false, g->c_x, g->c_y,
g->c_x + g->c_w + 1, g->c_y + g->c_h + 1);

183
frontends/amiga/menu.c
View File

@ -1175,6 +1175,120 @@ static nserror ami_menu_scan(struct ami_menu_data **md)
return ami_hotlist_scan((void *)md, AMI_MENU_HOTLIST, messages_get("HotlistMenu"), ami_menu_hotlist_add);
}
#ifdef __amigaos4__
void ami_menu_set_disabled_mc(struct Window *win, struct Menu *menu, int item, bool disable)
{
ULONG disable_state = MS_DISABLED;
if(disable == false) {
disable_state = 0;
}
IDoMethod(menu, MM_SETSTATE, 0, item, MS_DISABLED, disable_state);
}
#endif
static ULONG ami_menu_number(int item)
{
/* horrible, horrible, horrible */
ULONG menu_num;
switch(item) {
case M_SAVETXT:
menu_num = FULLMENUNUM(0,4,1);
break;
case M_SAVECOMP:
menu_num = FULLMENUNUM(0,4,2);
break;
case M_SAVEIFF:
menu_num = FULLMENUNUM(0,4,3);
break;
#ifdef WITH_PDF_EXPORT:
case M_SAVEPDF:
menu_num = FULLMENUNUM(0,4,4);
break;
#endif
case M_CLOSETAB:
menu_num = FULLMENUNUM(0,8,0);
break;
case M_CUT:
menu_num = FULLMENUNUM(1,0,0);
break;
case M_COPY:
menu_num = FULLMENUNUM(1,1,0);
break;
case M_PASTE:
menu_num = FULLMENUNUM(1,2,0);
break;
case M_SELALL:
menu_num = FULLMENUNUM(1,4,0);
break;
case M_CLEAR:
menu_num = FULLMENUNUM(1,5,0);
break;
case M_UNDO:
menu_num = FULLMENUNUM(1,8,0);
break;
case M_REDO:
menu_num = FULLMENUNUM(1,9,0);
break;
case M_FIND:
menu_num = FULLMENUNUM(2,0,0);
break;
case M_IMGFORE:
menu_num = FULLMENUNUM(2,8,0);
break;
case M_IMGBACK:
menu_num = FULLMENUNUM(2,8,1);
break;
case M_JS:
menu_num = FULLMENUNUM(2,9,0);
break;
default:
LOG("WARNING: Unrecognised menu item %d", item);
menu_num = 0;
break;
}
return menu_num;
}
static void ami_menu_set_disabled_gt(struct Window *win, struct Menu *menu, int item, bool disable)
{
ULONG menu_num = ami_menu_number(item);
if(disable == false) {
OnMenu(win, menu_num);
} else {
OffMenu(win, menu_num);
}
}
void ami_menu_set_disabled(struct Window *win, struct Menu *menu, int item, bool disable)
{
if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) {
#ifdef __amigaos4__
return ami_menu_set_disabled_mc(win, menu, item, disable);
#endif
} else {
return ami_menu_set_disabled_gt(win, menu, item, disable);
}
}
void ami_menu_update_checked(struct gui_window_2 *gwin)
{
if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 54, 6)) {
@ -1187,26 +1301,26 @@ void ami_menu_update_checked(struct gui_window_2 *gwin)
GetAttr(WINDOW_MenuStrip, gwin->objects[OID_MAIN], (ULONG *)&menustrip);
if(!menustrip) return;
if(nsoption_bool(enable_javascript) == true) {
if((ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) == 0)
ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED;
if((ItemAddress(menustrip, ami_menu_number(M_JS))->Flags & CHECKED) == 0)
ItemAddress(menustrip, ami_menu_number(M_JS))->Flags ^= CHECKED;
} else {
if(ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED)
ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED;
if(ItemAddress(menustrip, ami_menu_number(M_JS))->Flags & CHECKED)
ItemAddress(menustrip, ami_menu_number(M_JS))->Flags ^= CHECKED;
}
if(nsoption_bool(foreground_images) == true) {
if((ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) == 0)
ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED;
if((ItemAddress(menustrip, ami_menu_number(M_IMGFORE))->Flags & CHECKED) == 0)
ItemAddress(menustrip, ami_menu_number(M_IMGFORE))->Flags ^= CHECKED;
} else {
if(ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED)
ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED;
if(ItemAddress(menustrip, ami_menu_number(M_IMGFORE))->Flags & CHECKED)
ItemAddress(menustrip, ami_menu_number(M_IMGFORE))->Flags ^= CHECKED;
}
if(nsoption_bool(background_images) == true) {
if((ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags & CHECKED) == 0)
ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags ^= CHECKED;
if((ItemAddress(menustrip, ami_menu_number(M_IMGBACK))->Flags & CHECKED) == 0)
ItemAddress(menustrip, ami_menu_number(M_IMGBACK))->Flags ^= CHECKED;
} else {
if(ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags & CHECKED)
ItemAddress(menustrip, AMI_MENU_BACKIMG)->Flags ^= CHECKED;
if(ItemAddress(menustrip, ami_menu_number(M_IMGBACK))->Flags & CHECKED)
ItemAddress(menustrip, ami_menu_number(M_IMGBACK))->Flags ^= CHECKED;
}
ResetMenuStrip(gwin->win, menustrip);
@ -1220,10 +1334,10 @@ void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c)
if(content_get_type(c) <= CONTENT_CSS)
{
OnMenu(win,AMI_MENU_SAVEAS_TEXT);
OnMenu(win,AMI_MENU_SAVEAS_COMPLETE);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVETXT, false);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVECOMP, false);
#ifdef WITH_PDF_EXPORT
OnMenu(win,AMI_MENU_SAVEAS_PDF);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVEPDF, false);
#endif
#if 0
if(browser_window_get_editor_flags(g->bw) & BW_EDITOR_CAN_COPY) {
@ -1244,28 +1358,29 @@ void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c)
else
OffMenu(win,AMI_MENU_PASTE);
#else
OnMenu(win,AMI_MENU_CUT);
OnMenu(win,AMI_MENU_COPY);
OnMenu(win,AMI_MENU_PASTE);
OnMenu(win,AMI_MENU_CLEAR);
ami_menu_set_disabled(win, g->shared->imenu, M_CUT, false);
ami_menu_set_disabled(win, g->shared->imenu, M_COPY, false);
ami_menu_set_disabled(win, g->shared->imenu, M_PASTE, false);
ami_menu_set_disabled(win, g->shared->imenu, M_CLEAR, false);
#endif
OnMenu(win,AMI_MENU_SELECTALL);
OnMenu(win,AMI_MENU_FIND);
OffMenu(win,AMI_MENU_SAVEAS_IFF);
ami_menu_set_disabled(win, g->shared->imenu, M_SELALL, false);
ami_menu_set_disabled(win, g->shared->imenu, M_FIND, false);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, true);
}
else
{
OffMenu(win,AMI_MENU_CUT);
OffMenu(win,AMI_MENU_PASTE);
OffMenu(win,AMI_MENU_CLEAR);
ami_menu_set_disabled(win, g->shared->imenu, M_CUT, true);
ami_menu_set_disabled(win, g->shared->imenu, M_PASTE, true);
ami_menu_set_disabled(win, g->shared->imenu, M_CLEAR, true);
OffMenu(win,AMI_MENU_SAVEAS_TEXT);
OffMenu(win,AMI_MENU_SAVEAS_COMPLETE);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVETXT, true);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVECOMP, true);
#ifdef WITH_PDF_EXPORT
OffMenu(win,AMI_MENU_SAVEAS_PDF);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVEPDF, true);
#endif
OffMenu(win,AMI_MENU_SELECTALL);
OffMenu(win,AMI_MENU_FIND);
ami_menu_set_disabled(win, g->shared->imenu, M_SELALL, true);
ami_menu_set_disabled(win, g->shared->imenu, M_FIND, true);
#ifdef WITH_NS_SVG
if(content_get_bitmap(c) || (ami_mime_compare(c, "svg") == true))
@ -1273,13 +1388,13 @@ void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c)
if(content_get_bitmap(c))
#endif
{
OnMenu(win,AMI_MENU_COPY);
OnMenu(win,AMI_MENU_SAVEAS_IFF);
ami_menu_set_disabled(win, g->shared->imenu, M_COPY, false);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, false);
}
else
{
OffMenu(win,AMI_MENU_COPY);
OffMenu(win,AMI_MENU_SAVEAS_IFF);
ami_menu_set_disabled(win, g->shared->imenu, M_COPY, true);
ami_menu_set_disabled(win, g->shared->imenu, M_SAVEIFF, true);
}
}
}

23
frontends/amiga/menu.h
View File

@ -115,24 +115,6 @@ enum {
* only used for freeing the UTF-8 converted menu labels */
#define AMI_MENU_MAX AMI_MENU_AREXX
/* The Intuition menu numbers of some menus we might need to modify */
#define AMI_MENU_SAVEAS_TEXT FULLMENUNUM(0,4,1)
#define AMI_MENU_SAVEAS_COMPLETE FULLMENUNUM(0,4,2)
#define AMI_MENU_SAVEAS_IFF FULLMENUNUM(0,4,3)
#define AMI_MENU_SAVEAS_PDF FULLMENUNUM(0,4,4)
#define AMI_MENU_CLOSETAB FULLMENUNUM(0,8,0)
#define AMI_MENU_CUT FULLMENUNUM(1,0,0)
#define AMI_MENU_COPY FULLMENUNUM(1,1,0)
#define AMI_MENU_PASTE FULLMENUNUM(1,2,0)
#define AMI_MENU_SELECTALL FULLMENUNUM(1,4,0)
#define AMI_MENU_CLEAR FULLMENUNUM(1,5,0)
#define AMI_MENU_UNDO FULLMENUNUM(1,8,0)
#define AMI_MENU_REDO FULLMENUNUM(1,9,0)
#define AMI_MENU_FIND FULLMENUNUM(2,0,0)
#define AMI_MENU_FOREIMG FULLMENUNUM(2,8,0)
#define AMI_MENU_BACKIMG FULLMENUNUM(2,8,1)
#define AMI_MENU_JS FULLMENUNUM(2,9,0)
struct gui_window;
struct gui_window_2;
@ -154,6 +136,11 @@ void ami_menu_update_checked(struct gui_window_2 *gwin);
void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c);
void ami_menu_free(struct gui_window_2 *gwin);
/**
* Set disabled state of a menu item
*/
void ami_menu_set_disabled(struct Window *win, struct Menu *menu, int item, bool disable);
/**
* Sets that an item linked to a toggle menu item has been changed.
*/