neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

fix(win32 gui): don't panic on bad unicode result and reduce info logging

Browse source
This commit is contained in:
CJ van den Berg 2025-01-06 17:02:21 +01:00
parent 93d6ee2626
commit cd2aba6a74
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/win32/gui.zig
View file

@ -86,7 +86,7 @@ fn getIcons(dpi: XY(u32)) Icons {
const small_y = win32.GetSystemMetricsForDpi(@intFromEnum(win32.SM_CYSMICON), dpi.y); const small_y = win32.GetSystemMetricsForDpi(@intFromEnum(win32.SM_CYSMICON), dpi.y);
const large_x = win32.GetSystemMetricsForDpi(@intFromEnum(win32.SM_CXICON), dpi.x); const large_x = win32.GetSystemMetricsForDpi(@intFromEnum(win32.SM_CXICON), dpi.x);
const large_y = win32.GetSystemMetricsForDpi(@intFromEnum(win32.SM_CYICON), dpi.y); const large_y = win32.GetSystemMetricsForDpi(@intFromEnum(win32.SM_CYICON), dpi.y);
std.log.info("icons small={}x{} large={}x{} at dpi {}x{}", .{ std.log.debug("icons small={}x{} large={}x{} at dpi {}x{}", .{
small_x, small_y, small_x, small_y,
large_x, large_y, large_x, large_y,
dpi.x, dpi.y, dpi.x, dpi.y,
@ -342,7 +342,7 @@ fn calcWindowPlacement() WindowPlacement {
} }
break :blk dpi; break :blk dpi;
}; };
std.log.info("primary monitor dpi {}x{}", .{ result.dpi.x, result.dpi.y }); std.log.debug("primary monitor dpi {}x{}", .{ result.dpi.x, result.dpi.y });
const work_rect: win32.RECT = blk: { const work_rect: win32.RECT = blk: {
var info: win32.MONITORINFO = undefined; var info: win32.MONITORINFO = undefined;
@ -358,7 +358,7 @@ fn calcWindowPlacement() WindowPlacement {
.x = work_rect.right - work_rect.left, .x = work_rect.right - work_rect.left,
.y = work_rect.bottom - work_rect.top, .y = work_rect.bottom - work_rect.top,
}; };
std.log.info( std.log.debug(
"primary monitor work topleft={},{} size={}x{}", "primary monitor work topleft={},{} size={}x{}",
.{ work_rect.left, work_rect.top, work_size.x, work_size.y }, .{ work_rect.left, work_rect.top, work_size.x, work_size.y },
); );
@ -481,7 +481,7 @@ fn entry(pid: thespian.pid) !void {
} }
const exit_code = std.math.cast(u32, msg.wParam) orelse 0xffffffff; const exit_code = std.math.cast(u32, msg.wParam) orelse 0xffffffff;
std.log.info("gui thread exit {} ({})", .{ exit_code, msg.wParam }); std.log.debug("gui thread exit {} ({})", .{ exit_code, msg.wParam });
pid.send(.{"quit"}) catch |e| onexit(e); pid.send(.{"quit"}) catch |e| onexit(e);
} }
@ -611,10 +611,7 @@ fn sendMouse(
) void { ) void {
const point = ddui.pointFromLparam(lparam); const point = ddui.pointFromLparam(lparam);
const state = stateFromHwnd(hwnd); const state = stateFromHwnd(hwnd);
const cell_size = state.currently_rendered_cell_size orelse { const cell_size = state.currently_rendered_cell_size orelse return;
std.log.info("dropping mouse event that occurred before first render", .{});
return;
};
const cell = CellPos.init(cell_size, point.x, point.y); const cell = CellPos.init(cell_size, point.x, point.y);
switch (kind) { switch (kind) {
.move => { .move => {
@ -664,10 +661,7 @@ fn sendMouseWheel(
) void { ) void {
const point = ddui.pointFromLparam(lparam); const point = ddui.pointFromLparam(lparam);
const state = stateFromHwnd(hwnd); const state = stateFromHwnd(hwnd);
const cell_size = state.currently_rendered_cell_size orelse { const cell_size = state.currently_rendered_cell_size orelse return;
std.log.info("dropping mouse whell event that occurred before first render", .{});
return;
};
const cell = CellPos.init(cell_size, point.x, point.y); const cell = CellPos.init(cell_size, point.x, point.y);
// const fwKeys = win32.loword(wparam); // const fwKeys = win32.loword(wparam);
state.scroll_delta += @as(i16, @bitCast(win32.hiword(wparam))); state.scroll_delta += @as(i16, @bitCast(win32.hiword(wparam)));
@ -773,9 +767,9 @@ fn sendKey(
} }
if (unicode_result > max_char_count) { if (unicode_result > max_char_count) {
for (char_buf[0..@intCast(unicode_result)], 0..) |codepoint, i| { for (char_buf[0..@intCast(unicode_result)], 0..) |codepoint, i| {
std.log.err("UNICODE[{}] 0x{x}", .{ i, codepoint }); std.log.err("UNICODE[{}] 0x{x} {d}", .{ i, codepoint, unicode_result });
} }
std.debug.panic("TODO: unicode result is {}", .{unicode_result}); return;
} }
if (unicode_result == 0) { if (unicode_result == 0) {
@ -1174,7 +1168,7 @@ fn sendResize(
.x = @intCast(@divTrunc(client_pixel_size.x, single_cell_size.x)), .x = @intCast(@divTrunc(client_pixel_size.x, single_cell_size.x)),
.y = @intCast(@divTrunc(client_pixel_size.y, single_cell_size.y)), .y = @intCast(@divTrunc(client_pixel_size.y, single_cell_size.y)),
}; };
std.log.info( std.log.debug(
"Resize Px={}x{} Cells={}x{}", "Resize Px={}x{} Cells={}x{}",
.{ client_pixel_size.x, client_pixel_size.y, client_cell_size.x, client_cell_size.y }, .{ client_pixel_size.x, client_pixel_size.y, client_cell_size.x, client_cell_size.y },
); );