File epdfview-0.1.7-windows.patch of Package mingw32-epdfview

Overview Repositories Revisions Requests Users Attributes Meta

File epdfview-0.1.7-windows.patch of Package mingw32-epdfview (Revision fca9686b521db1c7317c305e84542943)

Currently displaying revision fca9686b521db1c7317c305e84542943 , Show latest

--- configure.ac	2009-02-28 22:00:49.000000000 +0100
+++ configure.ac	2011-02-17 13:53:50.000000000 +0100
@@ -5,6 +5,7 @@
 AC_COPYRIGHT([Copyright (C) 2006, 2007, 2009 Emma's Software.])
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
+AC_CANONICAL_HOST
 
 dnl Parameters.
 AC_ARG_ENABLE([debug], [  --enable-debug          turn on debugging [[default=no]]])
@@ -40,19 +41,42 @@
 AC_SUBST([POPPLER_CFLAGS])
 AC_SUBST([POPPLER_LIBS])
 dnl Check if we have poppler version 0.5.2 or higher.
-PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_052=yes])
-if test "x$have_poppler_052" = "xyes"; then
+PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_0_5_2=yes])
+if test "x$have_poppler_0_5_2" = "xyes"; then
     AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
 fi
-PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
-if test "x$have_poppler_060" = "xyes"; then
+PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_0_6_0=yes])
+if test "x$have_poppler_0_6_0" = "xyes"; then
     AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
 fi
-PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
-if test "x$have_poppler_080" = "xyes"; then
+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_0_8_0=yes])
+if test "x$have_poppler_0_8_0" = "xyes"; then
     AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
 fi
+PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes])
+if test "x$have_poppler_0_15_0" = "xyes"; then
+    AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
+fi
+PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes])
+if test "x$have_poppler_0_15_1" = "xyes"; then
+    AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.])
+fi
+
+
+AC_MSG_CHECKING([for native Win32])
+case "$host" in
+  *-*-mingw*)
+    os_win32=yes
+    ;;
+  *)
+    os_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$os_win32])
 
+AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
+
+if test "$os_win32" != "yes"; then
 EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
 AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
 if test "x$have_cups" = "xyes"; then
@@ -60,6 +84,9 @@
     AC_SUBST([CUPS_LIBS])
     AC_DEFINE([HAVE_CUPS], [1], [Define to 1 if you have the CUPS API library.])
 fi
+else
+  AM_CONDITIONAL(cups_printing, false)
+fi
 
 dnl CPPUnit library
 AM_PATH_CPPUNIT([1.10.2], CPPUNIT="yes")
--- src/gtk/FindView.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/gtk/FindView.cxx	2011-02-17 13:53:44.000000000 +0100
@@ -25,6 +25,11 @@
 
 using namespace ePDFView;
 
+namespace
+{
+    const gchar *g_SlashAccelPath = "<Actions>/ePDFView/Slash";
+}
+
 // Forwards declarations.
 static void find_view_close_cb (GtkWidget *, gpointer);
 static void find_view_next_cb (GtkWidget *, gpointer);
@@ -37,6 +42,8 @@
 FindView::FindView ():
     IFindView ()
 {
+    gtk_accel_map_lookup_entry(g_SlashAccelPath, &m_SlashAccelKey);
+
     m_FindBar = gtk_toolbar_new ();
     // Set the toolbar style to horizontal, so most toolbuttons' labels won't be
     // shown.
@@ -92,6 +99,9 @@
 void
 FindView::hide ()
 {
+    // Restore the slash accelerator's value when no longer searching.
+    gtk_accel_map_change_entry(g_SlashAccelPath, m_SlashAccelKey.accel_key,
+            m_SlashAccelKey.accel_mods, false);
     gtk_entry_set_text (GTK_ENTRY (m_TextToFind), "");
     gtk_widget_hide (m_FindBar);
 }
@@ -136,6 +146,11 @@
 
     IFindView::setPresenter (pter);
 
+    // Map the slash ("/") accelerator to nothing, in order to be able
+    // to add an actual slash to the search text.
+    gtk_accel_map_change_entry(g_SlashAccelPath, 0,
+            m_SlashAccelKey.accel_mods, false);
+
     gtk_widget_show_all (m_FindBar);
     gtk_widget_grab_focus (m_TextToFind);
 
--- src/gtk/FindView.h	2009-02-28 22:00:35.000000000 +0100
+++ src/gtk/FindView.h	2011-02-17 13:53:44.000000000 +0100
@@ -41,6 +41,7 @@
             GtkToolItem *m_FindPrevious;
             GtkWidget *m_InformationText;
             GtkWidget *m_TextToFind;
+            GtkAccelKey m_SlashAccelKey;
     };
 }
 
