mirror of
https://github.com/ghostty-org/ghostty.git
synced 2025-08-02 14:57:31 +03:00
Change Percentage to f32
This commit is contained in:
@ -3971,11 +3971,7 @@ pub fn performBindingAction(self: *Surface, action: input.Binding.Action) !bool
|
|||||||
.{ .surface = self },
|
.{ .surface = self },
|
||||||
.new_split,
|
.new_split,
|
||||||
.{
|
.{
|
||||||
.percent = std.fmt.parseInt(
|
.percent = value[1],
|
||||||
u16,
|
|
||||||
value[1],
|
|
||||||
10,
|
|
||||||
) catch return error.InvalidType,
|
|
||||||
.direction = switch (value[0]) {
|
.direction = switch (value[0]) {
|
||||||
.right => .right,
|
.right => .right,
|
||||||
.left => .left,
|
.left => .left,
|
||||||
|
@ -289,7 +289,7 @@ pub const Action = union(Key) {
|
|||||||
|
|
||||||
/// The percentage and direction to create the split
|
/// The percentage and direction to create the split
|
||||||
pub const SplitDirection = extern struct {
|
pub const SplitDirection = extern struct {
|
||||||
percent: u16,
|
percent: f32,
|
||||||
direction: Direction,
|
direction: Direction,
|
||||||
|
|
||||||
// This is made extern (c_int) to make interop easier with our embedded
|
// This is made extern (c_int) to make interop easier with our embedded
|
||||||
|
@ -864,10 +864,10 @@ fn syncActionAccelerators(self: *App) !void {
|
|||||||
try self.syncActionAccelerator("win.close", .{ .close_surface = {} });
|
try self.syncActionAccelerator("win.close", .{ .close_surface = {} });
|
||||||
try self.syncActionAccelerator("win.new_window", .{ .new_window = {} });
|
try self.syncActionAccelerator("win.new_window", .{ .new_window = {} });
|
||||||
try self.syncActionAccelerator("win.new_tab", .{ .new_tab = {} });
|
try self.syncActionAccelerator("win.new_tab", .{ .new_tab = {} });
|
||||||
try self.syncActionAccelerator("win.split_right", .{ .new_split = .{ .right, "50%" } });
|
try self.syncActionAccelerator("win.split_right", .{ .new_split = .{ .right, 0.5 } });
|
||||||
try self.syncActionAccelerator("win.split_down", .{ .new_split = .{ .down, "50%" } });
|
try self.syncActionAccelerator("win.split_down", .{ .new_split = .{ .down, 0.5 } });
|
||||||
try self.syncActionAccelerator("win.split_left", .{ .new_split = .{ .left, "50%" } });
|
try self.syncActionAccelerator("win.split_left", .{ .new_split = .{ .left, 0.5 } });
|
||||||
try self.syncActionAccelerator("win.split_up", .{ .new_split = .{ .up, "50%" } });
|
try self.syncActionAccelerator("win.split_up", .{ .new_split = .{ .up, 0.5 } });
|
||||||
try self.syncActionAccelerator("win.copy", .{ .copy_to_clipboard = {} });
|
try self.syncActionAccelerator("win.copy", .{ .copy_to_clipboard = {} });
|
||||||
try self.syncActionAccelerator("win.paste", .{ .paste_from_clipboard = {} });
|
try self.syncActionAccelerator("win.paste", .{ .paste_from_clipboard = {} });
|
||||||
try self.syncActionAccelerator("win.reset", .{ .reset = {} });
|
try self.syncActionAccelerator("win.reset", .{ .reset = {} });
|
||||||
|
@ -125,10 +125,9 @@ pub fn init(
|
|||||||
// added to the paned.
|
// added to the paned.
|
||||||
self.updateChildren();
|
self.updateChildren();
|
||||||
|
|
||||||
// Skip resize logic if percentage is 50 (this is the default behavior)
|
// Skip resize logic if percent is 0.5 (this is the default behavior)
|
||||||
if (new_split.percent != 50) {
|
if (new_split.percent != 0.5) {
|
||||||
const allocation = sibling.size;
|
const allocation = sibling.size;
|
||||||
const split_percentage: f32 = @as(f32, @floatFromInt(new_split.percent)) / 100;
|
|
||||||
const total_surface_size: f32 = switch (self.orientation) {
|
const total_surface_size: f32 = switch (self.orientation) {
|
||||||
.horizontal => @floatFromInt(allocation.width),
|
.horizontal => @floatFromInt(allocation.width),
|
||||||
.vertical => @floatFromInt(allocation.height),
|
.vertical => @floatFromInt(allocation.height),
|
||||||
@ -136,8 +135,8 @@ pub fn init(
|
|||||||
|
|
||||||
// percentage to apply based on direction
|
// percentage to apply based on direction
|
||||||
const pct = switch (new_split.direction) {
|
const pct = switch (new_split.direction) {
|
||||||
.right, .down => 1 - split_percentage,
|
.right, .down => 1 - new_split.percent,
|
||||||
.left, .up => split_percentage,
|
.left, .up => new_split.percent,
|
||||||
};
|
};
|
||||||
|
|
||||||
const divider_position = @as(c_int, @intFromFloat(total_surface_size * pct));
|
const divider_position = @as(c_int, @intFromFloat(total_surface_size * pct));
|
||||||
|
@ -807,7 +807,7 @@ fn gtkActionSplitRight(
|
|||||||
) callconv(.C) void {
|
) callconv(.C) void {
|
||||||
const self: *Window = @ptrCast(@alignCast(ud orelse return));
|
const self: *Window = @ptrCast(@alignCast(ud orelse return));
|
||||||
const surface = self.actionSurface() orelse return;
|
const surface = self.actionSurface() orelse return;
|
||||||
_ = surface.performBindingAction(.{ .new_split = .{ .right, "50%" } }) catch |err| {
|
_ = surface.performBindingAction(.{ .new_split = .{ .right, 0.5 } }) catch |err| {
|
||||||
log.warn("error performing binding action error={}", .{err});
|
log.warn("error performing binding action error={}", .{err});
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
@ -820,7 +820,7 @@ fn gtkActionSplitDown(
|
|||||||
) callconv(.C) void {
|
) callconv(.C) void {
|
||||||
const self: *Window = @ptrCast(@alignCast(ud orelse return));
|
const self: *Window = @ptrCast(@alignCast(ud orelse return));
|
||||||
const surface = self.actionSurface() orelse return;
|
const surface = self.actionSurface() orelse return;
|
||||||
_ = surface.performBindingAction(.{ .new_split = .{ .down, "50%" } }) catch |err| {
|
_ = surface.performBindingAction(.{ .new_split = .{ .down, 0.5 } }) catch |err| {
|
||||||
log.warn("error performing binding action error={}", .{err});
|
log.warn("error performing binding action error={}", .{err});
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
@ -833,7 +833,7 @@ fn gtkActionSplitLeft(
|
|||||||
) callconv(.C) void {
|
) callconv(.C) void {
|
||||||
const self: *Window = @ptrCast(@alignCast(ud orelse return));
|
const self: *Window = @ptrCast(@alignCast(ud orelse return));
|
||||||
const surface = self.actionSurface() orelse return;
|
const surface = self.actionSurface() orelse return;
|
||||||
_ = surface.performBindingAction(.{ .new_split = .{ .left, "50%" } }) catch |err| {
|
_ = surface.performBindingAction(.{ .new_split = .{ .left, 0.5 } }) catch |err| {
|
||||||
log.warn("error performing binding action error={}", .{err});
|
log.warn("error performing binding action error={}", .{err});
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
@ -846,7 +846,7 @@ fn gtkActionSplitUp(
|
|||||||
) callconv(.C) void {
|
) callconv(.C) void {
|
||||||
const self: *Window = @ptrCast(@alignCast(ud orelse return));
|
const self: *Window = @ptrCast(@alignCast(ud orelse return));
|
||||||
const surface = self.actionSurface() orelse return;
|
const surface = self.actionSurface() orelse return;
|
||||||
_ = surface.performBindingAction(.{ .new_split = .{ .up, "50%" } }) catch |err| {
|
_ = surface.performBindingAction(.{ .new_split = .{ .up, 0.5 } }) catch |err| {
|
||||||
log.warn("error performing binding action error={}", .{err});
|
log.warn("error performing binding action error={}", .{err});
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
@ -1927,12 +1927,12 @@ pub fn default(alloc_gpa: Allocator) Allocator.Error!Config {
|
|||||||
try result.keybind.set.put(
|
try result.keybind.set.put(
|
||||||
alloc,
|
alloc,
|
||||||
.{ .key = .{ .translated = .o }, .mods = .{ .ctrl = true, .shift = true } },
|
.{ .key = .{ .translated = .o }, .mods = .{ .ctrl = true, .shift = true } },
|
||||||
.{ .new_split = .{ .right, "50%" } },
|
.{ .new_split = .{ .right, 0.5 } },
|
||||||
);
|
);
|
||||||
try result.keybind.set.put(
|
try result.keybind.set.put(
|
||||||
alloc,
|
alloc,
|
||||||
.{ .key = .{ .translated = .e }, .mods = .{ .ctrl = true, .shift = true } },
|
.{ .key = .{ .translated = .e }, .mods = .{ .ctrl = true, .shift = true } },
|
||||||
.{ .new_split = .{ .down, "50%" } },
|
.{ .new_split = .{ .down, 0.5 } },
|
||||||
);
|
);
|
||||||
try result.keybind.set.put(
|
try result.keybind.set.put(
|
||||||
alloc,
|
alloc,
|
||||||
@ -2190,12 +2190,12 @@ pub fn default(alloc_gpa: Allocator) Allocator.Error!Config {
|
|||||||
try result.keybind.set.put(
|
try result.keybind.set.put(
|
||||||
alloc,
|
alloc,
|
||||||
.{ .key = .{ .translated = .d }, .mods = .{ .super = true } },
|
.{ .key = .{ .translated = .d }, .mods = .{ .super = true } },
|
||||||
.{ .new_split = .{ .right, "50%" } },
|
.{ .new_split = .{ .right, 0.5 } },
|
||||||
);
|
);
|
||||||
try result.keybind.set.put(
|
try result.keybind.set.put(
|
||||||
alloc,
|
alloc,
|
||||||
.{ .key = .{ .translated = .d }, .mods = .{ .super = true, .shift = true } },
|
.{ .key = .{ .translated = .d }, .mods = .{ .super = true, .shift = true } },
|
||||||
.{ .new_split = .{ .down, "50%" } },
|
.{ .new_split = .{ .down, 0.5 } },
|
||||||
);
|
);
|
||||||
try result.keybind.set.put(
|
try result.keybind.set.put(
|
||||||
alloc,
|
alloc,
|
||||||
|
@ -454,7 +454,7 @@ pub const Action = union(enum) {
|
|||||||
auto, // splits along the larger direction
|
auto, // splits along the larger direction
|
||||||
};
|
};
|
||||||
|
|
||||||
pub const Percentage = []const u8;
|
pub const Percentage = f32;
|
||||||
|
|
||||||
pub const SplitParameter = struct {
|
pub const SplitParameter = struct {
|
||||||
SplitDirection,
|
SplitDirection,
|
||||||
@ -504,15 +504,17 @@ pub const Action = union(enum) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn parseFloat(comptime T: type, value: []const u8) !T {
|
fn parseFloat(comptime T: type, value: []const u8) !T {
|
||||||
return std.fmt.parseFloat(T, value) catch return Error.InvalidFormat;
|
return switch (T) {
|
||||||
}
|
Action.Percentage => blk: {
|
||||||
|
if (value.len < 2) return Error.InvalidFormat;
|
||||||
fn parsePercentage(value: []const u8) !Percentage {
|
if (value[value.len - 1] != '%') return Error.InvalidFormat;
|
||||||
if (value.len < 2) return Error.InvalidFormat;
|
const percent = value[0 .. value.len - 1];
|
||||||
if (value[value.len - 1] != '%') return Error.InvalidFormat;
|
const parsed_percent = std.fmt.parseFloat(f32, percent) catch return Error.InvalidFormat;
|
||||||
const percent = value[0 .. value.len - 1];
|
const clamped_percent: f32 = @min(@max(parsed_percent / 100.0, 0.0), 1.0);
|
||||||
_ = std.fmt.parseInt(u16, percent, 10) catch return Error.InvalidFormat;
|
break :blk clamped_percent;
|
||||||
return percent;
|
},
|
||||||
|
else => std.fmt.parseFloat(T, value) catch return Error.InvalidFormat,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
fn parseParameter(
|
fn parseParameter(
|
||||||
@ -536,7 +538,6 @@ pub const Action = union(enum) {
|
|||||||
.Enum => try parseEnum(field_.type, next),
|
.Enum => try parseEnum(field_.type, next),
|
||||||
.Int => try parseInt(field_.type, next),
|
.Int => try parseInt(field_.type, next),
|
||||||
.Float => try parseFloat(field_.type, next),
|
.Float => try parseFloat(field_.type, next),
|
||||||
.Pointer => if (field_.type == Percentage) try parsePercentage(next),
|
|
||||||
else => unreachable,
|
else => unreachable,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -825,6 +826,12 @@ pub const Action = union(enum) {
|
|||||||
@as(u64, @bitCast(field)),
|
@as(u64, @bitCast(field)),
|
||||||
),
|
),
|
||||||
|
|
||||||
|
// Handle SplitParameter specifically
|
||||||
|
Action.SplitParameter => {
|
||||||
|
const bits = @as(u32, @bitCast(field[1]));
|
||||||
|
std.hash.autoHash(hasher, bits);
|
||||||
|
},
|
||||||
|
|
||||||
// Everything else automatically handle.
|
// Everything else automatically handle.
|
||||||
else => std.hash.autoHashStrat(
|
else => std.hash.autoHashStrat(
|
||||||
hasher,
|
hasher,
|
||||||
@ -1704,11 +1711,10 @@ test "parse: action with enum" {
|
|||||||
|
|
||||||
// parameter
|
// parameter
|
||||||
{
|
{
|
||||||
// Note: The "50%" in the binding string gets parsed to just "50"
|
|
||||||
const binding = try parseSingle("a=new_split:right,50%");
|
const binding = try parseSingle("a=new_split:right,50%");
|
||||||
try testing.expect(binding.action == .new_split);
|
try testing.expect(binding.action == .new_split);
|
||||||
try testing.expectEqual(Action.SplitDirection.right, binding.action.new_split[0]);
|
try testing.expectEqual(Action.SplitDirection.right, binding.action.new_split[0]);
|
||||||
try testing.expectEqualSlices(u8, "50", binding.action.new_split[1]);
|
try testing.expectEqual(@as(f32, 0.5), binding.action.new_split[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// missing unit %
|
// missing unit %
|
||||||
@ -1717,8 +1723,13 @@ test "parse: action with enum" {
|
|||||||
// too many
|
// too many
|
||||||
try testing.expectError(Error.InvalidFormat, parseSingle("a=new_split:right,30%,50%"));
|
try testing.expectError(Error.InvalidFormat, parseSingle("a=new_split:right,30%,50%"));
|
||||||
|
|
||||||
// invalid type
|
// clamping value
|
||||||
try testing.expectError(Error.InvalidFormat, parseSingle("a=new_split:right,0.5%"));
|
{
|
||||||
|
var binding = try parseSingle("a=new_split:right,150%");
|
||||||
|
try testing.expectEqual(@as(f32, 1.0), binding.action.new_split[1]);
|
||||||
|
binding = try parseSingle("a=new_split:right,-50%");
|
||||||
|
try testing.expectEqual(@as(f32, 0.0), binding.action.new_split[1]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
test "parse: action with int" {
|
test "parse: action with int" {
|
||||||
|
Reference in New Issue
Block a user