Replace a lot of idle and timeout calls by the new gdk_threads api.

[~andy/gtk] / demos / gtk-demo / pixbufs.c

diff --git a/demos/gtk-demo/pixbufs.c b/demos/gtk-demo/pixbufs.c
index d0f2f2a4efbb359e226ab395f1e8fd645ef34bf5..5fad5aa7f7a84cd0520bf7bd9c2385a07f83a162 100644 (file)
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -12,17 +12,17 @@
  *
  */
 
-#include <config.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <math.h>
 
+#include "demo-common.h"
+
 #define FRAME_DELAY 50
 
-#define RELATIVE_BACKGROUND_NAME "background.jpg"
-#define INSTALLED_BACKGROUND_NAME DEMOCODEDIR"/background.jpg"
+#define BACKGROUND_NAME "background.jpg"
 
-static const char *relative_image_names[] = {
+static const char *image_names[] = {
   "apple-red.png",
   "gnome-applets.png",
   "gnome-calendar.png",
@@ -33,18 +33,7 @@ static const char *relative_image_names[] = {
   "gnu-keys.png"
 };
 
-static const char *installed_image_names[] = {
-  DEMOCODEDIR"/apple-red.png",
-  DEMOCODEDIR"/gnome-applets.png",
-  DEMOCODEDIR"/gnome-calendar.png",
-  DEMOCODEDIR"/gnome-foot.png",
-  DEMOCODEDIR"/gnome-gmush.png",
-  DEMOCODEDIR"/gnome-gimp.png",
-  DEMOCODEDIR"/gnome-gsame.png",
-  DEMOCODEDIR"/gnu-keys.png"
-};
-
-#define N_IMAGES G_N_ELEMENTS (relative_image_names)
+#define N_IMAGES G_N_ELEMENTS (image_names)
 
 /* demo window */
 static GtkWidget *window = NULL;
@@ -67,30 +56,37 @@ static gboolean
 load_pixbufs (GError **error)
 {
   gint i;
-  const gchar **image_names;
+  char *filename;
 
   if (background)
     return TRUE; /* already loaded earlier */
 
-  background = gdk_pixbuf_new_from_file (RELATIVE_BACKGROUND_NAME, NULL);
+  /* demo_find_file() looks in the current directory first,
+   * so you can run gtk-demo without installing GTK, then looks
+   * in the location where the file is installed.
+   */
+  filename = demo_find_file (BACKGROUND_NAME, error);
+  if (!filename)
+    return FALSE; /* note that "error" was filled in and returned */
 
+  background = gdk_pixbuf_new_from_file (filename, error);
+  g_free (filename);
+  
   if (!background)
-    background = gdk_pixbuf_new_from_file (INSTALLED_BACKGROUND_NAME, error);
-
-  if (!background)
-    return FALSE; /* note that "error" was filled in and returned */
+    return FALSE; /* Note that "error" was filled with a GError */
 
   back_width = gdk_pixbuf_get_width (background);
   back_height = gdk_pixbuf_get_height (background);
 
-  if (g_file_test (relative_image_names[0], G_FILE_TEST_EXISTS))
-    image_names = relative_image_names;
-  else
-    image_names = installed_image_names;
-
   for (i = 0; i < N_IMAGES; i++)
     {
-      images[i] = gdk_pixbuf_new_from_file (image_names[i], error);
+      filename = demo_find_file (image_names[i], error);
+      if (!filename)
+       return FALSE; /* Note that "error" was filled with a GError */
+      
+      images[i] = gdk_pixbuf_new_from_file (filename, error);
+      g_free (filename);
+      
       if (!images[i])
        return FALSE; /* Note that "error" was filled with a GError */
     }
@@ -154,17 +150,17 @@ timeout (gpointer data)
       GdkRectangle r1, r2, dest;
       double k;
 
-      ang = 2.0 * M_PI * (double) i / N_IMAGES - f * 2.0 * M_PI;
+      ang = 2.0 * G_PI * (double) i / N_IMAGES - f * 2.0 * G_PI;
 
       iw = gdk_pixbuf_get_width (images[i]);
       ih = gdk_pixbuf_get_height (images[i]);
 
-      r = radius + (radius / 3.0) * sin (f * 2.0 * M_PI);
+      r = radius + (radius / 3.0) * sin (f * 2.0 * G_PI);
 
       xpos = floor (xmid + r * cos (ang) - iw / 2.0 + 0.5);
       ypos = floor (ymid + r * sin (ang) - ih / 2.0 + 0.5);
 
-      k = (i & 1) ? sin (f * 2.0 * M_PI) : cos (f * 2.0 * M_PI);
+      k = (i & 1) ? sin (f * 2.0 * G_PI) : cos (f * 2.0 * G_PI);
       k = 2.0 * k * k;
       k = MAX (0.25, k);
 
@@ -187,11 +183,13 @@ timeout (gpointer data)
                              k, k,
                              GDK_INTERP_NEAREST,
                              ((i & 1)
-                              ? MAX (127, fabs (255 * sin (f * 2.0 * M_PI)))
-                              : MAX (127, fabs (255 * cos (f * 2.0 * M_PI)))));
+                              ? MAX (127, fabs (255 * sin (f * 2.0 * G_PI)))
+                              : MAX (127, fabs (255 * cos (f * 2.0 * G_PI)))));
     }
 
+  GDK_THREADS_ENTER ();
   gtk_widget_queue_draw (da);
+  GDK_THREADS_LEAVE ();
 
   frame_num++;
   return TRUE;
@@ -208,19 +206,20 @@ cleanup_callback (GtkObject *object,
 }
 
 GtkWidget *
-do_pixbufs (void)
+do_pixbufs (GtkWidget *do_widget)
 {
   if (!window)
     {
       GError *error;
 
-
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      gtk_window_set_screen (GTK_WINDOW (window),
+                            gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
-      gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC (gtk_widget_destroyed), &window);
-      gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC (cleanup_callback), NULL);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
+      g_signal_connect (window, "destroy", G_CALLBACK (cleanup_callback), NULL);
 
 
       error = NULL;
@@ -237,10 +236,8 @@ do_pixbufs (void)
 
          g_error_free (error);
 
-         gtk_signal_connect (GTK_OBJECT (dialog),
-                             "response",
-                             GTK_SIGNAL_FUNC (gtk_widget_destroy),
-                             NULL);
+         g_signal_connect (dialog, "response",
+                           G_CALLBACK (gtk_widget_destroy), NULL);
 
          gtk_widget_show (dialog);
        }
@@ -252,12 +249,12 @@ do_pixbufs (void)
 
          da = gtk_drawing_area_new ();
 
-         gtk_signal_connect (GTK_OBJECT (da), "expose_event",
-                             GTK_SIGNAL_FUNC (expose_cb), NULL);
+         g_signal_connect (da, "expose_event",
+                           G_CALLBACK (expose_cb), NULL);
 
          gtk_container_add (GTK_CONTAINER (window), da);
 
-         timeout_id = gtk_timeout_add (FRAME_DELAY, timeout, NULL);
+         timeout_id = g_timeout_add (FRAME_DELAY, timeout, NULL);
        }
     }
 
@@ -269,6 +266,7 @@ do_pixbufs (void)
     {
       gtk_widget_destroy (window);
       window = NULL;
+      g_object_unref (frame);
     }
 
   return window;