bpo-4630: Add cursor no-blink option for IDLE (GH-16960)

This immediately toggles shell, editor, and output windows, but does not affect other input widgets.
This commit is contained in:
Zackery Spytz 2019-11-13 00:13:33 -07:00 committed by Terry Jan Reedy
parent 2d56af7a94
commit 9c2844927d
7 changed files with 48 additions and 1 deletions

View File

@ -3,7 +3,11 @@ Released on 2020-10-05?
====================================== ======================================
bop-26353: Stop adding newline when saving an IDLE shell window. bpo-4360: Add an option to toggle IDLE's cursor blink for shell,
editor, and output windows. See Settings, General, Window Preferences,
Cursor Blink. Patch by Zachary Spytz.
bpo-26353: Stop adding newline when saving an IDLE shell window.
bpo-38598: Do not try to compile IDLE shell or output windows. bpo-38598: Do not try to compile IDLE shell or output windows.

View File

@ -59,6 +59,7 @@ delete-exitfunc= 1
[EditorWindow] [EditorWindow]
width= 80 width= 80
height= 40 height= 40
cursor-blink= 1
font= TkFixedFont font= TkFixedFont
# For TkFixedFont, the actual size and boldness are obtained from tk # For TkFixedFont, the actual size and boldness are obtained from tk
# and override 10 and 0. See idlelib.config.IdleConf.GetFont # and override 10 and 0. See idlelib.config.IdleConf.GetFont

View File

@ -158,6 +158,8 @@ class IdleConf:
self.defaultCfg = {} self.defaultCfg = {}
self.userCfg = {} self.userCfg = {}
self.cfg = {} # TODO use to select userCfg vs defaultCfg self.cfg = {} # TODO use to select userCfg vs defaultCfg
# self.blink_off_time = <first editor text>['insertofftime']
# See https:/bugs.python.org/issue4630, msg356516.
if not _utest: if not _utest:
self.CreateConfigHandlers() self.CreateConfigHandlers()

View File

