# if ecore-txt isn't available.
PKG_CHECK_MODULES(ECORE_TXT, ecore-txt)
-e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "
-e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "
-AC_SUBST(e_libs)
-AC_SUBST(e_cflags)
-
PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no)
PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no)
+
+# this is used to conditionally build modules which depend on E_DBUS
+AM_CONDITIONAL(HAVE_EDBUS, test x$have_edbus = "xyes")
if test x$have_edbus = "xyes"; then
if test x$have_ehal = "xyes"; then
AC_DEFINE(HAVE_EDBUS, 1, [E_Dbus support])
fi
fi
+e_libs=$E_LIBS" "$LIBINTL" "$fnmatch_libs" "
+e_cflags="-DUSE_E_CONFIG_H "$E_CFLAGS" "$E_DBUS_CFLAGS" "
+AC_SUBST(e_libs)
+AC_SUBST(e_cflags)
+
profile="SLOW_PC"
AC_ARG_WITH(profile,
[ --with-profile=TARGET_PROFILE specify a target format profile of:
src/modules/conf_imc/module.desktop
src/modules/conf_profiles/Makefile
src/modules/conf_profiles/module.desktop
+src/modules/msgbus_lang/Makefile
+src/modules/msgbus_lang/module.desktop
src/modules/conf_engine/Makefile
src/modules/conf_engine/module.desktop
src/modules/conf_applications/Makefile
enlightenment_sys
enlightenment_thumb
enlightenment_fm
+enlightenment_init
e_path.h \
e_init.h \
e_ipc.h \
+e_msgbus.h \
e_error.h \
e_container.h \
e_zone.h \
e_exec.h \
e_widget_font_preview.h \
e_fm_custom.h \
-e_fm_shared.h
-
+e_fm_shared.h \
+e_config_data.h \
+e_intl_data.h
+
enlightenment_src = \
e_user.c \
e_manager.c \
e_path.c \
e_init.c \
e_ipc.c \
+e_msgbus.c \
e_error.c \
e_container.c \
e_zone.c \
e_border.c \
e_pointer.c \
e_config.c \
+e_config_data.c \
e_menu.c \
e_object.c \
e_icon.c \
e_test.c \
e_font.c \
e_intl.c \
+e_intl_data.c \
e_theme.c \
e_dnd.c \
e_bindings.c \
e_main.c \
$(enlightenment_src)
-enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@
+enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@
enlightenment_remote_SOURCES = \
e.h \
enlightenment_imc_SOURCES = \
e.h \
-e_imc_main.c \
-$(enlightenment_src)
+e_intl_data.c \
+e_config_data.c \
+e_imc_main.c
+# $(enlightenment_src)
enlightenment_imc_LDFLAGS = @e_libs@ @dlopen_libs@
e_sha1.c
enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @E_HAL_LIBS@
-enlightenment_fm_CFLAGS = $(INCLUDES) @E_DBUS_CFLAGS@ @E_HAL_CFLAGS@
+enlightenment_fm_CFLAGS = $(INCLUDES) @E_HAL_CFLAGS@
enlightenment_sys_SOURCES = \
e_sys_main.c
#include <Edje.h>
#include <Efreet.h>
#include <Efreet_Mime.h>
+#ifdef HAVE_EDBUS
+#include <E_DBus.h>
+#endif
#if HAVE___ATTRIBUTE__
#define __UNUSED__ __attribute__((unused))
return 1;
}
-EAPI E_Config_DD *
-e_config_descriptor_new(const char *name, int size)
-{
- Eet_Data_Descriptor_Class eddc;
-
- eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
- eddc.func.mem_alloc = NULL;
- eddc.func.mem_free = NULL;
- eddc.func.str_alloc = (char *(*)(const char *)) evas_stringshare_add;
- eddc.func.str_free = (void (*)(const char *)) evas_stringshare_del;
- eddc.func.list_next = (void *(*)(void *)) evas_list_next;
- eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
- eddc.func.list_data = (void *(*)(void *)) evas_list_data;
- eddc.func.list_free = (void *(*)(void *)) evas_list_free;
- eddc.func.hash_foreach =
- (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
- evas_hash_foreach;
- eddc.func.hash_add = (void *(*) (void *, const char *, void *)) evas_hash_add;
- eddc.func.hash_free = (void (*) (void *)) evas_hash_free;
- eddc.name = name;
- eddc.size = size;
- return (E_Config_DD *)eet_data_descriptor2_new(&eddc);
-}
-
EAPI int
e_config_save(void)
{
*/
#ifdef E_TYPEDEFS
-#define E_CONFIG_DD_NEW(str, typ) \
- e_config_descriptor_new(str, sizeof(typ))
-#define E_CONFIG_DD_FREE(eed) if (eed) { eet_data_descriptor_free((eed)); (eed) = NULL; }
-#define E_CONFIG_VAL(edd, type, member, dtype) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, type, #member, member, dtype)
-#define E_CONFIG_SUB(edd, type, member, eddtype) EET_DATA_DESCRIPTOR_ADD_SUB(edd, type, #member, member, eddtype)
-#define E_CONFIG_LIST(edd, type, member, eddtype) EET_DATA_DESCRIPTOR_ADD_LIST(edd, type, #member, member, eddtype)
-#define E_CONFIG_HASH(edd, type, member, eddtype) EET_DATA_DESCRIPTOR_ADD_HASH(edd, type, #member, member, eddtype)
-
-#define CHAR EET_T_CHAR
-#define SHORT EET_T_SHORT
-#define INT EET_T_INT
-#define LL EET_T_LONG_LONG
-#define FLOAT EET_T_FLOAT
-#define DOUBLE EET_T_DOUBLE
-#define UCHAR EET_T_UCHAR
-#define USHORT EET_T_USHORT
-#define UINT EET_T_UINT
-#define ULL EET_T_ULONG_LONG
-#define STR EET_T_STRING
-
#define E_CONFIG_LIMIT(v, min, max) {if (v > max) v = max; else if (v < min) v = min;}
typedef struct _E_Config E_Config;
typedef struct _E_Event_Config_Icon_Theme E_Event_Config_Icon_Theme;
-typedef Eet_Data_Descriptor E_Config_DD;
-
#else
#ifndef E_CONFIG_H
#define E_CONFIG_H
EAPI int e_config_init(void);
EAPI int e_config_shutdown(void);
-EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size);
-
EAPI int e_config_save(void);
EAPI void e_config_save_flush(void);
EAPI void e_config_save_queue(void);
--- /dev/null
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+
+EAPI E_Config_DD *
+e_config_descriptor_new(const char *name, int size)
+{
+ Eet_Data_Descriptor_Class eddc;
+
+ eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
+ eddc.func.mem_alloc = NULL;
+ eddc.func.mem_free = NULL;
+ eddc.func.str_alloc = (char *(*)(const char *)) evas_stringshare_add;
+ eddc.func.str_free = (void (*)(const char *)) evas_stringshare_del;
+ eddc.func.list_next = (void *(*)(void *)) evas_list_next;
+ eddc.func.list_append = (void *(*)(void *l, void *d)) evas_list_append;
+ eddc.func.list_data = (void *(*)(void *)) evas_list_data;
+ eddc.func.list_free = (void *(*)(void *)) evas_list_free;
+ eddc.func.hash_foreach =
+ (void (*) (void *, int (*) (void *, const char *, void *, void *), void *))
+ evas_hash_foreach;
+ eddc.func.hash_add = (void *(*) (void *, const char *, void *)) evas_hash_add;
+ eddc.func.hash_free = (void (*) (void *)) evas_hash_free;
+ eddc.name = name;
+ eddc.size = size;
+ return (E_Config_DD *)eet_data_descriptor2_new(&eddc);
+}
+
--- /dev/null
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+#define E_CONFIG_DD_NEW(str, typ) \
+ e_config_descriptor_new(str, sizeof(typ))
+#define E_CONFIG_DD_FREE(eed) if (eed) { eet_data_descriptor_free((eed)); (eed) = NULL; }
+#define E_CONFIG_VAL(edd, type, member, dtype) EET_DATA_DESCRIPTOR_ADD_BASIC(edd, type, #member, member, dtype)
+#define E_CONFIG_SUB(edd, type, member, eddtype) EET_DATA_DESCRIPTOR_ADD_SUB(edd, type, #member, member, eddtype)
+#define E_CONFIG_LIST(edd, type, member, eddtype) EET_DATA_DESCRIPTOR_ADD_LIST(edd, type, #member, member, eddtype)
+#define E_CONFIG_HASH(edd, type, member, eddtype) EET_DATA_DESCRIPTOR_ADD_HASH(edd, type, #member, member, eddtype)
+
+#define CHAR EET_T_CHAR
+#define SHORT EET_T_SHORT
+#define INT EET_T_INT
+#define LL EET_T_LONG_LONG
+#define FLOAT EET_T_FLOAT
+#define DOUBLE EET_T_DOUBLE
+#define UCHAR EET_T_UCHAR
+#define USHORT EET_T_USHORT
+#define UINT EET_T_UINT
+#define ULL EET_T_ULONG_LONG
+#define STR EET_T_STRING
+
+typedef Eet_Data_Descriptor E_Config_DD;
+
+#else
+#ifndef E_CONFIG_H
+#define E_CONFIG_H
+
+EAPI E_Config_DD *e_config_descriptor_new(const char *name, int size);
+
+#endif
+#endif
if ((!e_storage_find(ic->info.link)) &&
(!e_volume_find(ic->info.link)))
{
- printf("REMOVE IT\n");
+ printf("REMOVE IT %s\n", ic->info.file);
_e_fm2_live_file_del(ic->sd->obj, ic->info.file);
efreet_desktop_free(desktop);
goto error;
}
eet_init();
- e_intl_init();
+ e_intl_data_init();
if (write_ops != 0 && ecore_file_exists(file))
{
e_intl_input_method_config_free(read_imc);
E_FREE(write_imc);
eet_close(ef);
- e_intl_shutdown();
+ e_intl_data_shutdown();
eet_shutdown();
/* just return 0 to keep the compiler quiet */
return 0;
#include "e_border.h"
#include "e_pointer.h"
#include "e_config.h"
+#include "e_config_data.h"
#include "e_menu.h"
#include "e_icon.h"
#include "e_box.h"
#include "e_layout.h"
#include "e_font.h"
#include "e_intl.h"
+#include "e_intl_data.h"
#include "e_theme.h"
#include "e_dnd.h"
#include "e_bindings.h"
#include "e_exec.h"
#include "e_widget_font_preview.h"
#include "e_fm_custom.h"
+#include "e_msgbus.h"
static const char *_e_intl_imc_personal_path = NULL;
static const char *_e_intl_imc_system_path = NULL;
-static Eet_Data_Descriptor *_e_intl_input_method_config_edd = NULL;
-
#define E_EXE_STOP(EXE) if (EXE != NULL) { ecore_exe_terminate(EXE); ecore_exe_free(EXE); EXE = NULL; }
#define E_EXE_IS_VALID(EXE) (!((EXE == NULL) || (EXE[0] == 0)))
{
char *s;
- _e_intl_input_method_config_edd = E_CONFIG_DD_NEW("input_method_config", E_Input_Method_Config);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, version, INT);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, e_im_name, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, gtk_im_module, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, qt_im_module, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, xmodifiers, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, e_im_exec, STR);
- E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, e_im_setup_exec, STR);
+ e_intl_data_init();
if ((s = getenv("LC_MESSAGES"))) _e_intl_orig_lc_messages = strdup(s);
if ((s = getenv("LANGUAGE"))) _e_intl_orig_language = strdup(s);
if (_e_intl_imc_system_path)
evas_stringshare_del(_e_intl_imc_system_path);
- E_CONFIG_DD_FREE(_e_intl_input_method_config_edd);
+ e_intl_data_shutdown();
return 1;
}
}
-/* Get the input method configuration from the file */
-EAPI E_Input_Method_Config *
-e_intl_input_method_config_read(Eet_File *imc_file)
-{
- E_Input_Method_Config *imc;
-
- imc = NULL;
- if (imc_file)
- {
- imc = (E_Input_Method_Config *) eet_data_read(imc_file, _e_intl_input_method_config_edd, "imc");
- }
- return imc;
-}
-
-/* Write the input method configuration to the file */
-EAPI int
-e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc)
-{
- int ok = 0;
-
- if (imc_file)
- {
- ok = eet_data_write(imc_file, _e_intl_input_method_config_edd, "imc", imc, 0);
- }
- return ok;
-}
-
-EAPI void
-e_intl_input_method_config_free(E_Input_Method_Config *imc)
-{
- if (imc != NULL)
- {
- if (imc->e_im_name) evas_stringshare_del(imc->e_im_name);
- if (imc->gtk_im_module) evas_stringshare_del(imc->gtk_im_module);
- if (imc->qt_im_module) evas_stringshare_del(imc->qt_im_module);
- if (imc->xmodifiers) evas_stringshare_del(imc->xmodifiers);
- if (imc->e_im_exec) evas_stringshare_del(imc->e_im_exec);
- if (imc->e_im_setup_exec) evas_stringshare_del(imc->e_im_setup_exec);
- E_FREE(imc);
- }
-}
-
static int
_e_intl_cb_exit(void *data, int type, void *event)
{
*/
#define N_(str) (str)
-typedef struct _E_Input_Method_Config E_Input_Method_Config;
-typedef struct _E_Language_Pack E_Language_Pack;
typedef struct _E_Locale_Parts E_Locale_Parts;
#else
#ifndef E_INTL_H
#define E_INTL_H
-#define E_INTL_LANGUAGE_PACK_VERSION 1
-#define E_INTL_INPUT_METHOD_CONFIG_VERSION 2
-
#define E_INTL_LOC_CODESET 1 << 0
#define E_INTL_LOC_REGION 1 << 1
#define E_INTL_LOC_MODIFIER 1 << 2
#define E_INTL_LOC_LANG 1 << 3
-struct _E_Language_Pack
-{
- int language_pack_version;
- char *language_pack_name;
- char *language;
- char *input_method;
- Evas_List *font_fallbacks;
-};
-
-struct _E_Input_Method_Config
-{
- int version;
- const char *e_im_name;
- const char *gtk_im_module;
- const char *qt_im_module;
- const char *xmodifiers;
- const char *e_im_exec;
- const char *e_im_setup_exec;
-};
-
struct _E_Locale_Parts
{
int mask;
EAPI void e_intl_input_method_set(const char *method);
EAPI const char *e_intl_input_method_get(void);
EAPI Evas_List *e_intl_input_method_list(void);
-EAPI E_Input_Method_Config *e_intl_input_method_config_read (Eet_File *imc_file);
-EAPI int e_intl_input_method_config_write (Eet_File *imc_file, E_Input_Method_Config *imc);
-EAPI void e_intl_input_method_config_free (E_Input_Method_Config *imc);
EAPI const char *e_intl_imc_personal_path_get(void);
EAPI const char *e_intl_imc_system_path_get(void);
--- /dev/null
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+
+/* This file is the counterpart for data storage of e_intl */
+/* This only needs to be separate because the e_imc binary and other third parties
+ many waht to include the functionality to read IMC data from EET files
+ */
+static Eet_Data_Descriptor *_e_intl_input_method_config_edd = NULL;
+
+EAPI int
+e_intl_data_init(void)
+{
+ _e_intl_input_method_config_edd = E_CONFIG_DD_NEW("input_method_config", E_Input_Method_Config);
+ E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, version, INT);
+ E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, e_im_name, STR);
+ E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, gtk_im_module, STR);
+ E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, qt_im_module, STR);
+ E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, xmodifiers, STR);
+ E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, e_im_exec, STR);
+ E_CONFIG_VAL(_e_intl_input_method_config_edd, E_Input_Method_Config, e_im_setup_exec, STR);
+
+ return 1;
+}
+
+EAPI int
+e_intl_data_shutdown(void)
+{
+ E_CONFIG_DD_FREE(_e_intl_input_method_config_edd);
+
+ return 1;
+}
+
+
+/* Get the input method configuration from the file */
+EAPI E_Input_Method_Config *
+e_intl_input_method_config_read(Eet_File *imc_file)
+{
+ E_Input_Method_Config *imc;
+
+ imc = NULL;
+ if (imc_file)
+ {
+ imc = (E_Input_Method_Config *) eet_data_read(imc_file, _e_intl_input_method_config_edd, "imc");
+ }
+ return imc;
+}
+
+/* Write the input method configuration to the file */
+EAPI int
+e_intl_input_method_config_write(Eet_File *imc_file, E_Input_Method_Config *imc)
+{
+ int ok = 0;
+
+ if (imc_file)
+ {
+ ok = eet_data_write(imc_file, _e_intl_input_method_config_edd, "imc", imc, 0);
+ }
+ return ok;
+}
+
+EAPI void
+e_intl_input_method_config_free(E_Input_Method_Config *imc)
+{
+ if (imc != NULL)
+ {
+ if (imc->e_im_name) evas_stringshare_del(imc->e_im_name);
+ if (imc->gtk_im_module) evas_stringshare_del(imc->gtk_im_module);
+ if (imc->qt_im_module) evas_stringshare_del(imc->qt_im_module);
+ if (imc->xmodifiers) evas_stringshare_del(imc->xmodifiers);
+ if (imc->e_im_exec) evas_stringshare_del(imc->e_im_exec);
+ if (imc->e_im_setup_exec) evas_stringshare_del(imc->e_im_setup_exec);
+ E_FREE(imc);
+ }
+}
+
--- /dev/null
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+typedef struct _E_Input_Method_Config E_Input_Method_Config;
+
+#else
+#ifndef E_INTL_DATA_H
+#define E_INTL_DATA_H
+
+#define E_INTL_INPUT_METHOD_CONFIG_VERSION 2
+
+struct _E_Input_Method_Config
+{
+ int version;
+ const char *e_im_name;
+ const char *gtk_im_module;
+ const char *qt_im_module;
+ const char *xmodifiers;
+ const char *e_im_exec;
+ const char *e_im_setup_exec;
+};
+
+EAPI int e_intl_data_init(void);
+EAPI int e_intl_data_shutdown(void);
+EAPI E_Input_Method_Config *e_intl_input_method_config_read (Eet_File *imc_file);
+EAPI int e_intl_input_method_config_write (Eet_File *imc_file, E_Input_Method_Config *imc);
+EAPI void e_intl_input_method_config_free (E_Input_Method_Config *imc);
+#endif
+#endif
/* setup e ipc service */
if (e_ipc_init())
_e_main_shutdown_push(e_ipc_shutdown);
-
+
+ TS("msgbus");
+ /* setup e msgbus (DBUS) service */
+ if (e_msgbus_init())
+ _e_main_shutdown_push(e_msgbus_shutdown);
+
/* setup edje to animate @ e_config->framerate frames per sec. */
edje_frametime_set(1.0 / e_config->framerate);
--- /dev/null
+#include "e.h"
+
+/* local subsystem functions */
+#ifdef HAVE_EDBUS
+static void _e_msgbus_request_name_cb(void *data, DBusMessage *msg, DBusError *err);
+
+static DBusMessage* _e_msgbus_core_restart_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_core_shutdown_cb(E_DBus_Object *obj, DBusMessage *msg);
+
+static DBusMessage* _e_msgbus_module_load_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_module_unload_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_module_enable_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg);
+
+static DBusMessage* _e_msgbus_profile_set_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_profile_add_cb(E_DBus_Object *obj, DBusMessage *msg);
+static DBusMessage* _e_msgbus_profile_delete_cb(E_DBus_Object *obj, DBusMessage *msg);
+#endif
+
+/* local subsystem globals */
+static E_Msgbus_Data *_e_msgbus_data = NULL;
+
+/* externally accessible functions */
+EAPI int
+e_msgbus_init(void)
+{
+#ifdef HAVE_EDBUS
+ E_DBus_Interface *iface;
+
+ _e_msgbus_data = E_NEW(E_Msgbus_Data, 1);
+
+ e_dbus_init();
+
+ _e_msgbus_data->conn = e_dbus_bus_get(DBUS_BUS_SESSION);
+ e_dbus_request_name(_e_msgbus_data->conn, "org.enlighenment.wm.service", 0, _e_msgbus_request_name_cb, NULL);
+ _e_msgbus_data->obj = e_dbus_object_add(_e_msgbus_data->conn, "/org/enlightenment/wm/RemoteObject", NULL);
+
+ iface = e_dbus_interface_new("org.enlightenment.wm.Core");
+ if (!iface) return 0;
+ e_dbus_object_interface_attach(_e_msgbus_data->obj, iface);
+
+ /* Hardcore methods */
+ e_dbus_interface_method_add(iface, "Restart", "", "", _e_msgbus_core_restart_cb);
+ e_dbus_interface_method_add(iface, "Shutdown", "", "", _e_msgbus_core_shutdown_cb);
+
+ iface = e_dbus_interface_new("org.enlightenment.wm.Module");
+ if (!iface) return 0;
+ e_dbus_object_interface_attach(_e_msgbus_data->obj, iface);
+
+ /* Module methods */
+ e_dbus_interface_method_add(iface, "Load", "s", "", _e_msgbus_module_load_cb);
+ e_dbus_interface_method_add(iface, "Unload", "s", "", _e_msgbus_module_unload_cb);
+ e_dbus_interface_method_add(iface, "Enable", "s", "", _e_msgbus_module_enable_cb);
+ e_dbus_interface_method_add(iface, "Disable", "s", "", _e_msgbus_module_disable_cb);
+ e_dbus_interface_method_add(iface, "List", "", "a(si)", _e_msgbus_module_list_cb);
+
+ iface = e_dbus_interface_new("org.enlightenment.wm.Profile");
+ if (!iface) return 0;
+ e_dbus_object_interface_attach(_e_msgbus_data->obj, iface);
+
+ /* Profile methods */
+ e_dbus_interface_method_add(iface, "Set", "s", "", _e_msgbus_profile_set_cb);
+ e_dbus_interface_method_add(iface, "Get", "", "s", _e_msgbus_profile_get_cb);
+ e_dbus_interface_method_add(iface, "List", "", "as", _e_msgbus_profile_list_cb);
+ e_dbus_interface_method_add(iface, "Add", "s", "", _e_msgbus_profile_add_cb);
+ e_dbus_interface_method_add(iface, "Delete", "s", "", _e_msgbus_profile_delete_cb);
+
+
+#endif
+ return 1;
+}
+
+EAPI int
+e_msgbus_shutdown(void)
+{
+#ifdef HAVE_EDBUS
+ if (_e_msgbus_data->obj)
+ {
+ e_dbus_object_free(_e_msgbus_data->obj);
+ }
+ if (_e_msgbus_data->conn)
+ {
+ e_dbus_connection_close(_e_msgbus_data->conn);
+ }
+ e_dbus_shutdown();
+
+ E_FREE(_e_msgbus_data);
+ _e_msgbus_data = NULL;
+#endif
+ return 1;
+}
+
+EAPI void
+e_msgbus_interface_attach(E_DBus_Interface *iface)
+{
+#ifdef HAVE_EDBUS
+ e_dbus_object_interface_attach(_e_msgbus_data->obj, iface);
+#endif
+}
+
+EAPI void
+e_msgbus_interface_detach(E_DBus_Interface *iface)
+{
+#ifdef HAVE_EDBUS
+ e_dbus_object_interface_detach(_e_msgbus_data->obj, iface);
+#endif
+}
+
+#ifdef HAVE_EDBUS
+static void
+_e_msgbus_request_name_cb(void *data, DBusMessage *msg, DBusError *err)
+{
+//TODO Handle Errors
+}
+
+/* Core Handlers */
+static DBusMessage*
+_e_msgbus_core_restart_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ restart = 1;
+ ecore_main_loop_quit();
+
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage*
+_e_msgbus_core_shutdown_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ if (!e_util_immortal_check()) ecore_main_loop_quit();
+
+ return dbus_message_new_method_return(msg);
+}
+
+/* Modules Handlers */
+static DBusMessage*
+_e_msgbus_module_load_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ DBusMessageIter iter;
+ char *module;
+
+ dbus_message_iter_init(msg, &iter);
+ dbus_message_iter_get_basic(&iter, &module);
+
+ if (!e_module_find(module))
+ {
+ e_module_new(module);
+ e_config_save_queue();
+ }
+
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage*
+_e_msgbus_module_unload_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ DBusMessageIter iter;
+ char *module;
+ E_Module *m;
+
+ dbus_message_iter_init(msg, &iter);
+ dbus_message_iter_get_basic(&iter, &module);
+
+ if ((m = e_module_find(module)))
+ {
+ e_module_disable(m);
+ e_object_del(E_OBJECT(m));
+ e_config_save_queue();
+ }
+
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage*
+_e_msgbus_module_enable_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ DBusMessageIter iter;
+ char *module;
+ E_Module *m;
+
+ dbus_message_iter_init(msg, &iter);
+ dbus_message_iter_get_basic(&iter, &module);
+
+ if ((m = e_module_find(module))) {
+ e_module_enable(m);
+ e_config_save_queue();
+ }
+
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage*
+_e_msgbus_module_disable_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ DBusMessageIter iter;
+ char *module;
+ E_Module *m;
+
+ dbus_message_iter_init(msg, &iter);
+ dbus_message_iter_get_basic(&iter, &module);
+
+ if ((m = e_module_find(module))) {
+ e_module_disable(m);
+ e_config_save_queue();
+ }
+
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage*
+_e_msgbus_module_list_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ Evas_List *mod_list;
+ Evas_List * l;
+ DBusMessage *reply;
+ DBusMessageIter iter;
+ DBusMessageIter arr;
+
+ reply = dbus_message_new_method_return(msg);
+ dbus_message_iter_init_append(reply, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "(si)", &arr);
+
+ mod_list = e_module_list();
+
+ for (l = mod_list; l; l = l->next)
+ {
+ DBusMessageIter sub;
+ E_Module *mod;
+ const char *name;
+ int enabled;
+
+ mod = l->data;
+ name = mod->name;
+ enabled = mod->enabled;
+ dbus_message_iter_open_container(&arr, DBUS_TYPE_STRUCT, NULL, &sub);
+ dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &(name));
+ dbus_message_iter_append_basic(&sub, DBUS_TYPE_INT32, &(enabled));
+ dbus_message_iter_close_container(&arr, &sub);
+ }
+ dbus_message_iter_close_container(&iter, &arr);
+
+ return reply;
+}
+
+/* Profile Handlers */
+static DBusMessage*
+_e_msgbus_profile_set_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ DBusMessageIter iter;
+ char *profile;
+
+ dbus_message_iter_init(msg, &iter);
+ dbus_message_iter_get_basic(&iter, &profile);
+
+ e_config_save_flush();
+ e_config_profile_set(profile);
+ e_config_profile_save();
+ e_config_save_block_set(1);
+ restart = 1;
+ ecore_main_loop_quit();
+
+ return dbus_message_new_method_return(msg);
+}
+
+static DBusMessage*
+_e_msgbus_profile_get_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ DBusMessageIter iter;
+ DBusMessage *reply;
+ char *profile;
+
+ profile = e_config_profile_get();
+
+ reply = dbus_message_new_method_return(msg);
+ dbus_message_iter_init_append(reply, &iter);
+ dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &profile);
+
+ return reply;
+}
+
+static DBusMessage*
+_e_msgbus_profile_list_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ Evas_List *profiles;
+ Evas_List * l;
+ DBusMessage *reply;
+ DBusMessageIter iter;
+ DBusMessageIter arr;
+
+ reply = dbus_message_new_method_return(msg);
+ dbus_message_iter_init_append(reply, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &arr);
+
+ profiles = e_config_profile_list();
+
+ for (l = profiles; l; l = l->next)
+ {
+ const char *name;
+
+ name = l->data;
+ dbus_message_iter_append_basic(&arr, DBUS_TYPE_STRING, &name);
+ }
+ dbus_message_iter_close_container(&iter, &arr);
+
+ return reply;
+}
+
+static DBusMessage*
+_e_msgbus_profile_add_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ DBusMessageIter iter;
+ char *profile;
+
+ dbus_message_iter_init(msg, &iter);
+ dbus_message_iter_get_basic(&iter, &profile);
+
+ e_config_profile_add(profile);
+
+ return dbus_message_new_method_return(msg);
+
+}
+
+static DBusMessage*
+_e_msgbus_profile_delete_cb(E_DBus_Object *obj, DBusMessage *msg)
+{
+ DBusMessageIter iter;
+ char *profile;
+
+ dbus_message_iter_init(msg, &iter);
+ dbus_message_iter_get_basic(&iter, &profile);
+ if (!strcmp(e_config_profile_get(), profile))
+ {
+ DBusMessage *ret;
+
+ ret = dbus_message_new_error(msg, "org.enlightenment.DBus.InvalidArgument",
+ "Can't delete active profile");
+ return ret;
+ }
+ e_config_profile_del(profile);
+
+ return dbus_message_new_method_return(msg);
+}
+
+#endif
+
--- /dev/null
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+#ifndef HAVE_EDBUS
+#define E_DBus_Interface void
+#endif
+
+typedef struct _E_Msgbus_Data E_Msgbus_Data;
+
+#else
+#ifndef E_MSGBUS_H
+#define E_MSGBUS_H
+
+/* This is the dbus subsystem, but e_dbus namespace is taken by e_dbus */
+
+struct _E_Msgbus_Data
+{
+#ifdef HAVE_EDBUS
+ E_DBus_Connection *conn;
+ E_DBus_Object *obj;
+#endif
+};
+
+EAPI int e_msgbus_init(void);
+EAPI int e_msgbus_shutdown(void);
+
+#endif
+#endif
conf_startup \
conf_intl \
conf_imc \
+msgbus_lang \
conf_profiles \
conf_engine \
conf_applications \
--- /dev/null
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
--- /dev/null
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = msgbus_lang
+
+# 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)
+
+if HAVE_EDBUS
+pkg_LTLIBRARIES = module.la
+module_la_SOURCES = e_mod_main.c \
+ e_mod_main.h
+
+module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+endif
+
+uninstall:
+ rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
--- /dev/null
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#include "e.h"
+#include "e_mod_main.h"
+
+/***************************************************************************/
+/**/
+/* actual module specifics */
+
+static E_DBus_Interface *iface = NULL;
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+
+DBusMessage *
+cb_langs(E_DBus_Object *obj, DBusMessage *message)
+{
+ DBusMessage *reply;
+ DBusMessageIter iter;
+ DBusMessageIter arr;
+ Evas_List * languages;
+ Evas_List * l;
+
+ memset(&arr, 0, sizeof(DBusMessageIter));
+
+ reply = dbus_message_new_method_return(message);
+ dbus_message_iter_init_append(reply, &iter);
+ dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "s", &arr);
+
+ languages = e_intl_language_list();
+ for (l = languages; l; l = l->next) {
+ const char *str;
+
+ str = l->data;
+ dbus_message_iter_append_basic(&arr, DBUS_TYPE_STRING, &str);
+ }
+
+ dbus_message_iter_close_container(&iter, &arr);
+
+ return reply;
+}
+
+/**/
+/***************************************************************************/
+
+/***************************************************************************/
+/**/
+/* module setup */
+EAPI E_Module_Api e_modapi =
+{
+ E_MODULE_API_VERSION,
+ "IPC - Language"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+ iface = e_dbus_interface_new("org.enlightenment.wm.Language");
+ if (!iface) return NULL;
+
+ e_dbus_interface_method_add(iface, "List", "", "as", cb_langs);
+
+ e_msgbus_interface_attach(iface);
+
+ return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+ e_msgbus_interface_detach(iface);
+ e_dbus_interface_unref(iface);
+ return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+ return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+ e_module_dialog_show(m,
+ _("DBus IPC - Language"),
+ _("Extensions for language IPC configuration"));
+ return 1;
+}
--- /dev/null
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#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);
+EAPI int e_modapi_about (E_Module *m);
+
+#endif
--- /dev/null
+[Desktop Entry]
+Type=Link
+Name=DBus Extension - Language
+Icon=e-module-msgbus_lang
projects / platform / upstream / enlightenment.git / commitdiff