--- src/gtk/MainView.cxx	2009-02-28 22:00:55.000000000 +0100
+++ src/gtk/MainView.cxx	2011-02-17 13:53:44.000000000 +0100
@@ -77,7 +77,7 @@
 static void main_window_zoom_out_cb (GtkWidget *, gpointer);
 static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
 static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
-static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
+static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
 
 #if defined (HAVE_CUPS)
 static void main_window_print_cb (GtkWidget *, gpointer);
@@ -314,6 +314,15 @@
     gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active);
 }
 
+gboolean
+MainView::isIndexVisible () const
+{
+    GtkAction *showIndex =
+        gtk_ui_manager_get_action (m_UIManager,
+                                   "/MenuBar/ViewMenu/ShowIndex");
+    return gtk_toggle_action_get_active(GTK_TOGGLE_ACTION (showIndex));
+}
+
 gchar *
 MainView::openFileDialog (const gchar *lastFolder)
 {
@@ -431,6 +440,8 @@
             GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
             GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
             NULL);
+    gtk_file_chooser_set_do_overwrite_confirmation (
+            GTK_FILE_CHOOSER (saveDialog), TRUE);
     gtk_dialog_set_alternative_button_order (GTK_DIALOG (saveDialog),
             GTK_RESPONSE_ACCEPT, GTK_RESPONSE_CANCEL, -1);
 
@@ -1479,18 +1490,25 @@
     pter->setPageMode (mode);
 }
 
-void 
+gboolean 
 main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
 {
     g_assert ( NULL != data && "The data parameter is NULL.");
 
     MainPter *pter = (MainPter *)data;
     // Only zoom when the CTRL-Button is down...
-    if ( !(event->state & GDK_CONTROL_MASK) ) return;
-    if ( event->direction == GDK_SCROLL_UP ) {
+    if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )
+    {
+        if ( event->direction == GDK_SCROLL_UP )
+        {
         pter->zoomInActivated ();
-    } else if ( event->direction == GDK_SCROLL_DOWN ) {
+        }
+        else if ( event->direction == GDK_SCROLL_DOWN )
+        {
         pter->zoomOutActivated ();
     }
+        return TRUE;
+    }
+    return FALSE;
 }
 
--- src/gtk/MainView.h	2009-02-28 22:00:35.000000000 +0100
+++ src/gtk/MainView.h	2009-11-16 02:14:53.000000000 +0100
@@ -37,6 +37,7 @@
             void activeZoomWidth (gboolean active);
             void activePageModeScroll (gboolean active);
             void activePageModeText (gboolean active);
