make "make distcheck" work

[lyx.git] / src / support / os_win32.C

diff --git a/src/support/os_win32.C b/src/support/os_win32.C
index 28b0ca104ee36d622faf213bdcce55960eadaa9b..1559d61e36c1a1cee5bede442e637036782cba3b 100644 (file)
--- a/src/support/os_win32.C
+++ b/src/support/os_win32.C
@@ -4,6 +4,8 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Ruurd A. Reitsma
+ * \author Claus Hentschel
+ * \author Angus Leeming
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -19,13 +21,7 @@
 
 #include <windows.h>
 #include <io.h>
-
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-# include <sys/cygwin.h>
-
-#elif defined(_WIN32)
-# include <direct.h> // _getdrive
-#endif
+#include <direct.h> // _getdrive
 
 using std::endl;
 using std::string;
@@ -35,20 +31,90 @@ namespace lyx {
 namespace support {
 namespace os {
 
-void init(int, char *[])
-{}
+void os::init(int /* argc */, char * argv[])
+{
+       /* Note from Angus, 17 Jan 2005:
+        *
+        * The code below is taken verbatim from Ruurd's original patch
+        * porting LyX to Win32.
+        *
+        * Windows allows us to define LyX either as a console-based app
+        * or as a GUI-based app. Ruurd decided to define LyX as a
+        * console-based app with a "main" function rather than a "WinMain"
+        * function as the point of entry to the program, but to
+        * immediately close the console window that Windows helpfully
+        * opens for us. Doing so allows the user to see all of LyX's
+        * debug output simply by running LyX from a DOS or MSYS-shell
+        * prompt.
+        *
+        * The alternative approach is to define LyX as a genuine
+        * GUI-based app, with a "WinMain" function as the entry point to the
+        * executable rather than a "main" function, so:
+        *
+        * #if defined (_WIN32)
+        * # define WIN32_LEAN_AND_MEAN
+        * # include <stdlib.h>  // for __argc,__argv
+        * # include <windows.h> // for WinMain
+        * #endif
+        *
+        * // This will require the "-mwindows" flag when linking with
+        * // gcc under MinGW.
+        * // For MSVC, use "/subsystem:windows".
+        * #if defined (_WIN32)
+        * int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+        * {
+        *     return mymain(__argc, __argv);
+        * }
+        * #endif
+        *
+        * where "mymain" is just a renamed "main".
+        *
+        * However, doing so means that the lyxerr messages would mysteriously
+        * disappear. They could be resurrected with something like:
+        *
+        * #ifdef WIN32
+        *  AllocConsole();
+        *  freopen("conin$","r",stdin);
+        *  freopen("conout$","w",stdout);
+        *  freopen("conout$","w",stderr);
+        * #endif
+        *
+        * This code could be invoked (say) the first time that lyxerr
+        * is called. However, Ruurd has tried this route and found that some
+        * shell scripts failed, for mysterious reasons...
+        *
+        * I've chosen for now, therefore, to simply add Ruurd's original
+        * code as-is.
+        */
+       // Close the console when run (probably)
+       // not run from command prompt
+       char WindowTitle[1024];
+       HWND hwndFound;
+       GetConsoleTitle(WindowTitle,1024);
+       if ((strcmp(WindowTitle, argv[0]) == 0) ||
+               (strcmp(WindowTitle,"LyX") == 0)) {
+               // format a "unique" newWindowTitle
+               wsprintf(WindowTitle,"%d/%d",
+                       GetTickCount(),
+                       GetCurrentProcessId());
+               // change current window title
+               SetConsoleTitle(WindowTitle);
+               // ensure window title has been updated
+               Sleep(40);
+               // look for newWindowTitle
+               hwndFound=FindWindow(NULL, WindowTitle);
+               // If found, hide it
+               if ( hwndFound != NULL)
+                       ShowWindow( hwndFound, SW_HIDE);
+       }
+}
 
 
 string current_root()
 {
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       return string("/");
-
-#else
        // _getdrive returns the current drive (1=A, 2=B, and so on).
        char const drive = ::_getdrive() + 'A' - 1;
        return string(1, drive) + ":/";
-#endif
 }
 
 
@@ -74,21 +140,8 @@ string::size_type common_path(string const & p1, string const & p2)
 
 string external_path(string const & p)
 {
-       string dos_path;
-
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       // Translate from cygwin path syntax to dos path syntax
-       if (is_absolute_path(p)) {
-               char dp[PATH_MAX];
-               cygwin_conv_to_full_win32_path(p.c_str(), dp);
-               dos_path = !dp ? "" : dp;
-       }
+       string dos_path = p;
 
-       else return p;
-#else // regular Win32
-       dos_path = p;
-#endif
-       
        //No backslashes in LaTeX files
        dos_path = subst(dos_path,'\\','/');
 
@@ -106,14 +159,7 @@ string external_path(string const & p)
 // the Win32/DOS pathnames into Cygwin pathnames.
 string internal_path(string const & p)
 {
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       char posix_path[PATH_MAX];
-       posix_path[0] = '\0';
-       cygwin_conv_to_posix_path(p.c_str(), posix_path);
-       return posix_path;
-#else
        return subst(p,"\\","/");
-#endif
 }
 
 
@@ -145,33 +191,26 @@ char const * popen_read_mode()
 
 string const & nulldev()
 {
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       static string const nulldev_ = "/dev/null";
-#else
        static string const nulldev_ = "nul";
-#endif
        return nulldev_;
 }
 
 
 shell_type shell()
 {
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-       return UNIX;
-#else
        return CMD_EXE;
-#endif
 }
 
+
 char path_separator()
 {
-#if defined (_WIN32)
        return ';';
-#else // Cygwin
-       return ':';
-#endif
 }
 
+
+void cygwin_path_fix(bool)
+{}
+
 } // namespace os
 } // namespace support
 } // namespace lyx