}
}
+static gboolean
+save_to_loader (const gchar *buf, gsize count, GError **err, gpointer data)
+{
+ GdkPixbufLoader *loader = data;
+
+ return gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err);
+}
+
+static GdkPixbuf *
+buffer_to_pixbuf (const gchar *buf, gsize count, GError **err)
+{
+ GdkPixbufLoader *loader;
+ GdkPixbuf *pixbuf;
+
+ loader = gdk_pixbuf_loader_new ();
+ if (gdk_pixbuf_loader_write (loader, (const guchar *)buf, count, err) &&
+ gdk_pixbuf_loader_close (loader, err)) {
+ pixbuf = g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader));
+ g_object_unref (loader);
+ return pixbuf;
+ } else {
+ return NULL;
+ }
+}
+
+static void
+do_compare (GdkPixbuf *pixbuf, GdkPixbuf *compare, GError *err)
+{
+ if (compare == NULL) {
+ fprintf (stderr, "%s", err->message);
+ g_error_free (err);
+ } else {
+ compare_pixbufs (pixbuf, compare, "jpeg");
+ g_object_unref (compare);
+ }
+}
+
static void
keypress_check (GtkWidget *widget, GdkEventKey *evt, gpointer data)
{
GdkPixbuf *pixbuf;
GtkDrawingArea *da = (GtkDrawingArea*)data;
GError *err = NULL;
-
+ gchar *buffer;
+ gsize count;
+ GdkPixbufLoader *loader;
+
pixbuf = (GdkPixbuf *) g_object_get_data (G_OBJECT (da), "pixbuf");
if (evt->keyval == 'q')
gtk_main_quit ();
- if (evt->keyval == 's') {
+
+ if (evt->keyval == 's' && (evt->state & GDK_CONTROL_MASK)) {
+ /* save to callback */
+ if (pixbuf == NULL) {
+ fprintf (stderr, "PIXBUF NULL\n");
+ return;
+ }
+
+ loader = gdk_pixbuf_loader_new ();
+ if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "jpeg",
+ &err,
+ "quality", "100",
+ NULL) ||
+ !gdk_pixbuf_loader_close (loader, &err)) {
+ fprintf (stderr, "%s", err->message);
+ g_error_free (err);
+ } else {
+ do_compare (pixbuf,
+ g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+ err);
+ g_object_unref (loader);
+ }
+ }
+ else if (evt->keyval == 'S') {
+ /* save to buffer */
+ if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "jpeg",
+ &err,
+ "quality", "100",
+ NULL)) {
+ fprintf (stderr, "%s", err->message);
+ g_error_free (err);
+ } else {
+ do_compare (pixbuf,
+ buffer_to_pixbuf (buffer, count, &err),
+ err);
+ }
+ }
+ else if (evt->keyval == 's') {
+ /* save normally */
if (pixbuf == NULL) {
fprintf (stderr, "PIXBUF NULL\n");
return;
fprintf (stderr, "%s", err->message);
g_error_free (err);
} else {
- GdkPixbuf *compare;
-
- compare = gdk_pixbuf_new_from_file ("foo.jpg", &err);
-
- if (!compare) {
- fprintf (stderr, "%s", err->message);
- g_error_free (err);
- } else {
- compare_pixbufs (pixbuf, compare, "jpeg");
- g_object_unref (G_OBJECT (compare));
- }
-
+ do_compare (pixbuf,
+ gdk_pixbuf_new_from_file ("foo.jpg", &err),
+ err);
}
- } else if (evt->keyval == 'p') {
+ }
+
+ if (evt->keyval == 'p' && (evt->state & GDK_CONTROL_MASK)) {
+ /* save to callback */
+ if (pixbuf == NULL) {
+ fprintf (stderr, "PIXBUF NULL\n");
+ return;
+ }
+
+ loader = gdk_pixbuf_loader_new ();
+ if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "png",
+ &err,
+ "tEXt::Software", "testpixbuf-save",
+ NULL)
+ || !gdk_pixbuf_loader_close (loader, &err)) {
+ fprintf (stderr, "%s", err->message);
+ g_error_free (err);
+ } else {
+ do_compare (pixbuf,
+ g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+ err);
+ g_object_unref (loader);
+ }
+ }
+ else if (evt->keyval == 'P') {
+ /* save to buffer */
+ if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "png",
+ &err,
+ "tEXt::Software", "testpixbuf-save",
+ NULL)) {
+ fprintf (stderr, "%s", err->message);
+ g_error_free (err);
+ } else {
+ do_compare (pixbuf,
+ buffer_to_pixbuf (buffer, count, &err),
+ err);
+ }
+ }
+ else if (evt->keyval == 'p') {
if (pixbuf == NULL) {
fprintf (stderr, "PIXBUF NULL\n");
return;
fprintf (stderr, "%s", err->message);
g_error_free (err);
} else {
- GdkPixbuf *compare;
-
- compare = gdk_pixbuf_new_from_file ("foo.png", &err);
-
- if (!compare) {
- fprintf (stderr, "%s", err->message);
- g_error_free (err);
- } else {
- compare_pixbufs (pixbuf, compare, "png");
- g_object_unref (G_OBJECT (compare));
- }
-
+ do_compare(pixbuf,
+ gdk_pixbuf_new_from_file ("foo.png", &err),
+ err);
}
- } else if (evt->keyval == 'a') {
+ }
+
+ if (evt->keyval == 'i' && (evt->state & GDK_CONTROL_MASK)) {
+ /* save to callback */
+ if (pixbuf == NULL) {
+ fprintf (stderr, "PIXBUF NULL\n");
+ return;
+ }
+
+ loader = gdk_pixbuf_loader_new ();
+ if (!gdk_pixbuf_save_to_callback (pixbuf, save_to_loader, loader, "ico",
+ &err,
+ NULL)
+ || !gdk_pixbuf_loader_close (loader, &err)) {
+ fprintf (stderr, "%s", err->message);
+ g_error_free (err);
+ } else {
+ do_compare (pixbuf,
+ g_object_ref (gdk_pixbuf_loader_get_pixbuf (loader)),
+ err);
+ g_object_unref (loader);
+ }
+ }
+ else if (evt->keyval == 'I') {
+ /* save to buffer */
+ if (!gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &count, "ico",
+ &err,
+ NULL)) {
+ fprintf (stderr, "%s", err->message);
+ g_error_free (err);
+ } else {
+ do_compare (pixbuf,
+ buffer_to_pixbuf (buffer, count, &err),
+ err);
+ }
+ }
+ else if (evt->keyval == 'i') {
+ if (pixbuf == NULL) {
+ fprintf (stderr, "PIXBUF NULL\n");
+ return;
+ }
+
+ if (!gdk_pixbuf_save (pixbuf, "foo.ico", "ico",
+ &err,
+ NULL)) {
+ fprintf (stderr, "%s", err->message);
+ g_error_free (err);
+ } else {
+ do_compare(pixbuf,
+ gdk_pixbuf_new_from_file ("foo.ico", &err),
+ err);
+ }
+ }
+
+ if (evt->keyval == 'a') {
if (pixbuf == NULL) {
fprintf (stderr, "PIXBUF NULL\n");
return;
return TRUE;
}
-static int
-expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
+static gboolean
+draw_cb (GtkWidget *drawing_area, cairo_t *cr, gpointer data)
{
GdkPixbuf *pixbuf;
pixbuf = (GdkPixbuf *) g_object_get_data (G_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));
- }
+
+ gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+ cairo_paint (cr);
+
return FALSE;
}
GdkPixbuf *new_pixbuf;
root = gdk_get_default_root_window ();
- new_pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
- 0, 0, 0, 0, evt->width, evt->height);
- g_object_set_data (G_OBJECT (drawing_area), "pixbuf", new_pixbuf);
- gdk_pixbuf_unref (pixbuf);
+ new_pixbuf = gdk_pixbuf_get_from_window (root,
+ 0, 0, evt->width, evt->height);
+ g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", new_pixbuf,
+ (GDestroyNotify) g_object_unref);
}
return FALSE;
gtk_init (&argc, &argv);
- gtk_widget_set_default_colormap (gdk_rgb_get_colormap ());
-
root = gdk_get_default_root_window ();
- pixbuf = gdk_pixbuf_get_from_drawable (NULL, root, NULL,
- 0, 0, 0, 0, 150, 160);
+ pixbuf = gdk_pixbuf_get_from_window (root,
+ 0, 0, 150, 160);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (window, "delete_event",
g_signal_connect (window, "destroy",
G_CALLBACK (close_app), NULL);
- vbox = gtk_vbox_new (FALSE, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
drawing_area = gtk_drawing_area_new ();
gtk_widget_set_size_request (GTK_WIDGET (drawing_area),
gdk_pixbuf_get_width (pixbuf),
gdk_pixbuf_get_height (pixbuf));
- g_signal_connect (drawing_area, "expose_event",
- G_CALLBACK (expose_cb), NULL);
+ g_signal_connect (drawing_area, "draw",
+ G_CALLBACK (draw_cb), NULL);
g_signal_connect (drawing_area, "configure_event",
G_CALLBACK (configure_cb), NULL);
projects / ~andy / gtk / blobdiff