@ -236,6 +236,7 @@ class ConfigDialog(Toplevel):
instance.set_notabs_indentwidth() instance.set_notabs_indentwidth()
instance.ApplyKeybindings() instance.ApplyKeybindings()
instance.reset_help_menu_entries() instance.reset_help_menu_entries()
instance.update_cursor_blink()
for klass in reloadables: for klass in reloadables:
klass.reload() klass.reload()
@ -1820,6 +1821,9 @@ class GenPage(Frame):
(*)win_width_int: Entry - win_width (*)win_width_int: Entry - win_width
win_height_title: Label win_height_title: Label
(*)win_height_int: Entry - win_height (*)win_height_int: Entry - win_height
frame_cursor_blink: Frame
cursor_blink_title: Label
(*)cursor_blink_bool: Checkbutton - cursor_blink
frame_autocomplete: Frame frame_autocomplete: Frame
auto_wait_title: Label auto_wait_title: Label
(*)auto_wait_int: Entry - autocomplete_wait (*)auto_wait_int: Entry - autocomplete_wait
@ -1864,6 +1868,8 @@ class GenPage(Frame):
StringVar(self), ('main', 'EditorWindow', 'width')) StringVar(self), ('main', 'EditorWindow', 'width'))
self.win_height = tracers.add( self.win_height = tracers.add(
StringVar(self), ('main', 'EditorWindow', 'height')) StringVar(self), ('main', 'EditorWindow', 'height'))
self.cursor_blink = tracers.add(
BooleanVar(self), ('main', 'EditorWindow', 'cursor-blink'))
self.autocomplete_wait = tracers.add( self.autocomplete_wait = tracers.add(
StringVar(self), ('extensions', 'AutoComplete', 'popupwait')) StringVar(self), ('extensions', 'AutoComplete', 'popupwait'))
self.paren_style = tracers.add( self.paren_style = tracers.add(
@ -1920,6 +1926,11 @@ class GenPage(Frame):
validatecommand=self.digits_only, validate='key', validatecommand=self.digits_only, validate='key',
) )
frame_cursor_blink = Frame(frame_window, borderwidth=0)
cursor_blink_title = Label(frame_cursor_blink, text='Cursor Blink')
self.cursor_blink_bool = Checkbutton(frame_cursor_blink,
variable=self.cursor_blink, width=1)
frame_autocomplete = Frame(frame_window, borderwidth=0,) frame_autocomplete = Frame(frame_window, borderwidth=0,)
auto_wait_title = Label(frame_autocomplete, auto_wait_title = Label(frame_autocomplete,
text='Completions Popup Wait (milliseconds)') text='Completions Popup Wait (milliseconds)')
@ -2024,6 +2035,10 @@ class GenPage(Frame):
win_height_title.pack(side=RIGHT, anchor=E, pady=5) win_height_title.pack(side=RIGHT, anchor=E, pady=5)
self.win_width_int.pack(side=RIGHT, anchor=E, padx=10, pady=5) self.win_width_int.pack(side=RIGHT, anchor=E, padx=10, pady=5)
win_width_title.pack(side=RIGHT, anchor=E, pady=5) win_width_title.pack(side=RIGHT, anchor=E, pady=5)
# frame_cursor_blink.
frame_cursor_blink.pack(side=TOP, padx=5, pady=0, fill=X)
cursor_blink_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
self.cursor_blink_bool.pack(side=LEFT, padx=5, pady=5)
# frame_autocomplete. # frame_autocomplete.
frame_autocomplete.pack(side=TOP, padx=5, pady=0, fill=X) frame_autocomplete.pack(side=TOP, padx=5, pady=0, fill=X)
auto_wait_title.pack(side=LEFT, anchor=W, padx=5, pady=5) auto_wait_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
@ -2078,6 +2093,8 @@ class GenPage(Frame):
'main', 'EditorWindow', 'width', type='int')) 'main', 'EditorWindow', 'width', type='int'))
self.win_height.set(idleConf.GetOption( self.win_height.set(idleConf.GetOption(
'main', 'EditorWindow', 'height', type='int')) 'main', 'EditorWindow', 'height', type='int'))
self.cursor_blink.set(idleConf.GetOption(
'main', 'EditorWindow', 'cursor-blink', type='bool'))
self.autocomplete_wait.set(idleConf.GetOption( self.autocomplete_wait.set(idleConf.GetOption(
'extensions', 'AutoComplete', 'popupwait', type='int')) 'extensions', 'AutoComplete', 'popupwait', type='int'))
self.paren_style.set(idleConf.GetOption( self.paren_style.set(idleConf.GetOption(

View File

@ -241,6 +241,12 @@ class EditorWindow(object):
self.indentwidth = self.tabwidth self.indentwidth = self.tabwidth
self.set_notabs_indentwidth() self.set_notabs_indentwidth()
# Store the current value of the insertofftime now so we can restore
# it if needed.
if not hasattr(idleConf, 'blink_off_time'):
idleConf.blink_off_time = self.text['insertofftime']
self.update_cursor_blink()
# When searching backwards for a reliable place to begin parsing, # When searching backwards for a reliable place to begin parsing,
# first start num_context_lines[0] lines back, then # first start num_context_lines[0] lines back, then
# num_context_lines[1] lines back if that didn't work, and so on. # num_context_lines[1] lines back if that didn't work, and so on.
@ -803,6 +809,16 @@ class EditorWindow(object):
text.mark_set("insert", pos + "+1c") text.mark_set("insert", pos + "+1c")
text.see(pos) text.see(pos)
def update_cursor_blink(self):
"Update the cursor blink configuration."
cursorblink = idleConf.GetOption(
'main', 'EditorWindow', 'cursor-blink', type='bool')
if not cursorblink:
self.text['insertofftime'] = 0
else:
# Restore the original value
self.text['insertofftime'] = idleConf.blink_off_time
def ResetFont(self): def ResetFont(self):
"Update the text widgets' font if it is changed" "Update the text widgets' font if it is changed"
# Called from configdialog.py # Called from configdialog.py

View File

@ -1135,6 +1135,10 @@ class GenPageTest(unittest.TestCase):
d.win_width_int.insert(0, '11') d.win_width_int.insert(0, '11')
self.assertEqual(mainpage, {'EditorWindow': {'width': '11'}}) self.assertEqual(mainpage, {'EditorWindow': {'width': '11'}})
def test_cursor_blink(self):
self.page.cursor_blink_bool.invoke()
self.assertEqual(mainpage, {'EditorWindow': {'cursor-blink': 'False'}})
def test_autocomplete_wait(self): def test_autocomplete_wait(self):
self.page.auto_wait_int.delete(0, 'end') self.page.auto_wait_int.delete(0, 'end')
self.page.auto_wait_int.insert(0, '11') self.page.auto_wait_int.insert(0, '11')

View File

@ -0,0 +1,3 @@
Add an option to toggle IDLE's cursor blink for shell, editor, and output
windows. See Settings, General, Window Preferences, Cursor Blink.
Patch by Zachary Spytz.