]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkfilefilter.c
GtkWindow: Add gtk_window_has_group()
[~andy/gtk] / gtk / gtkfilefilter.c
index bd47bd7885b61a70fc181554c3780d43fe8d6fef..f64c5761bfcef110aee3b3e4446b2abbd804da18 100644 (file)
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
 #include <string.h>
 
 #include "gtkfilefilter.h"
-#include "gtkobject.h"
+#include "gtkintl.h"
+#include "gtkprivate.h"
+
+#include "gtkalias.h"
 
 typedef struct _GtkFileFilterClass GtkFileFilterClass;
 typedef struct _FilterRule FilterRule;
@@ -33,7 +37,8 @@ typedef struct _FilterRule FilterRule;
 typedef enum {
   FILTER_RULE_PATTERN,
   FILTER_RULE_MIME_TYPE,
-  FILTER_RULE_CUSTOM,
+  FILTER_RULE_PIXBUF_FORMATS,
+  FILTER_RULE_CUSTOM
 } FilterRuleType;
 
 struct _GtkFileFilterClass
@@ -59,6 +64,7 @@ struct _FilterRule
   union {
     gchar *pattern;
     gchar *mime_type;
+    GSList *pixbuf_formats;
     struct {
       GtkFileFilterFunc func;
       gpointer data;
@@ -67,36 +73,14 @@ struct _FilterRule
   } u;
 };
 
-static void gtk_file_filter_class_init (GtkFileFilterClass *class);
 static void gtk_file_filter_finalize   (GObject            *object);
 
-static GObjectClass *parent_class;
-
-GType
-gtk_file_filter_get_type (void)
-{
-  static GType file_filter_type = 0;
 
-  if (!file_filter_type)
-    {
-      static const GTypeInfo file_filter_info =
-      {
-       sizeof (GtkFileFilterClass),
-       NULL,           /* base_init */
-       NULL,           /* base_finalize */
-       (GClassInitFunc) gtk_file_filter_class_init,
-       NULL,           /* class_finalize */
-       NULL,           /* class_data */
-       sizeof (GtkFileFilter),
-       0,              /* n_preallocs */
-       NULL            /* init */
-      };
-      
-      file_filter_type = g_type_register_static (GTK_TYPE_OBJECT, "GtkFileFilter",
-                                                &file_filter_info, 0);
-    }
+G_DEFINE_TYPE (GtkFileFilter, gtk_file_filter, GTK_TYPE_OBJECT)
 
-  return file_filter_type;
+static void
+gtk_file_filter_init (GtkFileFilter *object)
+{
 }
 
 static void
@@ -104,8 +88,6 @@ gtk_file_filter_class_init (GtkFileFilterClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
 
-  parent_class = g_type_class_peek_parent (class);
-
   gobject_class->finalize = gtk_file_filter_finalize;
 }
 
@@ -124,19 +106,27 @@ filter_rule_free (FilterRule *rule)
       if (rule->u.custom.notify)
        rule->u.custom.notify (rule->u.custom.data);
       break;
+    case FILTER_RULE_PIXBUF_FORMATS:
+      g_slist_free (rule->u.pixbuf_formats);
+      break;
+    default:
+      g_assert_not_reached ();
     }
 
-  g_free (rule);
+  g_slice_free (FilterRule, rule);
 }
 
 static void
 gtk_file_filter_finalize (GObject  *object)
 {
-  GtkFileFilter *filter = GTK_FILE_FILTER (filter);
+  GtkFileFilter *filter = GTK_FILE_FILTER (object);
 
   g_slist_foreach (filter->rules, (GFunc)filter_rule_free, NULL);
+  g_slist_free (filter->rules);
 
-  parent_class->finalize (object);
+  g_free (filter->name);
+
+  G_OBJECT_CLASS (gtk_file_filter_parent_class)->finalize (object);
 }
 
 /**
@@ -148,13 +138,14 @@ gtk_file_filter_finalize (GObject  *object)
  * gtk_file_filter_add_mime_type(), gtk_file_filter_add_pattern(),
  * or gtk_file_filter_add_custom(). To create a filter
  * that accepts any file, use:
- *
- * <informalexample><programlisting>
+ * |[
  * GtkFileFilter *filter = gtk_file_filter_new ();
  * gtk_file_filter_add_pattern (filter, "*");
- * </programlisting></informalexample>
+ * ]|
  * 
  * Return value: a new #GtkFileFilter
+ * 
+ * Since: 2.4
  **/
 GtkFileFilter *
 gtk_file_filter_new (void)
