Enlightenment CVS committal
Author : sebastid
Project : misc
Module : embrace
Dir : misc/embrace/src
Modified Files:
Makefile.am embrace.c embrace.h embrace_plugin.h mailbox.c
mailbox.h
Added Files:
e_mod_main.c e_mod_main.h
Log Message:
Use the same code for standalone and module.
===================================================================
RCS file: /cvsroot/enlightenment/misc/embrace/src/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 24 Aug 2005 21:23:51 -0000 1.5
+++ Makefile.am 25 Aug 2005 19:42:14 -0000 1.6
@@ -1,6 +1,6 @@
-## $Id: Makefile.am,v 1.5 2005/08/24 21:23:51 sebastid Exp $
+## $Id: Makefile.am,v 1.6 2005/08/25 19:42:14 sebastid Exp $
-SUBDIRS = plugins module
+SUBDIRS = plugins
AM_CFLAGS = @ECORE_CFLAGS@ \
@EDB_CFLAGS@ \
@@ -8,12 +8,17 @@
@EDJE_CFLAGS@ \
@ESMART_CFLAGS@
+noinst_LTLIBRARIES = libembrace.la
+
+libembrace_la_SOURCES = embrace.c embrace.h \
+ embrace_plugin.c embrace_plugin.h \
+ mailbox.c mailbox.h
+
+libembrace_la_DEPENDENCIES = $(top_builddir)/config.h
+
bin_PROGRAMS = embrace
-embrace_SOURCES = main.c \
- embrace.c embrace.h \
- embrace_plugin.c embrace_plugin.h \
- mailbox.c mailbox.h
+embrace_SOURCES = main.c
embrace_LDADD = @ECORE_LIBS@ \
@EDB_LIBS@ \
@@ -21,6 +26,24 @@
@EDJE_LIBS@ \
@ESMART_LIBS@ \
@DL_LIBS@ \
+ libembrace.la \
-lesmart_container -lesmart_draggies -lesmart_trans_x11
embrace_LDFLAGS = -export-dynamic
+
+if BUILD_MODULE
+
+INCLUDES = -I. \
+ -I$(top_srcdir) \
+ -I$(includedir) \
+ @ENLIGHTENMENT_CFLAGS@
+pkgdir = @e_module_dir@/$(MODULE)/$(MODULE_ARCH)
+pkg_LTLIBRARIES = module.la
+module_la_SOURCES = e_mod_main.c
+module_la_LIBADD = @ENLIGHTENMENT_LIBS@ -lm @DL_LIBS@ \
+ libembrace.la \
+ -lesmart_container -lesmart_draggies
-lesmart_trans_x11
+module_la_LDFLAGS = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/embrace/src/embrace.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- embrace.c 24 Aug 2005 21:23:51 -0000 1.25
+++ embrace.c 25 Aug 2005 19:42:14 -0000 1.26
@@ -1,5 +1,5 @@
/*
- * $Id: embrace.c,v 1.25 2005/08/24 21:23:51 sebastid Exp $
+ * $Id: embrace.c,v 1.26 2005/08/25 19:42:14 sebastid Exp $
*
* Copyright (C) 2004 Embrace project.
*
@@ -21,20 +21,11 @@
# include <config.h>
#endif
-#include <Edb.h>
#include <Esmart/Esmart_Container.h>
#include <Esmart/Esmart_Draggies.h>
#include <Esmart/Esmart_Trans_X11.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
#include <ctype.h>
#include <assert.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <ltdl.h>
-#include <signal.h>
#include <getopt.h>
#include "embrace.h"
@@ -282,9 +273,11 @@
w = mailbox_width_get (mailbox);
}
- ecore_evas_resize (e->gui.ee, w, h);
- ecore_evas_size_max_set (e->gui.ee, w, h);
- ecore_evas_size_min_set (e->gui.ee, w, h);
+ if (e->gui.ee) {
+ ecore_evas_resize (e->gui.ee, w, h);
+ ecore_evas_size_max_set (e->gui.ee, w, h);
+ ecore_evas_size_min_set (e->gui.ee, w, h);
+ }
return evas_list_count (e->mailboxes);
}
@@ -310,7 +303,7 @@
snprintf (eet, sizeof (eet), DATA_DIR "/themes/%s.edj", name);
- return stat(eet, &st) ? NULL : eet;
+ return stat (eet, &st) ? NULL : eet;
}
static bool config_load_misc (Embrace *e, E_DB_File *edb)
@@ -456,14 +449,16 @@
return false;
}
- /* set min/max sizes */
- edje_object_size_max_get (e->gui.edje, &w, &h);
- ecore_evas_size_max_set (e->gui.ee, w, h);
-
- edje_object_size_min_get (e->gui.edje, &w, &h);
- ecore_evas_size_min_set (e->gui.ee, (int) w, (int) h);
- evas_object_resize (e->gui.edje, w, h);
- ecore_evas_resize (e->gui.ee, (int) w, (int) h);
+ if (e->gui.ee) {
+ /* set min/max sizes */
+ edje_object_size_max_get (e->gui.edje, &w, &h);
+ ecore_evas_size_max_set (e->gui.ee, w, h);
+
+ edje_object_size_min_get (e->gui.edje, &w, &h);
+ ecore_evas_size_min_set (e->gui.ee, (int) w, (int) h);
+ evas_object_resize (e->gui.edje, w, h);
+ ecore_evas_resize (e->gui.ee, (int) w, (int) h);
+ }
evas_object_pass_events_set (e->gui.edje, true);
evas_object_show (e->gui.edje);
@@ -505,6 +500,8 @@
int w = 0, h = 0;
assert (e);
+ if (e->cfg.module)
+ return true;
if (!(val = edje_object_data_get (e->gui.edje, "trans_bg")))
return true;
@@ -542,6 +539,8 @@
Evas_Object *dragger;
assert (e);
+ if (e->cfg.module)
+ return true;
if (!(dragger = esmart_draggies_new (e->gui.ee)))
return false;
@@ -564,21 +563,23 @@
char path[PATH_MAX + 1];
assert (e);
+ if (!e->cfg.module) {
#ifdef HAVE_ECORE_EVAS_GL
- if (!strcasecmp (e->cfg.evas_engine, "gl"))
- e->gui.ee = ecore_evas_gl_x11_new (NULL, 0, 0, 0, 0, 0);
- else
+ if (!strcasecmp (e->cfg.evas_engine, "gl"))
+ e->gui.ee = ecore_evas_gl_x11_new (NULL, 0, 0, 0, 0, 0);
+ else
#endif
- e->gui.ee = ecore_evas_software_x11_new (NULL, 0, 0, 0, 0, 0);
+ e->gui.ee = ecore_evas_software_x11_new (NULL, 0, 0, 0,
0, 0);
- if (!e->gui.ee)
- return false;
+ if (!e->gui.ee)
+ return false;
- ecore_evas_title_set (e->gui.ee, "Embrace");
- ecore_evas_name_class_set (e->gui.ee, "embrace", "Embrace");
- ecore_evas_borderless_set (e->gui.ee, true);
+ ecore_evas_title_set (e->gui.ee, "Embrace");
+ ecore_evas_name_class_set (e->gui.ee, "embrace", "Embrace");
+ ecore_evas_borderless_set (e->gui.ee, true);
- e->gui.evas = ecore_evas_get (e->gui.ee);
+ e->gui.evas = ecore_evas_get (e->gui.ee);
+ }
embrace_expand_path ("~/.fonts", path, sizeof (path));
evas_font_path_append (e->gui.evas, path);
@@ -597,13 +598,15 @@
if (!ui_load_container (e))
return false;
- ecore_evas_callback_pre_render_set (e->gui.ee, on_pre_render);
- ecore_evas_callback_post_render_set (e->gui.ee, on_post_render);
- ecore_evas_callback_delete_request_set (e->gui.ee, on_delete_request);
- ecore_evas_callback_resize_set (e->gui.ee, on_resize);
+ if (e->gui.ee) {
+ ecore_evas_callback_pre_render_set (e->gui.ee, on_pre_render);
+ ecore_evas_callback_post_render_set (e->gui.ee, on_post_render);
+ ecore_evas_callback_delete_request_set (e->gui.ee,
on_delete_request);
+ ecore_evas_callback_resize_set (e->gui.ee, on_resize);
- if (evas_object_name_find (e->gui.evas, "trans"))
- ecore_evas_callback_move_set (e->gui.ee, on_move);
+ if (evas_object_name_find (e->gui.evas, "trans"))
+ ecore_evas_callback_move_set (e->gui.ee, on_move);
+ }
return true;
}
@@ -663,11 +666,17 @@
assert (e);
if (e->gui.container) {
- edje_object_part_unswallow (e->gui.edje, e->gui.container);
+ if (e->gui.edje)
+ edje_object_part_unswallow (e->gui.edje,
e->gui.container);
evas_object_del (e->gui.container);
e->gui.container = NULL;
}
+ if (e->gui.edje) {
+ evas_object_del (e->gui.edje);
+ e->gui.edje = NULL;
+ }
+
if (e->gui.ee) {
ecore_evas_free (e->gui.ee);
e->gui.ee = NULL;
@@ -708,6 +717,8 @@
{NULL, 0, NULL, 0}};
assert (e);
+ if (e->cfg.module)
+ return true;
ecore_app_args_get (&argc, &argv);
@@ -793,21 +804,23 @@
{
assert (e);
- ecore_evas_show (e->gui.ee);
+ if (e->gui.ee)
+ ecore_evas_show (e->gui.ee);
ecore_idler_add (check_mailboxes, e);
- e->evt_hup = ecore_event_handler_add (ECORE_EVENT_SIGNAL_HUP,
- on_sighup, e);
- assert (e->evt_hup);
+ if (!e->cfg.module) {
+ e->evt_hup = ecore_event_handler_add (ECORE_EVENT_SIGNAL_HUP,
+ on_sighup, e);
+ assert (e->evt_hup);
+ }
}
void embrace_stop (Embrace *e)
{
assert (e);
- assert (e->evt_hup);
-
- ecore_event_handler_del (e->evt_hup);
+ if (e->evt_hup)
+ ecore_event_handler_del (e->evt_hup);
e->evt_hup = NULL;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/embrace/src/embrace.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- embrace.h 23 Apr 2004 16:02:53 -0000 1.4
+++ embrace.h 25 Aug 2005 19:42:14 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: embrace.h,v 1.4 2004/04/23 16:02:53 tsauerbeck Exp $
+ * $Id: embrace.h,v 1.5 2005/08/25 19:42:14 sebastid Exp $
*
* Copyright (C) 2004 Embrace project.
*
@@ -24,11 +24,11 @@
#include <Ecore.h>
#include <Ecore_Evas.h>
#include <Edje.h>
-#include <limits.h>
typedef struct {
char theme[PATH_MAX + 1];
char evas_engine[255];
+ int module;
} Config;
typedef struct {
===================================================================
RCS file: /cvsroot/enlightenment/misc/embrace/src/embrace_plugin.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- embrace_plugin.h 31 Mar 2004 18:28:46 -0000 1.2
+++ embrace_plugin.h 25 Aug 2005 19:42:14 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: embrace_plugin.h,v 1.2 2004/03/31 18:28:46 tsauerbeck Exp $
+ * $Id: embrace_plugin.h,v 1.3 2005/08/25 19:42:14 sebastid Exp $
*
* Copyright (C) 2004 Embrace project.
*
@@ -20,7 +20,6 @@
#ifndef __EMBRACE_PLUGIN_H
#define __EMBRACE_PLUGIN_H
-#include <Edb.h>
#include "mailbox.h"
#include "embrace.h"
===================================================================
RCS file: /cvsroot/enlightenment/misc/embrace/src/mailbox.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- mailbox.c 30 Jan 2005 18:07:32 -0000 1.9
+++ mailbox.c 25 Aug 2005 19:42:14 -0000 1.10
@@ -1,5 +1,5 @@
/*
- * $Id: mailbox.c,v 1.9 2005/01/30 18:07:32 tsauerbeck Exp $
+ * $Id: mailbox.c,v 1.10 2005/08/25 19:42:14 sebastid Exp $
*
* Copyright (C) 2004 Embrace project.
*
@@ -21,12 +21,8 @@
# include <config.h>
#endif
-#include <Edje.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <assert.h>
-
-#include "embrace.h"
+#include <Evas.h>
typedef struct {
Evas_Object *edje;
===================================================================
RCS file: /cvsroot/enlightenment/misc/embrace/src/mailbox.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mailbox.h 17 Apr 2004 15:13:45 -0000 1.2
+++ mailbox.h 25 Aug 2005 19:42:14 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: mailbox.h,v 1.2 2004/04/17 15:13:45 tsauerbeck Exp $
+ * $Id: mailbox.h,v 1.3 2005/08/25 19:42:14 sebastid Exp $
*
* Copyright (C) 2004 Embrace project.
*
@@ -21,7 +21,6 @@
#define __MAILBOX_H
#include <Evas.h>
-#include <Ecore.h>
#include <Edb.h>
#ifndef __MAILBOX_C
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
