pass make distcheck :)

SVN revision: 5027

diff --git a/Makefile.am b/Makefile.am
index fa972a8..7b0514c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ install-data-local:
        if test -d $(srcdir)/data; then \
          $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data; \
          for d in $(srcdir)/data/*; do \
-             cp -dpRf $$d $(DESTDIR)$(pkgdatadir)/data; \
+             cp @CP_OPTIONS@ -f $$d $(DESTDIR)$(pkgdatadir)/data; \
          done \
        fi
 
@@ -20,7 +20,7 @@ dist-hook:
        if test -d data; then \
          mkdir $(distdir)/data; \
          for d in data/*; do \
-             cp -dpR $$d $(distdir)/data; \
+             cp @CP_OPTIONS@ $$d $(distdir)/data; \
          done \
        fi
 

diff --git a/configure.in b/configure.in
index 7944f8b..9e65107 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,6 +2,20 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.in)
 
+# BAH - ugly. bloody operating systems. figure out per os options for cp
+# defaults
+CP_OPTIONS="-ar"
+
+AC_CANONICAL_SYSTEM
+case "$build_os" in
+*olaris*)
+  CP_OPTIONS="-ar";
+  ;;
+*BSD*)
+  CP_OPTIONS="-dpR";
+  ;;
+esac
+
 ENLIGHTENMENT_MAJOR=0
 ENLIGHTENMENT_MINOR=17
 ENLIGHTENMENT_MICRO=pre_0
@@ -111,6 +125,8 @@ AC_SUBST(ecore_libs)
 AC_SUBST(efsd_cflags)
 AC_SUBST(efsd_libs)
 
+AC_SUBST(CP_OPTIONS)
+
 AC_OUTPUT([
 Makefile src/Makefile lib/Makefile client/Makefile intl/Makefile po/Makefile.in
 ])

diff --git a/po/e.pot b/po/enlightenment.pot
similarity index 100%
rename from po/e.pot
rename to po/enlightenment.pot

diff --git a/src/Makefile.am b/src/Makefile.am
index be9bd6b..24e94dd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,12 +11,12 @@ enlightenment_SOURCES = \
        background.h background.c \
        border.h border.c \
        config.h config.c \
-       destops.h desktops.c \
+       desktops.h desktops.c \
        entry.h entry.c \
        exec.h exec.c \
        fs.h fs.c \
        icccm.h icccm.c \
-       icons.h icons.c \
+       icons.c \
        ipc.h ipc.c \
        keys.h keys.c \
        main.c \

diff --git a/src/text.c b/src/text.c
index dd3e160..b8f6363 100644 (file)
--- a/src/text.c
+++ b/src/text.c
@@ -15,10 +15,21 @@ e_text_new(Evas evas, char *text, char *class)
    t->evas = evas;
    t->obj = evas_add_text(t->evas, "borzoib", 8, t->text);
    evas_set_color(t->evas, t->obj, 0, 0, 0, 255);
+   t->color.r = 0;
+   t->color.g = 0;
+   t->color.b = 0;
+   t->color.a = 255;
+   t->w = evas_get_text_width(t->evas, t->obj);
+   t->h = evas_get_text_height(t->evas, t->obj);
+   t->min.w = t->w;
+   t->min.h = t->h;
+   t->max.w = t->w;
+   t->max.h = t->h;
    return t;
 }
 
-void    e_text_free(E_Text *t)
+void
+e_text_free(E_Text *t)
 {
    IF_FREE(t->state);
    IF_FREE(t->class);
@@ -31,19 +42,126 @@ void    e_text_free(E_Text *t)
    FREE(t);
 }
 
-void    e_text_set_text(E_Text *t){}
-void    e_text_set_layer(E_Text *t, int l){}
-void    e_text_set_clip(E_Text *t, Evas_Object clip){}
-void    e_text_unset_clip(E_Text *t){}
-void    e_text_raise(E_Text *t){}
-void    e_text_lower(E_Text *t){}
-void    e_text_show(E_Text *t){}
-void    e_text_hide(E_Text *t){}
-void    e_text_set_color(E_Text *t, int r, int g, int b, int a){}
-void    e_text_move(E_Text *t, double x, double y){}
-void    e_text_resize(E_Text *t, double w, double h){}
-void    e_text_get_geometry(E_Text *t, double *x, double *y, double *w, double *h){}
-void    e_text_get_min_size(E_Text *t, double *w, double *h){}
-void    e_text_get_max_size(E_Text *t, double *w, double *h){}
-void    e_text_set_state(E_Text *t, char *state){}
-                           
+void
+e_text_set_text(E_Text *t, char *text)
+{
+   if (!text) text = "";
+   if (!strcmp(t->text, text)) return;
+   IF_FREE(t->text);
+   t->text = strdup(text);
+   evas_set_text(t->evas, t->obj, t->text);
+}
+
+void
+e_text_set_layer(E_Text *t, int l)
+{
+   if (t->layer == l) return;
+   t->layer = l;
+   evas_set_layer(t->evas, t->obj, t->layer);
+}
+
+void
+e_text_set_clip(E_Text *t, Evas_Object clip)
+{
+   evas_set_clip(t->evas, t->obj, clip);
+}
+
+void
+e_text_unset_clip(E_Text *t)
+{
+   evas_unset_clip(t->evas, t->obj);
+}
+
+void
+e_text_raise(E_Text *t)
+{
+   evas_raise(t->evas, t->obj);
+}
+
+void
+e_text_lower(E_Text *t)
+{
+   evas_lower(t->evas, t->obj);
+}
+
+void
+e_text_show(E_Text *t)
+{
+   if (t->visible) return;
+   t->visible = 1;
+   evas_show(t->evas, t->obj);
+}
+
+void
+e_text_hide(E_Text *t)
+{
+   if (!t->visible) return;
+   t->visible = 0;
+   evas_hide(t->evas, t->obj);
+}
+
+void
+e_text_set_color(E_Text *t, int r, int g, int b, int a)
+{
+   if ((r == t->color.r) &&
+       (g == t->color.g) &&
+       (b == t->color.b) &&
+       (a == t->color.a)) return;
+   t->color.r = r;
+   t->color.g = g;
+   t->color.b = b;
+   t->color.a = a;
+   evas_set_color(t->evas, t->obj, t->color.r, t->color.g, t->color.b, t->color.a);
+}
+
+void
+e_text_move(E_Text *t, double x, double y)
+{
+   if ((t->x == x) && (t->y == y)) return;
+   t->x = x;
+   t->y = y;
+   evas_move(t->evas, t->obj, t->x, t->y);
+}
+
+void
+e_text_resize(E_Text *t, double w, double h)
+{
+}
+
+void
+e_text_get_geometry(E_Text *t, double *x, double *y, double *w, double *h)
+{
+   if (x) *x = t->x;
+   if (y) *y = t->y;
+   if (w) *w = t->w;
+   if (h) *h = t->h;
+}
+
+void
+e_text_get_min_size(E_Text *t, double *w, double *h)
+{
+   if (w) *w = t->min.w;
+   if (h) *h = t->min.h;
+}
+
+void
+e_text_get_max_size(E_Text *t, double *w, double *h)
+{
+   if (w) *w = t->max.w;
+   if (h) *h = t->max.h;
+}
+
+void
+e_text_set_state(E_Text *t, char *state)
+{
+}
+
+void
+e_text_set_class(E_Text *t, char *class)
+{
+}
+
+void
+e_text_update_class(E_Text *t)
+{
+}

diff --git a/src/text.h b/src/text.h
index 6dd1913..3806e73 100644 (file)
--- a/src/text.h
+++ b/src/text.h
@@ -27,7 +27,7 @@ struct _E_Text
 
 E_Text *e_text_new(Evas evas, char *text, char *class);
 void    e_text_free(E_Text *t);
-void    e_text_set_text(E_Text *t);
+void    e_text_set_text(E_Text *t, char *text);
 void    e_text_set_layer(E_Text *t, int l);
 void    e_text_set_clip(E_Text *t, Evas_Object clip);
 void    e_text_unset_clip(E_Text *t);
@@ -42,5 +42,6 @@ void    e_text_get_geometry(E_Text *t, double *x, double *y, double *w, double *
 void    e_text_get_min_size(E_Text *t, double *w, double *h);
 void    e_text_get_max_size(E_Text *t, double *w, double *h);
 void    e_text_set_state(E_Text *t, char *state);
-
+void    e_text_set_class(E_Text *t, char *class);
+void    e_text_update_class(E_Text *t);
 #endif