+            gboolean isIndexVisible () const;
             gchar *openFileDialog (const gchar *lastFolder);
             gchar *promptPasswordDialog (void);
             gchar *saveFileDialog (const gchar *lastFolder,
--- src/gtk/PageView.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/gtk/PageView.cxx	2011-02-17 13:53:44.000000000 +0100
@@ -26,6 +26,7 @@
 
 // Constants
 static gint PAGE_VIEW_PADDING = 12;
+static gint SCROLL_PAGE_DRAG_LENGTH = 50;
 
 // Forwards declarations.
 static gboolean page_view_button_press_cb (GtkWidget *, GdkEventButton *,
@@ -239,6 +240,8 @@
 void
 PageView::scrollPage (gdouble scrollX, gdouble scrollY, gint dx, gint dy)
 {
+    /* if the page cannot scroll and i'm dragging bottom to up, or left to right, 
+     i will go to the next page. viceversa previous page */
     GtkAdjustment *hAdjustment = gtk_scrolled_window_get_hadjustment (
             GTK_SCROLLED_WINDOW (m_PageScroll));
     gdouble hAdjValue = hAdjustment->page_size *
@@ -256,6 +259,23 @@
             CLAMP (scrollY - vAdjValue,
                    vAdjustment->lower,
                    vAdjustment->upper - vAdjustment->page_size));
+    
+    /* if the page cannot scroll and i'm dragging bottom to up, or left to right, 
+       I will go to the next page. viceversa previous page */
+    if ( (scrollY == (vAdjustment->upper - vAdjustment->page_size) &&
+                dy < (-SCROLL_PAGE_DRAG_LENGTH) ) ||
+        (scrollX == (hAdjustment->upper - hAdjustment->page_size) &&
+         dx < (-SCROLL_PAGE_DRAG_LENGTH)) )
+    {
+        m_Pter->scrollToNextPage();
+        m_Pter->mouseButtonReleased(1);
+    }
+    else if( (scrollY == vAdjustment->lower && dy > SCROLL_PAGE_DRAG_LENGTH) ||
+        (scrollX == hAdjustment->lower && dx > SCROLL_PAGE_DRAG_LENGTH) )
+    {
+        m_Pter->scrollToPreviousPage();
+        m_Pter->mouseButtonReleased(1);
+    }
 }
 
 void 
@@ -527,13 +547,6 @@
 {
     g_assert ( NULL != data && "The data parameter is NULL.");
 
-    // don't scroll when the CRTL-Button is down, because then the page should
-    // actually be zoomed and not scrolled. Zooming is handelt by the MainView
-    // class.
-    if ( event->state & GDK_CONTROL_MASK )
-    {
-        return FALSE;
-    }
     PagePter *pter = (PagePter *)data;
     GtkAdjustment *adjustment = 
         gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
@@ -662,10 +675,12 @@
        case GDK_KP_Enter:
             pter->scrollToNextPage ();
             direction = GTK_SCROLL_START;
+            break;
 
        case GDK_BackSpace:
-            pter->scrollToNextPage ();
+            pter->scrollToPreviousPage ();
             direction = GTK_SCROLL_START;
+            break;
 
        default:
             return FALSE;
--- src/gtk/PrintView.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/gtk/PrintView.cxx	2011-02-17 13:53:44.000000000 +0100
@@ -651,6 +651,14 @@
     createPrinterListModel ();
     m_PrinterListView =
         gtk_tree_view_new_with_model (GTK_TREE_MODEL (m_PrinterList));
+
+    // Add scrollbars to treeview.
+    scrollBox = gtk_scrolled_window_new (NULL, NULL);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollBox),
+      GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+    gtk_container_add (GTK_CONTAINER (scrollBox), m_PrinterListView);
+    gtk_container_add (GTK_CONTAINER (mainBox), scrollBox);
+
     gtk_box_pack_start_defaults (GTK_BOX (mainBox), m_PrinterListView);
 
     {
--- src/gtk/PrintView.h	2009-02-28 22:00:35.000000000 +0100
+++ src/gtk/PrintView.h	2011-02-17 13:53:44.000000000 +0100
@@ -81,6 +81,7 @@
             GtkWidget *m_PrinterListView;
             GtkListStore *m_Resolution;
             GtkWidget *m_ResolutionView;
+            GtkWidget *scrollBox;
 
             void addOptionToList (GtkListStore *optionList,
                                   const gchar *name, const gchar *value);
--- src/IDocument.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/IDocument.cxx	2011-02-17 13:53:44.000000000 +0100
@@ -135,7 +135,11 @@
     m_FindPage = 0;
     m_Format = NULL;
     m_Keywords = NULL;
+#if defined (HAVE_POPPLER_0_15_1)
+    m_Linearized = FALSE;
+#else
     m_Linearized = NULL;
+#endif
     m_ModifiedDate = NULL;
     m_PageCache = NULL;
     m_PageCacheAge = 0;
@@ -164,7 +168,9 @@
     g_free (m_FileName);
     g_free (m_Format);
     g_free (m_Keywords);
+#if !defined (HAVE_POPPLER_0_15_1)
     g_free (m_Linearized);
+#endif
     g_free (m_ModifiedDate);
     g_free (m_Password);
     g_free (m_Producer);
@@ -299,16 +305,17 @@
 /// This is called by the JobLoad class when the document couldn't
 /// be opened. It in turns notifies all attached observers.
 ///
+/// @param fileName The file that was trying to load.
 /// @param error The error message of why couldn't open the document.
 ///
 void
-IDocument::notifyLoadError (const GError *error)
+IDocument::notifyLoadError (const gchar *fileName, const GError *error)
 {
     for ( GList *item = g_list_first (m_Observers) ; NULL != item ;
           item = g_list_next (item) )
     {
         IDocumentObserver *observer = (IDocumentObserver *)item->data;
-        observer->notifyLoadError (error);
+        observer->notifyLoadError (fileName, error);
     }
 }
 
@@ -555,9 +562,8 @@
 void
 IDocument::setTitle (gchar *title)
 {
-    gchar *oldTitle = m_Title;
+    g_free (m_Title);
     m_Title = g_strdup (title);
-    g_free (oldTitle);
     g_free (title);
 }
 
@@ -585,9 +591,8 @@
 void
 IDocument::setAuthor (gchar *author)
 {
-    gchar *oldAuthor = m_Author;
+    g_free(m_Author);
     m_Author = g_strdup (author);
-    g_free (oldAuthor);
     g_free (author);
 }
 
@@ -615,10 +620,9 @@
 void
 IDocument::setSubject (gchar *subject)
 {
-    gchar *oldSubject = m_Subject;
+    g_free (m_Subject);
     m_Subject = g_strdup (subject);
-    g_free (oldSubject);
-    m_Subject = subject;
+    g_free (subject);
 }
 
 ///
@@ -646,9 +650,8 @@
 void
 IDocument::setKeywords (gchar *keywords)
 {
-    gchar *oldKeywords = m_Keywords;
+    g_free(m_Keywords);
     m_Keywords = g_strdup (keywords);
-    g_free (oldKeywords);
     g_free (keywords);
 }
 
@@ -677,9 +680,8 @@
 void
 IDocument::setCreator (gchar *creator)
 {
-    gchar *oldCreator = m_Creator;
+    g_free (m_Creator);
     m_Creator = g_strdup (creator);
-    g_free (oldCreator);
     g_free (creator);
 }
 ///
@@ -707,9 +709,8 @@
 void
 IDocument::setProducer (gchar *producer)
 {
-    gchar *oldProducer = m_Producer;
+    g_free (m_Producer);
     m_Producer = g_strdup (producer);
-    g_free (oldProducer);
     g_free (producer);
 }
 
@@ -739,9 +740,8 @@
 void
 IDocument::setFormat (gchar *format)
 {
-    gchar *oldFormat = m_Format;
+    g_free (m_Format);
     m_Format = g_strdup (format);
-    g_free (oldFormat);
     g_free (format);
 }
 
@@ -755,11 +755,16 @@
 const gchar *
 IDocument::getLinearized ()
 {
+#if defined (HAVE_POPPLER_0_15_1)
+    if ( m_Linearized ) return "Yes";
+    else return "No";
+#else
     if ( NULL == m_Linearized )
     {
         return "No";
     }
     return m_Linearized;
+#endif
 }
 
 ///
@@ -768,14 +773,21 @@
 /// @param linearized Set to "Yes" if the document is linearized. "No"
 ///                   otherwise. IDocument will free it.
 ///
+#if defined (HAVE_POPPLER_0_15_1)
+void
+IDocument::setLinearized (gboolean *linearized)
+{
+    m_Linearized = linearized;
+}
+#else
 void
 IDocument::setLinearized (gchar *linearized)
 {
-    gchar *oldLinearized = m_Linearized;
+    g_free (m_Linearized);
     m_Linearized = g_strdup (linearized);
-    g_free (oldLinearized);
     g_free (linearized);
 }
+#endif
 
 ///
 /// @brief Gets the document's creation date.
@@ -802,9 +814,8 @@
 void
 IDocument::setCreationDate (gchar *date)
 {
-    gchar *oldCreationDate = m_CreationDate;
+    g_free (m_CreationDate);
     m_CreationDate = g_strdup (date);
-    g_free (oldCreationDate);
     g_free (date);
 }
 
@@ -833,9 +844,8 @@
 void
 IDocument::setModifiedDate (gchar *date)
 {
-    gchar *oldModifiedDate = m_ModifiedDate;
+    g_free (m_ModifiedDate);
     m_ModifiedDate = g_strdup (date);
-    g_free (oldModifiedDate);
     g_free (date);
 }
 
@@ -917,9 +927,8 @@
 void
 IDocument::setPassword (const gchar *password)
 {
-    gchar *oldPassword = m_Password;
+    g_free (m_Password);
     m_Password = g_strdup (password);
-    g_free (oldPassword);
 }
 
 ///
@@ -959,14 +968,8 @@
 {
     g_assert (NULL != fileName && "Tried to set a NULL file name.");
 
-    // Don't ask me why, but then I set like this:
-    //      g_free (m_FileName);
-    //      m_FileName = fileName
-    // Somehow the g_free also frees the parameter ????????
-    //      
-    gchar *oldFileName = m_FileName;
+    g_free(m_FileName);
     m_FileName = g_strdup (fileName);
-    g_free (oldFileName);
 }
 
 ///
--- src/IDocument.h	2009-02-28 22:00:35.000000000 +0100
+++ src/IDocument.h	2011-02-17 13:53:44.000000000 +0100
@@ -275,7 +275,7 @@
             void notifyFindFinished (void);
             void notifyFindStarted (void);
             void notifyLoad (void);
-            void notifyLoadError (const GError *error);
+            void notifyLoadError (const gchar *fileName, const GError *error);
             void notifyLoadPassword (const gchar *fileName, gboolean reload,
                                      const GError *error);
             void notifyPageChanged (void);
@@ -306,7 +306,11 @@
             const gchar *getFormat (void);
             void setFormat (gchar *format);
             const gchar *getLinearized (void);
+#if defined (HAVE_POPPLER_0_15_1)
+            void setLinearized (gboolean *linearized);
+#else
             void setLinearized (gchar *linearized);
+#endif
             const gchar *getCreationDate (void);
             void setCreationDate (gchar *date);
             const gchar *getModifiedDate (void);
@@ -377,12 +381,16 @@
             gint m_FindPage;
             /// The document's format.
             gchar *m_Format;
-            /// The document's password.
+            /// The document's file name.
             gchar *m_FileName;
             /// The document's keyword.
             gchar *m_Keywords;
             /// Tells if the document is linearized or not.
+#if defined (HAVE_POPPLER_0_15_1)
+            gboolean *m_Linearized;
+#else
             gchar *m_Linearized;
+#endif
             /// The document's modification date and time.
             gchar *m_ModifiedDate;
             /// @brief The list of classes that will receive notifications
--- src/IDocumentObserver.h	2009-02-28 22:00:35.000000000 +0100
+++ src/IDocumentObserver.h	2009-11-16 02:14:54.000000000 +0100
@@ -73,9 +73,11 @@
             /// loaded because of an error. The error message is
             /// passed as a parameter.
             ///
+            /// @param fileName The file name that was trying to load.
             /// @param error The error code and message.
             ///
-            virtual void notifyLoadError (const GError *error) { }
+            virtual void notifyLoadError (const gchar *fileName,
+                    const GError *error) { }
 
             ///
             /// @brief The document is encrypted.
--- src/IJob.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/IJob.cxx	2009-11-16 02:14:54.000000000 +0100
@@ -17,6 +17,7 @@
 
 #include "epdfview.h"
 #include <unistd.h>
+#include <stdlib.h>
 
 using namespace ePDFView;
 
@@ -60,7 +61,11 @@
             delete job;
         }
     }
