refactor: move mode.event_handler back to input mode

This commit is contained in:
CJ van den Berg 2024-10-27 18:53:24 +01:00
parent d06ebd0dd5
commit 525287c7ac
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
22 changed files with 47 additions and 51 deletions

View file

@ -29,7 +29,7 @@ pub fn create(allocator: Allocator) !tui.Mode {
.input = try ArrayList(u8).initCapacity(allocator, input_buffer_size),
};
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = root.application_name,
.keybind_hints = &hints,
};

View file

@ -30,7 +30,7 @@ pub fn create(allocator: Allocator) !tui.Mode {
};
try self.commands.init(self);
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = "INS",
.line_numbers = if (tui.current().config.vim_insert_gutter_line_numbers_relative) .relative else .absolute,
.cursor_shape = .beam,

View file

@ -31,7 +31,7 @@ pub fn create(allocator: Allocator) !tui.Mode {
};
try self.commands.init(self);
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = "NOR",
.line_numbers = if (tui.current().config.vim_normal_gutter_line_numbers_relative) .relative else .absolute,
.keybind_hints = &hints,

View file

@ -31,7 +31,7 @@ pub fn create(allocator: Allocator) !tui.Mode {
};
try self.commands.init(self);
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = "SEL",
.line_numbers = if (tui.current().config.vim_visual_gutter_line_numbers_relative) .relative else .absolute,
.keybind_hints = &hints,

View file

@ -22,7 +22,7 @@ pub fn create(allocator: std.mem.Allocator) !tui.Mode {
.allocator = allocator,
};
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = root.application_name,
.keybind_hints = &hints,
};

View file

@ -39,7 +39,7 @@ pub fn create(allocator: Allocator) !tui.Mode {
};
try self.commands.init(self);
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = "INSERT",
.line_numbers = if (tui.current().config.vim_insert_gutter_line_numbers_relative) .relative else .absolute,
.cursor_shape = .beam,

View file

@ -31,7 +31,7 @@ pub fn create(allocator: Allocator) !tui.Mode {
};
try self.commands.init(self);
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = "NORMAL",
.line_numbers = if (tui.current().config.vim_normal_gutter_line_numbers_relative) .relative else .absolute,
.keybind_hints = &hints,

View file

@ -31,7 +31,7 @@ pub fn create(allocator: Allocator) !tui.Mode {
};
try self.commands.init(self);
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = "VISUAL",
.line_numbers = if (tui.current().config.vim_visual_gutter_line_numbers_relative) .relative else .absolute,
.keybind_hints = &hints,

View file

@ -52,9 +52,11 @@ pub fn Create(options: type) type {
if (@hasDecl(options, "restore_state"))
options.restore_state(self) catch {};
return .{
try keybind.mode.mini.file_browser.create(allocator),
.{
.input_handler = keybind.mode.mini.file_browser.create(allocator),
.event_handler = EventHandler.to_owned(self),
},
.{
.name = options.name(self),
},
};

View file

@ -48,9 +48,11 @@ pub fn create(allocator: Allocator, _: command.Context) !struct { tui.Mode, tui.
try self.input.appendSlice(text);
}
return .{
try keybind.mode.mini.find.create(allocator),
.{
.input_handler = keybind.mode.mini.find.create(allocator),
.event_handler = EventHandler.to_owned(self),
},
.{
.name = name,
},
};

View file

@ -42,9 +42,11 @@ pub fn create(allocator: Allocator, _: command.Context) !struct { tui.Mode, tui.
self.input = self.buf[0..text.len];
};
return .{
try keybind.mode.mini.find_in_files.create(allocator),
.{
.input_handler = keybind.mode.mini.find_in_files.create(allocator),
.event_handler = EventHandler.to_owned(self),
},
.{
.name = name,
},
};

View file

@ -33,9 +33,11 @@ pub fn create(allocator: Allocator, _: command.Context) !struct { tui.Mode, tui.
};
try self.commands.init(self);
return .{
try keybind.mode.mini.goto.create(allocator),
.{
.input_handler = keybind.mode.mini.goto.create(allocator),
.event_handler = EventHandler.to_owned(self),
},
.{
.name = name,
},
};

View file

@ -45,9 +45,11 @@ pub fn create(allocator: Allocator, ctx: command.Context) !struct { tui.Mode, tu
};
try self.commands.init(self);
return .{
try keybind.mode.mini.move_to_char.create(allocator),
.{
.input_handler = keybind.mode.mini.move_to_char.create(allocator),
.event_handler = EventHandler.to_owned(self),
},
.{
.name = self.name(),
},
};

View file

@ -62,7 +62,7 @@ pub fn create(allocator: std.mem.Allocator) !tui.Mode {
try mv.floating_views.add(self.modal.widget());
try mv.floating_views.add(self.menu.container_widget);
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = "󰈞 open recent",
};
}

View file

@ -84,7 +84,7 @@ pub fn Create(options: type) type {
try mv.floating_views.add(self.modal.widget());
try mv.floating_views.add(self.menu.container_widget);
return .{
.handler = EventHandler.to_owned(self),
.input_handler = EventHandler.to_owned(self),
.name = options.name,
};
}