add generic helper class for calling functions in gui thread

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

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 87899a838bbc4fac24945246f3e4bac8f67beda3..dd5f0e594d71cd9fa18fa1adc04dd0710c2d209e 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -6,6 +6,7 @@
  * \author Ruurd A. Reitsma
  * \author Claus Hentschel
  * \author Angus Leeming
+ * \author Enrico Forestieri
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -52,6 +53,16 @@
 #define ASSOCF_INIT_IGNOREUNKNOWN 0
 #endif
 
+#if defined(__MINGW32__)
+#include <stdio.h>
+#endif
+
+
+extern "C" {
+extern void __wgetmainargs(int * argc, wchar_t *** argv, wchar_t *** envp,
+                          int expand_wildcards, int * new_mode);
+}
+
 using namespace std;
 
 namespace lyx {
@@ -63,6 +74,9 @@ namespace os {
 
 namespace {
 
+int argc_ = 0;
+wchar_t ** argv_ = 0;
+
 bool windows_style_tex_paths_ = true;
 
 string cygdrive = "/cygdrive";
@@ -80,7 +94,7 @@ BOOL terminate_handler(DWORD event)
 
 } // namespace anon
 
-void init(int /* argc */, char * argv[])
+void init(int argc, char * argv[])
 {
        /* Note from Angus, 17 Jan 2005:
         *
@@ -138,6 +152,13 @@ void init(int /* argc */, char * argv[])
         * lyx is invoked as a parameter of hidecmd.exe.
         */
 
+
+       // Get the wide program arguments array
+       wchar_t ** envp = 0;
+       int newmode = 0;
+       __wgetmainargs(&argc_, &argv_, &envp, -1, &newmode);
+       LASSERT(argc == argc_, /**/);
+
        // If Cygwin is detected, query the cygdrive prefix.
        // The cygdrive prefix is needed for translating windows style paths
        // to posix style paths in LaTeX files when the Cygwin teTeX is used.
@@ -186,6 +207,21 @@ void init(int /* argc */, char * argv[])
 }
 
 
+string utf8_argv(int i)
+{
+       LASSERT(i < argc_, /**/);
+       return fromqstr(QString::fromWCharArray(argv_[i]));
+}
+
+
+void remove_internal_args(int i, int num)
+{
+       argc_ -= num;
+       for (int j = i; j < argc_; ++j)
+               argv_[j] = argv_[j + num];
+}
+
+
 string current_root()
 {
        // _getdrive returns the current drive (1=A, 2=B, and so on).
@@ -282,12 +318,13 @@ static QString const get_long_path(QString const & short_path)
 
 static QString const get_short_path(QString const & long_path, file_access how)
 {
-       // CreateFileW and GetShortPathNameW needs the path in utf16 encoding.
+       // CreateFileW and GetShortPathNameW need the path in utf16 encoding.
        if (how == CREATE) {
                HANDLE h = CreateFileW((wchar_t *) long_path.utf16(),
                                GENERIC_WRITE, 0, NULL, CREATE_NEW,
                                FILE_ATTRIBUTE_NORMAL, NULL);
-               if (h == INVALID_HANDLE_VALUE)
+               if (h == INVALID_HANDLE_VALUE
+                   && GetLastError() != ERROR_FILE_EXISTS)
                        return long_path;
                CloseHandle(h);
        }
@@ -380,26 +417,6 @@ string const & nulldev()
 }
 
 
-bool is_terminal(io_channel channel)
-{
-       switch (channel) {
-       case STDIN:
-               if (GetStdHandle(STD_INPUT_HANDLE) == NULL)
-                       return false;
-               break;
-       case STDOUT:
-               if (GetStdHandle(STD_OUTPUT_HANDLE) == NULL)
-                       return false;
-               break;
-       case STDERR:
-               if (GetStdHandle(STD_ERROR_HANDLE) == NULL)
-                       return false;
-               break;
-       }
-       return true;
-}
-
-
 shell_type shell()
 {
        return CMD_EXE;
@@ -586,7 +603,7 @@ string real_path(string const & path)
        CloseHandle(hmap);
        CloseHandle(hpath);
        string const retpath = subst(string(realpath), '\\', '/');
-       return FileName::fromFilesystemEncoding(retpath).absFilename();
+       return FileName::fromFilesystemEncoding(retpath).absFileName();
 }
 
 } // namespace os