[gtk+/wip/baedert/gtkimageview: 837/890] Add GtkImageView



commit 814811b8524a4cd7bb3efd25e270993d5fd8187f
Author: Timm Bäder <mail baedert org>
Date:   Sun Jul 5 20:18:29 2015 +0200

    Add GtkImageView

 docs/reference/gtk/gtk3-sections.txt |   23 +
 docs/reference/gtk/gtk3.types.in     |    1 +
 gtk/Makefile.am                      |    2 +
 gtk/gtk.h                            |    1 +
 gtk/gtkimageview.c                   | 1060 ++++++++++++++++++++++++++++++++++
 gtk/gtkimageview.h                   |  118 ++++
 6 files changed, 1205 insertions(+), 0 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index fd7c85a..44a388b 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -1999,6 +1999,29 @@ GtkImageIconNameData
 GtkImageGIconData
 </SECTION>
 
+
+
+<SECTION>
+<FILE>gtkimageview</FILE>
+<TITLE>GtkImageView</TITLE>
+GtkImageView
+<SUBSECTION Standard>
+GTK_IMAGE_VIEW
+GTK_IS_IMAGE_VIEW
+GTK_TYPE_IMAGE_VIEW
+GTK_IMAGE__VIEW_CLASS
+GTK_IS_IMAGE_VIEW_CLASS
+GTK_IMAGE_VIEW_GET_CLASS
+<SUBSECTION Private>
+GtkImageViewPrivate
+gtk_image_view_get_type
+</SECTION>
+
+
+
+
+
+
 <SECTION>
 <FILE>gtkimagemenuitem</FILE>
 <TITLE>GtkImageMenuItem</TITLE>
diff --git a/docs/reference/gtk/gtk3.types.in b/docs/reference/gtk/gtk3.types.in
index beb5a4a..7cb873e 100644
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -105,6 +105,7 @@ gtk_icon_factory_get_type
 gtk_icon_theme_get_type
 gtk_icon_view_get_type
 gtk_image_get_type
+gtk_image_view_get_type
 gtk_image_menu_item_get_type
 gtk_im_context_get_type
 gtk_im_context_simple_get_type
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7ed75b3..f3c33f0 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -206,6 +206,7 @@ gtk_public_h_sources =              \
        gtkicontheme.h          \
        gtkiconview.h           \
        gtkimage.h              \
+       gtkimageview.h \
        gtkimcontext.h          \
        gtkimcontextinfo.h      \
        gtkimcontextsimple.h    \
@@ -758,6 +759,7 @@ gtk_base_c_sources =                \
        gtkiconview.c           \
        gtkimage.c              \
        gtkimagedefinition.c    \
+       gtkimageview.c \
        gtkimcontext.c          \
        gtkimcontextsimple.c    \
        gtkimmodule.c           \
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 148d52f..46fb134 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -122,6 +122,7 @@
 #include <gtk/gtkicontheme.h>
 #include <gtk/gtkiconview.h>
 #include <gtk/gtkimage.h>
+#include <gtk/gtkimageview.h>
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtkimcontextinfo.h>
 #include <gtk/gtkimcontextsimple.h>
