well lets just modernize the UI

Author: JotaRandom

meson.build

@@ -22,9 +22,9 @@ add_project_arguments([
   '-Wno-deprecated',
   '-Wno-error=deprecated-declarations',
   # GTK4 migration debugging flags - DISABLED for now as they may cause issues
-  # '-DGDK_DISABLE_DEPRECATED',
-  # '-DGTK_DISABLE_DEPRECATED',
-  # '-DG_ENABLE_DIAGNOSTIC=1',
+   '-DGDK_DISABLE_DEPRECATED',
+   '-DGTK_DISABLE_DEPRECATED',
+   '-DG_ENABLE_DIAGNOSTIC=1',
 ], language : 'cpp')
 
 # Dependencies with version requirements

src/Config.h

@@ -25,14 +25,33 @@
 
 #include <glib.h>
 
-#define PACKAGE_DATA_DIR "/usr/local/share"
-#define PACKAGE_LOCALE_DIR "/usr/local/share/locale"
+// These are now defined in config.h (generated by Meson)
+// Do NOT redefine them here to avoid warnings
+// #define PACKAGE_DATA_DIR "/usr/local/share"
+// #define PACKAGE_LOCALE_DIR "/usr/local/share/locale"
+// #define PACKAGE_NAME "epdfview"
+// #define PACKAGE_VERSION "0.3.0"
+// #define PACKAGE "epdfview"
+// #define DATADIR PACKAGE_DATA_DIR
+// #define LOCALEDIR PACKAGE_LOCALE_DIR
+// #define VERSION PACKAGE_VERSION
+
+// For compatibility, we keep PACKAGE_* as aliases to the config.h values
+#ifndef PACKAGE_DATA_DIR
+#define PACKAGE_DATA_DIR DATADIR
+#endif
+#ifndef PACKAGE_LOCALE_DIR
+#define PACKAGE_LOCALE_DIR LOCALEDIR
+#endif
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION VERSION
+#endif
+#ifndef PACKAGE_NAME
 #define PACKAGE_NAME "epdfview"
-#define PACKAGE_VERSION "0.3.0"
+#endif
+#ifndef PACKAGE
 #define PACKAGE "epdfview"
-#define DATADIR PACKAGE_DATA_DIR
-#define LOCALEDIR PACKAGE_LOCALE_DIR
-#define VERSION PACKAGE_VERSION
+#endif
 
 namespace ePDFView
 {

src/IDocument.cxx

@@ -1116,36 +1116,8 @@ IDocument::goToNextPage ()
 }
 
 // Structure to hold data for async page loading
-typedef struct {
-    IDocument* document;
-    gint pageNum;
-} AsyncPageLoadData;
-
-static gboolean async_go_to_page(gpointer user_data) {
-    AsyncPageLoadData* data = static_cast<AsyncPageLoadData*>(user_data);
-    IDocument* doc = data->document;
-    gint pageNum = data->pageNum;
-    
-    // Only proceed if the page number is valid and different from current
-    if (pageNum != doc->getCurrentPageNum() && 1 <= pageNum && pageNum <= doc->getNumPages()) {
-        // Go to the target page using the public method
-        doc->goToPage(pageNum);
-        
-        // The document will handle caching of pages automatically through its internal logic
-        // We don't need to manually call addPageToCache as it's handled by the document class
-        
-        // Trigger a refresh of the view to show the new page
-        if (doc->getCurrentPage() != NULL) {
-            doc->notifyPageChanged();
-        }
-    }
-    
-    // Free the data structure
-    delete data;
-    
-    // Return FALSE to remove this idle function
-    return G_SOURCE_REMOVE;
-}
+///
+/// @brief Goes to the document's last page.
 
 ///
 /// @brief Goes to a document page.
@@ -1160,9 +1132,23 @@ static gboolean async_go_to_page(gpointer user_data) {
 void
 IDocument::goToPage(gint pageNum)
 {
-    // Schedule the page load asynchronously to prevent UI freezing
-    AsyncPageLoadData* data = new AsyncPageLoadData{this, pageNum};
-    g_idle_add(async_go_to_page, data);
+    // Clamp to valid range and check if different from current
+    pageNum = CLAMP(pageNum, 1, getNumPages());
+    
+    // Only change page if different - this prevents infinite loops
+    if (pageNum != m_CurrentPage) {
+        m_CurrentPage = pageNum;
+
+        addPageToCache(m_CurrentPage);
+        if (m_CurrentPage > 1) {
+            addPageToCache(m_CurrentPage - 1);
+        }
+        if (m_CurrentPage < getNumPages()) {
+            addPageToCache(m_CurrentPage + 1);
+        }
+
+        notifyPageChanged();
+    }
 }
 
 ///
@@ -1394,6 +1380,41 @@ IDocument::zoomToWidth (gint width)
     setZoom(scale);
 }
 
+///
+/// @brief Zooms the document to fit the height.
+///
+/// It tries to get the best zoom / scale level that will let the document
+/// fit into @a height, maintaining the aspect ratio.
+///
+/// @param height The height to fit the document to.
+///
+void
+IDocument::zoomToHeight (gint height)
+{
+    if (height <= 0)
+    {
+        return;
+    }
+
+    gdouble pageWidth;
+    gdouble pageHeight;
+    getPageSize(&pageWidth, &pageHeight);
+    
+    if (pageHeight <= 0)
+    {
+        return;
+    }
+    
+    // Calculate scale based on height while maintaining aspect ratio
+    gdouble scale = (gdouble)height / pageHeight;
+    
+    // Apply zoom constraints
+    scale = CLAMP(scale, ZOOM_OUT_MAX, ZOOM_IN_MAX);
+    
+    // Set the zoom level (this will trigger a redraw via notifyPageZoomed)
+    setZoom(scale);
+}
+
 ///
 /// @brief Adds a new page to the cache and starts to render it.
 ///

src/IDocument.h

@@ -355,6 +355,7 @@ namespace ePDFView
             void zoomOut (void);
             void zoomToFit (gint width, gint height);
             void zoomToWidth (gint width);
+            void zoomToHeight (gint height);
 
             gboolean hasLinkAtPosition (gint x, gint y);
             void activateLinkAtPosition (gint x, gint y);

src/IJob.cxx

@@ -83,10 +83,8 @@ IJob::dispatcher (gpointer data)
 void
 IJob::init ()
 {
-    if ( !g_thread_supported () )
-    {
-        g_thread_init (NULL);
-    }
+    // GLib threads are always available in modern versions (>= 2.32)
+    // No need to call g_thread_init() or check g_thread_supported()
     m_JobsQueue = g_async_queue_new ();
     GError *error = NULL;
     if ( NULL == g_thread_create (IJob::dispatcher, NULL, FALSE, &error) )

src/JobPrint.cxx

@@ -380,8 +380,8 @@ JobPrint::setUpPageRange ()
     {
         // Since the range is from 0 to numPages - 1, the checks for
         // even or odd are reversed.
-        if ( pageNum % 2 == 0 && PRINT_EVEN_PAGE_SET == pageSet ||
-             pageNum % 2 != 0 && PRINT_ODD_PAGE_SET == pageSet )
+        if ( (pageNum % 2 == 0 && PRINT_EVEN_PAGE_SET == pageSet) ||
+             (pageNum % 2 != 0 && PRINT_ODD_PAGE_SET == pageSet) )
         {
             m_PageRange[pageNum] = FALSE;
         }