diff --git a/configure.ac b/configure.ac index df4d20618..1f2239c0f 100644 --- a/configure.ac +++ b/configure.ac @@ -609,6 +609,8 @@ src/modules/illume2/Makefile src/modules/illume2/module.desktop src/modules/illume-home/Makefile src/modules/illume-home/module.desktop +src/modules/illume-bar/Makefile +src/modules/illume-bar/module.desktop src/modules/syscon/Makefile src/modules/syscon/module.desktop src/modules/everything/Makefile diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index 54c9b9542..6224f6dd4 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -239,7 +239,7 @@ SUBDIRS += connman endif if USE_MODULE_ILLUME -SUBDIRS += illume illume2 illume-home +SUBDIRS += illume illume2 illume-home illume-bar endif if USE_MODULE_SYSCON diff --git a/src/modules/illume-bar/Makefile.am b/src/modules/illume-bar/Makefile.am new file mode 100644 index 000000000..df86831dd --- /dev/null +++ b/src/modules/illume-bar/Makefile.am @@ -0,0 +1,31 @@ +MAINTAINERCLEANFILES = Makefile.in +MODULE = illume-bar + +# data files for the module +filesdir = $(libdir)/enlightenment/modules/$(MODULE) +files_DATA = \ +e-module-$(MODULE).edj module.desktop + +EXTRA_DIST = $(files_DATA) + +# the module .so file +INCLUDES = -I. \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src/modules/$(MODULE) \ + -I$(top_srcdir)/src/bin \ + -I$(top_srcdir)/src/lib \ + -I$(top_srcdir)/src/modules \ + @e_cflags@ +pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) +pkg_LTLIBRARIES = module.la +module_la_SOURCES = e_mod_main.c \ + e_mod_main.h \ + e_mod_config.c \ + e_mod_config.h + +module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LDFLAGS = -module -avoid-version +module_la_DEPENDENCIES = $(top_builddir)/config.h + +uninstall: + rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE) diff --git a/src/modules/illume-bar/e-module-illume-bar.edj b/src/modules/illume-bar/e-module-illume-bar.edj new file mode 100644 index 000000000..7cd4ac3ef Binary files /dev/null and b/src/modules/illume-bar/e-module-illume-bar.edj differ diff --git a/src/modules/illume-bar/e_mod_config.c b/src/modules/illume-bar/e_mod_config.c new file mode 100644 index 000000000..f8c09acb2 --- /dev/null +++ b/src/modules/illume-bar/e_mod_config.c @@ -0,0 +1,42 @@ +#include "e.h" +#include "e_mod_main.h" +#include "e_mod_config.h" + +EAPI Il_Bar_Config *il_bar_cfg = NULL; +static E_Config_DD *conf_edd = NULL; + +/* public functions */ +EAPI int +il_bar_config_init(E_Module *m) +{ + conf_edd = E_CONFIG_DD_NEW("Illume-Bar_Cfg", Il_Bar_Config); + #undef T + #undef D + #define T Il_Bar_Config + #define D conf_edd + E_CONFIG_VAL(D, T, version, INT); + + return 1; +} + +EAPI int +il_bar_config_shutdown(void) +{ + E_FREE(il_bar_cfg); + il_bar_cfg = NULL; + + E_CONFIG_DD_FREE(conf_edd); + return 1; +} + +EAPI int +il_bar_config_save(void) +{ + return 1; +} + +EAPI void +il_bar_config_show(E_Container *con, const char *params) +{ + +} diff --git a/src/modules/illume-bar/e_mod_config.h b/src/modules/illume-bar/e_mod_config.h new file mode 100644 index 000000000..030ce9e32 --- /dev/null +++ b/src/modules/illume-bar/e_mod_config.h @@ -0,0 +1,20 @@ +#ifndef E_MOD_CONFIG_H +#define E_MOD_CONFIG_H + +#define IL_CONFIG_MIN 0 +#define IL_CONFIG_MAJ 0 + +typedef struct _Il_Bar_Config Il_Bar_Config; +struct _Il_Bar_Config +{ + int version; +}; + +EAPI int il_bar_config_init(E_Module *m); +EAPI int il_bar_config_shutdown(void); +EAPI int il_bar_config_save(void); +EAPI void il_bar_config_show(E_Container *con, const char *params); + +extern EAPI Il_Bar_Config *il_bar_cfg; + +#endif diff --git a/src/modules/illume-bar/e_mod_main.c b/src/modules/illume-bar/e_mod_main.c new file mode 100644 index 000000000..41c123184 --- /dev/null +++ b/src/modules/illume-bar/e_mod_main.c @@ -0,0 +1,27 @@ +#include "e.h" +#include "e_mod_main.h" +#include "e_mod_config.h" + +EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Illume-Bar" }; + +/* public functions */ +EAPI void * +e_modapi_init(E_Module *m) +{ + if (!il_bar_config_init(m)) return NULL; + + return m; +} + +EAPI int +e_modapi_shutdown(E_Module *m) +{ + il_bar_config_shutdown(); + return 1; +} + +EAPI int +e_modapi_save(E_Module *m) +{ + return il_bar_config_save(); +} diff --git a/src/modules/illume-bar/e_mod_main.h b/src/modules/illume-bar/e_mod_main.h new file mode 100644 index 000000000..f884cc0aa --- /dev/null +++ b/src/modules/illume-bar/e_mod_main.h @@ -0,0 +1,10 @@ +#ifndef E_MOD_MAIN_H +#define E_MOD_MAIN_H + +EAPI extern E_Module_Api e_modapi; + +EAPI void *e_modapi_init(E_Module *m); +EAPI int e_modapi_shutdown(E_Module *m); +EAPI int e_modapi_save(E_Module *m); + +#endif diff --git a/src/modules/illume-bar/module.desktop.in b/src/modules/illume-bar/module.desktop.in new file mode 100644 index 000000000..5fe54ee91 --- /dev/null +++ b/src/modules/illume-bar/module.desktop.in @@ -0,0 +1,6 @@ +[Desktop Entry] +Type=Link +Name=Illume-Bar +Icon=e-module-illume-bar +X-Enlightenment-ModuleType=system +Comment=Illume Home for Embedded diff --git a/src/modules/illume2/e_mod_layout_illume.c b/src/modules/illume2/e_mod_layout_illume.c index 54a9ca589..92bfbb7cb 100644 --- a/src/modules/illume2/e_mod_layout_illume.c +++ b/src/modules/illume2/e_mod_layout_illume.c @@ -6,21 +6,25 @@ static void _border_add(E_Border *bd) { // handle a border being added + printf("Border Add\n"); } static void _border_del(E_Border *bd) { // handle a border being deleted + printf("Border Del\n"); } static void _border_focus_in(E_Border *bd) { // do something if focus enters a window + printf("Border Focus In\n"); } static void _border_focus_out(E_Border *bd) { // do something if the rfocus exits a window + printf("Border Focus Out\n"); } static void