diff options
| -rw-r--r-- | gtk/font_pango.c | 277 | ||||
| -rw-r--r-- | gtk/gtk_gui.c | 2 | ||||
| -rw-r--r-- | gtk/gtk_plotters.c | 27 | ||||
| -rw-r--r-- | gtk/gtk_window.c | 2 |
4 files changed, 193 insertions, 115 deletions
diff --git a/gtk/font_pango.c b/gtk/font_pango.c index bd0eda997..6d9c0d085 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.c @@ -2,9 +2,16 @@ * This file is part of NetSurf, http://netsurf.sourceforge.net/ * Licensed under the GNU General Public License, * http://www.opensource.org/licenses/gpl-license - * Copyright 2004 James Bursa <bursa@users.sourceforge.net> + * Copyright 2005 James Bursa <bursa@users.sourceforge.net> */ +/** \file + * Font handling (GTK implementation). + * + * Pango is used handle and render fonts. + */ + + #include <assert.h> #include <stdio.h> #include <gtk/gtk.h> @@ -14,145 +21,130 @@ #include "netsurf/utils/log.h" -struct font_set { - int x; -}; - - -struct font_set *nsfont_new_set() -{ - return 0; -} - - -struct font_data *nsfont_open(struct font_set *set, struct css_style *style) -{ - struct font_data *data; - unsigned int size = PANGO_SCALE * 11; - PangoFontDescription *fontdesc; - PangoWeight weight = PANGO_WEIGHT_NORMAL; - PangoStyle styl = PANGO_STYLE_NORMAL; - - if (style->font_size.size == CSS_FONT_SIZE_LENGTH) - size = style->font_size.value.length.value * PANGO_SCALE; - - switch (style->font_weight) { - case CSS_FONT_WEIGHT_NORMAL: - weight = PANGO_WEIGHT_NORMAL; break; - case CSS_FONT_WEIGHT_BOLD: - weight = PANGO_WEIGHT_BOLD; break; - case CSS_FONT_WEIGHT_100: weight = 100; break; - case CSS_FONT_WEIGHT_200: weight = 200; break; - case CSS_FONT_WEIGHT_300: weight = 300; break; - case CSS_FONT_WEIGHT_400: weight = 400; break; - case CSS_FONT_WEIGHT_500: weight = 500; break; - case CSS_FONT_WEIGHT_600: weight = 600; break; - case CSS_FONT_WEIGHT_700: weight = 700; break; - case CSS_FONT_WEIGHT_800: weight = 800; break; - case CSS_FONT_WEIGHT_900: weight = 900; break; - default: break; - } - - switch (style->font_style) { - case CSS_FONT_STYLE_ITALIC: styl = PANGO_STYLE_ITALIC; break; - case CSS_FONT_STYLE_OBLIQUE: styl = PANGO_STYLE_OBLIQUE; break; - default: break; - } +extern GdkDrawable *current_drawable; +extern GdkGC *current_gc; - fontdesc = pango_font_description_new(); - pango_font_description_set_size(fontdesc, size); - pango_font_description_set_family_static(fontdesc, "Sans"); - pango_font_description_set_weight(fontdesc, weight); - pango_font_description_set_style(fontdesc, styl); - data = malloc(sizeof *data); - assert(data); +static PangoFontDescription *nsfont_style_to_description( + const struct css_style *style); - data->id = fontdesc; - data->size = size; - data->space_width = nsfont_width(data, " ", sizeof(" ")-1); - - return data; -} - - -void nsfont_free_set(struct font_set *set) -{ -} +/** + * Measure the width of a string. + * + * \param style css_style for this text, with style->font_size.size == + * CSS_FONT_SIZE_LENGTH + * \param string UTF-8 string to measure + * \param length length of string + * \param width updated to width of string[0..length) + * \return true on success, false on error and error reported + */ -unsigned long nsfont_width(struct font_data *font, const char *text, - size_t length) +bool nsfont_width(const struct css_style *style, + const char *string, size_t length, + int *width) { - int width; + PangoFontDescription *desc; PangoContext *context; PangoLayout *layout; - assert(font && text); - if (length == 0) return 0; + desc = nsfont_style_to_description(style); context = gdk_pango_context_get(); layout = pango_layout_new(context); - pango_layout_set_font_description(layout, font->id); - pango_layout_set_text(layout, text, length); + pango_layout_set_font_description(layout, desc); + pango_layout_set_text(layout, string, length); - pango_layout_get_pixel_size(layout, &width, 0); + pango_layout_get_pixel_size(layout, width, 0); g_object_unref(layout); g_object_unref(context); + pango_font_description_free(desc); - return width; + return true; } -bool nsfont_position_in_string(struct font_data *font, const char *text, - size_t length, unsigned long x, int *char_offset, - int *pixel_offset) +/** + * Find the position in a string where an x coordinate falls. + * + * \param style css_style for this text, with style->font_size.size == + * CSS_FONT_SIZE_LENGTH + * \param string UTF-8 string to measure + * \param length length of string + * \param x x coordinate to search for + * \param char_offset updated to offset in string of actual_x, [0..length] + * \param actual_x updated to x coordinate of character closest to x + * \return true on success, false on error and error reported + */ + +bool nsfont_position_in_string(const struct css_style *style, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) { int index; + PangoFontDescription *desc; PangoContext *context; PangoLayout *layout; PangoRectangle pos; - assert(font && text); - + desc = nsfont_style_to_description(style); context = gdk_pango_context_get(); layout = pango_layout_new(context); - pango_layout_set_font_description(layout, font->id); - pango_layout_set_text(layout, text, length); + pango_layout_set_font_description(layout, desc); + pango_layout_set_text(layout, string, length); pango_layout_xy_to_index(layout, x * PANGO_SCALE, 0, &index, 0); pango_layout_index_to_pos(layout, index, &pos); g_object_unref(layout); g_object_unref(context); + pango_font_description_free(desc); *char_offset = index; - *pixel_offset = PANGO_PIXELS(pos.x); + *actual_x = PANGO_PIXELS(pos.x); return true; } -char *nsfont_split(struct font_data *font, const char *text, - size_t length, unsigned int width, unsigned int *used_width) +/** + * Find where to split a string to make it fit a width. + * + * \param style css_style for this text, with style->font_size.size == + * CSS_FONT_SIZE_LENGTH + * \param string UTF-8 string to measure + * \param length length of string + * \param x width available + * \param char_offset updated to offset in string of actual_x, [0..length] + * \param actual_x updated to x coordinate of character closest to x + * \return true on success, false on error and error reported + * + * On exit, [char_offset == 0 || + * string[char_offset] == ' ' || + * char_offset == length] + */ + +bool nsfont_split(const struct css_style *style, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) { int index = length; int x_pos; + PangoFontDescription *desc; PangoContext *context; PangoLayout *layout; PangoLayoutLine *line; - assert(font && text); - + desc = nsfont_style_to_description(style); context = gdk_pango_context_get(); layout = pango_layout_new(context); - pango_layout_set_font_description(layout, font->id); - pango_layout_set_text(layout, text, length); + pango_layout_set_font_description(layout, desc); + pango_layout_set_text(layout, string, length); - pango_layout_set_width(layout, width * PANGO_SCALE); + pango_layout_set_width(layout, x * PANGO_SCALE); pango_layout_set_wrap(layout, PANGO_WRAP_WORD); line = pango_layout_get_line(layout, 1); if (line) @@ -162,7 +154,114 @@ char *nsfont_split(struct font_data *font, const char *text, g_object_unref(layout); g_object_unref(context); + pango_font_description_free(desc); + + *char_offset = index; + *actual_x = PANGO_PIXELS(x_pos); + + return true; +} + + +/** + * Render a string. + * + * \param style css_style for this text, with style->font_size.size == + * CSS_FONT_SIZE_LENGTH + * \param string UTF-8 string to measure + * \param length length of string + * \param x x coordinate + * \param y y coordinate + * \param c colour for text + * \return true on success, false on error and error reported + */ + +bool nsfont_paint(const struct css_style *style, + const char *string, size_t length, + int x, int y, colour c) +{ + PangoFontDescription *desc; + PangoContext *context; + PangoLayout *layout; + PangoLayoutLine *line; + GdkColor colour = { 0, + ((c & 0xff) << 8) | (c & 0xff), + (c & 0xff00) | (c & 0xff00 >> 8), + ((c & 0xff0000) >> 8) | (c & 0xff0000 >> 16) }; + + if (length == 0) + return 0; + + desc = nsfont_style_to_description(style); + context = gdk_pango_context_get(); + layout = pango_layout_new(context); + pango_layout_set_font_description(layout, desc); + pango_layout_set_text(layout, string, length); + + line = pango_layout_get_line(layout, 0); + gdk_draw_layout_line_with_colors(current_drawable, current_gc, + x, y, line, &colour, 0); + + g_object_unref(layout); + g_object_unref(context); + pango_font_description_free(desc); + + return true; +} + + +/** + * Convert a css_style to a PangoFontDescription. + * + * \param style css_style for this text, with style->font_size.size == + * CSS_FONT_SIZE_LENGTH + * \return a new Pango font description + */ + +PangoFontDescription *nsfont_style_to_description( + const struct css_style *style) +{ + unsigned int size; + PangoFontDescription *desc; + PangoWeight weight = PANGO_WEIGHT_NORMAL; + PangoStyle styl = PANGO_STYLE_NORMAL; + + assert(style->font_size.size == CSS_FONT_SIZE_LENGTH); + size = css_len2px(&style->font_size.value.length, style) * PANGO_SCALE; + + switch (style->font_style) { + case CSS_FONT_STYLE_ITALIC: + styl = PANGO_STYLE_ITALIC; + break; + case CSS_FONT_STYLE_OBLIQUE: + styl = PANGO_STYLE_OBLIQUE; + break; + default: + break; + } + + switch (style->font_weight) { + case CSS_FONT_WEIGHT_NORMAL: + weight = PANGO_WEIGHT_NORMAL; break; + case CSS_FONT_WEIGHT_BOLD: + weight = PANGO_WEIGHT_BOLD; break; + case CSS_FONT_WEIGHT_100: weight = 100; break; + case CSS_FONT_WEIGHT_200: weight = 200; break; + case CSS_FONT_WEIGHT_300: weight = 300; break; + case CSS_FONT_WEIGHT_400: weight = 400; break; + case CSS_FONT_WEIGHT_500: weight = 500; break; + case CSS_FONT_WEIGHT_600: weight = 600; break; + case CSS_FONT_WEIGHT_700: weight = 700; break; + case CSS_FONT_WEIGHT_800: weight = 800; break; + case CSS_FONT_WEIGHT_900: weight = 900; break; + default: break; + } + + desc = pango_font_description_new(); + pango_font_description_set_size(desc, size); + pango_font_description_set_family_static(desc, "Sans"); + pango_font_description_set_weight(desc, weight); + pango_font_description_set_style(desc, styl); - *used_width = PANGO_PIXELS(x_pos); - return text + index; + return desc; } diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 07e89e11e..dc4c35adb 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -151,3 +151,5 @@ void gui_401login_open(struct browser_window *bw, struct content *c, void schedule(int t, void (*callback)(void *p), void *p) {} void schedule_remove(void (*callback)(void *p), void *p) {} void schedule_run(void) {} + +void global_history_add(struct gui_window *g) {} diff --git a/gtk/gtk_plotters.c b/gtk/gtk_plotters.c index 9054573e2..eab937ead 100644 --- a/gtk/gtk_plotters.c +++ b/gtk/gtk_plotters.c @@ -30,7 +30,7 @@ static bool nsgtk_plot_polygon(int *p, unsigned int n, colour fill); static bool nsgtk_plot_fill(int x0, int y0, int x1, int y1, colour c); static bool nsgtk_plot_clip(int clip_x0, int clip_y0, int clip_x1, int clip_y1); -static bool nsgtk_plot_text(int x, int y, struct font_data *font, +static bool nsgtk_plot_text(int x, int y, struct css_style *style, const char *text, size_t length, colour bg, colour c); static bool nsgtk_plot_disc(int x, int y, int radius, colour colour); static bool nsgtk_plot_bitmap(int x, int y, int width, int height, @@ -122,31 +122,10 @@ bool nsgtk_plot_clip(int clip_x0, int clip_y0, } -bool nsgtk_plot_text(int x, int y, struct font_data *font, +bool nsgtk_plot_text(int x, int y, struct css_style *style, const char *text, size_t length, colour bg, colour c) { - PangoContext *context; - PangoLayout *layout; - PangoLayoutLine *line; - GdkColor colour = { 0, - ((c & 0xff) << 8) | (c & 0xff), - (c & 0xff00) | (c & 0xff00 >> 8), - ((c & 0xff0000) >> 8) | (c & 0xff0000 >> 16) }; - - context = gtk_widget_get_pango_context(current_widget); - layout = pango_layout_new(context); - pango_layout_set_font_description(layout, - (const PangoFontDescription *) font->id); - pango_layout_set_text(layout, text, length); - - line = pango_layout_get_line(layout, 0); - - gdk_draw_layout_line_with_colors(current_drawable, current_gc, - x, y, line, &colour, 0); - - g_object_unref(layout); - - return true; + return nsfont_paint(style, text, length, x, y, c); } diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index c02a7cae4..b531b72c7 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -50,8 +50,6 @@ static gboolean gui_window_motion_notify_event(GtkWidget *widget, GdkEventMotion *event, gpointer data); static gboolean gui_window_button_press_event(GtkWidget *widget, GdkEventButton *event, gpointer data); -static void html_redraw_box(struct content *content, struct box *box, - int x, int y); struct gui_window *gui_create_browser_window(struct browser_window *bw, |