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=682a585a0bfee24d91343958cc44956931693c6f;hp=9cc94a7b3f9bf7c2868e85dadef947f8e5bf22d0;hpb=a6a175aba74a6715a262e20c1eabe05012c6615b;p=evince.git

diff --git a/shell/main.c b/shell/main.c
index 9cc94a7b..214e9c0e 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -40,11 +40,21 @@
 
 #ifdef WITH_SMCLIENT
 #include "eggsmclient.h"
-#if GDK_WINDOWING_X11
+#ifdef GDK_WINDOWING_X11
 #include "eggdesktopfile.h"
 #endif
 #endif /* WITH_SMCLIENT */
 
+#ifdef G_OS_WIN32
+#ifdef DATADIR
+#undef DATADIR
+#endif
+#include <io.h>
+#include <conio.h>
+#define _WIN32_WINNT 0x0500
+#include <windows.h>
+#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);