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

code formatting tweak

Browse Source
This commit is contained in:
Maxime Coste 2014-04-05 12:04:37 +01:00
parent 5523f10235
commit 9b7d8a93c8
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/remote.cc
View File

@ -245,14 +245,19 @@ private:
RemoteUI::RemoteUI(int socket) RemoteUI::RemoteUI(int socket)
: m_socket_watcher(socket, [this](FDWatcher&) { if (m_input_callback) m_input_callback(); }) : m_socket_watcher(socket, [this](FDWatcher&) {
if (m_input_callback)
m_input_callback();
})
{ {
write_debug("remote client connected: " + to_string(m_socket_watcher.fd())); write_debug("remote client connected: " +
to_string(m_socket_watcher.fd()));
} }
RemoteUI::~RemoteUI() RemoteUI::~RemoteUI()
{ {
write_debug("remote client disconnected: " + to_string(m_socket_watcher.fd())); write_debug("remote client disconnected: " +
to_string(m_socket_watcher.fd()));
close(m_socket_watcher.fd()); close(m_socket_watcher.fd());
} }
@ -369,7 +374,8 @@ RemoteClient::RemoteClient(int socket, std::unique_ptr<UserInterface>&& ui,
{ {
Message msg(socket); Message msg(socket);
msg.write(init_command.c_str(), (int)init_command.length()+1); msg.write(init_command.c_str(), (int)init_command.length()+1);
Key key{ resize_modifier, Codepoint(((int)m_dimensions.line << 16) | (int)m_dimensions.column) }; Key key{ resize_modifier, Codepoint(((int)m_dimensions.line << 16) |
(int)m_dimensions.column) };
msg.write(key); msg.write(key);
m_ui->set_input_callback([this]{ write_next_key(); }); m_ui->set_input_callback([this]{ write_next_key(); });
@ -432,12 +438,14 @@ void RemoteClient::write_next_key()
if (dimensions != m_dimensions) if (dimensions != m_dimensions)
{ {
m_dimensions = dimensions; m_dimensions = dimensions;
Key key{ resize_modifier, Codepoint(((int)dimensions.line << 16) | (int)dimensions.column) }; Key key{ resize_modifier, Codepoint(((int)dimensions.line << 16) |
(int)dimensions.column) };
msg.write(key); msg.write(key);
} }
} }
std::unique_ptr<RemoteClient> connect_to(const String& session, std::unique_ptr<UserInterface>&& ui, std::unique_ptr<RemoteClient> connect_to(const String& session,
std::unique_ptr<UserInterface>&& ui,
const String& init_command) const String& init_command)
{ {
auto filename = "/tmp/kak-" + session; auto filename = "/tmp/kak-" + session;
@ -450,7 +458,8 @@ std::unique_ptr<RemoteClient> connect_to(const String& session, std::unique_ptr<
if (connect(sock, (sockaddr*)&addr, sizeof(addr.sun_path)) == -1) if (connect(sock, (sockaddr*)&addr, sizeof(addr.sun_path)) == -1)
throw connection_failed(filename); throw connection_failed(filename);
return std::unique_ptr<RemoteClient>{new RemoteClient{sock, std::move(ui), init_command}}; return std::unique_ptr<RemoteClient>{new RemoteClient{sock, std::move(ui),
init_command}};
} }
void send_command(const String& session, const String& command) void send_command(const String& session, const String& command)
@ -483,7 +492,9 @@ class Server::Accepter
{ {
public: public:
Accepter(int socket) Accepter(int socket)
: m_socket_watcher(socket, [this](FDWatcher&) { handle_available_input(); }) {} : m_socket_watcher(socket,
[this](FDWatcher&) { handle_available_input(); })
{}
private: private:
void handle_available_input() void handle_available_input()
@ -504,17 +515,19 @@ private:
} }
catch (runtime_error& e) catch (runtime_error& e)
{ {
write_debug("error running command '" + m_buffer + "' : " + e.what()); write_debug("error running command '" + m_buffer +
"' : " + e.what());
} }
catch (client_removed&) {} catch (client_removed&) {}
close(socket); close(socket);
Server::instance().remove_accepter(this); Server::instance().remove_accepter(this);
return; return;
} }
if (c == 0) // end of initial command stream, go to interactive ui mode if (c == 0) // end of initial command stream, go to interactive ui
{ {
ClientManager::instance().create_client( std::unique_ptr<UserInterface> ui{new RemoteUI{socket}};
std::unique_ptr<UserInterface>{new RemoteUI{socket}}, m_buffer); ClientManager::instance().create_client(std::move(ui),
m_buffer);
Server::instance().remove_accepter(this); Server::instance().remove_accepter(this);
return; return;
} }
@ -550,7 +563,8 @@ Server::Server(String session_name)
auto accepter = [this](FDWatcher& watcher) { auto accepter = [this](FDWatcher& watcher) {
sockaddr_un client_addr; sockaddr_un client_addr;
socklen_t client_addr_len = sizeof(sockaddr_un); socklen_t client_addr_len = sizeof(sockaddr_un);
int sock = accept(watcher.fd(), (sockaddr*) &client_addr, &client_addr_len); int sock = accept(watcher.fd(), (sockaddr*) &client_addr,
&client_addr_len);
if (sock == -1) if (sock == -1)
throw runtime_error("accept failed"); throw runtime_error("accept failed");
fcntl(sock, F_SETFD, FD_CLOEXEC); fcntl(sock, F_SETFD, FD_CLOEXEC);