+#ifdef _WIN32
+    _sleep(0);
+#else
     sleep(0);
+#endif
 }
 
 ///
--- src/IMainView.h	2009-02-28 22:00:35.000000000 +0100
+++ src/IMainView.h	2009-11-16 02:14:54.000000000 +0100
@@ -78,6 +78,14 @@
             virtual void activeZoomWidth (gboolean active) = 0;
 
             ///
+            /// @brief Tells if the index is shown.
+            ///
+            /// @return @c TRUE if the index is currently shown, @c FALSE
+            ///         otherwise.
+            ///
+            virtual gboolean isIndexVisible() const = 0;
+
+            ///
             /// @brief Shows the open file dialog.
             ///
             /// The view must ask the user which file to open by using
--- src/JobLoad.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/JobLoad.cxx	2009-11-16 02:14:54.000000000 +0100
@@ -241,7 +241,8 @@
     g_assert (NULL != data && "The data parameter is NULL.");
 
     JobLoad *job = (JobLoad *)data;
-    job->getDocument ().notifyLoadError (job->getError ());
+    job->getDocument ().notifyLoadError (job->getFileName(),
+            job->getError ());
     JOB_NOTIFIER_END();
 
     return FALSE;
--- src/main.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/main.cxx	2009-11-16 02:14:54.000000000 +0100
@@ -23,6 +23,13 @@
 #include "epdfview.h"
 #include <MainView.h>
 
