aboutsummaryrefslogtreecommitdiff
path: root/src/service.cpp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-11-21 22:04:24 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2023-11-21 22:04:24 +0100
commit4657aab51d3242e383f9aa3b3dca04953f122c63 (patch)
tree2bc5dff62a55f28cd25fcf581d2684bbb3f466b9 /src/service.cpp
parent7ef3aaf2cd83209e90060ce847def58b4d064450 (diff)
parent08ede8598afe6a2ab486904089557f6ab3635c8e (diff)
downloadayatana-indicator-display-4657aab51d3242e383f9aa3b3dca04953f122c63.tar.gz
ayatana-indicator-display-4657aab51d3242e383f9aa3b3dca04953f122c63.tar.bz2
ayatana-indicator-display-4657aab51d3242e383f9aa3b3dca04953f122c63.zip
Merge branch 'tari01-pr/metacity-icon-cursor'
Attributes GH PR #88: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/88
Diffstat (limited to 'src/service.cpp')
-rw-r--r--src/service.cpp177
1 files changed, 177 insertions, 0 deletions
diff --git a/src/service.cpp b/src/service.cpp
index 2a10d7a..6221962 100644
--- a/src/service.cpp
+++ b/src/service.cpp
@@ -99,20 +99,28 @@ public:
if (!this->bGreeter)
{
const gchar *sSchema = NULL;
+ const gchar *sCursorSchema = NULL;
+ const gchar *sMetacitySchema = NULL;
if (this->bTest)
{
sSchema = "org.ayatana.indicator.display";
+ sCursorSchema = "org.ayatana.indicator.display";
+ sMetacitySchema = "org.ayatana.indicator.display";
}
else
{
if (ayatana_common_utils_is_mate ())
{
sSchema = "org.mate.interface";
+ sCursorSchema = "org.mate.peripherals-mouse";
+ sMetacitySchema = "org.mate.Marco.general";
}
else
{
sSchema = "org.gnome.desktop.interface";
+ sCursorSchema = "org.gnome.desktop.interface";
+ sMetacitySchema = "org.gnome.desktop.wm.preferences";
}
}
@@ -128,6 +136,30 @@ public:
g_error("No %s schema could be found", sSchema);
}
+ pSchema = g_settings_schema_source_lookup (pSource, sCursorSchema, FALSE);
+
+ if (pSchema != NULL)
+ {
+ g_settings_schema_unref (pSchema);
+ pCursorSettings = g_settings_new (sCursorSchema);
+ }
+ else
+ {
+ g_error("No %s schema could be found", sCursorSchema);
+ }
+
+ pSchema = g_settings_schema_source_lookup (pSource, sMetacitySchema, FALSE);
+
+ if (pSchema != NULL)
+ {
+ g_settings_schema_unref (pSchema);
+ pMetacitySettings = g_settings_new (sMetacitySchema);
+ }
+ else
+ {
+ g_error("No %s schema could be found", sMetacitySchema);
+ }
+
if (this->bTest)
{
sSchema = "org.ayatana.indicator.display";
@@ -222,6 +254,16 @@ public:
g_clear_object (&pThemeSettings);
}
+ if (pCursorSettings)
+ {
+ g_clear_object (&pCursorSettings);
+ }
+
+ if (pMetacitySettings)
+ {
+ g_clear_object (&pMetacitySettings);
+ }
+
if (pColorSchemeSettings)
{
g_clear_object (&pColorSchemeSettings);
@@ -369,6 +411,139 @@ private:
g_debug ("Changing theme to %s", sTheme);
g_settings_set_string (pImpl->pThemeSettings, "gtk-theme", sTheme);
+ gchar *sThemePath = g_strdup_printf ("/usr/share/themes/%s/index.theme", sTheme);
+ gboolean bThemePath = g_file_test (sThemePath, G_FILE_TEST_EXISTS);
+
+ if (bThemePath)
+ {
+ gchar *sFile = NULL;
+ GError *pError = NULL;
+ g_file_get_contents (sThemePath, &sFile, NULL, &pError);
+
+ if (!pError)
+ {
+ #if GLIB_CHECK_VERSION(2, 73, 0)
+ GRegex *pRegex = g_regex_new ("IconTheme *= *(.*)", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+ #else
+ GRegex *pRegex = g_regex_new ("IconTheme *= *(.*)", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+ #endif
+
+ if (!pError)
+ {
+ GMatchInfo *pMatchInfo = NULL;
+
+ #if GLIB_CHECK_VERSION(2, 73, 0)
+ gboolean bMatch = g_regex_match (pRegex, sFile, G_REGEX_MATCH_DEFAULT, &pMatchInfo);
+ #else
+ gboolean bMatch = g_regex_match (pRegex, sFile, (GRegexMatchFlags) 0, &pMatchInfo);
+ #endif
+
+ if (bMatch)
+ {
+ gchar *sIconTheme = g_match_info_fetch (pMatchInfo, 1);
+ g_settings_set_string (pImpl->pThemeSettings, "icon-theme", sIconTheme);
+ g_free (sIconTheme);
+ }
+ else
+ {
+ g_warning ("/usr/share/themes/%s/index.theme does not define an IconTheme", sTheme);
+ }
+
+ g_match_info_free (pMatchInfo);
+ g_regex_unref (pRegex);
+ }
+ else
+ {
+ g_error ("PANIC: Failed to compile regex: %s", pError->message);
+ g_error_free (pError);
+ }
+
+ #if GLIB_CHECK_VERSION(2, 73, 0)
+ pRegex = g_regex_new ("MetacityTheme *= *(.*)", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+ #else
+ pRegex = g_regex_new ("MetacityTheme *= *(.*)", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+ #endif
+
+ if (!pError)
+ {
+ GMatchInfo *pMatchInfo = NULL;
+
+ #if GLIB_CHECK_VERSION(2, 73, 0)
+ gboolean bMatch = g_regex_match (pRegex, sFile, G_REGEX_MATCH_DEFAULT, &pMatchInfo);
+ #else
+ gboolean bMatch = g_regex_match (pRegex, sFile, (GRegexMatchFlags) 0, &pMatchInfo);
+ #endif
+
+ if (bMatch)
+ {
+ gchar *sMetacityTheme = g_match_info_fetch (pMatchInfo, 1);
+ g_settings_set_string (pImpl->pMetacitySettings, "theme", sMetacityTheme);
+ g_free (sMetacityTheme);
+ }
+ else
+ {
+ g_warning ("/usr/share/themes/%s/index.theme does not define a MetacityTheme", sTheme);
+ }
+
+ g_match_info_free (pMatchInfo);
+ g_regex_unref (pRegex);
+ }
+ else
+ {
+ g_error ("PANIC: Failed to compile regex: %s", pError->message);
+ g_error_free (pError);
+ }
+
+ #if GLIB_CHECK_VERSION(2, 73, 0)
+ pRegex = g_regex_new ("CursorTheme *= *(.*)", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+ #else
+ pRegex = g_regex_new ("CursorTheme *= *(.*)", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+ #endif
+
+ if (!pError)
+ {
+ GMatchInfo *pMatchInfo = NULL;
+
+ #if GLIB_CHECK_VERSION(2, 73, 0)
+ gboolean bMatch = g_regex_match (pRegex, sFile, G_REGEX_MATCH_DEFAULT, &pMatchInfo);
+ #else
+ gboolean bMatch = g_regex_match (pRegex, sFile, (GRegexMatchFlags) 0, &pMatchInfo);
+ #endif
+
+ if (bMatch)
+ {
+ gchar *sCursorTheme = g_match_info_fetch (pMatchInfo, 1);
+ g_settings_set_string (pImpl->pCursorSettings, "cursor-theme", sTheme);
+ g_free (sCursorTheme);
+ }
+ else
+ {
+ g_warning ("/usr/share/themes/%s/index.theme does not define a CursorTheme", sTheme);
+ }
+
+ g_match_info_free (pMatchInfo);
+ g_regex_unref (pRegex);
+ }
+ else
+ {
+ g_error ("PANIC: Failed to compile regex: %s", pError->message);
+ g_error_free (pError);
+ }
+
+ g_free (sFile);
+ }
+ else
+ {
+ g_error ("PANIC: Failed to get index.theme contents: %s", pError->message);
+ g_error_free (pError);
+ }
+ }
+ else
+ {
+ g_warning ("/usr/share/themes/%s/index.theme does not exist", sTheme);
+ }
+
+ g_free (sThemePath);
if (pImpl->sLastTheme)
{
@@ -756,6 +931,8 @@ private:
gchar *sLastTheme = NULL;
const gchar *sLastColorScheme = "default";
GSettings *pThemeSettings = NULL;
+ GSettings *pCursorSettings = NULL;
+ GSettings *pMetacitySettings = NULL;
GSettings *pColorSchemeSettings = NULL;
gboolean bTest;
gboolean bGreeter;