summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-09-19 13:19:28 +0000
committerMatthias Clasen <mclasen@redhat.com>2020-09-19 13:19:28 +0000
commit7b2c4fdb6acf0c3a85a5b458cca335e98826b243 (patch)
tree3cb92881def5eb87432f5dd49661cb73f922dcfe
parentcfd1520a9f41804834f94dc8a486473145a7b3f6 (diff)
parent6b9622f0dabf42661a1acc09d8f5041e75edfd9d (diff)
downloadgtk+-7b2c4fdb6acf0c3a85a5b458cca335e98826b243.tar.gz
Merge branch 'font-chooser-sample-text' into 'master'
fontchooser: Determine sample text intelligently See merge request GNOME/gtk!2546
-rw-r--r--.gitlab-ci/test-msys2.sh2
-rw-r--r--gtk/gtkfontchooserwidget.c130
-rw-r--r--meson.build2
3 files changed, 131 insertions, 3 deletions
diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh
index 1298ab659a..d311f4bbe7 100644
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -48,7 +48,7 @@ if ! pkg-config --atleast-version=2.65.0 glib-2.0; then
fi
pkg-config --modversion glib-2.0
-if ! pkg-config --atleast-version=1.45.4 pango; then
+if ! pkg-config --atleast-version=1.47.0 pango; then
git clone https://gitlab.gnome.org/GNOME/pango.git _pango
meson setup _pango_build _pango
meson compile -C _pango_build
diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
index b3dfa9b348..9be3d33cd2 100644
--- a/gtk/gtkfontchooserwidget.c
+++ b/gtk/gtkfontchooserwidget.c
@@ -58,6 +58,9 @@
#include "gtkmaplistmodel.h"
#include <hb-ot.h>
+#if defined(HAVE_PANGOFT) && defined(HAVE_HARFBUZZ)
+#include <pango/pangofc-font.h>
+#endif
#include "language-names.h"
#include "script-names.h"
@@ -108,6 +111,7 @@ struct _GtkFontChooserWidget
GtkWidget *font_name_label;
char *preview_text;
gboolean show_preview_entry;
+ gboolean preview_text_set;
GtkWidget *size_label;
GtkWidget *size_spin;
@@ -210,6 +214,7 @@ gtk_font_chooser_widget_set_property (GObject *object,
break;
case GTK_FONT_CHOOSER_PROP_PREVIEW_TEXT:
gtk_font_chooser_widget_set_preview_text (fontchooser, g_value_get_string (value));
+ fontchooser->preview_text_set = TRUE;
break;
case GTK_FONT_CHOOSER_PROP_SHOW_PREVIEW_ENTRY:
gtk_font_chooser_widget_set_show_preview_entry (fontchooser, g_value_get_boolean (value));
@@ -433,6 +438,123 @@ resize_by_scroll_cb (GtkEventControllerScroll *controller,
}
static void
+maybe_update_preview_text (GtkFontChooserWidget *self,
+ PangoFontFace *face,
+ PangoFontDescription *desc)
+{
+#if defined(HAVE_PANGOFT) && defined(HAVE_HARFBUZZ)
+ PangoContext *context;
+ PangoFont *font;
+ const char *sample;
+
+ /* If the user has typed text into the entry, we don't touch it */
+ if (self->preview_text_set)
+ return;
+
+ /* We do the work only once, and cache the result on the PangoFontFace */
+ sample = (const char *)g_object_get_data (G_OBJECT (face), "gtk-sample-text");
+ if (sample)
+ {
+ gtk_font_chooser_widget_set_preview_text (self, sample);
+ return;
+ }
+
+ context = gtk_widget_get_pango_context (GTK_WIDGET (self));
+ font = pango_context_load_font (context, desc);
+
+ if (PANGO_IS_FC_FONT (font))
+ {
+ PangoLanguage **languages;
+ GHashTable *langs = NULL;
+ PangoLanguage *default_lang;
+ PangoLanguage *alt_default = NULL;
+ PangoLanguage *lang = NULL;
+ int i;
+ const char *p;
+
+ default_lang = pango_language_get_default ();
+ p = pango_language_to_string (default_lang);
+
+ /* The default language tends to be of the form en-us.
+ * Since fontconfig languages just have the language part,
+ * and we want to use direct pointer comparisons, we need
+ * an PangoLanguage for the shortened default language.
+ */
+ if (strchr (p, '-'))
+ {
+ char q[10];
+ for (i = 0; p[i] != '-' && i < 9; i++)
+ q[i] = p[i];
+ q[i] = '\0';
+ alt_default = pango_language_from_string (q);
+ }
+
+ languages = pango_fc_font_get_languages (PANGO_FC_FONT (font));
+
+ /* If the font supports the default language, just use it. */
+ for (i = 0; languages[i]; i++)
+ {
+ if (languages[i] == default_lang || languages[i] == alt_default)
+ {
+ lang = default_lang;
+ goto found;
+ }
+ }
+
+ /* Otherwise, we make a list of representative languages */
+ langs = g_hash_table_new (NULL, NULL);
+
+ for (i = 0; languages[i]; i++)
+ {
+ const PangoScript *scripts;
+ int num, j;
+
+ scripts = pango_language_get_scripts (languages[i], &num);
+ for (j = 0; j < num; j++)
+ {
+ lang = pango_script_get_sample_language (scripts[j]);
+ if (lang)
+ g_hash_table_add (langs, lang);
+ }
+ }
+
+ /* ... and compare it to the users default and preferred languages */
+ if (g_hash_table_contains (langs, default_lang) ||
+ g_hash_table_contains (langs, alt_default))
+ {
+ lang = default_lang;
+ }
+ else
+ {
+ PangoLanguage **preferred;
+
+ preferred = pango_language_get_preferred ();
+ if (preferred)
+ {
+ for (i = 0; preferred[i]; i++)
+ {
+ if (g_hash_table_contains (langs, preferred[i]))
+ {
+ lang = preferred[i];
+ break;
+ }
+ }
+ }
+ }
+ g_hash_table_unref (langs);
+
+found:
+ sample = pango_language_get_sample_string (lang);
+ gtk_font_chooser_widget_set_preview_text (self, sample);
+ g_object_set_data (G_OBJECT (face), "gtk-sample-text", (gpointer)sample);
+ }
+
+ g_object_unref (font);
+#endif
+}
+
+
+static void
selection_changed_cb (GtkSingleSelection *selection,
GParamSpec *pspec,
GtkFontChooserWidget *self)
@@ -452,8 +574,11 @@ selection_changed_cb (GtkSingleSelection *selection,
desc = pango_font_face_describe (face);
pango_font_description_set_variations (self->font_desc, NULL);
gtk_font_chooser_widget_merge_font_desc (self, desc);
- pango_font_description_free (desc);
g_simple_action_set_enabled (G_SIMPLE_ACTION (self->tweak_action), TRUE);
+
+ maybe_update_preview_text (self, face, desc);
+
+ pango_font_description_free (desc);
}
else
{
@@ -1933,6 +2058,9 @@ static void
gtk_font_chooser_widget_set_preview_text (GtkFontChooserWidget *fontchooser,
const char *text)
{
+ if (fontchooser->preview_text == text)
+ return;
+
g_free (fontchooser->preview_text);
fontchooser->preview_text = g_strdup (text);
diff --git a/meson.build b/meson.build
index 2e9354f847..713c2f5475 100644
--- a/meson.build
+++ b/meson.build
@@ -23,7 +23,7 @@ else
endif
glib_req = '>= @0@.@1@.@2@'.format(glib_major_req, glib_minor_req, glib_micro_req)
-pango_req = '>= 1.45.5'
+pango_req = '>= 1.47.0' # keep this in sync with .gitlab-ci/test-msys.sh
fribidi_req = '>= 0.19.7'
cairo_req = '>= 1.14.0'
gdk_pixbuf_req = '>= 2.30.0'