aboutsummaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorKunal Mohan <kunalmohan99@gmail.com>2021-02-12 11:39:02 +0530
committerKunal Mohan <kunalmohan99@gmail.com>2021-05-04 20:47:48 +0530
commit7beb24625015b9713b617b2070cca495707edcee (patch)
tree01938e7225d7c7d9dcbf0e719d48ad4a8940370c /src/common
parentIntroduce IpcSenderWithContext (diff)
downloadsl0ppij-7beb24625015b9713b617b2070cca495707edcee.tar.gz
sl0ppij-7beb24625015b9713b617b2070cca495707edcee.tar.xz
sl0ppij-7beb24625015b9713b617b2070cca495707edcee.zip
try fixes
Diffstat (limited to 'src/common')
-rw-r--r--src/common/errors.rs2
-rw-r--r--src/common/mod.rs29
-rw-r--r--src/common/pty_bus.rs5
-rw-r--r--src/common/screen.rs4
4 files changed, 22 insertions, 18 deletions
diff --git a/src/common/errors.rs b/src/common/errors.rs
index a9156ae6..94682ebc 100644
--- a/src/common/errors.rs
+++ b/src/common/errors.rs
@@ -64,7 +64,7 @@ pub fn handle_panic(
};
if thread == "main" {
- println!("{}", backtrace);
+ eprintln!("{}", backtrace);
process::exit(1);
} else {
send_app_instructions
diff --git a/src/common/mod.rs b/src/common/mod.rs
index c1b14a0d..4c8ab4c0 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -24,6 +24,7 @@ use std::{
};
use crate::cli::CliArgs;
+use crate::layout::Layout;
use crate::server::start_server;
use command_is_executing::CommandIsExecuting;
use errors::{AppContext, ContextType, ErrorContext, PluginContext, ScreenContext};
@@ -140,8 +141,11 @@ impl IpcSenderWithContext {
}
pub fn send(&mut self, msg: ApiCommand) -> std::io::Result<()> {
+ eprintln!("Ipcsender sending {:?}", msg);
let command = bincode::serialize(&(self.err_ctx, msg)).unwrap();
- self.sender.write_all(&command)
+ UnixStream::connect(MOSAIC_IPC_PIPE)
+ .unwrap()
+ .write_all(&command)
}
}
@@ -395,7 +399,7 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) {
ScreenInstruction::SwitchTabPrev => screen.switch_tab_prev(),
ScreenInstruction::CloseTab => screen.close_tab(),
ScreenInstruction::ApplyLayout((layout, new_pane_pids)) => {
- screen.apply_layout(layout, new_pane_pids);
+ screen.apply_layout(Layout::new(layout), new_pane_pids);
command_is_executing.done_opening_new_pane();
}
ScreenInstruction::GoToTab(tab_index) => {
@@ -560,22 +564,20 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) {
}
AppInstruction::Error(backtrace) => {
let _ = send_server_instructions.send(ApiCommand::Quit);
- let _ = ipc_thread.join();
+ //let _ = ipc_thread.join();
+ //IpcSenderWithContext::new().send(ApiCommand::Quit);
let _ = send_screen_instructions.send(ScreenInstruction::Quit);
let _ = screen_thread.join();
let _ = send_plugin_instructions.send(PluginInstruction::Quit);
let _ = wasm_thread.join();
os_input.unset_raw_mode(0);
let goto_start_of_last_line = format!("\u{1b}[{};{}H", full_screen_ws.rows, 1);
- let restore_snapshot = "\u{1b}[?1049l";
- let error = format!(
- "{}\n{}{}",
- goto_start_of_last_line, restore_snapshot, backtrace
- );
- let _ = os_input
- .get_stdout_writer()
- .write(error.as_bytes())
- .unwrap();
+ let error = format!("{}\n{}", goto_start_of_last_line, backtrace);
+ //let _ = os_input
+ // .get_stdout_writer()
+ // .write(error.as_bytes())
+ // .unwrap();
+ eprintln!("{}", error);
std::process::exit(1);
}
AppInstruction::ToScreen(instruction) => {
@@ -591,7 +593,8 @@ pub fn start(mut os_input: Box<dyn OsApi>, opts: CliArgs, config: Config) {
}
let _ = send_server_instructions.send(ApiCommand::Quit);
- let _ = ipc_thread.join().unwrap();
+ //let _ = ipc_thread.join().unwrap();
+ //IpcSenderWithContext::new().send(ApiCommand::Quit);
let _ = send_screen_instructions.send(ScreenInstruction::Quit);
screen_thread.join().unwrap();
let _ = send_plugin_instructions.send(PluginInstruction::Quit);
diff --git a/src/common/pty_bus.rs b/src/common/pty_bus.rs
index 63162356..5fa3d048 100644
--- a/src/common/pty_bus.rs
+++ b/src/common/pty_bus.rs
@@ -292,7 +292,8 @@ impl PtyBus {
self.id_to_child_pid.insert(pid_primary, pid_secondary);
pid_primary
}
- pub fn spawn_terminals_for_layout(&mut self, layout: Layout, err_ctx: ErrorContext) {
+ pub fn spawn_terminals_for_layout(&mut self, layout_path: PathBuf, err_ctx: ErrorContext) {
+ let layout = Layout::new(layout_path.clone());
let total_panes = layout.total_terminal_panes();
let mut new_pane_pids = vec![];
for _ in 0..total_panes {
@@ -302,7 +303,7 @@ impl PtyBus {
}
self.send_server_instructions
.send(ApiCommand::ToScreen(ScreenInstruction::ApplyLayout((
- layout,
+ layout_path,
new_pane_pids.clone(),
))))
.unwrap();
diff --git a/src/common/screen.rs b/src/common/screen.rs
index b6b8e7f2..dc628a4b 100644
--- a/src/common/screen.rs
+++ b/src/common/screen.rs
@@ -3,7 +3,7 @@
use serde::{Deserialize, Serialize};
use std::collections::BTreeMap;
use std::os::unix::io::RawFd;
-use std::str;
+use std::path::PathBuf;
use std::sync::mpsc::Receiver;
use super::{AppInstruction, SenderWithContext};
@@ -48,7 +48,7 @@ pub enum ScreenInstruction {
SetMaxHeight(PaneId, usize),
SetInvisibleBorders(PaneId, bool),
ClosePane(PaneId),
- ApplyLayout((Layout, Vec<RawFd>)),
+ ApplyLayout((PathBuf, Vec<RawFd>)),
NewTab(RawFd),
SwitchTabNext,
SwitchTabPrev,