diff --git a/gen/config.py b/gen/config.py index 62ef5aea7..f6ad9760a 100755 --- a/gen/config.py +++ b/gen/config.py @@ -53,7 +53,7 @@ def main(args: list[str]=sys.argv) -> None: patch_color_list('tools/cmd/at/set_colors.go', nullable_colors, 'NULLABLE') patch_color_list('tools/themes/collection.go', all_colors, 'ALL') nc = '\n '.join(f'{x!r}' for x in nullable_colors) - write_output('kitty', definition, f'\nnullable_colors = frozenset({{\n {nc}\n}})') + write_output('kitty', definition, f'\nnullable_colors = frozenset({{\n {nc}\n}})\n') if __name__ == '__main__': diff --git a/kitty/conf/generate.py b/kitty/conf/generate.py index b3c59589f..af6207426 100644 --- a/kitty/conf/generate.py +++ b/kitty/conf/generate.py @@ -302,7 +302,7 @@ def resolve_import(ftype: str) -> str: else: for val in func(text): a(f' # {sc.name}') - a(f' {val!r}, ') + a(f' {val!r},') a(']') if only: imports.add(('kitty.constants', 'is_macos')) diff --git a/kitty/options/types.py b/kitty/options/types.py index f605e7172..d0909dfc1 100644 --- a/kitty/options/types.py +++ b/kitty/options/types.py @@ -774,155 +774,155 @@ def __setattr__(self, key: str, val: typing.Any) -> typing.Any: defaults.watcher = {} defaults.map = [ # copy_to_clipboard - KeyDefinition(trigger=SingleKey(mods=256, key=99), definition='copy_to_clipboard'), + KeyDefinition(trigger=SingleKey(mods=256, key=99), definition='copy_to_clipboard'), # paste_from_clipboard - KeyDefinition(trigger=SingleKey(mods=256, key=118), definition='paste_from_clipboard'), + KeyDefinition(trigger=SingleKey(mods=256, key=118), definition='paste_from_clipboard'), # paste_from_selection - KeyDefinition(trigger=SingleKey(mods=256, key=115), definition='paste_from_selection'), + KeyDefinition(trigger=SingleKey(mods=256, key=115), definition='paste_from_selection'), # paste_from_selection - KeyDefinition(trigger=SingleKey(mods=1, key=57348), definition='paste_from_selection'), + KeyDefinition(trigger=SingleKey(mods=1, key=57348), definition='paste_from_selection'), # pass_selection_to_program - KeyDefinition(trigger=SingleKey(mods=256, key=111), definition='pass_selection_to_program'), + KeyDefinition(trigger=SingleKey(mods=256, key=111), definition='pass_selection_to_program'), # scroll_line_up - KeyDefinition(trigger=SingleKey(mods=256, key=57352), definition='scroll_line_up'), + KeyDefinition(trigger=SingleKey(mods=256, key=57352), definition='scroll_line_up'), # scroll_line_up - KeyDefinition(trigger=SingleKey(mods=256, key=107), definition='scroll_line_up'), + KeyDefinition(trigger=SingleKey(mods=256, key=107), definition='scroll_line_up'), # scroll_line_down - KeyDefinition(trigger=SingleKey(mods=256, key=57353), definition='scroll_line_down'), + KeyDefinition(trigger=SingleKey(mods=256, key=57353), definition='scroll_line_down'), # scroll_line_down - KeyDefinition(trigger=SingleKey(mods=256, key=106), definition='scroll_line_down'), + KeyDefinition(trigger=SingleKey(mods=256, key=106), definition='scroll_line_down'), # scroll_page_up - KeyDefinition(trigger=SingleKey(mods=256, key=57354), definition='scroll_page_up'), + KeyDefinition(trigger=SingleKey(mods=256, key=57354), definition='scroll_page_up'), # scroll_page_down - KeyDefinition(trigger=SingleKey(mods=256, key=57355), definition='scroll_page_down'), + KeyDefinition(trigger=SingleKey(mods=256, key=57355), definition='scroll_page_down'), # scroll_home - KeyDefinition(trigger=SingleKey(mods=256, key=57356), definition='scroll_home'), + KeyDefinition(trigger=SingleKey(mods=256, key=57356), definition='scroll_home'), # scroll_end - KeyDefinition(trigger=SingleKey(mods=256, key=57357), definition='scroll_end'), + KeyDefinition(trigger=SingleKey(mods=256, key=57357), definition='scroll_end'), # scroll_to_previous_prompt - KeyDefinition(trigger=SingleKey(mods=256, key=122), definition='scroll_to_prompt -1'), + KeyDefinition(trigger=SingleKey(mods=256, key=122), definition='scroll_to_prompt -1'), # scroll_to_next_prompt - KeyDefinition(trigger=SingleKey(mods=256, key=120), definition='scroll_to_prompt 1'), + KeyDefinition(trigger=SingleKey(mods=256, key=120), definition='scroll_to_prompt 1'), # show_scrollback - KeyDefinition(trigger=SingleKey(mods=256, key=104), definition='show_scrollback'), + KeyDefinition(trigger=SingleKey(mods=256, key=104), definition='show_scrollback'), # show_last_command_output - KeyDefinition(trigger=SingleKey(mods=256, key=103), definition='show_last_command_output'), + KeyDefinition(trigger=SingleKey(mods=256, key=103), definition='show_last_command_output'), # new_window - KeyDefinition(trigger=SingleKey(mods=256, key=57345), definition='new_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=57345), definition='new_window'), # new_os_window - KeyDefinition(trigger=SingleKey(mods=256, key=110), definition='new_os_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=110), definition='new_os_window'), # close_window - KeyDefinition(trigger=SingleKey(mods=256, key=119), definition='close_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=119), definition='close_window'), # next_window - KeyDefinition(trigger=SingleKey(mods=256, key=93), definition='next_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=93), definition='next_window'), # previous_window - KeyDefinition(trigger=SingleKey(mods=256, key=91), definition='previous_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=91), definition='previous_window'), # move_window_forward - KeyDefinition(trigger=SingleKey(mods=256, key=102), definition='move_window_forward'), + KeyDefinition(trigger=SingleKey(mods=256, key=102), definition='move_window_forward'), # move_window_backward - KeyDefinition(trigger=SingleKey(mods=256, key=98), definition='move_window_backward'), + KeyDefinition(trigger=SingleKey(mods=256, key=98), definition='move_window_backward'), # move_window_to_top - KeyDefinition(trigger=SingleKey(mods=256, key=96), definition='move_window_to_top'), + KeyDefinition(trigger=SingleKey(mods=256, key=96), definition='move_window_to_top'), # start_resizing_window - KeyDefinition(trigger=SingleKey(mods=256, key=114), definition='start_resizing_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=114), definition='start_resizing_window'), # first_window - KeyDefinition(trigger=SingleKey(mods=256, key=49), definition='first_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=49), definition='first_window'), # second_window - KeyDefinition(trigger=SingleKey(mods=256, key=50), definition='second_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=50), definition='second_window'), # third_window - KeyDefinition(trigger=SingleKey(mods=256, key=51), definition='third_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=51), definition='third_window'), # fourth_window - KeyDefinition(trigger=SingleKey(mods=256, key=52), definition='fourth_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=52), definition='fourth_window'), # fifth_window - KeyDefinition(trigger=SingleKey(mods=256, key=53), definition='fifth_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=53), definition='fifth_window'), # sixth_window - KeyDefinition(trigger=SingleKey(mods=256, key=54), definition='sixth_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=54), definition='sixth_window'), # seventh_window - KeyDefinition(trigger=SingleKey(mods=256, key=55), definition='seventh_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=55), definition='seventh_window'), # eighth_window - KeyDefinition(trigger=SingleKey(mods=256, key=56), definition='eighth_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=56), definition='eighth_window'), # ninth_window - KeyDefinition(trigger=SingleKey(mods=256, key=57), definition='ninth_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=57), definition='ninth_window'), # tenth_window - KeyDefinition(trigger=SingleKey(mods=256, key=48), definition='tenth_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=48), definition='tenth_window'), # focus_visible_window - KeyDefinition(trigger=SingleKey(mods=256, key=57370), definition='focus_visible_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=57370), definition='focus_visible_window'), # swap_with_window - KeyDefinition(trigger=SingleKey(mods=256, key=57371), definition='swap_with_window'), + KeyDefinition(trigger=SingleKey(mods=256, key=57371), definition='swap_with_window'), # next_tab - KeyDefinition(trigger=SingleKey(mods=256, key=57351), definition='next_tab'), + KeyDefinition(trigger=SingleKey(mods=256, key=57351), definition='next_tab'), # next_tab - KeyDefinition(trigger=SingleKey(mods=4, key=57346), definition='next_tab'), + KeyDefinition(trigger=SingleKey(mods=4, key=57346), definition='next_tab'), # previous_tab - KeyDefinition(trigger=SingleKey(mods=256, key=57350), definition='previous_tab'), + KeyDefinition(trigger=SingleKey(mods=256, key=57350), definition='previous_tab'), # previous_tab - KeyDefinition(trigger=SingleKey(mods=5, key=57346), definition='previous_tab'), + KeyDefinition(trigger=SingleKey(mods=5, key=57346), definition='previous_tab'), # new_tab - KeyDefinition(trigger=SingleKey(mods=256, key=116), definition='new_tab'), + KeyDefinition(trigger=SingleKey(mods=256, key=116), definition='new_tab'), # close_tab - KeyDefinition(trigger=SingleKey(mods=256, key=113), definition='close_tab'), + KeyDefinition(trigger=SingleKey(mods=256, key=113), definition='close_tab'), # move_tab_forward - KeyDefinition(trigger=SingleKey(mods=256, key=46), definition='move_tab_forward'), + KeyDefinition(trigger=SingleKey(mods=256, key=46), definition='move_tab_forward'), # move_tab_backward - KeyDefinition(trigger=SingleKey(mods=256, key=44), definition='move_tab_backward'), + KeyDefinition(trigger=SingleKey(mods=256, key=44), definition='move_tab_backward'), # set_tab_title - KeyDefinition(trigger=SingleKey(mods=258, key=116), definition='set_tab_title'), + KeyDefinition(trigger=SingleKey(mods=258, key=116), definition='set_tab_title'), # next_layout - KeyDefinition(trigger=SingleKey(mods=256, key=108), definition='next_layout'), + KeyDefinition(trigger=SingleKey(mods=256, key=108), definition='next_layout'), # increase_font_size - KeyDefinition(trigger=SingleKey(mods=256, key=61), definition='change_font_size all +2.0'), + KeyDefinition(trigger=SingleKey(mods=256, key=61), definition='change_font_size all +2.0'), # increase_font_size - KeyDefinition(trigger=SingleKey(mods=256, key=43), definition='change_font_size all +2.0'), + KeyDefinition(trigger=SingleKey(mods=256, key=43), definition='change_font_size all +2.0'), # increase_font_size - KeyDefinition(trigger=SingleKey(mods=256, key=57413), definition='change_font_size all +2.0'), + KeyDefinition(trigger=SingleKey(mods=256, key=57413), definition='change_font_size all +2.0'), # decrease_font_size - KeyDefinition(trigger=SingleKey(mods=256, key=45), definition='change_font_size all -2.0'), + KeyDefinition(trigger=SingleKey(mods=256, key=45), definition='change_font_size all -2.0'), # decrease_font_size - KeyDefinition(trigger=SingleKey(mods=256, key=57412), definition='change_font_size all -2.0'), + KeyDefinition(trigger=SingleKey(mods=256, key=57412), definition='change_font_size all -2.0'), # reset_font_size - KeyDefinition(trigger=SingleKey(mods=256, key=57347), definition='change_font_size all 0'), + KeyDefinition(trigger=SingleKey(mods=256, key=57347), definition='change_font_size all 0'), # open_url - KeyDefinition(trigger=SingleKey(mods=256, key=101), definition='open_url_with_hints'), + KeyDefinition(trigger=SingleKey(mods=256, key=101), definition='open_url_with_hints'), # insert_selected_path - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=102),), definition='kitten hints --type path --program -'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=102),), definition='kitten hints --type path --program -'), # open_selected_path - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(mods=1, key=102),), definition='kitten hints --type path'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(mods=1, key=102),), definition='kitten hints --type path'), # insert_selected_line - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=108),), definition='kitten hints --type line --program -'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=108),), definition='kitten hints --type line --program -'), # insert_selected_word - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=119),), definition='kitten hints --type word --program -'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=119),), definition='kitten hints --type word --program -'), # insert_selected_hash - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=104),), definition='kitten hints --type hash --program -'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=104),), definition='kitten hints --type hash --program -'), # goto_file_line - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=110),), definition='kitten hints --type linenum'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=110),), definition='kitten hints --type linenum'), # open_selected_hyperlink - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=121),), definition='kitten hints --type hyperlink'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=112), rest=(SingleKey(key=121),), definition='kitten hints --type hyperlink'), # show_kitty_doc - KeyDefinition(trigger=SingleKey(mods=256, key=57364), definition='show_kitty_doc overview'), + KeyDefinition(trigger=SingleKey(mods=256, key=57364), definition='show_kitty_doc overview'), # toggle_fullscreen - KeyDefinition(trigger=SingleKey(mods=256, key=57374), definition='toggle_fullscreen'), + KeyDefinition(trigger=SingleKey(mods=256, key=57374), definition='toggle_fullscreen'), # toggle_maximized - KeyDefinition(trigger=SingleKey(mods=256, key=57373), definition='toggle_maximized'), + KeyDefinition(trigger=SingleKey(mods=256, key=57373), definition='toggle_maximized'), # input_unicode_character - KeyDefinition(trigger=SingleKey(mods=256, key=117), definition='kitten unicode_input'), + KeyDefinition(trigger=SingleKey(mods=256, key=117), definition='kitten unicode_input'), # edit_config_file - KeyDefinition(trigger=SingleKey(mods=256, key=57365), definition='edit_config_file'), + KeyDefinition(trigger=SingleKey(mods=256, key=57365), definition='edit_config_file'), # kitty_shell - KeyDefinition(trigger=SingleKey(mods=256, key=57344), definition='kitty_shell window'), + KeyDefinition(trigger=SingleKey(mods=256, key=57344), definition='kitty_shell window'), # increase_background_opacity - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=97), rest=(SingleKey(key=109),), definition='set_background_opacity +0.1'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=97), rest=(SingleKey(key=109),), definition='set_background_opacity +0.1'), # decrease_background_opacity - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=97), rest=(SingleKey(key=108),), definition='set_background_opacity -0.1'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=97), rest=(SingleKey(key=108),), definition='set_background_opacity -0.1'), # full_background_opacity - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=97), rest=(SingleKey(key=49),), definition='set_background_opacity 1'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=97), rest=(SingleKey(key=49),), definition='set_background_opacity 1'), # reset_background_opacity - KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=97), rest=(SingleKey(key=100),), definition='set_background_opacity default'), + KeyDefinition(is_sequence=True, trigger=SingleKey(mods=256, key=97), rest=(SingleKey(key=100),), definition='set_background_opacity default'), # reset_terminal - KeyDefinition(trigger=SingleKey(mods=256, key=57349), definition='clear_terminal reset active'), + KeyDefinition(trigger=SingleKey(mods=256, key=57349), definition='clear_terminal reset active'), # reload_config_file - KeyDefinition(trigger=SingleKey(mods=256, key=57368), definition='load_config_file'), + KeyDefinition(trigger=SingleKey(mods=256, key=57368), definition='load_config_file'), # debug_config - KeyDefinition(trigger=SingleKey(mods=256, key=57369), definition='debug_config'), + KeyDefinition(trigger=SingleKey(mods=256, key=57369), definition='debug_config'), ] if is_macos: defaults.map.append(KeyDefinition(trigger=SingleKey(mods=8, key=99), definition='copy_to_clipboard')) @@ -975,63 +975,63 @@ def __setattr__(self, key: str, val: typing.Any) -> typing.Any: defaults.map.append(KeyDefinition(trigger=SingleKey(mods=8, key=113), definition='quit')) defaults.mouse_map = [ # click_url_or_select - MouseMapping(repeat_count=-2, definition='mouse_handle_click selection link prompt'), + MouseMapping(repeat_count=-2, definition='mouse_handle_click selection link prompt'), # click_url_or_select_grabbed - MouseMapping(mods=1, repeat_count=-2, grabbed=True, definition='mouse_handle_click selection link prompt'), + MouseMapping(mods=1, repeat_count=-2, grabbed=True, definition='mouse_handle_click selection link prompt'), # click_url_or_select_grabbed - MouseMapping(mods=1, repeat_count=-2, definition='mouse_handle_click selection link prompt'), + MouseMapping(mods=1, repeat_count=-2, definition='mouse_handle_click selection link prompt'), # click_url - MouseMapping(mods=5, repeat_count=-1, grabbed=True, definition='mouse_handle_click link'), + MouseMapping(mods=5, repeat_count=-1, grabbed=True, definition='mouse_handle_click link'), # click_url - MouseMapping(mods=5, repeat_count=-1, definition='mouse_handle_click link'), + MouseMapping(mods=5, repeat_count=-1, definition='mouse_handle_click link'), # click_url_discard - MouseMapping(mods=5, grabbed=True, definition='discard_event'), + MouseMapping(mods=5, grabbed=True, definition='discard_event'), # paste_selection - MouseMapping(button=2, repeat_count=-1, definition='paste_from_selection'), + MouseMapping(button=2, repeat_count=-1, definition='paste_from_selection'), # start_simple_selection - MouseMapping(definition='mouse_selection normal'), + MouseMapping(definition='mouse_selection normal'), # start_rectangle_selection - MouseMapping(mods=6, definition='mouse_selection rectangle'), + MouseMapping(mods=6, definition='mouse_selection rectangle'), # select_word - MouseMapping(repeat_count=2, definition='mouse_selection word'), + MouseMapping(repeat_count=2, definition='mouse_selection word'), # select_line - MouseMapping(repeat_count=3, definition='mouse_selection line'), + MouseMapping(repeat_count=3, definition='mouse_selection line'), # select_line_from_point - MouseMapping(mods=6, repeat_count=3, definition='mouse_selection line_from_point'), + MouseMapping(mods=6, repeat_count=3, definition='mouse_selection line_from_point'), # extend_selection - MouseMapping(button=1, definition='mouse_selection extend'), + MouseMapping(button=1, definition='mouse_selection extend'), # paste_selection_grabbed - MouseMapping(button=2, mods=1, repeat_count=-1, grabbed=True, definition='paste_selection'), + MouseMapping(button=2, mods=1, repeat_count=-1, grabbed=True, definition='paste_selection'), # paste_selection_grabbed - MouseMapping(button=2, mods=1, repeat_count=-1, definition='paste_selection'), + MouseMapping(button=2, mods=1, repeat_count=-1, definition='paste_selection'), # paste_selection_grabbed - MouseMapping(button=2, mods=1, grabbed=True, definition='discard_event'), + MouseMapping(button=2, mods=1, grabbed=True, definition='discard_event'), # start_simple_selection_grabbed - MouseMapping(mods=1, grabbed=True, definition='mouse_selection normal'), + MouseMapping(mods=1, grabbed=True, definition='mouse_selection normal'), # start_simple_selection_grabbed - MouseMapping(mods=1, definition='mouse_selection normal'), + MouseMapping(mods=1, definition='mouse_selection normal'), # start_rectangle_selection_grabbed - MouseMapping(mods=7, grabbed=True, definition='mouse_selection rectangle'), + MouseMapping(mods=7, grabbed=True, definition='mouse_selection rectangle'), # start_rectangle_selection_grabbed - MouseMapping(mods=7, definition='mouse_selection rectangle'), + MouseMapping(mods=7, definition='mouse_selection rectangle'), # select_word_grabbed - MouseMapping(mods=1, repeat_count=2, grabbed=True, definition='mouse_selection word'), + MouseMapping(mods=1, repeat_count=2, grabbed=True, definition='mouse_selection word'), # select_word_grabbed - MouseMapping(mods=1, repeat_count=2, definition='mouse_selection word'), + MouseMapping(mods=1, repeat_count=2, definition='mouse_selection word'), # select_line_grabbed - MouseMapping(mods=1, repeat_count=3, grabbed=True, definition='mouse_selection line'), + MouseMapping(mods=1, repeat_count=3, grabbed=True, definition='mouse_selection line'), # select_line_grabbed - MouseMapping(mods=1, repeat_count=3, definition='mouse_selection line'), + MouseMapping(mods=1, repeat_count=3, definition='mouse_selection line'), # select_line_from_point_grabbed - MouseMapping(mods=7, repeat_count=3, grabbed=True, definition='mouse_selection line_from_point'), + MouseMapping(mods=7, repeat_count=3, grabbed=True, definition='mouse_selection line_from_point'), # select_line_from_point_grabbed - MouseMapping(mods=7, repeat_count=3, definition='mouse_selection line_from_point'), + MouseMapping(mods=7, repeat_count=3, definition='mouse_selection line_from_point'), # extend_selection_grabbed - MouseMapping(button=1, mods=1, grabbed=True, definition='mouse_selection extend'), + MouseMapping(button=1, mods=1, grabbed=True, definition='mouse_selection extend'), # extend_selection_grabbed - MouseMapping(button=1, mods=1, definition='mouse_selection extend'), + MouseMapping(button=1, mods=1, definition='mouse_selection extend'), # show_clicked_cmd_output_ungrabbed - MouseMapping(button=1, mods=5, definition='mouse_show_command_output'), + MouseMapping(button=1, mods=5, definition='mouse_show_command_output'), ] nullable_colors = frozenset({ @@ -1043,4 +1043,4 @@ def __setattr__(self, key: str, val: typing.Any) -> typing.Any: 'tab_bar_margin_color' 'selection_foreground' 'selection_background' -}) \ No newline at end of file +})