Skip to content

refactor: move XSettings operations to dedicated thread #714

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

Draft
zzxyb wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

refactor: move XSettings operations to dedicated thread #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 11 additions & 28 deletions src/seat/helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,6 @@ Session::~Session()
qCDebug(treelandCore) << "Deleting session for uid:" << uid << socket;
Q_EMIT aboutToBeDestroyed();

if (settingManagerThread) {
settingManagerThread->quit();
settingManagerThread->wait(QDeadlineTimer(25000));
}

if (settingManager) {
delete settingManager;
settingManager = nullptr;
Expand Down Expand Up @@ -2325,29 +2320,17 @@ std::shared_ptr<Session> Helper::ensureSession(int id, QString username)
qCWarning(treelandInput) << "Failed to intern atom:" << _DEEPIN_NO_TITLEBAR;
}
session->settingManager = new SettingManager(session->xwayland->xcbConnection());
// TODO: proper destruction of QThread. relying on the QObject tree is crashy.
// We are moving session management out of Helper anyways, will fix later.
session->settingManagerThread = new QThread(session->xwayland);

session->settingManager->moveToThread(session->settingManagerThread);
connect(session->settingManagerThread, &QThread::started, this, [this, session]{
const qreal scale = m_rootSurfaceContainer->window()->effectiveDevicePixelRatio();
QMetaObject::invokeMethod(session->settingManager, [session, scale]() {
session->settingManager->setGlobalScale(scale);
session->settingManager->apply();
}, Qt::QueuedConnection);

QObject::connect(Helper::instance()->window(),
&WOutputRenderWindow::effectiveDevicePixelRatioChanged,
session->settingManager,
[session](qreal dpr) {
session->settingManager->setGlobalScale(dpr);
session->settingManager->apply();
}, Qt::QueuedConnection);
});

connect(session->settingManagerThread, &QThread::finished, session->settingManagerThread, &QThread::deleteLater);
session->settingManagerThread->start();
const qreal scale = m_rootSurfaceContainer->window()->effectiveDevicePixelRatio();
session->settingManager->setGlobalScale(scale);
session->settingManager->apply();

QObject::connect(Helper::instance()->window(),
&WOutputRenderWindow::effectiveDevicePixelRatioChanged,
session->settingManager,
[session](qreal dpr) {
session->settingManager->setGlobalScale(dpr);
session->settingManager->apply();
}, Qt::QueuedConnection);
}
});
return xwayland;
Expand Down
1 change: 0 additions & 1 deletion src/seat/helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ struct Session : QObject {
WXWayland *xwayland = nullptr;
quint32 noTitlebarAtom = XCB_ATOM_NONE;
SettingManager *settingManager = nullptr;
QThread *settingManagerThread = nullptr;

~Session();

Expand Down
Loading