Fixes bug #542924. Makes enums static to fix Solaris build.

[evince.git] / shell / ev-jobs.h

diff --git a/shell/ev-jobs.h b/shell/ev-jobs.h
index 6a35c834e7c013a6baab4bee8141d978dcedee4e..c63a32c449408d885d209c32ce3732b272219268 100644 (file)
--- a/shell/ev-jobs.h
+++ b/shell/ev-jobs.h
@@ -123,11 +123,25 @@ struct _EvJobLinksClass
        EvJobClass parent_class;
 };
 
        EvJobClass parent_class;
 };
 

+typedef enum {
+       EV_RENDER_INCLUDE_NONE      = 0,
+       EV_RENDER_INCLUDE_LINKS     = 1 << 0,
+       EV_RENDER_INCLUDE_TEXT      = 1 << 1,
+       EV_RENDER_INCLUDE_SELECTION = 1 << 2,
+       EV_RENDER_INCLUDE_IMAGES    = 1 << 3,
+       EV_RENDER_INCLUDE_FORMS     = 1 << 4,
+       EV_RENDER_INCLUDE_ALL       = (1 << 5) - 1
+} EvRenderFlags;
+

 struct _EvJobRender
 {
        EvJob parent;
 
 struct _EvJobRender
 {
        EvJob parent;
 

-       EvRenderContext *rc;
+       gint page;
+       gint rotation;
+       gdouble scale;
+
+       EvPage *ev_page;

        gboolean page_ready;
        gint target_width;
        gint target_height;
        gboolean page_ready;
        gint target_width;
        gint target_height;


@@ -145,11 +159,7 @@ struct _EvJobRender
        GdkColor base;
        GdkColor text; 
 
        GdkColor base;
        GdkColor text; 
 

-       gint include_forms : 1;
-       gint include_links : 1;
-       gint include_text : 1;
-       gint include_selection : 1;
-       gint include_images : 1;
+       EvRenderFlags flags;

 };
 
 struct _EvJobRenderClass
 };
 
 struct _EvJobRenderClass


@@ -163,7 +173,10 @@ struct _EvJobThumbnail
 {
        EvJob parent;
 
 {
        EvJob parent;
 

-       EvRenderContext *rc;
+       gint page;
+       gint rotation;
+       gdouble scale;
+       

        GdkPixbuf *thumbnail;
 };
 
        GdkPixbuf *thumbnail;
 };
 


@@ -189,6 +202,7 @@ struct _EvJobLoad
        
        EvLinkDest *dest;
        EvWindowRunMode mode;
        
        EvLinkDest *dest;
        EvWindowRunMode mode;

+       gchar *search_string;

        GError *error;
        gchar *uri;
 };
        GError *error;
        gchar *uri;
 };


@@ -247,24 +261,25 @@ void            ev_job_links_run          (EvJobLinks     *thumbnail);
 /* EvJobRender */
 GType           ev_job_render_get_type    (void) G_GNUC_CONST;
 EvJob          *ev_job_render_new         (EvDocument      *document,
 /* EvJobRender */
 GType           ev_job_render_get_type    (void) G_GNUC_CONST;
 EvJob          *ev_job_render_new         (EvDocument      *document,

-                                          EvRenderContext *rc,
+                                          gint             page,
+                                          gint             rotation,
+                                          gdouble          scale,

                                           gint             width,
                                           gint             height,
                                           gint             width,
                                           gint             height,

+                                          EvRenderFlags    flags);
+void     ev_job_render_set_selection_info (EvJobRender     *job,

                                           EvRectangle     *selection_points,
                                           EvSelectionStyle selection_style,
                                           GdkColor        *text,
                                           EvRectangle     *selection_points,
                                           EvSelectionStyle selection_style,
                                           GdkColor        *text,

-                                          GdkColor        *base,
-                                          gboolean         include_forms,
-                                          gboolean         include_links,
-                                          gboolean         include_images,
-                                          gboolean         include_text,
-                                          gboolean         include_selection);
+                                          GdkColor        *base);

 void            ev_job_render_run         (EvJobRender     *thumbnail);
 
 /* EvJobThumbnail */
 GType           ev_job_thumbnail_get_type (void) G_GNUC_CONST;
 EvJob          *ev_job_thumbnail_new      (EvDocument      *document,
 void            ev_job_render_run         (EvJobRender     *thumbnail);
 
 /* EvJobThumbnail */
 GType           ev_job_thumbnail_get_type (void) G_GNUC_CONST;
 EvJob          *ev_job_thumbnail_new      (EvDocument      *document,

-                                          EvRenderContext *rc);
+                                          gint             page,
+                                          gint             rotation,
+                                          gdouble          scale);

 void            ev_job_thumbnail_run      (EvJobThumbnail  *thumbnail);
 
 /* EvJobFonts */
 void            ev_job_thumbnail_run      (EvJobThumbnail  *thumbnail);
 
 /* EvJobFonts */


@@ -276,7 +291,8 @@ void                ev_job_fonts_run          (EvJobFonts      *fonts);
 GType          ev_job_load_get_type      (void) G_GNUC_CONST;
 EvJob         *ev_job_load_new           (const gchar     *uri,
                                           EvLinkDest      *dest,
 GType          ev_job_load_get_type      (void) G_GNUC_CONST;
 EvJob         *ev_job_load_new           (const gchar     *uri,
                                           EvLinkDest      *dest,

-                                          EvWindowRunMode  mode);
+                                          EvWindowRunMode  mode,
+                                          const gchar     *search_string);

 void            ev_job_load_set_uri       (EvJobLoad       *load,
                                           const gchar     *uri);
 void           ev_job_load_run           (EvJobLoad       *load);
 void            ev_job_load_set_uri       (EvJobLoad       *load,
                                           const gchar     *uri);
 void           ev_job_load_run           (EvJobLoad       *load);