diff --git a/packages/sciter/.vscode/launch.json b/packages/sciter/.vscode/launch.json new file mode 100644 index 0000000..ef52570 --- /dev/null +++ b/packages/sciter/.vscode/launch.json @@ -0,0 +1,19 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Launch", + "type": "lldb", + "request": "launch", + "program": "${workspaceFolder}/zig-out/bin/sciter", + "args": [], + "cwd": "${workspaceFolder}/zig-out/bin", + }, + { + "name": "Attach", + "type": "lldb", + "request": "attach", + "program": "${workspaceFolder}/zig-out/bin/sciter", + }, + ] +} diff --git a/packages/sciter/.vscode/settings.json b/packages/sciter/.vscode/settings.json new file mode 100644 index 0000000..c430907 --- /dev/null +++ b/packages/sciter/.vscode/settings.json @@ -0,0 +1,6 @@ +{ + "lldb.displayFormat": "auto", + "lldb.showDisassembly": "always", + "lldb.dereferencePointers": true, + "lldb.consoleMode": "commands" +} \ No newline at end of file diff --git a/packages/sciter/build.zig b/packages/sciter/build.zig index 3228fc7..645f559 100644 --- a/packages/sciter/build.zig +++ b/packages/sciter/build.zig @@ -26,6 +26,7 @@ pub fn build(b: *std.Build) void { }, }); const optimize = b.standardOptimizeOption(.{}); + const llvm = b.option(bool, "llvm", "Use LLVM and LLD") orelse false; const exe_mod = b.createModule(.{ .root_source_file = b.path("src/main.zig"), @@ -36,6 +37,8 @@ pub fn build(b: *std.Build) void { const exe = b.addExecutable(.{ .name = "sciter", .root_module = exe_mod, + .use_llvm = llvm, + .use_lld = llvm, }); b.installArtifact(exe); diff --git a/packages/sciter/src/main.zig b/packages/sciter/src/main.zig index 4439f87..ff5bc30 100644 --- a/packages/sciter/src/main.zig +++ b/packages/sciter/src/main.zig @@ -186,8 +186,11 @@ pub fn main() void { _ = display.mapWindow(window); defer _ = display.unmapWindow(window); + //var rect: sciter.Rect = .{ .left = -1, .right = -1, .top = -1, .bottom = -1 }; + //const window2 = sciter_api.SciterCreateWindow(0, &rect, null, null, .null_handle); + _ = sciter_api.SciterSetOption(.null_handle, 10, 1); - sciter_api.SciterSetupDebugOutput(window, null, &sciterDebugOutputProc); + sciter_api.SciterSetupDebugOutput(.null_handle, null, &sciterDebugOutputProc); _ = sciter_api.SciterLoadHtml(window, html, html.len, L("/")); var running = true; diff --git a/packages/sciter/src/sciter.zig b/packages/sciter/src/sciter.zig index c6b3d5c..f0176ae 100644 --- a/packages/sciter/src/sciter.zig +++ b/packages/sciter/src/sciter.zig @@ -236,7 +236,7 @@ pub const Rect = extern struct { left: i32, top: i32, right: i32, - bottom: u32, + bottom: i32, }; pub const RequestParam = extern struct { @@ -453,7 +453,7 @@ pub const API = extern struct { SciterSetHomeURL: *const fn (hwnd: HWindow, baseUrl: CWStr) callconv(.c) Bool, SciterCreateNSView: *anyopaque, SciterCreateWidget: *anyopaque, - SciterCreateWindow: *const fn (creationFlags: u32, frame: *Rect, delegate: *const WindowDelegate, delegateParam: ?*anyopaque, parent: HWindow) callconv(.c) HWindow, + SciterCreateWindow: *const fn (creationFlags: u32, frame: *Rect, _: ?*anyopaque, _: ?*anyopaque, parent: HWindowOptional) callconv(.c) HWindow, SciterSetupDebugOutput: *const fn (hwndOrNull: HWindowOptional, param: ?*anyopaque, pfOutput: ?*const DebugOutputProc) callconv(.c) void,