Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix IME not working in some scenarios. #16476

Merged
merged 2 commits into from
Sep 12, 2024
Merged

Fix IME not working in some scenarios. #16476

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf8a53b
Fix IME not working in some scenarios.
kkwpsv Jul 26, 2024
0582034
Add log.
kkwpsv Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Avalonia.Input.Raw;
Expand Down Expand Up @@ -59,12 +60,18 @@ public DBusTextInputMethodBase(Connection connection, params string[] knownNames

private async Task WatchAsync()
{
var dbus = new OrgFreedesktopDBus(Connection, "org.freedesktop.DBus", "/org/freedesktop/DBus");
try
{
_disposables.Add(await dbus.WatchNameOwnerChangedAsync(OnNameChange));
}
catch (DBusException)
{
}
kkwpsv marked this conversation as resolved.
Show resolved Hide resolved
foreach (var name in _knownNames)
{
var dbus = new OrgFreedesktopDBus(Connection, "org.freedesktop.DBus", "/org/freedesktop/DBus");
try
{
_disposables.Add(await dbus.WatchNameOwnerChangedAsync(OnNameChange));
var nameOwner = await dbus.GetNameOwnerAsync(name);
OnNameChange(null, (name, null, nameOwner));
}
Expand All @@ -87,6 +94,11 @@ private async void OnNameChange(Exception? e, (string ServiceName, string? OldOw
return;
}

if (!_knownNames.Contains(args.ServiceName))
{
return;
}

if (args.NewOwner is not null && _currentName is null)
{
_onlineNamesQueue.Enqueue(args.ServiceName);
Expand Down
Loading