diff --git a/gtk/gtkimageview.c b/gtk/gtkimageview.c
new file mode 100644
index 0000000..5c4865c
--- /dev/null
+++ b/gtk/gtkimageview.c
@@ -0,0 +1,1060 @@
+#include "config.h"
+#include "gtkimageview.h"
+#include "gtktypebuiltins.h"
+#include "gtkmain.h"
+#include "gtkintl.h"
+#include "gtkprivate.h"
+#include "gtkrender.h"
+#include "gtkgesture.h"
+#include "gtkgesturerotate.h"
+#include "gtkgesturezoom.h"
+#include "gtkscrollable.h"
+#include "gtkmarshalers.h"
+#include "gtkadjustment.h"
+#include <gdk/gdkcairo.h>
+
+#include <cairo-gobject.h>
+#include <math.h>
+
+
+#define DEG_TO_RAD(x) (((x) / 360.0) * (2 * M_PI))
+#define RAD_TO_DEG(x) ((x / (2.0 * M_PI) * 360.0))
+
+#define TRANSITION_DURATION (200.0 * 1000.0)
+
+
+
+struct _GtkImageViewPrivate
+{
+  double   scale;
+  double   angle;
+  int      zoom_mode;
+  gboolean snap_angle;
+
+  GtkGesture *rotate_gesture;
+  GtkGesture *zoom_gesture;
+
+  /* GtkScrollable stuff */
+  GtkAdjustment       *hadjustment;
+  GtkAdjustment       *vadjustment;
+  GtkScrollablePolicy  hscroll_policy;
+  GtkScrollablePolicy  vscroll_policy;
+
+  gboolean                is_animation;
+  GdkPixbufAnimation     *source_animation;
+  GdkPixbufAnimationIter *source_animation_iter;
+  cairo_surface_t        *image_surface;
+  int                     animation_timeout;
+
+  /* Transitions */
+  gint64 angle_transition_start;
+  double transition_start_angle;
+  double transition_end_angle;
+};
+
+// XXX animate image size changes!
+// XXX Double-press gesture to zoom in/out
+
+enum
+{
+  PROP_SCALE = 1,
+  PROP_ANGLE,
+  PROP_ZOOM_MODE,
+  PROP_ROTATE_ENABLED,
+  PROP_ZOOM_ENABLED,
+  PROP_SNAP_ANGLE,
+  LAST_WIDGET_PROPERTY,
+  PROP_HADJUSTMENT,
+  PROP_VADJUSTMENT,
+  PROP_HSCROLL_POLICY,
+  PROP_VSCROLL_POLICY,
+
+  LAST_PROPERTY
+};
+
+enum
+{
+  PREPARE_IMAGE,
+
+  LAST_SIGNAL
+};
+
+static GParamSpec *widget_props[LAST_WIDGET_PROPERTY] = { NULL, };
+static int         widget_signals[LAST_SIGNAL]        = { 0 };
+
+
+G_DEFINE_TYPE_WITH_CODE (GtkImageView, gtk_image_view, GTK_TYPE_WIDGET,
+                         G_ADD_PRIVATE (GtkImageView)
+                         G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
+
+
+static void
+gtk_image_view_init (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  GtkStyleContext *sc = gtk_widget_get_style_context ((GtkWidget *)image_view);
+
+  priv->scale = 1.0;
+  priv->angle = 0.0;
+  priv->snap_angle = FALSE;
+  priv->zoom_mode = GTK_IMAGE_VIEW_ZOOM_MODE_FIT;
+  priv->rotate_gesture = gtk_gesture_rotate_new ((GtkWidget *)image_view);
+  priv->zoom_gesture = gtk_gesture_zoom_new ((GtkWidget *)image_view);
+
+  gtk_style_context_add_class (sc, GTK_STYLE_CLASS_BACKGROUND);
+}
+
+/* Prototypes {{{ */
+static void gtk_image_view_update_surface (GtkImageView *image_view);
+
+static void adjustment_value_changed_cb (GtkAdjustment *adjustment,
+                                         gpointer       user_data);
+
+
+/* }}} */
+
+
+static gboolean
+gtk_image_view_update_animation (gpointer user_data)
+{
+  GtkImageView *image_view = user_data;
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+
+  gdk_pixbuf_animation_iter_advance (priv->source_animation_iter, NULL);
+  gtk_image_view_update_surface (image_view);
+
+  return priv->is_animation;
+}
+
+
+static void
+gtk_image_view_start_animation (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  int delay_ms;
+
+  if (!priv->is_animation)
+    g_error ("NOPE");
+
+  delay_ms = gdk_pixbuf_animation_iter_get_delay_time (priv->source_animation_iter);
+
+  priv->animation_timeout = g_timeout_add (delay_ms, gtk_image_view_update_animation, image_view);
+}
+
+static void
+gtk_image_view_stop_animation (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+
+  if (priv->animation_timeout != 0)
+    {
+      g_assert (priv->is_animation);
+      g_source_remove (priv->animation_timeout);
+      priv->animation_timeout = 0;
+    }
+}
+
+
+static gboolean
+frameclock_cb (GtkWidget     *widget,
+               GdkFrameClock *frame_clock,
+               gpointer       user_data)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private ((GtkImageView *)widget);
+  gint64 now = gdk_frame_clock_get_frame_time (frame_clock);
+
+  double t = (now - priv->angle_transition_start) / TRANSITION_DURATION;
+
+  double new_angle = (priv->transition_end_angle - priv->transition_start_angle) * t;
+
+  priv->angle = priv->transition_start_angle + new_angle;
+  /*gtk_widget_queue_resize (widget);*/
+  gtk_widget_queue_draw (widget);
+
+  if (t >= 1.0)
+    {
+      priv->angle = priv->transition_end_angle;
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+
+static void
+gtk_image_view_animate_to_angle (GtkImageView *image_view,
+                                 double        start_angle)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  /* target angle is priv->angle! */
+
+  priv->transition_start_angle = start_angle;
+  priv->transition_end_angle   = priv->angle;
+  priv->angle_transition_start = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock ((GtkWidget 
*)image_view));
+  gtk_widget_add_tick_callback ((GtkWidget *)image_view, frameclock_cb, NULL, NULL);
+}
+
+static void
+gtk_image_view_do_snapping (GtkImageView *image_view,
+                            double        angle)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  int new_angle;
+
+  g_assert (priv->snap_angle);
+
+  /* Snap to angles of 0, 90, 180 and 270 degrees */
+
+  new_angle = (int) ((angle) / 90.0) * 90;
+
+  if (new_angle != priv->angle)
+    {
+      double old_angle = priv->angle;
+      priv->angle = new_angle;
+      /* XXX Make this conditional */
+      gtk_image_view_animate_to_angle (image_view,
+                                       old_angle);
+    }
+
+  priv->angle = new_angle;
+}
+
+static void
+gtk_image_view_compute_bounding_box (GtkImageView *image_view,
+                                     int          *width,
+                                     int          *height,
+                                     double       *scale)
+{
+  // XXX Rework this to have less code duplication
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  GtkAllocation alloc;
+  int image_width;
+  int image_height;
+  int bb_width  = 0;
+  int bb_height = 0;
+
+
+  if (!priv->image_surface)
+    {
+      *width  = 0;
+      *height = 0;
+      return;
+    }
+
+  gtk_widget_get_allocation ((GtkWidget *)image_view, &alloc);
+  image_width  = cairo_image_surface_get_width (priv->image_surface);
+  image_height = cairo_image_surface_get_height (priv->image_surface);
+
+  if (priv->zoom_mode == GTK_IMAGE_VIEW_ZOOM_MODE_FIT ||
+      priv->zoom_mode == GTK_IMAGE_VIEW_ZOOM_MODE_ORIGINAL)
+    {
+      int final_width  = image_width;
+      int final_height = image_height;
+
+      double upper_right_degrees = DEG_TO_RAD (priv->angle) + atan ((double)final_height / 
(double)final_width);
+      double upper_left_degrees  = DEG_TO_RAD (priv->angle) + atan ((double)final_height / 
-(double)final_width);
+      double r = sqrtf ((final_width / 2) * (final_width / 2) + (final_height / 2) * (final_height / 2));
+
+      int upper_right_x = r * cos (upper_right_degrees);
+      int upper_right_y = r * sin (upper_right_degrees);
+
+      int upper_left_x = r * cos (upper_left_degrees);
+      int upper_left_y = r * sin (upper_left_degrees);
+
+
+      //
+      bb_width  = MAX (fabs (upper_right_x), fabs (upper_left_x)) * 2;
+      bb_height = MAX (fabs (upper_right_y), fabs (upper_left_y)) * 2;
+
+      double scale_x = (double)alloc.width / (double)bb_width;
+      double scale_y = (double)alloc.height / (double)bb_height;
+
+      if (scale)
+        *scale = MIN (MIN (scale_x, scale_y), 1.0);
+
+      priv->scale = *scale;
+      g_object_notify_by_pspec ((GObject *)image_view,
+                                widget_props[PROP_SCALE]);
+
+      if (priv->zoom_mode == GTK_IMAGE_VIEW_ZOOM_MODE_FIT)
+        {
+          *width = bb_width * *scale;
+          *height = bb_height * *scale;
+        }
+      else if (priv->zoom_mode == GTK_IMAGE_VIEW_ZOOM_MODE_ORIGINAL)
+        {
+          *width = bb_width * *scale;
+          *height = bb_height * *scale;
+        }
+
+      return;
+    }
+  else
+    {
+    }
+
+  *width  = image_width;
+  *height = image_height;
+
+  if (scale)
+    *scale  = 1.0;
+}
+
+static void
+gtk_image_view_update_adjustments (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+
+  if (!priv->hadjustment && !priv->vadjustment)
+    return;
+
+  if (!priv->source_animation)
+    {
+      gtk_adjustment_configure (priv->vadjustment, 0, 0, 0, 0, 0, 0);
+      gtk_adjustment_configure (priv->hadjustment, 0, 0, 0, 0, 0, 0);
+      return;
+    }
+
+
+
+
+  if (priv->zoom_mode == GTK_IMAGE_VIEW_ZOOM_MODE_ORIGINAL)
+    {
+      int width, height;
+      gtk_image_view_compute_bounding_box (image_view,
+                                           &width,
+                                           &height,
+                                           NULL);
+      gtk_adjustment_set_upper (priv->hadjustment, width);
+      gtk_adjustment_set_upper (priv->vadjustment, height);
+    }
+  else if (priv->zoom_mode == GTK_IMAGE_VIEW_ZOOM_MODE_FIT)
+    {
+      gtk_adjustment_set_upper (priv->vadjustment,
+                                gtk_widget_get_allocated_width ((GtkWidget *)image_view));
+
+      gtk_adjustment_set_upper (priv->hadjustment,
+                                gtk_widget_get_allocated_height((GtkWidget *)image_view));
+    }
+
+  gtk_adjustment_set_page_size (priv->hadjustment,
+                                gtk_widget_get_allocated_width ((GtkWidget *)image_view));
+  gtk_adjustment_set_page_size (priv->vadjustment,
+                                gtk_widget_get_allocated_height ((GtkWidget *)image_view));
+
+}
+
+static gboolean
+gtk_image_view_draw (GtkWidget *widget, cairo_t *ct)
+{
+  GtkImageView *image_view = (GtkImageView *)widget;
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  GtkStyleContext *sc = gtk_widget_get_style_context (widget);
+  GtkAllocation alloc;
+  int draw_x;
+  int draw_y;
+  int draw_width;
+  int draw_height;
+  int image_width;
+  int image_height;
+  double scale = 0.0;
+
+  gtk_widget_get_allocation (widget, &alloc);
+
+
+  gtk_render_background (sc, ct, 0, 0, alloc.width, alloc.height);
+  gtk_render_frame      (sc, ct, 0, 0, alloc.width, alloc.height);
+
+  if (!priv->image_surface)
+    return FALSE;
+
+  gtk_image_view_compute_bounding_box (image_view, &draw_width, &draw_height, &scale);
+
+  image_width = cairo_image_surface_get_width (priv->image_surface) * scale;
+  image_height = cairo_image_surface_get_height (priv->image_surface) * scale;
+
+  draw_x = (alloc.width  - draw_width) / 2;
+  draw_y = (alloc.height - draw_height) / 2;
+
+  /* Bounding box, for debugging */
+#if 0
+  {
+    cairo_save (ct);
+    cairo_set_source_rgba (ct, 0.7, 0.7, 0.7, 1);
+    cairo_rectangle (ct, (alloc.width - draw_width) / 2, (alloc.height - draw_height) / 2, draw_width, 
draw_height);
+    cairo_fill (ct);
+    cairo_restore (ct);
+  }
+#endif
+
+
+  cairo_save (ct);
+
+
+  cairo_rectangle (ct, draw_x, draw_y, draw_width, draw_height);
+  /* Handle the h/vadjustments, but keep the image centered in all cases */
+  if (priv->hadjustment &&
+      gtk_adjustment_get_page_size (priv->hadjustment) < draw_width)
+    draw_x = -gtk_adjustment_get_value (priv->hadjustment);
+  else
+    draw_x = (alloc.width - image_width) / 2;
+
+
+  if (priv->vadjustment &&
+      gtk_adjustment_get_page_size (priv->vadjustment) < draw_height)
+    draw_y = -gtk_adjustment_get_value (priv->vadjustment);
+  else
+    draw_y = (alloc.height - image_height) / 2;
+
+
+  /*cairo_rectangle (ct, draw_x, draw_y, draw_width, draw_height);*/
+
+  /* Rotate around the center */
+  cairo_translate (ct, draw_x + (image_width / 2.0), draw_y + (image_height / 2.0));
+  cairo_rotate (ct, DEG_TO_RAD (priv->angle));
+  cairo_translate (ct, -draw_x - (image_width / 2.0), - draw_y - (image_height / 2.0));
+
+
+  cairo_scale (ct, scale, scale);
+  cairo_set_source_surface (ct, priv->image_surface, draw_x/scale, draw_y/scale);
+  cairo_fill (ct);
+  cairo_restore (ct);
+
+  return GDK_EVENT_PROPAGATE;
+}
+
+/* Property Getter/Setter {{{ */
+static void
+gtk_image_view_set_hadjustment (GtkImageView  *image_view,
+                                GtkAdjustment *hadjustment)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+
+  if (priv->hadjustment && priv->hadjustment == hadjustment)
+    return;
+
+  if (priv->hadjustment)
+    {
+      g_signal_handlers_disconnect_by_func (priv->hadjustment, adjustment_value_changed_cb, image_view);
+      g_object_unref (priv->hadjustment);
+    }
+
+
+  if (hadjustment)
+    {
+      g_signal_connect ((GObject *)hadjustment, "value-changed",
+                        (GCallback) adjustment_value_changed_cb, image_view);
+      priv->hadjustment = g_object_ref_sink (hadjustment);
+    }
+  else
+    {
+      priv->hadjustment = hadjustment;
+    }
+
+}
+
+static void
+gtk_image_view_set_vadjustment (GtkImageView  *image_view,
+                                GtkAdjustment *vadjustment)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+
+  if (priv->vadjustment == vadjustment)
+    return;
+
+  if (priv->vadjustment)
+    {
+      g_signal_handlers_disconnect_by_func (priv->vadjustment, adjustment_value_changed_cb, image_view);
+      g_object_unref (priv->vadjustment);
+    }
+
+  if (vadjustment)
+    {
+      g_signal_connect ((GObject *)vadjustment, "value-changed",
+                        (GCallback) adjustment_value_changed_cb, image_view);
+      priv->vadjustment = g_object_ref_sink (vadjustment);
+    }
+  else
+    {
+      priv->vadjustment = vadjustment;
+    }
+}
+
+
+
+void
+gtk_image_view_set_scale (GtkImageView *image_view,
+                          double        scale)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+
+  /*g_message ("Want to set new scale: %f", scale);*/
+
+  priv->scale = scale;
+  /*gtk_image_view_set_zoom_mode (image_view, GTK_IMAGE_VIEW_ZOOM_MODE_NONE);*/
+  g_object_notify_by_pspec ((GObject *)image_view,
+                            widget_props[PROP_SCALE]);
+  gtk_widget_queue_resize ((GtkWidget *)image_view);
+}
+
+double
+gtk_image_view_get_scale (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+
+  return priv->scale;
+}
+
+
+
+void
+gtk_image_view_set_angle (GtkImageView *image_view,
+                          double        angle)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+
+  if (priv->snap_angle)
+    gtk_image_view_do_snapping (image_view, angle);
+  else
+    priv->angle = angle;
+
+  g_object_notify_by_pspec ((GObject *)image_view,
+                            widget_props[PROP_ANGLE]);
+
+  gtk_widget_queue_resize ((GtkWidget *)image_view);
+}
+
+double
+gtk_image_view_get_angle (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+
+  return priv->angle;
+}
+
+
+
+void
+gtk_image_view_set_zoom_mode (GtkImageView         *image_view,
+                              GtkImageViewZoomMode  zoom_mode)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+
+  if (priv->zoom_mode == zoom_mode)
+    return;
+
+  priv->zoom_mode = zoom_mode;
+  g_object_notify_by_pspec ((GObject *)image_view,
+                            widget_props[PROP_ANGLE]);
+
+  gtk_widget_queue_resize ((GtkWidget *)image_view);
+}
+
+GtkImageViewZoomMode
+gtk_image_view_get_zoom_mode (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+
+  return priv->zoom_mode;
+}
+
+
+
+void
+gtk_image_view_set_snap_angle (GtkImageView *image_view,
+                               gboolean     snap_angle)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+
+  snap_angle = !!snap_angle;
+
+  if (snap_angle == priv->snap_angle)
+    return;
+
+  priv->snap_angle = snap_angle;
+  g_object_notify_by_pspec ((GObject *)image_view,
+                            widget_props[PROP_SNAP_ANGLE]);
+
+  if (priv->snap_angle)
+    gtk_image_view_do_snapping (image_view, priv->angle);
+}
+
+gboolean
+gtk_image_view_get_snap_angle (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+
+  return priv->snap_angle;
+}
+
+
+/* }}} */
+
+
+/* GtkWidget API {{{ */
+
+static void
+gtk_image_view_realize (GtkWidget *widget)
+{
+  GtkAllocation allocation;
+  GdkWindowAttr attributes = { 0, };
+  GdkWindow *window;
+
+  gtk_widget_get_allocation (widget, &allocation);
+  gtk_widget_set_realized (widget, TRUE);
+
+  attributes.x = allocation.x;
+  attributes.y = allocation.y;
+  attributes.width  = allocation.width;
+  attributes.height = allocation.height;
+  attributes.window_type = GDK_WINDOW_CHILD;
+  attributes.event_mask = gtk_widget_get_events (widget) |
+                           GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK |
+                           GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK;
+  attributes.wclass = GDK_INPUT_OUTPUT;
+
+  window = gdk_window_new (gtk_widget_get_parent_window (widget),
+                           &attributes, GDK_WA_X | GDK_WA_Y);
+  gdk_window_set_user_data (window, (GObject *) widget);
+  gtk_widget_set_window (widget, window); /* Passes ownership */
+}
+
+static void
+gtk_image_view_size_allocate (GtkWidget     *widget,
+                              GtkAllocation *allocation)
+{
+  GtkImageView *image_view = (GtkImageView *)widget;
+
+  gtk_widget_set_allocation (widget, allocation);
+
+  if (gtk_widget_get_realized (widget))
+    {
+      gdk_window_move_resize (gtk_widget_get_window (widget),
+                              allocation->x, allocation->y,
+                              allocation->width, allocation->height);
+    }
+
+  gtk_image_view_update_adjustments (image_view);
+}
+
+static void
+adjustment_value_changed_cb (GtkAdjustment *adjustment,
+                             gpointer       user_data)
+{
+  GtkImageView *image_view = user_data;
+
+  gtk_widget_queue_draw ((GtkWidget *)image_view);
+}
+
+static void
+gtk_image_view_get_preferred_height (GtkWidget *widget,
+                                     int       *minimal,
+                                     int       *natural)
+{
+  GtkImageView *image_view  = (GtkImageView *)widget;
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+
+  int width, height;
+  double scale;
+  gtk_image_view_compute_bounding_box (image_view,
+                                       &width,
+                                       &height,
+                                       &scale);
+
+
+  if (priv->zoom_mode == GTK_IMAGE_VIEW_ZOOM_MODE_FIT)
+    {
+      *minimal = 0;
+      *natural = height;
+    }
+  else
+    {
+      *minimal = height;
+      *natural = height;
+    }
+}
+
+static void
+gtk_image_view_get_preferred_width (GtkWidget *widget,
+                                    int       *minimal,
+                                    int       *natural)
+{
+  GtkImageView *image_view  = (GtkImageView *)widget;
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  int width, height;
+  double scale;
+  gtk_image_view_compute_bounding_box (image_view,
+                                       &width,
+                                       &height,
+                                       &scale);
+
+  if (priv->zoom_mode == GTK_IMAGE_VIEW_ZOOM_MODE_FIT)
+    {
+      *minimal = 0;
+      *natural = width;
+    }
+  else
+    {
+      *minimal = width;
+      *natural = width;
+    }
+
+}
+/* }}} */
+
+
+/* GObject API {{{ */
+static void
+gtk_image_view_set_property (GObject      *object,
+                             guint         prop_id,
+                             const GValue *value,
+                             GParamSpec   *pspec)
+
+{
+  GtkImageView *image_view = (GtkImageView *) object;
+
+  switch (prop_id)
+    {
+      case PROP_SCALE:
+        gtk_image_view_set_scale (image_view, g_value_get_double (value));
+        break;
+      case PROP_ANGLE:
+        gtk_image_view_set_angle (image_view, g_value_get_double (value));
+        break;
+      case PROP_ZOOM_MODE:
+        gtk_image_view_set_zoom_mode (image_view, g_value_get_enum (value));
+        break;
+      case PROP_SNAP_ANGLE:
+        gtk_image_view_set_snap_angle (image_view, g_value_get_boolean (value));
+        break;
+      case PROP_HADJUSTMENT:
+        gtk_image_view_set_hadjustment (image_view, g_value_get_object (value));
+        break;
+       case PROP_VADJUSTMENT:
+        gtk_image_view_set_vadjustment (image_view, g_value_get_object (value));
+        break;
+      case PROP_HSCROLL_POLICY:
+        ;
+        break;
+      case PROP_VSCROLL_POLICY:
+        ;
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+
+static void
+gtk_image_view_get_property (GObject    *object,
+                             guint       prop_id,
+                             GValue     *value,
+                             GParamSpec *pspec)
+{
+  GtkImageView *image_view  = (GtkImageView *)object;
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  switch (prop_id)
+    {
+      case PROP_SCALE:
+        g_value_set_double (value, priv->scale);
+        break;
+      case PROP_ANGLE:
+        g_value_set_double (value, priv->angle);
+        break;
+      case PROP_ZOOM_MODE:
+        g_value_set_enum (value, priv->zoom_mode);
+        break;
+      case PROP_SNAP_ANGLE:
+        g_value_set_boolean (value, priv->snap_angle);
+        break;
+      case PROP_HADJUSTMENT:
+        g_value_set_object (value, priv->hadjustment);
+        break;
+      case PROP_VADJUSTMENT:
+        g_value_set_object (value, priv->vadjustment);
+        break;
+      case PROP_HSCROLL_POLICY:
+        ;
+        break;
+      case PROP_VSCROLL_POLICY:
+        ;
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+gtk_image_view_finalize (GObject *object)
+{
+  GtkImageView *image_view  = (GtkImageView *)object;
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+
+  gtk_image_view_stop_animation (image_view);
+
+  g_clear_object (&priv->rotate_gesture);
+  g_clear_object (&priv->zoom_gesture);
+
+  g_clear_object (&priv->hadjustment);
+  g_clear_object (&priv->hadjustment);
+
+  if (priv->image_surface)
+    cairo_surface_destroy (priv->image_surface);
+
+
+
+  G_OBJECT_CLASS (gtk_image_view_parent_class)->finalize (object);
+}
+
+/* }}} GObject API */
+
+static void
+gtk_image_view_class_init (GtkImageViewClass *view_class)
+{
+  GObjectClass   *object_class = (GObjectClass *)view_class;
+  GtkWidgetClass *widget_class = (GtkWidgetClass *)view_class;
+
+  object_class->set_property = gtk_image_view_set_property;
+  object_class->get_property = gtk_image_view_get_property;
+  object_class->finalize     = gtk_image_view_finalize;
+
+  widget_class->draw          = gtk_image_view_draw;
+  widget_class->realize       = gtk_image_view_realize;
+  widget_class->size_allocate = gtk_image_view_size_allocate;
+  widget_class->get_preferred_width  = gtk_image_view_get_preferred_width;
+  widget_class->get_preferred_height = gtk_image_view_get_preferred_height;
+
+  widget_props[PROP_SCALE] = g_param_spec_double ("scale",
+                                                  P_("Scale"),
+                                                  P_("foobar scale"),
+                                                  -G_MAXDOUBLE,
+                                                  G_MAXDOUBLE,
+                                                  0.0,
+                                                  GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  widget_props[PROP_ANGLE] = g_param_spec_double ("angle",
+                                                  P_("angle"),
+                                                  P_("angle"),
+                                                  -G_MAXDOUBLE,
+                                                  G_MAXDOUBLE,
+                                                  0.0,
+                                                  GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  widget_props[PROP_ZOOM_MODE] = g_param_spec_enum("zoom-mode",
+                                                   P_("zoom mode"),
+                                                   P_("zoommode"),
+                                                   GTK_TYPE_IMAGE_VIEW_ZOOM_MODE,
+                                                   GTK_IMAGE_VIEW_ZOOM_MODE_NONE,
+                                                   GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  widget_props[PROP_ROTATE_ENABLED] = g_param_spec_boolean ("rotate-gesture-enabled",
+                                                            P_("Foo"),
+                                                            P_("fooar"),
+                                                            TRUE,
+                                                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+  widget_props[PROP_ZOOM_ENABLED] = g_param_spec_boolean ("zoom-gesture-enabled",
+                                                            P_("Foo"),
+                                                            P_("fooar"),
+                                                            TRUE,
+                                                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+  widget_props[PROP_SNAP_ANGLE] = g_param_spec_boolean ("snap-angle",
+                                                        P_("Foo"),
+                                                        P_("fooar"),
+                                                        FALSE,
+                                                        GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+
+
+  widget_signals[PREPARE_IMAGE] = g_signal_new (I_("prepare-image"),
+                                                G_TYPE_FROM_CLASS (object_class),
+                                                G_SIGNAL_RUN_LAST,
+                                                G_STRUCT_OFFSET (GtkImageViewClass, prepare_image),
+                                                NULL, NULL,
+                                                _gtk_marshal_VOID__VOID,
+                                                G_TYPE_NONE, 0);
+
+  g_object_class_install_properties (object_class, LAST_WIDGET_PROPERTY, widget_props);
+
+  g_object_class_override_property (object_class, PROP_HADJUSTMENT,    "hadjustment");
+  g_object_class_override_property (object_class, PROP_VADJUSTMENT,    "vadjustment");
+  g_object_class_override_property (object_class, PROP_HSCROLL_POLICY, "hscroll-policy");
+  g_object_class_override_property (object_class, PROP_VSCROLL_POLICY, "vscroll-policy");
+}
+
+GtkWidget *
+gtk_image_view_new ()
+{
+  return g_object_new (GTK_TYPE_IMAGE_VIEW, NULL);
+}
+
+
+static GdkPixbuf *
+gtk_image_view_get_current_frame (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+
+  g_assert (priv->source_animation);
+
+  if (priv->is_animation)
+    return gdk_pixbuf_animation_iter_get_pixbuf (priv->source_animation_iter);
+  else
+    return gdk_pixbuf_animation_get_static_image (priv->source_animation);
+}
+
+
+static void
+gtk_image_view_update_surface (GtkImageView *image_view)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  int cur_width  = gdk_pixbuf_animation_get_width (priv->source_animation);
+  int cur_height = gdk_pixbuf_animation_get_height (priv->source_animation);
+  GdkPixbuf *frame = gtk_image_view_get_current_frame (image_view);
+
+  if (!priv->image_surface ||
+      cairo_image_surface_get_width  (priv->image_surface) != cur_width ||
+      cairo_image_surface_get_height (priv->image_surface) != cur_height)
+    {
+      if (priv->image_surface)
+        cairo_surface_destroy (priv->image_surface);
+
+      priv->image_surface = gdk_cairo_surface_create_from_pixbuf (frame,
+                                                                  1,
+                                                                  gtk_widget_get_window ((GtkWidget 
*)image_view));
+      cairo_surface_reference (priv->image_surface);
+    }
+  else
+    {
+      gdk_cairo_surface_paint_pixbuf (priv->image_surface, frame);
+    }
+  g_assert (priv->image_surface != NULL);
+
+  g_signal_emit (image_view, widget_signals[PREPARE_IMAGE], 0, priv->image_surface);
+
+  gtk_widget_queue_resize ((GtkWidget *)image_view);
+}
+
+
+static void
+gtk_image_view_load_image_from_stream (GtkImageView *image_view,
+                                       GInputStream *input_stream,
+                                       GCancellable *cancellable,
+                                       GError       *error)
+{
+  GtkImageViewPrivate *priv = gtk_image_view_get_instance_private (image_view);
+  GdkPixbufAnimation *result;
+  result = gdk_pixbuf_animation_new_from_stream (G_INPUT_STREAM (input_stream),
+                                                 cancellable,
+                                                 &error);
+
+  g_object_unref (input_stream);
+  if (error)
+    {
+      g_error ("error!");
+    }
+  else
+    {
+      if (priv->source_animation)
+        {
+          g_assert (priv->image_surface);
+          /*cairo_surface_destroy (priv->image_surface);*/
+          // Cleanup old pixbufanimation, iter, surface, ...
+          if (priv->is_animation)
+            gtk_image_view_stop_animation (image_view);
+
+        }
+      /*g_task_return_pointer (task, result, g_object_unref);*/
+      g_message ("Updating surface...");
+      priv->source_animation = result;
+      priv->is_animation = !gdk_pixbuf_animation_is_static_image (result);
+      if (priv->is_animation)
+        {
+          priv->source_animation_iter = gdk_pixbuf_animation_get_iter (priv->source_animation,
+                                                                       NULL);
+          gtk_image_view_start_animation (image_view);
+        }
+      gtk_image_view_update_surface (image_view);
+    }
+
+}
+
+static void
+gtk_image_view_load_image_contents (GTask        *task,
+                                    gpointer      source_object,
+                                    gpointer      task_data,
+                                    GCancellable *cancellable)
+{
+  GtkImageView *image_view = source_object;
+  GFile *file = task_data;
+  GError *error = NULL;
+  GFileInputStream *in_stream;
+
+  in_stream = g_file_read (file, cancellable, &error);
+
+  if (error)
+    {
+      g_task_return_error (task, error);
+      g_message ("g_file_read error: %s", error->message);
+      return;
+    }
+
+
+  gtk_image_view_load_image_from_stream (image_view,
+                                         G_INPUT_STREAM (in_stream),
+                                         cancellable,
+                                         error);
+
+  if (error)
+    g_task_return_error (task, error);
+}
+
+
+void
+gtk_image_view_load_from_file_async (GtkImageView        *image_view,
+                                     GFile               *file,
+                                     GCancellable        *cancellable,
+                                     GAsyncReadyCallback  callback,
+                                     gpointer             user_data)
+{
+  GTask *task;
+  g_return_if_fail (GTK_IS_IMAGE_VIEW (image_view));
+  g_return_if_fail (G_IS_FILE (file));
+
+  task = g_task_new (image_view, cancellable, callback, user_data);
+  g_task_set_task_data (task, file, (GDestroyNotify)g_object_unref);
+  g_task_run_in_thread (task, gtk_image_view_load_image_contents);
+
+  g_object_unref (task);
+}
+void
+gtk_image_view_load_from_file_finish   (GtkImageView  *image_view,
+                                        GAsyncResult  *result,
+                                        GError       **error)
+{
+  g_return_if_fail (g_task_is_valid (result, image_view));
+}
+
+
+
+
+void
+gtk_image_view_load_from_stream_async (GtkImageView *image_view,
+                                       GInputStream *input_stream)
+{
+
+}
+void
+gtk_image_view_load_from_stream_finish (GtkImageView  *image_view,
+                                        GAsyncResult  *result,
+                                        GError       **error)
+{
+
+}
diff --git a/gtk/gtkimageview.h b/gtk/gtkimageview.h
new file mode 100644
index 0000000..bcc3109
--- /dev/null
+++ b/gtk/gtkimageview.h
@@ -0,0 +1,118 @@
+#ifndef __GTK_IMAGE_VIEW_H__
+#define __GTK_IMAGE_VIEW_H__
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkwidget.h>
+
+
+G_BEGIN_DECLS
+
+
+#define GTK_TYPE_IMAGE_VIEW            (gtk_image_view_get_type ())
+#define GTK_IMAGE_VIEW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_IMAGE_VIEW, 
GtkImageView))
+#define GTK_IMAGE_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMAGE_VIEW, 
GtkImageViewClass))
+#define GTK_IS_IMAGE_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_IMAGE_VIEW))
+#define GTK_IS_IMAGE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_IMAGE_VIEW))
+#define GTK_IMAGE_VIEW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_IMAGE_VIEW, 
GtkImageViewClass))
+
+
+typedef struct _GtkImageView              GtkImageView;
+typedef struct _GtkImageViewPrivate       GtkImageViewPrivate;
+typedef struct _GtkImageViewClass         GtkImageViewClass;
+
+
+struct _GtkImageView
+{
+  GtkWidget parent_instance;
+};
+
+struct _GtkImageViewClass
+{
+  GtkWidgetClass parent_class;
+  void (* prepare_image) (cairo_surface_t *image);
+};
+
+typedef enum
+{
+  GTK_IMAGE_VIEW_ZOOM_MODE_ORIGINAL,
+  GTK_IMAGE_VIEW_ZOOM_MODE_FIT,
+  GTK_IMAGE_VIEW_ZOOM_MODE_NONE
+} GtkImageViewZoomMode;
+
+
+GDK_AVAILABLE_IN_3_18
+GType         gtk_image_view_get_type (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_3_18
+GtkWidget *   gtk_image_view_new      ();
+
+
+/* Loading {{{ */
+
+GDK_AVAILABLE_IN_3_18
+void          gtk_image_view_load_from_file_async    (GtkImageView        *image_view,
+                                                      GFile               *file,
+                                                      GCancellable        *cancellable,
+                                                      GAsyncReadyCallback  callback,
+                                                      gpointer             user_data);
+GDK_AVAILABLE_IN_3_18
+void          gtk_image_view_load_from_file_finish   (GtkImageView  *image_view,
+                                                      GAsyncResult  *result,
+                                                      GError       **error);
+GDK_AVAILABLE_IN_3_18
+void          gtk_image_view_load_from_stream_async  (GtkImageView  *image_view,
+                                                      GInputStream  *stream);
+GDK_AVAILABLE_IN_3_18
+void          gtk_image_view_load_from_stream_finish (GtkImageView  *image_view,
+                                                      GAsyncResult  *result,
+                                                      GError       **error);
+
+/* }}} */
+
+/* Setters/Getters {{{ */
+GDK_AVAILABLE_IN_3_18
+void   gtk_image_view_set_scale (GtkImageView *image_view, double scale);
+
+GDK_AVAILABLE_IN_3_18
+double gtk_image_view_get_scale (GtkImageView *image_view);
+
+
+
+GDK_AVAILABLE_IN_3_18
+void  gtk_image_view_set_angle (GtkImageView *image_view, double angle);
+
+GDK_AVAILABLE_IN_3_18
+double gtk_image_view_get_angle (GtkImageView *image_view);
+
+
+
+GDK_AVAILABLE_IN_3_18
+void gtk_image_view_set_zoom_mode (GtkImageView         *image_view,
+                                   GtkImageViewZoomMode  zoom_mode);
+
+GDK_AVAILABLE_IN_3_18
+GtkImageViewZoomMode gtk_image_view_get_zoom_mode (GtkImageView *image_view);
+
+
+
+GDK_AVAILABLE_IN_3_18
+gboolean gtk_image_view_snap_angle (GtkImageView *image_view);
+
+GDK_AVAILABLE_IN_3_18
+void gtk_image_view_set_snap_angle (GtkImageView *image_view,
+                                    gboolean      snap_rotation);
+
+
+
+// XXX Adding a gtk_image_view_set_pixbuf would work, but we are working with animations internally...
+
+
+
+/* }}} */
+
+G_END_DECLS
+
+#endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]