diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2017-09-26 23:45:31 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2017-11-08 17:57:09 +0100 |
| commit | 896830e23e8f94b17bdf386c191a885c972ea8a8 (patch) | |
| tree | 061feda4707c8cc989df39e2440550a6ca1a2f7d /platform/gl/gl-app.h | |
| parent | 94a5846502cd1f05ec4127872ef06dcd8606f34b (diff) | |
| download | mupdf-896830e23e8f94b17bdf386c191a885c972ea8a8.tar.xz | |
gl: Remove GLFW and reinstate FreeGLUT.
GLFW doesn't build on Visual Studio 2005 anymore, and I don't have time to keep
up with the changes.
So, we're switching back to FreeGLUT, which is more stable.
I've added the two missing features that made us switch to GLFW in the first
place: input methods and system clipboard support.
If MuPDF is compiled with our version of FreeGLUT, we now use these functions:
* glutKeyboardExtFunc
* glutSetClipboard
* glutGetClipboard
Diffstat (limited to 'platform/gl/gl-app.h')
| -rw-r--r-- | platform/gl/gl-app.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/platform/gl/gl-app.h b/platform/gl/gl-app.h index 7bff257b..a43654cf 100644 --- a/platform/gl/gl-app.h +++ b/platform/gl/gl-app.h @@ -7,10 +7,9 @@ int win_open_file(char *buf, int len); #include "mupdf/fitz.h" #include "mupdf/ucdn.h" -#include <GLFW/glfw3.h> +#include <GL/freeglut.h> extern fz_context *ctx; -extern GLFWwindow *window; enum { @@ -57,7 +56,7 @@ struct ui int x, y; int down, middle, right; int scroll_x, scroll_y; - int key, mod; + int key, mod, plain; void *hot, *active, *focus; @@ -68,6 +67,9 @@ struct ui extern struct ui ui; +void ui_set_clipboard(const char *buf); +const char *ui_get_clipboard(void); + void ui_init_fonts(fz_context *ctx, float pixelsize); void ui_finish_fonts(fz_context *ctx); float ui_measure_character(fz_context *ctx, int ucs); |