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

renderer/opengl: handle wide preedit

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-11-10 17:30:14 -08:00
parent ce4541dd61
commit 5c8c4bb06e
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/renderer/Metal.zig
View File

@ -1215,6 +1215,7 @@ fn rebuildCells(
var cell: mtl_shaders.Cell = cursor_cell orelse var cell: mtl_shaders.Cell = cursor_cell orelse
(real_cursor_cell orelse break :preedit).*; (real_cursor_cell orelse break :preedit).*;
cell.color = .{ 0, 0, 0, 255 }; cell.color = .{ 0, 0, 0, 255 };
cell.cell_width = if (preedit_v.wide) 2 else 1;
// If preedit rendering succeeded then we don't want to // If preedit rendering succeeded then we don't want to
// re-render the underlying cell fg // re-render the underlying cell fg

21
src/renderer/OpenGL.zig
View File

@ -817,7 +817,7 @@ pub fn rebuildCells(
// a cursor cell then we invert the colors on that and add it in so // a cursor cell then we invert the colors on that and add it in so
// that we can always see it. // that we can always see it.
if (cursor_style_) |cursor_style| { if (cursor_style_) |cursor_style| {
const real_cursor_cell = self.addCursor(screen, cursor_style); const real_cursor_cell = self.addCursor(screen, cursor_style, preedit);
// If we have a preedit, we try to render the preedit text on top // If we have a preedit, we try to render the preedit text on top
// of the cursor. // of the cursor.
@ -832,6 +832,7 @@ pub fn rebuildCells(
cell.fg_g = 0; cell.fg_g = 0;
cell.fg_b = 0; cell.fg_b = 0;
cell.fg_a = 255; cell.fg_a = 255;
cell.grid_width = if (preedit_v.wide) 2 else 1;
// If preedit rendering succeeded then we don't want to // If preedit rendering succeeded then we don't want to
// re-render the underlying cell fg // re-render the underlying cell fg
@ -871,10 +872,18 @@ fn addCursor(
self: *OpenGL, self: *OpenGL,
screen: *terminal.Screen, screen: *terminal.Screen,
cursor_style: renderer.CursorStyle, cursor_style: renderer.CursorStyle,
preedit: ?renderer.State.Preedit,
) ?*const GPUCell { ) ?*const GPUCell {
// Add the cursor. We render the cursor over the wide character if // Add the cursor. We render the cursor over the wide character if
// we're on the wide characer tail. // we're on the wide characer tail.
const cell, const x = cell: { const wide, const x = cell: {
// If we have preedit text, our width is based on that.
if (preedit) |p| {
if (p.codepoint > 0) {
break :cell .{ p.wide, screen.cursor.x };
}
}
// The cursor goes over the screen cursor position. // The cursor goes over the screen cursor position.
const cell = screen.getCell( const cell = screen.getCell(
.active, .active,
@ -882,7 +891,7 @@ fn addCursor(
screen.cursor.x, screen.cursor.x,
); );
if (!cell.attrs.wide_spacer_tail or screen.cursor.x == 0) if (!cell.attrs.wide_spacer_tail or screen.cursor.x == 0)
break :cell .{ cell, screen.cursor.x }; break :cell .{ cell.attrs.wide, screen.cursor.x };
// If we're part of a wide character, we move the cursor back to // If we're part of a wide character, we move the cursor back to
// the actual character. // the actual character.
@ -890,7 +899,7 @@ fn addCursor(
.active, .active,
screen.cursor.y, screen.cursor.y,
screen.cursor.x - 1, screen.cursor.x - 1,
), screen.cursor.x - 1 }; ).attrs.wide, screen.cursor.x - 1 };
}; };
const color = self.cursor_color orelse self.foreground_color; const color = self.cursor_color orelse self.foreground_color;
@ -910,7 +919,7 @@ fn addCursor(
self.alloc, self.alloc,
font.sprite_index, font.sprite_index,
@intFromEnum(sprite), @intFromEnum(sprite),
.{ .cell_width = if (cell.attrs.wide) 2 else 1 }, .{ .cell_width = if (wide) 2 else 1 },
) catch |err| { ) catch |err| {
log.warn("error rendering cursor glyph err={}", .{err}); log.warn("error rendering cursor glyph err={}", .{err});
return null; return null;
@ -920,7 +929,7 @@ fn addCursor(
.mode = .fg, .mode = .fg,
.grid_col = @intCast(x), .grid_col = @intCast(x),
.grid_row = @intCast(screen.cursor.y), .grid_row = @intCast(screen.cursor.y),
.grid_width = if (cell.attrs.wide) 2 else 1, .grid_width = if (wide) 2 else 1,
.fg_r = color.r, .fg_r = color.r,
.fg_g = color.g, .fg_g = color.g,
.fg_b = color.b, .fg_b = color.b,