From 06d2876bafd4d2b10b3c6e48591d2423791a7937 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 18 Jan 2010 09:38:52 +0000 Subject: [PATCH] well it needed to be done finallly - elm has config files and profiles - just like big brother e. SVN revision: 45280 --- legacy/elementary/Makefile.am | 2 +- legacy/elementary/config/Makefile.am | 19 ++ legacy/elementary/config/default/Makefile.am | 23 ++ legacy/elementary/config/default/base.src | 22 ++ legacy/elementary/config/default/icon.png | Bin 0 -> 9183 bytes .../elementary/config/default/profile.desktop | 19 ++ legacy/elementary/config/illume/Makefile.am | 23 ++ legacy/elementary/config/illume/base.src | 22 ++ legacy/elementary/config/illume/icon.png | Bin 0 -> 7555 bytes .../elementary/config/illume/profile.desktop | 16 ++ legacy/elementary/config/profile.src | 1 + legacy/elementary/config/standard/Makefile.am | 23 ++ legacy/elementary/config/standard/base.src | 22 ++ legacy/elementary/config/standard/icon.png | Bin 0 -> 12068 bytes .../config/standard/profile.desktop | 18 ++ legacy/elementary/configure.ac | 17 +- legacy/elementary/src/lib/elm_main.c | 217 +++++++++++++++--- legacy/elementary/src/lib/elm_priv.h | 4 +- legacy/elementary/src/lib/els_scroller.h | 4 +- 19 files changed, 416 insertions(+), 36 deletions(-) create mode 100644 legacy/elementary/config/Makefile.am create mode 100644 legacy/elementary/config/default/Makefile.am create mode 100644 legacy/elementary/config/default/base.src create mode 100644 legacy/elementary/config/default/icon.png create mode 100644 legacy/elementary/config/default/profile.desktop create mode 100644 legacy/elementary/config/illume/Makefile.am create mode 100644 legacy/elementary/config/illume/base.src create mode 100644 legacy/elementary/config/illume/icon.png create mode 100644 legacy/elementary/config/illume/profile.desktop create mode 100644 legacy/elementary/config/profile.src create mode 100644 legacy/elementary/config/standard/Makefile.am create mode 100644 legacy/elementary/config/standard/base.src create mode 100644 legacy/elementary/config/standard/icon.png create mode 100644 legacy/elementary/config/standard/profile.desktop diff --git a/legacy/elementary/Makefile.am b/legacy/elementary/Makefile.am index 01507a823f..0c097d6164 100644 --- a/legacy/elementary/Makefile.am +++ b/legacy/elementary/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src data doc +SUBDIRS = src data config doc ACLOCAL_AMFLAGS = -I m4 diff --git a/legacy/elementary/config/Makefile.am b/legacy/elementary/config/Makefile.am new file mode 100644 index 0000000000..cf5213394a --- /dev/null +++ b/legacy/elementary/config/Makefile.am @@ -0,0 +1,19 @@ +MAINTAINERCLEANFILES = Makefile.in +SUBDIRS = default standard illume + +EET_EET = @eet_eet@ + +EXTRA_DIST = profile.src + +filesdir = $(datadir)/elementary/config + +files_DATA = profile.cfg + +%.cfg: %.src + $(EET_EET) -i \ + $(top_builddir)/config/$@ config \ + $< 0 + +clean-local: + rm -rf *.cfg *~ + diff --git a/legacy/elementary/config/default/Makefile.am b/legacy/elementary/config/default/Makefile.am new file mode 100644 index 0000000000..ba2bc9666a --- /dev/null +++ b/legacy/elementary/config/default/Makefile.am @@ -0,0 +1,23 @@ +MAINTAINERCLEANFILES = Makefile.in + +EET_EET = @eet_eet@ + +EXTRA_DIST = \ + profile.desktop \ + icon.png \ + base.src + +filesdir = $(datadir)/elementary/config/default +files_DATA = \ + profile.desktop \ + icon.png \ + base.cfg + +%.cfg: %.src + $(EET_EET) -e \ + $(top_builddir)/config/default/$@ config \ + $< 1 + +clean-local: + rm -rf *.cfg *~ + diff --git a/legacy/elementary/config/default/base.src b/legacy/elementary/config/default/base.src new file mode 100644 index 0000000000..9cd5c20160 --- /dev/null +++ b/legacy/elementary/config/default/base.src @@ -0,0 +1,22 @@ +group "Elm_Config" struct { + value "engine" int: 0; + value "thumbscroll_enable" int: 1; + value "thumbscroll_threshhold" int: 24; + value "thumbscroll_momentum_threshhold" double: 100.0; + value "thumbscroll_friction" double: 1.0; + value "thumbscroll_bounce_friction" double: 0.5; + value "page_scroll_friction" double: 0.5; + value "bring_in_scroll_friction" double: 0.5; + value "zoom_friction" double: 0.5; + value "thumbscroll_bounce_enable" int: 1; + value "scale" double: 1.0; + value "bgpixmap" int: 0; + value "compositing" int: 1; + value "font_hinting" int: 2; + value "image_cache" int: 4096; + value "font_cache" int: 512; + value "finger_size" int: 40; + value "fps" double: 60.0; + value "theme" string: "default"; + value "modules" string: ""; +} diff --git a/legacy/elementary/config/default/icon.png b/legacy/elementary/config/default/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9c08ee2a58b98727f32b2524ce4c3272e9b7ff7f GIT binary patch literal 9183 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 literal 0 HcmV?d00001 diff --git a/legacy/elementary/config/default/profile.desktop b/legacy/elementary/config/default/profile.desktop new file mode 100644 index 0000000000..e02dc43300 --- /dev/null +++ b/legacy/elementary/config/default/profile.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Type=Link +Name=Default +Name[cs]=Výchozí +Name[it]=Predefinito +Name[hu]=Alapértelmezett +Name[fr]=Prédéfini +Name[el]=Προκαθορισμένο +Name[eo]=Pravaloroj +Name[zh_CN]=默认 +Icon=icon.png +Comment=Select this to begin
the initial setup again. +Comment[cs]=Vyberte pro znovuspuštění
tohoto průvodce. +Comment[it]=Selezionare questo per
riprendere la
configurazione iniziale. +Comment[hu]=Válaszd ezt az alap
beállítáok megismétléséhez. +Comment[fr]=Sélectionnez ceci pour recommencer
la configuration initiale. +Comment[el]=Επέλεξε αυτό για να
ξεκινήσεις την αρχική ρύθμιση ξανά. +Comment[eo]=Elektu tion por restartigi
la pravalorizan agordon. +Comment[zh_CN]=点击这里重新进行初始化设置主题。 diff --git a/legacy/elementary/config/illume/Makefile.am b/legacy/elementary/config/illume/Makefile.am new file mode 100644 index 0000000000..fa13056090 --- /dev/null +++ b/legacy/elementary/config/illume/Makefile.am @@ -0,0 +1,23 @@ +MAINTAINERCLEANFILES = Makefile.in + +EET_EET = @eet_eet@ + +EXTRA_DIST = \ + profile.desktop \ + icon.png \ + base.src + +filesdir = $(datadir)/elementary/config/illume +files_DATA = \ + profile.desktop \ + icon.png \ + base.cfg + +%.cfg: %.src + $(EET_EET) -e \ + $(top_builddir)/config/illume/$@ config \ + $< 1 + +clean-local: + rm -rf *.cfg *~ + diff --git a/legacy/elementary/config/illume/base.src b/legacy/elementary/config/illume/base.src new file mode 100644 index 0000000000..9cd5c20160 --- /dev/null +++ b/legacy/elementary/config/illume/base.src @@ -0,0 +1,22 @@ +group "Elm_Config" struct { + value "engine" int: 0; + value "thumbscroll_enable" int: 1; + value "thumbscroll_threshhold" int: 24; + value "thumbscroll_momentum_threshhold" double: 100.0; + value "thumbscroll_friction" double: 1.0; + value "thumbscroll_bounce_friction" double: 0.5; + value "page_scroll_friction" double: 0.5; + value "bring_in_scroll_friction" double: 0.5; + value "zoom_friction" double: 0.5; + value "thumbscroll_bounce_enable" int: 1; + value "scale" double: 1.0; + value "bgpixmap" int: 0; + value "compositing" int: 1; + value "font_hinting" int: 2; + value "image_cache" int: 4096; + value "font_cache" int: 512; + value "finger_size" int: 40; + value "fps" double: 60.0; + value "theme" string: "default"; + value "modules" string: ""; +} diff --git a/legacy/elementary/config/illume/icon.png b/legacy/elementary/config/illume/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9e0ed3dac82f0499c92c86775018cf5d0c0a5517 GIT binary patch literal 7555 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 systems like
phones and web
tablets with tiny
touchscreen displays.
Only use this if
you really have
such a device. +Comment[cs]=Illume profil pro
přenosná zařízení
jako telefony
a webové tablety
s malými dotykovými displeji.
Použijte jen pokud
opravdu máte
takové zařízení. +Comment[it]=Profilo Illume per
sistemi embedded come
cellulari e webpad
con piccoli display
touchscreen.
Usatelo solo se
avete realmente un
dispositivo simile. +Comment[hu]=Illume profil
telefonokhoz, érintőképernyőkhöz.
Csak akkor használd ezt,
ha valóban ilyen eszközöd van. +Comment[fr]=Profil Illume pour les systèmes
embarqués comme les téléphones
et tablettes internet pourvus
d'un petit écran tactile.
À n'utiliser que si
vous disposez réellement
d'un tel matériel. +Comment[el]=Το προφίλ Illume είναι
για μικροσυσκευές όπως
κινητά τηλέφωνα ή internet
tablets με μικρές οθόνες αφής.
Επιλέξτε μόνο αν έχετε τέτοια
συσκευή. +Comment[eo]=Profilo Illume por la
enkorpigitaj sistemoj
kiel la telefonoj kaj
ttt-tabletoj kun etaj
tuŝekranoj. Nur uzu
tiun se vi vere havas
tian aparaton. +Comment[zh_CN]=为带有小型触屏的嵌入式系统如手机和上网本设计的 Illume 设置主题。 diff --git a/legacy/elementary/config/profile.src b/legacy/elementary/config/profile.src new file mode 100644 index 0000000000..331d858ce9 --- /dev/null +++ b/legacy/elementary/config/profile.src @@ -0,0 +1 @@ +default \ No newline at end of file diff --git a/legacy/elementary/config/standard/Makefile.am b/legacy/elementary/config/standard/Makefile.am new file mode 100644 index 0000000000..88cae80e0b --- /dev/null +++ b/legacy/elementary/config/standard/Makefile.am @@ -0,0 +1,23 @@ +MAINTAINERCLEANFILES = Makefile.in + +EET_EET = @eet_eet@ + +EXTRA_DIST = \ + profile.desktop \ + icon.png \ + base.src + +filesdir = $(datadir)/elementary/config/standard +files_DATA = \ + profile.desktop \ + icon.png \ + base.cfg + +%.cfg: %.src + $(EET_EET) -e \ + $(top_builddir)/config/standard/$@ config \ + $< 1 + +clean-local: + rm -rf *.cfg *~ + diff --git a/legacy/elementary/config/standard/base.src b/legacy/elementary/config/standard/base.src new file mode 100644 index 0000000000..4df5eda966 --- /dev/null +++ b/legacy/elementary/config/standard/base.src @@ -0,0 +1,22 @@ +group "Elm_Config" struct { + value "engine" int: 0; + value "thumbscroll_enable" int: 1; + value "thumbscroll_threshhold" int: 4; + value "thumbscroll_momentum_threshhold" double: 100.0; + value "thumbscroll_friction" double: 1.0; + value "thumbscroll_bounce_friction" double: 0.5; + value "page_scroll_friction" double: 0.5; + value "bring_in_scroll_friction" double: 0.5; + value "zoom_friction" double: 0.5; + value "thumbscroll_bounce_enable" int: 1; + value "scale" double: 1.0; + value "bgpixmap" int: 0; + value "compositing" int: 1; + value "font_hinting" int: 2; + value "image_cache" int: 4096; + value "font_cache" int: 512; + value "finger_size" int: 5; + value "fps" double: 60.0; + value "theme" string: "default"; + value "modules" string: ""; +} diff --git a/legacy/elementary/config/standard/icon.png b/legacy/elementary/config/standard/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..90b57af47dd12d33c8bbf686931853865a4b1ce1 GIT binary patch literal 12068 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 racgprofile that is
universal for most
desktop and laptop
systems. Choose this
if you are not
sure what to choose. +Comment[cs]=Toto je standartní
univerzální
profil pro většinu
stolních a přenosných
počítačů. Vyberte pokud
si nejste jisti
co vybrat. +Comment[it]=Questo è il profilo
standard, universale
per la maggior
parte dei sistemi
desktop e portatili.
Scegliete questo se
non siete sicuri di
cosa scegliere. +Comment[hu]=Ez az általános,
alap beállítás,
amely megfelelő a
legtöbb laptop és
asztali gép számára. +Comment[fr]=C'est le profil standard
adapté à la quasi totalité
des systèmes de bureau
et ordinateurs portables.
Choisissez ce profil si
vous n'êtes pas sûr. +Comment[el]=Αυτό είναι το κανονικό
προφίλ που είναι κοινό
για τα περισσότερα συστήματα. Επιλέξτε αυτό
αν δεν είστε σίγουροι για
την επιλογή σας. +Comment[eo]=Tio estas la kutima profilo
taŭga por preskaŭ ĉiuj
oficejaj sistemoj kaj
porteblaj sistemoj.
Elektu ĝin se vi ne certas. +Comment[zh_CN]=适用于大多数台式机和笔记本的设置主题，如果您不清楚如何选择则请使用这个。 diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac index eb2bd402ee..8196567a94 100644 --- a/legacy/elementary/configure.ac +++ b/legacy/elementary/configure.ac @@ -131,7 +131,7 @@ AM_CONDITIONAL([ELEMENTARY_WINDOWS_BUILD], [test "x${have_windows}" = "xyes"]) PKG_CHECK_MODULES([ELEMENTARY], [ eina-0 >= 0.0.1 - eet >= 1.1.0 + eet >= 1.2.3 evas >= 0.9.9 ecore >= 0.9.9 ecore-evas >= 0.9.9 @@ -142,6 +142,17 @@ PKG_CHECK_MODULES([ELEMENTARY], ] ) +AC_ARG_WITH(eet-eet, +[ --with-eet-eet=PATH specify a specific path to eet utility], +[ + v=$withval; + eet_eet=$v + echo " Elementary eet explicitly set to "$eet_eet; +],[ + eet_eet=$(pkg-config --variable=prefix eet)/bin/eet +]) +AC_SUBST(eet_eet) + requirement_elm="edje ecore-file ecore-txt ecore-job ecore-evas ecore evas eet eina-0 ${requirement_elm}" have_elementary_x="no" @@ -292,6 +303,10 @@ data/themes/Makefile data/images/Makefile data/objects/Makefile data/desktop/Makefile +config/Makefile +config/default/Makefile +config/standard/Makefile +config/illume/Makefile ]) ##################################################################### diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c index e13b17c2a1..8558744c5f 100644 --- a/legacy/elementary/src/lib/elm_main.c +++ b/legacy/elementary/src/lib/elm_main.c @@ -329,8 +329,14 @@ _elm_window_property_change(void *data, int ev_type, void *ev) val = ecore_x_window_prop_string_get(event->win, event->atom); + if (_elm_config->theme) + { + eina_stringshare_del(_elm_config->theme); + _elm_config->theme = NULL; + } if (val) { + _elm_config->theme = eina_stringshare_add(val); _elm_theme_parse(val); free(val); _elm_rescale(); @@ -459,7 +465,7 @@ elm_quicklaunch_init(int argc, char **argv) { int i; char buf[PATH_MAX], *s; - + eina_init(); _elm_log_dom = eina_log_domain_register("elementary", EINA_COLOR_LIGHTBLUE); if (!_elm_log_dom) @@ -549,35 +555,151 @@ elm_quicklaunch_init(int argc, char **argv) #endif if (!_elm_data_dir) _elm_data_dir = eina_stringshare_add(PACKAGE_DATA_DIR); - if (!_elm_data_dir) + if (!_elm_data_dir) _elm_data_dir = eina_stringshare_add("/"); if (!_elm_lib_dir) _elm_lib_dir = eina_stringshare_add(PACKAGE_LIB_DIR); if (!_elm_lib_dir) _elm_lib_dir = eina_stringshare_add("/"); - // FIXME: actually load config from file - use eet. also for X properties, - // reduce to single x property with eet data encoded in it. - _elm_config = ELM_NEW(Elm_Config); - _elm_config->engine = ELM_SOFTWARE_X11; - _elm_config->thumbscroll_enable = 1; - _elm_config->thumbscroll_threshhold = 24; - _elm_config->thumbscroll_momentum_threshhold = 100.0; - _elm_config->thumbscroll_friction = 1.0; - _elm_config->thumbscroll_bounce_friction = 0.5; - _elm_config->thumbscroll_bounce_enable = 1; - _elm_config->page_scroll_friction = 0.5; - _elm_config->bring_in_scroll_friction = 0.5; - _elm_config->zoom_friction = 0.5; - _elm_config->scale = 1.0; - _elm_config->font_hinting = 2; - _elm_config->font_dirs = NULL; - _elm_config->image_cache = 4096; - _elm_config->font_cache = 512; - _elm_config->finger_size = 40; - _elm_config->bgpixmap = 0; - _elm_config->compositing = 1; - _elm_config->fps = 60.0; + + // yes - this should be a function. do it later + { + Eet_Data_Descriptor_Class eddc; + Eet_Data_Descriptor *edd = NULL; + Eet_File *ef = NULL; + int len = 0; + char buf[PATH_MAX], *p; + const char *home = NULL; + char *profile = strdup("default"); + + EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, Elm_Config); + + eddc.func.str_direct_alloc = NULL; + eddc.func.str_direct_free = NULL; + + edd = eet_data_descriptor_file_new(&eddc); + if (edd) + { + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "engine", engine, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "thumbscroll_enable", thumbscroll_enable, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "thumbscroll_threshhold", thumbscroll_threshhold, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "thumbscroll_momentum_threshhold", thumbscroll_momentum_threshhold, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "thumbscroll_friction", thumbscroll_friction, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "thumbscroll_bounce_friction", thumbscroll_bounce_friction, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "page_scroll_friction", page_scroll_friction, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "bring_in_scroll_friction", bring_in_scroll_friction, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "zoom_friction", zoom_friction, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "thumbscroll_bounce_enable", thumbscroll_bounce_enable, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "scale", scale, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "bgpixmap", bgpixmap, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "compositing", compositing, EET_T_INT); + // EET_DATA_DESCRIPTOR_ADD_LIST(edd, Elm_Config, "font_dirs", font_dirs, sub_edd); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "font_hinting", font_hinting, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "image_cache", image_cache, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "font_cache", font_cache, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "finger_size", finger_size, EET_T_INT); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "fps", fps, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "theme", theme, EET_T_STRING); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Elm_Config, "modules", modules, EET_T_STRING); + } + else + { + printf("EEEK! eet_data_descriptor_file_new() failed\n"); + } + + home = getenv("HOME"); + if (!home) home = "/"; + + snprintf(buf, sizeof(buf), "%s/.elementary/config/profile.cfg", home); + ef = eet_open(buf, EET_FILE_MODE_READ); + if (ef) + { + p = eet_read(ef, "config", &len); + if (p) + { + free(profile); + profile = malloc(len + 1); + memcpy(profile, p, len); + profile[len] = 0; + free(p); + } + eet_close(ef); + if (!p) ef = NULL; + } + if (!ef) + { + snprintf(buf, sizeof(buf), "%s/config/profile.cfg", _elm_data_dir); + ef = eet_open(buf, EET_FILE_MODE_READ); + if (ef) + { + p = eet_read(ef, "config", &len); + if (p) + { + free(profile); + profile = malloc(len + 1); + memcpy(profile, p, len); + profile[len] = 0; + free(p); + } + eet_close(ef); + } + } + + s = getenv("ELM_PROFILE"); + if (s) + { + free(profile); + profile = strdup(s); + } + + snprintf(buf, sizeof(buf), "%s/.elementary/config/%s/base.cfg", home, profile); + ef = eet_open(buf, EET_FILE_MODE_READ); + if (ef) + { + _elm_config = eet_data_read(ef, edd, "config"); + eet_close(ef); + } + if (!_elm_config) + { + snprintf(buf, sizeof(buf), "%s/config/%s/base.cfg", _elm_data_dir, profile); + ef = eet_open(buf, EET_FILE_MODE_READ); + if (ef) + { + _elm_config = eet_data_read(ef, edd, "config"); + eet_close(ef); + } + } + + if (edd) eet_data_descriptor_free(edd); + if (profile) free(profile); + } + + if (!_elm_config) + { + _elm_config = ELM_NEW(Elm_Config); + _elm_config->engine = ELM_SOFTWARE_X11; + _elm_config->thumbscroll_enable = 1; + _elm_config->thumbscroll_threshhold = 24; + _elm_config->thumbscroll_momentum_threshhold = 100.0; + _elm_config->thumbscroll_friction = 1.0; + _elm_config->thumbscroll_bounce_friction = 0.5; + _elm_config->page_scroll_friction = 0.5; + _elm_config->bring_in_scroll_friction = 0.5; + _elm_config->zoom_friction = 0.5; + _elm_config->thumbscroll_bounce_enable = 1; + _elm_config->scale = 1.0; + _elm_config->bgpixmap = 0; + _elm_config->font_hinting = 2; + _elm_config->font_dirs = NULL; + _elm_config->image_cache = 4096; + _elm_config->font_cache = 512; + _elm_config->finger_size = 40; + _elm_config->compositing = 1; + _elm_config->fps = 60.0; + _elm_config->theme = eina_stringshare_add("default"); + _elm_config->modules = NULL; + } s = getenv("ELM_ENGINE"); if (s) @@ -641,8 +763,17 @@ elm_quicklaunch_init(int argc, char **argv) if (s) _elm_config->zoom_friction = atof(s); s = getenv("ELM_THEME"); - if (s) _elm_theme_parse(s); - else _elm_theme_parse("default"); + if (s) + { + if (_elm_config->theme) + { + eina_stringshare_del(_elm_config->theme); + _elm_config->theme = NULL; + } + _elm_config->theme = eina_stringshare_add(s); + } + + _elm_theme_parse(_elm_config->theme); _elm_config->font_hinting = 2; s = getenv("ELM_FONT_HINTING"); @@ -659,6 +790,11 @@ elm_quicklaunch_init(int argc, char **argv) const char *p, *pp; char *buf; + EINA_LIST_FREE(_elm_config->font_dirs, p) + { + eina_stringshare_del(p); + } + buf = alloca(strlen(s) + 1); p = s; pp = p; @@ -705,11 +841,20 @@ elm_quicklaunch_init(int argc, char **argv) if (_elm_config->fps < 1.0) _elm_config->fps = 1.0; ecore_animator_frametime_set(1.0 / _elm_config->fps); - edje_frametime_set(1.0 / 60.0); + edje_frametime_set(1.0 / _elm_config->fps); edje_scale_set(_elm_config->scale); s = getenv("ELM_MODULES"); - if (s) _elm_module_parse(s); + if (s) + { + if (_elm_config->modules) + { + eina_stringshare_del(_elm_config->modules); + _elm_config->modules = NULL; + } + _elm_config->modules = eina_stringshare_add(s); + } + if (_elm_config->modules) _elm_module_parse(_elm_config->modules); } EAPI void @@ -775,6 +920,12 @@ elm_quicklaunch_sub_init(int argc, char **argv) _elm_atom_enlightenment_theme); if (s) { + if (_elm_config->theme) + { + eina_stringshare_del(_elm_config->theme); + _elm_config->theme = NULL; + } + _elm_config->theme = eina_stringshare_add(s); _elm_theme_parse(s); free(s); } @@ -817,12 +968,16 @@ elm_quicklaunch_shutdown(void) { eina_stringshare_del(fontdir); } - + + if (_elm_config->theme) eina_stringshare_del(_elm_config->theme); + if (_elm_config->modules) eina_stringshare_del(_elm_config->modules); + + free(_elm_config); + free(_elm_appname); + ecore_event_handler_del(_elm_exit_handler); _elm_exit_handler = NULL; - free(_elm_config); - free(_elm_appname); _elm_unneed_efreet(); _elm_unneed_e_dbus(); _elm_module_shutdown(); diff --git a/legacy/elementary/src/lib/elm_priv.h b/legacy/elementary/src/lib/elm_priv.h index c2e34e0dcc..0ca625dee5 100644 --- a/legacy/elementary/src/lib/elm_priv.h +++ b/legacy/elementary/src/lib/elm_priv.h @@ -57,8 +57,10 @@ struct _Elm_Config int font_hinting; int image_cache; int font_cache; - Evas_Coord finger_size; + int finger_size; double fps; + const char *theme; + const char *modules; }; typedef struct _Elm_Module Elm_Module; diff --git a/legacy/elementary/src/lib/els_scroller.h b/legacy/elementary/src/lib/els_scroller.h index b138a41d20..ecfb95fc1d 100644 --- a/legacy/elementary/src/lib/els_scroller.h +++ b/legacy/elementary/src/lib/els_scroller.h @@ -1,8 +1,8 @@ typedef enum _Elm_Smart_Scroller_Policy { - ELM_SMART_SCROLLER_POLICY_OFF, + ELM_SMART_SCROLLER_POLICY_AUTO, ELM_SMART_SCROLLER_POLICY_ON, - ELM_SMART_SCROLLER_POLICY_AUTO + ELM_SMART_SCROLLER_POLICY_OFF } Elm_Smart_Scroller_Policy;