namespace {
-bool cygwin_path_fix_ = false;
+bool windows_style_tex_paths_ = true;
string cygdrive = "/cygdrive";
* shell scripts failed, for mysterious reasons...
*
* I've chosen for now, therefore, to simply add Ruurd's original
- * code as-is.
+ * code as-is. A wrapper program hidecmd.c has been added to
+ * development/Win32 which hides the console window of lyx when
+ * lyx is invoked as a parameter of hidecmd.exe.
*/
- // Close the console when run (probably)
- // not run from command prompt
- char WindowTitle[1024];
- if (GetConsoleTitle(WindowTitle, sizeof(WindowTitle)) == 0) {
- // Could not get the title, so we just leave things as they are
- return;
- }
-
- 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
- HWND const hwndFound = FindWindow(NULL, WindowTitle);
- // If found, hide it
- if (hwndFound != NULL)
- ShowWindow( hwndFound, SW_HIDE);
- }
// If cygwin is detected, query the cygdrive prefix
- cmd_ret const c = runCommand("sh -c uname");
- if (c.first != -1 && prefixIs(c.second, "CYGWIN")) {
- cmd_ret const p = runCommand("mount --show-cygdrive-prefix");
- // The output of the mount command is as follows:
- // Prefix Type Flags
- // /cygdrive system binmode
- // So, we use the inner split to pass the second line to the
- // outer split which sets cygdrive with its contents until
- // the first blank, discarding the unneeded return value.
- if (p.first != -1 && prefixIs(p.second, "Prefix"))
- (void) split(split(p.second, '\n'), cygdrive, ' ');
+ HKEY regKey;
+ char buf[MAX_PATH];
+ DWORD bufSize = sizeof(buf);
+ LONG retVal;
+
+ retVal = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+ "Software\\Cygnus Solutions\\Cygwin\\mounts v2",
+ 0, KEY_QUERY_VALUE, ®Key);
+ if (retVal != ERROR_SUCCESS) {
+ retVal = RegOpenKeyEx(HKEY_CURRENT_USER,
+ "Software\\Cygnus Solutions\\Cygwin\\mounts v2",
+ 0, KEY_QUERY_VALUE, ®Key);
+ }
+ if (retVal == ERROR_SUCCESS) {
+ retVal = RegQueryValueEx(regKey, "cygdrive prefix", NULL, NULL,
+ (LPBYTE) buf, &bufSize);
+ RegCloseKey(regKey);
+ if ((retVal == ERROR_SUCCESS) && (bufSize <= MAX_PATH))
+ cygdrive = buf;
}
}
string latex_path(string const & p)
{
// We may need a posix style path or a windows style path (depending
- // on cygwin_path_fix_), but we use always forward slashes, since it
- // gets written into a .tex file.
+ // on windows_style_tex_paths_), but we use always forward slashes,
+ // since it gets written into a .tex file.
- if (cygwin_path_fix_ && is_absolute_path(p)) {
+ if (!windows_style_tex_paths_ && is_absolute_path(p)) {
string const drive = p.substr(0, 2);
string const cygprefix = cygdrive + "/" + drive.substr(0, 1);
string const cygpath = subst(subst(p, '\\', '/'), drive, cygprefix);
lyxerr[Debug::LATEX]
- << "<Cygwin path correction> ["
+ << "<Path correction for LaTeX> ["
<< p << "]->>["
<< cygpath << ']' << endl;
return cygpath;
}
-void cygwin_path_fix(bool use_cygwin_paths)
+void windows_style_tex_paths(bool use_windows_paths)
{
- cygwin_path_fix_ = !use_cygwin_paths;
+ windows_style_tex_paths_ = use_windows_paths;
}
{
if (ext.empty())
return false;
-
- string full_ext = ext;
- // if the extension is passed without leading dot
- if (full_ext[0] != '.')
- full_ext = "." + ext;
+
+ string const full_ext = "." + ext;
DWORD bufSize = MAX_PATH + 100;
TCHAR buf[MAX_PATH + 100];
// reference: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc
// /platform/shell/reference/functions/shellexecute.asp
char const * action = (mode == VIEW) ? "open" : "edit";
- return reinterpret_cast<int>(ShellExecute(NULL, action,
+ return reinterpret_cast<int>(ShellExecute(NULL, action,
filename.c_str(), NULL, NULL, 1)) > 32;
}