+#ifdef _WIN32
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#endif
+
 using namespace ePDFView;
 
 struct LoadFileInfo
@@ -49,6 +56,31 @@
 int
 main (int argc, char **argv)
 {
+#ifdef _WIN32
+
+    if (fileno (stdout) != -1 &&
+ 	  _get_osfhandle (fileno (stdout)) != -1)
+    {
+      /* stdout is fine, presumably redirected to a file or pipe */
+    }
+    else
+    {
+      typedef BOOL (* WINAPI AttachConsole_t) (DWORD);
+
+      AttachConsole_t p_AttachConsole =
+        (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole");
+
+      if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS))
+      {
+          freopen ("CONOUT$", "w", stdout);
+          dup2 (fileno (stdout), 1);
+          freopen ("CONOUT$", "w", stderr);
+          dup2 (fileno (stderr), 2);
+
+      }
+    }
+#endif
+
     // Enable NLS.
     setlocale (LC_ALL, "");
     bindtextdomain (PACKAGE, LOCALEDIR);
--- src/MainPter.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/MainPter.cxx	2011-02-17 13:53:44.000000000 +0100
@@ -54,6 +54,7 @@
     m_PagePter = NULL;
     m_FindPter = NULL;
     m_PasswordTries = 3;
+    m_ReloadPage = 1;
 #if defined (DEBUG)
     G_LOCK (fileLoaded);
     fileLoaded = FALSE;
