oupson
/
FooTerm
mirror of https://github.com/oupson/FooTerm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move ssh and slave watcher to functions

This commit is contained in:
oupson 2023-02-26 16:09:17 +01:00
parent 287474bd41
commit d0f95935a9
Signed by: oupson
GPG Key ID: 3BD88615552EFCB7
1 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/terminalpane.vala
View File

@ -145,7 +145,12 @@ namespace FooTerm {
slave_channel.set_encoding (null); slave_channel.set_encoding (null);
slave_channel.set_buffered (false); slave_channel.set_buffered (false);
sock_channel.add_watch (GLib.IOCondition.IN, (source, condition) => { sock_channel.add_watch (GLib.IOCondition.IN, this.on_ssh_event);
slave_channel.add_watch (GLib.IOCondition.IN, this.on_slave_event);
}
}
private bool on_ssh_event(GLib.IOChannel source, GLib.IOCondition condition) {
if (condition == IOCondition.HUP) { if (condition == IOCondition.HUP) {
print ("The connection has been broken.\n"); print ("The connection has been broken.\n");
return false; return false;
@ -154,6 +159,7 @@ namespace FooTerm {
try { try {
var buffer = new uint8[1024]; var buffer = new uint8[1024];
var size = this.channel.read(buffer); var size = this.channel.read(buffer);
debug("Got %zu from ssh", size);
if (Posix.write(this.slave_pty, buffer, size) < 0) { if (Posix.write(this.slave_pty, buffer, size) < 0) {
throw GLib.IOError.from_errno(Posix.errno); throw GLib.IOError.from_errno(Posix.errno);
@ -164,9 +170,9 @@ namespace FooTerm {
GLib.warning("Failed to read from ssh : %s", e.message); GLib.warning("Failed to read from ssh : %s", e.message);
return false; return false;
} }
}); }
slave_channel.add_watch (GLib.IOCondition.IN, (source, condition) => { private bool on_slave_event(GLib.IOChannel source, GLib.IOCondition condition) {
if (condition == IOCondition.HUP) { if (condition == IOCondition.HUP) {
print ("The connection has been broken.\n"); print ("The connection has been broken.\n");
return false; return false;
@ -186,8 +192,6 @@ namespace FooTerm {
GLib.warning("Failed to read from terminal : %s", e.message); GLib.warning("Failed to read from terminal : %s", e.message);
return false; return false;
} }
});
}
} }
} }
} }