summaryrefslogtreecommitdiff
path: root/src/draw.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/draw.zig')
-rw-r--r--src/draw.zig95
1 files changed, 1 insertions, 94 deletions
diff --git a/src/draw.zig b/src/draw.zig
index 9a71ab1d..a73613ac 100644
--- a/src/draw.zig
+++ b/src/draw.zig
@@ -116,24 +116,6 @@ pub fn place(p: *Pardes, s: *Surface) void {
}
if (p.settings.workspace_tag)
s.addRegion(.{ .kind = .workspace_tag, .rect = .{ .x = 0, .y = 0, .w = s.cols, .h = p.topBarHeight() } });
- // A column carried to the window's right edge shows where it lands as a
- // rail in the last cell: the layers under it stop a cell short.
- if (v.drag == .column_move) rail: {
- const d = v.drag.column_move;
- const source = layout.columnBySerial(p, d.serial) orelse break :rail;
- const edge: u16 = switch (layout.columnDrop(p, source, d.cur_x, d.grab)) {
- .stay => break :rail,
- .reorder => |target| if (target < source) v.col_x[target] else v.col_x[target] + v.col_w[target],
- .edge => |x| x,
- };
- if (edge != s.cols) break :rail;
- for (s.regions[0..s.nregions]) |*region| switch (region.kind) {
- .body, .tag, .notice, .column_tag => if (region.rect.x + region.rect.w == s.cols) {
- region.clip = 1;
- },
- else => {},
- };
- }
}
/// A pane's grip in the grid: `box` focused, else halfway between its ring
@@ -252,8 +234,6 @@ fn joinNotice(p: *Pardes, s: *Surface, arena: std.mem.Allocator, region: Region)
if (layer.cursor) |caret| {
if (caret.x >= skip) s.cursor = .{ .x = region.rect.x + caret.x - @as(u16, @intCast(skip)), .y = region.rect.y, .bar = caret.bar };
}
- // Laid out at its full width; only shown short of the rail.
- layer.viewport.w -|= region.clip;
}
pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
@@ -328,77 +308,6 @@ pub fn render(p: *Pardes, arena: std.mem.Allocator) !*Surface {
try paintHeaders(p, s);
- switch (v.drag) {
- .border_v => |d| {
- if (d.cur_x < s.cols) {
- var row: u16 = p.topBarHeight();
- while (row < s.rows) : (row += 1) s.overlayDash(d.cur_x, row, "╎");
- s.addRegion(.{ .kind = .guide, .rect = .{ .x = d.cur_x, .y = p.topBarHeight(), .w = 1, .h = s.rows -| p.topBarHeight() } });
- }
- if (d.corner) |k| if (d.cur_y < s.rows) {
- const first = if (k.col == d.left_col) v.col_x[k.col] else d.cur_x +| 1;
- const end = if (k.col == d.left_col) d.cur_x else v.col_x[k.col] +| v.col_w[k.col] -| 1;
- var col = first;
- while (col <= end and col < s.cols) : (col += 1) s.overlayDash(col, d.cur_y, "╌");
- if (col > first) s.addRegion(.{ .kind = .guide, .rect = .{ .x = first, .y = d.cur_y, .w = col - first, .h = 1 } });
- };
- },
- // A column that went away mid-drag has nothing to guide.
- .border_h => |d| if (d.cur_y < s.rows and d.col < v.ncol and v.col_x[d.col] < s.cols) {
- const end = @min(s.cols, v.col_x[d.col] + v.col_w[d.col]);
- var col = v.col_x[d.col];
- while (col < end) : (col += 1) s.overlayDash(col, d.cur_y, "╌");
- s.addRegion(.{ .kind = .guide, .rect = .{ .x = v.col_x[d.col], .y = d.cur_y, .w = end - v.col_x[d.col], .h = 1 } });
- },
- .column_move => |d| rail: {
- const source = layout.columnBySerial(p, d.serial) orelse break :rail;
- if (s.cols == 0) break :rail;
- // Where the column's left edge would land, reordered or not.
- const edge: u16 = switch (layout.columnDrop(p, source, d.cur_x, d.grab)) {
- .stay => break :rail,
- .reorder => |target| if (target < source) v.col_x[target] else v.col_x[target] + v.col_w[target],
- .edge => |x| x,
- };
- // The layers under an outside rail stop a cell short of it:
- // `place` clipped them.
- // The rail runs in the seam cell left of the edge, where a
- // border drag's does: the edge cell itself is a gutter, which
- // the GUI paints as a scroll rail that swallowed the dashes.
- // At the window's left edge there is no seam, so it runs just
- // past that scroll rail instead. It takes the lit grip's
- // color: this is where the grabbed column lands.
- const x = @min(if (edge == 0) config.GUTTER - 1 else edge - 1, s.cols -| 1);
- var row: u16 = p.topBarHeight();
- // A guide region for each run of it the tags do not break.
- var run: u16 = row;
- while (row < s.rows) : (row += 1) {
- // Past the left edge's scroll rail the rail would cut
- // through column 0's grip and pane boxes: leave them whole.
- if (edge == 0 and s.at(x, row).style.font_role == .tagline) {
- if (row > run) s.addRegion(.{ .kind = .guide, .rect = .{ .x = x, .y = run, .w = 1, .h = row - run } });
- run = row + 1;
- continue;
- }
- s.overlayDash(x, row, "╎");
- s.at(x, row).style.fg = .{ .rgb = chrome.column_box };
- }
- if (row > run) s.addRegion(.{ .kind = .guide, .rect = .{ .x = x, .y = run, .w = 1, .h = row - run } });
- },
- .move => |d| if (d.cur_x < s.cols) {
- if (layout.movePlacement(p, d.id, d.cur_x, d.cur_y)) |placement| if (placement.row < s.rows and v.col_x[placement.preview_col] + v.col_w[placement.preview_col] <= s.cols) {
- var col: u16 = v.col_x[placement.preview_col];
- while (col < v.col_x[placement.preview_col] + v.col_w[placement.preview_col]) : (col += 1) {
- s.set(col, placement.row, "╌", .{ .fg = .{ .rgb = chrome.lineno } });
- }
- s.set(d.cur_x, placement.row, "▌", .{ .fg = .{ .rgb = chrome.lineno } });
- s.addRegion(.{ .kind = .guide, .rect = .{ .x = v.col_x[placement.preview_col], .y = placement.row, .w = v.col_w[placement.preview_col], .h = 1 } });
- s.addRegion(.{ .kind = .guide, .rect = .{ .x = d.cur_x, .y = placement.row, .w = 1, .h = 1 } });
- };
- },
- // A hover draws no hint: columns resize by their grips.
- .none, .select => {},
- }
-
// debug overlay: a small stats box drawn last, top-right ("Debug")
if (p.settings.debug) if (p.panes[v.active]) |at| {
var nlive: usize = 0;
@@ -607,8 +516,6 @@ fn paintHeaders(p: *Pardes, s: *Surface) !void {
const layer = &s.tag_layers[MAX_PANES + c];
try renderHeaderLayer(p, layer, .column, @intCast(c), region.rect, tagline.columnTag(p, c), top, bg, fg);
if (v.col_x[c] < s.cols) joinHeaderRows(s, layer, fg);
- // Laid out at its full width; only shown short of the rail.
- layer.viewport.w -|= region.clip;
};
}
@@ -810,7 +717,7 @@ fn joinPaneTag(p: *Pardes, s: *Surface, arena: std.mem.Allocator, pane: *Pane, r
layer.kind = .pane;
layer.id = @intCast(id);
layer.serial = pane.serial;
- layer.viewport = .{ .x = region.rect.x, .y = region.rect.y, .w = region.rect.w - region.clip, .h = rows };
+ layer.viewport = .{ .x = region.rect.x, .y = region.rect.y, .w = region.rect.w, .h = rows };
layer.cols = columns;
layer.rows = rows;
layer.context_rows = 0;