summaryrefslogtreecommitdiff
path: root/riscos
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2006-12-08 20:04:03 +0000
committerJames Bursa <james@netsurf-browser.org>2006-12-08 20:04:03 +0000
commit7e252084a52dc3d99cb76b9b0bc008c21fa1ff4f (patch)
tree660b78b21b70096b8d9c66687edf373b3f7144c8 /riscos
parent1b13cad222fe139c16e3fd47bb85c5eda30883cc (diff)
downloadnetsurf-7e252084a52dc3d99cb76b9b0bc008c21fa1ff4f.tar.gz
netsurf-7e252084a52dc3d99cb76b9b0bc008c21fa1ff4f.tar.bz2
Replace font_menu with new rufl built-in font menu.
svn path=/trunk/netsurf/; revision=3111
Diffstat (limited to 'riscos')
-rw-r--r--riscos/configure/con_fonts.c10
-rw-r--r--riscos/font.c43
-rw-r--r--riscos/gui.h1
3 files changed, 5 insertions, 49 deletions
diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index 4fa26f7be..81d9a576d 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -68,15 +68,15 @@ bool ro_gui_options_fonts_initialise(wimp_w w)
/* initialise all functions for a newly created window */
ro_gui_wimp_event_register_menu_gright(w, FONT_SANS_FIELD,
- FONT_SANS_MENU, font_menu);
+ FONT_SANS_MENU, rufl_family_menu);
ro_gui_wimp_event_register_menu_gright(w, FONT_SERIF_FIELD,
- FONT_SERIF_MENU, font_menu);
+ FONT_SERIF_MENU, rufl_family_menu);
ro_gui_wimp_event_register_menu_gright(w, FONT_MONOSPACE_FIELD,
- FONT_MONOSPACE_MENU, font_menu);
+ FONT_MONOSPACE_MENU, rufl_family_menu);
ro_gui_wimp_event_register_menu_gright(w, FONT_CURSIVE_FIELD,
- FONT_CURSIVE_MENU, font_menu);
+ FONT_CURSIVE_MENU, rufl_family_menu);
ro_gui_wimp_event_register_menu_gright(w, FONT_FANTASY_FIELD,
- FONT_FANTASY_MENU, font_menu);
+ FONT_FANTASY_MENU, rufl_family_menu);
ro_gui_wimp_event_register_menu_gright(w, FONT_DEFAULT_FIELD,
FONT_DEFAULT_MENU, default_menu);
ro_gui_wimp_event_register_numeric_field(w, FONT_DEFAULT_SIZE,
diff --git a/riscos/font.c b/riscos/font.c
index eca4ae80f..40cc0874f 100644
--- a/riscos/font.c
+++ b/riscos/font.c
@@ -25,8 +25,6 @@
#include "netsurf/utils/utils.h"
-wimp_menu *font_menu;
-
/** desktop font, size and style being used */
char ro_gui_desktop_font_family[80];
int ro_gui_desktop_font_size = 12;
@@ -37,7 +35,6 @@ static void nsfont_check_option(char **option, const char *family,
const char *fallback);
static int nsfont_list_cmp(const void *keyval, const void *datum);
static void nsfont_check_fonts(void);
-static void nsfont_init_menu(void);
static void ro_gui_wimp_desktop_font(char *family, size_t bufsize, int *psize,
rufl_style *pstyle);
@@ -85,8 +82,6 @@ void nsfont_init(void)
option_font_default != CSS_FONT_FAMILY_CURSIVE &&
option_font_default != CSS_FONT_FAMILY_FANTASY)
option_font_default = CSS_FONT_FAMILY_SANS_SERIF;
-
- nsfont_init_menu();
}
@@ -198,44 +193,6 @@ void nsfont_check_fonts(void)
/**
- * Prepare the menu of font families.
- */
-
-void nsfont_init_menu(void)
-{
- unsigned int i;
-
- font_menu = malloc(wimp_SIZEOF_MENU(rufl_family_list_entries));
- if (!font_menu)
- die("NoMemory");
- font_menu->title_data.indirected_text.text = messages_get("Fonts");
- font_menu->title_fg = wimp_COLOUR_BLACK;
- font_menu->title_bg = wimp_COLOUR_LIGHT_GREY;
- font_menu->work_fg = wimp_COLOUR_BLACK;
- font_menu->work_bg = wimp_COLOUR_WHITE;
- font_menu->width = 200;
- font_menu->height = wimp_MENU_ITEM_HEIGHT;
- font_menu->gap = wimp_MENU_ITEM_GAP;
- for (i = 0; i != rufl_family_list_entries; i++) {
- font_menu->entries[i].menu_flags = 0;
- font_menu->entries[i].sub_menu = wimp_NO_SUB_MENU;
- font_menu->entries[i].icon_flags = wimp_ICON_TEXT |
- wimp_ICON_INDIRECTED |
- (wimp_COLOUR_BLACK << wimp_ICON_FG_COLOUR_SHIFT) |
- (wimp_COLOUR_WHITE << wimp_ICON_BG_COLOUR_SHIFT);
- font_menu->entries[i].data.indirected_text.text =
- rufl_family_list[i];
- font_menu->entries[i].data.indirected_text.validation =
- (char *) -1;
- font_menu->entries[i].data.indirected_text.size =
- strlen(rufl_family_list[i]);
- }
- font_menu->entries[0].menu_flags = wimp_MENU_TITLE_INDIRECTED;
- font_menu->entries[i - 1].menu_flags |= wimp_MENU_LAST;
-}
-
-
-/**
* Measure the width of a string.
*
* \param style css_style for this text, with style->font_size.size ==
diff --git a/riscos/gui.h b/riscos/gui.h
index 23c888cfc..c38d6ca88 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -46,7 +46,6 @@ extern wimp_w dialog_info, dialog_saveas, dialog_zoom, dialog_pageinfo,
extern struct gui_window *gui_track_gui_window;
extern wimp_w current_menu_window;
extern bool current_menu_open;
-extern wimp_menu *font_menu; /* font.c */
extern wimp_menu *recent_search_menu; /* search.c */
extern wimp_w history_window;
extern struct form_control *current_gadget;