feat: add mouse resizing of panel views

This commit is contained in:
CJ van den Berg 2024-08-13 19:38:35 +02:00
parent 95bf2ac9a7
commit 50d47a73f2
15 changed files with 138 additions and 65 deletions

View file

@ -19,7 +19,7 @@ rendered: [:0]const u8 = "",
const Self = @This();
pub fn create(a: Allocator, parent: Plane) !Widget {
pub fn create(a: Allocator, parent: Plane, event_handler: ?Widget.EventHandler) !Widget {
return Button.create_widget(Self, a, parent, .{
.ctx = .{},
.label = "",
@ -27,6 +27,7 @@ pub fn create(a: Allocator, parent: Plane) !Widget {
.on_layout = layout,
.on_render = render,
.on_receive = receive,
.on_event = event_handler,
});
}

View file

@ -34,7 +34,7 @@ file: bool = false,
const project_icon = "";
const Self = @This();
pub fn create(a: Allocator, parent: Plane) !Widget {
pub fn create(a: Allocator, parent: Plane, event_handler: ?Widget.EventHandler) !Widget {
const btn = try Button.create(Self, a, parent, .{
.ctx = .{
.a = a,
@ -52,6 +52,7 @@ pub fn create(a: Allocator, parent: Plane) !Widget {
.on_layout = layout,
.on_render = render,
.on_receive = receive,
.on_event = event_handler,
});
return Widget.to(btn);
}

View file

@ -15,7 +15,6 @@ const EventHandler = @import("../EventHandler.zig");
const history = 8;
parent: Plane,
plane: Plane,
frame: u64 = 0,
idle_frame: u64 = 0,
@ -33,23 +32,15 @@ const idle_msg = "🐶";
pub const width = idle_msg.len + 20;
pub fn create(a: Allocator, parent: Plane) !Widget {
const self: *Self = try a.create(Self);
self.* = try init(parent);
try tui.current().input_listeners.add(EventHandler.bind(self, listen));
return self.widget();
}
fn init(parent: Plane) !Self {
var n = try Plane.init(&(Widget.Box{}).opts(@typeName(Self)), parent);
errdefer n.deinit();
var frame_rate = tp.env.get().num("frame-rate");
if (frame_rate == 0) frame_rate = 60;
return .{
.parent = parent,
.plane = n,
const self: *Self = try a.create(Self);
self.* = .{
.plane = try Plane.init(&(Widget.Box{}).opts(@typeName(Self)), parent),
.wipe_after_frames = @divTrunc(frame_rate, 2),
};
try tui.current().input_listeners.add(EventHandler.bind(self, listen));
return self.widget();
}
pub fn widget(self: *Self) Widget {

View file

@ -18,7 +18,7 @@ rendered: [:0]const u8 = "",
const Self = @This();
pub fn create(a: Allocator, parent: Plane) !Widget {
pub fn create(a: Allocator, parent: Plane, event_handler: ?Widget.EventHandler) !Widget {
return Button.create_widget(Self, a, parent, .{
.ctx = .{},
.label = "",
@ -26,6 +26,7 @@ pub fn create(a: Allocator, parent: Plane) !Widget {
.on_layout = layout,
.on_render = render,
.on_receive = receive,
.on_event = event_handler,
});
}

View file

@ -10,12 +10,12 @@ const tui = @import("../tui.zig");
const mainview = @import("../mainview.zig");
const logview = @import("../logview.zig");
parent: Plane,
plane: Plane,
msg: std.ArrayList(u8),
msg_counter: usize = 0,
clear_timer: ?tp.Cancellable = null,
level: Level = .info,
on_event: ?Widget.EventHandler,
const message_display_time_seconds = 2;
const error_display_time_seconds = 4;
@ -26,12 +26,12 @@ const Level = enum {
err,
};
pub fn create(a: std.mem.Allocator, parent: Plane) !Widget {
pub fn create(a: std.mem.Allocator, parent: Plane, event_handler: ?Widget.EventHandler) !Widget {
const self: *Self = try a.create(Self);
self.* = .{
.parent = parent,
.plane = try Plane.init(&(Widget.Box{}).opts(@typeName(Self)), parent),
.msg = std.ArrayList(u8).init(a),
.on_event = event_handler,
};
logview.init(a);
try tui.current().message_filters.add(MessageFilter.bind(self, receive_log));
@ -52,6 +52,15 @@ pub fn deinit(self: *Self, a: std.mem.Allocator) void {
a.destroy(self);
}
pub fn receive(self: *Self, from: tp.pid_ref, m: tp.message) error{Exit}!bool {
var btn: u32 = 0;
if (try m.match(.{ "D", tp.any, tp.extract(&btn), tp.more })) {
if (self.on_event) |h| h.send(from, m) catch {};
return true;
}
return false;
}
pub fn layout(self: *Self) Widget.Layout {
return .{ .static = if (self.msg.items.len > 0) self.msg.items.len + 2 else 1 };
}
@ -92,7 +101,7 @@ fn process_log(self: *Self, m: tp.message) !void {
const err_stop = "error.Stop";
if (std.mem.eql(u8, msg, err_stop))
return;
if (msg.len >= err_stop.len + 1 and std.mem.eql(u8, msg[0..err_stop.len + 1], err_stop ++ "\n"))
if (msg.len >= err_stop.len + 1 and std.mem.eql(u8, msg[0 .. err_stop.len + 1], err_stop ++ "\n"))
return;
try self.set(msg, .err);
} else if (try m.match(.{ "log", tp.extract(&src), tp.more })) {

View file

@ -14,13 +14,14 @@ const command = @import("../command.zig");
const ed = @import("../editor.zig");
const tui = @import("../tui.zig");
pub fn create(a: Allocator, parent: Plane) !Widget {
pub fn create(a: Allocator, parent: Plane, event_handler: ?Widget.EventHandler) !Widget {
return Button.create_widget(void, a, parent, .{
.ctx = {},
.label = tui.get_mode(),
.on_click = on_click,
.on_layout = layout,
.on_render = render,
.on_event = event_handler,
});
}

View file

@ -25,19 +25,13 @@ pub const width = 5;
pub fn create(a: Allocator, parent: Plane) !Widget {
const self: *Self = try a.create(Self);
self.* = try init(parent);
self.* = .{
.plane = try Plane.init(&(Widget.Box{}).opts(@typeName(Self)), parent),
};
try tui.current().input_listeners.add(EventHandler.bind(self, listen));
return self.widget();
}
fn init(parent: Plane) !Self {
var n = try Plane.init(&(Widget.Box{}).opts(@typeName(Self)), parent);
errdefer n.deinit();
return .{
.plane = n,
};
}
pub fn widget(self: *Self) Widget {
return Widget.to(self);
}

View file

@ -15,22 +15,17 @@ cursels: usize = 0,
selection: ?ed.Selection = null,
buf: [256]u8 = undefined,
rendered: [:0]const u8 = "",
on_event: ?Widget.EventHandler,
const Self = @This();
pub fn create(a: Allocator, parent: Plane) !Widget {
pub fn create(a: Allocator, parent: Plane, event_handler: ?Widget.EventHandler) !Widget {
const self: *Self = try a.create(Self);
self.* = try init(parent);
return Widget.to(self);
}
fn init(parent: Plane) !Self {
var n = try Plane.init(&(Widget.Box{}).opts(@typeName(Self)), parent);
errdefer n.deinit();
return .{
.plane = n,
self.* = .{
.plane = try Plane.init(&(Widget.Box{}).opts(@typeName(Self)), parent),
.on_event = event_handler,
};
return Widget.to(self);
}
pub fn deinit(self: *Self, a: Allocator) void {
@ -81,7 +76,12 @@ fn format(self: *Self) void {
self.buf[self.rendered.len] = 0;
}
pub fn receive(self: *Self, _: tp.pid_ref, m: tp.message) error{Exit}!bool {
pub fn receive(self: *Self, from: tp.pid_ref, m: tp.message) error{Exit}!bool {
var btn: u32 = 0;
if (try m.match(.{ "D", tp.any, tp.extract(&btn), tp.more })) {
if (self.on_event) |h| h.send(from, m) catch {};
return true;
}
if (try m.match(.{ "E", "match", tp.extract(&self.matches) }))
self.format();
if (try m.match(.{ "E", "cursels", tp.extract(&self.cursels) }))

View file

@ -6,15 +6,28 @@ const tui = @import("../tui.zig");
const Self = @This();
pub fn create(a: std.mem.Allocator, parent: Widget) !Widget {
pub fn create(a: std.mem.Allocator, parent: Widget, event_handler: ?Widget.EventHandler) !Widget {
var w = try WidgetList.createH(a, parent, "statusbar", .{ .static = 1 });
if (tui.current().config.modestate_show) try w.add(try @import("modestate.zig").create(a, w.plane));
try w.add(try @import("filestate.zig").create(a, w.plane));
try w.add(try @import("minilog.zig").create(a, w.plane));
if (tui.current().config.selectionstate_show) try w.add(try @import("selectionstate.zig").create(a, w.plane));
try w.add(try @import("diagstate.zig").create(a, w.plane));
try w.add(try @import("linenumstate.zig").create(a, w.plane));
w.after_render = render_grip;
w.ctx = w;
if (tui.current().config.modestate_show) try w.add(try @import("modestate.zig").create(a, w.plane, event_handler));
try w.add(try @import("filestate.zig").create(a, w.plane, event_handler));
try w.add(try @import("minilog.zig").create(a, w.plane, event_handler));
if (tui.current().config.selectionstate_show) try w.add(try @import("selectionstate.zig").create(a, w.plane, event_handler));
try w.add(try @import("diagstate.zig").create(a, w.plane, event_handler));
try w.add(try @import("linenumstate.zig").create(a, w.plane, event_handler));
if (tui.current().config.modstate_show) try w.add(try @import("modstate.zig").create(a, w.plane));
if (tui.current().config.keystate_show) try w.add(try @import("keystate.zig").create(a, w.plane));
return w.widget();
}
fn render_grip(ctx: ?*anyopaque, theme: *const Widget.Theme) void {
const w: *WidgetList = @ptrCast(@alignCast(ctx.?));
if (w.hover()) {
w.plane.set_style(theme.statusbar_hover);
const width = w.plane.dim_x();
const grip_pos = width / 2;
w.plane.cursor_move_yx(0, @intCast(grip_pos)) catch {};
_ = w.plane.putstr("") catch {};
}
}