@@ -144,9 +145,11 @@
         checkZoomSettings ();
 
         // Check if we should see the outlines.
-        showSidebar = (NULL != m_Document->getOutline () &&
-                       0 < m_Document->getOutline ()->getNumChildren () &&
+        showSidebar = (0 < m_Document->getOutline ()->getNumChildren () &&
                        PageModeOutlines == m_Document->getPageMode ());
+        // IDocument::getOutline is set if and only if m_Document is
+        // loaded.
+        view.setOutline (m_Document->getOutline ());
     }
     else
     {
@@ -178,7 +181,6 @@
     // Show the toolbar and status bar depending on the configuration.
     view.showToolbar (config.showToolbar ());
     view.showStatusbar (config.showStatusbar ());
-    view.setOutline (m_Document->getOutline ());
     view.showIndex (showSidebar);
     // Remove the status bar text.
     view.setStatusBarText (NULL);
@@ -534,6 +536,7 @@
     g_assert ( m_Document->isLoaded () && 
             "Tried to reload a yet to load document.");
     // Reload
+    m_ReloadPage = m_Document->getCurrentPageNum();
     setOpenState (m_Document->getFileName (), TRUE);
     m_Document->reload ();
 }
@@ -827,9 +830,11 @@
 }
 
 void
-MainPter::notifyLoadError (const GError *error)
+MainPter::notifyLoadError (const gchar *fileName, const GError *error)
 {
-    getView ().showErrorMessage (_("Error Loading File"), error->message);
+    gchar *errorTitle = g_strdup_printf ("%s \"%s\"", _("Error Loading File"), fileName);
+    getView ().showErrorMessage (errorTitle, error->message);
+    g_free (errorTitle);
     setInitialState ();
 #if defined (DEBUG)
     G_LOCK (fileLoaded);
@@ -927,7 +932,11 @@
 void
 MainPter::notifyReload ()
 {
+    gboolean showIndex = getView ().isIndexVisible();
     setInitialState ();
+    getView ().showIndex(showIndex);
+    m_Document->goToPage(m_ReloadPage);
+    m_Document->notifyPageChanged();
 #if defined (DEBUG)
     G_LOCK (fileLoaded);
     fileLoaded = TRUE;
--- src/MainPter.h	2009-02-28 22:00:35.000000000 +0100
+++ src/MainPter.h	2009-11-16 02:14:54.000000000 +0100
@@ -77,7 +77,7 @@
             void zoomWidthActivated (gboolean active);
 
             void notifyLoad (void);
-            void notifyLoadError (const GError *error);
+            void notifyLoadError (const gchar *fileName, const GError *error);
             void notifyLoadPassword (const gchar *fileName, gboolean reload,
                                      const GError *error);
             void notifyPageChanged (gint pageNum);
@@ -102,6 +102,8 @@
             PagePter *m_PagePter;
             /// The number of times the password has been tried for a document.
             gint m_PasswordTries;
+            /// The page to move once the document is reloaded.
+            gint m_ReloadPage;
             /// The main view.
             IMainView *m_View;
 
--- src/Makefile.am	2009-02-28 18:38:53.000000000 +0100
+++ src/Makefile.am	2009-11-16 02:14:54.000000000 +0100
@@ -58,7 +58,7 @@
 	main.cxx
 
 libshell_cxxflags = -I$(top_srcdir)/src/gtk $(GTK2_CFLAGS)
-libshell_ldadd = $(GTK2_LIBS) $(top_builddir)/src/gtk/libshell-gtk.a
+libshell_ldadd = $(top_builddir)/src/gtk/libshell-gtk.a $(GTK2_LIBS)
 
 epdfview_CXXFLAGS =	\
 	-DLOCALEDIR='"$(datadir)/locale"'	\
@@ -69,8 +69,10 @@
 epdfview_LDADD =	\
 	libepdfview.a	\
 	$(GLIB_LIBS)	\
-	$(libshell_ldadd)	\
-	$(POPPLER_LIBS)
+	$(POPPLER_LIBS)	\
+	$(libshell_ldadd)
+
+epdfview_LDFLAGS =
 
 if cups_printing
 libepdfview_a_SOURCES +=	\
@@ -87,3 +89,7 @@
 	$(CUPS_LIBS)
 endif
 
+if OS_WIN32
+epdfview_LDFLAGS += -mwindows
+endif
+
--- src/PDFDocument.cxx	2009-02-28 22:00:35.000000000 +0100
+++ src/PDFDocument.cxx	2011-02-17 13:53:44.000000000 +0100
@@ -167,6 +167,7 @@
                                        (height - matchRect->y1));
             results = g_list_prepend (results, rect);
         }
