* 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.
*
#include <config.h>
#include "support/os.h"
-#include "support/filetools.h"
#include "support/lstrings.h"
#include "debug.h"
#include <windows.h>
#include <io.h>
-#include <sys/cygwin.h>
+#include <direct.h> // _getdrive
-using namespace lyx::support;
using std::endl;
using std::string;
-namespace {
-
-string binpath_;
-string binname_;
-string tmpdir_;
-string homepath_;
-string nulldev_;
-
-}
-
-
namespace lyx {
namespace support {
namespace os {
-void init(int /* argc */, char * argv[])
+void os::init(int /* argc */, char * argv[])
{
- static bool initialized = false;
- if (initialized)
- return;
- initialized = true;
-
- string tmp = internal_path(argv[0]);
- binname_ = OnlyFilename(tmp);
- tmp = ExpandPath(tmp); // This expands ./ and ~/
-
- if (!is_absolute_path(tmp)) {
- string binsearchpath = GetEnvPath("PATH");
- // This will make "src/lyx" work always :-)
- binsearchpath += ";.";
- tmp = internal_path(argv[0]);
- tmp = FileOpenSearch(binsearchpath, tmp);
+ /* 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);
}
-
- tmp = MakeAbsPath(OnlyPath(tmp));
-
- // In case we are running in place and compiled with shared libraries
- if (suffixIs(tmp, "/.libs/"))
- tmp.erase(tmp.length()-6, string::npos);
- binpath_ = tmp;
-
-#ifdef __CYGWIN__
- tmpdir_ = "/tmp";
- homepath_ = GetEnvPath("HOME");
- nulldev_ = "/dev/null";
-#else
- tmpdir_ = string();
- homepath_ = GetEnvPath("HOMEDRIVE") + GetEnvPath("HOMEPATH");
- nulldev_ = "nul";
-#endif
-}
-
-
-void warn(string const & mesg)
-{
- MessageBox(0, mesg.c_str(), "LyX error",
- MB_OK|MB_ICONSTOP|MB_SYSTEMMODAL);
}
string current_root()
{
- return "/";
+ // _getdrive returns the current drive (1=A, 2=B, and so on).
+ char const drive = ::_getdrive() + 'A' - 1;
+ return string(1, drive) + ":/";
}
string external_path(string const & p)
{
- string dos_path;
-#ifdef __CYGWIN__
- // Translate from cygwin path syntax to dos path syntax
- if (is_absolute_path(p)) {
- char dp[MAX_PATH];
- 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,'\\','/');
// the Win32/DOS pathnames into Cygwin pathnames.
string internal_path(string const & p)
{
-#ifdef __CYGWIN__
- char pp[MAX_PATH];
- cygwin_conv_to_posix_path(p.c_str(), pp);
- string const posix_path = MakeLatexName(pp);
-#else
- string const posix_path = subst(p,"\\","/");
-#endif
- lyxerr[Debug::DEPEND]
- << "<Win32 path correction> ["
- << p << "]->>["
- << posix_path << ']' << endl;
- return posix_path;
+ return subst(p,"\\","/");
}
}
-string binpath()
-{
- return binpath_;
-}
-
-
-string binname()
-{
- return binname_;
-}
-
-
-void setTmpDir(string const & p)
-{
- tmpdir_ = p;
-}
-
-
-string getTmpDir()
+string const & nulldev()
{
- return tmpdir_;
+ static string const nulldev_ = "nul";
+ return nulldev_;
}
-string const & homepath()
+shell_type shell()
{
- return homepath_;
+ return CMD_EXE;
}
-string const & nulldev()
+char path_separator()
{
- return nulldev_;
+ return ';';
}
-shell_type shell()
-{
-#ifdef __CYGWIN__
- return UNIX;
-#else
- return CMD_EXE;
-#endif
-}
+void cygwin_path_fix(bool)
+{}
} // namespace os
} // namespace support
projects / lyx.git / blobdiff