#include "support/os_win32.h"
#include "support/lstrings.h"
#include "support/filetools.h"
+#include "support/ExceptionMessage.h"
+#include "support/package.h"
+#include "support/path.h"
#include "debug.h"
+#include "gettext.h"
#include <boost/assert.hpp>
#include <cstdlib>
#include <vector>
-#include <string>
-
/* The GetLongPathName macro may be defined on the compiling machine,
* but we must use a bit of trickery if the resulting executable is
* to run on a Win95 machine.
using lyx::support::runCommand;
using lyx::support::split;
+using lyx::support::addName;
+using lyx::support::addPath;
+using lyx::support::package;
+
+string const win_fonts_truetype[] = {"cmex10", "cmmi10", "cmr10", "cmsy10",
+ "eufm10", "msam10", "msbm10", "wasy10", "esint10"};
+const int num_fonts_truetype = sizeof(win_fonts_truetype) / sizeof(*win_fonts_truetype);
namespace lyx {
* 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 const get_long_path(string const & short_path)
{
+ // GetLongPathName needs the path in file system encoding.
+ // We can use to_local8bit, since file system encoding and the
+ // local 8 bit encoding are identical on windows.
std::vector<char> long_path(MAX_PATH);
- DWORD result = GetLongPathName(short_path.c_str(),
+ DWORD result = GetLongPathName(to_local8bit(from_utf8(short_path)).c_str(),
&long_path[0], long_path.size());
if (result > long_path.size()) {
BOOST_ASSERT(result <= long_path.size());
}
- return (result == 0) ? short_path : &long_path[0];
+ return (result == 0) ? short_path : to_utf8(from_filesystem8bit(&long_path[0]));
}
} // namespace anon
}
-namespace {
-
-void bail_out()
-{
-#ifndef CXX_GLOBAL_CSTD
- using std::exit;
-#endif
- exit(1);
-}
-
-} // namespace anon
-
-
GetFolderPath::GetFolderPath()
: folder_module_(0),
folder_path_func_(0)
{
folder_module_ = LoadLibrary("shfolder.dll");
if (!folder_module_) {
- lyxerr << "Unable to load shfolder.dll\nPlease install."
- << std::endl;
- bail_out();
+ throw ExceptionMessage(ErrorException, _("System file not found"),
+ _("Unable to load shfolder.dll\nPlease install."));
}
folder_path_func_ = reinterpret_cast<function_pointer>(::GetProcAddress(folder_module_, "SHGetFolderPathA"));
if (folder_path_func_ == 0) {
- lyxerr << "Unable to find SHGetFolderPathA in shfolder.dll\n"
- "Don't know how to proceed. Sorry."
- << std::endl;
- bail_out();
+ throw ExceptionMessage(ErrorException, _("System function not found"),
+ _("Unable to find SHGetFolderPathA in shfolder.dll\n"
+ "Don't know how to proceed. Sorry."));
}
}
HRESULT const result = (folder_path_func_)(0, id, 0,
SHGFP_TYPE_CURRENT,
folder_path);
- return (result == 0) ? os::internal_path(folder_path) : string();
+ return (result == 0) ? os::internal_path(to_utf8(from_filesystem8bit(folder_path))) : string();
}
// /platform/shell/reference/functions/shellexecute.asp
char const * action = (mode == VIEW) ? "open" : "edit";
return reinterpret_cast<int>(ShellExecute(NULL, action,
- filename.c_str(), NULL, NULL, 1)) > 32;
+ to_local8bit(from_utf8(filename)).c_str(), NULL, NULL, 1)) > 32;
+}
+
+
+void addFontResources()
+{
+ // Windows only: Add BaKoMa TrueType font resources
+ string const fonts_dir = addPath(package().system_support(), "fonts");
+
+ for (int i = 0 ; i < num_fonts_truetype ; ++i) {
+ string const font_current =
+ addName(fonts_dir, win_fonts_truetype[i] + ".ttf");
+ AddFontResource(to_local8bit(from_utf8(external_path(font_current))).c_str());
+ }
}
+void restoreFontResources()
+{
+ // Windows only: Remove BaKoMa TrueType font resources
+ string const fonts_dir = addPath(package().system_support(), "fonts");
+
+ for(int i = 0 ; i < num_fonts_truetype ; ++i) {
+ string const font_current =
+ addName(fonts_dir, win_fonts_truetype[i] + ".ttf");
+ RemoveFontResource(to_local8bit(from_utf8(external_path(font_current))).c_str());
+ }
+}
+
} // namespace os
} // namespace support
} // namespace lyx
projects / lyx.git / blobdiff