X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fmain.h;h=70997a31c935d5d251ec3651127584fcf54445ca;hp=02a745144302988bb7f0b9facf0bf9826b3de6bd;hb=cfe7da763b5d8ef4252ddb94558abb080bbd893d;hpb=f8ef964f021d1d6da6ea46bbb1fe8f0250a5be8c diff --git a/src/main.h b/src/main.h index 02a7451..70997a3 100644 --- a/src/main.h +++ b/src/main.h @@ -11,8 +11,9 @@ using namespace IPDF; inline void OverlayBMP(Document & doc, const char * input, const char * output, const Rect & bounds = Rect(0,0,1,1), const Colour & c = Colour(0.f,0.f,0.f,1.f)) { - View view(doc, bounds, c); + Screen scr; + View view(doc, scr, bounds, c); if (input != NULL) scr.RenderBMP(input); view.Render(); @@ -25,13 +26,13 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const { // order is important... segfaults occur when screen (which inits GL) is not constructed first -_- Screen scr; - View view(doc,bounds, c); + View view(doc,scr, bounds, c); scr.DebugFontInit("DejaVuSansMono.ttf"); scr.SetMouseHandler([&](int x, int y, int buttons, int wheel) // [?] wtf { static bool oldButtonDown = false; static int oldx, oldy; - if (buttons > 1 && !oldButtonDown) + if (buttons == 3 && !oldButtonDown) { oldButtonDown = true; view.ToggleGPUTransform(); @@ -39,6 +40,13 @@ inline void MainLoop(Document & doc, const Rect & bounds = Rect(0,0,1,1), const oldy = y; return; } + if (buttons == 2 && !oldButtonDown) + { + oldButtonDown = true; + view.ToggleGPURendering(); + oldx = x; + oldy = y; + } if (buttons && !oldButtonDown) { // We're beginning a drag.