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

refactor Client creation

Browse Source
This commit is contained in:
Maxime Coste 2012-10-31 14:23:44 +01:00
parent 6eef68124f
commit 74731b0d0f
3 changed files with 55 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/client_manager.cc
View File

@ -1,11 +1,33 @@
#include "client_manager.hh"
#include "event_manager.hh"
namespace Kakoune
{
void ClientManager::add_client(Client&& client)
void ClientManager::create_client(std::unique_ptr<UserInterface>&& ui,
Buffer& buffer, int event_fd)
{
m_clients.emplace_back(std::move(client));
m_clients.emplace_back(std::move(ui), *buffer.get_or_create_window());
InputHandler* input_handler = m_clients.back().input_handler.get();
Context* context = m_clients.back().context.get();
EventManager::instance().watch(event_fd, [=](int) {
try
{
input_handler->handle_available_inputs(*context);
}
catch (Kakoune::runtime_error& error)
{
context->print_status(error.description());
}
catch (Kakoune::client_removed&)
{
EventManager::instance().unwatch(event_fd);
close(event_fd);
}
});
context->draw_ifn();
}
void ClientManager::remove_client_by_context(Context& context)

42
src/client_manager.hh
View File

@ -7,16 +7,25 @@
namespace Kakoune
{
struct client_removed{};
class ClientManager : public Singleton<ClientManager>
{
public:
void create_client(std::unique_ptr<UserInterface>&& ui,
Buffer& buffer, int event_fd);
void remove_client_by_context(Context& context);
bool empty() const { return m_clients.empty(); }
size_t count() const { return m_clients.size(); }
private:
struct Client
{
std::unique_ptr<UserInterface> ui;
std::unique_ptr<InputHandler> input_handler;
std::unique_ptr<Context> context;
Client(UserInterface* ui, Window& window)
: ui(ui),
input_handler(new InputHandler{}),
context(new Context(*input_handler, window, *ui)) {}
Client(std::unique_ptr<UserInterface>&& ui, Window& window)
: user_interface(std::move(ui)), input_handler(new InputHandler{}),
context(new Context(*input_handler, window, *user_interface))
{}
Client(Client&&) = default;
Client& operator=(Client&& other)
@ -24,24 +33,17 @@ struct Client
// drop safe pointers first
context.reset();
ui = std::move(other.ui);
user_interface = std::move(other.user_interface);
input_handler = std::move(other.input_handler);
context = std::move(other.context);
return *this;
}
std::unique_ptr<UserInterface> user_interface;
std::unique_ptr<InputHandler> input_handler;
std::unique_ptr<Context> context;
};
struct client_removed{};
class ClientManager : public Singleton<ClientManager>
{
public:
void add_client(Client&& client);
void remove_client_by_context(Context& context);
bool empty() const { return m_clients.empty(); }
size_t count() const { return m_clients.size(); }
private:
std::vector<Client> m_clients;
};

44
src/main.cc
View File

@ -509,27 +509,8 @@ void create_local_client(const String& file)
else
buffer = new Buffer("*scratch*", Buffer::Type::Scratch);
Client client{ui, *buffer->get_or_create_window()};
InputHandler* input_handler = client.input_handler.get();
Context* context = client.context.get();
EventManager::instance().watch(0, [=](int) {
try
{
input_handler->handle_available_inputs(*context);
}
catch (Kakoune::runtime_error& error)
{
ui->print_status(error.description(), -1);
}
catch (Kakoune::client_removed&)
{
EventManager::instance().unwatch(0);
}
});
context->draw_ifn();
ClientManager::instance().add_client(std::move(client));
ClientManager::instance().create_client(
std::unique_ptr<UserInterface>{ui}, *buffer, 0);
}
struct Server
@ -558,25 +539,8 @@ struct Server
auto& buffer = *BufferManager::instance().begin();
RemoteUI* ui = new RemoteUI{sock};
Client client{ui, *buffer->get_or_create_window()};
InputHandler* input_handler = client.input_handler.get();
Context* context = client.context.get();
EventManager::instance().watch(sock, [=](int) {
try
{
input_handler->handle_available_inputs(*context);
}
catch (Kakoune::runtime_error& error)
{
ui->print_status(error.description(), -1);
}
catch (Kakoune::client_removed&)
{
EventManager::instance().unwatch(sock);
close(sock);
}
});
ClientManager::instance().add_client(std::move(client));
ClientManager::instance().create_client(
std::unique_ptr<UserInterface>{ui}, *buffer, sock);
};
EventManager::instance().watch(m_listen_sock, accepter);
}