not used anymore - remove

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = src data doc po intl
+SUBDIRS = src data doc po
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
@@ -8,7 +8,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 
 bin_SCRIPTS = enlightenment-config
 
-EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
+EXTRA_DIST = config.rpath  README AUTHORS COPYING COPYING-PLAIN \
              enlightenment.spec.in enlightenment.spec \
 	     debian/changelog \
 	     debian/changelog.in \
@@ -21,3 +21,5 @@ EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN \
 
 filesdir = $(datadir)/enlightenment/
 files_DATA = AUTHORS COPYING 
+
+ACLOCAL_AMFLAGS = -I m4

autogen.sh

@@ -10,6 +10,10 @@ echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
 echo "Running autoconf..." ; autoconf || exit 1
 echo "Running autoheader..." ; autoheader || exit 1
 echo "Running libtoolize..." ; (libtoolize --copy --automake || glibtoolize --automake) || exit 1
+echo "Running gettextize..." ; gettextize -f --no-changelog&
+# hack - gettextize is interactive and demands input from a user. "screw it".
+sleep 20
+kill %1
 echo "Running automake..." ; automake --add-missing --copy --gnu || exit 1
 
 if [ -z "$NOCONFIGURE" ]; then

configure.in

@@ -138,8 +138,6 @@ AC_CHECK_HEADERS(CFBase.h,
     cf_cflags="-I /System/Library/Frameworks/CoreFoundation.framework/Headers"
     cf_cflags="${cf_cflags} -I /System/Library/Frameworks/IOKit.framework/Headers"
     cf_libs="-framework 'CoreFoundation' -framework 'IOKit'"
-  ],[
-    AC_MSG_WARN([Cannot find CoreFoundation headers and libraries.])
   ]
 )
 CPPFLAGS="${PCPPFLAGS}"
@@ -150,8 +148,8 @@ AC_SUBST(cf_libs)
 ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW"
 AC_SUBST(ALL_LINGUAS)
 
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION(0.12.1)
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.14.6])
 if test "x$LIBINTL" = "x"; then
   LIBINTL="$INTLLIBS"
 fi
@@ -298,7 +296,6 @@ data/etc/Makefile
 data/icons/Makefile
 doc/Makefile
 po/Makefile.in
