merge evince-threads branch

[evince.git] / ps / ps-document.h

diff --git a/ps/ps-document.h b/ps/ps-document.h
index f7c8e92d6be94c0f7f1cc16ec602ed9c2857d831..1c6761bd6db21d85f0cf54b2d76942205301f676 100644 (file)
--- a/ps/ps-document.h
+++ b/ps/ps-document.h
@@ -35,23 +35,18 @@ G_BEGIN_DECLS
 #define PS_TYPE_DOCUMENT         (ps_document_get_type())
 #define PS_DOCUMENT(obj)         GTK_CHECK_CAST (obj, ps_document_get_type (), PSDocument)
 #define PS_DOCUMENT_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, ps_document_get_type (), PSDocumentClass)
-#define GTK_IS_GS(obj)           GTK_CHECK_TYPE (obj, ps_document_get_type())
+#define PS_IS_DOCUMENT(obj)      GTK_CHECK_TYPE (obj, ps_document_get_type())
 
 typedef struct _PSDocument PSDocument;
 typedef struct _PSDocumentClass PSDocumentClass;
 
 struct _PSDocument {
   GObject object;
-  GdkWindow *pstarget;          /* the window passed to gv
-                                 * it is a child of widget...
-                                 */
-  GdkGC *psgc;
-
-  GdkPixmap *bpixmap;           /* Backing pixmap */
 
+  GdkWindow *pstarget;
+  GdkPixmap *bpixmap;
   long message_window;          /* Used by ghostview to receive messages from app */
 
-  int disable_start;            /* Can the interpreter be started? */
   pid_t interpreter_pid;        /* PID of interpreter, -1 if none  */
   int interpreter_input;        /* stdin of interpreter            */
   int interpreter_output;       /* stdout of interpreter           */
@@ -60,22 +55,19 @@ struct _PSDocument {
   guint interpreter_output_id;
   guint interpreter_error_id;
 
+  gint width;                   /* Size of window at last setup()  */
   gint llx;
   gint lly;
   gint urx;
   gint ury;
-  gint left_margin;
-  gint right_margin;
-  gint top_margin;
-  gint bottom_margin;
-  gint width;                   /* Size of window at last setup()  */
   gint height;
+  gint orientation;
   gboolean busy;                /* Is gs busy drawing? */
-  gboolean changed;             /* Anything changed since setup */
   gfloat zoom_factor;
   gint current_page;
   gboolean structured_doc;
   gboolean loaded;
+  gboolean changed;
 
   struct record_list *ps_input;
   gchar *input_buffer_ptr;
@@ -84,30 +76,16 @@ struct _PSDocument {
 
   FILE *gs_psfile;              /* the currently loaded FILE */
   gchar *gs_filename;           /* the currently loaded filename */
-  gchar *gs_filename_dsc;       /* Used to browse PDF to PS */
   gchar *gs_filename_unc;       /* Uncompressed file */
   gchar *input_buffer;
-  gint gs_scanstyle;
   gboolean send_filename_to_gs; /* True if gs should read from file directly */
   gboolean reading_from_pipe;   /* True if ggv is reading input from pipe */
   struct document *doc;
 
-  /* User selected options... */
-  gboolean antialiased;         /* Using antialiased display */
-  gboolean respect_eof;         /* respect EOF comments? */
-  gint default_size;
-  gfloat xdpi, ydpi;
-  gint fallback_orientation;    /* Orientation to use if override */
-  gint real_orientation;        /* Real orientation from the document */
-
   const gchar *gs_status;       /* PSDocument status */
 
-  guint avail_w, avail_h;
-
   int page_x_offset;
   int page_y_offset;
-
-  gboolean scaling;
 };
 
 struct _PSDocumentClass {