Trim trailing white spaces on empty lines.

[geeqie.git] / src / typedefs.h

diff --git a/src/typedefs.h b/src/typedefs.h
index 3e7d304..482c05a 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2010 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -50,7 +50,8 @@ typedef enum {
        SORT_SIZE,
        SORT_TIME,
        SORT_PATH,
-       SORT_NUMBER
+       SORT_NUMBER,
+       SORT_EXIFTIME
 } SortType;
 
 typedef enum {
@@ -139,7 +140,7 @@ typedef enum {
        NOTIFY_PRIORITY_MEDIUM,
        NOTIFY_PRIORITY_LOW
 } NotifyPriority;
-       
+
 typedef enum {
        NOTIFY_MARKS            = 1 << 1, /* changed marks */
        NOTIFY_PIXBUF           = 1 << 2, /* image was read into fd->pixbuf */
@@ -158,11 +159,11 @@ typedef enum {
        CHANGE_WARN_SAME               = 1 << 2,
        CHANGE_WARN_CHANGED_EXT        = 1 << 3,
        CHANGE_WARN_UNSAVED_META       = 1 << 4,
+       CHANGE_WARN_NO_WRITE_PERM_DEST_DIR  = 1 << 5,
        CHANGE_ERROR_MASK              = (~0) << 8, /* the values below are fatal errors */
        CHANGE_NO_READ_PERM            = 1 << 8,
        CHANGE_NO_WRITE_PERM_DIR       = 1 << 9,
        CHANGE_NO_DEST_DIR             = 1 << 10,
-       CHANGE_NO_WRITE_PERM_DEST_DIR  = 1 << 11,
        CHANGE_NO_WRITE_PERM_DEST      = 1 << 12,
        CHANGE_DEST_EXISTS             = 1 << 13,
        CHANGE_NO_SRC                  = 1 << 14,
@@ -193,19 +194,22 @@ typedef enum {
        PR_STEREO_HORIZ          = 1 << 2, /* side by side */
        PR_STEREO_VERT           = 1 << 3, /* above below */
        PR_STEREO_RIGHT          = 1 << 4, /* render right buffer */
-       PR_STEREO_ANAGLYPH       = 1 << 5, /* anaglyph */
+       PR_STEREO_ANAGLYPH_RC    = 1 << 5, /* anaglyph red-cyan */
+       PR_STEREO_ANAGLYPH_GRAY  = 1 << 6, /* anaglyph gray red-cyan*/
+       PR_STEREO_ANAGLYPH_DB    = 1 << 7, /* anaglyph dubois*/
+       PR_STEREO_ANAGLYPH       = PR_STEREO_ANAGLYPH_RC | PR_STEREO_ANAGLYPH_GRAY | PR_STEREO_ANAGLYPH_DB, /* anaglyph mask */
 
-       PR_STEREO_MIRROR_LEFT    = 1 << 6, /* mirror */
-       PR_STEREO_FLIP_LEFT      = 1 << 7, /* flip */
+       PR_STEREO_MIRROR_LEFT    = 1 << 8, /* mirror */
+       PR_STEREO_FLIP_LEFT      = 1 << 9, /* flip */
 
-       PR_STEREO_MIRROR_RIGHT   = 1 << 8, /* mirror */
-       PR_STEREO_FLIP_RIGHT     = 1 << 9, /* flip */
+       PR_STEREO_MIRROR_RIGHT   = 1 << 10, /* mirror */
+       PR_STEREO_FLIP_RIGHT     = 1 << 11, /* flip */
 
        PR_STEREO_MIRROR         = PR_STEREO_MIRROR_LEFT | PR_STEREO_MIRROR_RIGHT, /* mirror mask*/
        PR_STEREO_FLIP           = PR_STEREO_FLIP_LEFT | PR_STEREO_FLIP_RIGHT, /* flip mask*/
-       PR_STEREO_SWAP           = 1 << 10,  /* swap left and right buffers */
-       PR_STEREO_TEMP_DISABLE   = 1 << 11  /* temporarily disable stereo mode if source image is not stereo */
-       
+       PR_STEREO_SWAP           = 1 << 12,  /* swap left and right buffers */
+       PR_STEREO_TEMP_DISABLE   = 1 << 13,  /* temporarily disable stereo mode if source image is not stereo */
+       PR_STEREO_HALF           = 1 << 14
 } PixbufRendererStereoMode;
 
 typedef enum {
@@ -483,7 +487,7 @@ struct _FileDataChangeInfo {
 };
 
 struct _FileData {
-       gint magick;
+       guint magick;
        gint type;
        gchar *original_path; /* key to file_data_pool hash table */
        gchar *path;
@@ -494,7 +498,8 @@ struct _FileData {
        gint64 size;
        time_t date;
        mode_t mode; /* this is needed at least for notification in view_dir because it is preserved after the file/directory is deleted */
-       
+       gint sidecar_priority;
+
        guint marks; /* each bit represents one mark */
        guint valid_marks; /* zero bit means that the corresponding mark needs to be reread */
 
@@ -506,7 +511,7 @@ struct _FileData {
 
        GdkPixbuf *pixbuf; /* full-size image, only complete images, NULL during loading
                              all FileData with non-NULL pixbuf are referenced by image_cache */
-                             
+
        HistMap *histmap;
 
        gint ref;
@@ -515,9 +520,11 @@ struct _FileData {
 
        gint user_orientation;
        gint exif_orientation;
-       
+
        ExifData *exif;
+       time_t exifdate;
        GHashTable *modified_xmp; // hash table which contains unwritten xmp metadata in format: key->list of string values
+       GList *cached_metadata;
 };
 
 struct _LayoutOptions
@@ -666,7 +673,7 @@ struct _LayoutWindow
        GtkWidget *info_details;
        GtkWidget *info_zoom;
        GtkWidget *info_pixel;
-       
+
        /* slide show */
 
        SlideShowData *slideshow;
@@ -775,7 +782,7 @@ struct _ViewFile
        gboolean marks_enabled;
        gint active_mark;
        gint clicked_mark;
-       
+
        /* refresh */
        guint refresh_idle_id; /* event source id */
        time_t time_refresh_set; /* time when refresh_idle_id was set */
@@ -861,6 +868,8 @@ struct _FullScreenData
 
        void (*stop_func)(FullScreenData *, gpointer);
        gpointer stop_data;
+
+       gboolean same_region; /* the returned region will overlap the current location of widget. */
 };
 
 struct _PixmapFolders