##// END OF EJS Templates
Don't ignore ctrl-C during normal execution in inputhook_qt4
MinRK -
Show More
@@ -1,124 +1,126 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """
2 """
3 Qt4's inputhook support function
3 Qt4's inputhook support function
4
4
5 Author: Christian Boos
5 Author: Christian Boos
6 """
6 """
7
7
8 #-----------------------------------------------------------------------------
8 #-----------------------------------------------------------------------------
9 # Copyright (C) 2011 The IPython Development Team
9 # Copyright (C) 2011 The IPython Development Team
10 #
10 #
11 # Distributed under the terms of the BSD License. The full license is in
11 # Distributed under the terms of the BSD License. The full license is in
12 # the file COPYING, distributed as part of this software.
12 # the file COPYING, distributed as part of this software.
13 #-----------------------------------------------------------------------------
13 #-----------------------------------------------------------------------------
14
14
15 #-----------------------------------------------------------------------------
15 #-----------------------------------------------------------------------------
16 # Imports
16 # Imports
17 #-----------------------------------------------------------------------------
17 #-----------------------------------------------------------------------------
18
18
19 from IPython.core.interactiveshell import InteractiveShell
19 from IPython.core.interactiveshell import InteractiveShell
20 from IPython.external.qt_for_kernel import QtCore, QtGui
20 from IPython.external.qt_for_kernel import QtCore, QtGui
21 from IPython.lib.inputhook import allow_CTRL_C, ignore_CTRL_C, stdin_ready
21 from IPython.lib.inputhook import allow_CTRL_C, ignore_CTRL_C, stdin_ready
22
22
23 #-----------------------------------------------------------------------------
23 #-----------------------------------------------------------------------------
24 # Code
24 # Code
25 #-----------------------------------------------------------------------------
25 #-----------------------------------------------------------------------------
26
26
27 def create_inputhook_qt4(mgr, app=None):
27 def create_inputhook_qt4(mgr, app=None):
28 """Create an input hook for running the Qt4 application event loop.
28 """Create an input hook for running the Qt4 application event loop.
29
29
30 Parameters
30 Parameters
31 ----------
31 ----------
32 mgr : an InputHookManager
32 mgr : an InputHookManager
33
33
34 app : Qt Application, optional.
34 app : Qt Application, optional.
35 Running application to use. If not given, we probe Qt for an
35 Running application to use. If not given, we probe Qt for an
36 existing application object, and create a new one if none is found.
36 existing application object, and create a new one if none is found.
37
37
38 Returns
38 Returns
39 -------
39 -------
40 A pair consisting of a Qt Application (either the one given or the
40 A pair consisting of a Qt Application (either the one given or the
41 one found or created) and a inputhook.
41 one found or created) and a inputhook.
42
42
43 Notes
43 Notes
44 -----
44 -----
45 We use a custom input hook instead of PyQt4's default one, as it
45 We use a custom input hook instead of PyQt4's default one, as it
46 interacts better with the readline packages (issue #481).
46 interacts better with the readline packages (issue #481).
47
47
48 The inputhook function works in tandem with a 'pre_prompt_hook'
48 The inputhook function works in tandem with a 'pre_prompt_hook'
49 which automatically restores the hook as an inputhook in case the
49 which automatically restores the hook as an inputhook in case the
50 latter has been temporarily disabled after having intercepted a
50 latter has been temporarily disabled after having intercepted a
51 KeyboardInterrupt.
51 KeyboardInterrupt.
52 """
52 """
53
53
54 if app is None:
54 if app is None:
55 app = QtCore.QCoreApplication.instance()
55 app = QtCore.QCoreApplication.instance()
56 if app is None:
56 if app is None:
57 app = QtGui.QApplication([" "])
57 app = QtGui.QApplication([" "])
58
58
59 # Re-use previously created inputhook if any
59 # Re-use previously created inputhook if any
60 ip = InteractiveShell.instance()
60 ip = InteractiveShell.instance()
61 if hasattr(ip, '_inputhook_qt4'):
61 if hasattr(ip, '_inputhook_qt4'):
62 return app, ip._inputhook_qt4
62 return app, ip._inputhook_qt4
63
63
64 # Otherwise create the inputhook_qt4/preprompthook_qt4 pair of
64 # Otherwise create the inputhook_qt4/preprompthook_qt4 pair of
65 # hooks (they both share the got_kbdint flag)
65 # hooks (they both share the got_kbdint flag)
66
66
67 got_kbdint = [False]
67 got_kbdint = [False]
68
68
69 def inputhook_qt4():
69 def inputhook_qt4():
70 """PyOS_InputHook python hook for Qt4.
70 """PyOS_InputHook python hook for Qt4.
71
71
72 Process pending Qt events and if there's no pending keyboard
72 Process pending Qt events and if there's no pending keyboard
73 input, spend a short slice of time (50ms) running the Qt event
73 input, spend a short slice of time (50ms) running the Qt event
74 loop.
74 loop.
75
75
76 As a Python ctypes callback can't raise an exception, we catch
76 As a Python ctypes callback can't raise an exception, we catch
77 the KeyboardInterrupt and temporarily deactivate the hook,
77 the KeyboardInterrupt and temporarily deactivate the hook,
78 which will let a *second* CTRL+C be processed normally and go
78 which will let a *second* CTRL+C be processed normally and go
79 back to a clean prompt line.
79 back to a clean prompt line.
80 """
80 """
81 try:
81 try:
82 allow_CTRL_C()
82 allow_CTRL_C()
83 app = QtCore.QCoreApplication.instance()
83 app = QtCore.QCoreApplication.instance()
84 if not app: # shouldn't happen, but safer if it happens anyway...
84 if not app: # shouldn't happen, but safer if it happens anyway...
85 return 0
85 return 0
86 app.processEvents(QtCore.QEventLoop.AllEvents, 300)
86 app.processEvents(QtCore.QEventLoop.AllEvents, 300)
87 if not stdin_ready():
87 if not stdin_ready():
88 timer = QtCore.QTimer()
88 timer = QtCore.QTimer()
89 timer.timeout.connect(app.quit)
89 timer.timeout.connect(app.quit)
90 while not stdin_ready():
90 while not stdin_ready():
91 timer.start(50)
91 timer.start(50)
92 app.exec_()
92 app.exec_()
93 timer.stop()
93 timer.stop()
94 ignore_CTRL_C()
95 except KeyboardInterrupt:
94 except KeyboardInterrupt:
96 ignore_CTRL_C()
95 ignore_CTRL_C()
97 got_kbdint[0] = True
96 got_kbdint[0] = True
98 print("\nKeyboardInterrupt - qt4 event loop interrupted!"
97 print("\nKeyboardInterrupt - qt4 event loop interrupted!"
99 "\n * hit CTRL+C again to clear the prompt"
98 "\n * hit CTRL+C again to clear the prompt"
100 "\n * use '%gui none' to disable the event loop"
99 "\n * use '%gui none' to disable the event loop"
101 " permanently"
100 " permanently"
102 "\n and '%gui qt4' to re-enable it later")
101 "\n and '%gui qt4' to re-enable it later")
103 mgr.clear_inputhook()
102 mgr.clear_inputhook()
104 except: # NO exceptions are allowed to escape from a ctypes callback
103 except: # NO exceptions are allowed to escape from a ctypes callback
104 ignore_CTRL_C()
105 mgr.clear_inputhook()
105 mgr.clear_inputhook()
106 from traceback import print_exc
106 from traceback import print_exc
107 print_exc()
107 print_exc()
108 print("Got exception from inputhook_qt4, unregistering.")
108 print("Got exception from inputhook_qt4, unregistering.")
109 finally:
110 allow_CTRL_C()
109 return 0
111 return 0
110
112
111 def preprompthook_qt4(ishell):
113 def preprompthook_qt4(ishell):
112 """'pre_prompt_hook' used to restore the Qt4 input hook
114 """'pre_prompt_hook' used to restore the Qt4 input hook
113
115
114 (in case the latter was temporarily deactivated after a
116 (in case the latter was temporarily deactivated after a
115 CTRL+C)
117 CTRL+C)
116 """
118 """
117 if got_kbdint[0]:
119 if got_kbdint[0]:
118 mgr.set_inputhook(inputhook_qt4)
120 mgr.set_inputhook(inputhook_qt4)
119 got_kbdint[0] = False
121 got_kbdint[0] = False
120
122
121 ip._inputhook_qt4 = inputhook_qt4
123 ip._inputhook_qt4 = inputhook_qt4
122 ip.set_hook('pre_prompt_hook', preprompthook_qt4)
124 ip.set_hook('pre_prompt_hook', preprompthook_qt4)
123
125
124 return app, inputhook_qt4
126 return app, inputhook_qt4
General Comments 0
You need to be logged in to leave comments. Login now