Menu
▾
▴
enlightenment-cvs
|
From: Enlightenment C. <no...@cv...> - 2008-07-18 14:17:08
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_inline.x evas_private.h
Log Message:
fix build. build properly.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_inline.x,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_inline.x 18 Jul 2008 11:11:04 -0000 1.6
+++ evas_inline.x 18 Jul 2008 14:17:05 -0000 1.7
@@ -202,4 +202,6 @@
obj->cur.cache.clip.dirty = 0;
}
+#include "data/evas_inline_array.x"
+
#endif
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/include/evas_private.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- evas_private.h 10 Jul 2008 16:38:54 -0000 1.109
+++ evas_private.h 18 Jul 2008 14:17:05 -0000 1.110
@@ -740,8 +740,6 @@
void evas_render_invalidate(Evas *e);
void evas_render_object_recalc(Evas_Object *obj);
-Evas_Bool _evas_array_grow(Evas_Array *array);
-
#define EVAS_API_OVERRIDE(func, api, prefix) \
(api)->func = prefix##func
|
|
From: Enlightenment C. <no...@cv...> - 2008-07-18 14:17:39
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/data
Modified Files:
Makefile.am evas_array.c
Added Files:
evas_inline_array.x
Log Message:
fix build. build properly.
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/data/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Makefile.am 10 Jul 2008 16:38:54 -0000 1.13
+++ Makefile.am 18 Jul 2008 14:17:05 -0000 1.14
@@ -11,6 +11,7 @@
noinst_LTLIBRARIES = libevas_data.la
libevas_data_la_SOURCES = \
+evas_array_inline.x \
evas_hash.c \
evas_list.c \
evas_array.c \
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/data/evas_array.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_array.c 18 Jul 2008 09:38:02 -0000 1.5
+++ evas_array.c 18 Jul 2008 14:17:05 -0000 1.6
@@ -9,48 +9,7 @@
#include <stdlib.h>
#include "Evas_Data.h"
-
-
-#ifdef __GNUC__
-# define UNLIKELY(x) __builtin_expect(!!(x), 0)
-#else
-# define UNLIKELY(x) (x)
-#endif
-
-
-static Evas_Bool _evas_array_grow(Evas_Array *array);
-
-static inline void
-_evas_array_append(Evas_Array *array, void *data)
-{
- if (UNLIKELY((array->count + array->step) > array->total))
- if (!_evas_array_grow(array)) return ;
-
- array->data[array->count++] = data;
-}
-
-static inline void*
-_evas_array_get(Evas_Array *array, unsigned int index)
-{
- return array->data[index];
-}
-
-
-static Evas_Bool
-_evas_array_grow(Evas_Array *array)
-{
- void **tmp;
- size_t total;
-
- total = array->total + array->step;
- tmp = realloc(array->data, sizeof (void*) * total);
- if (!tmp) return 0;
-
- array->total = total;
- array->data = tmp;
-
- return 1;
-}
+#include "evas_inline_array.x"
EAPI void
evas_array_append(Evas_Array *array, void *data)
@@ -58,7 +17,7 @@
_evas_array_append(array, data);
}
-EAPI void*
+EAPI void *
evas_array_get(Evas_Array *array, unsigned int index)
{
return _evas_array_get(array, index);
@@ -86,7 +45,7 @@
array->data = NULL;
}
-EAPI Evas_Array*
+EAPI Evas_Array *
evas_array_new(unsigned int step)
{
Evas_Array *array;
|
|
From: Enlightenment C. <no...@cv...> - 2008-07-26 13:04:30
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_callbacks.c
Log Message:
cedirc patchies!
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_callbacks.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- evas_callbacks.c 3 Jun 2008 20:33:40 -0000 1.34
+++ evas_callbacks.c 26 Jul 2008 13:04:29 -0000 1.35
@@ -69,6 +69,7 @@
/* MEM OK */
Evas_Object_List **l_mod = NULL, *l;
Evas_Button_Flags flags = EVAS_BUTTON_NONE;
+ Evas_Bool func_call = 0;
Evas *e;
if (obj->delete_me) return;
@@ -118,7 +119,10 @@
if ((fn->type == type) && (!fn->delete_me))
{
if (fn->func)
- fn->func(fn->data, obj->layer->evas, obj, event_info);
+ {
+ fn->func(fn->data, obj->layer->evas, obj, event_info);
+ func_call = 1;
+ }
}
if (obj->delete_me) break;
}
@@ -140,8 +144,7 @@
ev->flags = flags;
}
}
-
- if (!((obj->no_propagate) && (l_mod) && (*l_mod)))
+ if (!((obj->no_propagate) && (l_mod) && (*l_mod)) && ((obj->no_propagate && !func_call) || !obj->no_propagate))
{
if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
(type <= EVAS_CALLBACK_KEY_UP))
|
|
From: Enlightenment C. <no...@cv...> - 2008-07-30 07:57:09
|
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_callbacks.c
Log Message:
revert patch - breaks etk "drag scrolling".
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_callbacks.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- evas_callbacks.c 26 Jul 2008 13:04:29 -0000 1.35
+++ evas_callbacks.c 30 Jul 2008 07:57:05 -0000 1.36
@@ -69,7 +69,6 @@
/* MEM OK */
Evas_Object_List **l_mod = NULL, *l;
Evas_Button_Flags flags = EVAS_BUTTON_NONE;
- Evas_Bool func_call = 0;
Evas *e;
if (obj->delete_me) return;
@@ -119,10 +118,7 @@
if ((fn->type == type) && (!fn->delete_me))
{
if (fn->func)
- {
- fn->func(fn->data, obj->layer->evas, obj, event_info);
- func_call = 1;
- }
+ fn->func(fn->data, obj->layer->evas, obj, event_info);
}
if (obj->delete_me) break;
}
@@ -144,7 +140,8 @@
ev->flags = flags;
}
}
- if (!((obj->no_propagate) && (l_mod) && (*l_mod)) && ((obj->no_propagate && !func_call) || !obj->no_propagate))
+
+ if (!((obj->no_propagate) && (l_mod) && (*l_mod)))
{
if ((obj->smart.parent) && (type != EVAS_CALLBACK_FREE) &&
(type <= EVAS_CALLBACK_KEY_UP))
|
|
From: Enlightenment C. <no...@cv...> - 2008-08-06 05:33:21
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas Modified Files: Makefile.am Log Message: distcheck - pass. =================================================================== RCS file: /cvs/e/e17/libs/evas/Makefile.am,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- Makefile.am 14 May 2008 11:26:28 -0000 1.53 +++ Makefile.am 6 Aug 2008 05:33:20 -0000 1.54 @@ -55,25 +55,24 @@ README.in \ README \ evas.pc.in \ -evas-cairo-x11.pc \ -evas-directfb.pc \ -evas-fb.pc \ -evas-glitz-x11.pc \ -evas-opengl-x11.pc \ -evas-opengl-glew.pc \ -evas-software-buffer.pc \ -evas-software-qtopia.pc \ -evas-software-x11.pc \ -evas-software-16-x11.pc \ -evas-software-xcb.pc \ -evas-xrender-x11.pc \ -evas-xrender-xcb.pc \ -evas-software-ddraw.pc \ -evas-software-16-ddraw.pc \ -evas-direct3d.pc \ -evas-software-16-wince.pc \ -evas-software-sdl.pc \ -evas.pc \ +evas-cairo-x11.pc.in \ +evas-directfb.pc.in \ +evas-fb.pc.in \ +evas-glitz-x11.pc.in \ +evas-opengl-x11.pc.in \ +evas-opengl-glew.pc.in \ +evas-software-buffer.pc.in \ +evas-software-qtopia.pc.in \ +evas-software-x11.pc.in \ +evas-software-16-x11.pc.in \ +evas-software-xcb.pc.in \ +evas-xrender-x11.pc.in \ +evas-xrender-xcb.pc.in \ +evas-software-ddraw.pc.in \ +evas-software-16-ddraw.pc.in \ +evas-direct3d.pc.in \ +evas-software-16-wince.pc.in \ +evas-software-sdl.pc.in \ evas.spec.in evas.spec \ doc gendoc |
Thanks for helping keep SourceForge clean.
X