#include "support/os.h"
#include "support/os_win32.h"
-#include "support/lstrings.h"
+
+#include "support/debug.h"
+#include "support/FileName.h"
+#include "support/gettext.h"
#include "support/filetools.h"
+#include "support/lstrings.h"
#include "support/ExceptionMessage.h"
-#include "support/Package.h"
-#include "support/Path.h"
-
-#include "debug.h"
-#include "gettext.h"
#include <boost/assert.hpp>
#include <direct.h> // _getdrive
#include <shlobj.h> // SHGetFolderPath
#include <windef.h>
-#include <shellapi.h>
+#include <shellapi.h>
#include <shlwapi.h>
// Must define SHGFP_TYPE_CURRENT for older versions of MinGW.
# endif
#endif
-using std::endl;
-using std::string;
-
-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);
-
+using namespace std;
namespace lyx {
namespace support {
* shell scripts failed, for mysterious reasons...
*
* I've chosen for now, therefore, to simply add Ruurd's original
- * code as-is. A wrapper program hidecmd.c has been added to
+ * 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.
*/
docstring::size_type common_path(docstring const & p1, docstring const & p2)
{
- docstring::size_type i = 0;
- docstring::size_type const p1_len = p1.length();
- docstring::size_type const p2_len = p2.length();
+ size_t i = 0;
+ size_t const p1_len = p1.length();
+ size_t const p2_len = p2.length();
while (i < p1_len && i < p2_len && uppercase(p1[i]) == uppercase(p2[i]))
++i;
if ((i < p1_len && i < p2_len)
{
string const dos_path = subst(p, "/", "\\");
- LYXERR(Debug::LATEX)
- << "<Win32 path correction> ["
- << p << "]->>["
- << dos_path << ']' << endl;
+ LYXERR(Debug::LATEX, "<Win32 path correction> ["
+ << p << "]->>[" << dos_path << ']');
return dos_path;
}
-namespace {
-
-string const get_long_path(string const & short_path)
+static 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);
+ vector<char> long_path(MAX_PATH);
DWORD result = GetLongPathName(to_local8bit(from_utf8(short_path)).c_str(),
&long_path[0], long_path.size());
return (result == 0) ? short_path : to_utf8(from_filesystem8bit(&long_path[0]));
}
-} // namespace anon
-
string internal_path(string const & p)
{
// on windows_style_tex_paths_), but we use always forward slashes,
// since it gets written into a .tex file.
- if (!windows_style_tex_paths_ && is_absolute_path(p)) {
+ FileName path(p);
+ if (!windows_style_tex_paths_ && path.isAbsolute()) {
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)
- << "<Path correction for LaTeX> ["
- << p << "]->>["
- << cygpath << ']' << endl;
+ LYXERR(Debug::LATEX, "<Path correction for LaTeX> ["
+ << p << "]->>[" << cygpath << ']');
return cygpath;
}
return subst(p, '\\', '/');
}
-// (Claus H.) On Win32 both Unix and Win32/DOS pathnames are used.
-// Therefore an absolute path could be either a pathname starting
-// with a slash (Unix) or a pathname starting with a drive letter
-// followed by a colon. Because a colon is not valid in pathes in Unix
-// and at another location in Win32 testing just for the existance
-// of the colon in the 2nd position seems to be enough!
-bool is_absolute_path(string const & p)
-{
- if (p.empty())
- return false;
-
- bool isDosPath = (p.length() > 1 && p[1] == ':');
- bool isUnixPath = (p[0] == '/');
-
- return isDosPath || isUnixPath;
-}
-
-
// returns a string suitable to be passed to popen when
// reading a pipe
char const * popen_read_mode()
bool autoOpenFile(string const & filename, auto_open_mode const mode)
{
- // reference: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc
- // /platform/shell/reference/functions/shellexecute.asp
+ // 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,
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().absFilename(), "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().absFilename(), "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