mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rjek/bloom

This commit is contained in:
Rob Kendrick (humdrum) 2013-05-20 11:15:17 +01:00
parent 90d2c8c212 6c9d0aaee7
commit f571aebbdb
6 changed files with 243 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
amiga/font.c
View File

@ -341,15 +341,14 @@ bool nsfont_split(const plot_font_style_t *fstyle,
}
}
tx += tempx;
if ((x < tx) && (*char_offset != 0)) {
/* Reached available width, and a space was found;
* split there. */
free(outf16);
return true;
}
tx += tempx;
utf16 = utf16next;
utf8_pos = utf8_next(string, length, utf8_pos);
}

1
amiga/gui.h
View File

@ -99,6 +99,7 @@ struct gui_window_2 {
bool new_content;
bool redraw_scheduled;
char *menulab[AMI_MENU_AREXX_MAX + 1];
Object *menuobj[AMI_MENU_AREXX_MAX + 1];
char menukey[AMI_MENU_AREXX_MAX + 1];
struct Hook menu_hook[AMI_MENU_AREXX_MAX + 1];
UBYTE *menutype;

454
amiga/menu.c
View File

@ -67,6 +67,7 @@
#define IMAGE_MENU_ITEM(n, i, t) \
gwin->menulab[n] = LabelObject, \
LABEL_DrawInfo, dri, \
LABEL_DisposeImage, TRUE, \
LABEL_Image, BitMapObject, \
BITMAP_Screen, scrn, \
BITMAP_SourceFile, i, \
@ -78,9 +79,9 @@ BOOL menualreadyinit;
const char * const netsurf_version;
const char * const verdate;
ULONG ami_menu_scan(struct tree *tree, bool count, struct gui_window_2 *gwin);
ULONG ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin);
void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen,
ULONG *item, bool count, struct gui_window_2 *gwin);
int *item, struct gui_window_2 *gwin);
void ami_menu_arexx_scan(struct gui_window_2 *gwin);
/* Functions for menu selections */
@ -129,13 +130,11 @@ void ami_free_menulabs(struct gui_window_2 *gwin)
{
if(gwin->menutype[i] & MENU_IMAGE)
{
//TODO: Free image structure
}
else
{
ami_utf8_free(gwin->menulab[i]);
DisposeObject(gwin->menuobj[i]);
}
ami_utf8_free(gwin->menulab[i]);
if(i >= AMI_MENU_AREXX)
{
if(gwin->menu_hook[i].h_Data) free(gwin->menu_hook[i].h_Data);
@ -143,6 +142,7 @@ void ami_free_menulabs(struct gui_window_2 *gwin)
}
gwin->menulab[i] = NULL;
gwin->menuobj[i] = NULL;
gwin->menukey[i] = 0;
}
@ -153,9 +153,32 @@ void ami_free_menulabs(struct gui_window_2 *gwin)
gwin->menu = NULL;
}
static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type,
const char *label, char key, struct bitmap *bm, void *func, void *hookdata)
{
gwin->menutype[num] = type;
if((label == NM_BARLABEL) || (strcmp(label, "--") == 0)) {
gwin->menulab[num] = NM_BARLABEL;
} else {
if((num >= AMI_MENU_HOTLIST) && (num <= AMI_MENU_HOTLIST_MAX)) {
gwin->menulab[num] = ami_utf8_easy(label);
} else if((num >= AMI_MENU_AREXX) && (num <= AMI_MENU_AREXX_MAX)) {
gwin->menulab[num] = strdup(label);
} else {
gwin->menulab[num] = ami_utf8_easy(messages_get(label));
}
}
if(key) gwin->menukey[num] = key;
if(func) gwin->menu_hook[num].h_Entry = (HOOKFUNC)func;
if(hookdata) gwin->menu_hook[num].h_Data = hookdata;
}
void ami_init_menulabs(struct gui_window_2 *gwin)
{
int i;
struct DrawInfo *dri = GetScreenDrawInfo(scrn);
gwin->menutype = AllocVec(AMI_MENU_AREXX_MAX + 1, MEMF_PRIVATE | MEMF_CLEAR);
@ -163,237 +186,112 @@ void ami_init_menulabs(struct gui_window_2 *gwin)
{
gwin->menutype[i] = NM_IGNORE;
gwin->menulab[i] = NULL;
gwin->menuobj[i] = NULL;
}
gwin->menutype[0] = NM_TITLE;
gwin->menulab[0] = ami_utf8_easy((char *)messages_get("Project"));
ami_menu_alloc_item(gwin, M_PROJECT, NM_TITLE, "Project", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_NEWWIN, NM_ITEM, "NewWindowNS", 'N', NULL,
ami_menu_item_project_newwin, NULL);
ami_menu_alloc_item(gwin, M_NEWTAB, NM_ITEM, "NewTab", 'T', NULL,
ami_menu_item_project_newtab, NULL);
ami_menu_alloc_item(gwin, M_BAR_P1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_OPEN, NM_ITEM, "OpenFile", 'O', NULL,
ami_menu_item_project_open, NULL);
ami_menu_alloc_item(gwin, M_SAVEAS, NM_ITEM, "SaveAsNS", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_SAVESRC, NM_SUB, "Source", 'S', NULL,
ami_menu_item_project_save, (void *)AMINS_SAVE_SOURCE);
ami_menu_alloc_item(gwin, M_SAVETXT, NM_SUB, "TextNS", 0, NULL,
ami_menu_item_project_save, (void *)AMINS_SAVE_TEXT);
ami_menu_alloc_item(gwin, M_SAVECOMP, NM_SUB, "SaveCompNS", 0, NULL,
ami_menu_item_project_save, (void *)AMINS_SAVE_COMPLETE);
ami_menu_alloc_item(gwin, M_SAVEPDF, NM_SUB, "PDFNS", 0, NULL,
ami_menu_item_project_save, (void *)AMINS_SAVE_PDF);
ami_menu_alloc_item(gwin, M_SAVEIFF, NM_SUB, "IFF", 0, NULL,
ami_menu_item_project_save, (void *)AMINS_SAVE_IFF);
ami_menu_alloc_item(gwin, M_BAR_P2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_CLOSETAB, NM_ITEM, "CloseTab", 'K', NULL,
ami_menu_item_project_closetab, NULL);
ami_menu_alloc_item(gwin, M_CLOSEWIN, NM_ITEM, "CloseWindow", 0, NULL,
ami_menu_item_project_closewin, NULL);
ami_menu_alloc_item(gwin, M_BAR_P3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_PRINT, NM_ITEM, "PrintNS", 'P', NULL,
ami_menu_item_project_print, NULL);
ami_menu_alloc_item(gwin, M_BAR_P4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_ABOUT, NM_ITEM, "About", '?', NULL,
ami_menu_item_project_about, NULL);
ami_menu_alloc_item(gwin, M_QUIT, NM_ITEM, "Quit", 'Q', NULL,
ami_menu_item_project_quit, NULL);
gwin->menutype[1] = NM_ITEM;
gwin->menulab[1] = ami_utf8_easy((char *)messages_get("NewWindowNS"));
gwin->menukey[1] = 'N';
gwin->menu_hook[1].h_Entry = (HOOKFUNC)ami_menu_item_project_newwin;
ami_menu_alloc_item(gwin, M_EDIT, NM_TITLE, "Edit", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_CUT, NM_ITEM, "CutNS", 'X', NULL,
ami_menu_item_edit_cut, NULL);
ami_menu_alloc_item(gwin, M_COPY, NM_ITEM, "CopyNS", 'C', NULL,
ami_menu_item_edit_copy, NULL);
ami_menu_alloc_item(gwin, M_PASTE, NM_ITEM, "PasteNS", 'V', NULL,
ami_menu_item_edit_paste, NULL);
ami_menu_alloc_item(gwin, M_BAR_E1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_SELALL, NM_ITEM, "SelectAllNS", 'A', NULL,
ami_menu_item_edit_selectall, NULL);
ami_menu_alloc_item(gwin, M_CLEAR, NM_ITEM, "ClearNS", 'Z', NULL,
ami_menu_item_edit_clearsel, NULL);
gwin->menutype[2] = NM_ITEM;
gwin->menulab[2] = ami_utf8_easy((char *)messages_get("NewTab"));
gwin->menukey[2] = 'T';
gwin->menu_hook[2].h_Entry = (HOOKFUNC)ami_menu_item_project_newtab;
ami_menu_alloc_item(gwin, M_BROWSER, NM_TITLE, "Browser", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_FIND, NM_ITEM, "FindTextNS", 'F', NULL,
ami_menu_item_browser_find, NULL);
ami_menu_alloc_item(gwin, M_BAR_B1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_HISTLOCL, NM_ITEM, "HistLocalNS", 0, NULL,
ami_menu_item_browser_localhistory, NULL);
ami_menu_alloc_item(gwin, M_HISTGLBL, NM_ITEM, "HistGlobalNS", 0, NULL,
ami_menu_item_browser_globalhistory, NULL);
ami_menu_alloc_item(gwin, M_BAR_B2, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_COOKIES, NM_ITEM, "ShowCookies", 0, NULL,
ami_menu_item_browser_cookies, NULL);
ami_menu_alloc_item(gwin, M_BAR_B3, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_SCALE, NM_ITEM, "ScaleNS", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_SCALEDEC, NM_SUB, "ScaleDec", '-', NULL,
ami_menu_item_browser_scale_decrease, NULL);
ami_menu_alloc_item(gwin, M_SCALENRM, NM_SUB, "ScaleNorm", '=', NULL,
ami_menu_item_browser_scale_normal, NULL);
ami_menu_alloc_item(gwin, M_SCALEDEC, NM_SUB, "ScaleDec", '-', NULL,
ami_menu_item_browser_scale_decrease, NULL);
ami_menu_alloc_item(gwin, M_SCALEINC, NM_SUB, "ScaleInc", '+', NULL,
ami_menu_item_browser_scale_increase, NULL);
ami_menu_alloc_item(gwin, M_IMAGES, NM_ITEM, "Images", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_IMGFORE, NM_SUB, "ForeImg", 0, NULL,
ami_menu_item_browser_foreimg, NULL);
ami_menu_alloc_item(gwin, M_IMGBACK, NM_SUB, "BackImg", 0, NULL,
ami_menu_item_browser_backimg, NULL);
#if defined(WITH_JS) || defined(WITH_MOZJS)
ami_menu_alloc_item(gwin, M_JS, NM_ITEM, "EnableJS", 0, NULL,
ami_menu_item_browser_enablejs, NULL);
#endif
ami_menu_alloc_item(gwin, M_BAR_B4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_REDRAW, NM_ITEM, "Redraw", 0, NULL,
ami_menu_item_browser_redraw, NULL);
gwin->menutype[3] = NM_ITEM;
gwin->menulab[3] = NM_BARLABEL;
ami_menu_alloc_item(gwin, M_HOTLIST, NM_TITLE, "Hotlist", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_HLADD, NM_ITEM, "HotlistAdd", 'B', NULL,
ami_menu_item_hotlist_add, NULL);
ami_menu_alloc_item(gwin, M_HLSHOW, NM_ITEM,"HotlistShowNS",'H', NULL,
ami_menu_item_hotlist_show, NULL);
ami_menu_alloc_item(gwin, M_BAR_H1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
gwin->menutype[4] = NM_ITEM;
gwin->menulab[4] = ami_utf8_easy((char *)messages_get("OpenFile"));
gwin->menukey[4] = 'O';
gwin->menu_hook[4].h_Entry = (HOOKFUNC)ami_menu_item_project_open;
gwin->menutype[5] = NM_ITEM;
gwin->menulab[5] = ami_utf8_easy((char *)messages_get("SaveAsNS"));
gwin->menutype[6] = NM_SUB;
gwin->menulab[6] = ami_utf8_easy((char *)messages_get("Source"));
gwin->menukey[6] = 'S';
gwin->menu_hook[6].h_Entry = (HOOKFUNC)ami_menu_item_project_save;
gwin->menu_hook[6].h_Data = AMINS_SAVE_SOURCE;
gwin->menutype[7] = NM_SUB;
gwin->menulab[7] = ami_utf8_easy((char *)messages_get("TextNS"));
gwin->menu_hook[7].h_Entry = (HOOKFUNC)ami_menu_item_project_save;
gwin->menu_hook[7].h_Data = (void *)AMINS_SAVE_TEXT;
gwin->menutype[8] = NM_SUB;
gwin->menulab[8] = ami_utf8_easy((char *)messages_get("SaveCompNS"));
gwin->menu_hook[8].h_Entry = (HOOKFUNC)ami_menu_item_project_save;
gwin->menu_hook[8].h_Data = (void *)AMINS_SAVE_COMPLETE;
gwin->menutype[9] = NM_SUB;
gwin->menulab[9] = ami_utf8_easy((char *)messages_get("PDFNS"));
gwin->menu_hook[9].h_Entry = (HOOKFUNC)ami_menu_item_project_save;
gwin->menu_hook[9].h_Data = (void *)AMINS_SAVE_PDF;
gwin->menutype[10] = NM_SUB;
gwin->menulab[10] = ami_utf8_easy((char *)messages_get("IFF"));
gwin->menu_hook[10].h_Entry = (HOOKFUNC)ami_menu_item_project_save;
gwin->menu_hook[10].h_Data = (void *)AMINS_SAVE_IFF;
gwin->menutype[11] = NM_ITEM;
gwin->menulab[11] = NM_BARLABEL;
gwin->menutype[12] = NM_ITEM;
gwin->menulab[12] = ami_utf8_easy((char *)messages_get("CloseTab"));
gwin->menukey[12] = 'K';
gwin->menu_hook[12].h_Entry = (HOOKFUNC)ami_menu_item_project_closetab;
gwin->menutype[13] = NM_ITEM;
gwin->menulab[13] = ami_utf8_easy((char *)messages_get("CloseWindow"));
gwin->menu_hook[13].h_Entry = (HOOKFUNC)ami_menu_item_project_closewin;
gwin->menutype[14] = NM_ITEM;
gwin->menulab[14] = NM_BARLABEL;
gwin->menutype[15] = NM_ITEM;
gwin->menulab[15] = ami_utf8_easy((char *)messages_get("PrintNS"));
gwin->menukey[15] = 'P';
gwin->menu_hook[15].h_Entry = (HOOKFUNC)ami_menu_item_project_print;
gwin->menutype[16] = NM_ITEM;
gwin->menulab[16] = NM_BARLABEL;
gwin->menutype[17] = NM_ITEM;
gwin->menulab[17] = ami_utf8_easy((char *)messages_get("About"));
gwin->menukey[17] = '?';
gwin->menu_hook[17].h_Entry = (HOOKFUNC)ami_menu_item_project_about;
gwin->menutype[18] = NM_ITEM;
gwin->menulab[18] = ami_utf8_easy((char *)messages_get("Quit"));
gwin->menukey[18] = 'Q';
gwin->menu_hook[18].h_Entry = (HOOKFUNC)ami_menu_item_project_quit;
gwin->menutype[19] = NM_TITLE;
gwin->menulab[19] = ami_utf8_easy((char *)messages_get("Edit"));
gwin->menutype[20] = NM_ITEM;
gwin->menulab[20] = ami_utf8_easy((char *)messages_get("CutNS"));
gwin->menukey[20] = 'X';
gwin->menu_hook[20].h_Entry = (HOOKFUNC)ami_menu_item_edit_cut;
gwin->menutype[21] = NM_ITEM;
gwin->menulab[21] = ami_utf8_easy((char *)messages_get("CopyNS"));
gwin->menukey[21] = 'C';
gwin->menu_hook[21].h_Entry = (HOOKFUNC)ami_menu_item_edit_copy;
gwin->menutype[22] = NM_ITEM;
gwin->menulab[22] = ami_utf8_easy((char *)messages_get("PasteNS"));
gwin->menukey[22] = 'V';
gwin->menu_hook[22].h_Entry = (HOOKFUNC)ami_menu_item_edit_paste;
gwin->menutype[23] = NM_ITEM;
gwin->menulab[23] = NM_BARLABEL;
gwin->menutype[24] = NM_ITEM;
gwin->menulab[24] = ami_utf8_easy((char *)messages_get("SelectAllNS"));
gwin->menukey[24] = 'A';
gwin->menu_hook[24].h_Entry = (HOOKFUNC)ami_menu_item_edit_selectall;
gwin->menutype[25] = NM_ITEM;
gwin->menulab[25] = ami_utf8_easy((char *)messages_get("ClearNS"));
gwin->menukey[25] = 'Z';
gwin->menu_hook[25].h_Entry = (HOOKFUNC)ami_menu_item_edit_clearsel;
gwin->menutype[26] = NM_TITLE;
gwin->menulab[26] = ami_utf8_easy((char *)messages_get("Browser"));
gwin->menutype[27] = NM_ITEM;
gwin->menulab[27] = ami_utf8_easy((char *)messages_get("FindTextNS"));
gwin->menukey[27] = 'F';
gwin->menu_hook[27].h_Entry = (HOOKFUNC)ami_menu_item_browser_find;
gwin->menutype[28] = NM_ITEM;
gwin->menulab[28] = NM_BARLABEL;
gwin->menutype[29] = NM_ITEM;
gwin->menulab[29] = ami_utf8_easy((char *)messages_get("HistLocalNS"));
gwin->menu_hook[29].h_Entry = (HOOKFUNC)ami_menu_item_browser_localhistory;
gwin->menutype[30] = NM_ITEM;
gwin->menulab[30] = ami_utf8_easy((char *)messages_get("HistGlobalNS"));
gwin->menu_hook[30].h_Entry = (HOOKFUNC)ami_menu_item_browser_globalhistory;
gwin->menutype[31] = NM_ITEM;
gwin->menulab[31] = NM_BARLABEL;
gwin->menutype[32] = NM_ITEM;
gwin->menulab[32] = ami_utf8_easy((char *)messages_get("ShowCookies"));
gwin->menu_hook[32].h_Entry = (HOOKFUNC)ami_menu_item_browser_cookies;
gwin->menutype[33] = NM_ITEM;
gwin->menulab[33] = NM_BARLABEL;
gwin->menutype[34] = NM_ITEM;
gwin->menulab[34] = ami_utf8_easy((char *)messages_get("ScaleNS"));
gwin->menutype[35] = NM_SUB;
gwin->menulab[35] = ami_utf8_easy((char *)messages_get("ScaleDec"));
gwin->menukey[35] = '-';
gwin->menu_hook[35].h_Entry = (HOOKFUNC)ami_menu_item_browser_scale_decrease;
gwin->menutype[36] = NM_SUB;
gwin->menulab[36] = ami_utf8_easy((char *)messages_get("ScaleNorm"));
gwin->menukey[36] = '=';
gwin->menu_hook[36].h_Entry = (HOOKFUNC)ami_menu_item_browser_scale_normal;
gwin->menutype[37] = NM_SUB;
gwin->menulab[37] = ami_utf8_easy((char *)messages_get("ScaleInc"));
gwin->menukey[37] = '+';
gwin->menu_hook[37].h_Entry = (HOOKFUNC)ami_menu_item_browser_scale_increase;
gwin->menutype[38] = NM_ITEM;
gwin->menulab[38] = ami_utf8_easy((char *)messages_get("Images"));
gwin->menutype[39] = NM_SUB;
gwin->menulab[39] = ami_utf8_easy((char *)messages_get("ForeImg"));
gwin->menu_hook[39].h_Entry = (HOOKFUNC)ami_menu_item_browser_foreimg;
gwin->menutype[40] = NM_SUB;
gwin->menulab[40] = ami_utf8_easy((char *)messages_get("BackImg"));
gwin->menu_hook[40].h_Entry = (HOOKFUNC)ami_menu_item_browser_backimg;
gwin->menutype[41] = NM_ITEM;
gwin->menulab[41] = ami_utf8_easy((char *)messages_get("EnableJS"));
gwin->menu_hook[41].h_Entry = (HOOKFUNC)ami_menu_item_browser_enablejs;
gwin->menutype[42] = NM_ITEM;
gwin->menulab[42] = NM_BARLABEL;
gwin->menutype[43] = NM_ITEM;
gwin->menulab[43] = ami_utf8_easy((char *)messages_get("Redraw"));
gwin->menu_hook[43].h_Entry = (HOOKFUNC)ami_menu_item_browser_redraw;
gwin->menutype[44] = NM_TITLE;
gwin->menulab[44] = ami_utf8_easy((char *)messages_get("Hotlist"));
gwin->menutype[45] = NM_ITEM;
gwin->menulab[45] = ami_utf8_easy((char *)messages_get("HotlistAdd"));
gwin->menukey[45] = 'B';
gwin->menu_hook[45].h_Entry = (HOOKFUNC)ami_menu_item_hotlist_add;
gwin->menutype[46] = NM_ITEM;
gwin->menulab[46] = ami_utf8_easy((char *)messages_get("HotlistShowNS"));
gwin->menukey[46] = 'H';
gwin->menu_hook[46].h_Entry = (HOOKFUNC)ami_menu_item_hotlist_show;
gwin->menutype[47] = NM_ITEM;
gwin->menulab[47] = NM_BARLABEL;
gwin->menutype[AMI_MENU_HOTLIST_MAX + 1] = NM_TITLE;
gwin->menulab[AMI_MENU_HOTLIST_MAX + 1] = ami_utf8_easy((char *)messages_get("Settings"));
gwin->menutype[AMI_MENU_HOTLIST_MAX + 2] = NM_ITEM;
gwin->menulab[AMI_MENU_HOTLIST_MAX + 2] = ami_utf8_easy((char *)messages_get("SettingsEdit"));
gwin->menu_hook[AMI_MENU_HOTLIST_MAX + 2].h_Entry = (HOOKFUNC)ami_menu_item_settings_edit;
gwin->menutype[AMI_MENU_HOTLIST_MAX + 3] = NM_ITEM;
gwin->menulab[AMI_MENU_HOTLIST_MAX + 3] = NM_BARLABEL;
gwin->menutype[AMI_MENU_HOTLIST_MAX + 4] = NM_ITEM;
gwin->menulab[AMI_MENU_HOTLIST_MAX + 4] = ami_utf8_easy((char *)messages_get("SnapshotWindow"));
gwin->menu_hook[AMI_MENU_HOTLIST_MAX + 4].h_Entry = (HOOKFUNC)ami_menu_item_settings_snapshot;
gwin->menutype[AMI_MENU_HOTLIST_MAX + 5] = NM_ITEM;
gwin->menulab[AMI_MENU_HOTLIST_MAX + 5] = ami_utf8_easy((char *)messages_get("SettingsSave"));
gwin->menu_hook[AMI_MENU_HOTLIST_MAX + 5].h_Entry = (HOOKFUNC)ami_menu_item_settings_save;
gwin->menutype[AMI_MENU_HOTLIST_MAX + 6] = NM_TITLE;
gwin->menulab[AMI_MENU_HOTLIST_MAX + 6] = ami_utf8_easy((char *)messages_get("ARexx"));
gwin->menutype[AMI_MENU_HOTLIST_MAX + 7] = NM_ITEM;
gwin->menulab[AMI_MENU_HOTLIST_MAX + 7] = ami_utf8_easy((char *)messages_get("ARexxExecute"));
gwin->menukey[AMI_MENU_HOTLIST_MAX + 7] = 'E';
gwin->menu_hook[AMI_MENU_HOTLIST_MAX + 7].h_Entry = (HOOKFUNC)ami_menu_item_arexx_execute;
gwin->menutype[AMI_MENU_HOTLIST_MAX + 8] = NM_ITEM;
gwin->menulab[AMI_MENU_HOTLIST_MAX + 8] = NM_BARLABEL;
ami_menu_alloc_item(gwin, M_PREFS, NM_TITLE, "Settings", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_PREDIT, NM_ITEM, "SettingsEdit", 0, NULL,
ami_menu_item_settings_edit, NULL);
ami_menu_alloc_item(gwin, M_BAR_S1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_SNAPSHOT, NM_ITEM, "SnapshotWindow",0, NULL,
ami_menu_item_settings_snapshot, NULL);
ami_menu_alloc_item(gwin, M_PRSAVE, NM_ITEM, "SettingsSave", 0, NULL,
ami_menu_item_settings_save, NULL);
ami_menu_alloc_item(gwin, M_AREXX, NM_TITLE, "ARexx", 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_AREXXEX, NM_ITEM, "ARexxExecute",'E', NULL,
ami_menu_item_arexx_execute, NULL);
ami_menu_alloc_item(gwin, M_BAR_A1, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
gwin->menutype[AMI_MENU_AREXX_MAX] = NM_END;
FreeScreenDrawInfo(scrn, dri);
}
/* Menu refresh for hotlist */
@ -415,47 +313,43 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin)
{
int i;
ami_init_menulabs(gwin);
gwin->menu = AllocVec(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), MEMF_CLEAR);
ami_init_menulabs(gwin);
ami_menu_scan(ami_tree_get_tree(hotlist_window), gwin);
ami_menu_arexx_scan(gwin);
for(i=0;i<=AMI_MENU_AREXX_MAX;i++)
{
gwin->menu[i].nm_Type = gwin->menutype[i];
gwin->menu[i].nm_Label = gwin->menulab[i];
if(gwin->menuobj[i])
gwin->menu[i].nm_Label = (void *)gwin->menuobj[i];
else
gwin->menu[i].nm_Label = gwin->menulab[i];
if(gwin->menukey[i]) gwin->menu[i].nm_CommKey = &gwin->menukey[i];
gwin->menu[i].nm_Flags = 0;
if(gwin->menu_hook[i].h_Entry) gwin->menu[i].nm_UserData = &gwin->menu_hook[i];
}
gwin->menu[1].nm_Flags = 0;
gwin->menu[2].nm_Flags = 0;
gwin->menu[12].nm_Flags = 0;
gwin->menu[13].nm_Flags = 0;
#ifndef WITH_PDF_EXPORT
gwin->menu[9].nm_Flags = NM_ITEMDISABLED;
gwin->menu[M_SAVEPDF].nm_Flags = NM_ITEMDISABLED;
#endif
#if !defined(WITH_JS) && !defined(WITH_MOZJS)
gwin->menu[41].nm_Flags = NM_ITEMDISABLED | CHECKIT | MENUTOGGLE;
#else
gwin->menu[41].nm_Flags = CHECKIT | MENUTOGGLE;
#if defined(WITH_JS) || defined(WITH_MOZJS)
gwin->menu[M_JS].nm_Flags = CHECKIT | MENUTOGGLE;
if(nsoption_bool(enable_javascript) == true)
gwin->menu[41].nm_Flags |= CHECKED;
gwin->menu[M_JS].nm_Flags |= CHECKED;
#endif
gwin->menu[15].nm_Flags = NM_ITEMDISABLED;
gwin->menu[M_PRINT].nm_Flags = NM_ITEMDISABLED;
gwin->menu[39].nm_Flags = CHECKIT | MENUTOGGLE;
gwin->menu[M_IMGFORE].nm_Flags = CHECKIT | MENUTOGGLE;
if(nsoption_bool(foreground_images) == true)
gwin->menu[39].nm_Flags |= CHECKED;
gwin->menu[40].nm_Flags = CHECKIT | MENUTOGGLE;
gwin->menu[M_IMGFORE].nm_Flags |= CHECKED;
gwin->menu[M_IMGBACK].nm_Flags = CHECKIT | MENUTOGGLE;
if(nsoption_bool(background_images) == true)
gwin->menu[40].nm_Flags |= CHECKED;
gwin->menu[M_IMGBACK].nm_Flags |= CHECKED;
ami_menu_scan(ami_tree_get_tree(hotlist_window), false, gwin);
ami_menu_arexx_scan(gwin);
/* Set up scheduler to refresh the hotlist menu */
/* Set up scheduler to refresh the hotlist menu */
if(nsoption_int(menu_refresh) > 0)
schedule(nsoption_int(menu_refresh), (void *)ami_menu_refresh, gwin);
@ -471,6 +365,7 @@ void ami_menu_arexx_scan(struct gui_window_2 *gwin)
char matchpatt[16];
LONG cont;
struct ExAllData *ead;
char *menu_lab;
if(lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))
{
@ -498,18 +393,12 @@ void ami_menu_arexx_scan(struct gui_window_2 *gwin)
{
gwin->menu[item].nm_Type = NM_ITEM;
if(ead->ed_Comment[0] != '\0')
{
gwin->menulab[item] = (char *)strdup(ead->ed_Comment);
}
menu_lab = ead->ed_Comment;
else
{
gwin->menulab[item] = (char *)strdup(ead->ed_Name);
}
menu_lab = ead->ed_Name;
gwin->menu[item].nm_Label = gwin->menulab[item];
gwin->menu_hook[item].h_Entry = (HOOKFUNC)ami_menu_item_arexx_entries;
gwin->menu_hook[item].h_Data = (char *)strdup(ead->ed_Name);
gwin->menu[item].nm_UserData = (HOOKFUNC)&gwin->menu_hook[item];
ami_menu_alloc_item(gwin, item, NM_ITEM, menu_lab, 0, NULL,
ami_menu_item_arexx_entries, (void *)strdup(ead->ed_Name));
item++;
}
@ -526,13 +415,13 @@ void ami_menu_arexx_scan(struct gui_window_2 *gwin)
gwin->menu[item].nm_Label = NULL;
}
ULONG ami_menu_scan(struct tree *tree, bool count, struct gui_window_2 *gwin)
ULONG ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin)
{
struct node *root = tree_node_get_child(tree_get_root(tree));
struct node *node;
struct node_element *element;
WORD gen = 0;
ULONG item;
int item;
item = AMI_MENU_HOTLIST;
@ -543,7 +432,7 @@ ULONG ami_menu_scan(struct tree *tree, bool count, struct gui_window_2 *gwin)
if(element && (strcmp(tree_node_element_get_text(element), messages_get("HotlistMenu")) == 0))
{
// found menu
ami_menu_scan_2(tree, tree_node_get_child(node), &gen, &item, count, gwin);
ami_menu_scan_2(tree, tree_node_get_child(node), &gen, &item, gwin);
}
}
@ -551,11 +440,12 @@ ULONG ami_menu_scan(struct tree *tree, bool count, struct gui_window_2 *gwin)
}
void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen,
ULONG *item, bool count, struct gui_window_2 *gwin)
int *item, struct gui_window_2 *gwin)
{
struct node *tempnode;
struct node_element *element=NULL;
struct node *node;
UBYTE menu_type;
*gen = *gen + 1;
@ -563,37 +453,21 @@ void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen,
{
if((*gen > 0) && (*gen < 3))
{
// if(*item >= AMI_MENU_HOTLIST_MAX) return;
if(*item >= AMI_MENU_HOTLIST_MAX) return;
if(!count)
{
if(*gen == 1) gwin->menu[*item].nm_Type = NM_ITEM;
if(*gen == 2) gwin->menu[*item].nm_Type = NM_SUB;
if(*gen == 1) menu_type = NM_ITEM;
if(*gen == 2) menu_type = NM_SUB;
if(strcmp(tree_url_node_get_title(node),"--"))
{
gwin->menulab[*item] = ami_utf8_easy((char *)tree_url_node_get_title(node));
}
else
{
gwin->menulab[*item] = NM_BARLABEL;
}
gwin->menu[*item].nm_Label = gwin->menulab[*item];
gwin->menu_hook[*item].h_Entry = (HOOKFUNC)ami_menu_item_hotlist_entries;
gwin->menu_hook[*item].h_Data = (void *)tree_url_node_get_url(node);
gwin->menu[*item].nm_UserData = (HOOKFUNC)&gwin->menu_hook[*item];
if(tree_node_is_folder(node) && (!tree_node_get_child(node)))
gwin->menu[*item].nm_Flags = NM_ITEMDISABLED;
}
ami_menu_alloc_item(gwin, *item, menu_type, tree_url_node_get_title(node), 0, NULL,
ami_menu_item_hotlist_entries, (void *)tree_url_node_get_url(node));
if(tree_node_is_folder(node) && (!tree_node_get_child(node)))
gwin->menu[*item].nm_Flags = NM_ITEMDISABLED;
*item = *item + 1;
}
if (tree_node_get_child(node))
{
ami_menu_scan_2(tree,tree_node_get_child(node),gen,item,count,gwin);
}
ami_menu_scan_2(tree, tree_node_get_child(node), gen, item, gwin);
}
*gen = *gen - 1;

97
amiga/menu.h
View File

@ -23,32 +23,87 @@
#include <libraries/gadtools.h>
#include "content/hlcache.h"
/* Number of hotlist items, menu structure needs to be changed in ami_create_menu()
* if this value is changed. */
/* Maximum number of hotlist items (somewhat arbitrary value) */
#define AMI_HOTLIST_ITEMS 60
//gwin->hotlist_items
/* Maximum number of menu items - first value is number of static items
* (ie. everything not intially defined as NM_IGNORE) */
#define AMI_MENU_MAX 57 + AMI_HOTLIST_ITEMS
/* Where the hotlist entries start */
#define AMI_MENU_HOTLIST 48
/* Where the hotlist entries end */
#define AMI_MENU_HOTLIST_MAX AMI_MENU_HOTLIST+AMI_HOTLIST_ITEMS
/* Number of ARexx menu items. menu structure in ami_create_menu() needs to be
* changed if this value is modified. */
/* Maximum number of ARexx menu items (somewhat arbitrary value) */
#define AMI_MENU_AREXX_ITEMS 20
/* Where the ARexx menu items start. ARexx menu items are right at the end...
* for now, at least. We can get away with AMI_MENU_MAX falling short as it is
* only used for freeing the UTF-8 converted menu labels */
#define AMI_MENU_AREXX AMI_MENU_MAX
/* enum menu structure, has to be here as we need it below. */
enum {
/* Project menu */
M_PROJECT = 0,
M_NEWWIN,
M_NEWTAB,
M_BAR_P1,
M_OPEN,
M_SAVEAS,
M_SAVESRC,
M_SAVETXT,
M_SAVECOMP,
M_SAVEPDF,
M_SAVEIFF,
M_BAR_P2,
M_CLOSETAB,
M_CLOSEWIN,
M_BAR_P3,
M_PRINT,
M_BAR_P4,
M_ABOUT,
M_QUIT,
/* Edit menu */
M_EDIT,
M_CUT,
M_COPY,
M_PASTE,
M_BAR_E1,
M_SELALL,
M_CLEAR,
/* Browser menu */
M_BROWSER,
M_FIND,
M_BAR_B1,
M_HISTLOCL,
M_HISTGLBL,
M_BAR_B2,
M_COOKIES,
M_BAR_B3,
M_SCALE,
M_SCALEDEC,
M_SCALENRM,
M_SCALEINC,
M_IMAGES,
M_IMGFORE,
M_IMGBACK,
#if defined(WITH_JS) || defined(WITH_MOZJS)
M_JS,
#endif
M_BAR_B4,
M_REDRAW,
/* Hotlist menu */
M_HOTLIST,
M_HLADD,
M_HLSHOW,
M_BAR_H1, // 47
AMI_MENU_HOTLIST, /* Where the hotlist entries start */
AMI_MENU_HOTLIST_MAX = AMI_MENU_HOTLIST + AMI_HOTLIST_ITEMS,
/* Settings menu */
M_PREFS,
M_PREDIT,
M_BAR_S1,
M_SNAPSHOT,
M_PRSAVE,
/* ARexx menu */
M_AREXX,
M_AREXXEX,
M_BAR_A1,
AMI_MENU_AREXX,
AMI_MENU_AREXX_MAX = AMI_MENU_AREXX + AMI_MENU_AREXX_ITEMS
};
/* Where the ARexx menu items end (incidentally this is the real AMI_MENU_MAX) */
#define AMI_MENU_AREXX_MAX AMI_MENU_AREXX+AMI_MENU_AREXX_ITEMS
/* We can get away with AMI_MENU_MAX falling short as it is
* 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)

8
amiga/plotters.c
View File

@ -155,7 +155,6 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
* Also applies to the further gfx/layers functions and memory below */
ULONG depth = 32;
struct DrawInfo *dri;
struct BitMap *friend = NULL;
depth = GetBitMapAttr(scrn->RastPort.BitMap, BMA_DEPTH);
@ -163,13 +162,6 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
palette_mapped = true;
} else {
palette_mapped = false;
/* If we're not palette-mapping allocate using a friend BitMap if the
* depth is 32bpp. In all other cases using a friend BitMap causes a
* hard lockup or odd/missing graphical effects.
*/
if(depth == 32) friend = scrn->RastPort.BitMap;
}
if(nsoption_int(redraw_tile_size_x) <= 0) nsoption_set_int(redraw_tile_size_x, scrn->Width);

5
css/select.c
View File

@ -1551,10 +1551,6 @@ css_error node_is_visited(void *pw, void *node, bool *match)
{
*match = false;
/** \todo Implement visted check in a more performant way */
#define SUPPORT_VISITED
#ifdef SUPPORT_VISITED
nscss_select_ctx *ctx = pw;
nsurl *url;
nserror error;
@ -1606,7 +1602,6 @@ css_error node_is_visited(void *pw, void *node, bool *match)
*match = true;
nsurl_unref(url);
#endif
return CSS_OK;
}