diff --git a/Makefile.am b/Makefile.am index 4749b5efd..b015c7818 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src data doc po +SUBDIRS = src data doc po intl MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ diff --git a/configure.in b/configure.in index 2d808b230..f60378510 100644 --- a/configure.in +++ b/configure.in @@ -227,6 +227,7 @@ data/icons/images/Makefile data/other/Makefile doc/Makefile po/Makefile +intl/Makefile enlightenment-config ],[ chmod +x enlightenment-config diff --git a/intl/Makefile.am b/intl/Makefile.am new file mode 100644 index 000000000..be63def09 --- /dev/null +++ b/intl/Makefile.am @@ -0,0 +1 @@ +MAINTAINERCLEANFILES = Makefile.in diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index d5508f26b..2d474e3b8 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -48,6 +48,7 @@ e_font.h \ e_intl.h \ e_theme.h \ e_dnd.h \ +e_bindings.h \ e_moveresize.h enlightenment_SOURCES = \ @@ -89,6 +90,7 @@ e_font.c \ e_intl.c \ e_theme.c \ e_dnd.c \ +e_bindings.c \ e_moveresize.c \ $(ENLIGHTENMENTHEADERS) diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c new file mode 100644 index 000000000..dc42b3c0a --- /dev/null +++ b/src/bin/e_bindings.c @@ -0,0 +1,24 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#include "e.h" + +/* local subsystem functions */ + +/* local subsystem globals */ + +/* externally accessible functions */ + +int +e_bindings_init(void) +{ + return 1; +} + +int +e_bindings_shutdown(void) +{ + return 1; +} + +/* local subsystem functions */ diff --git a/src/bin/e_bindings.h b/src/bin/e_bindings.h new file mode 100644 index 000000000..ad7c0cadd --- /dev/null +++ b/src/bin/e_bindings.h @@ -0,0 +1,23 @@ +/* + * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 + */ +#ifdef E_TYPEDEFS + +typedef enum _E_Binding_Context +{ + E_BINDING_CONTEXT_BORDER, + E_BINDING_CONTEXT_ZONE, + E_BINDING_CONTEXT_OTHER +} E_Binding_Context; + +#else +#ifndef E_BINDINGS_H +#define E_BINDINGS_H + +EAPI int e_bindings_init(void); +EAPI int e_bindings_shutdown(void); + +//EAPI void e_bindings_key_event_handle(E_Binding_Context context, E_Object *obj, char *key); /* finxish... */ + +#endif +#endif diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index b94f6f33b..c66fbcc78 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -37,4 +37,5 @@ #include "e_intl.h" #include "e_theme.h" #include "e_dnd.h" +#include "e_bindings.h" #include "e_moveresize.h" diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 8fb8bb32b..c12915c7b 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -303,9 +303,17 @@ main(int argc, char **argv) } _e_main_shutdown_push(e_theme_shutdown); + /* tell the error system that it can use gui dialogs now */ e_error_gui_set(1); + /* init bindings system */ + if (!e_bindings_init()) + { + e_error_message_show(_("Enlightenment cannot set up its bindings system.")); + _e_main_shutdown(-1); + } + _e_main_shutdown_push(e_bindings_shutdown); /* setup e ipc service */ if (!_e_main_ipc_init()) {