forked from AuroraMiddleware/gtk
829ed02435
2000-04-11 Federico Mena Quintero <federico@helixcode.com> Most of this patch is based on a patch by Havoc Pennington (hp@redhat.com) to make GdkPixbuf's structures opaque and to remove the libart dependency. * gdk-pixbuf/gdk-pixbuf.h: Removed the public structures. (GdkColorspace): New enum that for now only contains GDK_COLORSPACE_RGB. (GdkPixbufDestroyNotify): New type for the pixbuf's pixels destroy notification function. (GdkInterpType): New num with interpolation types. * *.[ch]: Replace the libart stuff with our own stuff. * pixops/*.[ch]: Likewise. * gdk-pixbuf/gdk-pixbuf-private.h: New file with the private declarations of the GdkPixbuf structures. * gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_new_from_art_pixbuf): Removed function. (gdk_pixbuf_get_format): Constify. (gdk_pixbuf_get_n_channels): Constify. (gdk_pixbuf_get_has_alpha): Constify. (gdk_pixbuf_get_bits_per_sample): Constify. (gdk_pixbuf_get_pixels): Constify. (gdk_pixbuf_get_width): Constify. (gdk_pixbuf_get_height): Constify. (gdk_pixbuf_get_rowstride): Constify. * gdk-pixbuf/gdk-pixbuf.c (gdk_pixbuf_copy): New function to copy a pixbuf. * gdk-pixbuf/gdk-pixbuf-data.c (gdk_pixbuf_new_from_data): Added a bits_per_sample argument; currently only 8 bits per sample are supported. * gdk-pixbuf/gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_pixbuf): New accessor. (gdk_pixbuf_frame_get_x_offset): New accessor. (gdk_pixbuf_frame_get_y_offset): New accessor. (gdk_pixbuf_frame_get_delay_time): New accessor. (gdk_pixbuf_frame_get_action): New accessor. * gdk-pixbuf/gdk-pixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask): Instead of returning a solid mask rectangle for pixbufs without an alpha channel, set the *mask_return to NULL. * gdk-pixbuf/gdk-pixbuf-util.c (gdk_pixbuf_add_alpha): Constify. * gdk-pixbuf/gdk-pixbuf-scale.c: Fix includes. * gdk-pixbuf/gdk-pixbuf-scale.c (gdk_pixbuf_scale): Added some preconditions. Maybe we should also check for the colorspace, bits per pixel, and such. (gdk_pixbuf_composite): Likewise. (gdk_pixbuf_composite_color): Likewise. (gdk_pixbuf_scale_simple): Likewise, and fail gracefully if we cannot allocate the new pixbuf. (gdk_pixbuf_composite_color_simple): Likewise. * gdk-pixbuf/gnome-canvas-pixbuf.c (gnome_canvas_pixbuf_render): Use art_rgb_rgba_affine() or art_rgb_affine() since we no longer have an ArtPixBuf. * gdk-pixbuf/io-bmp.c: Fix includes. * gdk-pixbuf/pixops/pixops.c (pixops_scale_nearest): Fixed cast in an lvalue. * TODO: Populated. * configure.in: Removed checks for libart. * gdk-pixbuf/Makefile.am: Removed references to libart. (noinst_HEADERS): Added gdk-pixbuf-private.h. * gdk-pixbuf/Makefile.am (libgdk_pixbuf_la_LDFLAGS): Incremented the version number of the libtool library to indicate that this definitely is not compatible with the old usage. I know you love me. I know you do. * configure.in: Bumped version number to 0.7.0. * README: Updated. * gdk-pixbuf-config.in (--libs): We no longer require libart. * DEPENDS.libgdk_pixbuf: We no longer depend on libart. * gdk-pixbuf.spec.in: Updated, but I don't guarantee anything.
114 lines
3.6 KiB
C
114 lines
3.6 KiB
C
#include <config.h>
|
|
#include <gtk/gtk.h>
|
|
#include <gdk/gdkx.h>
|
|
#include "gdk-pixbuf.h"
|
|
|
|
int close_app(GtkWidget *widget, gpointer data)
|
|
{
|
|
gtk_main_quit();
|
|
return TRUE;
|
|
}
|
|
|
|
int expose_cb(GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
|
|
{
|
|
GdkPixbuf *pixbuf;
|
|
|
|
pixbuf = (GdkPixbuf *) gtk_object_get_data(GTK_OBJECT(drawing_area),
|
|
"pixbuf");
|
|
if(gdk_pixbuf_get_has_alpha (pixbuf))
|
|
{
|
|
gdk_draw_rgb_32_image(drawing_area->window,
|
|
drawing_area->style->black_gc,
|
|
evt->area.x, evt->area.y,
|
|
evt->area.width,
|
|
evt->area.height,
|
|
GDK_RGB_DITHER_MAX,
|
|
gdk_pixbuf_get_pixels (pixbuf) +
|
|
(evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
|
|
(evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
|
|
gdk_pixbuf_get_rowstride (pixbuf));
|
|
}
|
|
else
|
|
{
|
|
gdk_draw_rgb_image(drawing_area->window,
|
|
drawing_area->style->black_gc,
|
|
evt->area.x, evt->area.y,
|
|
evt->area.width,
|
|
evt->area.height,
|
|
GDK_RGB_DITHER_NORMAL,
|
|
gdk_pixbuf_get_pixels (pixbuf) +
|
|
(evt->area.y * gdk_pixbuf_get_rowstride (pixbuf)) +
|
|
(evt->area.x * gdk_pixbuf_get_n_channels (pixbuf)),
|
|
gdk_pixbuf_get_rowstride (pixbuf));
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
int configure_cb(GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
|
|
{
|
|
GdkPixbuf *pixbuf;
|
|
|
|
pixbuf = (GdkPixbuf *) gtk_object_get_data(GTK_OBJECT(drawing_area),
|
|
"pixbuf");
|
|
|
|
g_print("X:%d Y:%d\n", evt->width, evt->height);
|
|
if(evt->width != gdk_pixbuf_get_width (pixbuf) || evt->height != gdk_pixbuf_get_height (pixbuf))
|
|
{
|
|
GdkWindow *root;
|
|
GdkPixbuf *new_pixbuf;
|
|
|
|
root = GDK_ROOT_PARENT();
|
|
new_pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
|
|
0, 0, 0, 0, evt->width, evt->height);
|
|
gtk_object_set_data(GTK_OBJECT(drawing_area), "pixbuf", new_pixbuf);
|
|
gdk_pixbuf_unref(pixbuf);
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
GdkWindow *root;
|
|
GtkWidget *window;
|
|
GtkWidget *vbox;
|
|
GtkWidget *drawing_area;
|
|
GdkPixbuf *pixbuf;
|
|
|
|
gtk_init(&argc, &argv);
|
|
gdk_rgb_set_verbose(TRUE);
|
|
gdk_rgb_init();
|
|
|
|
gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
|
|
gtk_widget_set_default_visual(gdk_rgb_get_visual());
|
|
|
|
root = GDK_ROOT_PARENT();
|
|
pixbuf = gdk_pixbuf_get_from_drawable(NULL, root, NULL,
|
|
0, 0, 0, 0, 150, 160);
|
|
|
|
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
|
gtk_signal_connect(GTK_OBJECT(window), "delete_event",
|
|
GTK_SIGNAL_FUNC(close_app), NULL);
|
|
gtk_signal_connect(GTK_OBJECT(window), "destroy",
|
|
GTK_SIGNAL_FUNC(close_app), NULL);
|
|
|
|
vbox = gtk_vbox_new(FALSE, 0);
|
|
gtk_container_add(GTK_CONTAINER(window), vbox);
|
|
|
|
drawing_area = gtk_drawing_area_new();
|
|
gtk_drawing_area_size(GTK_DRAWING_AREA(drawing_area),
|
|
gdk_pixbuf_get_width (pixbuf),
|
|
gdk_pixbuf_get_height (pixbuf));
|
|
gtk_signal_connect(GTK_OBJECT(drawing_area), "expose_event",
|
|
GTK_SIGNAL_FUNC(expose_cb), NULL);
|
|
|
|
gtk_signal_connect(GTK_OBJECT(drawing_area), "configure_event",
|
|
GTK_SIGNAL_FUNC(configure_cb), NULL);
|
|
gtk_object_set_data(GTK_OBJECT(drawing_area), "pixbuf", pixbuf);
|
|
gtk_box_pack_start(GTK_BOX(vbox), drawing_area, TRUE, TRUE, 0);
|
|
|
|
gtk_widget_show_all(window);
|
|
gtk_main();
|
|
return 0;
|
|
}
|