diff options
Diffstat (limited to 'gdk/gdkfont.c')
| -rw-r--r-- | gdk/gdkfont.c | 691 |
1 files changed, 13 insertions, 678 deletions
diff --git a/gdk/gdkfont.c b/gdk/gdkfont.c index a3a3502fba..9c051383ef 100644 --- a/gdk/gdkfont.c +++ b/gdk/gdkfont.c @@ -24,179 +24,9 @@ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. */ -#include <X11/Xlib.h> -#include <X11/Xos.h> #include "gdkfont.h" #include "gdkprivate.h" -static GHashTable *font_name_hash = NULL; -static GHashTable *fontset_name_hash = NULL; - -static void -gdk_font_hash_insert (GdkFontType type, GdkFont *font, const gchar *font_name) -{ - GdkFontPrivate *private = (GdkFontPrivate *)font; - GHashTable **hashp = (type == GDK_FONT_FONT) ? - &font_name_hash : &fontset_name_hash; - - if (!*hashp) - *hashp = g_hash_table_new (g_str_hash, g_str_equal); - - private->names = g_slist_prepend (private->names, g_strdup (font_name)); - g_hash_table_insert (*hashp, private->names->data, font); -} - -static void -gdk_font_hash_remove (GdkFontType type, GdkFont *font) -{ - GdkFontPrivate *private = (GdkFontPrivate *)font; - GSList *tmp_list; - GHashTable *hash = (type == GDK_FONT_FONT) ? - font_name_hash : fontset_name_hash; - - tmp_list = private->names; - while (tmp_list) - { - g_hash_table_remove (hash, tmp_list->data); - g_free (tmp_list->data); - - tmp_list = tmp_list->next; - } - - g_slist_free (private->names); - private->names = NULL; -} - -static GdkFont * -gdk_font_hash_lookup (GdkFontType type, const gchar *font_name) -{ - GdkFont *result; - GHashTable *hash = (type == GDK_FONT_FONT) ? - font_name_hash : fontset_name_hash; - - if (!hash) - return NULL; - else - { - result = g_hash_table_lookup (hash, font_name); - if (result) - gdk_font_ref (result); - - return result; - } -} - -GdkFont* -gdk_font_load (const gchar *font_name) -{ - GdkFont *font; - GdkFontPrivate *private; - XFontStruct *xfont; - - g_return_val_if_fail (font_name != NULL, NULL); - - font = gdk_font_hash_lookup (GDK_FONT_FONT, font_name); - if (font) - return font; - - xfont = XLoadQueryFont (gdk_display, font_name); - if (xfont == NULL) - return NULL; - - font = gdk_font_lookup (xfont->fid); - if (font != NULL) - { - private = (GdkFontPrivate *) font; - if (xfont != private->xfont) - XFreeFont (gdk_display, xfont); - - gdk_font_ref (font); - } - else - { - private = g_new (GdkFontPrivate, 1); - private->xdisplay = gdk_display; - private->xfont = xfont; - private->ref_count = 1; - private->names = NULL; - - font = (GdkFont*) private; - font->type = GDK_FONT_FONT; - font->ascent = xfont->ascent; - font->descent = xfont->descent; - - gdk_xid_table_insert (&xfont->fid, font); - } - - gdk_font_hash_insert (GDK_FONT_FONT, font, font_name); - - return font; -} - -GdkFont* -gdk_fontset_load (gchar *fontset_name) -{ - GdkFont *font; - GdkFontPrivate *private; - XFontSet fontset; - gint missing_charset_count; - gchar **missing_charset_list; - gchar *def_string; - - font = gdk_font_hash_lookup (GDK_FONT_FONTSET, fontset_name); - if (font) - return font; - - private = g_new (GdkFontPrivate, 1); - font = (GdkFont*) private; - - private->xdisplay = gdk_display; - fontset = XCreateFontSet (gdk_display, fontset_name, - &missing_charset_list, &missing_charset_count, - &def_string); - - if (missing_charset_count) - { - gint i; - g_warning ("Missing charsets in FontSet creation\n"); - for (i=0;i<missing_charset_count;i++) - g_warning (" %s\n", missing_charset_list[i]); - XFreeStringList (missing_charset_list); - } - - private->ref_count = 1; - - if (!fontset) - { - g_free (font); - return NULL; - } - else - { - gint num_fonts; - gint i; - XFontStruct **font_structs; - gchar **font_names; - - private->xfont = fontset; - font->type = GDK_FONT_FONTSET; - num_fonts = XFontsOfFontSet (fontset, &font_structs, &font_names); - - font->ascent = font->descent = 0; - - for (i = 0; i < num_fonts; i++) - { - font->ascent = MAX (font->ascent, font_structs[i]->ascent); - font->descent = MAX (font->descent, font_structs[i]->descent); - } - - private->names = NULL; - gdk_font_hash_insert (GDK_FONT_FONTSET, font, fontset_name); - - return font; - } -} - GdkFont* gdk_font_ref (GdkFont *font) { @@ -220,304 +50,35 @@ gdk_font_unref (GdkFont *font) private->ref_count -= 1; if (private->ref_count == 0) - { - gdk_font_hash_remove (font->type, font); - - switch (font->type) - { - case GDK_FONT_FONT: - gdk_xid_table_remove (((XFontStruct *) private->xfont)->fid); - XFreeFont (private->xdisplay, (XFontStruct *) private->xfont); - break; - case GDK_FONT_FONTSET: - XFreeFontSet (private->xdisplay, (XFontSet) private->xfont); - break; - default: - g_error ("unknown font type."); - break; - } - g_free (font); - } -} - -gint -gdk_font_id (const GdkFont *font) -{ - const GdkFontPrivate *font_private; - - g_return_val_if_fail (font != NULL, 0); - - font_private = (const GdkFontPrivate*) font; - - if (font->type == GDK_FONT_FONT) - { - return ((XFontStruct *) font_private->xfont)->fid; - } - else - { - return 0; - } -} - -gint -gdk_font_equal (const GdkFont *fonta, - const GdkFont *fontb) -{ - const GdkFontPrivate *privatea; - const GdkFontPrivate *privateb; - - g_return_val_if_fail (fonta != NULL, FALSE); - g_return_val_if_fail (fontb != NULL, FALSE); - - privatea = (const GdkFontPrivate*) fonta; - privateb = (const GdkFontPrivate*) fontb; - - if (fonta->type == GDK_FONT_FONT && fontb->type == GDK_FONT_FONT) - { - return (((XFontStruct *) privatea->xfont)->fid == - ((XFontStruct *) privateb->xfont)->fid); - } - else if (fonta->type == GDK_FONT_FONTSET && fontb->type == GDK_FONT_FONTSET) - { - gchar *namea, *nameb; - - namea = XBaseFontNameListOfFontSet((XFontSet) privatea->xfont); - nameb = XBaseFontNameListOfFontSet((XFontSet) privateb->xfont); - - return (strcmp(namea, nameb) == 0); - } - else - /* fontset != font */ - return 0; + _gdk_font_destroy (font); } gint gdk_string_width (GdkFont *font, const gchar *string) { - GdkFontPrivate *font_private; - gint width; - XFontStruct *xfont; - XFontSet fontset; - g_return_val_if_fail (font != NULL, -1); g_return_val_if_fail (string != NULL, -1); - font_private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - xfont = (XFontStruct *) font_private->xfont; - if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) - { - width = XTextWidth (xfont, string, strlen (string)); - } - else - { - width = XTextWidth16 (xfont, (XChar2b *) string, strlen (string) / 2); - } - break; - case GDK_FONT_FONTSET: - fontset = (XFontSet) font_private->xfont; - width = XmbTextEscapement (fontset, string, strlen(string)); - break; - default: - width = 0; - } - - return width; -} - -gint -gdk_text_width (GdkFont *font, - const gchar *text, - gint text_length) -{ - GdkFontPrivate *private; - gint width; - XFontStruct *xfont; - XFontSet fontset; - - g_return_val_if_fail (font != NULL, -1); - g_return_val_if_fail (text != NULL, -1); - - private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) - { - width = XTextWidth (xfont, text, text_length); - } - else - { - width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2); - } - break; - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, text, text_length); - break; - default: - width = 0; - } - return width; + return gdk_text_width (font, string, _gdk_font_strlen (font, string)); } gint -gdk_text_width_wc (GdkFont *font, - const GdkWChar *text, - gint text_length) -{ - GdkFontPrivate *private; - gint width; - XFontStruct *xfont; - XFontSet fontset; - - g_return_val_if_fail (font != NULL, -1); - g_return_val_if_fail (text != NULL, -1); - - private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) - { - gchar *text_8bit; - gint i; - text_8bit = g_new (gchar, text_length); - for (i=0; i<text_length; i++) text_8bit[i] = text[i]; - width = XTextWidth (xfont, text_8bit, text_length); - g_free (text_8bit); - } - else - { - width = 0; - } - break; - case GDK_FONT_FONTSET: - if (sizeof(GdkWChar) == sizeof(wchar_t)) - { - fontset = (XFontSet) private->xfont; - width = XwcTextEscapement (fontset, (wchar_t *)text, text_length); - } - else - { - wchar_t *text_wchar; - gint i; - fontset = (XFontSet) private->xfont; - text_wchar = g_new(wchar_t, text_length); - for (i=0; i<text_length; i++) text_wchar[i] = text[i]; - width = XwcTextEscapement (fontset, text_wchar, text_length); - g_free (text_wchar); - } - break; - default: - width = 0; - } - return width; -} - -/* Problem: What if a character is a 16 bits character ?? */ -gint gdk_char_width (GdkFont *font, gchar character) { - GdkFontPrivate *private; - XCharStruct *chars; - gint width; - guint ch = character & 0xff; /* get rid of sign-extension */ - XFontStruct *xfont; - XFontSet fontset; - g_return_val_if_fail (font != NULL, -1); - private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - /* only 8 bits characters are considered here */ - xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && - (xfont->max_byte1 == 0) && - (ch >= xfont->min_char_or_byte2) && - (ch <= xfont->max_char_or_byte2)) - { - chars = xfont->per_char; - if (chars) - width = chars[ch - xfont->min_char_or_byte2].width; - else - width = xfont->min_bounds.width; - } - else - { - width = XTextWidth (xfont, &character, 1); - } - break; - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - width = XmbTextEscapement (fontset, &character, 1) ; - break; - default: - width = 0; - } - return width; + return gdk_text_width (font, &character, 1); } gint gdk_char_width_wc (GdkFont *font, GdkWChar character) { - GdkFontPrivate *private; - XCharStruct *chars; - gint width; - guint ch = character & 0xff; /* get rid of sign-extension */ - XFontStruct *xfont; - XFontSet fontset; - g_return_val_if_fail (font != NULL, -1); - private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - /* only 8 bits characters are considered here */ - xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && - (xfont->max_byte1 == 0) && - (ch >= xfont->min_char_or_byte2) && - (ch <= xfont->max_char_or_byte2)) - { - chars = xfont->per_char; - if (chars) - width = chars[ch - xfont->min_char_or_byte2].width; - else - width = xfont->min_bounds.width; - } - else - { - char ch2 = character; - width = XTextWidth (xfont, &ch2, 1); - } - break; - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - { - wchar_t char_wc = character; - width = XwcTextEscapement (fontset, &char_wc, 1) ; - } - break; - default: - width = 0; - } - return width; + return gdk_text_width_wc (font, &character, 1); } gint @@ -527,162 +88,7 @@ gdk_string_measure (GdkFont *font, g_return_val_if_fail (font != NULL, -1); g_return_val_if_fail (string != NULL, -1); - return gdk_text_measure (font, string, strlen (string)); -} - -void -gdk_text_extents (GdkFont *font, - const gchar *text, - gint text_length, - gint *lbearing, - gint *rbearing, - gint *width, - gint *ascent, - gint *descent) -{ - GdkFontPrivate *private; - XCharStruct overall; - XFontStruct *xfont; - XFontSet fontset; - XRectangle ink, logical; - int direction; - int font_ascent; - int font_descent; - - g_return_if_fail (font != NULL); - g_return_if_fail (text != NULL); - - private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) - { - XTextExtents (xfont, text, text_length, - &direction, &font_ascent, &font_descent, - &overall); - } - else - { - XTextExtents16 (xfont, (XChar2b *) text, text_length / 2, - &direction, &font_ascent, &font_descent, - &overall); - } - if (lbearing) - *lbearing = overall.lbearing; - if (rbearing) - *rbearing = overall.rbearing; - if (width) - *width = overall.width; - if (ascent) - *ascent = overall.ascent; - if (descent) - *descent = overall.descent; - break; - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &logical); - if (lbearing) - *lbearing = ink.x; - if (rbearing) - *rbearing = ink.x + ink.width; - if (width) - *width = logical.width; - if (ascent) - *ascent = -ink.y; - if (descent) - *descent = ink.y + ink.height; - break; - } - -} - -void -gdk_text_extents_wc (GdkFont *font, - const GdkWChar *text, - gint text_length, - gint *lbearing, - gint *rbearing, - gint *width, - gint *ascent, - gint *descent) -{ - GdkFontPrivate *private; - XCharStruct overall; - XFontStruct *xfont; - XFontSet fontset; - XRectangle ink, logical; - int direction; - int font_ascent; - int font_descent; - - g_return_if_fail (font != NULL); - g_return_if_fail (text != NULL); - - private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - { - gchar *text_8bit; - gint i; - - xfont = (XFontStruct *) private->xfont; - g_return_if_fail ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)); - - text_8bit = g_new (gchar, text_length); - for (i=0; i<text_length; i++) - text_8bit[i] = text[i]; - - XTextExtents (xfont, text_8bit, text_length, - &direction, &font_ascent, &font_descent, - &overall); - g_free (text_8bit); - - if (lbearing) - *lbearing = overall.lbearing; - if (rbearing) - *rbearing = overall.rbearing; - if (width) - *width = overall.width; - if (ascent) - *ascent = overall.ascent; - if (descent) - *descent = overall.descent; - break; - } - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - - if (sizeof(GdkWChar) == sizeof(wchar_t)) - XwcTextExtents (fontset, (wchar_t *)text, text_length, &ink, &logical); - else - { - wchar_t *text_wchar; - gint i; - - text_wchar = g_new (wchar_t, text_length); - for (i = 0; i < text_length; i++) - text_wchar[i] = text[i]; - XwcTextExtents (fontset, text_wchar, text_length, &ink, &logical); - g_free (text_wchar); - } - if (lbearing) - *lbearing = ink.x; - if (rbearing) - *rbearing = ink.x + ink.width; - if (width) - *width = logical.width; - if (ascent) - *ascent = -ink.y; - if (descent) - *descent = ink.y + ink.height; - break; - } - + return gdk_text_measure (font, string, _gdk_font_strlen (font, string)); } void @@ -697,7 +103,7 @@ gdk_string_extents (GdkFont *font, g_return_if_fail (font != NULL); g_return_if_fail (string != NULL); - gdk_text_extents (font, string, strlen (string), + gdk_text_extents (font, string, _gdk_font_strlen (font, string), lbearing, rbearing, width, ascent, descent); } @@ -707,50 +113,14 @@ gdk_text_measure (GdkFont *font, const gchar *text, gint text_length) { - GdkFontPrivate *private; - XCharStruct overall; - XFontStruct *xfont; - XFontSet fontset; - XRectangle ink, log; - int direction; - int font_ascent; - int font_descent; - gint width; + gint rbearing; g_return_val_if_fail (font != NULL, -1); g_return_val_if_fail (text != NULL, -1); - private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) - { - XTextExtents (xfont, text, text_length, - &direction, &font_ascent, &font_descent, - &overall); - } - else - { - XTextExtents16 (xfont, (XChar2b *) text, text_length / 2, - &direction, &font_ascent, &font_descent, - &overall); - } - width = overall.rbearing; - break; - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &log); - width = ink.x + ink.width; - break; - default: - width = 0; - } - return width; + gdk_text_extents (font, text, text_length, NULL, &rbearing, NULL, NULL, NULL); + return rbearing; } - gint gdk_char_measure (GdkFont *font, gchar character) @@ -767,7 +137,7 @@ gdk_string_height (GdkFont *font, g_return_val_if_fail (font != NULL, -1); g_return_val_if_fail (string != NULL, -1); - return gdk_text_height (font, string, strlen (string)); + return gdk_text_height (font, string, _gdk_font_strlen (font, string)); } gint @@ -775,48 +145,13 @@ gdk_text_height (GdkFont *font, const gchar *text, gint text_length) { - GdkFontPrivate *private; - XCharStruct overall; - XFontStruct *xfont; - XFontSet fontset; - XRectangle ink, log; - int direction; - int font_ascent; - int font_descent; - gint height; + gint ascent, descent; g_return_val_if_fail (font != NULL, -1); g_return_val_if_fail (text != NULL, -1); - private = (GdkFontPrivate*) font; - - switch (font->type) - { - case GDK_FONT_FONT: - xfont = (XFontStruct *) private->xfont; - if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) - { - XTextExtents (xfont, text, text_length, - &direction, &font_ascent, &font_descent, - &overall); - } - else - { - XTextExtents16 (xfont, (XChar2b *) text, text_length / 2, - &direction, &font_ascent, &font_descent, - &overall); - } - height = overall.ascent + overall.descent; - break; - case GDK_FONT_FONTSET: - fontset = (XFontSet) private->xfont; - XmbTextExtents (fontset, text, text_length, &ink, &log); - height = log.height; - break; - default: - height = 0; - } - return height; + gdk_text_extents (font, text, text_length, NULL, NULL, NULL, &ascent, &descent); + return ascent + descent; } gint |