randre03
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add resize on SIGWINCH

embed
Manos Pitsidianakis 2018-07-16 13:36:28 +03:00
parent df5c617b2d
commit 2c5704dcd0
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
5 changed files with 82 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -26,6 +26,8 @@ encoding = "0.2.33"
bitflags = "1.0" bitflags = "1.0"
notify = "4.0.1" notify = "4.0.1"
termion = "1.5.1" termion = "1.5.1"
chan = "0.1.21"
chan-signal = "0.3.1"
[profile.release] [profile.release]
#lto = true #lto = true

111
src/bin.rs
View File

@ -31,6 +31,13 @@ use std::sync::mpsc::{sync_channel, SyncSender, Receiver};
use std::thread; use std::thread;
use std::io::{stdout, stdin, }; use std::io::{stdout, stdin, };
#[macro_use]
extern crate chan;
extern crate chan_signal;
use chan_signal::Signal;
fn main() { fn main() {
/* Lock all stdios */ /* Lock all stdios */
let _stdout = stdout(); let _stdout = stdout();
@ -44,11 +51,14 @@ fn main() {
let (sender, receiver): (SyncSender<ThreadEvent>, Receiver<ThreadEvent>) = sync_channel(::std::mem::size_of::<ThreadEvent>()); let signal = chan_signal::notify(&[Signal::WINCH]);
let (sender, receiver) = chan::sync(::std::mem::size_of::<ThreadEvent>());
{ {
let sender = sender.clone(); let sender = sender.clone();
thread::Builder::new().name("input-thread".to_string()).spawn(move || { thread::Builder::new().name("input-thread".to_string()).spawn(move || {
get_events(stdin, move | k| { sender.send(ThreadEvent::Input(k)).unwrap(); get_events(stdin, move | k| { sender.send(ThreadEvent::Input(k));
})}).unwrap(); })}).unwrap();
} }
@ -73,18 +83,18 @@ fn main() {
state.register_entity(status_bar); state.register_entity(status_bar);
/* /*
let mut idxa = 0; let mut idxa = 0;
let mut idxm = 0; let mut idxm = 0;
let account_length = state.context.accounts.len(); let account_length = state.context.accounts.len();
*/ */
let mut mode: UIMode = UIMode::Normal; let mut mode: UIMode = UIMode::Normal;
'main: loop { 'main: loop {
/* /*
state.refresh_mailbox(idxa,idxm); state.refresh_mailbox(idxa,idxm);
*/ */
/* /*
let folder_length = state.context.accounts[idxa].len(); let folder_length = state.context.accounts[idxa].len();
*/ */
state.render(); state.render();
'inner: loop { 'inner: loop {
@ -93,48 +103,59 @@ fn main() {
state.rcv_event(e); state.rcv_event(e);
} }
state.redraw(); state.redraw();
match receiver.recv().unwrap() { chan_select! {
ThreadEvent::Input(k) => { receiver.recv() -> r => {
match mode { match r.unwrap() {
UIMode::Normal => { ThreadEvent::Input(k) => {
match k { match mode {
Key::Char('q') | Key::Char('Q') => { UIMode::Normal => {
break 'main; match k {
Key::Char('q') | Key::Char('Q') => {
break 'main;
},
Key::Char(';') => {
mode = UIMode::Execute;
state.rcv_event(UIEvent { id: 0, event_type: UIEventType::ChangeMode(mode)});
state.redraw();
}
key => {
state.rcv_event(UIEvent { id: 0, event_type: UIEventType::Input(key)});
state.redraw();
},
_ => {}
}
}, },
Key::Char(';') => { UIMode::Execute => {
mode = UIMode::Execute; match k {
state.rcv_event(UIEvent { id: 0, event_type: UIEventType::ChangeMode(mode)}); Key::Char('\n') | Key::Esc => {
state.redraw(); mode = UIMode::Normal;
} state.rcv_event(UIEvent { id: 0, event_type: UIEventType::ChangeMode(mode)});
key => { state.redraw();
state.rcv_event(UIEvent { id: 0, event_type: UIEventType::Input(key)}); },
state.redraw(); k @ Key::Char(_) => {
state.rcv_event(UIEvent { id: 0, event_type: UIEventType::ExInput(k)});
state.redraw();
},
_ => {},
}
}, },
_ => {}
} }
}, },
UIMode::Execute => { ThreadEvent::RefreshMailbox { name : n } => {
match k { eprintln!("Refresh mailbox {}", n);
Key::Char('\n') | Key::Esc => { },
mode = UIMode::Normal; ThreadEvent::UIEventType(e) => {
state.rcv_event(UIEvent { id: 0, event_type: UIEventType::ChangeMode(mode)}); state.rcv_event(UIEvent { id: 0, event_type: e});
state.redraw(); state.render();
},
k @ Key::Char(_) => {
state.rcv_event(UIEvent { id: 0, event_type: UIEventType::ExInput(k)});
state.redraw();
},
_ => {},
}
}, },
} }
}, },
ThreadEvent::RefreshMailbox { name : n } => { signal.recv() -> signal => {
eprintln!("Refresh mailbox {}", n); if let Some(Signal::WINCH) = signal {
}, state.update_size();
ThreadEvent::UIEventType(e) => { state.render();
state.rcv_event(UIEvent { id: 0, event_type: e}); state.redraw();
state.render(); }
}, },
} }
} }

6
src/ui/components/mail.rs
View File

@ -373,6 +373,9 @@ impl Component for MailListing {
UIEventType::ChangeMode(UIMode::Normal) => { UIEventType::ChangeMode(UIMode::Normal) => {
self.dirty = true; self.dirty = true;
}, },
UIEventType::Resize => {
self.dirty = true;
},
_ => { _ => {
}, },
} }
@ -524,6 +527,9 @@ impl Component for AccountMenu {
UIEventType::ChangeMode(UIMode::Normal) => { UIEventType::ChangeMode(UIMode::Normal) => {
self.dirty = true; self.dirty = true;
}, },
UIEventType::Resize => {
self.dirty = true;
},
_ => { _ => {
}, },
} }

6
src/ui/components/utilities.rs
View File

@ -191,6 +191,9 @@ impl Component for Pager {
UIEventType::ChangeMode(UIMode::Normal) => { UIEventType::ChangeMode(UIMode::Normal) => {
self.dirty = true; self.dirty = true;
}, },
UIEventType::Resize => {
self.dirty = true;
},
_ => { _ => {
}, },
} }
@ -301,6 +304,9 @@ impl Component for StatusBar {
self.dirty = true; self.dirty = true;
self.ex_buffer.push(c); self.ex_buffer.push(c);
}, },
UIEventType::Resize => {
self.dirty = true;
},
_ => {}, _ => {},
} }
} }

2
src/ui/mod.rs
View File

@ -198,6 +198,8 @@ impl<W: Write> State<W> {
self.cols = termcols.unwrap_or(72) as usize; self.cols = termcols.unwrap_or(72) as usize;
self.rows = termrows.unwrap_or(120) as usize; self.rows = termrows.unwrap_or(120) as usize;
self.grid.resize(self.cols, self.rows, Cell::with_char(' ')); self.grid.resize(self.cols, self.rows, Cell::with_char(' '));
self.rcv_event(UIEvent { id: 0, event_type: UIEventType::Resize });
} }
pub fn redraw(&mut self) { pub fn redraw(&mut self) {