2cc2f803f1
Fixes `new_os_window`:
scancode: 0x39 release: 0 clean_sym: n composed_sym: N mods: ctrl+shift glfw_key: N
Traceback (most recent call last):
File "…/Vcs/kitty/kitty/boss.py", line 431, in dispatch_special_key
return self.dispatch_action(key_action)
File "…/Vcs/kitty/kitty/boss.py", line 487, in dispatch_action
passthrough = f(*key_action.args)
File "…/Vcs/kitty/kitty/boss.py", line 199, in new_os_window
self._new_os_window(args)
File "…/Vcs/kitty/kitty/boss.py", line 195, in _new_os_window
startup_session = create_session(self.opts, special_window=sw, cwd_from=cwd_from)
File "…/Vcs/kitty/kitty/session.py", line 127, in create_session
if args.hold:
138 lines
4.3 KiB
Python
138 lines
4.3 KiB
Python
#!/usr/bin/env python
|
|
# vim:fileencoding=utf-8
|
|
# License: GPL v3 Copyright: 2016, Kovid Goyal <kovid at kovidgoyal.net>
|
|
|
|
import shlex
|
|
|
|
from .config_data import to_layout_names
|
|
from .constants import shell_path, kitty_exe
|
|
from .layout import all_layouts
|
|
from .utils import log_error
|
|
|
|
|
|
class Tab:
|
|
|
|
def __init__(self, opts, name):
|
|
self.windows = []
|
|
self.name = name.strip()
|
|
self.active_window_idx = 0
|
|
self.enabled_layouts = opts.enabled_layouts
|
|
self.layout = (self.enabled_layouts or ['tall'])[0]
|
|
self.cwd = None
|
|
self.next_title = None
|
|
|
|
|
|
class Session:
|
|
|
|
def __init__(self):
|
|
self.tabs = []
|
|
self.active_tab_idx = 0
|
|
|
|
def add_tab(self, opts, name=''):
|
|
if self.tabs and not self.tabs[-1].windows:
|
|
del self.tabs[-1]
|
|
self.tabs.append(Tab(opts, name))
|
|
|
|
def set_next_title(self, title):
|
|
self.tabs[-1].next_title = title.strip()
|
|
|
|
def set_layout(self, val):
|
|
if val not in all_layouts:
|
|
raise ValueError('{} is not a valid layout'.format(val))
|
|
self.tabs[-1].layout = val
|
|
|
|
def add_window(self, cmd):
|
|
if cmd:
|
|
cmd = shlex.split(cmd) if isinstance(cmd, str) else cmd
|
|
else:
|
|
cmd = None
|
|
from .tabs import SpecialWindow
|
|
t = self.tabs[-1]
|
|
t.windows.append(SpecialWindow(cmd, cwd=t.cwd, override_title=t.next_title))
|
|
t.next_title = None
|
|
|
|
def add_special_window(self, sw):
|
|
self.tabs[-1].windows.append(sw)
|
|
|
|
def focus(self):
|
|
self.active_tab_idx = max(0, len(self.tabs) - 1)
|
|
self.tabs[-1].active_window_idx = max(0, len(self.tabs[-1].windows) - 1)
|
|
|
|
def set_enabled_layouts(self, raw):
|
|
self.tabs[-1].enabled_layouts = to_layout_names(raw)
|
|
if self.tabs[-1].layout not in self.tabs[-1].enabled_layouts:
|
|
self.tabs[-1].layout = self.tabs[-1].enabled_layouts[0]
|
|
|
|
def set_cwd(self, val):
|
|
self.tabs[-1].cwd = val
|
|
|
|
|
|
def resolved_shell(opts):
|
|
ans = opts.shell
|
|
if ans == '.':
|
|
ans = [shell_path]
|
|
else:
|
|
ans = shlex.split(ans)
|
|
return ans
|
|
|
|
|
|
def parse_session(raw, opts):
|
|
ans = Session()
|
|
ans.add_tab(opts)
|
|
for line in raw.splitlines():
|
|
line = line.strip()
|
|
if line and not line.startswith('#'):
|
|
cmd, rest = line.partition(' ')[::2]
|
|
cmd, rest = cmd.strip(), rest.strip()
|
|
if cmd == 'new_tab':
|
|
ans.add_tab(opts, rest)
|
|
elif cmd == 'layout':
|
|
ans.set_layout(rest)
|
|
elif cmd == 'launch':
|
|
ans.add_window(rest)
|
|
elif cmd == 'focus':
|
|
ans.focus()
|
|
elif cmd == 'enabled_layouts':
|
|
ans.set_enabled_layouts(rest)
|
|
elif cmd == 'cd':
|
|
ans.set_cwd(rest)
|
|
elif cmd == 'title':
|
|
ans.set_next_title(rest)
|
|
else:
|
|
raise ValueError('Unknown command in session file: {}'.format(cmd))
|
|
for t in ans.tabs:
|
|
if not t.windows:
|
|
t.windows.append(resolved_shell(opts))
|
|
return ans
|
|
|
|
|
|
def create_session(opts, args=None, special_window=None, cwd_from=None, respect_cwd=False, default_session=None):
|
|
if args and args.session:
|
|
with open(args.session) as f:
|
|
return parse_session(f.read(), opts)
|
|
if default_session and default_session != 'none':
|
|
try:
|
|
with open(default_session) as f:
|
|
session_data = f.read()
|
|
except EnvironmentError:
|
|
log_error('Failed to read from session file, ignoring: {}'.format(default_session))
|
|
else:
|
|
return parse_session(session_data, opts)
|
|
ans = Session()
|
|
current_layout = opts.enabled_layouts[0] if opts.enabled_layouts else 'tall'
|
|
ans.add_tab(opts)
|
|
ans.tabs[-1].layout = current_layout
|
|
if special_window is None:
|
|
cmd = args.args if args and args.args else resolved_shell(opts)
|
|
if args and args.hold:
|
|
cmd = [kitty_exe(), '+hold'] + cmd
|
|
from kitty.tabs import SpecialWindow
|
|
k = {'cwd_from': cwd_from}
|
|
if respect_cwd:
|
|
k['cwd'] = args.directory
|
|
if getattr(args, 'title', None):
|
|
k['override_title'] = args.title
|
|
special_window = SpecialWindow(cmd, **k)
|
|
ans.add_special_window(special_window)
|
|
return ans
|