Merge branch 'fixes' into lua_api

Author: arch1t3cht

libaegisub/common/vfr.cpp

@@ -143,7 +143,7 @@ Framerate::Framerate(double fps)
 Framerate::Framerate(int64_t numerator, int64_t denominator, bool drop)
 : denominator(denominator)
 , numerator(numerator)
-, drop(drop && numerator % denominator != 0)
+, drop(drop && denominator != 0 && numerator % denominator != 0)
 {
 	if (numerator <= 0 || denominator <= 0)
 		throw InvalidFramerate("Numerator and denominator must both be greater than zero");
@@ -225,7 +225,7 @@ int Framerate::FrameAtTime(int ms, Time type) const {
 		return int((ms * numerator / denominator - 999) / 1000);
 
 	if (ms > timecodes.back())
-		return int((ms * numerator - last + denominator - 1) / denominator / 1000) + (int)timecodes.size() - 1;
+		return int((ms * numerator - numerator / 2 - last + numerator - 1) / denominator / 1000) + (int)timecodes.size() - 1;
 
 	return (int)distance(lower_bound(timecodes.rbegin(), timecodes.rend(), ms, std::greater<int>()), timecodes.rend()) - 1;
 }

libaegisub/unix/util.cpp

@@ -15,22 +15,13 @@
 #include <libaegisub/util.h>
 
 #include <cstddef>
-
-#ifdef _LIBCPP_VERSION
 #include <thread>
-#else
-#include <boost/thread.hpp>
-#endif
 
 namespace agi { namespace util {
 void SetThreadName(const char *) { }
 
 void sleep_for(int ms) {
-#ifdef __clang__
 	std::this_thread::sleep_for(std::chrono::milliseconds(ms));
-#else
-	boost::this_thread::sleep_for(boost::chrono::milliseconds(ms));
-#endif
 }
 
 } }

libaegisub/windows/fs.cpp

@@ -35,7 +35,11 @@ namespace bfs = boost::filesystem;
 
 namespace agi { namespace fs {
 std::string ShortName(path const& p) {
-	std::wstring out(MAX_PATH + 1, 0);
+	DWORD length = GetShortPathName(p.c_str(), NULL, 0);
+	if (!length)
+		return p.string();
+
+	std::wstring out(length, 0);
 	DWORD len = GetShortPathName(p.c_str(), &out[0], out.size());
 	if (!len)
 		return p.string();
@@ -60,9 +64,7 @@ void Touch(path const& file) {
 }
 
 void Copy(fs::path const& from, fs::path const& to) {
-	acs::CheckFileRead(from);
 	CreateDirectory(to.parent_path());
-	acs::CheckDirWrite(to.parent_path());
 
 	if (!CopyFile(from.wstring().c_str(), to.wstring().c_str(), false)) {
 		switch (GetLastError()) {

meson.build

@@ -1,6 +1,6 @@
 project('Aegisub', ['c', 'cpp'],
         license: 'BSD-3-Clause',
-        meson_version: '>=0.56.1',
+        meson_version: '>=0.57.0',
         default_options: ['cpp_std=c++14', 'buildtype=debugoptimized'],
         version: '3.2.2')
 

src/audio_timing_dialogue.cpp

@@ -324,8 +324,8 @@ class AudioTimingControllerDialogue final : public AudioTimingController {
 	/// The owning project context
 	agi::Context *context;
 
-	/// The time which was clicked on for alt-dragging mode
-	int clicked_ms;
+	/// The time which was clicked on for alt-dragging mode, or INT_MIN if not in alt-draging mode
+	int clicked_ms = INT_MIN;
 
 	/// Autocommit option
 	const agi::OptionValue *auto_commit = OPT_GET("Audio/Auto/Commit");

src/auto4_base.cpp

@@ -222,13 +222,6 @@ namespace Automation4 {
 		});
 	}
 
-	int ProgressSink::ShowDialog(wxDialog *dialog)
-	{
-		int ret = 0;
-		agi::dispatch::Main().Sync([&] { ret = dialog->ShowModal(); });
-		return ret;
-	}
-
 	BackgroundScriptRunner::BackgroundScriptRunner(wxWindow *parent, std::string const& title)
 	: impl(new DialogProgress(parent, to_wx(title)))
 	{
@@ -323,7 +316,8 @@ namespace Automation4 {
 
 		std::vector<std::future<std::unique_ptr<Script>>> script_futures;
 
-		for (auto tok : agi::Split(path, '|')) {
+		auto path_it = agi::Split(path, '|');
+		for (auto tok : std::set<agi::StringRange>(begin(path_it), end(path_it))) {
 			auto dirname = config::path->Decode(agi::str(tok));
 			if (!agi::fs::DirectoryExists(dirname)) continue;
 

src/auto4_base.h

@@ -132,7 +132,6 @@ namespace Automation4 {
 		/// Show the passed dialog on the GUI thread, blocking the calling
 		/// thread until it closes
 		void ShowDialog(ScriptDialog *config_dialog);
-		int ShowDialog(wxDialog *dialog);
 		wxWindow *GetParentWindow() const { return bsr->GetParentWindow(); }
 
 		/// Get the current automation trace level

src/auto4_lua.cpp

@@ -127,7 +127,8 @@ namespace {
 
 	const char *clipboard_get()
 	{
-		std::string data = GetClipboard();
+		std::string data;
+		agi::dispatch::Main().Sync([&] { data = GetClipboard(); });
 		if (data.empty())
 			return nullptr;
 		return strndup(data);
@@ -137,18 +138,14 @@ namespace {
 	{
 		bool succeeded = false;
 
-#if wxUSE_OLE
-		// OLE needs to be initialized on each thread that wants to write to
-		// the clipboard, which wx does not handle automatically
-		wxClipboard cb;
-#else
-		wxClipboard &cb = *wxTheClipboard;
-#endif
-		if (cb.Open()) {
-			succeeded = cb.SetData(new wxTextDataObject(wxString::FromUTF8(str)));
-			cb.Close();
-			cb.Flush();
-		}
+		agi::dispatch::Main().Sync([&] {
+			wxClipboard &cb = *wxTheClipboard;
+			if (cb.Open()) {
+				succeeded = cb.SetData(new wxTextDataObject(wxString::FromUTF8(str)));
+				cb.Close();
+				cb.Flush();
+			}
+		});
 
 		return succeeded;
 	}
@@ -785,27 +782,33 @@ namespace {
 	{
 		bool failed = false;
 		BackgroundScriptRunner bsr(parent, title);
-		bsr.Run([&](ProgressSink *ps) {
-			LuaProgressSink lps(L, ps, can_open_config);
-
-			// Insert our error handler under the function to call
-			lua_pushcclosure(L, add_stack_trace, 0);
-			lua_insert(L, -nargs - 2);
-
-			if (lua_pcall(L, nargs, nresults, -nargs - 2)) {
-				if (!lua_isnil(L, -1)) {
-					// if the call failed, log the error here
-					ps->Log("\n\nLua reported a runtime error:\n");
-					ps->Log(get_string_or_default(L, -1));
+		try {
+			bsr.Run([&](ProgressSink *ps) {
+				LuaProgressSink lps(L, ps, can_open_config);
+
+				// Insert our error handler under the function to call
+				lua_pushcclosure(L, add_stack_trace, 0);
+				lua_insert(L, -nargs - 2);
+
+				if (lua_pcall(L, nargs, nresults, -nargs - 2)) {
+					if (!lua_isnil(L, -1)) {
+						// if the call failed, log the error here
+						ps->Log("\n\nLua reported a runtime error:\n");
+						ps->Log(get_string_or_default(L, -1));
+					}
+					lua_pop(L, 2);
+					failed = true;
 				}
-				lua_pop(L, 2);
-				failed = true;
-			}
-			else
-				lua_remove(L, -nresults - 1);
+				else
+					lua_remove(L, -nresults - 1);
 
-			lua_gc(L, LUA_GCCOLLECT, 0);
-		});
+				lua_gc(L, LUA_GCCOLLECT, 0);
+			});
+		} catch (agi::UserCancelException const&) {
+			if (!failed)
+				lua_pop(L, 2);
+			throw;
+		}
 		if (failed)
 			throw agi::UserCancelException("Script threw an error");
 	}

src/auto4_lua_dialog.cpp

@@ -284,6 +284,10 @@ namespace Automation4 {
 					max = DBL_MAX;
 					min = -DBL_MAX;
 				}
+				if (step != 0.0) {
+					min = min == -DBL_MAX ? 0.0 : min;
+					max = max == DBL_MAX ? 100.0 : max;
+				}
 			}
 
 			bool CanSerialiseValue() const override { return true; }

src/auto4_lua_progresssink.cpp

@@ -36,6 +36,7 @@
 
 #include "compat.h"
 
+#include <libaegisub/dispatch.h>
 #include <libaegisub/lua/utils.h>
 
 #include <wx/filedlg.h>
@@ -197,7 +198,6 @@ namespace Automation4 {
 
 	int LuaProgressSink::LuaDisplayOpenDialog(lua_State *L)
 	{
-		ProgressSink *ps = GetObjPointer(L, lua_upvalueindex(1));
 		wxString message(check_wxstring(L, 1));
 		wxString dir(check_wxstring(L, 2));
 		wxString file(check_wxstring(L, 3));
@@ -211,26 +211,24 @@ namespace Automation4 {
 		if (must_exist)
 			flags |= wxFD_FILE_MUST_EXIST;
 
-		wxFileDialog diag(nullptr, message, dir, file, wildcard, flags);
-		if (ps->ShowDialog(&diag) == wxID_CANCEL) {
-			lua_pushnil(L);
-			return 1;
-		}
-
-		if (multiple) {
-			wxArrayString files;
-			diag.GetPaths(files);
-
-			lua_createtable(L, files.size(), 0);
-			for (size_t i = 0; i < files.size(); ++i) {
-				lua_pushstring(L, files[i].utf8_str());
-				lua_rawseti(L, -2, i + 1);
+		agi::dispatch::Main().Sync([&] {
+			wxFileDialog diag(nullptr, message, dir, file, wildcard, flags);
+			if (diag.ShowModal() == wxID_CANCEL) {
+				lua_pushnil(L);
+			} else if (multiple) {
+				wxArrayString files;
+				diag.GetPaths(files);
+
+				lua_createtable(L, files.size(), 0);
+				for (size_t i = 0; i < files.size(); ++i) {
+					lua_pushstring(L, files[i].utf8_str());
+					lua_rawseti(L, -2, i + 1);
+				}
+			} else {
+				lua_pushstring(L, diag.GetPath().utf8_str());
 			}
+		});
 
-			return 1;
-		}
-
-		lua_pushstring(L, diag.GetPath().utf8_str());
 		return 1;
 	}
 
@@ -247,13 +245,15 @@ namespace Automation4 {
 		if (prompt_overwrite)
 			flags |= wxFD_OVERWRITE_PROMPT;
 
-		wxFileDialog diag(ps->GetParentWindow(), message, dir, file, wildcard, flags);
-		if (ps->ShowDialog(&diag) == wxID_CANCEL) {
-			lua_pushnil(L);
-			return 1;
-		}
+		agi::dispatch::Main().Sync([&] {
+			wxFileDialog diag(ps->GetParentWindow(), message, dir, file, wildcard, flags);
+			if (diag.ShowModal() == wxID_CANCEL) {
+				lua_pushnil(L);
+			} else {
+				lua_pushstring(L, diag.GetPath().utf8_str());
+			}
+		});
 
-		lua_pushstring(L, diag.GetPath().utf8_str());
 		return 1;
 	}
 }