From: Enlightenment S. <no-...@en...> - 2009-11-23 17:27:04
|
Log: Add config for illume2 module (for kbd slide duration, etc). Author: devilhorns Date: 2009-11-23 09:26:51 -0800 (Mon, 23 Nov 2009) New Revision: 43932 Added: trunk/e/src/modules/illume2/e_mod_config.c trunk/e/src/modules/illume2/e_mod_config.h Modified: trunk/e/src/modules/illume2/Makefile.am trunk/e/src/modules/illume2/e_kbd.c trunk/e/src/modules/illume2/e_mod_main.c Modified: trunk/e/src/modules/illume2/Makefile.am =================================================================== --- trunk/e/src/modules/illume2/Makefile.am 2009-11-23 17:20:19 UTC (rev 43931) +++ trunk/e/src/modules/illume2/Makefile.am 2009-11-23 17:26:51 UTC (rev 43932) @@ -18,14 +18,16 @@ @e_cflags@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la -module_la_SOURCES = e_mod_main.c \ - e_mod_main.h \ +module_la_SOURCES = e_mod_main.h \ + e_mod_main.c \ e_mod_layout.h \ e_mod_layout.c \ + e_mod_layout_illume.h \ e_mod_layout_illume.c \ - e_mod_layout_illume.h \ e_kbd.h \ - e_kbd.c + e_kbd.c \ + e_mod_config.h \ + e_mod_config.c module_la_LIBADD = @e_libs@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version Modified: trunk/e/src/modules/illume2/e_kbd.c =================================================================== --- trunk/e/src/modules/illume2/e_kbd.c 2009-11-23 17:20:19 UTC (rev 43931) +++ trunk/e/src/modules/illume2/e_kbd.c 2009-11-23 17:26:51 UTC (rev 43932) @@ -1,6 +1,7 @@ #include "e.h" #include "e_kbd.h" #include "e_mod_layout.h" +#include "e_mod_config.h" static Eina_List *handlers = NULL; static Eina_List *kbds = NULL; @@ -133,8 +134,7 @@ _e_kbd_hide(E_Kbd *kbd) { if (kbd->visible) return; -#if 0 - if (illume_cfg->sliding.kbd.duration <= 0) + if (il_cfg->sliding.kbd.duration <= 0) { _e_kbd_border_hide(kbd->border); kbd->actually_visible = kbd->visible; @@ -142,8 +142,7 @@ _e_kbd_layout_send(kbd); } else - _e_kbd_slide(kbd, 0, (double)illume_cfg->sliding.kbd.duration / 1000.0); -#endif + _e_kbd_slide(kbd, 0, (double)il_cfg->sliding.kbd.duration / 1000.0); } static int @@ -1023,8 +1022,7 @@ if (kbd->disabled) return; kbd->actually_visible = kbd->visible; _e_kbd_layout_send(kbd); -#if 0 - if (illume_cfg->sliding.kbd.duration <= 0) + if (il_cfg->sliding.kbd.duration <= 0) { if (kbd->border) { @@ -1041,9 +1039,8 @@ e_border_fx_offset(kbd->border, 0, kbd->border->h - kbd->adjust); _e_kbd_border_show(kbd, kbd->border); } - _e_kbd_slide(kbd, 1, (double)illume_cfg->sliding.kbd.duration / 1000.0); + _e_kbd_slide(kbd, 1, (double)il_cfg->sliding.kbd.duration / 1000.0); } -#endif } EAPI void Modified: trunk/e/src/modules/illume2/e_mod_main.c =================================================================== --- trunk/e/src/modules/illume2/e_mod_main.c 2009-11-23 17:20:19 UTC (rev 43931) +++ trunk/e/src/modules/illume2/e_mod_main.c 2009-11-23 17:26:51 UTC (rev 43932) @@ -1,5 +1,6 @@ #include "e.h" #include "e_mod_main.h" +#include "e_mod_config.h" #include "e_mod_layout.h" #include "e_kbd.h" @@ -13,9 +14,15 @@ EAPI void * e_modapi_init(E_Module *m) { + /* init the config system */ + if (!il_config_init(m)) return NULL; + /* set up the virtual keyboard */ e_kbd_init(m); + + /* init the layout system */ e_mod_layout_init(m); + return m; /* return NULL on failure, anything else on success. the pointer * returned will be set as m->data for convenience tracking */ } @@ -26,6 +33,7 @@ { e_mod_layout_shutdown(); e_kbd_shutdown(); + il_config_shutdown(); return 1; /* 1 for success, 0 for failure */ } @@ -33,5 +41,5 @@ EAPI int e_modapi_save(E_Module *m) { - return 1; /* 1 for success, 0 for failure */ + return il_config_save(); } |