From: Enlightenment S. <no-...@en...> - 2010-08-25 03:42:57
|
Log: Add start of notification support. Author: devilhorns Date: 2010-08-24 20:42:50 -0700 (Tue, 24 Aug 2010) New Revision: 51629 Modified: trunk/e/src/modules/illume-indicator/Makefile.am trunk/e/src/modules/illume-indicator/e_mod_ind_win.c trunk/e/src/modules/illume-indicator/e_mod_main.c trunk/e/src/modules/illume-indicator/e_mod_main.h Modified: trunk/e/src/modules/illume-indicator/Makefile.am =================================================================== --- trunk/e/src/modules/illume-indicator/Makefile.am 2010-08-25 03:42:28 UTC (rev 51628) +++ trunk/e/src/modules/illume-indicator/Makefile.am 2010-08-25 03:42:50 UTC (rev 51629) @@ -24,7 +24,7 @@ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ @ENOTIFY_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la @@ -37,7 +37,7 @@ e_mod_main.c \ e_mod_main.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @ENOTIFY_LIBS@ @dlopen_libs@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h Modified: trunk/e/src/modules/illume-indicator/e_mod_ind_win.c =================================================================== --- trunk/e/src/modules/illume-indicator/e_mod_ind_win.c 2010-08-25 03:42:28 UTC (rev 51628) +++ trunk/e/src/modules/illume-indicator/e_mod_ind_win.c 2010-08-25 03:42:50 UTC (rev 51629) @@ -189,7 +189,8 @@ ev = event; if (!(iwin = data)) return ECORE_CALLBACK_PASS_ON; - if (ev->win != iwin->win->container->manager->root) return ECORE_CALLBACK_PASS_ON; + if (ev->win != iwin->win->container->manager->root) + return ECORE_CALLBACK_PASS_ON; if (ev->atom != ATM_ENLIGHTENMENT_SCALE) return ECORE_CALLBACK_PASS_ON; /* set minimum size of this window */ Modified: trunk/e/src/modules/illume-indicator/e_mod_main.c =================================================================== --- trunk/e/src/modules/illume-indicator/e_mod_main.c 2010-08-25 03:42:28 UTC (rev 51628) +++ trunk/e/src/modules/illume-indicator/e_mod_main.c 2010-08-25 03:42:50 UTC (rev 51629) @@ -32,6 +32,21 @@ return NULL; } +#ifdef HAVE_ENOTIFY + /* init notification subsystem */ + if (!e_notification_init()) + { + /* shutdown config */ + il_ind_config_shutdown(); + + /* clear module directory variable */ + if (_ind_mod_dir) eina_stringshare_del(_ind_mod_dir); + _ind_mod_dir = NULL; + + return NULL; + } +#endif + /* loop through the managers (root windows) */ EINA_LIST_FOREACH(e_manager_list(), ml, man) { @@ -44,6 +59,9 @@ E_Zone *zone; Eina_List *zl; + /* TODO: Make this configurable so illume2 can be run + * on just one zone/screen/etc */ + /* for each zone, create an indicator window */ EINA_LIST_FOREACH(con->zones, zl, zone) { @@ -72,6 +90,11 @@ ecore_x_e_illume_indicator_geometry_set(ecore_x_window_root_first_get(), 0, 0, 0, 0); +#ifdef HAVE_ENOTIFY + /* shutdown notification subsystem */ + e_notification_shutdown(); +#endif + /* shutdown config */ il_ind_config_shutdown(); Modified: trunk/e/src/modules/illume-indicator/e_mod_main.h =================================================================== --- trunk/e/src/modules/illume-indicator/e_mod_main.h 2010-08-25 03:42:28 UTC (rev 51628) +++ trunk/e/src/modules/illume-indicator/e_mod_main.h 2010-08-25 03:42:50 UTC (rev 51629) @@ -1,6 +1,10 @@ #ifndef E_MOD_MAIN_H # define E_MOD_MAIN_H +# ifdef HAVE_ENOTIFY +# include <E_Notify.h> +# endif + EAPI extern E_Module_Api e_modapi; EAPI void *e_modapi_init(E_Module *m); |