aiden
/
core
mirror of https://github.com/cutefishos/core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add setting cursor theme interface

Browse Source
pull/9/head
reionwong 4 years ago
parent 81263af2d8
commit a5c0514b77
6 changed files with 137 additions and 53 deletions
Show Stats Download Patch File Download Diff File

2
cupdatecursor/main.cpp
Unescape Escape View File

@ -15,7 +15,7 @@ inline void applyTheme(const QString &theme, int size)
if (!theme.isEmpty())
XcursorSetTheme(display, QFile::encodeName(theme));
if (size >= 0)
if (size > 0)
XcursorSetDefaultSize(display, size);
Cursor handle = XcursorLibraryLoadCursor(display, "left_ptr");

72
session/application.cpp
Unescape Escape View File

@ -93,8 +93,7 @@ Application::Application(int &argc, char **argv)
createConfigDirectory();
initLanguage();
initScreenScaleFactors();
initCursor();
initFontDpi();
initXResource();
initEnvironments();
@ -110,6 +109,9 @@ Application::Application(int &argc, char **argv)
// ref plasma
importSystemdEnvrionment();
qunsetenv("XCURSOR_THEME");
qunsetenv("XCURSOR_SIZE");
QTimer::singleShot(100, m_processManager, &ProcessManager::start);
}
@ -141,39 +143,11 @@ void Application::initEnvironments()
qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0");
// IM Config
qputenv("GTK_IM_MODULE", "fcitx5");
qputenv("QT4_IM_MODULE", "fcitx5");
qputenv("QT_IM_MODULE", "fcitx5");
qputenv("CLUTTER_IM_MODULE", "fcitx5");
qputenv("XMODIFIERS", "@im=fcitx");
}
void Application::initFontDpi()
{
QSettings settings(QSettings::UserScope, "cutefishos", "theme");
qreal scaleFactor = settings.value("PixelRatio", 1.0).toReal();
int fontDpi = 96 * scaleFactor;
// TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontDpi);
QProcess p;
p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input);
p.closeWriteChannel();
p.waitForFinished(-1);
}
void Application::initCursor()
{
QSettings settings(QSettings::UserScope, "cutefishos", "theme");
qreal scaleFactor = settings.value("PixelRatio", 1.0).toReal();
QString theme = settings.value("cursorTheme", "default").toString();
int size = settings.value("cursorSize", 24).toInt();
runSync("cupdatecursor", {theme, QString::number(size * scaleFactor)});
qputenv("XCURSOR_THEME", theme.toLatin1());
qputenv("XCURSOR_SIZE", QByteArray::number(size * scaleFactor));
// qputenv("GTK_IM_MODULE", "fcitx5");
// qputenv("QT4_IM_MODULE", "fcitx5");
// qputenv("QT_IM_MODULE", "fcitx5");
// qputenv("CLUTTER_IM_MODULE", "fcitx5");
// qputenv("XMODIFIERS", "@im=fcitx");
}
void Application::initLanguage()
@ -215,6 +189,34 @@ void Application::initScreenScaleFactors()
}
}
void Application::initXResource()
{
QSettings settings(QSettings::UserScope, "cutefishos", "theme");
qreal scaleFactor = settings.value("PixelRatio", 1.0).toReal();
int fontDpi = 96 * scaleFactor;
QString cursorTheme = settings.value("CursorTheme", "default").toString();
int cursorSize = settings.value("CursorSize", 24).toInt() * scaleFactor;
const QString datas = QString("Xft.dpi: %1\n"
"Xcursor.theme: %2\n"
"Xcursor.size: %3")
.arg(fontDpi)
.arg(cursorTheme)
.arg(cursorSize);
QProcess p;
p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(datas.toLatin1());
p.closeWriteChannel();
p.waitForFinished(-1);
// Init cursor
runSync("cupdatecursor", {cursorTheme, QString::number(cursorSize * scaleFactor)});
// qputenv("XCURSOR_THEME", cursorTheme.toLatin1());
// qputenv("XCURSOR_SIZE", QByteArray::number(cursorSize * scaleFactor));
}
bool Application::syncDBusEnvironment()
{
int exitCode = 0;

3
session/application.h
Unescape Escape View File

@ -63,10 +63,9 @@ public slots:
private:
void initEnvironments();
void initFontDpi();
void initCursor();
void initLanguage();
void initScreenScaleFactors();
void initXResource();
bool syncDBusEnvironment();
void importSystemdEnvrionment();
void createConfigDirectory();

16
settings-daemon/theme/org.cutefish.Theme.xml
Unescape Escape View File

@ -31,6 +31,12 @@
<method name="setBackgroundType">
<arg name="type" type="i" direction="in"/>
</method>
<method name="setCursorTheme">
<arg name="type" type="s" direction="in"/>
</method>
<method name="setCursorSize">
<arg name="type" type="i" direction="in"/>
</method>
<property name="isDarkMode" type="b" access="read"/>
<property name="darkModeDimsWallpaer" type="b" access="read"/>
@ -42,6 +48,8 @@
<property name="accentColor" type="i" access="read"/>
<property name="backgroundType" type="i" access="read"/>
<property name="backgroundColor" type="s" access="read"/>
<property name="cursorTheme" type="s" access="read"/>
<property name="cursorSize" type="i" access="read"/>
<signal name="darkModeChanged">
<arg type="b"/>
@ -54,9 +62,9 @@
<signal name="accentColorChanged">
<arg type="i"/>
</signal>
<signal name="backgroundTypeChanged">
</signal>
<signal name="backgroundColorChanged">
</signal>
<signal name="backgroundTypeChanged"></signal>
<signal name="backgroundColorChanged"></signal>
<signal name="cursorThemeChanged"></signal>
<signal name="cursorSizeChanged"></signal>
</interface>
</node>

82
settings-daemon/theme/thememanager.cpp
Unescape Escape View File

@ -64,6 +64,8 @@ ThemeManager::ThemeManager(QObject *parent)
m_accentColor = m_settings->value("AccentColor", 0).toInt();
m_backgroundType = m_settings->value("BackgroundType", 0).toInt();
m_backgroundColor = m_settings->value("BackgroundColor", "#2B8ADA").toString();
m_cursorTheme = m_settings->value("CursorTheme", "default").toString();
m_cursorSize = m_settings->value("CursorSize", 24).toInt();
// Start the DE and need to update the settings again.
initGtkConfig();
@ -119,6 +121,38 @@ void ThemeManager::setAccentColor(int accentColor)
emit accentColorChanged(m_accentColor);
}
QString ThemeManager::cursorTheme() const
{
return m_cursorTheme;
}
void ThemeManager::setCursorTheme(const QString &theme)
{
if (m_cursorTheme != theme) {
m_cursorTheme = theme;
m_settings->setValue("CursorTheme", m_cursorTheme);
applyXResource();
applyCursor();
emit cursorThemeChanged();
}
}
int ThemeManager::cursorSize() const
{
return m_cursorSize;
}
void ThemeManager::setCursorSize(int size)
{
if (m_cursorSize != size) {
m_cursorSize = size;
m_settings->setValue("CursorSize", m_cursorSize);
applyXResource();
applyCursor();
emit cursorSizeChanged();
}
}
QString ThemeManager::systemFont()
{
return m_settings->value(s_systemFontName, "Noto Sans").toString();
@ -158,18 +192,11 @@ qreal ThemeManager::devicePixelRatio()
void ThemeManager::setDevicePixelRatio(qreal ratio)
{
int scaleDpi = qRound(ratio * 96.0);
QProcess process;
process.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
if (process.waitForStarted()) {
process.write(QByteArray("Xft.dpi: " + QString::number(scaleDpi).toLatin1()));
process.closeWriteChannel();
process.waitForFinished();
}
int fontDpi = qRound(ratio * 96.0);
m_settings->setValue(s_devicePixelRatio, ratio);
m_settings->setValue("forceFontDPI", scaleDpi);
m_settings->setValue("forceFontDPI", fontDpi);
m_settings->sync();
applyXResource();
}
QString ThemeManager::wallpaper()
@ -231,6 +258,39 @@ void ThemeManager::initGtkConfig()
settings.sync();
}
void ThemeManager::applyXResource()
{
qreal scaleFactor = this->devicePixelRatio();
int fontDpi = 96 * scaleFactor;
const QString datas = QString("Xft.dpi: %1\n"
"Xcursor.theme: %2\n"
"Xcursor.size: %3")
.arg(fontDpi)
.arg(m_cursorTheme)
.arg(m_cursorSize * scaleFactor);
QProcess p;
p.start(QStringLiteral("xrdb"), {QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp")});
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(datas.toLatin1());
p.closeWriteChannel();
p.waitForFinished(-1);
}
void ThemeManager::applyCursor()
{
QProcess p;
p.start("cupdatecursor", QStringList() << cursorTheme() << QString::number(cursorSize() * devicePixelRatio()));
p.waitForFinished(-1);
QDBusMessage message = QDBusMessage::createSignal("/KGlobalSettings", "org.kde.KGlobalSettings", "notifyChange");
// ChangeCursor
message << 5;
message << 0;
QDBusConnection::sessionBus().send(message);
}
void ThemeManager::updateGtkFont()
{
QSettings settings(gtk3SettingsIniPath(), QSettings::IniFormat);

15
settings-daemon/theme/thememanager.h
Unescape Escape View File

@ -36,6 +36,8 @@ class ThemeManager : public QObject
Q_PROPERTY(int accentColor READ accentColor WRITE setAccentColor NOTIFY accentColorChanged)
Q_PROPERTY(int backgroundType READ backgroundType WRITE setBackgroundType NOTIFY backgroundTypeChanged)
Q_PROPERTY(QString backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
Q_PROPERTY(QString cursorTheme READ cursorTheme WRITE setCursorTheme NOTIFY cursorThemeChanged)
Q_PROPERTY(int cursorSize READ cursorSize WRITE setCursorSize NOTIFY cursorSizeChanged)
public:
ThemeManager(QObject *parent = nullptr);
@ -70,7 +72,15 @@ public:
int accentColor();
void setAccentColor(int accentColor);
QString cursorTheme() const;
void setCursorTheme(const QString &theme);
int cursorSize() const;
void setCursorSize(int size);
void initGtkConfig();
void applyXResource();
void applyCursor();
signals:
void darkModeChanged(bool darkMode);
@ -79,6 +89,8 @@ signals:
void accentColorChanged(int accentColor);
void backgroundTypeChanged();
void backgroundColorChanged();
void cursorThemeChanged();
void cursorSizeChanged();
private:
void updateGtkFont();
@ -92,6 +104,9 @@ private:
int m_backgroundType;
QString m_backgroundColor;
int m_accentColor;
QString m_cursorTheme;
int m_cursorSize;
};
#endif

Write Preview
Loading…
Cancel
Save