Re: [E-devel] Evas on Mac OS X
On Thu, 9 Jan 2003 12:54:50 + Chris Ross <[EMAIL PROTECTED]> babbled: > > It was built with: > > make CFLAGS="-O9" > > I simply guessed the flags so I do not know if they are correct. raster > any > ideas? thats about right. i have pentium/ppro flags too but i dont know if gcc supports ppc specific flags, and if so exactly what they are :) but that's about right. > Anyway, the results are not too shabby: > > > # Performance Test. Your system scores... > > # FRAME COUNT: 639 frames > # TIME:20.011 seconds > # AVERAGE FPS: 31.932 fps > > # Your system Evas Benchmark: > # > # EVAS BENCH: 0.532 > # > about the same speed as mu laptop (p3-700, thinkpad) > With some work to make a Quartz back end for evas there should be > futher speed improvements, but this I dont think is too shabby for a > graphics layer going through a couple of layers of indirection. > > evas -> X11 -> Quartz -> Quartz Extreme yeah not too bad - though i think it does end up being just a direct memcopy at the end... :) the data doesnt go thru any real transforms after evas is done generating it.. so it just *SHOULD* be a memcpy... yup quartz could speed things up - if theres hware support for scaling & blending... definitely. i'll get to doing a render engine once its complete with scaling support... and i have time :) gl engine is still on my list too. > Regards, > > Chris > > > > --- > This SF.NET email is sponsored by: > SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! > http://www.vasoftware.com > ___ > enlightenment-devel mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- --- Codito, ergo sum - "I code, therefore I am" The Rasterman (Carsten Haitzler)[EMAIL PROTECTED] [EMAIL PROTECTED] Mobile Phone: +61 (0)413 451 899Home Phone: 02 9698 8615 --- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com ___ enlightenment-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Desktop icons
I just downloaded the e17 from SPLIT everything compiles ok but I cant find a way to display the desktop icons (or any icons for that matter...no iconbar also) I have tried placing both on ~/.e/desktop/default and ~/.e/desktop/0/ none worked what gives? --- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com ___ enlightenment-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_image_load.c evas_image_main.c
Log Message:
resolve symlinks...
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_image_load.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_image_load.c 14 Nov 2002 05:38:10 - 1.2
+++ evas_image_load.c 10 Jan 2003 02:05:37 - 1.3
@@ -1097,7 +1097,10 @@
}
im->timestamp = mod_time;
if (file)
- im->info.file = strdup(file);
+ {
+ im->info.file = strdup(file);
+ im->info.real_file = evas_file_path_resolve(file);
+ }
if (key)
im->info.key = strdup(key);
evas_common_image_ref(im);
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_image_main.c 14 Nov 2002 05:38:10 - 1.2
+++ evas_image_main.c 10 Jan 2003 02:05:37 - 1.3
@@ -138,6 +138,7 @@
}
if (im->mipmaps.levels) free(im->mipmaps.levels);
if (im->info.file) free(im->info.file);
+ if (im->info.real_file) free(im->info.real_file);
if (im->info.key) free(im->info.key);
if (im->info.comment) free(im->info.comment);
free(im);
@@ -244,7 +245,8 @@
if (im->flags & RGBA_IMAGE_INDEXED) return;
if ((!im->info.file) && (!im->info.key)) return;
l1 = 0;
- if (im->info.file) l1 = strlen(im->info.file);
+ if (im->info.real_file) l1 = strlen(im->info.real_file);
+ else if (im->info.file) l1 = strlen(im->info.file);
l2 = 0;
if (im->info.key) l2 = strlen(im->info.key);
snprintf(buf, sizeof(buf), "%llx", im->timestamp);
@@ -252,7 +254,8 @@
key = malloc(l1 + 3 + l2 + 3 + l3 +1);
if (!key) return;
key[0] = 0;
- if (im->info.file) strcpy(key, im->info.file);
+ if (im->info.real_file) strcpy(key, im->info.real_file);
+ else if (im->info.file) strcpy(key, im->info.file);
strcat(key, "/:/");
if (im->info.key) strcat(key, im->info.key);
strcat(key, "/:/");
@@ -272,7 +275,8 @@
if (!(im->flags & RGBA_IMAGE_INDEXED)) return;
if ((!im->info.file) && (!im->info.key)) return;
l1 = 0;
- if (im->info.file) l1 = strlen(im->info.file);
+ if (im->info.real_file) l1 = strlen(im->info.real_file);
+ else if (im->info.file) l1 = strlen(im->info.file);
l2 = 0;
if (im->info.key) l2 = strlen(im->info.key);
snprintf(buf, sizeof(buf), "%llx", im->timestamp);
@@ -280,7 +284,8 @@
key = malloc(l1 + 3 + l2 + 3 + l3 +1);
if (!key) return;
key[0] = 0;
- if (im->info.file) strcpy(key, im->info.file);
+ if (im->info.real_file) strcpy(key, im->info.real_file);
+ else if (im->info.file) strcpy(key, im->info.file);
strcat(key, "/:/");
if (im->info.key) strcat(key, im->info.key);
strcat(key, "/:/");
@@ -294,6 +299,7 @@
RGBA_Image *
evas_common_image_find(const char *filename, const char *key, DATA64 timestamp)
{
+ char *real_filename;
Evas_Object_List *l;
RGBA_Image *im;
char *str;
@@ -301,8 +307,10 @@
char buf[256];
if ((!filename) && (!key)) return NULL;
+ real_filename = evas_file_path_resolve(filename);
l1 = 0;
- if (filename) l1 = strlen(filename);
+ if (real_filename) l1 = strlen(real_filename);
+ else if (filename) l1 = strlen(filename);
l2 = 0;
if (key) l2 = strlen(key);
sprintf(buf, "%llx", timestamp);
@@ -325,11 +333,20 @@
im = (RGBA_Image *)l;
ok = 0;
- if ((filename) && (im->info.file) &&
- (!strcmp(filename, im->info.file)))
- ok++;
- if ((!filename) && (!im->info.file))
- ok++;
+ if (real_filename)
+ {
+ if ((im->info.real_file) &&
+(!strcmp(real_filename, im->info.real_file)))
+ ok++;
+ }
+ else
+ {
+if ((filename) && (im->info.file) &&
+(!strcmp(filename, im->info.file)))
+ ok++;
+if ((!filename) && (!im->info.file))
+ ok++;
+ }
if ((key) && (im->info.key) &&
(!strcmp(key, im->info.key)))
ok++;
@@ -350,6 +367,7 @@
ram += sizeof(struct _RGBA_Image);
if (im->info.file) ram += strlen(im->info.file);
+ if (im->info.real_file) ram += strlen(im->info.real_file);
if (im->info.key) ram += strlen(im->info.key);
if (im->info.comment) ram += strlen(im->info.comment);
if ((im->image) && (im->image->data) && (!im->image->no_free))
---
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
__
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/file
Modified Files:
evas_path.c
Log Message:
resolve symlinks...
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/file/evas_path.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_path.c 8 Nov 2002 08:02:15 - 1.1
+++ evas_path.c 10 Jan 2003 02:05:37 - 1.2
@@ -8,9 +8,12 @@
#ifndef _WIN32_WCE
+#include
+#include
+#include
+#include
#include
#include
-#include
/* get the casefold feature! */
#define _GNU_SOURCE
#include
@@ -120,6 +123,15 @@
return 0;
}
+char *
+evas_file_path_resolve(const char *file)
+{
+ char buf[PATH_MAX], *buf2;
+
+ if (!realpath(file, buf)) return NULL;
+ buf2 = strdup(buf);
+ return buf2;
+}
#else
@@ -327,7 +339,6 @@
return files;
}
-
DATA64
evas_file_modified_time(const char *file)
{
@@ -352,5 +363,11 @@
modtime.u.LowPart = find.ftCreationTime.dwLowDateTime;
return modtime.QuadPart;
+}
+
+char *
+evas_file_path_resolve(const char *file)
+{
+ return strdup(file);
}
#endif
---
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_common.h evas_private.h
Log Message:
resolve symlinks...
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_common.h 14 Nov 2002 05:38:10 - 1.3
+++ evas_common.h 10 Jan 2003 02:05:37 - 1.4
@@ -265,6 +265,7 @@
{
int format;
char *file;
+ char *real_file;
char *key;
char *comment;
} info;
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_private.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_private.h 5 Jan 2003 12:55:37 - 1.8
+++ evas_private.h 10 Jan 2003 02:05:37 - 1.9
@@ -521,6 +521,7 @@
int evas_file_path_is_dir(char *path);
Evas_List *evas_file_path_list(char *path, char *match, int match_case);
DATA64 evas_file_modified_time(const char *file);
+char *evas_file_path_resolve(const char *file);
int evas_mem_free(int mem_required);
int evas_mem_degrade(int mem_required);
void evas_debug_error(void);
---
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_image_main.c
Log Message:
and dont leak
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_image_main.c 10 Jan 2003 02:05:37 - 1.3
+++ evas_image_main.c 10 Jan 2003 02:07:23 - 1.4
@@ -316,7 +316,11 @@
sprintf(buf, "%llx", timestamp);
l3 = strlen(buf);
str = malloc(l1 + 3 + l2 + 3 + l3 +1);
- if (!str) return NULL;
+ if (!str)
+ {
+ if (real_filename) free(real_filename);
+ return NULL;
+ }
str[0] = 0;
if (filename) strcpy(str, filename);
strcat(str, "/:/");
@@ -325,7 +329,11 @@
strcat(str, buf);
im = evas_hash_find(images, str);
free(str);
- if (im) return im;
+ if (im)
+ {
+ if (real_filename) free(real_filename);
+ return im;
+ }
for (l = cache; l; l = l->next)
{
@@ -354,8 +362,13 @@
ok++;
if (im->timestamp == timestamp)
ok++;
- if (ok >= 3) return im;
+ if (ok >= 3)
+ {
+if (real_filename) free(real_filename);
+return im;
+ }
}
+ if (real_filename) free(real_filename);
return NULL;
}
---
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
Re: [E-devel] Evas on Mac OS X
On Friday, 10 January 2003, at 10:05:51 (+1100), Carsten Haitzler wrote: > > make CFLAGS="-O9" > > > > I simply guessed the flags so I do not know if they are > > correct. raster any ideas? > > thats about right. i have pentium/ppro flags too but i dont know if > gcc supports ppc specific flags, and if so exactly what they are :) > but that's about right. I just had this discussion with Zack Weinberg at the New Year's party I went to. He agreed with me that the best general-purpose CFLAGS to use is "-O2 -march=pentiumpro" (or whatever arch you choose), and even the latter part of that didn't make more than maybe a 5% difference. -O9 is ridiculous. Nothing over -O3 actually means anything, and even -O3 tends to be a bad idea. He referred to -O3 as "turning on all the optimizations that probably shouldn't even be part of the optimizer." It's also worth noting that omitting the frame pointer does give you a boost but makes debugging essentially impossible, at least with gdb. Michael -- Michael Jennings (a.k.a. KainX) http://www.kainx.org/ <[EMAIL PROTECTED]> n+1, Inc., http://www.nplus1.net/ Author, Eterm (www.eterm.org) --- "I like things that go woosh when my PC goes bleep." -- Tom Gilbert --- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com ___ enlightenment-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] CFLAGS [Was: Evas on Mac OS X]
I won't argue the -Ox stuff, but I don't suppose you had a conversation with Zack Winberg about why in moving from gcc-2.95 to gcc-3 they deprecated '-mpentiumpro'? Also, the manpage lists -march=pentiumpro and -mcpu=pentiumpro as aliases, but whenever I've spoken to anyone there always seems to be a distinct favortism toward -march... are they not truly the same? If memory serves me correctly at one point in time, they were different... are they still but to a lesser degree, or are they really the same now? -James Michael Jennings ([EMAIL PROTECTED]) wrote: > On Friday, 10 January 2003, at 10:05:51 (+1100), > Carsten Haitzler wrote: > > > > make CFLAGS="-O9" > > > > > > I simply guessed the flags so I do not know if they are > > > correct. raster any ideas? > > > > thats about right. i have pentium/ppro flags too but i dont know if > > gcc supports ppc specific flags, and if so exactly what they are :) > > but that's about right. > > I just had this discussion with Zack Weinberg at the New Year's party > I went to. He agreed with me that the best general-purpose CFLAGS to > use is "-O2 -march=pentiumpro" (or whatever arch you choose), and even > the latter part of that didn't make more than maybe a 5% difference. > > -O9 is ridiculous. Nothing over -O3 actually means anything, and even > -O3 tends to be a bad idea. He referred to -O3 as "turning on all the > optimizations that probably shouldn't even be part of the optimizer." > > It's also worth noting that omitting the frame pointer does give you a > boost but makes debugging essentially impossible, at least with gdb. > > Michael > > -- > Michael Jennings (a.k.a. KainX) http://www.kainx.org/ <[EMAIL PROTECTED]> > n+1, Inc., http://www.nplus1.net/ Author, Eterm (www.eterm.org) > --- > "I like things that go woosh when my PC goes bleep." -- Tom Gilbert > > > --- > This SF.NET email is sponsored by: > SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! > http://www.vasoftware.com > ___ > enlightenment-devel mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel --- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com ___ enlightenment-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] CFLAGS [Was: Evas on Mac OS X]
On Thursday 09 January 2003 22:19, James Moss wrote: > I won't argue the -Ox stuff, but I don't suppose you had a conversation > with Zack Winberg about why in moving from gcc-2.95 to gcc-3 they > deprecated '-mpentiumpro'? because in the new system this is ambigious ... do you want -march or do you want -mcpu ? > Also, the manpage lists -march=pentiumpro > and -mcpu=pentiumpro as aliases, but whenever I've spoken to anyone > there always seems to be a distinct favortism toward -march... are they > not truly the same? nope ! http://gcc.gnu.org/onlinedocs/gcc-3.2/gcc/i386-and-x86-64-Options.html#i386%20and%20x86-64%20Options -mcpu=cpu-type Tune to cpu-type everything applicable about the generated code, except for the ABI and the set of available instructions -march=cpu-type Generate instructions for the machine type cpu-type. -mike --- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com ___ enlightenment-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] CFLAGS
On Thursday, 09 January 2003, at 22:19:09 (-0500), James Moss wrote: > I won't argue the -Ox stuff, but I don't suppose you had a > conversation with Zack Winberg about why in moving from gcc-2.95 to > gcc-3 they deprecated '-mpentiumpro'? Also, the manpage lists > -march=pentiumpro and -mcpu=pentiumpro as aliases, but whenever I've > spoken to anyone there always seems to be a distinct favortism > toward -march... are they not truly the same? If memory serves me > correctly at one point in time, they were different... are they > still but to a lesser degree, or are they really the same now? They have never been the same, at least for as long as I've known them to exist. From the info page: Intel 386 Options - These `-m' options are defined for the i386 family of computers: `-mcpu=CPU TYPE' Assume the defaults for the machine type CPU TYPE when scheduling instructions. The choices for CPU TYPE are: `i386'`i486'`i586'`i686' `pentium' `pentiumpro' `k6' While picking a specific CPU TYPE will schedule things appropriately for that particular chip, the compiler will not generate any code that does not run on the i386 without the `-march=CPU TYPE' option being used. `i586' is equivalent to `pentium' and `i686' is equivalent to `pentiumpro'. `k6' is the AMD chip as opposed to the Intel ones. `-march=CPU TYPE' Generate instructions for the machine type CPU TYPE. The choices for CPU TYPE are the same as for `-mcpu'. Moreover, specifying `-march=CPU TYPE' implies `-mcpu=CPU TYPE'. ^ `-m386' `-m486' `-mpentium' `-mpentiumpro' Synonyms for -mcpu=i386, -mcpu=i486, -mcpu=pentium, and -mcpu=pentiumpro respectively. These synonyms are deprecated. ^ I've highlighted the important parts which should clarify why I said to use -march= specifically. Michael -- Michael Jennings (a.k.a. KainX) http://www.kainx.org/ <[EMAIL PROTECTED]> n+1, Inc., http://www.nplus1.net/ Author, Eterm (www.eterm.org) --- "When the Lord closes a door, somewhere he opens a window." -- Maria Von Trapp (Julie Andrews), "The Sound of Music" --- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com ___ enlightenment-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
evas_common.h
Log Message:
const-ify lots of things...
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_common.h 10 Jan 2003 02:05:37 - 1.4
+++ evas_common.h 10 Jan 2003 04:58:51 - 1.5
@@ -526,14 +526,14 @@
extern "C" {
#endif
-Evas_List *evas_list_append (Evas_List *list, void *data);
-Evas_List *evas_list_prepend(Evas_List *list, void *data);
-Evas_List *evas_list_append_relative(Evas_List *list, void *data, void *relative);
-Evas_List *evas_list_prepend_relative (Evas_List *list, void *data, void *relative);
-Evas_List *evas_list_remove (Evas_List *list, void *data);
+Evas_List *evas_list_append (Evas_List *list, const void *data);
+Evas_List *evas_list_prepend(Evas_List *list, const void *data);
+Evas_List *evas_list_append_relative(Evas_List *list, const void *data, const
+void *relative);
+Evas_List *evas_list_prepend_relative (Evas_List *list, const void *data, const
+void *relative);
+Evas_List *evas_list_remove (Evas_List *list, const void *data);
Evas_List *evas_list_remove_list(Evas_List *list, Evas_List *remove_list);
-void *evas_list_find (Evas_List *list, void *data);
-Evas_List *evas_list_find_list (Evas_List *list, void *data);
+void *evas_list_find (Evas_List *list, const void *data);
+Evas_List *evas_list_find_list (Evas_List *list, const void *data);
Evas_List *evas_list_free (Evas_List *list);
Evas_List *evas_list_last (Evas_List *list);
Evas_List *evas_list_next (Evas_List *list);
@@ -545,12 +545,12 @@
Evas_List *evas_list_reverse(Evas_List *list);
intevas_list_alloc_error(void);
-Evas_Hash *evas_hash_add(Evas_Hash *hash, const char *key, void
*data);
-Evas_Hash *evas_hash_del(Evas_Hash *hash, const char *key, void
*data);
+Evas_Hash *evas_hash_add(Evas_Hash *hash, const char *key, const void
+*data);
+Evas_Hash *evas_hash_del(Evas_Hash *hash, const char *key, const void
+*data);
void *evas_hash_find (Evas_Hash *hash, const char *key);
intevas_hash_size (Evas_Hash *hash);
void evas_hash_free (Evas_Hash *hash);
-void evas_hash_foreach(Evas_Hash *hash, int (*func) (Evas_Hash
*hash, const char *key, void *data, void *fdata), void *fdata);
+void evas_hash_foreach(Evas_Hash *hash, int (*func) (Evas_Hash
+*hash, const char *key, void *data, void *fdata), const void *fdata);
intevas_hash_alloc_error(void);
void *evas_object_list_append (void *in_list, void *in_item);
---
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/data
Modified Files:
evas_hash.c evas_list.c
Log Message:
const-ify lots of things...
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/data/evas_hash.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evas_hash.c 20 Nov 2002 04:34:05 - 1.4
+++ evas_hash.c 10 Jan 2003 04:58:51 - 1.5
@@ -61,7 +61,7 @@
* @endcode
*/
Evas_Hash *
-evas_hash_add(Evas_Hash *hash, const char *key, void *data)
+evas_hash_add(Evas_Hash *hash, const char *key, const void *data)
{
int hash_num;
Evas_Hash_El *el;
@@ -102,7 +102,7 @@
el->key = NULL;
hash_num = 0;
}
- el->data = data;
+ el->data = (void *)data;
hash->buckets[hash_num] = evas_object_list_prepend(hash->buckets[hash_num], el);
if (evas_list_alloc_error())
{
@@ -147,7 +147,7 @@
* @endcode
*/
Evas_Hash *
-evas_hash_del(Evas_Hash *hash, const char *key, void *data)
+evas_hash_del(Evas_Hash *hash, const char *key, const void *data)
{
int hash_num;
Evas_Hash_El *el;
@@ -325,7 +325,7 @@
* @endcode
*/
void
-evas_hash_foreach(Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key,
void *data, void *fdata), void *fdata)
+evas_hash_foreach(Evas_Hash *hash, int (*func) (Evas_Hash *hash, const char *key,
+void *data, void *fdata), const void *fdata)
{
int i, size;
@@ -341,7 +341,7 @@
next_l = l->next;
el = (Evas_Hash_El *)l;
-if (!func(hash, el->key, el->data, fdata)) return;
+if (!func(hash, el->key, el->data, (void *)fdata)) return;
l = next_l;
}
}
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/data/evas_list.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_list.c 20 Nov 2002 04:34:05 - 1.3
+++ evas_list.c 10 Jan 2003 04:58:51 - 1.4
@@ -32,7 +32,7 @@
* @endcode
*/
Evas_List *
-evas_list_append(Evas_List *list, void *data)
+evas_list_append(Evas_List *list, const void *data)
{
Evas_List *l, *new_l;
@@ -45,7 +45,7 @@
}
new_l->next = NULL;
new_l->prev = NULL;
- new_l->data = data;
+ new_l->data = (void *)data;
if (!list)
{
new_l->last = new_l;
@@ -106,7 +106,7 @@
* @endcode
*/
Evas_List *
-evas_list_prepend(Evas_List *list, void *data)
+evas_list_prepend(Evas_List *list, const void *data)
{
Evas_List *new_l;
@@ -118,7 +118,7 @@
return list;
}
new_l->prev = NULL;
- new_l->data = data;
+ new_l->data = (void *)data;
if (!list)
{
new_l->next = NULL;
@@ -176,7 +176,7 @@
* @endcode
*/
Evas_List *
-evas_list_append_relative(Evas_List *list, void *data, void *relative)
+evas_list_append_relative(Evas_List *list, const void *data, const void *relative)
{
Evas_List *l;
@@ -193,7 +193,7 @@
_evas_list_alloc_error = 1;
return list;
}
-new_l->data = data;
+new_l->data = (void *)data;
if (l->next)
{
new_l->next = l->next;
@@ -254,7 +254,7 @@
* @endcode
*/
Evas_List *
-evas_list_prepend_relative(Evas_List *list, void *data, void *relative)
+evas_list_prepend_relative(Evas_List *list, const void *data, const void *relative)
{
Evas_List *l;
@@ -271,7 +271,7 @@
_evas_list_alloc_error = 1;
return list;
}
-new_l->data = data;
+new_l->data = (void *)data;
new_l->prev = l->prev;
new_l->next = l;
if (l->prev) l->prev->next = new_l;
@@ -315,7 +315,7 @@
* @endcode
*/
Evas_List *
-evas_list_remove(Evas_List *list, void *data)
+evas_list_remove(Evas_List *list, const void *data)
{
Evas_List *l;
@@ -399,13 +399,13 @@
* @endcode
*/
void *
-evas_list_find(Evas_List *list, void *data)
+evas_list_find(Evas_List *list, const void *data)
{
Evas_List *l;
for (l = list; l; l = l->next)
{
- if (l->data == data) return data;
+ if (l->data == data) return (void *)data;
}
return NULL;
}
@@ -435,7 +435,7 @@
* @endcode
*/
Evas_List *
-evas_list_find_list(Evas_List *list, void *data)
+evas_list_find_list(Evas_List *list, const void *data)
{
Evas_List *l;
---
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib
Modified Files:
Evas.h
Log Message:
const-ify lots of things...
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/Evas.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- Evas.h 5 Jan 2003 12:55:36 - 1.13
+++ Evas.h 10 Jan 2003 04:58:51 - 1.14
@@ -197,14 +197,14 @@
extern "C" {
#endif
- Evas_List*evas_list_append (Evas_List *list, void *data);
- Evas_List*evas_list_prepend (Evas_List *list, void *data);
- Evas_List*evas_list_append_relative (Evas_List *list, void *data,
void *relative);
- Evas_List*evas_list_prepend_relative(Evas_List *list, void *data,
void *relative);
- Evas_List*evas_list_remove (Evas_List *list, void *data);
+ Evas_List*evas_list_append (Evas_List *list, const void
+*data);
+ Evas_List*evas_list_prepend (Evas_List *list, const void
+*data);
+ Evas_List*evas_list_append_relative (Evas_List *list, const void
+*data, const void *relative);
+ Evas_List*evas_list_prepend_relative(Evas_List *list, const void
+*data, const void *relative);
+ Evas_List*evas_list_remove (Evas_List *list, const void
+*data);
Evas_List*evas_list_remove_list (Evas_List *list, Evas_List
*remove_list);
- void *evas_list_find(Evas_List *list, void *data);
- Evas_List*evas_list_find_list (Evas_List *list, void *data);
+ void *evas_list_find(Evas_List *list, const void
+*data);
+ Evas_List*evas_list_find_list (Evas_List *list, const void
+*data);
Evas_List*evas_list_free(Evas_List *list);
Evas_List*evas_list_last(Evas_List *list);
Evas_List*evas_list_next(Evas_List *list);
@@ -222,12 +222,12 @@
*
* do we really need this? hmmm - let me think... there may be a better way
*/
- Evas_Hash*evas_hash_add (Evas_Hash *hash, const char
*key, void *data);
- Evas_Hash*evas_hash_del (Evas_Hash *hash, const char
*key, void *data);
+ Evas_Hash*evas_hash_add (Evas_Hash *hash, const char
+*key, const void*data);
+ Evas_Hash*evas_hash_del (Evas_Hash *hash, const char
+*key, const void*data);
void *evas_hash_find(Evas_Hash *hash, const char
*key);
int evas_hash_size(Evas_Hash *hash);
void evas_hash_free(Evas_Hash *hash);
- void evas_hash_foreach (Evas_Hash *hash, int (*func)
(Evas_Hash *hash, const char *key, void *data, void *fdata), void *fdata);
+ void evas_hash_foreach (Evas_Hash *hash, int (*func)
+(Evas_Hash *hash, const char *key, void *data, void *fdata), const void *fdata);
int evas_hash_alloc_error (void);
int evas_alloc_error (void);
@@ -284,7 +284,7 @@
void evas_object_polygon_points_clear (Evas_Object *obj);
Evas_Object *evas_object_image_add (Evas *e);
- void evas_object_image_file_set(Evas_Object *obj, char *file,
char *key);
+ void evas_object_image_file_set(Evas_Object *obj, const char
+*file, const char *key);
void evas_object_image_file_get(Evas_Object *obj, char
**file, char **key);
void evas_object_image_border_set (Evas_Object *obj, int l, int
r, int t, int b);
void evas_object_image_border_get (Evas_Object *obj, int *l, int
*r, int *t, int *b);
@@ -309,10 +309,10 @@
int evas_object_image_cache_get (Evas *e);
Evas_Object *evas_object_text_add (Evas *e);
- void evas_object_text_font_set (Evas_Object *obj, char *font,
double size);
+ void evas_object_text_font_set (Evas_Object *obj, const char
+*font, double size);
void evas_object_text_font_get (Evas_Object *obj, char
**font, double *size);
- void evas_object_text_text_set (Evas_Object *obj, char *text);
- char *evas_object_text_text_get (Evas_Object *obj);
+ void evas_object_text_text_set (Evas_Object *obj, const char
+*text);
+ const char *evas_object_text_text_get (Evas_Object *obj
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_callbacks.c evas_clip.c evas_data.c evas_events.c
evas_key.c evas_key_grab.c evas_name.c evas_object_image.c
evas_object_intercept.c evas_object_smart.c evas_object_text.c
evas_smart.c
Log Message:
const-ify lots of things...
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_callbacks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_callbacks.c8 Jan 2003 04:33:33 - 1.7
+++ evas_callbacks.c10 Jan 2003 04:58:51 - 1.8
@@ -259,7 +259,7 @@
* @endcode
*/
void
-evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, void
(*func) (void *data, Evas *e, Evas_Object *obj, void *event_info), void *data)
+evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, void
+(*func) (void *data, Evas *e, Evas_Object *obj, void *event_info), const void *data)
{
/* MEM OK */
Evas_Func_Node *fn;
@@ -274,7 +274,7 @@
fn = evas_mem_calloc(sizeof(Evas_Func_Node));
if (!fn) return;
fn->func = func;
- fn->data = data;
+ fn->data = (void *)data;
switch (type)
{
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_clip.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_clip.c 9 Dec 2002 23:00:10 - 1.2
+++ evas_clip.c 10 Jan 2003 04:58:51 - 1.3
@@ -186,7 +186,7 @@
}
}
-Evas_List *
+const Evas_List *
evas_object_clipees_get(Evas_Object *obj)
{
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_data.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_data.c 8 Nov 2002 08:02:14 - 1.1
+++ evas_data.c 10 Jan 2003 04:58:51 - 1.2
@@ -3,7 +3,7 @@
#include "Evas.h"
void
-evas_object_data_set(Evas_Object *obj, const char *key, void *data)
+evas_object_data_set(Evas_Object *obj, const char *key, const void *data)
{
Evas_Data_Node *node;
@@ -16,7 +16,7 @@
node = malloc(sizeof(Evas_Data_Node));
node->key = strdup(key);
- node->data = data;
+ node->data = (void *)data;
obj->data.elements = evas_list_prepend(obj->data.elements, node);
}
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_events.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_events.c 5 Jan 2003 12:55:37 - 1.3
+++ evas_events.c 10 Jan 2003 04:58:51 - 1.4
@@ -80,7 +80,7 @@
}
void
-evas_event_feed_mouse_down_data(Evas *e, int b, void *data)
+evas_event_feed_mouse_down_data(Evas *e, int b, const void *data)
{
Evas_List *l, *copy;
@@ -109,7 +109,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_DOWN, &ev);
@@ -118,7 +118,7 @@
}
void
-evas_event_feed_mouse_up_data(Evas *e, int b, void *data)
+evas_event_feed_mouse_up_data(Evas *e, int b, const void *data)
{
Evas_List *l, *copy;
@@ -145,7 +145,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_UP, &ev);
@@ -177,7 +177,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_OUT, &ev);
@@ -200,7 +200,7 @@
ev.output.y = e->pointer.y;
ev.canvas.x = e->pointer.canvas_x;
ev.canvas.y = e->pointer.canvas_y;
- ev.data = data;
+ ev.data = (void *)data;
ev.modifiers = &(e->modifiers);
ev.locks = &(e->locks);
evas_object_event_callback_call(obj, EVAS_CALLBACK_MOUSE_IN, &ev);
@@ -215,7 +215,7 @@
}
void
-evas_event_feed_mouse_move_data(Evas *e, int x, int y, void *data)
+evas_event
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common Modified Files: evas_image_main.c Log Message: const-ify lots of things... === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- evas_image_main.c 10 Jan 2003 02:07:23 - 1.4 +++ evas_image_main.c 10 Jan 2003 04:58:51 - 1.5 @@ -1,4 +1,5 @@ #include "evas_common.h" +#include "evas_private.h" static Evas_Hash* images = NULL; static Evas_Object_List * cache = NULL; @@ -307,7 +308,7 @@ char buf[256]; if ((!filename) && (!key)) return NULL; - real_filename = evas_file_path_resolve(filename); + real_filename = evas_file_path_resolve((char *)filename); l1 = 0; if (real_filename) l1 = strlen(real_filename); else if (filename) l1 = strlen(filename); --- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/include Modified Files: evas_private.h Log Message: logic problem on evas_free(). shoudl be fixed now... :) === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_private.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- evas_private.h 10 Jan 2003 02:05:37 - 1.9 +++ evas_private.h 10 Jan 2003 05:38:47 - 1.10 @@ -497,6 +497,7 @@ Evas_List * evas_rects_return_difference_rects(int x, int y, int w, int h, int xx, int yy, int ww, int hh); void evas_object_clip_recalc(Evas_Object *obj); Evas_Layer *evas_layer_new(Evas *e); +void evas_layer_pre_free(Evas_Layer *lay); void evas_layer_free(Evas_Layer *lay); Evas_Layer *evas_layer_find(Evas *e, int layer_num); void evas_layer_add(Evas_Layer *lay); --- This SF.NET email is sponsored by: SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See! http://www.vasoftware.com ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_layer.c evas_main.c evas_object_main.c
evas_object_smart.c
Log Message:
logic problem on evas_free(). shoudl be fixed now... :)
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_layer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_layer.c15 Dec 2002 00:33:57 - 1.3
+++ evas_layer.c10 Jan 2003 05:38:47 - 1.4
@@ -45,6 +45,20 @@
}
void
+evas_layer_pre_free(Evas_Layer *lay)
+{
+ Evas_Object_List *l;
+
+ for (l = (Evas_Object_List *)lay->objects; l; l = l->next)
+ {
+ Evas_Object *obj;
+
+ obj = (Evas_Object *)l;
+ evas_object_del(obj);
+ }
+}
+
+void
evas_layer_free(Evas_Layer *lay)
{
while (lay->objects)
@@ -52,7 +66,6 @@
Evas_Object *obj;
obj = (Evas_Object *)lay->objects;
- if (obj->smart.smart) evas_object_smart_del(obj);
evas_object_free(obj, 0);
}
free(lay);
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_main.c 26 Nov 2002 05:25:02 - 1.2
+++ evas_main.c 10 Jan 2003 05:38:47 - 1.3
@@ -72,13 +72,19 @@
void
evas_free(Evas *e)
{
+ Evas_Object_List *l;
+
MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return;
MAGIC_CHECK_END();
- evas_object_font_path_clear(e);
-
- e->pointer.object.in = evas_list_free(e->pointer.object.in);
+ for (l = (Evas_Object_List *)(e->layers); l; l = l->next)
+ {
+ Evas_Layer *lay;
+
+ lay = (Evas_Layer *)l;
+ evas_layer_pre_free(lay);
+ }
while (e->layers)
{
Evas_Layer *lay;
@@ -87,6 +93,9 @@
evas_layer_del(lay);
evas_layer_free(lay);
}
+
+ evas_object_font_path_clear(e);
+ e->pointer.object.in = evas_list_free(e->pointer.object.in);
if (e->name_hash) evas_hash_free(e->name_hash);
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_object_main.c 5 Jan 2003 12:55:37 - 1.6
+++ evas_object_main.c 10 Jan 2003 05:38:47 - 1.7
@@ -422,6 +422,8 @@
evas_object_change(obj);
obj->delete_me = 1;
if (obj->smart.smart) evas_object_smart_del(obj);
+ evas_object_smart_cleanup(obj);
+ obj->smart.smart = NULL;
}
void
===
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_smart.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_object_smart.c 10 Jan 2003 04:58:51 - 1.2
+++ evas_object_smart.c 10 Jan 2003 05:38:47 - 1.3
@@ -238,8 +238,8 @@
Evas_Smart *s;
s = obj->smart.smart;
- if (obj->smart.parent) evas_object_smart_member_del(obj);
if ((s) && (s->func_del)) s->func_del(obj);
+ if (obj->smart.parent) evas_object_smart_member_del(obj);
if (s) evas_object_smart_unuse(s);
}
---
This SF.NET email is sponsored by:
SourceForge Enterprise Edition + IBM + LinuxWorld = Something 2 See!
http://www.vasoftware.com
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
