+#include <config.h>
#include <gtk/gtk.h>
-#include "gdk-pixbuf.h"
#include <stdio.h>
+#include <stdlib.h>
-ArtFilterLevel filter_level = ART_FILTER_BILINEAR;
+GdkInterpType interp_type = GDK_INTERP_BILINEAR;
int overall_alpha = 255;
GdkPixbuf *pixbuf;
GtkWidget *darea;
void
-set_filter_level (GtkWidget *widget, gpointer data)
+set_interp_type (GtkWidget *widget, gpointer data)
{
- filter_level = GPOINTER_TO_UINT (data);
+ guint types[] = { GDK_INTERP_NEAREST,
+ GDK_INTERP_BILINEAR,
+ GDK_INTERP_TILES,
+ GDK_INTERP_HYPER };
+
+ interp_type = types[gtk_combo_box_get_active (GTK_COMBO_BOX (widget))];
gtk_widget_queue_draw (darea);
}
gdk_window_set_back_pixmap (widget->window, NULL, FALSE);
- dest = gdk_pixbuf_new (ART_PIX_RGB, FALSE, 8, event->area.width, event->area.height);
-
- if (pixbuf->art_pixbuf->has_alpha || overall_alpha != 255)
- gdk_pixbuf_composite_color (pixbuf, dest,
- 0, 0, event->area.width, event->area.height,
- -event->area.x, -event->area.y,
- (double) widget->allocation.width / pixbuf->art_pixbuf->width,
- (double) widget->allocation.height / pixbuf->art_pixbuf->height,
- filter_level, overall_alpha,
- event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
- else
- gdk_pixbuf_scale (pixbuf, dest,
- 0, 0, event->area.width, event->area.height,
- -event->area.x, -event->area.y,
- (double) widget->allocation.width / pixbuf->art_pixbuf->width,
- (double) widget->allocation.height / pixbuf->art_pixbuf->height,
- filter_level);
-
-
- gdk_pixbuf_render_to_drawable (dest, widget->window, widget->style->fg_gc[GTK_STATE_NORMAL],
- 0, 0, event->area.x, event->area.y,
- event->area.width, event->area.height,
- GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
+ dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, event->area.width, event->area.height);
+
+ gdk_pixbuf_composite_color (pixbuf, dest,
+ 0, 0, event->area.width, event->area.height,
+ -event->area.x, -event->area.y,
+ (double) widget->allocation.width / gdk_pixbuf_get_width (pixbuf),
+ (double) widget->allocation.height / gdk_pixbuf_get_height (pixbuf),
+ interp_type, overall_alpha,
+ event->area.x, event->area.y, 16, 0xaaaaaa, 0x555555);
+
+ gdk_draw_pixbuf (widget->window, widget->style->fg_gc[GTK_STATE_NORMAL], dest,
+ 0, 0, event->area.x, event->area.y,
+ event->area.width, event->area.height,
+ GDK_RGB_DITHER_NORMAL, event->area.x, event->area.y);
- gdk_pixbuf_unref (dest);
+ g_object_unref (dest);
return TRUE;
}
+extern void pixbuf_init();
+
int
main(int argc, char **argv)
{
GtkWidget *window, *vbox;
- GtkWidget *menuitem, *optionmenu, *menu;
+ GtkWidget *combo_box;
GtkWidget *alignment;
GtkWidget *hbox, *label, *hscale;
GtkAdjustment *adjustment;
GtkRequisition scratch_requisition;
+ const gchar *creator;
+ GError *error;
+
+ pixbuf_init ();
gtk_init (&argc, &argv);
- gdk_rgb_init ();
if (argc != 2) {
fprintf (stderr, "Usage: testpixbuf-scale FILE\n");
exit (1);
}
- pixbuf = gdk_pixbuf_new_from_file (argv[1]);
+ error = NULL;
+ pixbuf = gdk_pixbuf_new_from_file (argv[1], &error);
if (!pixbuf) {
- fprintf (stderr, "Cannot load %s\n", argv[1]);
+ fprintf (stderr, "Cannot load image: %s\n",
+ error->message);
+ g_error_free (error);
exit(1);
}
+ creator = gdk_pixbuf_get_option (pixbuf, "tEXt::Software");
+ if (creator)
+ g_print ("%s was created by '%s'\n", argv[1], creator);
+
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_signal_connect (GTK_OBJECT (window), "destroy",
- GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
+ g_signal_connect (window, "destroy",
+ G_CALLBACK (gtk_main_quit), NULL);
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
- menu = gtk_menu_new ();
-
- menuitem = gtk_menu_item_new_with_label ("NEAREST");
- gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
- GTK_SIGNAL_FUNC (set_filter_level),
- GUINT_TO_POINTER (ART_FILTER_NEAREST));
- gtk_widget_show (menuitem);
- gtk_container_add (GTK_CONTAINER (menu), menuitem);
-
- menuitem = gtk_menu_item_new_with_label ("BILINEAR");
- gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
- GTK_SIGNAL_FUNC (set_filter_level),
- GUINT_TO_POINTER (ART_FILTER_BILINEAR));
- gtk_widget_show (menuitem);
- gtk_container_add (GTK_CONTAINER (menu), menuitem);
-
- menuitem = gtk_menu_item_new_with_label ("TILES");
- gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
- GTK_SIGNAL_FUNC (set_filter_level),
- GUINT_TO_POINTER (ART_FILTER_TILES));
- gtk_container_add (GTK_CONTAINER (menu), menuitem);
-
- menuitem = gtk_menu_item_new_with_label ("HYPER");
- gtk_signal_connect (GTK_OBJECT (menuitem), "activate",
- GTK_SIGNAL_FUNC (set_filter_level),
- GUINT_TO_POINTER (ART_FILTER_HYPER));
- gtk_container_add (GTK_CONTAINER (menu), menuitem);
-
- optionmenu = gtk_option_menu_new ();
- gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu), menu);
- gtk_option_menu_set_history (GTK_OPTION_MENU (optionmenu), 1);
+ combo_box = gtk_combo_box_new_text ();
+
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "NEAREST");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "BILINEAR");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "TILES");
+ gtk_combo_box_append_text (GTK_COMBO_BOX (combo_box), "HYPER");
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 1);
+
+ g_signal_connect (combo_box, "changed",
+ G_CALLBACK (set_interp_type),
+ NULL);
alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0));
- gtk_signal_connect (GTK_OBJECT (adjustment), "value_changed",
- GTK_SIGNAL_FUNC (overall_changed_cb), NULL);
+ g_signal_connect (adjustment, "value_changed",
+ G_CALLBACK (overall_changed_cb), NULL);
hscale = gtk_hscale_new (adjustment);
gtk_scale_set_digits (GTK_SCALE (hscale), 0);
gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (alignment), optionmenu);
+ gtk_container_add (GTK_CONTAINER (alignment), combo_box);
gtk_widget_show_all (vbox);
/* Compute the size without the drawing area, so we know how big to make the default size */
darea = gtk_drawing_area_new ();
gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (darea), "expose_event",
- GTK_SIGNAL_FUNC (expose_cb), NULL);
+ g_signal_connect (darea, "expose_event",
+ G_CALLBACK (expose_cb), NULL);
gtk_window_set_default_size (GTK_WINDOW (window),
- pixbuf->art_pixbuf->width,
- scratch_requisition.height + pixbuf->art_pixbuf->height);
+ gdk_pixbuf_get_width (pixbuf),
+ scratch_requisition.height + gdk_pixbuf_get_height (pixbuf));
gtk_widget_show_all (window);