Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 08:46:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

font: Box font uses canvas abstraction

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-12-13 21:08:45 -08:00
parent b21e18a9e6
commit ead8610604
2 changed files with 45 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/font/sprite/Box.zig
View File

@ -2167,8 +2167,9 @@ fn draw_light_arc(
const width = self.width * supersample;
// Allocate our supersample sized canvas
var supercanvas = try font.sprite.Canvas.init(alloc, width, height);
defer supercanvas.deinit(alloc);
var ss_data = try alloc.alloc(u8, height * width);
defer alloc.free(ss_data);
std.mem.set(u8, ss_data, 0);
const height_pixels = self.height;
const width_pixels = self.width;
@ -2357,49 +2358,42 @@ fn draw_light_arc(
if (dist > @intToFloat(f64, thick) / 2) continue;
// Set our pixel
supercanvas.rect(.{ .x = c, .y = r, .width = 1, .height = 1 }, .on);
const idx = @intCast(usize, r * @intCast(i32, width) + c);
ss_data[idx] = 0xFF;
}
}
}
}
// Downsample
// {
// var ss_data = try supercanvas.getData(alloc);
// defer alloc.free(ss_data);
//
// var r: u32 = 0;
// while (r < self.height) : (r += 1) {
// var c: u32 = 0;
// while (c < self.width) : (c += 1) {
// var total: u32 = 0;
// var i: usize = 0;
// while (i < supersample) : (i += 1) {
// var j: usize = 0;
// while (j < supersample) : (j += 1) {
// const idx = (r * supersample + i) * (c * supersample) + (c * supersample + j);
// total += ss_data[idx];
// // const idx = (r * supersample + i) * @intCast(usize, stride) + c * supersample + j;
// //total += data[idx];
// }
// }
//
// const average = @intCast(u8, @min(total / (supersample * supersample), 0xff));
// canvas.rect(
// .{
// .x = @intCast(i32, c),
// .y = @intCast(i32, r),
// .width = 1,
// .height = 1,
// },
// @intToEnum(font.sprite.Color, average),
// );
//
// // const idx = r * @intCast(usize, real_stride) + c;
// // real_data[idx] = average;
// }
// }
// }
{
var r: u32 = 0;
while (r < self.height) : (r += 1) {
var c: u32 = 0;
while (c < self.width) : (c += 1) {
var total: u32 = 0;
var i: usize = 0;
while (i < supersample) : (i += 1) {
var j: usize = 0;
while (j < supersample) : (j += 1) {
const idx = (r * supersample + i) * width + (c * supersample + j);
total += ss_data[idx];
}
}
const average = @intCast(u8, @min(total / (supersample * supersample), 0xff));
canvas.rect(
.{
.x = @intCast(i32, c),
.y = @intCast(i32, r),
.width = 1,
.height = 1,
},
@intToEnum(font.sprite.Color, average),
);
}
}
}
// draw vertical/horizontal lines from quartercircle-edge to box-edge.
self.vline(canvas, @min(c_y_pixels, vert_to), @max(c_y_pixels, vert_to), (width_pixels - thick_pixels) / 2, thick_pixels);

24
src/font/sprite/canvas.zig
View File

@ -262,25 +262,25 @@ const PixmanImpl = struct {
pub fn getData(self: *const Canvas, alloc: Allocator) ![]u8 {
const width = @intCast(u32, self.image.getWidth());
const height = @intCast(u32, self.image.getHeight());
const stride = self.image.getStride();
var result = try alloc.alloc(u8, height * width);
errdefer alloc.free(result);
// We want to convert our []u32 to []u8 since we use an 8bpp format
var data_u32 = self.image.getData();
const len_u8 = data_u32.len * 4;
var real_data = @alignCast(@alignOf(u8), @ptrCast([*]u8, data_u32.ptr)[0..len_u8]);
const real_stride = self.image.getStride();
const data = @alignCast(
@alignOf(u8),
@ptrCast([*]u8, self.data.ptr)[0 .. self.data.len * 4],
);
// Convert our strided data
var r: u32 = 0;
while (r < height) : (r += 1) {
var c: u32 = 0;
while (c < width) : (c += 1) {
const src = r * @intCast(usize, real_stride) + c;
const dst = (r * c) + c;
result[dst] = real_data[src];
}
var dst_ptr = result;
var src_ptr = data.ptr;
var i: usize = 0;
while (i < height) : (i += 1) {
std.mem.copy(u8, dst_ptr, src_ptr[0..width]);
dst_ptr = dst_ptr[width..];
src_ptr += @intCast(usize, stride);
}
return result;