summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/e_config.c4
-rw-r--r--src/bin/e_config.h14
-rw-r--r--src/bin/e_xsettings.c6
-rw-r--r--src/modules/conf_theme/e_int_config_xsettings.c13
4 files changed, 18 insertions, 19 deletions
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 52c357c90..dd9b75379 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -958,11 +958,11 @@ _e_config_edd_init(Eina_Bool old)
958 E_CONFIG_VAL(D, T, xsettings.xft_hinting, INT); 958 E_CONFIG_VAL(D, T, xsettings.xft_hinting, INT);
959 E_CONFIG_VAL(D, T, xsettings.xft_hint_style, STR); 959 E_CONFIG_VAL(D, T, xsettings.xft_hint_style, STR);
960 E_CONFIG_VAL(D, T, xsettings.xft_rgba, STR); 960 E_CONFIG_VAL(D, T, xsettings.xft_rgba, STR);
961 E_CONFIG_VAL(D, T, xsettings.xft_dpi.enabled, UCHAR);
962 E_CONFIG_VAL(D, T, xsettings.xft_dpi.value, INT);
961 E_CONFIG_VAL(D, T, xsettings.net_theme_name, STR); 963 E_CONFIG_VAL(D, T, xsettings.net_theme_name, STR);
962 E_CONFIG_VAL(D, T, xsettings.net_icon_theme_name, STR); 964 E_CONFIG_VAL(D, T, xsettings.net_icon_theme_name, STR);
963 E_CONFIG_VAL(D, T, xsettings.gtk_font_name, STR); 965 E_CONFIG_VAL(D, T, xsettings.gtk_font_name, STR);
964 E_CONFIG_VAL(D, T, xsettings.dpi.enabled, UCHAR);
965 E_CONFIG_VAL(D, T, xsettings.dpi.value, INT);
966 966
967 E_CONFIG_VAL(D, T, update.check, UCHAR); 967 E_CONFIG_VAL(D, T, update.check, UCHAR);
968 E_CONFIG_VAL(D, T, update.later, UCHAR); 968 E_CONFIG_VAL(D, T, update.later, UCHAR);
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index d8d7be59f..f95ccd8c8 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -47,7 +47,7 @@ typedef enum
47/* increment this whenever a new set of config values are added but the users 47/* increment this whenever a new set of config values are added but the users
48 * config doesn't need to be wiped - simply new values need to be put in 48 * config doesn't need to be wiped - simply new values need to be put in
49 */ 49 */
50#define E_CONFIG_FILE_GENERATION 30 50#define E_CONFIG_FILE_GENERATION 31
51#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION) 51#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH * 1000000) + E_CONFIG_FILE_GENERATION)
52 52
53#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!! 53#define E_CONFIG_BINDINGS_VERSION 0 // DO NOT INCREMENT UNLESS YOU WANT TO WIPE ALL BINDINGS!!!!!
@@ -392,12 +392,6 @@ struct _E_Config
392 unsigned char load_kde; // GUI 392 unsigned char load_kde; // GUI
393 } deskenv; 393 } deskenv;
394 394
395 struct dpi
396 {
397 unsigned char enabled;
398 int value;
399 } dpi;
400
401 struct 395 struct
402 { 396 {
403 unsigned char enabled; // GUI 397 unsigned char enabled; // GUI
@@ -405,13 +399,17 @@ struct _E_Config
405 unsigned char match_e17_icon_theme; // GUI 399 unsigned char match_e17_icon_theme; // GUI
406 int xft_antialias; 400 int xft_antialias;
407 int xft_hinting; 401 int xft_hinting;
402 struct
403 {
404 unsigned char enabled;
405 int value;
406 } xft_dpi; // GUI
408 const char *xft_hint_style; 407 const char *xft_hint_style;
409 const char *xft_rgba; 408 const char *xft_rgba;
410 const char *net_theme_name; // GUI 409 const char *net_theme_name; // GUI
411 const char *net_theme_name_detected; // not saved 410 const char *net_theme_name_detected; // not saved
412 const char *net_icon_theme_name; 411 const char *net_icon_theme_name;
413 const char *gtk_font_name; 412 const char *gtk_font_name;
414 struct dpi dpi;
415 } xsettings; 413 } xsettings;
416 414
417 struct 415 struct
diff --git a/src/bin/e_xsettings.c b/src/bin/e_xsettings.c
index 971f42874..3a379f70b 100644
--- a/src/bin/e_xsettings.c
+++ b/src/bin/e_xsettings.c
@@ -595,10 +595,10 @@ _e_xsettings_font_set(void)
595static void 595static void
596_e_xsettings_dpi_set(void) 596_e_xsettings_dpi_set(void)
597{ 597{
598 if (e_config->xsettings.dpi.enabled) 598 if ((e_config->xsettings.xft_dpi.enabled) && (e_config->xsettings.xft_dpi.value > 0))
599 _e_xsettings_int_set(_setting_xft_dpi, e_config->xsettings.dpi.value * 1024, EINA_TRUE); 599 _e_xsettings_int_set(_setting_xft_dpi, e_config->xsettings.xft_dpi.value * 1024, EINA_TRUE);
600 else 600 else
601 _e_xsettings_int_set(_setting_xft_dpi, 96 * 1024, EINA_TRUE); 601 _e_xsettings_int_set(_setting_xft_dpi, 0, EINA_FALSE);
602} 602}
603 603
604#if 0 604#if 0
diff --git a/src/modules/conf_theme/e_int_config_xsettings.c b/src/modules/conf_theme/e_int_config_xsettings.c
index e814a9dc3..89ac29ee1 100644
--- a/src/modules/conf_theme/e_int_config_xsettings.c
+++ b/src/modules/conf_theme/e_int_config_xsettings.c
@@ -77,8 +77,8 @@ _create_data(E_Config_Dialog *cfd)
77 cfdata->match_e17_icon_theme = e_config->xsettings.match_e17_icon_theme; 77 cfdata->match_e17_icon_theme = e_config->xsettings.match_e17_icon_theme;
78 cfdata->match_e17_theme = e_config->xsettings.match_e17_theme; 78 cfdata->match_e17_theme = e_config->xsettings.match_e17_theme;
79 cfdata->enable_xsettings = e_config->xsettings.enabled; 79 cfdata->enable_xsettings = e_config->xsettings.enabled;
80 cfdata->enable_xsettings_dpi = e_config->xsettings.dpi.enabled; 80 cfdata->enable_xsettings_dpi = e_config->xsettings.xft_dpi.enabled;
81 cfdata->xsettings_dpi = e_config->xsettings.dpi.value; 81 cfdata->xsettings_dpi = e_config->xsettings.xft_dpi.value;
82 cfdata->icon_theme = eina_stringshare_add(e_config->icon_theme); 82 cfdata->icon_theme = eina_stringshare_add(e_config->icon_theme);
83 cfdata->icon_overrides = e_config->icon_theme_overrides; 83 cfdata->icon_overrides = e_config->icon_theme_overrides;
84 //cfdata->enable_icon_theme = !!(e_config->icon_theme); 84 //cfdata->enable_icon_theme = !!(e_config->icon_theme);
@@ -135,9 +135,10 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd
135 (strcmp(cfdata->icon_theme, e_config->icon_theme) != 0)) 135 (strcmp(cfdata->icon_theme, e_config->icon_theme) != 0))
136 return 1; 136 return 1;
137 137
138 if (cfdata->enable_xsettings_dpi != e_config->xsettings.dpi.enabled) 138 if (cfdata->enable_xsettings_dpi != e_config->xsettings.xft_dpi.enabled)
139 return 1; 139 return 1;
140 if (cfdata->xsettings_dpi != e_config->xsettings.dpi.value) 140
141 if (cfdata->xsettings_dpi != e_config->xsettings.xft_dpi.value)
141 return 1; 142 return 1;
142 143
143 return 0; 144 return 0;
@@ -157,8 +158,8 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
157// e_config->xsettings.match_e17_icon_theme = cfdata->match_e17_icon_theme; 158// e_config->xsettings.match_e17_icon_theme = cfdata->match_e17_icon_theme;
158 e_config->xsettings.match_e17_theme = cfdata->match_e17_theme; 159 e_config->xsettings.match_e17_theme = cfdata->match_e17_theme;
159 e_config->xsettings.enabled = cfdata->enable_xsettings; 160 e_config->xsettings.enabled = cfdata->enable_xsettings;
160 e_config->xsettings.dpi.enabled = cfdata->enable_xsettings_dpi; 161 e_config->xsettings.xft_dpi.enabled = cfdata->enable_xsettings_dpi;
161 e_config->xsettings.dpi.value = cfdata->xsettings_dpi; 162 e_config->xsettings.xft_dpi.value = cfdata->xsettings_dpi;
162 163
163 eina_stringshare_del(e_config->icon_theme); 164 eina_stringshare_del(e_config->icon_theme);
164 if (cfdata->icon_overrides || cfdata->match_e17_icon_theme) 165 if (cfdata->icon_overrides || cfdata->match_e17_icon_theme)