KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Control KITTY_LISTEN_ON more precisely

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-16 10:16:18 +05:30
parent 572e920466
commit 4c5f7f50f7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kitty/boss.py
View File

@ -262,8 +262,10 @@ class Boss:
self.allow_remote_control = 'y' self.allow_remote_control = 'y'
elif self.allow_remote_control in ('n', 'no', 'false'): elif self.allow_remote_control in ('n', 'no', 'false'):
self.allow_remote_control = 'n' self.allow_remote_control = 'n'
self.listening_on = ''
if args.listen_on and self.allow_remote_control in ('y', 'socket', 'socket-only', 'password'): if args.listen_on and self.allow_remote_control in ('y', 'socket', 'socket-only', 'password'):
listen_fd = listen_on(args.listen_on) listen_fd = listen_on(args.listen_on)
self.listening_on = args.listen_on
self.prewarm = prewarm self.prewarm = prewarm
self.child_monitor = ChildMonitor( self.child_monitor = ChildMonitor(
self.on_child_death, self.on_child_death,

9
kitty/child.py
View File

@ -241,6 +241,7 @@ class Child:
def final_env(self) -> Dict[str, str]: def final_env(self) -> Dict[str, str]:
from kitty.options.utils import DELETE_ENV_VAR from kitty.options.utils import DELETE_ENV_VAR
env = default_env().copy() env = default_env().copy()
boss = fast_data_types.get_boss()
if is_macos and env.get('LC_CTYPE') == 'UTF-8' and not getattr(sys, 'kitty_run_data').get( if is_macos and env.get('LC_CTYPE') == 'UTF-8' and not getattr(sys, 'kitty_run_data').get(
'lc_ctype_before_python') and not getattr(default_env, 'lc_ctype_set_by_user', False): 'lc_ctype_before_python') and not getattr(default_env, 'lc_ctype_set_by_user', False):
del env['LC_CTYPE'] del env['LC_CTYPE']
@ -248,9 +249,13 @@ class Child:
env['TERM'] = fast_data_types.get_options().term env['TERM'] = fast_data_types.get_options().term
env['COLORTERM'] = 'truecolor' env['COLORTERM'] = 'truecolor'
env['KITTY_PID'] = getpid() env['KITTY_PID'] = getpid()
env['KITTY_PUBLIC_KEY'] = fast_data_types.get_boss().encryption_public_key env['KITTY_PUBLIC_KEY'] = boss.encryption_public_key
if boss.listening_on:
env['KITTY_LISTEN_ON'] = boss.listening_on
else:
env.pop('KITTY_LISTEN_ON', None)
if not self.is_prewarmed: if not self.is_prewarmed:
env['KITTY_PREWARM_SOCKET'] = fast_data_types.get_boss().prewarm.socket_env_var() env['KITTY_PREWARM_SOCKET'] = boss.prewarm.socket_env_var()
env['KITTY_PREWARM_SOCKET_REAL_TTY'] = ' ' * 32 env['KITTY_PREWARM_SOCKET_REAL_TTY'] = ' ' * 32
if self.cwd: if self.cwd:
# needed in case cwd is a symlink, in which case shells # needed in case cwd is a symlink, in which case shells

1
kitty/main.py
View File

@ -325,7 +325,6 @@ def setup_environment(opts: Options, cli_opts: CLIOptions) -> None:
from_config_file = True from_config_file = True
if cli_opts.listen_on: if cli_opts.listen_on:
cli_opts.listen_on = expand_listen_on(cli_opts.listen_on, from_config_file) cli_opts.listen_on = expand_listen_on(cli_opts.listen_on, from_config_file)
os.environ['KITTY_LISTEN_ON'] = cli_opts.listen_on
env = opts.env.copy() env = opts.env.copy()
ensure_kitty_in_path() ensure_kitty_in_path()
kitty_path = shutil.which('kitty') kitty_path = shutil.which('kitty')