diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2015-09-08 16:14:02 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2015-10-06 11:21:23 +0200 |
| commit | 36ad0a6f567192d676d128628eb461204984e070 (patch) | |
| tree | 62b0dcc27837f15a1edfd5e56e5e736aea46767b /platform/gl/gl-main.c | |
| parent | 5ae0871d6e950f5afad17c01362b9d95ecec6a9d (diff) | |
| download | mupdf-36ad0a6f567192d676d128628eb461204984e070.tar.xz | |
gl: Windows stuff.
* Add icons to application and window.
* Open file dialog if no command line argument.
* Install file type associations.
Diffstat (limited to 'platform/gl/gl-main.c')
| -rw-r--r-- | platform/gl/gl-main.c | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c index 88eaf5b0..8396029e 100644 --- a/platform/gl/gl-main.c +++ b/platform/gl/gl-main.c @@ -1,10 +1,3 @@ -#ifdef _WIN32 -#include <windows.h> -#ifdef _MSC_VER -#define main main_utf8 -#endif -#endif - #include "gl-app.h" struct ui ui; @@ -131,7 +124,6 @@ static int zoom_out(int oldres) #define MAXRES (zoom_list[nelem(zoom_list)-1]) #define DEFRES 96 -static const char *filename = ""; static const char *title = "MuPDF/GL"; static fz_document *doc = NULL; static fz_outline *outline = NULL; @@ -379,7 +371,7 @@ static void do_copy_region(fz_rect *sel, int xofs, int yofs, float zoom, float r saw_text = 1; if (need_newline) { -#if defined(_WIN32) || defined(_WIN64) +#ifdef _WIN32 fz_write_buffer_rune(ctx, buf, '\r'); #endif fz_write_buffer_rune(ctx, buf, '\n'); @@ -1199,14 +1191,31 @@ static void on_error(int error, const char *msg) fprintf(stderr, "gl error %d: %s\n", error, msg); } + +#ifdef _MSC_VER +int main_utf8(int argc, char **argv) +#else int main(int argc, char **argv) +#endif { - if (argc < 2) { + char filename[2048]; + + if (argc < 2) + { +#ifdef _WIN32 + win_install(); + if (!win_open_file(filename, sizeof filename)); + exit(0); +#else fprintf(stderr, "usage: mupdf-gl input.pdf\n"); exit(1); +#endif + } + else + { + fz_strlcpy(filename, argv[1], sizeof filename); } - filename = argv[1]; title = strrchr(filename, '/'); if (!title) title = strrchr(filename, '\\'); @@ -1251,7 +1260,7 @@ int main(int argc, char **argv) ui_init_fonts(ctx, ui.fontsize); - doc = fz_open_document(ctx, argv[1]); + doc = fz_open_document(ctx, filename); render_page(currentpage, currentzoom, currentrotate); update_title(); @@ -1288,7 +1297,7 @@ int main(int argc, char **argv) int wmain(int argc, wchar_t *wargv[]) { char **argv = fz_argv_from_wargv(argc, wargv); - int ret = main(argc, argv); + int ret = main_utf8(argc, argv); fz_free_argv(argc, argv); return ret; } |