-intl/Makefile
 enlightenment-config
 debian/changelog
 ],[

src/lib/.cvsignore

@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-e_main.lo
-libe.la

src/lib/E_Lib.h

@@ -1,246 +0,0 @@
-/*
- * vim:ts=8:sw=3:sts=3:noexpandtab:cino=>5n-3f0^-2{2
- */
-#ifndef _E_H
-#define _E_H
-
-#ifdef EAPI
-#undef EAPI
-#endif
-#ifdef WIN32
-# ifdef BUILDING_DLL
-#  define EAPI __declspec(dllexport)
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif
-#endif
-
-typedef enum E_Lib_Binding_Context
-{
-   E_LIB_BINDING_CONTEXT_NONE,
-   E_LIB_BINDING_CONTEXT_UNKNOWN,
-   E_LIB_BINDING_CONTEXT_BORDER,
-   E_LIB_BINDING_CONTEXT_ZONE,
-   E_LIB_BINDING_CONTEXT_CONTAINER,
-   E_LIB_BINDING_CONTEXT_MANAGER,
-   E_LIB_BINDING_CONTEXT_MENU,
-   E_LIB_BINDING_CONTEXT_WINLIST,
-   E_LIB_BINDING_CONTEXT_ANY
-} E_Lib_Binding_Context;
-
-typedef enum E_Lib_Binding_Modifier
-{
-   E_LIB_BINDING_MODIFIER_NONE = 0,
-   E_LIB_BINDING_MODIFIER_SHIFT = (1 << 0),
-   E_LIB_BINDING_MODIFIER_CTRL = (1 << 1),
-   E_LIB_BINDING_MODIFIER_ALT = (1 << 2),
-   E_LIB_BINDING_MODIFIER_WIN = (1 << 3)
-} E_Lib_Binding_Modifier;
-
-typedef struct _E_Response_Module_List E_Response_Module_List;
-typedef struct _E_Response_Module_Data E_Response_Module_Data;
-typedef struct _E_Response_Dirs_List E_Response_Dirs_List;
-typedef struct _E_Response_Background_Get E_Response_Background_Get;
-typedef struct _E_Response_Language_Get E_Response_Language_Get;
-typedef struct _E_Response_Theme_Get E_Response_Theme_Get;
-
-typedef struct _E_Response_Binding_Mouse_List E_Response_Binding_Mouse_List;
-typedef struct _E_Response_Binding_Mouse_Data E_Response_Binding_Mouse_Data;
-typedef struct _E_Response_Binding_Key_List E_Response_Binding_Key_List;
-typedef struct _E_Response_Binding_Key_Data E_Response_Binding_Key_Data;
-typedef struct _E_Response_Binding_Signal_List E_Response_Binding_Signal_List;
-typedef struct _E_Response_Binding_Signal_Data E_Response_Binding_Signal_Data;
-typedef struct _E_Response_Binding_Wheel_List E_Response_Binding_Wheel_List;
-typedef struct _E_Response_Binding_Wheel_Data E_Response_Binding_Wheel_Data;
-
-struct _E_Response_Module_List
-{
-    E_Response_Module_Data    **modules;
-    int 			count;
-};
-
-struct _E_Response_Module_Data
-{
-   char   *name;
-   char    enabled;
-};
-
-struct _E_Response_Dirs_List
-{
-   char   **dirs;
-   int	    count;
-};
-
-struct _E_Response_Background_Get
-{
-   char   *file;
-};
-
-struct _E_Response_Theme_Get
-{
-   char   *file;
-   char   *category;
-};
-
-struct _E_Response_Language_Get
-{
-   char   *lang;
-};
-
-struct _E_Response_Binding_Key_List
-{
-    E_Response_Binding_Key_Data    **bindings;
-    int				     count;
-};
-
-struct _E_Response_Binding_Key_Data
-{
-   E_Lib_Binding_Context ctx;
-   const char *key;
-   E_Lib_Binding_Modifier mod;
-   unsigned char any_mod : 1;
-   const char *action;
-   const char *params;
-};
-
-struct _E_Response_Binding_Mouse_List
-{
-    E_Response_Binding_Mouse_Data    **bindings;
-    int			   	       count;
-};
-
-struct _E_Response_Binding_Mouse_Data
-{
-   E_Lib_Binding_Context ctx;
-   int button;
-   E_Lib_Binding_Modifier mod;
-   unsigned char any_mod : 1;
-   const char *action;
-   const char *params;
-};
-
-struct _E_Response_Binding_Signal_List
-{
-    E_Response_Binding_Signal_Data **bindings;
-    int				     count;
-};
-
-struct _E_Response_Binding_Signal_Data
-{
-   E_Lib_Binding_Context ctx;
-   const char *signal;
-   const char *source;
-   E_Lib_Binding_Modifier mod;
-   unsigned char any_mod : 1;
-   const char *action;
-   const char *params;
-};
-
-struct _E_Response_Binding_Wheel_List
-{
-    E_Response_Binding_Wheel_Data  **bindings;
-    int				     count;
-};
-
-struct _E_Response_Binding_Wheel_Data
-{
-   E_Lib_Binding_Context ctx;
-   int direction;
-   int z;
-   E_Lib_Binding_Modifier mod;
-   unsigned char any_mod : 1;
-   const char *action;
-   const char *params;
-};
-
-
-extern EAPI int E_RESPONSE_MODULE_LIST;
-extern EAPI int E_RESPONSE_BACKGROUND_GET;
-extern EAPI int E_RESPONSE_LANGUAGE_GET;
-extern EAPI int E_RESPONSE_THEME_GET;
-
-extern EAPI int E_RESPONSE_DATA_DIRS_LIST;
-extern EAPI int E_RESPONSE_IMAGE_DIRS_LIST;
-extern EAPI int E_RESPONSE_FONT_DIRS_LIST;
-extern EAPI int E_RESPONSE_THEME_DIRS_LIST;
-extern EAPI int E_RESPONSE_INIT_DIRS_LIST;
-extern EAPI int E_RESPONSE_ICON_DIRS_LIST;
-extern EAPI int E_RESPONSE_MODULE_DIRS_LIST;
-extern EAPI int E_RESPONSE_BACKGROUND_DIRS_LIST;
-
-extern EAPI int E_RESPONSE_BINDING_KEY_LIST;
-extern EAPI int E_RESPONSE_BINDING_MOUSE_LIST;
-extern EAPI int E_RESPONSE_BINDING_SIGNAL_LIST;
-extern EAPI int E_RESPONSE_BINDING_WHEEL_LIST;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-   /* library startup and shutdown */
-   EAPI int          e_lib_init                       (const char *display);
-   EAPI int          e_lib_shutdown                   (void);
-
-   /* E startup and shutdown */
-   EAPI void         e_lib_restart                    (void);
-   EAPI void         e_lib_quit                       (void);
-
-   EAPI void         e_lib_config_panel_show          (void);
-
-   /* E module manipulation */
-   EAPI void         e_lib_module_enabled_set         (const char *module, int enable);
-   EAPI void         e_lib_module_loaded_set          (const char *module, int load);
-   EAPI void         e_lib_module_list                (void);
-
-   /* E desktop manipulation */
-   EAPI void         e_lib_background_set             (const char *bgfile);
-   EAPI void         e_lib_background_get             (void);
-   EAPI void         e_lib_desktop_background_add     (const int con, const int zone, const int desk_x, const int desk_y, const char *bgfile);
-   EAPI void         e_lib_desktop_background_del     (const int con, const int zone, const int desk_x, const int desk_y);
-
-   /* key/mouse bindings */
-   EAPI void	     e_lib_bindings_key_list	      (void);
-   EAPI void	     e_lib_binding_key_del	      (unsigned int context, unsigned int modifiers, const char *key, 
-						       unsigned int any_mod, const char *action, const char *params);
-   EAPI void	     e_lib_binding_key_add	      (unsigned int context, unsigned int modifiers, const char *key, 
-						       unsigned int any_mod, const char *action, const char *params);
-
-   EAPI void	     e_lib_bindings_mouse_list	      (void);
-   EAPI void	     e_lib_binding_mouse_del	      (unsigned int context, unsigned int modifiers, unsigned int button, 
-						       unsigned int any_mod, const char *action, const char *params);
-   EAPI void	     e_lib_binding_mouse_add	      (unsigned int context, unsigned int modifiers, unsigned int button, 
-						       unsigned int any_mod, const char *action, const char *params);
-
-   /* E current theme manipulation */
-   EAPI void         e_lib_theme_set                  (const char *category, const char *file);
-   EAPI void         e_lib_theme_get                  (const char *category);
-
-   /* languages */
-   EAPI void         e_lib_language_set               (const char *lang);
-   EAPI void         e_lib_language_get               (void);
-
-   /* E path information */
-   EAPI void         e_lib_data_dirs_list             (void);
-   EAPI void         e_lib_image_dirs_list            (void);
-   EAPI void         e_lib_font_dirs_list             (void);
-   EAPI void         e_lib_theme_dirs_list            (void);
-   EAPI void         e_lib_init_dirs_list             (void);
-   EAPI void         e_lib_icon_dirs_list             (void);
-   EAPI void         e_lib_module_dirs_list           (void);
-   EAPI void         e_lib_background_dirs_list       (void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

src/lib/Makefile.am

@@ -1,15 +0,0 @@
-MAINTAINERCLEANFILES	= Makefile.in
-INCLUDES		= -I$(top_srcdir)/src/bin \
-			  @e_cflags@
-
-lib_LTLIBRARIES		= libe.la
-
-include_HEADERS		= E_Lib.h
-
-libe_la_SOURCES= \
-e_main.c \
-E_Lib.h \
-e_private.h
-
-libe_la_LIBADD		= @ecore_libs@ @evas_libs@
-libe_la_DEPENDENCIES	= $(top_builddir)/config.h

src/lib/e_main.c

@@ -1,640 +0,0 @@
-/*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-
-
-/*
- * TODO:
- * add ecore events for callbacks to all/some ipc calls, e.g. module_list
- *
- * add module_enabled_get
- *
- * augment IPC calls and add wrappers for them - i.e.:
- *   desktops add/remove/list/currentset etc
- *   windows shade[get/set]/maximise[get/set]/iconify[get/set]/list
- *
- * add ability to e to set theme, so we can have a theme_set call :)
- */
-
-#include <Evas.h>
-#include <Eet.h>
-#include <Ecore.h>
-#include <Ecore_Ipc.h>
-#include "E_Lib.h"
-#include "e.h"
-
-#ifdef USE_IPC
-#include "e_ipc_codec.c"
-
-typedef struct _Opt Opt;
-
-struct _Opt 
-{
-   char     *opt;
-   int       num_param; 
-   char     *desc;
-   int       num_reply;
-   E_Ipc_Op  opcode;
-};
-
-Opt opts[] = { 
-#define TYPE  E_REMOTE_OPTIONS
-#include      "e_ipc_handlers.h"
-#undef TYPE 
-};
-
-static int  _e_ipc_init(const char *display);
-static void _e_ipc_shutdown(void);
-static E_Ipc_Op _e_ipc_call_find(const char *name);
-static void _e_ipc_call(E_Ipc_Op opcode, char **params);
-static int _e_cb_server_data(void *data, int type, void *event);
-
-static void _e_cb_module_list_free(void *data, void *ev);
-static void _e_cb_dir_list_free(void *data __UNUSED__, void *ev);
-
-static void e_lib_binding_key_handle(int hdl, unsigned int context, unsigned int modifiers, const char *key, 
-				     unsigned int any_mod, const char *action, const char *params);
-static void e_lib_binding_mouse_handle(int hdl, unsigned int context, unsigned int modifiers, unsigned int button,
-				       unsigned int any_mod, const char *action, const char *params);
-
-static Ecore_Ipc_Server *_e_ipc_server  = NULL;
-
-EAPI int E_RESPONSE_MODULE_LIST = 0;
-EAPI int E_RESPONSE_BACKGROUND_GET = 0;
-EAPI int E_RESPONSE_LANGUAGE_GET = 0;
-EAPI int E_RESPONSE_THEME_GET = 0;
-
-EAPI int E_RESPONSE_DATA_DIRS_LIST = 0;
-EAPI int E_RESPONSE_IMAGE_DIRS_LIST = 0;
-EAPI int E_RESPONSE_FONT_DIRS_LIST = 0;
-EAPI int E_RESPONSE_THEME_DIRS_LIST = 0;
-EAPI int E_RESPONSE_INIT_DIRS_LIST = 0;
-EAPI int E_RESPONSE_ICON_DIRS_LIST = 0;
-EAPI int E_RESPONSE_MODULE_DIRS_LIST = 0;
-EAPI int E_RESPONSE_BACKGROUND_DIRS_LIST = 0;
-
-EAPI int E_RESPONSE_BINDING_KEY_LIST = 0;
-EAPI int E_RESPONSE_BINDING_MOUSE_LIST = 0;
-EAPI int E_RESPONSE_BINDING_WHEEL_LIST = 0;
-EAPI int E_RESPONSE_BINDING_SIGNAL_LIST = 0;
-
-/*
- * initialise connection to the current E running on "display".
- * If parameter is null try to use DISPLAY env var.
- */
-EAPI int
-e_lib_init(const char* display)
-{
-   char *disp, *pos;
-   int free_disp;
-
-   if (_e_ipc_server)
-     return 0;
-
-   free_disp = 0;
-   if (display)
-     disp = (char *) display;
-   else
-     disp = getenv("DISPLAY");
-   
-   if (!disp)
-     fprintf(stderr, "ERROR: No display parameter passed to e_lib_init, and no DISPLAY variable\n");
-
-   pos = strrchr(disp, ':');
-   if (!pos)
-     {
-	char *tmp;
-	tmp = malloc(strlen(disp) + 5);
-	snprintf(tmp, sizeof(tmp), "%s:0.0", disp);
-	disp = tmp;
-	free_disp = 1;
-     }
-   else
-     {
-	pos = strrchr(pos, '.');
-	if (!pos)
-	  {
-	     char *tmp;
-	     tmp = malloc(strlen(disp) + 3);
-	     snprintf(tmp, strlen(tmp), "%s.0", disp);
-	     disp = tmp;
-	     free_disp = 1;
-	  }
-     }
-
-   /* basic ecore init */
-   if (!ecore_init())
-     {
-	fprintf(stderr, "ERROR: Enlightenment cannot Initialize Ecore!\n"
-	       "Perhaps you are out of memory?\n");
-	return 0;
-     }
-
-   /* init ipc */
-   if (!ecore_ipc_init())
-     {
-	fprintf(stderr, "ERROR: Enlightenment cannot initialize the ipc system.\n"
-	       "Perhaps you are out of memory?\n");
-	return 0;
-     }
-
-   /* setup e ipc service */
-   if (!_e_ipc_init(disp))
-     {
-	fprintf(stderr, "ERROR: Enlightenment cannot set up the IPC socket.\n"
-	       "Did you specify the right display?\n");
-	return 0;
-     }
-   e_ipc_codec_init();
-   
-   if (!E_RESPONSE_MODULE_LIST)
-     {
-	E_RESPONSE_MODULE_LIST = ecore_event_type_new();
-	E_RESPONSE_BACKGROUND_GET = ecore_event_type_new();
-	E_RESPONSE_THEME_GET = ecore_event_type_new();
-	E_RESPONSE_LANGUAGE_GET = ecore_event_type_new();
-
-	E_RESPONSE_DATA_DIRS_LIST = ecore_event_type_new();
-	E_RESPONSE_IMAGE_DIRS_LIST = ecore_event_type_new();
-	E_RESPONSE_FONT_DIRS_LIST = ecore_event_type_new();
-	E_RESPONSE_THEME_DIRS_LIST = ecore_event_type_new();
-	E_RESPONSE_INIT_DIRS_LIST = ecore_event_type_new();
-	E_RESPONSE_ICON_DIRS_LIST = ecore_event_type_new();
-	E_RESPONSE_MODULE_DIRS_LIST = ecore_event_type_new();
-	E_RESPONSE_BACKGROUND_DIRS_LIST = ecore_event_type_new();
-
-	E_RESPONSE_BINDING_KEY_LIST = ecore_event_type_new();
-	E_RESPONSE_BINDING_MOUSE_LIST = ecore_event_type_new();
-     }
-   
-   if (free_disp)
-     free(disp);
-   return 1;
-}
-
-/* 
- * close our connection to E
- */
-EAPI int
-e_lib_shutdown(void)
-{
-   e_ipc_codec_shutdown();
-   _e_ipc_shutdown();
-   ecore_ipc_shutdown();
-   ecore_shutdown();
-
-   return 1;
-}
-
-/* actual IPC calls */
-EAPI void
-e_lib_restart(void)
-{
-   _e_ipc_call(E_IPC_OP_RESTART, NULL);
-}
-    
-EAPI void
-e_lib_quit(void)
-{
-   _e_ipc_call(E_IPC_OP_SHUTDOWN, NULL);
-}
-
-EAPI void
-e_lib_config_panel_show(void)
-{
-   _e_ipc_call(E_IPC_OP_CONFIG_PANEL_SHOW, NULL);
-}
-
-EAPI void
-e_lib_module_enabled_set(const char *module, int enable)
-{
-   char *tmp;
-
-   if (!module)
-     return;
-
-   tmp = strdup(module);
-   if (enable)
-     _e_ipc_call(E_IPC_OP_MODULE_ENABLE, &tmp);
-   else
-     _e_ipc_call(E_IPC_OP_MODULE_DISABLE, &tmp);
-   free(tmp);
-}
-
-EAPI void
-e_lib_module_load_set(const char *module, int load)
-{
-   char *tmp;
-   if (!module)
-     return;
-
-   tmp = strdup(module);
-   if (load)
-     _e_ipc_call(E_IPC_OP_MODULE_LOAD, &tmp);
-   else
-     _e_ipc_call(E_IPC_OP_MODULE_UNLOAD, &tmp);
-   free(tmp);
-}
-
-EAPI void
-e_lib_module_list(void)
-{
-   _e_ipc_call(E_IPC_OP_MODULE_LIST, NULL);
-}
-
-EAPI void
-e_lib_background_set(const char *bgfile)
-{
-   char *tmp;
-   if (!bgfile)
-     return;
-
-   tmp = strdup(bgfile);
-   _e_ipc_call(E_IPC_OP_BG_SET, &tmp);
-   free(tmp);
-}
-
-EAPI void
-e_lib_background_get(void)
-{
-   _e_ipc_call(E_IPC_OP_BG_GET, NULL);
-}
-
-EAPI void
-e_lib_desktop_background_add(const int con, const int zone, const int desk_x, const int desk_y, const char *bgfile)
-{
-   char *params[5];
-   int i;
-   
-   if (!bgfile)
-     return;
-   for (i = 0; i < 4; i++)
-     params[i] = (char *)calloc(5, sizeof(char));
-   sprintf(params[0], "%i", con);
-   sprintf(params[1], "%i", zone);
-   sprintf(params[2], "%i", desk_x);
-   sprintf(params[3], "%i", desk_y);
-   params[4] = strdup(bgfile);
-   if ((!params[0]) || (!params[1]) || (!params[2]) ||
-       (!params[3]) || (!params[4]))
-     return;
-   _e_ipc_call(E_IPC_OP_DESKTOP_BG_ADD, params);
-   free(params[0]);
-   free(params[1]);
-   free(params[2]);
-   free(params[3]);
-   free(params[4]);
-}
-
-EAPI void
-e_lib_desktop_background_del(const int con, const int zone, const int desk_x, const int desk_y)
-{
-   int i;
-   char *params[4];
-
-   for (i = 0; i < 4; i++)
-     params[i] = (char *)calloc(5,sizeof(char));
-   sprintf(params[0], "%i", con);
-   sprintf(params[1], "%i", zone);
-   sprintf(params[2], "%i", desk_x);
-   sprintf(params[3], "%i", desk_y);
-   if ((!params[0]) || (!params[1]) || (!params[2]) ||
-       (!params[3]) || (!params[4]))
-   _e_ipc_call(E_IPC_OP_DESKTOP_BG_DEL, params);
-   free(params[0]);
-   free(params[1]);
-   free(params[2]);
-   free(params[3]);
-}
-
-EAPI void
-e_lib_theme_get(const char *category)
-{
-   char *tmp;
-   if (!category)
-     return;
-
-   tmp = strdup(category);
-   _e_ipc_call(E_IPC_OP_THEME_GET, &tmp);
-   free(tmp);
-}
-
-EAPI void
-e_lib_theme_set(const char *category, const char *file)
-{
-   char *tmp[2];
-   if (!category && !file)
-     return; 
-
-   tmp[0] = strdup(category);
-   tmp[1] = strdup(file);
-
-   _e_ipc_call(E_IPC_OP_THEME_SET, tmp);
-   free(tmp[0]);
-   free(tmp[1]);
-}
-
-EAPI void
-e_lib_language_set(const char *lang)
-{
-   char *tmp;
-   if (!lang)
-     return;
-
-   tmp = strdup(lang);
-   _e_ipc_call(E_IPC_OP_LANG_SET, &tmp);
-   free(tmp);
-}
-
-EAPI void
-e_lib_language_get(void)
-{
-   _e_ipc_call(E_IPC_OP_LANG_GET, NULL);
-}
-
-EAPI void
-e_lib_data_dirs_list(void)
-{
-   char *type = "data";
-   _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-}
-
-EAPI void
-e_lib_image_dirs_list(void)
-{
-   char *type = "images";
-   _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-}
-
-EAPI void
-e_lib_font_dirs_list(void)
-{
-   char *type = "fonts";
-   _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-}
-
-EAPI void
-e_lib_theme_dirs_list(void)
-{
-   char *type = "themes";
-   _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-}
-
-EAPI void
-e_lib_init_dirs_list(void)
-{
-   char *type = "inits";
-   _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-}
-
-EAPI void
-e_lib_icon_dirs_list(void)
-{
-   char *type = "icons";
-   _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-}
-
-EAPI void
-e_lib_module_dirs_list(void)
-{
-   char *type = "modules";
-   _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-}
-
-EAPI void
-e_lib_background_dirs_list(void)
-{
-   char *type = "backgrounds";
-   _e_ipc_call(E_IPC_OP_DIRS_LIST, &type);
-}
-
-EAPI void
-e_lib_bindings_key_list(void)
-{
-   _e_ipc_call(E_IPC_OP_BINDING_KEY_LIST, NULL);
-}
-
-static void
-e_lib_binding_key_handle(int hdl, unsigned int context, unsigned int modifiers, const char *key, 
-		       unsigned int any_mod, const char *action, const char *key_params)
-{
-   char buf[256];
-   char *params[6];
-   int i;
-   
-   for (i = 0; i < 5; i++)
-     params[i] = calloc(5, sizeof(char));
-
-   snprintf(buf, 256, "%u", context);
-   params[0] = strdup(buf);
-
-   snprintf(buf, 256, "%u", modifiers);
-   params[1] = strdup(buf);
-
-   params[2] = strdup(key);
-
-   snprintf(buf, 256, "%d", any_mod);
-   params[3] = strdup(buf);
-
-   params[4] = strdup(action);
-   params[5] = strdup(key_params);
-
-   if ((!params[0]) || (!params[1]) || (!params[2]) ||
-       (!params[3]) || (!params[4]) || (!params[5]))
-     return;
-
-   _e_ipc_call(hdl, params);
-
-   free(params[0]);
-   free(params[1]);
-   free(params[2]);
-   free(params[3]);
-   free(params[4]);
-   free(params[5]);
-}
-
-EAPI void
-e_lib_binding_key_del(unsigned int context, unsigned int modifiers, const char *key, 
-		      unsigned int any_mod, const char *action, const char *params)
-{
-   e_lib_binding_key_handle(E_IPC_OP_BINDING_KEY_DEL, context, modifiers, key, any_mod, action, params);
-}
-
-EAPI void
-e_lib_binding_key_add(unsigned int context, unsigned int modifiers, const char *key, 
-		      unsigned int any_mod, const char *action, const char *params)
-{
-   e_lib_binding_key_handle(E_IPC_OP_BINDING_KEY_ADD, context, modifiers, key, any_mod, action, params);
-}
-
-EAPI void
-e_lib_bindings_mouse_list(void)
-{
-   _e_ipc_call(E_IPC_OP_BINDING_MOUSE_LIST, NULL);
-}
-
-static void
-e_lib_binding_mouse_handle(int hdl, unsigned int context, unsigned int modifiers, unsigned int button,
-			   unsigned int any_mod, const char *action, const char *mouse_params)
-{
-   char buf[256];
-   char *params[6];
-   int i;
-   
-   for (i = 0; i < 5; i++)
-     params[i] = calloc(5, sizeof(char));
-
-   snprintf(buf, 256, "%u", context);
-   params[0] = strdup(buf);
-
-   snprintf(buf, 256, "%u", modifiers);
-   params[1] = strdup(buf);
-
-   snprintf(buf, 256, "%d", button);
-   params[2] = strdup(buf);
-
-   snprintf(buf, 256, "%d", any_mod);
-   params[3] = strdup(buf);
-
-   params[4] = strdup(action);
-   params[5] = strdup(mouse_params);
-
-   if ((!params[0]) || (!params[1]) || (!params[2]) ||
-       (!params[3]) || (!params[4]) || (!params[5]))
-     return;
-
-   _e_ipc_call(hdl, params);
-
-   free(params[0]);
-   free(params[1]);
-   free(params[2]);
-   free(params[3]);
-   free(params[4]);
-   free(params[5]);
-}
-
-EAPI void
-e_lib_binding_mouse_del(unsigned int context, unsigned int modifiers, unsigned int button, 
-			unsigned int any_mod, const char *action, const char *params)
-{
-   e_lib_binding_mouse_handle(E_IPC_OP_BINDING_MOUSE_DEL, context, modifiers, button, any_mod, action, params);
-}
-
-EAPI void
-e_lib_binding_mouse_add(unsigned int context, unsigned int modifiers, unsigned int button, 
-		   	unsigned int any_mod, const char *action, const char *params)
-{
-   e_lib_binding_mouse_handle(E_IPC_OP_BINDING_MOUSE_ADD, context, modifiers, button, any_mod, action, params);
-}
-
-static int
-_e_ipc_init(const char *display)
-{
-   char buf[1024];
-   char *disp;
-   
-   disp = (char *)display;
-   if (!disp) disp = ":0";
-   snprintf(buf, sizeof(buf), "enlightenment-(%s)", disp);
-   _e_ipc_server = ecore_ipc_server_connect(ECORE_IPC_LOCAL_USER, buf, 0, NULL);
-   /* FIXME: we shoudl also try the generic ":0" if the display is ":0.0" */
-   /* similar... */
-   if (!_e_ipc_server) return 0;
-   
-   ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, _e_cb_server_data, NULL);
-
-   return 1;
-}
-
-static void
-_e_ipc_shutdown(void)
-{
-   if (_e_ipc_server)
-     {
-	ecore_ipc_server_del(_e_ipc_server);
-	_e_ipc_server = NULL;
-     }
-}
-
-static E_Ipc_Op
-_e_ipc_call_find(const char *name)
-{
-   int i;
-
-   for (i = 0; i < (int)(sizeof(opts) / sizeof(Opt)); i++)
-     { 
-        Opt *opt;
-        
-        opt = &(opts[i]);
-        if (!strcmp(opt->opt, name))
-	  return opt->opcode;
-     }  
-   return 0;
-}
-
-static void
-_e_ipc_call(E_Ipc_Op opcode, char **params)
-{
-   Ecore_Ipc_Event_Server_Data *e = malloc(sizeof(Ecore_Ipc_Event_Server_Data));
-   e->server = _e_ipc_server;
-   
-   switch(opcode)
-     {
-
-#define TYPE  E_REMOTE_OUT
-#include      "e_ipc_handlers.h"
-#undef TYPE
-
-	default:
-	  break;
-     }
-   free(e);
-}
-
-static int
-_e_cb_server_data(void *data __UNUSED__, int type, void *event)
-{
-   Ecore_Ipc_Event_Server_Data *e;
-
-   e = event;
-
-   switch (e->minor)
-     {
-
-#define TYPE  E_LIB_IN
-#include      "e_ipc_handlers.h"
-#undef TYPE
-
-	default:
-	  break;
-     }
-   return 1;
-}
-
-static void
-_e_cb_module_list_free(void *data __UNUSED__, void *ev)
-{
-    E_Response_Module_List *e;
-    int i;
-
-    e = ev;
-    for (i = 0; i < e->count; i++)
-      {
-         free(e->modules[i]);
-      }
-    free(e->modules);
-    free(e);
-}
-
-static void
-_e_cb_dir_list_free(void *data __UNUSED__, void *ev)
-{
-    E_Response_Dirs_List *e;
-
-    e = ev;
-    free(e->dirs);
-    free(e);
-}
-
-#endif
-

src/lib/e_private.h

@@ -1,32 +0,0 @@
-#ifndef E_PRIVATE_H
-#define E_PRIVATE_H
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef USE_IPC
-  
-#if HAVE___ATTRIBUTE__
-#define __UNUSED__ __attribute__((unused))
-#else
-#define __UNUSED__
-#endif
-
-#define E_REMOTE_OPTIONS 1
-#define E_REMOTE_OUT     2
-#define E_WM_IN          3
-#define E_REMOTE_IN      4
-#define E_ENUM           5
-#define E_LIB_IN         6
-
-#define E_TYPEDEFS 1
-#include "e_ipc.h"
-#undef E_TYPEDEFS
-#include "e_ipc.h"
-
-#endif
-
-#endif
-
-