aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichaël Bouchaud (yoz) <yoz@efl.so>2016-11-28 15:04:21 +0100
committerMichaël Bouchaud (yoz) <yoz@efl.so>2017-01-08 12:12:08 +0100
commitbef6457d03fbf9c7f7e20e77abf548723967d684 (patch)
treebce682c8019c379f90869a4ac680a1b4b39356a4
parente_time: make time external config (diff)
downloadenlightenment-devs/yoz/bryce.tar.gz
bryce_migration: add a module to migrate from shelf to brycedevs/yoz/bryce
-rw-r--r--configure.ac2
-rw-r--r--src/bin/e_bryce.c29
-rw-r--r--src/bin/e_bryce.h1
-rw-r--r--src/bin/e_module.c1
-rw-r--r--src/modules/Makefile.mk3
-rw-r--r--src/modules/Makefile_bryce_migration.mk32
-rw-r--r--src/modules/bryce_migration/config_migration.c618
-rw-r--r--src/modules/bryce_migration/e_mod_main.c181
-rw-r--r--src/modules/bryce_migration/module.desktop.in7
9 files changed, 867 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index df69b29e7..0d0b1d503 100644
--- a/configure.ac
+++ b/configure.ac
@@ -902,6 +902,7 @@ AC_E_OPTIONAL_MODULE([geolocation], true)
AC_E_OPTIONAL_MODULE([xwayland], $have_wayland_dep, [CHECK_MODULE_XWAYLAND])
AC_E_OPTIONAL_MODULE([wireless], true)
AC_E_OPTIONAL_MODULE([time], true)
+AC_E_OPTIONAL_MODULE([bryce_migration], true)
if test "x${HAVE_WL_X11}" != "xyes" && test "x${have_wayland}" = "xyes" && test "x${HAVE_XWAYLAND}" != "xyes"; then
AC_DEFINE_UNQUOTED([HAVE_WAYLAND_ONLY],[1],[enable wayland-only version of enlightenment])
@@ -1132,6 +1133,7 @@ src/modules/wl_desktop_shell/module.desktop
src/modules/wireless/module.desktop
src/modules/time/module.desktop
src/modules/luncher/module.desktop
+src/modules/bryce_migration/module.desktop
data/xsession/enlightenment.desktop
data/etc/sysactions.conf
data/units/enlightenment.service
diff --git a/src/bin/e_bryce.c b/src/bin/e_bryce.c
index a8e38e608..9bc13ac38 100644
--- a/src/bin/e_bryce.c
+++ b/src/bin/e_bryce.c
@@ -53,6 +53,9 @@ typedef struct Bryces
Eina_List *bryces;
} Bryces;
+
+static void _bryce_delete(Bryce *b);
+
static E_Config_DD *edd_bryces;
static E_Config_DD *edd_bryce;
static Bryces *bryces;
@@ -750,13 +753,7 @@ _bryce_autohide_menu(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNU
static void
_bryce_remove_menu(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
- Bryce *b = data;
- bryces->bryces = eina_list_remove(bryces->bryces, data);
- e_gadget_site_del(b->site);
- eina_stringshare_del(b->name);
- eina_stringshare_del(b->style);
- evas_object_hide(b->bryce);
- evas_object_del(b->bryce);
+ _bryce_delete(data);
e_config_save_queue();
}
@@ -940,6 +937,17 @@ _bryce_create(Bryce *b, Evas_Object *parent)
_bryce_autosize(b);
}
+static void
+_bryce_delete(Bryce *b)
+{
+ bryces->bryces = eina_list_remove(bryces->bryces, b);
+ e_gadget_site_del(b->site);
+ eina_stringshare_del(b->name);
+ eina_stringshare_del(b->style);
+ evas_object_hide(b->bryce);
+ evas_object_del(b->bryce);
+}
+
static Eina_Bool
_bryce_act_resize(E_Object *obj, const char *params, E_Binding_Event_Wheel *ev)
{
@@ -1035,6 +1043,13 @@ e_bryce_add(Evas_Object *parent, const char *name, E_Gadget_Site_Orient orient,
}
E_API void
+e_bryce_delete(Evas_Object *bryce)
+{
+ BRYCE_GET(bryce);
+ _bryce_delete(b);
+}
+
+E_API void
e_bryce_orient(Evas_Object *bryce, E_Gadget_Site_Orient orient, E_Gadget_Site_Anchor an)
{
const char *loc = NULL, *loc2 = NULL;
diff --git a/src/bin/e_bryce.h b/src/bin/e_bryce.h
index 3f575a2d8..644c7e663 100644
--- a/src/bin/e_bryce.h
+++ b/src/bin/e_bryce.h
@@ -6,6 +6,7 @@ EINTERN void e_bryce_init(void);
EINTERN void e_bryce_shutdown(void);
E_API Evas_Object *e_bryce_add(Evas_Object *parent, const char *name, E_Gadget_Site_Orient orient, E_Gadget_Site_Anchor an);
+E_API void e_bryce_delete(Evas_Object *bryce);
E_API void e_bryce_orient(Evas_Object *bryce, E_Gadget_Site_Orient orient, E_Gadget_Site_Anchor an);
E_API Evas_Object *e_bryce_site_get(Evas_Object *bryce);
E_API Eina_Bool e_bryce_autosize_get(Evas_Object *bryce);
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 9bfc3170b..ba9e0791f 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -1042,6 +1042,7 @@ _e_module_whitelist_check(void)
"policy_mobile",
"geolocation",
"xwayland",
+ "bryce_migration",
NULL // end marker
};
diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
index fc7ace3a6..dd0a2ae94 100644
--- a/src/modules/Makefile.mk
+++ b/src/modules/Makefile.mk
@@ -132,4 +132,7 @@ include src/modules/Makefile_policy_mobile.mk
include src/modules/Makefile_geolocation.mk
include src/modules/Makefile_wireless.mk
+
include src/modules/Makefile_time.mk
+
+include src/modules/Makefile_bryce_migration.mk
diff --git a/src/modules/Makefile_bryce_migration.mk b/src/modules/Makefile_bryce_migration.mk
new file mode 100644
index 000000000..0fa2d6c44
--- /dev/null
+++ b/src/modules/Makefile_bryce_migration.mk
@@ -0,0 +1,32 @@
+EXTRA_DIST += src/modules/bryce_migration/module.desktop.in
+if USE_MODULE_BRYCE_MIGRATION
+bryce_migrationdir = $(MDIR)/bryce_migration
+bryce_migration_DATA = src/modules/bryce_migration/module.desktop
+
+bryce_migrationpkgdir = $(MDIR)/bryce_migration/$(MODULE_ARCH)
+bryce_migrationpkg_LTLIBRARIES = src/modules/bryce_migration/module.la
+
+src_modules_bryce_migration_module_la_LIBADD = $(MOD_LIBS)
+src_modules_bryce_migration_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
+src_modules_bryce_migration_module_la_LDFLAGS = $(MOD_LDFLAGS)
+src_modules_bryce_migration_module_la_SOURCES = src/modules/bryce_migration/e_mod_main.c
+
+
+internal_bin_PROGRAMS += enlightenment_bryce_migration
+enlightenment_bryce_migration_SOURCES = \
+src/modules/bryce_migration/config_migration.c \
+src/modules/clock/config_descriptor.c \
+src/modules/time/config_descriptor.c \
+src/modules/ibar/config_descriptor.c \
+src/modules/luncher/config_descriptor.c \
+src/bin/e_config_descriptor.c \
+src/bin/e_config_data.c
+enlightenment_bryce_migration_CPPFLAGS = $(E_CPPFLAGS)
+enlightenment_bryce_migration_LDFLAGS = @E_SYS_LIBS@ @EET_LIBS@
+#@EINA_LIBS@ @ECORE_LIBS@ @EET_LIBS@
+
+PHONIES += bryce_migration install-bryce_migration
+bryce_migration: $(bryce_migrationpkg_LTLIBRARIES) $(bryce_migration_DATA)
+install-bryce_migration: install-bryce_migrationDATA install-bryce_migrationpkgLTLIBRARIES
+
+endif
diff --git a/src/modules/bryce_migration/config_migration.c b/src/modules/bryce_migration/config_migration.c
new file mode 100644
index 000000000..0e2c18020
--- /dev/null
+++ b/src/modules/bryce_migration/config_migration.c
@@ -0,0 +1,618 @@
+#include <Eet.h>
+#include <e.h>
+
+#define BRYCE_MIGRATION 1
+
+#include "../time/config_descriptor.h"
+#include "../clock/config_descriptor.h"
+#include "../ibar/config_descriptor.h"
+#include "../luncher/config_descriptor.h"
+
+typedef struct _E_Gadget_Config
+{
+ int id;
+ int zone;
+ const char *type;
+ struct {
+ const char *name;
+ } style;
+ double x;
+ double y;
+ double w;
+ double h;
+} E_Gadget_Config;
+
+typedef struct _E_Gadget_Site
+{
+ E_Gadget_Site_Gravity gravity;
+ E_Gadget_Site_Orient orient;
+ E_Gadget_Site_Anchor anchor;
+ unsigned char autoadd;
+ const char *name;
+ Eina_List *gadgets;
+} E_Gadget_Site;
+
+typedef struct _E_Gadget_Sites
+{
+ Eina_List *sites;
+} E_Gadget_Sites;
+
+typedef struct _Bryce
+{
+ const char *name;
+ const char *style;
+ unsigned int zone;
+ int size;
+ unsigned int layer;
+ unsigned char autosize;
+ unsigned char autohide;
+ E_Gadget_Site_Orient orient;
+ E_Gadget_Site_Anchor anchor;
+ unsigned int version;
+} Bryce;
+
+typedef struct _Bryces
+{
+ Eina_List *bryces;
+} Bryces;
+
+
+
+E_Config *e_config = NULL;
+static E_Gadget_Sites *_sites = NULL;
+static Bryces *_bryces = NULL;
+
+E_Config_DD *e_remember_edd;
+static Eet_Data_Descriptor *_edd_bryces;
+static Eet_Data_Descriptor *_edd_bryce;
+static Eet_Data_Descriptor *_edd_sites;
+static Eet_Data_Descriptor *_edd_gadget_site;
+static Eet_Data_Descriptor *_edd_gadget_config;
+
+static void
+_init(const char *path)
+{
+ Eet_File *f;
+ char buf[PATH_MAX];
+
+ eet_init();
+
+ e_config_descriptor_init(EINA_FALSE);
+ clock_config_descriptor_init();
+ time_config_descriptor_init();
+ ibar_config_descriptor_init();
+ luncher_config_descriptor_init();
+
+ snprintf(buf, sizeof(buf), "%s/e.cfg", path);
+ f = eet_open(buf, EET_FILE_MODE_READ);
+ if (!f)
+ {
+ printf("Can't open config file\n");
+ }
+
+ e_config = eet_data_read(f, e_config_descriptor_get(), "config");
+ if (!e_config)
+ {
+ fprintf(stderr, "Error on loading config file\n");
+ eet_close(f);
+ return;
+ }
+ eet_close(f);
+
+
+}
+
+static void
+_bryce_init(const char *path)
+{
+ Eet_Data_Descriptor_Class eddc_gadget_config, eddc_gadget_site, eddc_sites, eddc_bryce, eddc_bryces;
+ char buf[PATH_MAX];
+ Eet_File *f;
+
+ EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc_gadget_config, E_Gadget_Config);
+ _edd_gadget_config = eet_data_descriptor_stream_new(&eddc_gadget_config);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_config, E_Gadget_Config, "id", id, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_config, E_Gadget_Config, "zone", zone, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_config, E_Gadget_Config, "type", type, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_config, E_Gadget_Config, "style.name", style.name, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_config, E_Gadget_Config, "x", x, EET_T_DOUBLE);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_config, E_Gadget_Config, "y", y, EET_T_DOUBLE);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_config, E_Gadget_Config, "w", w, EET_T_DOUBLE);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_config, E_Gadget_Config, "h", h, EET_T_DOUBLE);
+
+ EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc_gadget_site, E_Gadget_Site);
+ _edd_gadget_site = eet_data_descriptor_stream_new(&eddc_gadget_site);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_site, E_Gadget_Site, "gravity", gravity, EET_T_UINT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_site, E_Gadget_Site, "orient", orient, EET_T_UINT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_site, E_Gadget_Site, "anchor", anchor, EET_T_UINT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_site, E_Gadget_Site, "autoadd", autoadd, EET_T_UCHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_gadget_site, E_Gadget_Site, "name", name, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_LIST(_edd_gadget_site, E_Gadget_Site, "gadgets", gadgets, _edd_gadget_config);
+
+ EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc_sites, E_Gadget_Sites);
+ _edd_sites = eet_data_descriptor_stream_new(&eddc_sites);
+ EET_DATA_DESCRIPTOR_ADD_LIST(_edd_sites, E_Gadget_Sites, "sites", sites, _edd_gadget_site);
+
+ EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc_bryce, Bryce);
+ _edd_bryce = eet_data_descriptor_stream_new(&eddc_bryce);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "name", name, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "style", style, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "zone", zone, EET_T_UINT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "size", size, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "layer", layer, EET_T_UINT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "autosize", autosize, EET_T_UCHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "autohide", autohide, EET_T_UCHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "orient", orient, EET_T_UINT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "anchor", anchor, EET_T_UINT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edd_bryce, Bryce, "version", version, EET_T_UINT);
+
+ EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc_bryces, Bryces);
+ _edd_bryces = eet_data_descriptor_stream_new(&eddc_bryces);
+ EET_DATA_DESCRIPTOR_ADD_LIST(_edd_bryces, Bryces, "bryces", bryces, _edd_bryce);
+
+
+ snprintf(buf, sizeof(buf), "%s/e_gadgets_sites.cfg", path);
+ f = eet_open(buf, EET_FILE_MODE_READ);
+ if (!f)
+ {
+ printf("Can't open config file\n");
+ }
+
+ _sites = eet_data_read(f, _edd_sites, "config");
+ if (!_sites)
+ {
+ fprintf(stderr, "Error on loading config file\n");
+ eet_close(f);
+ return;
+ }
+ eet_close(f);
+
+ printf("gadget site loaded %d\n", eina_list_count(_sites->sites));
+ snprintf(buf, sizeof(buf), "%s/e_bryces.cfg", path);
+ f = eet_open(buf, EET_FILE_MODE_READ);
+ if (!f)
+ {
+ printf("Can't open config file\n");
+ }
+
+ _bryces = eet_data_read(f, _edd_bryces, "config");
+ if (!_bryces)
+ {
+ fprintf(stderr, "Error on loading config bryce file\n");
+ eet_close(f);
+ return;
+ }
+ eet_close(f);
+}
+
+static void
+_bryce_shutdown(const char *path)
+{
+ Eet_File *f;
+ char buf[PATH_MAX];
+
+ snprintf(buf, sizeof(buf), "%s/e_gadgets_sites.cfg", path);
+ f = eet_open(buf, EET_FILE_MODE_READ_WRITE);
+ if (!f)
+ {
+ printf("Can't open config file\n");
+ }
+
+ eet_data_write(f, _edd_sites, "config", _sites, 1);
+ eet_close(f);
+
+ snprintf(buf, sizeof(buf), "%s/e_bryces.cfg", path);
+ f = eet_open(buf, EET_FILE_MODE_READ_WRITE);
+ if (!f)
+ {
+ printf("Can't open config file\n");
+ }
+
+ eet_data_write(f, _edd_bryces, "config", _bryces, 1);
+ eet_close(f);
+}
+
+typedef int (*Migrate_Cb)(const char *path, const char *id);
+
+typedef struct _Bryce_Migration_Module_Compat{
+ const char *shelf;
+ const char *bryce;
+ Migrate_Cb migrate;
+} Bryce_Migration_Module_Compat;
+
+
+static int
+_start_migrate(const char *path, const char *id)
+{
+ return 0;
+}
+
+static int
+_pager_migrate(const char *path, const char *id)
+{
+ return 0;
+}
+
+static int
+_ibar_migrate(const char *path, const char *id)
+{
+ Eet_File *f;
+ Ibar_Config *ibar;
+ Eina_List *l;
+ Ibar_Config_Item *it;
+ Luncher_Config *luncher_config;
+ Luncher_Config_Item *luncher_it;
+ char buf[PATH_MAX];
+
+ snprintf(buf, sizeof(buf), "%s/module.ibar.cfg", path);
+ printf("%s open %s\n", path, buf);
+ f = eet_open(buf, EET_FILE_MODE_READ);
+ ibar = eet_data_read(f, ibar_config_descriptor_get(), "config");
+ eet_close(f);
+
+ EINA_LIST_FOREACH(ibar->items, l, it)
+ {
+ if (it->id == id) break;
+ }
+
+ if (l)
+ {
+ printf("Found Ibar config!\n");
+ printf("Ibar dir %s\n", it->dir);
+ snprintf(buf, sizeof(buf), "%s/module.luncher.cfg", path);
+ f = eet_open(buf, EET_FILE_MODE_READ);
+ luncher_config = eet_data_read(f, luncher_config_descriptor_get(), "config");
+ eet_close(f);
+ luncher_it = calloc(1, sizeof(Luncher_Config_Item));
+ luncher_it->id = eina_list_count(luncher_config->items) + 1;
+ luncher_it->dir = eina_stringshare_ref(it->dir);
+ luncher_it->style = eina_stringshare_add("default");
+ luncher_config->items = eina_list_append(luncher_config->items, luncher_it);
+ f = eet_open(buf, EET_FILE_MODE_READ_WRITE);
+ eet_data_write(f, luncher_config_descriptor_get(), "config",
+ luncher_config, 1);
+ eet_close(f);
+ return luncher_it->id;
+ }
+
+ return -1;
+}
+
+static int
+_clock_migrate(const char *path, const char *id)
+{
+ Eet_File *f, *ff;
+ Clock_Config *clock;
+ Time_Config *time_config;
+ Eina_List *l;
+ Clock_Config_Item *it;
+ Time_Config_Item *time_it;
+ char buf[PATH_MAX];
+
+ snprintf(buf, sizeof(buf), "%s/module.clock.cfg", path);
+ f = eet_open(buf, EET_FILE_MODE_READ);
+ clock = eet_data_read(f, clock_config_descriptor_get(), "config");
+ eet_close(f);
+
+ EINA_LIST_FOREACH(clock->items, l, it)
+ {
+ if (it->id == id) break;
+ }
+ if (l)
+ {
+ snprintf(buf, sizeof(buf), "%s/module.time.cfg", path);
+ ff = eet_open(buf, EET_FILE_MODE_READ);
+ time_config = eet_data_read(ff, time_config_descriptor_get(), "config");
+ eet_close(ff);
+ time_it = calloc(1, sizeof(Time_Config_Item));
+ time_it->id = eina_list_count(time_config->items) + 1;
+ time_it->weekend.start = it->weekend.start;
+ time_it->weekend.len = it->weekend.len;
+ time_it->week.start = it->week.start;
+ time_it->digital_clock = it->digital_clock ? 1 : 0;
+ time_it->digital_24h = it->digital_24h ? 1 : 0;
+ time_it->show_seconds = it->show_seconds ? 1 : 0;
+ time_it->show_date = it->show_date ? 1 : 0;
+ time_it->time_str[0] = eina_stringshare_add("%I:%M");
+ time_it->time_str[1] = eina_stringshare_add("%F");
+
+ time_config->items = eina_list_append(time_config->items, time_it);
+
+ ff = eet_open(buf, EET_FILE_MODE_READ_WRITE);
+ eet_data_write(ff, time_config_descriptor_get(), "config",
+ time_config, 1);
+ eet_close(ff);
+
+ return time_it->id;
+
+ }
+ return -1;
+}
+
+static Bryce_Migration_Module_Compat _compat[] =
+{
+ {"start", "Start", _start_migrate},
+ {"pager", "Pager Gadget", _pager_migrate},
+ {"ibar", "Luncher Bar", _ibar_migrate},
+ {"clock", "Digital Clock", _clock_migrate}
+};
+
+
+
+static void
+_migrate_shelf(const char *path, E_Config_Shelf *shelf, const char *bryce, E_Gadget_Site_Anchor anchor, E_Gadget_Site_Gravity gravity, E_Gadget_Site_Orient orient)
+{
+ Eina_List *l, *ll;
+ E_Config_Gadcon *gc;
+ E_Config_Gadcon_Client *client;
+ int i;
+ int id;
+ E_Gadget_Site *site;
+ E_Gadget_Config *gcfg;
+ char buf[PATH_MAX];
+ Bryce *b;
+
+ site = calloc(1, sizeof(E_Gadget_Site));
+
+ printf("Starting migration %s %s\n", path, shelf->name);
+
+ EINA_LIST_FOREACH(e_config->gadcons, l, gc)
+ {
+ printf("gadcon %s\n", gc->name);
+ if (!strcmp(gc->name, shelf->name))
+ {
+ EINA_LIST_FOREACH(gc->clients, ll, client)
+ {
+ id = -1;
+ for (i = 0; i < (sizeof(_compat) / sizeof(_compat[0])); ++i)
+ {
+ if (!strcmp(_compat[i].shelf, client->name))
+ {
+ id = _compat[i].migrate(path, client->id);
+ break;
+ }
+ }
+ if (id < 0)
+ {
+ printf("Fail to migrate %s\n", client->name);
+ continue;
+ }
+ gcfg = calloc(1, sizeof(E_Gadget_Config));
+ gcfg->id = id;
+ gcfg->type = eina_stringshare_add(_compat[i].bryce);
+ site->gadgets = eina_list_append(site->gadgets, gcfg);
+ }
+ e_config->gadcons = eina_list_remove_list(e_config->gadcons, l);
+ break;
+ }
+ }
+ if (l)
+ {
+ snprintf(buf, sizeof(buf), "__bryce%s", bryce);
+ site->name = eina_stringshare_add(buf);
+ site->gravity = gravity;
+ site->orient = orient;
+ site->anchor = anchor;
+
+ printf("Append %d %d\n", eina_list_count(_sites->sites), eina_list_count(site->gadgets));
+ _sites->sites = eina_list_append(_sites->sites, site);
+ printf("Append %d %d\n", eina_list_count(_sites->sites), eina_list_count(site->gadgets));
+
+ b = calloc(1, sizeof(Bryce));
+ b->name = eina_stringshare_add(bryce);
+ b->style = eina_stringshare_add("default");
+ b->zone = shelf->zone; /* TODO */
+ b->size = 48;
+ b->layer = shelf->layer;
+ b->autosize = !!shelf->fit_along;
+ b->autohide = !!shelf->autohide;
+ b->orient = orient;
+ b->anchor = anchor;
+ b->version = 2;
+ _bryces->bryces = eina_list_append(_bryces->bryces, b);
+ }
+}
+
+static void
+_migrate(const char *path)
+{
+ E_Config_Shelf *shelf;
+ E_Gadget_Site_Orient orient;
+ E_Gadget_Site_Anchor anchor;
+ E_Gadget_Site_Gravity gravity;
+ const char *loc, *loc2;
+ char buf[PATH_MAX];
+ Eet_File *f;
+
+
+
+ EINA_LIST_FREE(e_config->shelves, shelf)
+ {
+ switch(shelf->orient)
+ {
+// case E_GADCON_ORIENT_FLOAT: ???? UNUSED ????
+ case E_GADCON_ORIENT_HORIZ:
+ orient = E_GADGET_SITE_ORIENT_HORIZONTAL;
+ anchor = E_GADGET_SITE_ANCHOR_TOP;
+ break;
+ case E_GADCON_ORIENT_TOP:
+ orient = E_GADGET_SITE_ORIENT_HORIZONTAL;
+ anchor = E_GADGET_SITE_ANCHOR_TOP;
+ break;
+ case E_GADCON_ORIENT_BOTTOM:
+ orient = E_GADGET_SITE_ORIENT_HORIZONTAL;
+ anchor = E_GADGET_SITE_ANCHOR_BOTTOM;
+ break;
+ case E_GADCON_ORIENT_CORNER_TL:
+ orient = E_GADGET_SITE_ORIENT_HORIZONTAL;
+ anchor = E_GADGET_SITE_ANCHOR_TOP | E_GADGET_SITE_ANCHOR_LEFT;
+ break;
+ case E_GADCON_ORIENT_CORNER_TR:
+ orient = E_GADGET_SITE_ORIENT_HORIZONTAL;
+ anchor = E_GADGET_SITE_ANCHOR_TOP | E_GADGET_SITE_ANCHOR_RIGHT;
+ break;
+ case E_GADCON_ORIENT_CORNER_BL:
+ orient = E_GADGET_SITE_ORIENT_HORIZONTAL;
+ anchor = E_GADGET_SITE_ANCHOR_BOTTOM | E_GADGET_SITE_ANCHOR_LEFT;
+ break;
+ case E_GADCON_ORIENT_CORNER_BR:
+ orient = E_GADGET_SITE_ORIENT_HORIZONTAL;
+ anchor = E_GADGET_SITE_ANCHOR_BOTTOM | E_GADGET_SITE_ANCHOR_RIGHT;
+ break;
+ case E_GADCON_ORIENT_VERT:
+ orient = E_GADGET_SITE_ORIENT_VERTICAL;
+ anchor = E_GADGET_SITE_ANCHOR_LEFT;
+ break;
+ case E_GADCON_ORIENT_LEFT:
+ orient = E_GADGET_SITE_ORIENT_VERTICAL;
+ anchor = E_GADGET_SITE_ANCHOR_LEFT;
+ break;
+ case E_GADCON_ORIENT_RIGHT:
+ orient = E_GADGET_SITE_ORIENT_VERTICAL;
+ anchor = E_GADGET_SITE_ANCHOR_RIGHT;
+ break;
+ case E_GADCON_ORIENT_CORNER_LT:
+ orient = E_GADGET_SITE_ORIENT_VERTICAL;
+ anchor = E_GADGET_SITE_ANCHOR_LEFT | E_GADGET_SITE_ANCHOR_TOP;
+ break;
+ case E_GADCON_ORIENT_CORNER_RT:
+ orient = E_GADGET_SITE_ORIENT_VERTICAL;
+ anchor = E_GADGET_SITE_ANCHOR_RIGHT | E_GADGET_SITE_ANCHOR_TOP;
+ break;
+ case E_GADCON_ORIENT_CORNER_LB:
+ orient = E_GADGET_SITE_ORIENT_VERTICAL;
+ anchor = E_GADGET_SITE_ANCHOR_LEFT | E_GADGET_SITE_ANCHOR_BOTTOM;
+ break;
+ case E_GADCON_ORIENT_CORNER_RB:
+ orient = E_GADGET_SITE_ORIENT_VERTICAL;
+ anchor = E_GADGET_SITE_ANCHOR_RIGHT | E_GADGET_SITE_ANCHOR_BOTTOM;
+ break;
+ }
+ if (orient == E_GADGET_SITE_ORIENT_HORIZONTAL)
+ {
+ if (anchor & E_GADGET_SITE_ANCHOR_LEFT)
+ gravity = E_GADGET_SITE_GRAVITY_LEFT;
+ else if (anchor & E_GADGET_SITE_ANCHOR_RIGHT)
+ gravity = E_GADGET_SITE_GRAVITY_RIGHT;
+ else
+ gravity = E_GADGET_SITE_GRAVITY_CENTER;
+ }
+ else
+ {
+ if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+ gravity = E_GADGET_SITE_GRAVITY_TOP;
+ else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+ gravity = E_GADGET_SITE_GRAVITY_BOTTOM;
+ else
+ gravity = E_GADGET_SITE_GRAVITY_CENTER;
+ }
+
+ if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+ loc = "top";
+ else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+ loc = "bottom";
+ else if (anchor & E_GADGET_SITE_ANCHOR_LEFT)
+ loc = "left";
+ else if (anchor & E_GADGET_SITE_ANCHOR_RIGHT)
+ loc = "right";
+ if (anchor & E_GADGET_SITE_ANCHOR_RIGHT)
+ loc2 = "right";
+ else if (anchor & E_GADGET_SITE_ANCHOR_LEFT)
+ loc2 = "left";
+ else if (anchor & E_GADGET_SITE_ANCHOR_TOP)
+ loc2 = "top";
+ else if (anchor & E_GADGET_SITE_ANCHOR_BOTTOM)
+ loc2 = "bottom";
+
+ snprintf(buf, sizeof(buf), "bryce_%s_%s_%d", loc, loc2, shelf->zone);
+
+ _migrate_shelf(path, shelf, buf, anchor, gravity, orient);
+ }
+ snprintf(buf, sizeof(buf), "%s/e.cfg", path);
+ f = eet_open(buf, EET_FILE_MODE_READ_WRITE);
+ if (!f)
+ {
+ printf("Can't open config file\n");
+ }
+
+ eet_data_write(f, e_config_descriptor_get(), "config",
+ e_config, 1);
+ eet_close(f);
+}
+
+static void
+_shutdown(void)
+{
+ clock_config_descriptor_shutdown();
+ time_config_descriptor_shutdown();
+ ibar_config_descriptor_shutdown();
+ luncher_config_descriptor_shutdown();
+ e_config_descriptor_shutdown();
+ eet_shutdown();
+}
+
+static const Ecore_Getopt options =
+{
+ "Bryce migration",
+ "%prog [options]",
+ "0.1",
+ "(C) 2011 Enlightenment, see AUTHORS.",
+ "GPL, see COPYING",
+ "Bryce migration tool",
+ EINA_TRUE,
+ {
+ ECORE_GETOPT_STORE_STR('p', "path", "path of e config"),
+ ECORE_GETOPT_STORE_STR('s', "shelf", "shelf name"),
+ ECORE_GETOPT_STORE_STR('b', "bryce", "bryce name"),
+ ECORE_GETOPT_STORE_UINT('a', "anchor", "anchor position"),
+ ECORE_GETOPT_STORE_UINT('g', "gravity", "gadget gravity"),
+ ECORE_GETOPT_STORE_UINT('o', "orient", "gadget orientation"),
+ ECORE_GETOPT_HELP('h', "help"),
+ ECORE_GETOPT_SENTINEL
+ }
+};
+
+int
+main(int argc, char **argv)
+{
+ int args;
+ char *path;
+ char *shelf;
+ char *bryce;
+ Eina_Bool quit_option;
+ E_Gadget_Site_Gravity gravity;
+ E_Gadget_Site_Orient orient;
+ E_Gadget_Site_Anchor anchor;
+
+ Ecore_Getopt_Value values[] =
+ {
+ ECORE_GETOPT_VALUE_STR(path),
+ ECORE_GETOPT_VALUE_STR(shelf),
+ ECORE_GETOPT_VALUE_STR(bryce),
+ ECORE_GETOPT_VALUE_UINT(anchor),
+ ECORE_GETOPT_VALUE_UINT(gravity),
+ ECORE_GETOPT_VALUE_UINT(orient),
+ ECORE_GETOPT_VALUE_BOOL(quit_option)
+ };
+
+ args = ecore_getopt_parse(&options, values, argc, argv);
+ if (args < 0)
+ return EXIT_FAILURE;
+ if (quit_option)
+ return EXIT_SUCCESS;
+
+
+ printf("Welcome to migration tool\n");
+ _init(path);
+ _bryce_init(path);
+
+ _migrate(path);
+
+ _bryce_shutdown(path);
+ _shutdown();
+
+ return 0;
+}
+
+
+
diff --git a/src/modules/bryce_migration/e_mod_main.c b/src/modules/bryce_migration/e_mod_main.c
new file mode 100644
index 000000000..deeae97a5
--- /dev/null
+++ b/src/modules/bryce_migration/e_mod_main.c
@@ -0,0 +1,181 @@
+#include <e.h>
+
+static Eina_Bool _ask_user_migration(void *data);
+static Eina_Bool _ask_user_valid(void *data);
+static void _migrate_user_cb(void *data, E_Dialog *dia);
+static void _migrate_user_ok_cb(void *data, E_Dialog *dia);
+static void _migrate_user_cancel_cb(void *data, E_Dialog *dia);
+
+typedef enum _Bryce_Migration_Step
+{
+ BRYCE_MIGRATION_ASK = 0,
+ BRYCE_MIGRATION_RUN,
+ BRYCE_MIGRATION_DONE
+} Bryce_Migration_Step;
+
+typedef struct _Config
+{
+ Bryce_Migration_Step step;
+} Config;
+
+static Config *_bryce_migration_config = NULL;
+static E_Config_DD *_conf_edd = NULL;
+
+
+E_API E_Module_Api e_modapi =
+{
+ E_MODULE_API_VERSION,
+ "Bryce migration"
+};
+
+E_API void *
+e_modapi_init(E_Module *m)
+{
+ _conf_edd = E_CONFIG_DD_NEW("Config", Config);
+#undef T
+#undef D
+#define T Config
+#define D _conf_edd
+ E_CONFIG_VAL(D, T, step, UINT);
+ _bryce_migration_config = e_config_domain_load("module.bryce_migration", _conf_edd);
+ if (!_bryce_migration_config)
+ _bryce_migration_config = E_NEW(Config, 1);
+
+
+
+ switch(_bryce_migration_config->step)
+ {
+ case BRYCE_MIGRATION_ASK:
+ ecore_timer_add(1.0, _ask_user_migration, NULL);
+ break;
+ case BRYCE_MIGRATION_RUN:
+ ecore_timer_add(1.0, _ask_user_valid, NULL);
+ break;
+ case BRYCE_MIGRATION_DONE:
+ fprintf(stderr, "migration done\n");
+ break;
+ }
+
+
+ return m;
+}
+
+E_API int
+e_modapi_shutdown(E_Module *m EINA_UNUSED)
+{
+ E_FREE(_bryce_migration_config);
+ return 1;
+}
+
+E_API int
+e_modapi_save(E_Module *m EINA_UNUSED)
+{
+ e_config_domain_save("module.bryce_migration", _conf_edd, _bryce_migration_config);
+ return 1;
+}
+
+static Eina_Bool
+_ask_user_migration(void *data)
+{
+ E_Dialog *dia;
+
+ dia = e_dialog_new(NULL, "E", "_module_bryce_migration");
+
+ e_dialog_title_set(dia, "Bryce Migration");
+ e_dialog_icon_set(dia, "enlightenment", 64);
+ e_dialog_text_set(dia, "Hi, shelf are deprecatede</br>We Will try to update your config to the new gadget container (bryce). Hope this run works well for you !");
+ e_dialog_button_add(dia, _("Migrate"), NULL, _migrate_user_cb, NULL);
+ e_dialog_button_add(dia, _("Later"), NULL, NULL, NULL);
+ elm_win_center(dia->win, 1, 1);
+ e_win_no_remember_set(dia->win, 1);
+ e_dialog_show(dia);
+
+ return ECORE_CALLBACK_CANCEL;
+}
+
+static Eina_Bool
+_ask_user_valid(void *data)
+{
+ E_Dialog *dia;
+
+ dia = e_dialog_new(NULL, "E", "_module_bryce_migration");
+
+ e_dialog_title_set(dia, "Bryce Migration");
+ e_dialog_icon_set(dia, "enlightenment", 64);
+ e_dialog_text_set(dia, _("Would you keep this setup ?"));
+ e_dialog_button_add(dia, _("Keep this config"), NULL, _migrate_user_ok_cb, NULL);
+ e_dialog_button_add(dia, _("Reset to my old Config"), NULL, _migrate_user_cancel_cb, NULL);
+ elm_win_center(dia->win, 1, 1);
+ e_win_no_remember_set(dia->win, 1);
+ e_dialog_show(dia);
+
+ return ECORE_CALLBACK_CANCEL;
+}
+
+
+
+static void
+_migrate_user_cb(void *data, E_Dialog *dia)
+{
+ char buf[4096];
+ char buf2[4096];
+ char cmd[PATH_MAX];
+
+ e_object_del(E_OBJECT(dia));
+ e_user_dir_snprintf(buf, sizeof(buf), "config/%s", e_config_profile_get());
+ e_user_dir_snprintf(buf2, sizeof(buf2), "config/bryce_backup");
+ snprintf(cmd, sizeof(cmd), "rm -rf %s", buf2);
+ fprintf(stderr, "exec -> %s\n", cmd);
+ system(cmd);
+ snprintf(cmd, sizeof(cmd), "/usr/bin/cp -a %s %s", buf, buf2);
+ fprintf(stderr, "exec -> %s\n", cmd);
+ system(cmd);
+ fprintf(stderr, "Backup current profile %s\n", cmd);
+ _bryce_migration_config->step = BRYCE_MIGRATION_RUN;
+ e_config_save();
+ e_config_save_flush();
+ e_config_save_block_set(EINA_TRUE);
+
+ snprintf(cmd, sizeof(cmd),
+ "/usr/lib/enlightenment/utils/enlightenment_bryce_migration "
+ "--path %s ", buf);
+ system(cmd);
+ kill(getpid(), SIGKILL);
+}
+
+static void
+_migrate_user_ok_cb(void *data, E_Dialog *dia)
+{
+ E_Module *m;
+ e_object_del(E_OBJECT(dia));
+ _bryce_migration_config->step = BRYCE_MIGRATION_DONE;
+ m = e_module_find("bryce_migration");
+ e_module_disable(m);
+ e_config_save_queue();
+}
+
+static void
+_migrate_user_cancel_cb(void *data, E_Dialog *dia)
+{
+ char buf[4096];
+ char buf2[4096];
+ char cmd[PATH_MAX];
+
+ _bryce_migration_config->step = BRYCE_MIGRATION_ASK;
+ e_config_save();
+ e_config_save_flush();
+ e_object_del(E_OBJECT(dia));
+ e_config_save_block_set(EINA_TRUE);
+ fprintf(stderr, "Reset config\n");
+ e_user_dir_snprintf(buf, sizeof(buf), "config/%s", e_config_profile_get());
+ e_user_dir_snprintf(buf2, sizeof(buf2), "config/bryce_backup");
+ fprintf(stderr, "exec -> %s\n", cmd);
+ snprintf(cmd, sizeof(cmd), "rm -rf %s", buf);
+ system(cmd);
+ snprintf(cmd, sizeof(cmd), "/usr/bin/cp -a %s %s", buf2, buf);
+ system(cmd);
+ snprintf(cmd, sizeof(cmd), "rm -rf %s", buf2);
+ system(cmd);
+ kill(getpid(), SIGKILL);
+}
+
diff --git a/src/modules/bryce_migration/module.desktop.in b/src/modules/bryce_migration/module.desktop.in
new file mode 100644
index 000000000..8103d8837
--- /dev/null
+++ b/src/modules/bryce_migration/module.desktop.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+Name=Bryce migration
+Comment=Bryce migration wizard
+Icon=e-module-bryce-wizard
+X-Enlightenment-ModuleType=utils