Move to stable poppler-cpp api

Author: BioBox

Makefile

@@ -1,16 +1,18 @@
-SOURCES = main.cpp rectangle.cpp coordconv.cpp
-OBJECTS = $(SOURCES:.cpp=.o)
-
 CXXFLAGS ?= -Wall -O0 -g
+include ::= $(shell pkg-config --cflags poppler-cpp)
+LDLIBS ::= -lX11 $(shell pkg-config --libs poppler-cpp)
+
+spdf: main.o coordconv.o
+	$(CXX) $(LDLIBS) $^ -o $@
 
-spdf: $(OBJECTS)
-	$(CXX) -lpoppler -lX11 $(OBJECTS) -o $@
+main.o: main.cpp config.hpp
+	$(CXX) -std=c++20 $(CXXFLAGS) $(include) -c $< -o $@
 
-%.o: %.cpp config.hpp
-	$(CXX) -std=c++17 $(CXXFLAGS) -I/usr/include/poppler -c $< -o $@
+coordconv.o: coordconv.cpp
+	$(CXX) -std=c++20 $(CXXFLAGS) $(include) -c $< -o $@
 
-config.h:
+config.hpp:
 	cp config.def.hpp config.hpp
 
 clean:
-	rm -f spdf $(OBJECTS)
+	rm -f spdf *.o

config.def.hpp

@@ -1,3 +1,38 @@
+
+#include <climits>
+
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
+
+#define AnyMask UINT_MAX
+#define EmptyMask 0
+
+enum Action {
+  QUIT,
+  NEXT,
+  PREV,
+  FIRST,
+  LAST,
+  FIT_PAGE,
+  FIT_WIDTH,
+  DOWN,
+  UP,
+  BACK,
+  RELOAD,
+  GOTO_PAGE,
+  SEARCH,
+  PAGE,
+  MAGNIFY,
+  ROTATE_CW,
+  ROTATE_CCW
+};
+
+struct Shortcut {
+  unsigned mask;
+  KeySym ksym;
+  Action action;
+};
+
 /*
  * Background color, X11 color name (see:
  * https://en.wikipedia.org/wiki/X11_color_names).
@@ -20,11 +55,8 @@ static Shortcut shortcuts[] = {{AnyMask, XK_q, QUIT},
                                {EmptyMask, XK_w, FIT_WIDTH},
                                {EmptyMask, XK_Down, DOWN},
                                {EmptyMask, XK_Up, UP},
-                               {EmptyMask, XK_Page_Down, PG_DOWN},
-                               {EmptyMask, XK_Page_Up, PG_UP},
                                {EmptyMask, XK_b, BACK},
                                {AnyMask, XK_r, RELOAD},
-                               {ControlMask, XK_c, COPY},
                                {AnyMask, XK_g, GOTO_PAGE},
                                {AnyMask, XK_s, SEARCH},
                                {EmptyMask, XK_slash, SEARCH},

coordconv.cpp

@@ -1,45 +1,40 @@
 #include <algorithm>
 
-#include "coordconv.h"
+#include "coordconv.hpp"
 
-CoordConv::CoordConv(const Page *p, const Rectangle &r, bool i, int rotation)
+CoordConv::CoordConv(const poppler::page *p, const srect &r, bool i,
+                     int rotation)
     : rect(r), inverty(i) {
-  auto pbox = p->getCropBox();
+  auto pbox = p->page_rect();
 
-  auto width = pbox->x2 - pbox->x1;
-  auto height = pbox->y2 - pbox->y1;
-
-  if (abs(p->getRotate() - rotation) % 180 != 0)
-    std::swap(width, height);
-
-  xscale = (width) / double(rect.width);
-  yscale = (height) / double(rect.height);
+  xscale = (pbox.width()) / double(rect.width());
+  yscale = (pbox.height()) / double(rect.height());
 }
 
-double CoordConv::to_pdf_x(int x) const { return (x - rect.x) * xscale; }
+double CoordConv::to_pdf_x(int x) const { return (x - rect.x()) * xscale; }
 
 double CoordConv::to_pdf_y(int y) const {
   if (inverty)
-    return (rect.height - (y - rect.y)) * yscale;
-  return (y - rect.y) * yscale;
+    return (rect.height() - (y - rect.y())) * yscale;
+  return (y - rect.y()) * yscale;
 }
 
-Rectangle CoordConv::to_pdf(const Rectangle &r) const {
-  return {(int)to_pdf_x(r.x), (int)to_pdf_y(r.y),
-          (int)(to_pdf_x(r.x + r.width) - to_pdf_x(r.x)),
-          (int)(to_pdf_y(r.y + r.height) - to_pdf_y(r.y))};
+srect CoordConv::to_pdf(const srect &r) const {
+  return {(int)to_pdf_x(r.x()), (int)to_pdf_y(r.y()),
+          (int)(to_pdf_x(r.x() + r.width()) - to_pdf_x(r.x())),
+          (int)(to_pdf_y(r.y() + r.height()) - to_pdf_y(r.y()))};
 }
 
-double CoordConv::to_screen_x(int x) const { return x / xscale + rect.x; }
+double CoordConv::to_screen_x(int x) const { return x / xscale + rect.x(); }
 
 double CoordConv::to_screen_y(int y) const {
   if (inverty)
-    return rect.y + rect.height - y / yscale;
-  return y / yscale + rect.y;
+    return rect.y() + rect.height() - y / yscale;
+  return y / yscale + rect.y();
 }
 
-Rectangle CoordConv::to_screen(const Rectangle &r) const {
-  return {(int)to_screen_x(r.x), (int)to_screen_y(r.y),
-          (int)(to_screen_x(r.x + r.width) - to_screen_x(r.x)),
-          (int)(to_screen_y(r.y + r.height) - to_screen_y(r.y))};
+srect CoordConv::to_screen(const srectf &r) const {
+  return {(int)to_screen_x(r.x()), (int)to_screen_y(r.y()),
+          (int)(to_screen_x(r.x() + r.width()) - to_screen_x(r.x())),
+          (int)(to_screen_y(r.y() + r.height()) - to_screen_y(r.y()))};
 }

coordconv.hpp

@@ -1,21 +1,21 @@
 #ifndef SCALER_H
 #define SCALER_H
 
-#include "rectangle.h"
-#include <poppler/Page.h>
+#include "rectangle.hpp"
+#include <poppler-page.h>
 
 struct CoordConv {
-  CoordConv(const Page *p, const Rectangle &r, bool i, int rotation);
+  CoordConv(const poppler::page *p, const srect &r, bool i, int rotation);
   double to_pdf_x(int x) const;
   double to_pdf_y(int y) const;
-  Rectangle to_pdf(const Rectangle &r) const;
+  srect to_pdf(const srect &r) const;
   double to_screen_x(int x) const;
   double to_screen_y(int y) const;
-  Rectangle to_screen(const Rectangle &r) const;
+  srect to_screen(const srectf &r) const;
 
 private:
   double xscale, yscale;
-  Rectangle rect;
+  srect rect;
   bool inverty;
 };