X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ffiletools.h;h=cfbec430ec49409fe7accb0303d1abba8ab9d616;hb=5b336954d7eb234f424164a8e4d039db74002afa;hp=92c6eb57e7ec8b50edac51e06051cfb282e40067;hpb=9fe72c3501e966ea7e19f7229a37388de7171887;p=lyx.git

diff --git a/src/support/filetools.h b/src/support/filetools.h
index 92c6eb57e7..cfbec430ec 100644
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -50,7 +50,12 @@ enum search_mode {
 	must_exist,
 	/// Only do file name expansion, return the complete name even if
 	/// the file does not exist
-	may_not_exist
+	may_not_exist,
+	/// The (image) file may be present with hi-dpi resolution -
+	/// the lookup checks for a file named "image" + "@2x" + ".ext" first.
+	/// If found it will return e.g. "image@2x.png" instead of "image.png".
+	/// Otherwise it will work as must_exist.
+	check_hidpi
 };
 
 /** Returns the real name of file name in directory path, with optional
@@ -78,6 +83,9 @@ bool isValidLaTeXFileName(std::string const & filename);
 */
 bool isValidDVIFileName(std::string const & filename);
 
+/// check whether the file has binary contents
+bool isBinaryFile(FileName const & filename);
+
 /** Returns the path of a library data file.
     Search the file name.ext in the subdirectory dir of
       -# user_lyxdir
@@ -87,7 +95,8 @@ bool isValidDVIFileName(std::string const & filename);
 */
 FileName const libFileSearch(std::string const & dir,
 				std::string const & name,
-				std::string const & ext = std::string());
+				std::string const & ext = std::string(),
+				search_mode mode = must_exist);
 
 /** Same as libFileSearch(), but tries first to find an
   internationalized version of the file by prepending $LANG_ to the
@@ -103,13 +112,17 @@ i18nLibFileSearch(std::string const & dir,
   */
 FileName const
 imageLibFileSearch(std::string & dir, std::string const & name,
-		   std::string const & ext = std::string());
+		   std::string const & ext = std::string(),
+		   search_mode mode = must_exist);
 
 /// How to quote a filename
 enum quote_style {
 	/** Quote for the (OS dependant) shell. This is needed for command
 	    line arguments of subprocesses. */
 	quote_shell,
+	/** Quote a file name for the (OS dependant) shell. This is needed
+	    for file names as command line arguments of subprocesses. */
+	quote_shell_filename,
 	/** Quote for python. Use this if you want to store a filename in a
 	    python script. Example: \code
 	    os << "infile = " << quoteName(filename) << '\\n';
@@ -125,8 +138,7 @@ enum quote_style {
  *  command will still fail, but the error message will make some sort of
  *  sense ;-)
  */
-std::string const libScriptSearch(std::string const & command,
-		quote_style style = quote_shell);
+std::string const commandPrep(std::string const & command);
 
 enum latex_path_extension {
 	PROTECT_EXTENSION,
@@ -292,6 +304,8 @@ typedef std::pair<int, std::string> cmd_ret;
 
 cmd_ret const runCommand(std::string const & cmd);
 
+int fileLock(const char * lock_file);
+void fileUnlock(int fd, const char * lock_file);
 
 } // namespace support
 } // namespace lyx