Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_icon.c e_fileman_smart.c e_icon_layout.c
Log Message:
- fix bug in edd creation, metadata works now.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_fileman_icon.c 10 Nov 2005 09:12:58 -0000 1.22
+++ e_fileman_icon.c 10 Nov 2005 11:52:26 -0000 1.23
@@ -3,26 +3,6 @@
*/
#include "e.h"
-#define NEWD(str, typ) \
- eet_data_descriptor_new(str, sizeof(typ), \
- (void *(*) (void *))evas_list_next, \
- (void *(*) (void *, void *))evas_list_append, \
- (void *(*) (void *))evas_list_data, \
- (void *(*) (void *))evas_list_free, \
- (void (*) (void *, int (*) (void *, const char
*, void *, void *), void *))evas_hash_foreach, \
- (void *(*) (void *, const char *, void
*))evas_hash_add, \
- (void (*) (void *))evas_hash_free)
-
-#define FREED(eed) \
- if (eed) \
- { \
- eet_data_descriptor_free((eed)); \
- (eed) = NULL; \
- }
-#define NEWI(str, it, type) \
- EET_DATA_DESCRIPTOR_ADD_BASIC(_e_fm_icon_meta_edd, E_Fm_Icon_Metadata, str,
it, type)
-
-
typedef struct _E_Smart_Data E_Smart_Data;
struct _E_Smart_Data
@@ -82,13 +62,6 @@
int
e_fm_icon_init(void)
{
- _e_fm_icon_meta_edd = NEWD("E_Fm_Icon_Metadata", E_Fm_Icon_Metadata);
- NEWI("x", x, EET_T_INT);
- NEWI("y", y, EET_T_INT);
- NEWI("w", w, EET_T_INT);
- NEWI("h", h, EET_T_INT);
- NEWI("nm", name, EET_T_STRING);
-
event_handlers = evas_list_append(event_handlers,
ecore_event_handler_add(ECORE_EVENT_EXE_EXIT,
_e_fm_icon_thumb_cb_exe_exit,
@@ -99,7 +72,6 @@
int
e_fm_icon_shutdown(void)
{
- FREED(_e_fm_icon_meta_edd);
while (event_handlers)
{
ecore_event_handler_del(event_handlers->data);
@@ -706,5 +678,5 @@
m->y = sd->y;
m->w = sd->w;
m->h = sd->h;
- m->name = strdup(sd->file->name);
+ m->name = strdup(sd->file->name);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- e_fileman_smart.c 10 Nov 2005 09:12:58 -0000 1.106
+++ e_fileman_smart.c 10 Nov 2005 11:52:26 -0000 1.107
@@ -73,7 +73,7 @@
#define NEWI(str, it, type) \
EET_DATA_DESCRIPTOR_ADD_BASIC(_e_fm_dir_meta_edd, E_Fm_Dir_Metadata, str,
it, type)
#define NEWL(str, it, type) \
- EET_DATA_DESCRIPTOR_ADD_LIST(_e_fm_icon_meta_edd, E_Fm_Dir_Metadata, str,
it, type)
+ EET_DATA_DESCRIPTOR_ADD_LIST(_e_fm_dir_meta_edd, E_Fm_Dir_Metadata, str,
it, type)
typedef struct _E_Fm_Smart_Data E_Fm_Smart_Data;
typedef struct _E_Fm_Icon E_Fm_Icon;
@@ -165,6 +165,7 @@
Evas_List *event_handlers;
Evas_List *files;
+ Evas_List *files_raw;
Ecore_File_Monitor *monitor;
E_Fm_Arrange arrange;
@@ -1424,16 +1425,44 @@
static void
_e_fm_dir_set(E_Fm_Smart_Data *sd, const char *dir)
{
- Evas_List *l;
+ Evas_List *l;
+ Ecore_List *list;
+ Ecore_Sheap *heap;
+ char *f;
+ int type;
+ DIR *dir2;
+ struct dirent *dp;
E_Event_Fm_Reconfigure *ev;
E_Event_Fm_Directory_Change *ev2;
- DIR *dir2;
if (!dir) return;
if ((sd->dir) && (!strcmp(sd->dir, dir))) return;
if (!(dir2 = opendir(dir))) return;
+ type = E_FM_FILE_TYPE_NORMAL;
+ list = ecore_list_new();
+ ecore_list_set_free_cb(list, free);
+ /* TODO: use sorting function here */
+ heap = ecore_sheap_new(ECORE_COMPARE_CB(strcmp), ecore_list_nodes(list));
+ while(dp = readdir(dir2))
+ {
+ if ((!strcmp(dp->d_name, ".") || (!strcmp (dp->d_name, ".."))))
continue;
+ if ((dp->d_name[0] == '.') && (!(type & E_FM_FILE_TYPE_HIDDEN)))
continue;
+ f = strdup(dp->d_name);
+ ecore_list_append(list, f);
+ }
+ closedir(dir2);
+
+ heap = ecore_sheap_new(ECORE_COMPARE_CB(strcasecmp),
ecore_list_nodes(list));
+ while ((f = ecore_list_remove_first(list)))
+ ecore_sheap_insert(heap, f);
+
+ while ((f = ecore_sheap_extract(heap)))
+ sd->files_raw = evas_list_append(sd->files_raw, f);
+
+ ecore_sheap_destroy(heap);
+
if (sd->dir) free (sd->dir);
sd->dir = strdup(dir);
@@ -1456,9 +1485,7 @@
printf("META: file = %s\n", im->name);
}
}
-
-
-
+
/* Reset position */
sd->position = 0.0;
@@ -1520,24 +1547,21 @@
int i;
int type;
- /* FIXME: This needs to be passed in to decide what file types to show */
- type = E_FM_FILE_TYPE_NORMAL;
i = 0;
sd = data;
e_icon_layout_freeze(sd->layout);
while (i < 2)
- {
- dir_entry = readdir(sd->dir2);
- if(!dir_entry)
- break;
- if ((!strcmp(dir_entry->d_name, ".") || (!strcmp (dir_entry->d_name,
"..")))) continue;
- if ((dir_entry->d_name[0] == '.') && (!(type & E_FM_FILE_TYPE_HIDDEN)))
continue;
+ {
+ char *f;
+ if(!sd->files_raw)
+ break;
+ f = sd->files_raw->data;
icon = E_NEW(E_Fm_Icon, 1);
if (!icon) continue;
- snprintf(path, sizeof(path), "%s/%s", sd->dir, dir_entry->d_name);
+ snprintf(path, sizeof(path), "%s/%s", sd->dir, f);
icon->file = e_fm_file_new(path);
if (!icon->file)
{
@@ -1556,9 +1580,10 @@
evas_object_event_callback_add(icon->icon_object,
EVAS_CALLBACK_MOUSE_MOVE, _e_fm_icon_mouse_move_cb, sd);
evas_object_show(icon->icon_object);
e_icon_layout_pack(sd->layout, icon->icon_object);
- e_icon_layout_icon_callbacks_set(icon->icon_object,
e_fm_icon_appear_cb, e_fm_icon_disappear_cb, NULL);
+ e_icon_layout_icon_callbacks_set(icon->icon_object,
e_fm_icon_appear_cb, e_fm_icon_disappear_cb, NULL);
}
i++;
+ sd->files_raw = evas_list_remove_list(sd->files_raw, sd->files_raw);
}
e_icon_layout_thaw(sd->layout);
@@ -1566,28 +1591,8 @@
e_icon_layout_virtual_size_get(sd->layout, &sd->child.w, &sd->child.h);
evas_object_smart_callback_call(sd->object, "changed", NULL);
- if(!dir_entry) {
- closedir(sd->dir2);
-
- sd->files = evas_list_sort(sd->files,
- evas_list_count(sd->files),
- _e_fm_files_sort_name_cb);
-// e_icon_layout_sort(sd->layout, _e_fm_files_sort_layout_name_cb);
-
-
- e_icon_layout_freeze(sd->layout);
- e_icon_layout_reset(sd->layout);
-
- for(l = sd->files; l; l = l->next)
- {
- icon = l->data;
- e_icon_layout_pack(sd->layout, icon->icon_object);
- e_icon_layout_icon_callbacks_set(icon->icon_object,
e_fm_icon_appear_cb, e_fm_icon_disappear_cb, NULL);
- }
- e_icon_layout_thaw(sd->layout);
-
- sd->timer = NULL;
-
+ if(!sd->files_raw) {
+ sd->timer = NULL;
if(!sd->meta)
{
printf("Generating Meta!\n");
@@ -3237,8 +3242,6 @@
E_Fm_Icon_Metadata *im;
im = l->data;
- printf("loading %s\n", im->name);
- m->files = evas_list_append(m->files, im);
m->files_hash = evas_hash_add(m->files_hash, im->name, im);
}
}
@@ -3255,6 +3258,7 @@
if (!sd->dir) return 0;
m = calloc(1, sizeof(E_Fm_Dir_Metadata));
+ m->files = NULL;
if (!m) return 0;
_e_fm_dir_meta_fill(m, sd);
for (l = sd->files; l; l = l->next)
@@ -3266,7 +3270,6 @@
im = e_fm_icon_meta_generate(icon->icon_object);
if (im)
{
- printf("adding %s\n", im->name);
m->files = evas_list_append(m->files, im);
m->files_hash = evas_hash_add(m->files_hash, icon->file->name, im);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_icon_layout.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_icon_layout.c 10 Nov 2005 09:12:58 -0000 1.17
+++ e_icon_layout.c 10 Nov 2005 11:52:26 -0000 1.18
@@ -214,16 +214,20 @@
li->x, li->y, li->w, li->h))
{
li->appear_func(obj, li->data);
+/*
printf("appear! %d %d %d %d - %d %d %d %d\n",sd->viewport.x,
sd->viewport.y,
sd->viewport.w, sd->viewport.h,
li->x, li->y, li->w, li->h);
+*/
}
else
{
li->disappear_func(obj, li->data);
+/*
printf("disappear! %d %d %d %d - %d %d %d %d\n",sd->viewport.x,
sd->viewport.y,
sd->viewport.w, sd->viewport.h,
li->x, li->y, li->w, li->h);
+*/
}
}
@@ -458,17 +462,20 @@
sd->viewport.w, sd->viewport.h,
li->x, li->y, li->w, li->h))
{
- printf("appear! %d %d %d %d - %d %d %d
%d\n",sd->viewport.x, sd->viewport.y,
+/* printf("appear! %d %d %d %d - %d %d %d
%d\n",sd->viewport.x, sd->viewport.y,
sd->viewport.w, sd->viewport.h,
li->x, li->y, li->w, li->h);
+*/
li->appear_func(obj, li->data);
}
else
{
li->disappear_func(obj, li->data);
+/*
printf("disappear! %d %d %d %d - %d %d %d
%d\n",sd->viewport.x, sd->viewport.y,
sd->viewport.w, sd->viewport.h,
li->x, li->y, li->w, li->h);
+*/
}
}
_e_icon_layout_smart_move_resize_item(li);
@@ -656,17 +663,21 @@
sd->viewport.w, sd->viewport.h,
ox + dx, oy + dy, li->w, li->h))
{
+/*
printf("appear! %d %d %d %d - %d %d %d
%d\n",sd->viewport.x, sd->viewport.y,
sd->viewport.w, sd->viewport.h,
li->x, li->y, li->w, li->h);
+*/
li->appear_func(li->obj, li->data);
}
else
{
li->disappear_func(li->obj, li->data);
+/*
printf("disappear! %d %d %d %d - %d %d %d
%d\n",sd->viewport.x, sd->viewport.y,
sd->viewport.w, sd->viewport.h,
ox + dx, oy + dy, li->w, li->h);
+*/
}
}
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