+        g_object_unref (G_OBJECT (page));
     }
 
     return g_list_reverse (results);
@@ -246,23 +247,25 @@
     // Check if the document couldn't be opened successfully and why.
     if ( NULL == newDocument )
     {
-        // Poppler's glib wrapper passes the Poppler error code unless the
-        // error is that the file is encrypted. We want to set our own
-        // error code in this case.
         DocumentError errorCode = DocumentErrorNone;
-        if ( POPPLER_ERROR == loadError->domain )
+        switch ( loadError->code )
         {
+            case POPPLER_ERROR_OPEN_FILE:
+            case POPPLER_ERROR_INVALID:
+                errorCode = DocumentErrorOpenFile;
+                break;
+
+            case POPPLER_ERROR_BAD_CATALOG:
+                errorCode = DocumentErrorBadCatalog;
+                break;
+
+            case POPPLER_ERROR_DAMAGED:
+                errorCode = DocumentErrorDamaged;
+                break;
+
+            case POPPLER_ERROR_ENCRYPTED:
             errorCode = DocumentErrorEncrypted;
-        }
-        else
-        {
-            // OK, the glib's wrapper don't pass the error code directly
-            // from Poppler. Instead returns G_FILE_ERROR_FAILED and a
-            // non translated string.
-            // Maybe I'm wrong (very probable) but that's a wrong way.
-            // So I'm reading the error code from the error string...
-            sscanf (loadError->message, "Failed to load document (error %d)",
-                    (gint *)&errorCode);
+                break;
         }
         g_error_free (loadError);
         // Get our error message.
@@ -324,7 +327,11 @@
     gchar *format = NULL;
     gchar *keywords = NULL;
     PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
+#if defined (HAVE_POPPLER_0_15_1)
+    gboolean *linearized = NULL;
+#else
     gchar *linearized = NULL;
+#endif
     GTime modDate;
     PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
     gchar *producer = NULL;
@@ -650,7 +657,11 @@
         return FALSE;
     }
     // Try to save the PDF document.
