Use util_clip_triangle() in pan_item_tri_new()

[geeqie.git] / src / pixbuf-renderer.h

diff --git a/src/pixbuf-renderer.h b/src/pixbuf-renderer.h
index a4a5c97..fb4b298 100644 (file)
--- a/src/pixbuf-renderer.h
+++ b/src/pixbuf-renderer.h
@@ -22,6 +22,16 @@
 #ifndef PIXBUF_RENDERER_H
 #define PIXBUF_RENDERER_H
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "typedefs.h"
+
+struct PixbufRenderer;
+
 #define TYPE_PIXBUF_RENDERER           (pixbuf_renderer_get_type())
 #define PIXBUF_RENDERER(obj)           (G_TYPE_CHECK_INSTANCE_CAST((obj), TYPE_PIXBUF_RENDERER, PixbufRenderer))
 #define PIXBUF_RENDERER_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_PIXBUF_RENDERER, PixbufRendererClass))
@@ -61,24 +71,11 @@
 #define ROUND_DOWN(A,B) ((gint)(((A))/(B))*(B))
 
 
-using RendererFuncs = struct _RendererFuncs;
-
-using PixbufRenderer = struct _PixbufRenderer;
-using PixbufRendererClass = struct _PixbufRendererClass;
-
-
 using PixbufRendererTileRequestFunc = gint (*)(PixbufRenderer *, gint, gint, gint, gint, GdkPixbuf *, gpointer);
 using PixbufRendererTileDisposeFunc = void (*)(PixbufRenderer *, gint, gint, gint, gint, GdkPixbuf *, gpointer);
 
 using PixbufRendererPostProcessFunc = void (*)(PixbufRenderer *, GdkPixbuf **, gint, gint, gint, gint, gpointer);
 
-enum PixbufRendererScrollResetType {
-       PR_SCROLL_RESET_TOPLEFT = 0,
-       PR_SCROLL_RESET_CENTER,
-       PR_SCROLL_RESET_NOCHANGE,
-       PR_SCROLL_RESET_COUNT,
-};
-
 enum ImageRenderType {
        TILE_RENDER_NONE = 0, /**< do nothing */
        TILE_RENDER_AREA, /**< render an area of the tile */
@@ -91,10 +88,8 @@ enum OverlayRendererFlags {
        /* OVL_HIDE_ON_SCROLL = 1 << 1*/ /**< hide temporarily when scrolling (not yet implemented) */
 };
 
-struct _RendererFuncs
+struct RendererFuncs
 {
-//     void (*redraw)(void *renderer, gint x, gint y, gint w, gint h,
-  //                   gint clamp, ImageRenderType render, gboolean new_data, gboolean only_existing);
     void (*area_changed)(void *renderer, gint src_x, gint src_y, gint src_w, gint src_h); /**< pixbuf area changed */
        void (*invalidate_region)(void *renderer, gint x, gint y, gint w, gint h);
        void (*scroll)(void *renderer, gint x_off, gint y_off); /**< scroll */
@@ -111,7 +106,7 @@ struct _RendererFuncs
        void (*free)(void *renderer);
 };
 
-struct _PixbufRenderer
+struct PixbufRenderer
 {
        GtkEventBox eventbox;
 
@@ -144,7 +139,7 @@ struct _PixbufRenderer
        gint y_scroll;
 
        gdouble norm_center_x;  /**< coordinates of viewport center in the image, in range 0.0 - 1.0 */
-       gdouble norm_center_y;  /**< these coordinates are used for PR_SCROLL_RESET_NOCHANGE and should be preserved over periods with NULL pixbuf */
+       gdouble norm_center_y;  /**< these coordinates are used for ScrollReset::NOCHANGE and should be preserved over periods with NULL pixbuf */
 
        gdouble subpixel_x_scroll; /**< subpixel scroll alignment, used to prevent accumulation of rounding errors */
        gdouble subpixel_y_scroll;
@@ -160,7 +155,7 @@ struct _PixbufRenderer
        gboolean zoom_2pass;
        gboolean zoom_expand;
 
-       PixbufRendererScrollResetType scroll_reset;
+       ScrollReset scroll_reset;
 
        gboolean has_frame;
 
@@ -174,7 +169,7 @@ struct _PixbufRenderer
        gint autofit_limit_size;
        gint enlargement_limit_size;
 
-       GdkColor color;
+       GdkRGBA color;
 
        /*< private >*/
        gboolean in_drag;
@@ -231,7 +226,7 @@ struct _PixbufRenderer
        gboolean ignore_alpha;
 };
 
-struct _PixbufRendererClass
+struct PixbufRendererClass
 {
        GtkEventBoxClass parent_class;
 
@@ -247,12 +242,11 @@ struct _PixbufRendererClass
 
 
 
-GType pixbuf_renderer_get_type(void);
+GType pixbuf_renderer_get_type();
 
-PixbufRenderer *pixbuf_renderer_new(void);
+PixbufRenderer *pixbuf_renderer_new();
 
 void pixbuf_renderer_set_parent(PixbufRenderer *pr, GtkWindow *window);
-GtkWindow *pixbuf_renderer_get_parent(PixbufRenderer *pr);
 
 /**
  * @headerfile pixbuf_renderer_set_pixbuf
@@ -269,7 +263,6 @@ void pixbuf_renderer_set_pixbuf_lazy(PixbufRenderer *pr, GdkPixbuf *pixbuf, gdou
 GdkPixbuf *pixbuf_renderer_get_pixbuf(PixbufRenderer *pr);
 
 void pixbuf_renderer_set_orientation(PixbufRenderer *pr, gint orientation);
-gint pixbuf_renderer_get_orientation(PixbufRenderer *pr);
 
 /**
  * @headerfile pixbuf_renderer_set_stereo_data
@@ -335,18 +328,11 @@ gboolean pixbuf_renderer_get_scaled_size(PixbufRenderer *pr, gint *width, gint *
  */
 gboolean pixbuf_renderer_get_visible_rect(PixbufRenderer *pr, GdkRectangle *rect);
 
-/**
- * @headerfile pixbuf_renderer_get_virtual_rect
- * actual size of the PixbufRenderer window minus borders,
- * x and y are the scroll offset and include zoom factor.
- */
-gboolean pixbuf_renderer_get_virtual_rect(PixbufRenderer *pr, GdkRectangle *rect);
-
 /**
  * @headerfile pixbuf_renderer_set_color
  *  background color
  */
-void pixbuf_renderer_set_color(PixbufRenderer *pr, GdkColor *color);
+void pixbuf_renderer_set_color(PixbufRenderer *pr, GdkRGBA *color);
 
 /* overlay */
 
@@ -373,11 +359,10 @@ gint pixbuf_renderer_stereo_get(PixbufRenderer *pr);
 void pixbuf_renderer_stereo_fixed_set(PixbufRenderer *pr, gint width, gint height, gint x1, gint y1, gint x2, gint y2);
 
 /**
- * @struct _SourceTile
+ * @struct SourceTile
  * protected - for renderer use only
  */
-using SourceTile = struct _SourceTile;
-struct _SourceTile
+struct SourceTile
 {
        gint x;
        gint y;