From bb8adfb731bc46bb02b414b59d7301e1aff552dc Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Mon, 14 Mar 2011 16:09:06 +1300 Subject: Use .stop() and .start() to restart curses around external spawns. --- libmproxy/console.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libmproxy/console.py b/libmproxy/console.py index 532f3c1c..f05b27e7 100644 --- a/libmproxy/console.py +++ b/libmproxy/console.py @@ -371,18 +371,15 @@ class ConnectionView(WWrap): if not c: c = "vi" cmd = [c, name] + self.master.ui.stop() try: ret = subprocess.call(cmd) except: self.master.statusbar.message("Can't start editor: %s" % c) - self.master.ui._curs_set(1) - self.master.ui.clear() + self.master.ui.start() os.unlink(name) return data - # Not sure why, unless we do this we get a visible cursor after - # spawning 'less'. - self.master.ui._curs_set(1) - self.master.ui.clear() + self.master.ui.start() data = open(name).read() os.unlink(name) return data @@ -947,11 +944,9 @@ class ConsoleMaster(flow.FlowMaster): if not cmd: c = os.environ.get("PAGER") or os.environ.get("EDITOR") cmd = [c, name] + self.ui.stop() ret = subprocess.call(cmd, shell=shell) - # Not sure why, unless we do this we get a visible cursor after - # spawning 'less'. - self.ui._curs_set(1) - self.ui.clear() + self.ui.start() os.unlink(name) def set_palette(self): -- cgit v1.2.3