+#if defined (HAVE_POPPLER_0_8_0)
+    gboolean result = poppler_document_save_a_copy (m_Document, filename_uri, error);
+#else // !HAVE_POPPLER_0_8_0
     gboolean result = poppler_document_save (m_Document, filename_uri, error);
+#endif // HAVE_POPPLER_0_8_0
     g_free (filename_uri);
 
     return result;
@@ -678,14 +689,24 @@
     gdouble pageWidth, pageHeight;
     poppler_page_get_size(page, &pageWidth, &pageHeight);
 
+#if defined (HAVE_POPPLER_0_15_0)
+    PopplerRectangle textRect = { rect->getX1() / getZoom(),
+                                  rect->getY1() / getZoom(),
+                                  rect->getX2() / getZoom(),
+                                  rect->getY2() / getZoom()};
+#else // !HAVE_POPPLER_0_15_0
     //for get text we must exchange y coordinate, don't ask me where logic here.
     PopplerRectangle textRect = { rect->getX1() / getZoom(),
                                   (pageHeight - rect->getY2() / getZoom()),
-                                  rect->getX2() * getZoom() / getZoom(),
+                                  rect->getX2() / getZoom(),
                                   (pageHeight - rect->getY1() / getZoom())};
+#endif // HAVE_POPPLER_0_15_0
     repairEmpty(textRect);
 
-#if defined (HAVE_POPPLER_0_6_0)
+#if defined (HAVE_POPPLER_0_15_0)
+    gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH,
+            &textRect);
+#elif defined (HAVE_POPPLER_0_6_0)
     gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
             &textRect);
 #else // !HAVE_POPPLER_0_6_0

Places

File epdfview-0.1.7-windows.patch of Package mingw32-epdfview (Revision fca9686b521db1c7317c305e84542943)

Places