@@ -165,12 +156,14 @@ gtk_file_filter_new (void)
 /**
  * gtk_file_filter_set_name:
  * @filter: a #GtkFileFilter
- * @name: the human-readable-name for the filter, or %NULL
+ * @name: (allow-none): the human-readable-name for the filter, or %NULL
  *   to remove any existing name.
  * 
  * Sets the human-readable name of the filter; this is the string
  * that will be displayed in the file selector user interface if
  * there is a selectable list of filters.
+ * 
+ * Since: 2.4
  **/
 void
 gtk_file_filter_set_name (GtkFileFilter *filter,
@@ -178,8 +171,7 @@ gtk_file_filter_set_name (GtkFileFilter *filter,
 {
   g_return_if_fail (GTK_IS_FILE_FILTER (filter));
   
-  if (filter->name)
-    g_free (filter->name);
+  g_free (filter->name);
 
   filter->name = g_strdup (name);
 }
@@ -193,6 +185,8 @@ gtk_file_filter_set_name (GtkFileFilter *filter,
  * Return value: The human-readable name of the filter,
  *   or %NULL. This value is owned by GTK+ and must not
  *   be modified or freed.
+ * 
+ * Since: 2.4
  **/
 G_CONST_RETURN gchar *
 gtk_file_filter_get_name (GtkFileFilter *filter)
@@ -216,6 +210,8 @@ file_filter_add_rule (GtkFileFilter *filter,
  * @mime_type: name of a MIME type
  * 
  * Adds a rule allowing a given mime type to @filter.
+ * 
+ * Since: 2.4
  **/
 void
 gtk_file_filter_add_mime_type (GtkFileFilter *filter,
@@ -226,7 +222,7 @@ gtk_file_filter_add_mime_type (GtkFileFilter *filter,
   g_return_if_fail (GTK_IS_FILE_FILTER (filter));
   g_return_if_fail (mime_type != NULL);
 
-  rule = g_new (FilterRule, 1);
+  rule = g_slice_new (FilterRule);
   rule->type = FILTER_RULE_MIME_TYPE;
   rule->needed = GTK_FILE_FILTER_MIME_TYPE;
   rule->u.mime_type = g_strdup (mime_type);
@@ -240,6 +236,8 @@ gtk_file_filter_add_mime_type (GtkFileFilter *filter,
  * @pattern: a shell style glob
  * 
  * Adds a rule allowing a shell style glob to a filter.
+ * 
+ * Since: 2.4
  **/
 void
 gtk_file_filter_add_pattern (GtkFileFilter *filter,
@@ -250,7 +248,7 @@ gtk_file_filter_add_pattern (GtkFileFilter *filter,
   g_return_if_fail (GTK_IS_FILE_FILTER (filter));
   g_return_if_fail (pattern != NULL);
 
-  rule = g_new (FilterRule, 1);
+  rule = g_slice_new (FilterRule);
   rule->type = FILTER_RULE_PATTERN;
   rule->needed = GTK_FILE_FILTER_DISPLAY_NAME;
   rule->u.pattern = g_strdup (pattern);
@@ -258,6 +256,30 @@ gtk_file_filter_add_pattern (GtkFileFilter *filter,
   file_filter_add_rule (filter, rule);
 }
 
+/**
+ * gtk_file_filter_add_pixbuf_formats:
+ * @filter: a #GtkFileFilter
+ * 
+ * Adds a rule allowing image files in the formats supported
+ * by GdkPixbuf.
+ * 
+ * Since: 2.6
+ **/
+void
+gtk_file_filter_add_pixbuf_formats (GtkFileFilter *filter)
+{
+  FilterRule *rule;
+  
+  g_return_if_fail (GTK_IS_FILE_FILTER (filter));
+
+  rule = g_slice_new (FilterRule);
+  rule->type = FILTER_RULE_PIXBUF_FORMATS;
+  rule->needed = GTK_FILE_FILTER_MIME_TYPE;
+  rule->u.pixbuf_formats = gdk_pixbuf_get_formats ();
+  file_filter_add_rule (filter, rule);
+}
+
+
 /**
  * gtk_file_filter_add_custom:
  * @filter: a #GtkFileFilter
@@ -273,6 +295,8 @@ gtk_file_filter_add_pattern (GtkFileFilter *filter,
  * about what sorts of information that the filter function needs;
  * this allows GTK+ to avoid retrieving expensive information when
  * it isn't needed by the filter.
+ * 
+ * Since: 2.4
  **/
 void
 gtk_file_filter_add_custom (GtkFileFilter         *filter,
@@ -286,7 +310,7 @@ gtk_file_filter_add_custom (GtkFileFilter         *filter,
   g_return_if_fail (GTK_IS_FILE_FILTER (filter));
   g_return_if_fail (func != NULL);
 
-  rule = g_new (FilterRule, 1);
+  rule = g_slice_new (FilterRule);
   rule->type = FILTER_RULE_CUSTOM;
   rule->needed = needed;
   rule->u.custom.func = func;
@@ -309,6 +333,8 @@ gtk_file_filter_add_custom (GtkFileFilter         *filter,
  * 
  * Return value: bitfield of flags indicating needed fields when
  *   calling gtk_file_filter_filter()
+ * 
+ * Since: 2.4
  **/
 GtkFileFilterFlags
 gtk_file_filter_get_needed (GtkFileFilter *filter)
@@ -324,13 +350,15 @@ gtk_file_filter_get_needed (GtkFileFilter *filter)
  * 
  * Tests whether a file should be displayed according to @filter.
  * The #GtkFileFilterInfo structure @filter_info should include
- * the fields returned feom gtk_file_filter_get_needed().
+ * the fields returned from gtk_file_filter_get_needed().
  *
  * This function will not typically be used by applications; it
  * is intended principally for use in the implementation of
  * #GtkFileChooser.
  * 
  * Return value: %TRUE if the file should be displayed
+ * 
+ * Since: 2.4
  **/
 gboolean
 gtk_file_filter_filter (GtkFileFilter           *filter,
@@ -348,14 +376,42 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
       switch (rule->type)
        {
        case FILTER_RULE_MIME_TYPE:
-         if (filter_info->mime_type != NULL
-             && strcmp (rule->u.mime_type, filter_info->mime_type) == 0)
+         if (filter_info->mime_type != NULL &&
+              g_content_type_is_a (filter_info->mime_type, rule->u.mime_type))
            return TRUE;
          break;
        case FILTER_RULE_PATTERN:
-         if (_gtk_fnmatch (rule->u.pattern, filter_info->display_name))
+         if (filter_info->display_name != NULL &&
+             _gtk_fnmatch (rule->u.pattern, filter_info->display_name, FALSE))
            return TRUE;
          break;
+       case FILTER_RULE_PIXBUF_FORMATS:
+         {
+           GSList *list;
+
+           if (!filter_info->mime_type)
+             break;
+
+           for (list = rule->u.pixbuf_formats; list; list = list->next)
+             {
+               int i;
+               gchar **mime_types;
+
+               mime_types = gdk_pixbuf_format_get_mime_types (list->data);
+
+               for (i = 0; mime_types[i] != NULL; i++)
+                 {
+                   if (strcmp (mime_types[i], filter_info->mime_type) == 0)
+                     {
+                       g_strfreev (mime_types);
+                       return TRUE;
+                     }
+                 }
+
+               g_strfreev (mime_types);
+             }
+           break;
+         }
        case FILTER_RULE_CUSTOM:
          if (rule->u.custom.func (filter_info, rule->u.custom.data))
            return TRUE;
@@ -365,3 +421,6 @@ gtk_file_filter_filter (GtkFileFilter           *filter,
 
   return FALSE;
 }
+
+#define __GTK_FILE_FILTER_C__
+#include "gtkaliasdef.c"