Attachment 55155 Details for Bug 130159

[patch] Patch against gtk+ 2.8.6

gtk+-2.8.6-speedup-fontsel.diff (text/plain), 5.43 KB, created by Zhe Su on 2005-10-22 16:12:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhe Su

Created: 2005-10-22 16:12:31 UTC

Size: 5.43 KB

patch

obsolete

>--- gtk/gtkfontsel.c.old	2005-10-22 13:31:09.000000000 +0800
>+++ gtk/gtkfontsel.c	2005-10-22 23:34:41.000000000 +0800
>@@ -591,11 +591,24 @@
> gtk_font_selection_finalize (GObject *object)
> {
>   GtkFontSelection *fontsel;
>+  guint selection_timeout;
>   
>   g_return_if_fail (GTK_IS_FONT_SELECTION (object));
>   
>   fontsel = GTK_FONT_SELECTION (object);
> 
>+  selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "font-selection-timeout"));
>+  if (selection_timeout)
>+    g_source_remove (selection_timeout);
>+
>+  selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "style-selection-timeout"));
>+  if (selection_timeout)
>+    g_source_remove (selection_timeout);
>+
>+  selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "size-selection-timeout"));
>+  if (selection_timeout)
>+    g_source_remove (selection_timeout);
>+
>   if (fontsel->font)
>     gdk_font_unref (fontsel->font);
>   
>@@ -674,16 +687,19 @@
> }
> 
> /* This is called when a family is selected in the list. */
>-static void
>-gtk_font_selection_select_font (GtkTreeSelection *selection,
>-				gpointer          data)
>+static gboolean
>+gtk_font_selection_real_select_font (gpointer data)
> {
>+  GtkTreeSelection *selection;
>   GtkFontSelection *fontsel;
>   GtkTreeModel *model;
>   GtkTreeIter iter;
>   const gchar *family_name;
>   
>+  GDK_THREADS_ENTER ();
>+
>   fontsel = GTK_FONT_SELECTION (data);
>+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->family_list));
> 
>   if (gtk_tree_selection_get_selected (selection, &model, &iter))
>     {
>@@ -706,6 +722,30 @@
> 
>       g_object_unref (family);
>     }
>+
>+  g_object_set_data (G_OBJECT (fontsel), "font-selection-timeout", GUINT_TO_POINTER (0));
>+
>+  GDK_THREADS_LEAVE ();
>+
>+  /* Remove ourselves */
>+  return FALSE;
>+}
>+
>+static void
>+gtk_font_selection_select_font (GtkTreeSelection *selection,
>+				gpointer          data)
>+{
>+  GtkFontSelection *fontsel;
>+  guint selection_timeout = 0;
>+
>+  fontsel = GTK_FONT_SELECTION (data);
>+  selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "font-selection-timeout"));
>+
>+  if (selection_timeout)
>+    g_source_remove (selection_timeout);
>+
>+  selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_font, data);
>+  g_object_set_data (G_OBJECT (fontsel), "font-selection-timeout", GUINT_TO_POINTER (selection_timeout));
> }
> 
> static int
>@@ -908,14 +948,19 @@
> 
> 
> /* This is called when a style is selected in the list. */
>-static void
>-gtk_font_selection_select_style (GtkTreeSelection *selection,
>-				 gpointer          data)
>+static gboolean
>+gtk_font_selection_real_select_style (gpointer data)
> {
>-  GtkFontSelection *fontsel = GTK_FONT_SELECTION (data);
>+  GtkTreeSelection *selection;
>+  GtkFontSelection *fontsel;
>   GtkTreeModel *model;
>   GtkTreeIter iter;
>   
>+  GDK_THREADS_ENTER ();
>+
>+  fontsel = GTK_FONT_SELECTION (data);
>+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->face_list));
>+
>   if (gtk_tree_selection_get_selected (selection, &model, &iter))
>     {
>       PangoFontFace *face;
>@@ -928,6 +973,30 @@
> 
>   gtk_font_selection_show_available_sizes (fontsel, FALSE);
>   gtk_font_selection_select_best_size (fontsel);
>+
>+  g_object_set_data (G_OBJECT (fontsel), "style-selection-timeout", GUINT_TO_POINTER (0));
>+
>+  GDK_THREADS_LEAVE ();
>+
>+  /* Remove ourselves */
>+  return FALSE;
>+}
>+
>+static void
>+gtk_font_selection_select_style (GtkTreeSelection *selection,
>+				 gpointer          data)
>+{
>+  GtkFontSelection *fontsel;
>+  guint selection_timeout = 0;
>+
>+  fontsel = GTK_FONT_SELECTION (data);
>+  selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "style-selection-timeout"));
>+
>+  if (selection_timeout)
>+    g_source_remove (selection_timeout);
>+
>+  selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_style, data);
>+  g_object_set_data (G_OBJECT (fontsel), "style-selection-timeout", GUINT_TO_POINTER (selection_timeout));
> }
> 
> static void
>@@ -1062,22 +1131,49 @@
> }
> 
> /* This is called when a size is selected in the list. */
>-static void
>-gtk_font_selection_select_size (GtkTreeSelection *selection,
>-				gpointer          data)
>+static gboolean
>+gtk_font_selection_real_select_size (gpointer data)
> {
>+  GtkTreeSelection *selection;
>   GtkFontSelection *fontsel;
>   GtkTreeModel *model;
>   GtkTreeIter iter;
>   gint new_size;
>   
>+  GDK_THREADS_ENTER ();
>+
>   fontsel = GTK_FONT_SELECTION (data);
>-  
>+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (fontsel->size_list));
>+
>   if (gtk_tree_selection_get_selected (selection, &model, &iter))
>     {
>       gtk_tree_model_get (model, &iter, SIZE_COLUMN, &new_size, -1);
>       gtk_font_selection_set_size (fontsel, new_size * PANGO_SCALE);
>     }
>+
>+  g_object_set_data (G_OBJECT (fontsel), "size-selection-timeout", GUINT_TO_POINTER (0));
>+
>+  GDK_THREADS_LEAVE ();
>+
>+  /* Remove ourselves */
>+  return FALSE;
>+}
>+
>+static void
>+gtk_font_selection_select_size (GtkTreeSelection *selection,
>+				gpointer          data)
>+{
>+  GtkFontSelection *fontsel;
>+  guint selection_timeout = 0;
>+
>+  fontsel = GTK_FONT_SELECTION (data);
>+  selection_timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (fontsel), "size-selection-timeout"));
>+
>+  if (selection_timeout)
>+    g_source_remove (selection_timeout);
>+
>+  selection_timeout = g_timeout_add (200, gtk_font_selection_real_select_size, data);
>+  g_object_set_data (G_OBJECT (fontsel), "size-selection-timeout", GUINT_TO_POINTER (selection_timeout));
> }
> 
> static void

Actions: View | Diff

Attachments on bug 130159: 55155