Merge pull request #262 from mitchellh/split-writes

update libxev to fix split writes on large writes (i.e. big paste)
This commit is contained in:
Mitchell Hashimoto
2023-08-09 10:17:36 -07:00
committed by GitHub
4 changed files with 15 additions and 5 deletions

View File

@ -673,13 +673,16 @@ fn addDeps(
if (font_backend.hasFontconfig()) step.addModule("fontconfig", fontconfig.module(b)); if (font_backend.hasFontconfig()) step.addModule("fontconfig", fontconfig.module(b));
const mod_freetype = freetype.module(b); const mod_freetype = freetype.module(b);
const mod_macos = macos.module(b); const mod_macos = macos.module(b);
const mod_libxev = b.createModule(.{
.source_file = .{ .path = "vendor/libxev/src/main.zig" },
});
step.addModule("freetype", mod_freetype); step.addModule("freetype", mod_freetype);
step.addModule("harfbuzz", harfbuzz.module(b, .{ step.addModule("harfbuzz", harfbuzz.module(b, .{
.freetype = mod_freetype, .freetype = mod_freetype,
.macos = mod_macos, .macos = mod_macos,
})); }));
step.addModule("imgui", imgui.module(b)); step.addModule("imgui", imgui.module(b));
step.addModule("xev", libxev.module(b)); step.addModule("xev", mod_libxev);
step.addModule("pixman", pixman.module(b)); step.addModule("pixman", pixman.module(b));
step.addModule("stb_image_resize", stb_image_resize.module(b)); step.addModule("stb_image_resize", stb_image_resize.module(b));
step.addModule("utf8proc", utf8proc.module(b)); step.addModule("utf8proc", utf8proc.module(b));

View File

@ -369,8 +369,15 @@ fn cursorCancelCallback(
_: *xev.Completion, _: *xev.Completion,
r: xev.Timer.CancelError!void, r: xev.Timer.CancelError!void,
) xev.CallbackAction { ) xev.CallbackAction {
_ = r catch |err| switch (err) { // This makes it easier to work across platforms where different platforms
error.NotFound => {}, // support different sets of errors, so we just unify it.
const CancelError = xev.Timer.CancelError || error{
Canceled,
Unexpected,
};
_ = r catch |err| switch (@as(CancelError, @errSetCast(err))) {
error.Canceled => {},
else => { else => {
log.warn("error in cursor cancel callback err={}", .{err}); log.warn("error in cursor cancel callback err={}", .{err});
unreachable; unreachable;

View File

@ -483,7 +483,7 @@ fn ttyWrite(
return .disarm; return .disarm;
}; };
_ = d; _ = d;
//log.info("WROTE: {d}", .{status}); //log.info("WROTE: {d}", .{d});
return .disarm; return .disarm;
} }

2
vendor/libxev vendored

@ -1 +1 @@
Subproject commit a3e5c9b263775d6955dd3eccfb0e8931346f48c4 Subproject commit 32e67d79ec11d3e976a89b10b4a0c50d2d66ec75