aria/feresaria
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate native Rime and stabilize input, output, and rendering

Browse Source 
- Add optional modifier-only Super binding whose tap is cancelled by
  other input, focus changes, grabs, locks, and session teardown.
- Ship the native ferese-rime user service, Rime defaults, installer
  inventory, package dependencies, session environment, and docs.
- Vendor Smithay 8a27023 with the SHM texture-cache format fix and add
  GPU regressions for format changes and resize snapshots.
- Release reused CRTC owners before staging output modes, then restore
  changed outputs before former owners when a transaction fails.
- Wait for resize-capture GPU completion, expand filtered surface
  damage, and preserve IME popup origin under fractional scaling.
- Mark weekends like holidays in both calendar layouts.
This commit is contained in:
aria committed 2026-10-30 03:13:43 +09:00
1 parent a2be421974
commit 993bc0f88f
391 files changed
+130908 -76
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

scripts/tests/test_session_startup.py
+166 -4
View File
@@ -13,19 +13,46 @@ SCRIPT = Path(__file__).resolve().parents[2] / 'packaging/ferese-session-shell'
class SessionStartupTest(unittest.TestCase):
def run_session(self, direct=True, fail_target=False, shell_status=0, terminate=False,
display=None, xauthority=None, extra_env=None, programs_override=None):
display=None, xauthority=None, extra_env=None, programs_override=None,
user_customization=None, restart_after_kill=False):
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
helper = root / 'ferese-session-shell'
shutil.copyfile(SCRIPT, helper)
(root / 'rime').mkdir()
shutil.copyfile(SCRIPT.parent / 'rime/default.custom.yaml', root / 'rime/default.custom.yaml')
shared = root / 'rime-shared'
shared.mkdir()
(shared / 'luna_pinyin_simp.schema.yaml').write_text('fixture')
units = root / 'units'
units.mkdir()
foreign_unit = units / '[email protected]'
foreign_unit.write_text('foreign service')
if user_customization is not None:
user_rime = root / 'data/ferese/rime'
user_rime.mkdir(parents=True)
(user_rime / 'default.custom.yaml').write_text(user_customization)
programs = {
'dbus-update-activation-environment': (
'printf "import:%s\\n" "$WAYLAND_DISPLAY" >> "$TEST_ROOT/events"\n'
'printf "vars:%s\\n" "$*" >> "$TEST_ROOT/events"\n'),
'dbus-send': 'echo reload-bus >> "$TEST_ROOT/events"\n',
'systemctl': 'echo "$*" >> "$TEST_ROOT/events"\nif [[ $* == "--user start ferese-session.target" && $TEST_FAIL == 1 ]]; then exit 1; fi\n',
'systemctl': (
'echo "$*" >> "$TEST_ROOT/events"\n'
'if [[ $* == "--user start ferese-session.target" && $TEST_FAIL == 1 ]]; then exit 1; fi\n'
'if [[ ${2:-} == show && ${3:-} == ferese-rime-session@* ]]; then\n'
' if [[ -f $TEST_ROOT/units/$3 ]]; then echo loaded; else echo not-found; fi\n'
'elif [[ ${2:-} == stop && ${3:-} == ferese-rime-session@* ]]; then\n'
' rm -f -- "$TEST_ROOT/units/$3"\nfi\n'),
'ferese-polkit-agent': 'exec sleep 30\n',
'ferese-shell': 'printf "shell:%s\\n" "$WAYLAND_SOCKET" >> "$TEST_ROOT/events"\nif [[ $TEST_WAIT == 1 ]]; then exec sleep 30; fi\nexit "$TEST_STATUS"\n',
'ferese-rime': 'exit 0\n',
'systemd-run': (
'for arg; do if [[ $arg == --unit=* ]]; then unit=${arg#--unit=}; fi; done\n'
'(set -o noclobber; echo running > "$TEST_ROOT/units/$unit") || exit 1\n'
'printf "rime-arg:%s\\n" "$@" >> "$TEST_ROOT/events"\n'
'printf "rime-config:%s\\n" "$(cat "$XDG_DATA_HOME/ferese/rime/default.custom.yaml")" >> "$TEST_ROOT/events"\n'
'touch "$TEST_ROOT/rime-started"\n'),
}
programs.update(programs_override or {})
for name, body in programs.items():
@@ -36,7 +63,10 @@ class SessionStartupTest(unittest.TestCase):
FERESE_SESSION_MODE='desktop',
FERESE_SESSION_IMPORT_ENV=str(int(direct)), WAYLAND_DISPLAY='private-display',
FERESE_PUBLIC_WAYLAND_DISPLAY='public-display', WAYLAND_SOCKET='77',
TEST_FAIL=str(int(fail_target)), TEST_STATUS=str(shell_status), TEST_WAIT=str(int(terminate)))
FERESE_SOCKET=str(root / 'control.sock'),
XDG_DATA_HOME=str(root / 'data'), FERESE_RIME_SHARED_DATA=str(shared),
TEST_FAIL=str(int(fail_target)), TEST_STATUS=str(shell_status),
TEST_WAIT=str(int(terminate or restart_after_kill)))
env.pop('DISPLAY', None)
env.pop('XAUTHORITY', None)
if display is not None:
@@ -44,7 +74,25 @@ class SessionStartupTest(unittest.TestCase):
if xauthority is not None:
env['XAUTHORITY'] = xauthority
env.update(extra_env or {})
child = subprocess.Popen(['bash', str(helper)], env=env, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
child = subprocess.Popen(['bash', str(helper)], env=env, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, start_new_session=True)
if restart_after_kill:
deadline = time.monotonic() + 3
while not (root / 'rime-started').exists():
if time.monotonic() > deadline:
os.killpg(child.pid, signal.SIGKILL)
self.fail('Native input unit did not start')
time.sleep(.01)
child.kill()
child.wait(timeout=2)
# The helper cannot run cleanup after SIGKILL. Dispose of fake
# shell/agent processes, while its fake systemd service survives.
os.killpg(child.pid, signal.SIGKILL)
child.communicate(timeout=2)
self.assertEqual(len(list(units.glob('*.service'))), 2)
env.update(TEST_WAIT='0', FERESE_CLIENT_RESTART='1')
child = subprocess.Popen(['bash', str(helper)], env=env,
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if terminate:
deadline = time.monotonic() + 3
while not (root / 'events').exists() or 'shell:77' not in (root / 'events').read_text():
@@ -54,6 +102,7 @@ class SessionStartupTest(unittest.TestCase):
time.sleep(.01)
child.send_signal(signal.SIGTERM)
child.communicate(timeout=4)
self.assertEqual(foreign_unit.read_text(), 'foreign service')
return child.returncode, (root / 'events').read_text().splitlines()
@staticmethod
@@ -78,6 +127,78 @@ class SessionStartupTest(unittest.TestCase):
self.assertEqual(status, 0)
self.assertIn('FERESE_SOCKET=/run/user/1000/ferese/control.sock', self.imported_vars(events))
def test_native_rime_is_release_pinned_supervised_and_stopped_with_its_session(self):
status, events = self.run_session(extra_env={'FERESE_ENABLE_INPUT_METHOD': '1'})
self.assertEqual(status, 0)
args = [event.removeprefix('rime-arg:') for event in events if event.startswith('rime-arg:')]
self.assertIn('--service-type=notify', args)
for setting in ('Restart=on-failure', 'WatchdogSec=10', 'StartLimitBurst=5',
'BindsTo=ferese-session.target'):
self.assertIn('--property=' + setting, args)
self.assertIn('WAYLAND_DISPLAY=public-display', args)
self.assertIn('WAYLAND_SOCKET', args)
self.assertIn('FERESE_SHELL_CONTROL_SOCKET', args)
executable = next(arg for arg in args if arg.endswith('/ferese-rime'))
self.assertNotEqual(executable, '/usr/bin/ferese-rime')
unit = next(arg.removeprefix('--unit=') for arg in args if arg.startswith('--unit='))
self.assertIn('--user stop ' + unit, events)
self.assertEqual(events[-1], '--user stop ferese-session.target')
self.assertIn(' - schema: luna_pinyin_simp', events)
def test_native_rime_preserves_existing_user_customization(self):
status, events = self.run_session(extra_env={'FERESE_ENABLE_INPUT_METHOD': '1'},
user_customization='my-custom-dictionary: preserved\n')
self.assertEqual(status, 0)
self.assertIn('rime-config:my-custom-dictionary: preserved', events)
def test_hard_killed_helper_replaces_only_its_existing_native_rime_unit(self):
status, events = self.run_session(extra_env={'FERESE_ENABLE_INPUT_METHOD': '1'},
restart_after_kill=True)
self.assertEqual(status, 0)
starts = [event.removeprefix('rime-arg:--unit=') for event in events
if event.startswith('rime-arg:--unit=')]
self.assertEqual(len(starts), 2)
self.assertEqual(starts[0], starts[1])
stopped = '--user stop ' + starts[0]
start_events = [index for index, event in enumerate(events) if event == 'rime-arg:--unit=' + starts[0]]
self.assertIn(stopped, events[start_events[0] + 1:start_events[1]])
self.assertNotIn('--user stop [email protected]', events)
def test_unresponsive_old_rime_unit_blocks_replacement_without_stopping_the_desktop(self):
# Model a timed-out manager request. The helper must not create a second
# input service while it cannot confirm the state of the first one.
status, events = self.run_session(extra_env={'FERESE_ENABLE_INPUT_METHOD': '1'},
programs_override={'systemctl': (
'echo "$*" >> "$TEST_ROOT/events"\n'
'if [[ ${2:-} == show ]]; then exit 124; fi\n')})
self.assertEqual(status, 0)
self.assertIn('shell:77', events)
self.assertFalse(any(event.startswith('rime-arg:') for event in events))
def test_failed_rime_start_leaves_the_desktop_running(self):
status, events = self.run_session(extra_env={'FERESE_ENABLE_INPUT_METHOD': '1'},
programs_override={'systemd-run': 'exit 7\n'})
self.assertEqual(status, 0)
self.assertIn('shell:77', events)
self.assertFalse(any(event.startswith('--user stop ferese-rime-') for event in events))
def test_nested_session_never_starts_native_rime(self):
status, events = self.run_session(direct=False, extra_env={'FERESE_ENABLE_INPUT_METHOD': '1'})
self.assertEqual(status, 0)
self.assertEqual(events, ['shell:77'])
def test_native_input_environment_is_imported_for_activated_applications(self):
status, events = self.run_session(extra_env={'FERESE_ENABLE_INPUT_METHOD': '1',
'GTK_IM_MODULE': '', 'QT_IM_MODULE': 'wayland', 'QT_IM_MODULES': 'wayland',
'IBUS_ADDRESS': '', 'XMODIFIERS': '@im=ibus', 'FERESE_RIME_CONTROL': '/private/rime.sock'})
self.assertEqual(status, 0)
imported = self.imported_vars(events)
for name in ('QT_IM_MODULE', 'QT_IM_MODULES', 'IBUS_ADDRESS', 'FERESE_RIME_CONTROL'):
self.assertIn(name, imported)
self.assertIn('GTK_IM_MODULE=', imported)
self.assertIn('SDL_IM_MODULE=', imported)
self.assertIn('XMODIFIERS=@im=ibus', imported)
def test_a_managed_x11_endpoint_is_imported_for_dbus_activators(self):
status, events = self.run_session(display=':7', xauthority='/run/user/1000/ferese-xauth-abcd')
self.assertEqual(status, 0)
@@ -161,5 +282,46 @@ class SessionStartupTest(unittest.TestCase):
self.assertEqual(events.count('autostart'), int(restarted == '0'))
class SessionLauncherTest(unittest.TestCase):
def launch(self, nested=False, enabled=None):
with tempfile.TemporaryDirectory() as directory:
root = Path(directory)
launcher = root / 'ferese-session'
shutil.copyfile(SCRIPT.parent / 'ferese-session', launcher)
for name, body in {'ferese': '/usr/bin/env > "$TEST_ROOT/environment"\n',
'systemctl': 'exit 0\n'}.items():
path = root / name
path.write_text('#!/bin/bash\n' + body)
path.chmod(0o755)
env = dict(os.environ, PATH=f'{root}:{os.environ["PATH"]}', TEST_ROOT=directory,
HOME=directory, XDG_RUNTIME_DIR=directory, DBUS_SESSION_BUS_ADDRESS='fixture',
XDG_STATE_HOME=str(root / 'state'), GTK_IM_MODULE='ibus', QT_IM_MODULE='ibus',
QT_IM_MODULES='wayland;ibus', IBUS_ADDRESS='old-ibus', XMODIFIERS='@im=ibus', SDL_IM_MODULE='ibus')
env.pop('FERESE_ENABLE_INPUT_METHOD', None)
if enabled is not None:
env['FERESE_ENABLE_INPUT_METHOD'] = enabled
subprocess.run(['bash', str(launcher), *(['--nested'] if nested else [])],
env=env, capture_output=True, check=True)
return dict(line.split('=', 1) for line in (root / 'environment').read_text().splitlines())
def test_drm_session_overrides_inherited_ibus_only_for_native_input(self):
env = self.launch()
self.assertEqual(env['FERESE_ENABLE_INPUT_METHOD'], '1')
self.assertNotIn('GTK_IM_MODULE', env)
for variable in ('QT_IM_MODULE', 'QT_IM_MODULES'):
self.assertEqual(env[variable], 'wayland')
self.assertEqual(env['IBUS_ADDRESS'], '')
self.assertEqual(env['XMODIFIERS'], '@im=ibus')
self.assertNotIn('SDL_IM_MODULE', env)
self.assertTrue(env['FERESE_RIME_CONTROL'].endswith('/ferese/rime-control.sock'))
def test_nested_and_explicit_opt_out_preserve_input_configuration(self):
for options in ({'nested': True}, {'enabled': '0'}):
with self.subTest(options=options):
env = self.launch(**options)
self.assertEqual(env['QT_IM_MODULE'], 'ibus')
self.assertNotEqual(env.get('FERESE_ENABLE_INPUT_METHOD'), '1')
if __name__ == '__main__':
unittest.main()