Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_clip.c evas_layer.c evas_object_main.c
evas_object_smart.c evas_smart.c evas_stack.c
Log Message:
get rid of useless shm check.... and other things (cant remember)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_clip.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_clip.c 5 Mar 2003 02:30:14 -0000 1.4
+++ evas_clip.c 9 Oct 2003 03:05:17 -0000 1.5
@@ -123,8 +123,8 @@
if (obj->cur.clipper == clip) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_clip_set)
- obj->smart.smart->func_clip_set(obj, clip);
+ if (obj->smart.smart->smart_class->clip_set)
+ obj->smart.smart->smart_class->clip_set(obj, clip);
}
if (obj->cur.clipper)
{
@@ -180,8 +180,8 @@
/* unclip */
if (obj->smart.smart)
{
- if (obj->smart.smart->func_clip_unset)
- obj->smart.smart->func_clip_unset(obj);
+ if (obj->smart.smart->smart_class->clip_unset)
+ obj->smart.smart->smart_class->clip_unset(obj);
}
obj->cur.clipper->clip.clipees = evas_list_remove(obj->cur.clipper->clip.clipees,
obj);
obj->cur.clipper = NULL;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_layer.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_layer.c 30 Jul 2003 02:58:10 -0000 1.6
+++ evas_layer.c 9 Oct 2003 03:05:17 -0000 1.7
@@ -140,8 +140,8 @@
}
if (obj->smart.smart)
{
- if (obj->smart.smart->func_layer_set)
- obj->smart.smart->func_layer_set(obj, l);
+ if (obj->smart.smart->smart_class->layer_set)
+ obj->smart.smart->smart_class->layer_set(obj, l);
}
e = obj->layer->evas;
evas_object_release(obj, 1);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas_object_main.c 30 Jul 2003 02:58:10 -0000 1.15
+++ evas_object_main.c 9 Oct 2003 03:05:17 -0000 1.16
@@ -446,8 +446,8 @@
if (evas_object_intercept_call_move(obj, x, y)) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_move)
- obj->smart.smart->func_move(obj, x, y);
+ if (obj->smart.smart->smart_class->move)
+ obj->smart.smart->smart_class->move(obj, x, y);
}
if ((obj->cur.geometry.x == x) &&
(obj->cur.geometry.y == y))
@@ -498,8 +498,8 @@
if (evas_object_intercept_call_resize(obj, w, h)) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_resize)
- obj->smart.smart->func_resize(obj, w, h);
+ if (obj->smart.smart->smart_class->resize)
+ obj->smart.smart->smart_class->resize(obj, w, h);
}
if ((obj->cur.geometry.w == w) &&
(obj->cur.geometry.h == h))
@@ -565,8 +565,8 @@
if (evas_object_intercept_call_show(obj)) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_show)
- obj->smart.smart->func_show(obj);
+ if (obj->smart.smart->smart_class->show)
+ obj->smart.smart->smart_class->show(obj);
}
if (obj->cur.visible)
{
@@ -606,8 +606,8 @@
if (evas_object_intercept_call_hide(obj)) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_hide)
- obj->smart.smart->func_hide(obj);
+ if (obj->smart.smart->smart_class->hide)
+ obj->smart.smart->smart_class->hide(obj);
}
if (!obj->cur.visible)
{
@@ -686,8 +686,8 @@
if (a > 255) a = 255; if (a < 0) a = 0;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_color_set)
- obj->smart.smart->func_color_set(obj, r, g, b, a);
+ if (obj->smart.smart->smart_class->color_set)
+ obj->smart.smart->smart_class->color_set(obj, r, g, b, a);
}
if ((obj->cur.color.r == r) &&
(obj->cur.color.g == g) &&
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_smart.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_object_smart.c 5 Mar 2003 02:30:19 -0000 1.7
+++ evas_object_smart.c 9 Oct 2003 03:05:17 -0000 1.8
@@ -179,13 +179,13 @@
obj = evas_object_new();
if (!obj) return NULL;
obj->smart.smart = s;
- obj->type = s->name;
+ obj->type = s->smart_class->name;
evas_object_smart_init(obj);
evas_object_inject(obj, e);
evas_object_smart_use(s);
- if (s->func_add) s->func_add(obj);
+ if (s->smart_class->add) s->smart_class->add(obj);
return obj;
}
@@ -325,7 +325,7 @@
Evas_Smart *s;
s = obj->smart.smart;
- if ((s) && (s->func_del)) s->func_del(obj);
+ if ((s) && (s->smart_class->del)) s->smart_class->del(obj);
if (obj->smart.parent) evas_object_smart_member_del(obj);
if (s) evas_object_smart_unuse(s);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_smart.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_smart.c 5 Mar 2003 02:30:20 -0000 1.3
+++ evas_smart.c 9 Oct 2003 03:05:17 -0000 1.4
@@ -37,28 +37,30 @@
s->magic = MAGIC_SMART;
- s->name = strdup(name);
- if (!s->name)
+ s->class_allocated = 1;
+
+ s->smart_class = evas_mem_calloc(sizeof(Evas_Smart_Class));
+ if (!s->smart_class)
{
free(s);
return NULL;
}
-
- s->func_add = func_add;
- s->func_del = func_del;
- s->func_layer_set = func_layer_set;
- s->func_raise = func_raise;
- s->func_lower = func_lower;
- s->func_stack_above = func_stack_above;
- s->func_stack_below = func_stack_below;
- s->func_move = func_move;
- s->func_resize = func_resize;
- s->func_show = func_show;
- s->func_hide = func_hide;
- s->func_color_set = func_color_set;
- s->func_clip_set = func_clip_set;
- s->func_clip_unset = func_clip_unset;
- s->data = (void *)data;
+ s->smart_class->name = name;
+ s->smart_class->add = func_add;
+ s->smart_class->del = func_del;
+ s->smart_class->layer_set = func_layer_set;
+ s->smart_class->raise = func_raise;
+ s->smart_class->lower = func_lower;
+ s->smart_class->stack_above = func_stack_above;
+ s->smart_class->stack_below = func_stack_below;
+ s->smart_class->move = func_move;
+ s->smart_class->resize = func_resize;
+ s->smart_class->show = func_show;
+ s->smart_class->hide = func_hide;
+ s->smart_class->color_set = func_color_set;
+ s->smart_class->clip_set = func_clip_set;
+ s->smart_class->clip_unset = func_clip_unset;
+ s->smart_class->data = (void *)data;
return s;
}
@@ -77,7 +79,7 @@
MAGIC_CHECK_END();
s->delete_me = 1;
if (s->usage > 0) return;
- if (s->name) free(s->name);
+ if (s->class_allocated) free(s->smart_class);
free(s);
}
@@ -87,13 +89,51 @@
* FIXME: To be fixed.
*
*/
+Evas_Smart *
+evas_smart_class_new(Evas_Smart_Class *sc)
+{
+ Evas_Smart *s;
+
+ if (!sc) return NULL;
+
+ s = evas_mem_calloc(sizeof(Evas_Smart));
+ if (!s) return NULL;
+
+ s->magic = MAGIC_SMART;
+
+ s->smart_class = sc;
+
+ return s;
+}
+
+/**
+ * To be documented.
+ *
+ * FIXME: To be fixed.
+ *
+ */
+Evas_Smart_Class *
+evas_smart_class_get(Evas_Smart *s)
+{
+ MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
+ return NULL;
+ MAGIC_CHECK_END();
+ return s->smart_class;
+}
+
+/**
+ * To be documented.
+ *
+ * FIXME: To be fixed.
+ *
+ */
void *
evas_smart_data_get(Evas_Smart *s)
{
MAGIC_CHECK(s, Evas_Smart, MAGIC_SMART);
return NULL;
MAGIC_CHECK_END();
- return s->data;
+ return s->smart_class->data;
}
/* internal funcs */
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_stack.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_stack.c 22 Jul 2003 05:16:47 -0000 1.5
+++ evas_stack.c 9 Oct 2003 03:05:17 -0000 1.6
@@ -56,8 +56,8 @@
if (evas_object_intercept_call_raise(obj)) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_raise)
- obj->smart.smart->func_raise(obj);
+ if (obj->smart.smart->smart_class->raise)
+ obj->smart.smart->smart_class->raise(obj);
}
if (!(((Evas_Object_List *)obj)->next))
{
@@ -102,8 +102,8 @@
if (evas_object_intercept_call_lower(obj)) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_lower)
- obj->smart.smart->func_lower(obj);
+ if (obj->smart.smart->smart_class->lower)
+ obj->smart.smart->smart_class->lower(obj);
}
if (!(((Evas_Object_List *)obj)->prev))
{
@@ -151,8 +151,8 @@
if (evas_object_intercept_call_stack_above(obj, above)) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_stack_above)
- obj->smart.smart->func_stack_above(obj, above);
+ if (obj->smart.smart->smart_class->stack_above)
+ obj->smart.smart->smart_class->stack_above(obj, above);
}
if (above->layer != obj->layer)
{
@@ -205,8 +205,8 @@
if (evas_object_intercept_call_stack_below(obj, below)) return;
if (obj->smart.smart)
{
- if (obj->smart.smart->func_stack_below)
- obj->smart.smart->func_stack_below(obj, below);
+ if (obj->smart.smart->smart_class->stack_below)
+ obj->smart.smart->smart_class->stack_below(obj, below);
}
if (below->layer != obj->layer)
{
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
