main: changed interrupt signal handling

2 files changed, 52 insertions, 3 deletions

diff --git a/ranger/__main__.py b/ranger/__main__.py
index 892fc87e..ba41e5c9 100644
--- a/ranger/__main__.py
+++ b/ranger/__main__.py
@@ -31,6 +31,7 @@ def main():
 	from locale import setlocale, LC_ALL
 	from optparse import OptionParser, SUPPRESS_HELP
 
+	from ranger.ext import curses_interrupt_handler
 	from ranger import __version__, USAGE, CONFDIR
 	from ranger.fm import FM
 	from ranger.container.environment import Environment
@@ -40,9 +41,7 @@ def main():
 
 	setlocale(LC_ALL, 'en_US.utf8')
 	os.stat_float_times(True)
-	# push a Ctrl+C (ascii value 3) if a keyboard-interrupt occurs
-	# instead of raising KeyboardInterrupt and possibly breaking stuff
-	signal(SIGINT, lambda *_: curses.ungetch(3))
+	curses_interrupt_handler.install_interrupt_handler()
 
 	if not os.path.exists(CONFDIR):
 		os.mkdir(CONFDIR)
diff --git a/ranger/ext/curses_interrupt_handler.py b/ranger/ext/curses_interrupt_handler.py
new file mode 100644
index 00000000..43372cfd
--- /dev/null
+++ b/ranger/ext/curses_interrupt_handler.py
@@ -0,0 +1,50 @@
+# Copyright (c) 2009, 2010 hut <hut@lavabit.com>
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+"""
+This module can catch interrupt signals which would otherwise
+rise a KeyboardInterrupt exception and handle it by pushing
+a Ctrl+C (ASCII value 3) to the curses getch stack.
+"""
+
+import curses
+import signal
+
+_do_catch_interrupt = True
+
+def catch_interrupt(boolean=True):
+	"""Should interrupts be caught and simulate a ^C press in curses?"""
+	global _do_catch_interrupt
+	old_value = _do_catch_interrupt
+	_do_catch_interrupt = bool(boolean)
+	return old_value
+
+# The handler which will be used in signal.signal()
+def _interrupt_handler(a1, a2):
+	global _do_catch_interrupt
+	# if a keyboard-interrupt occurs...
+	if _do_catch_interrupt:
+		# push a Ctrl+C (ascii value 3) to the curses getch stack
+		curses.ungetch(3)
+	else:
+		# use the default handler
+		signal.default_int_handler(a1, a2)
+
+def install_interrupt_handler():
+	"""Install the custom interrupt_handler"""
+	signal.signal(signal.SIGINT, _interrupt_handler)
+
+def restore_interrupt_handler():
+	"""Restore the default_int_handler"""
+	signal.signal(signal.SIGINT, signal.default_int_handler)