Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : proto
Dir : e17/proto/esmart/src/container
Modified Files:
Makefile.am container.c container_element.c container_plugin.c
container_private.h container_smart.c container_util.c
Added Files:
Esmart_Container.h
Removed Files:
container.h
Log Message:
i wonder if anyone will notice :P
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 13 Jan 2004 19:26:41 -0000 1.3
+++ Makefile.am 22 Apr 2004 16:32:03 -0000 1.4
@@ -9,10 +9,10 @@
noinst_LTLIBRARIES = libecontainer.la
installed_headers_DATA = \
- container.h
+ Esmart_Container.h
libecontainer_la_SOURCES = \
- container.c container.h \
+ container.c Esmart_Container.h \
container_element.c \
container_smart.c \
container_plugin.c container_plugin.h \
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- container.c 24 Mar 2004 07:24:36 -0000 1.13
+++ container.c 22 Apr 2004 16:32:03 -0000 1.14
@@ -8,14 +8,14 @@
#include <Evas.h>
#include <math.h>
-#include "container.h"
+#include "Esmart_Container.h"
#include "container_private.h"
int _container_scroll_timer(void *data);
/*** external API ***/
-void e_container_sort(Evas_Object *container, int (*func)(void*,void*))
+void esmart_container_sort(Evas_Object *container, int (*func)(void*,void*))
{
Container *cont;
@@ -26,7 +26,7 @@
func);
_container_elements_fix(cont);
}
-void e_container_direction_set(Evas_Object *container, int direction)
+void esmart_container_direction_set(Evas_Object *container, int direction)
{
Container *cont;
@@ -39,7 +39,7 @@
_container_elements_fix(cont);
}
-int e_container_direction_get(Evas_Object *container)
+int esmart_container_direction_get(Evas_Object *container)
{
Container *cont;
@@ -49,7 +49,7 @@
return cont->direction;
}
-void e_container_padding_set(Evas_Object *container, double l, double r,
+void esmart_container_padding_set(Evas_Object *container, double l, double r,
double t, double b)
{
Container *cont;
@@ -71,7 +71,7 @@
_container_elements_fix(cont);
}
-void e_container_padding_get(Evas_Object *container, double *l, double *r,
+void esmart_container_padding_get(Evas_Object *container, double *l, double *r,
double *t, double *b)
{
Container *cont;
@@ -84,7 +84,7 @@
if (b) *b = cont->padding.b;
}
-void e_container_scroll(Evas_Object *container, int val)
+void esmart_container_scroll(Evas_Object *container, int val)
{
Container *cont;
double size, length, pad, max_scroll;
@@ -92,7 +92,7 @@
if(!(cont = _container_fetch(container)))
return;
- length = e_container_elements_length_get(container);
+ length = esmart_container_elements_length_get(container);
size = cont->direction ? cont->h : cont->w;
/* don't scroll unless the elements exceed the size of the container */
@@ -115,7 +115,7 @@
_container_elements_fix(cont);
}
-void e_container_scroll_offset_set(Evas_Object *container, int scroll_offset)
+void esmart_container_scroll_offset_set(Evas_Object *container, int scroll_offset)
{
Container *cont;
@@ -128,7 +128,7 @@
_container_elements_fix(cont);
}
-int e_container_scroll_offset_get(Evas_Object *container)
+int esmart_container_scroll_offset_get(Evas_Object *container)
{
Container *cont;
@@ -138,7 +138,7 @@
}
-void e_container_alignment_set(Evas_Object *container,
+void esmart_container_alignment_set(Evas_Object *container,
Container_Alignment align)
{
Container *cont;
@@ -154,7 +154,7 @@
}
-Container_Alignment e_container_alignment_get(Evas_Object *container)
+Container_Alignment esmart_container_alignment_get(Evas_Object *container)
{
Container *cont;
@@ -164,7 +164,7 @@
return cont->align;
}
-void e_container_fill_policy_set(Evas_Object *container,
+void esmart_container_fill_policy_set(Evas_Object *container,
Container_Fill_Policy fill)
{
Container *cont;
@@ -181,7 +181,7 @@
}
-Container_Fill_Policy e_container_fill_policy_get(Evas_Object *container)
+Container_Fill_Policy esmart_container_fill_policy_get(Evas_Object *container)
{
Container *cont;
@@ -191,7 +191,7 @@
return cont->fill;
}
-void e_container_spacing_set(Evas_Object *container, int spacing)
+void esmart_container_spacing_set(Evas_Object *container, int spacing)
{
Container *cont;
@@ -204,7 +204,7 @@
_container_elements_fix(cont);
}
-int e_container_spacing_get(Evas_Object *container)
+int esmart_container_spacing_get(Evas_Object *container)
{
Container *cont;
@@ -214,7 +214,7 @@
return cont->spacing;
}
-void e_container_move_button_set(Evas_Object *container, int move_button)
+void esmart_container_move_button_set(Evas_Object *container, int move_button)
{
Container *cont;
@@ -226,7 +226,7 @@
cont->move_button = move_button;
}
-int e_container_move_button_get(Evas_Object *container)
+int esmart_container_move_button_get(Evas_Object *container)
{
Container *cont;
@@ -236,7 +236,7 @@
return cont->move_button;
}
-void e_container_callback_order_change_set(Evas_Object *container, void (*func)(void
*data), void *data)
+void esmart_container_callback_order_change_set(Evas_Object *container, void
(*func)(void *data), void *data)
{
Container *cont;
@@ -248,7 +248,7 @@
}
double
-e_container_elements_length_get(Evas_Object *container)
+esmart_container_elements_length_get(Evas_Object *container)
{
Container *cont;
Evas_List *l;
@@ -277,7 +277,7 @@
}
void
-e_container_scroll_start(Evas_Object *container, double velocity)
+esmart_container_scroll_start(Evas_Object *container, double velocity)
{
Container *cont = _container_fetch(container);
if (!cont) return;
@@ -287,7 +287,7 @@
}
void
-e_container_scroll_stop(Evas_Object *container)
+esmart_container_scroll_stop(Evas_Object *container)
{
Container *cont;
@@ -299,7 +299,7 @@
}
void
-e_container_scroll_to(Evas_Object *container, Evas_Object *element)
+esmart_container_scroll_to(Evas_Object *container, Evas_Object *element)
{
Container *cont;
Container_Element *el;
@@ -314,7 +314,7 @@
}
double
-e_container_elements_orig_length_get(Evas_Object *container)
+esmart_container_elements_orig_length_get(Evas_Object *container)
{
Container *cont;
Evas_List *l;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container_element.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- container_element.c 8 Mar 2004 20:11:58 -0000 1.7
+++ container_element.c 22 Apr 2004 16:32:03 -0000 1.8
@@ -1,9 +1,9 @@
-#include "container.h"
+#include "Esmart_Container.h"
#include "container_private.h"
/*** element API ***/
-void e_container_element_append(Evas_Object *container, Evas_Object *element)
+void esmart_container_element_append(Evas_Object *container, Evas_Object *element)
{
Container *cont;
Container_Element *el = NULL;
@@ -20,7 +20,7 @@
_container_elements_fix(cont);
}
-void e_container_element_prepend(Evas_Object *container, Evas_Object *element)
+void esmart_container_element_prepend(Evas_Object *container, Evas_Object *element)
{
Container *cont;
Container_Element *el;
@@ -37,7 +37,7 @@
_container_elements_fix(cont);
}
-void e_container_element_append_relative(Evas_Object *container,
+void esmart_container_element_append_relative(Evas_Object *container,
Evas_Object *element,
Evas_Object *relative)
{
@@ -59,7 +59,7 @@
_container_elements_fix(cont);
}
-void e_container_element_prepend_relative(Evas_Object *container,
+void esmart_container_element_prepend_relative(Evas_Object *container,
Evas_Object *element,
Evas_Object *relative)
{
@@ -81,7 +81,7 @@
_container_elements_fix(cont);
}
-void e_container_element_remove(Evas_Object *container, Evas_Object *element)
+void esmart_container_element_remove(Evas_Object *container, Evas_Object *element)
{
Container *cont;
Container_Element *el;
@@ -90,7 +90,7 @@
cont = _container_fetch(container);
if (!cont) return;
- old_length = e_container_elements_length_get(container);
+ old_length = esmart_container_elements_length_get(container);
el = evas_object_data_get(element, "Container_Element");
cont->elements = evas_list_remove(cont->elements, el);
@@ -100,7 +100,7 @@
_container_scale_scroll(cont, old_length);
}
-void e_container_element_destroy(Evas_Object *container, Evas_Object
+void esmart_container_element_destroy(Evas_Object *container, Evas_Object
*element)
{
Container *cont;
@@ -110,7 +110,7 @@
cont = _container_fetch(container);
if (!cont) return;
- old_length = e_container_elements_length_get(container);
+ old_length = esmart_container_elements_length_get(container);
el = evas_object_data_get(element, "Container_Element");
evas_object_del (el->obj);
@@ -123,7 +123,7 @@
_container_scale_scroll(cont, old_length);
}
-void e_container_empty (Evas_Object *container)
+void esmart_container_empty (Evas_Object *container)
{
Container *cont;
@@ -147,7 +147,7 @@
}
-Evas_List *e_container_elements_get(Evas_Object *container)
+Evas_List *esmart_container_elements_get(Evas_Object *container)
{
Container *cont;
Evas_List *l, *ll = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container_plugin.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- container_plugin.c 24 Jan 2004 20:20:52 -0000 1.9
+++ container_plugin.c 22 Apr 2004 16:32:03 -0000 1.10
@@ -7,7 +7,7 @@
#include <stdio.h>
#include <string.h>
#include <limits.h>
-#include "container.h"
+#include "Esmart_Container.h"
#include "container_private.h"
@@ -126,7 +126,7 @@
/* returns 0 on error, nonzero if ok */
int
-e_container_layout_plugin_set(Evas_Object *container, const char *plugin)
+esmart_container_layout_plugin_set(Evas_Object *container, const char *plugin)
{
Container *cont = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container_private.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- container_private.h 24 Jan 2004 20:20:54 -0000 1.4
+++ container_private.h 22 Apr 2004 16:32:03 -0000 1.5
@@ -1,7 +1,7 @@
#ifndef CONTAINER_PRIVATE_H
#define CONTAINER_PRIVATE_H
-#include "container.h"
+#include "Esmart_Container.h"
Container *_container_fetch(Evas_Object *obj);
Container_Element *_container_element_new(Container *cont, Evas_Object *obj);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container_smart.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- container_smart.c 29 Jan 2004 22:26:50 -0000 1.12
+++ container_smart.c 22 Apr 2004 16:32:03 -0000 1.13
@@ -1,4 +1,4 @@
-#include "container.h"
+#include "Esmart_Container.h"
#include "container_private.h"
/* smart object handlers */
@@ -24,7 +24,7 @@
/****** Public API *******/
Evas_Object *
-e_container_new(Evas *evas)
+esmart_container_new(Evas *evas)
{
Evas_Object *container;
@@ -35,7 +35,7 @@
if (!cont) printf("wtf! (%s)\n", evas_object_type_get(container));
}
/* load the default layout plugin */
- if (!e_container_layout_plugin_set(container, "default"))
+ if (!esmart_container_layout_plugin_set(container, "default"))
{
evas_object_del(container);
return NULL;
@@ -112,7 +112,7 @@
data = _container_fetch(obj);
- e_container_empty(obj);
+ esmart_container_empty(obj);
_container_layout_plugin_free(data->plugin);
free(data);
}
@@ -246,7 +246,7 @@
if (w == data->w && h == data->h) return;
- old_length = e_container_elements_length_get(obj);
+ old_length = esmart_container_elements_length_get(obj);
evas_object_resize(data->clipper, w, h);
evas_object_resize(data->grabber, w, h);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/esmart/src/container/container_util.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- container_util.c 13 Jan 2004 19:26:41 -0000 1.4
+++ container_util.c 22 Apr 2004 16:32:03 -0000 1.5
@@ -1,5 +1,5 @@
#include <sys/stat.h>
-#include "container.h"
+#include "Esmart_Container.h"
#include "container_private.h"
Container *
@@ -21,7 +21,7 @@
int new_scroll;
double new_length;
- new_length = e_container_elements_length_get(cont->obj);
+ new_length = esmart_container_elements_length_get(cont->obj);
if (new_length < (cont->direction ? cont->h : cont->w))
{
@@ -30,7 +30,7 @@
else
new_scroll = cont->scroll_offset * (new_length / old_length);
- e_container_scroll_offset_set(cont->obj, new_scroll);
+ esmart_container_scroll_offset_set(cont->obj, new_scroll);
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
