X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fmain.c;h=214e9c0e2ea77625e246411488cc946adac31d5e;hb=cc3f21efc8104182171c9300facc16d9a79177ef;hp=2d966afdb8181eb4057fc06f676abc039a0c3c5c;hpb=960b0d9ea6fc47981d2cc0429fbd9609df8d014f;p=evince.git diff --git a/shell/main.c b/shell/main.c index 2d966afd..214e9c0e 100644 --- a/shell/main.c +++ b/shell/main.c @@ -45,6 +45,16 @@ #endif #endif /* WITH_SMCLIENT */ +#ifdef G_OS_WIN32 +#ifdef DATADIR +#undef DATADIR +#endif +#include +#include +#define _WIN32_WINNT 0x0500 +#include +#endif + static gchar *ev_page_label; static gchar *ev_find_string; static gboolean preview_mode = FALSE; @@ -387,6 +397,31 @@ main (int argc, char *argv[]) GHashTable *args; GError *error = NULL; +#ifdef G_OS_WIN32 + + if (fileno (stdout) != -1 && + _get_osfhandle (fileno (stdout)) != -1) + { + /* stdout is fine, presumably redirected to a file or pipe */ + } + else + { + typedef BOOL (* WINAPI AttachConsole_t) (DWORD); + + AttachConsole_t p_AttachConsole = + (AttachConsole_t) GetProcAddress (GetModuleHandle ("kernel32.dll"), "AttachConsole"); + + if (p_AttachConsole != NULL && p_AttachConsole (ATTACH_PARENT_PROCESS)) + { + freopen ("CONOUT$", "w", stdout); + dup2 (fileno (stdout), 1); + freopen ("CONOUT$", "w", stderr); + dup2 (fileno (stderr), 2); + + } + } +#endif + /* Init glib threads asap */ if (!g_thread_supported ()) g_thread_init (NULL);