refactor: move mode.event_handler back to input mode
This commit is contained in:
parent
d06ebd0dd5
commit
525287c7ac
22 changed files with 47 additions and 51 deletions
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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),
|
||||
},
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
};
|
||||
|
|
|
@ -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(),
|
||||
},
|
||||
};
|
||||
|
|
|
@ -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",
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue