xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework handling of initial coordinates so that init commands can change them

Browse Source 
Fixes #944
This commit is contained in:
Maxime Coste 2016-12-01 20:40:50 +00:00
parent 3ad554167d
commit a65e8142f3
4 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client_manager.cc
View File

@ -37,8 +37,8 @@ String ClientManager::generate_name() const
} }
Client* ClientManager::create_client(std::unique_ptr<UserInterface>&& ui, Client* ClientManager::create_client(std::unique_ptr<UserInterface>&& ui,
EnvVarMap env_vars, EnvVarMap env_vars, StringView init_cmds,
StringView init_commands) BufferCoord init_coord)
{ {
Buffer& buffer = BufferManager::instance().get_first_buffer(); Buffer& buffer = BufferManager::instance().get_first_buffer();
WindowAndSelections ws = get_free_window(buffer); WindowAndSelections ws = get_free_window(buffer);
@ -46,9 +46,14 @@ Client* ClientManager::create_client(std::unique_ptr<UserInterface>&& ui,
std::move(ws.selections), std::move(env_vars), std::move(ws.selections), std::move(env_vars),
generate_name()}; generate_name()};
m_clients.emplace_back(client); m_clients.emplace_back(client);
auto& selections = client->context().selections_write_only();
selections = SelectionList(buffer, buffer.clamp(init_coord));
client->context().window().center_line(init_coord.line);
try try
{ {
CommandManager::instance().execute(init_commands, client->context()); CommandManager::instance().execute(init_cmds, client->context());
} }
catch (Kakoune::runtime_error& error) catch (Kakoune::runtime_error& error)
{ {

3
src/client_manager.hh
View File

@ -21,7 +21,8 @@ public:
~ClientManager(); ~ClientManager();
Client* create_client(std::unique_ptr<UserInterface>&& ui, Client* create_client(std::unique_ptr<UserInterface>&& ui,
EnvVarMap env_vars, StringView init_cmd); EnvVarMap env_vars, StringView init_cmds,
BufferCoord init_coord);
bool empty() const { return m_clients.empty(); } bool empty() const { return m_clients.empty(); }
size_t count() const { return m_clients.size(); } size_t count() const { return m_clients.size(); }

47
src/main.cc
View File

@ -454,12 +454,12 @@ void signal_handler(int signal)
abort(); abort();
} }
int run_client(StringView session, StringView init_command, UIType ui_type) int run_client(StringView session, StringView init_cmds, UIType ui_type)
{ {
try try
{ {
EventManager event_manager; EventManager event_manager;
RemoteClient client{session, make_ui(ui_type), get_env_vars(), init_command}; RemoteClient client{session, make_ui(ui_type), get_env_vars(), init_cmds};
while (true) while (true)
event_manager.handle_next_events(EventMode::Normal); event_manager.handle_next_events(EventMode::Normal);
} }
@ -471,9 +471,10 @@ int run_client(StringView session, StringView init_command, UIType ui_type)
return 0; return 0;
} }
int run_server(StringView session, StringView init_command, int run_server(StringView session,
StringView init_cmds, BufferCoord init_coord,
bool ignore_kakrc, bool daemon, bool readonly, UIType ui_type, bool ignore_kakrc, bool daemon, bool readonly, UIType ui_type,
ConstArrayView<StringView> files, BufferCoord target_coord) ConstArrayView<StringView> files)
{ {
static bool terminate = false; static bool terminate = false;
if (daemon) if (daemon)
@ -565,21 +566,15 @@ int run_server(StringView session, StringView init_command,
try try
{ {
if (not daemon and if (not daemon)
(local_client = client_manager.create_client( local_client = client_manager.create_client(
create_local_ui(ui_type), get_env_vars(), init_command))) create_local_ui(ui_type), get_env_vars(), init_cmds, init_coord);
{
auto& selections = local_client->context().selections_write_only();
auto& buffer = selections.buffer();
selections = SelectionList(buffer, buffer.clamp(target_coord));
local_client->context().window().center_line(target_coord.line);
if (startup_error) if (local_client and startup_error)
local_client->print_status({ local_client->print_status({
"error during startup, see *debug* buffer for details", "error during startup, see *debug* buffer for details",
get_face("Error") get_face("Error")
}); });
}
while (not terminate and (not client_manager.empty() or daemon)) while (not terminate and (not client_manager.empty() or daemon))
{ {
@ -794,7 +789,7 @@ int main(int argc, char* argv[])
return run_pipe(*session); return run_pipe(*session);
} }
auto init_command = parser.get_switch("e").value_or(StringView{}); auto init_cmds = parser.get_switch("e").value_or(StringView{});
const UIType ui_type = parse_ui_type(parser.get_switch("ui").value_or("ncurses")); const UIType ui_type = parse_ui_type(parser.get_switch("ui").value_or("ncurses"));
if (auto keys = parser.get_switch("f")) if (auto keys = parser.get_switch("f"))
@ -809,7 +804,7 @@ int main(int argc, char* argv[])
for (size_t i = 0; i < parser.positional_count(); ++i) for (size_t i = 0; i < parser.positional_count(); ++i)
files.emplace_back(parser[i]); files.emplace_back(parser[i]);
return run_filter(*keys, init_command, files, return run_filter(*keys, init_cmds, files,
(bool)parser.get_switch("q")); (bool)parser.get_switch("q"));
} }
@ -827,11 +822,11 @@ int main(int argc, char* argv[])
for (auto name : parser) for (auto name : parser)
new_files += format("edit '{}';", escape(real_path(name), "'", '\\')); new_files += format("edit '{}';", escape(real_path(name), "'", '\\'));
return run_client(*server_session, new_files + init_command, ui_type); return run_client(*server_session, new_files + init_cmds, ui_type);
} }
else else
{ {
BufferCoord target_coord; BufferCoord init_coord;
Vector<StringView> files; Vector<StringView> files;
for (auto& name : parser) for (auto& name : parser)
{ {
@ -840,9 +835,9 @@ int main(int argc, char* argv[])
auto colon = find(name, ':'); auto colon = find(name, ':');
if (auto line = str_to_int_ifp({name.begin()+1, colon})) if (auto line = str_to_int_ifp({name.begin()+1, colon}))
{ {
target_coord.line = *line - 1; init_coord.line = *line - 1;
if (colon != name.end()) if (colon != name.end())
target_coord.column = str_to_int_ifp({colon+1, name.end()}).value_or(1) - 1; init_coord.column = str_to_int_ifp({colon+1, name.end()}).value_or(1) - 1;
continue; continue;
} }
@ -854,11 +849,11 @@ int main(int argc, char* argv[])
StringView session = parser.get_switch("s").value_or(StringView{}); StringView session = parser.get_switch("s").value_or(StringView{});
try try
{ {
return run_server(session, init_command, return run_server(session, init_cmds, init_coord,
(bool)parser.get_switch("n"), (bool)parser.get_switch("n"),
(bool)parser.get_switch("d"), (bool)parser.get_switch("d"),
(bool)parser.get_switch("ro"), (bool)parser.get_switch("ro"),
ui_type, files, target_coord); ui_type, files);
} }
catch (convert_to_client_mode& convert) catch (convert_to_client_mode& convert)
{ {

6
src/remote.cc
View File

@ -650,13 +650,13 @@ private:
{ {
case MessageType::Connect: case MessageType::Connect:
{ {
auto init_command = m_reader.read<String>(); auto init_cmds = m_reader.read<String>();
auto dimensions = m_reader.read<DisplayCoord>(); auto dimensions = m_reader.read<DisplayCoord>();
auto env_vars = m_reader.read_idmap<String, MemoryDomain::EnvVars>(); auto env_vars = m_reader.read_idmap<String, MemoryDomain::EnvVars>();
RemoteUI* ui = new RemoteUI{sock, dimensions}; RemoteUI* ui = new RemoteUI{sock, dimensions};
if (auto* client = ClientManager::instance().create_client( if (auto* client = ClientManager::instance().create_client(
std::unique_ptr<UserInterface>{ui}, std::unique_ptr<UserInterface>(ui),
std::move(env_vars), init_command)) std::move(env_vars), init_cmds, {}))
ui->set_client(client); ui->set_client(client);
Server::instance().remove_accepter(this); Server::instance().remove_accepter(this);