E CVS: proto/eina cedric
Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/include
Modified Files:
eina_list.h eina_inline_list.x
Log Message:
Add iterator/accessor to eina list.
Change list size type to unsigned int.
===
RCS file: /cvs/e/e17/proto/eina/src/include/eina_list.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eina_list.h 8 Aug 2008 14:20:11 - 1.5
+++ eina_list.h 13 Aug 2008 09:19:34 - 1.6
@@ -22,6 +22,8 @@
#include stdlib.h
#include eina_types.h
+#include eina_iterator.h
+#include eina_accessor.h
/**
* @defgroup List_Group List
@@ -41,7 +43,7 @@
struct _Eina_List_Accounting
{
Eina_List *last;
- intcount;
+ unsigned int count;
};
@@ -60,16 +62,21 @@
EAPI void *eina_list_find(const Eina_List *list, const void *data);
EAPI Eina_List *eina_list_find_list (const Eina_List *list, const void *data);
EAPI Eina_List *eina_list_free (Eina_List *list);
-EAPI void *eina_list_nth(const Eina_List *list, int n);
-EAPI Eina_List *eina_list_nth_list (const Eina_List *list, int n);
+EAPI void *eina_list_nth(const Eina_List *list, unsigned int n);
+EAPI Eina_List *eina_list_nth_list (const Eina_List *list, unsigned int n);
EAPI Eina_List *eina_list_reverse (Eina_List *list);
-EAPI Eina_List *eina_list_sort (Eina_List *list, int size,
int(*func)(void*,void*));
+EAPI Eina_List *eina_list_sort (Eina_List *list, unsigned int size,
int(*func)(void*,void*));
static inline Eina_List *eina_list_last (const Eina_List *list);
static inline Eina_List *eina_list_next (const Eina_List *list);
static inline Eina_List *eina_list_prev (const Eina_List *list);
static inline void *eina_list_data(const Eina_List *list);
-static inline int eina_list_count(const Eina_List *list);
+static inline unsigned int eina_list_count(const Eina_List *list);
+
+EAPI Eina_Iterator *eina_list_iterator_new(const Eina_List *list);
+EAPI Eina_Accessor *eina_list_accessor_new(const Eina_List *list);
+
+#define EINA_LIST_ITER_NEXT(list, l, data) for (l = list, data =
eina_list_data(l); l; l = eina_list_next(l), data = eina_list_data(l))
/** @} */
#include eina_inline_list.x
===
RCS file: /cvs/e/e17/proto/eina/src/include/eina_inline_list.x,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- eina_inline_list.x 8 Aug 2008 14:25:37 - 1.1
+++ eina_inline_list.x 13 Aug 2008 09:19:34 - 1.2
@@ -47,7 +47,7 @@
return list-data;
}
-static inline int
+static inline unsigned int
eina_list_count(const Eina_List *list)
{
if (!list) return 0;
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/eina cedric
Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/tests
Modified Files:
eina_test_iterator.c eina_test_accessor.c eina_bench_array.c
Log Message:
Add iterator/accessor to eina list.
Change list size type to unsigned int.
===
RCS file: /cvs/e/e17/proto/eina/src/tests/eina_test_iterator.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- eina_test_iterator.c12 Aug 2008 15:58:41 - 1.3
+++ eina_test_iterator.c13 Aug 2008 09:19:34 - 1.4
@@ -26,6 +26,7 @@
#include eina_array.h
#include eina_hash.h
#include eina_inlist.h
+#include eina_list.h
#include eina_private.h
static Eina_Bool
@@ -212,10 +213,68 @@
}
END_TEST
+static Eina_Bool
+eina_iterator_list_data_check(__UNUSED__ const Eina_List *list, int *data, int
*fdata)
+{
+ switch (*fdata)
+ {
+ case 0: fail_if(*data != 81); break;
+ case 1: fail_if(*data != 7); break;
+ case 2: fail_if(*data != 9); break;
+ case 3: fail_if(*data != 6); break;
+ case 4: fail_if(*data != 42); break;
+ case 5: fail_if(*data != 1); break;
+ case 6: fail_if(*data != 1337); break;
+ }
+
+ (*fdata)++;
+
+ return EINA_TRUE;
+}
+
+START_TEST(eina_iterator_list_simple)
+{
+ Eina_List *list = NULL;
+ Eina_Iterator *it;
+ int data[] = { 6, 9, 42, 1, 7, 1337, 81, 1664 };
+ int i = 0;
+
+ eina_list_init();
+
+ list = eina_list_append(list, data[0]);
+ fail_if(list == NULL);
+
+ list = eina_list_prepend(list, data[1]);
+ fail_if(list == NULL);
+
+ list = eina_list_append(list, data[2]);
+ fail_if(list == NULL);
+
+ list = eina_list_append(list, data[3]);
+ fail_if(list == NULL);
+
+ list = eina_list_prepend(list, data[4]);
+ fail_if(list == NULL);
+
+ list = eina_list_append(list, data[5]);
+ fail_if(list == NULL);
+
+ list = eina_list_prepend(list, data[6]);
+ fail_if(list == NULL);
+
+ it = eina_list_iterator_new(list);
+ fail_if(!it);
+
+ eina_iterator_foreach(it, EINA_EACH(eina_iterator_list_data_check), i);
+ eina_iterator_free(it);
+}
+END_TEST
+
void
eina_test_iterator(TCase *tc)
{
tcase_add_test(tc, eina_iterator_array_simple);
tcase_add_test(tc, eina_iterator_hash_simple);
tcase_add_test(tc, eina_iterator_inlist_simple);
+ tcase_add_test(tc, eina_iterator_list_simple);
}
===
RCS file: /cvs/e/e17/proto/eina/src/tests/eina_test_accessor.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- eina_test_accessor.c12 Aug 2008 15:58:41 - 1.3
+++ eina_test_accessor.c13 Aug 2008 09:19:34 - 1.4
@@ -25,6 +25,7 @@
#include eina_suite.h
#include eina_array.h
#include eina_inlist.h
+#include eina_list.h
#include eina_private.h
static Eina_Bool
@@ -164,10 +165,75 @@
}
END_TEST
+static Eina_Bool
+eina_iterator_list_data_check(__UNUSED__ const Eina_List *list, int *data, int
*fdata)
+{
+ switch (*fdata)
+ {
+ case 0: fail_if(*data != 9); break;
+ case 1: fail_if(*data != 6); break;
+ }
+
+ (*fdata)++;
+
+ return EINA_TRUE;
+}
+
+START_TEST(eina_accessor_list_simple)
+{
+ Eina_List *list = NULL;
+ Eina_Accessor *it;
+ int data[] = { 6, 9, 42, 1, 7, 1337, 81, 1664 };
+ int *j;
+ int i = 0;
+
+ eina_list_init();
+
+ list = eina_list_append(list, data[0]);
+ fail_if(list == NULL);
+
+ list = eina_list_prepend(list, data[1]);
+ fail_if(list == NULL);
+
+ list = eina_list_append(list, data[2]);
+ fail_if(list == NULL);
+
+ list = eina_list_append(list, data[3]);
+ fail_if(list == NULL);
+
+ list = eina_list_prepend(list, data[4]);
+ fail_if(list == NULL);
+
+ list = eina_list_append(list, data[5]);
+ fail_if(list == NULL);
+
+ list = eina_list_prepend(list, data[6]);
+ fail_if(list == NULL);
+
+ it = eina_list_accessor_new(list);
+ fail_if(!it);
+
+ eina_accessor_over(it, EINA_EACH(eina_iterator_list_data_check), 2, 4, i);
+
+ fail_if(eina_accessor_data_get(it, 5, (void**) j) != EINA_TRUE);
+ fail_if(*j != 1);
+ fail_if(eina_accessor_data_get(it, 3, (void**) j) != EINA_TRUE);
+ fail_if(*j != 6);
+ fail_if(eina_accessor_data_get(it, 3, (void**) j) != EINA_TRUE);
+ fail_if(*j != 6);
+ fail_if(eina_accessor_data_get(it, 1, (void**) j) != EINA_TRUE);
+ fail_if(*j != 7);
+ fail_if(eina_accessor_data_get(it, 5, (void**) j) != EINA_TRUE);
+ fail_if(*j != 1);
+
+ eina_accessor_free(it);
+}
+END_TEST
void
eina_test_accessor(TCase *tc)
{
tcase_add_test(tc, eina_accessor_array_simple);
tcase_add_test(tc, eina_accessor_inlist_simple);
+ tcase_add_test(tc, eina_accessor_list_simple);
}
===
RCS file: /cvs/e/e17/proto/eina/src/tests/eina_bench_array.c,v
retrieving revision 1.4
retrieving revision 1.5
E CVS: proto/eina cedric
Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/lib
Modified Files:
eina_list.c
Log Message:
Add iterator/accessor to eina list.
Change list size type to unsigned int.
===
RCS file: /cvs/e/e17/proto/eina/src/lib/eina_list.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eina_list.c 8 Aug 2008 14:20:11 - 1.5
+++ eina_list.c 13 Aug 2008 09:19:34 - 1.6
@@ -65,6 +65,27 @@
/**
* Local
*
**/
+typedef struct _Eina_Iterator_List Eina_Iterator_List;
+typedef struct _Eina_Accessor_List Eina_Accessor_List;
+
+struct _Eina_Iterator_List
+{
+ Eina_Iterator iterator;
+
+ const Eina_List *head;
+ const Eina_List *current;
+};
+
+struct _Eina_Accessor_List
+{
+ Eina_Accessor accessor;
+
+ const Eina_List *head;
+ const Eina_List *current;
+
+ unsigned int index;
+};
+
static inline Eina_List_Accounting*
_eina_list_mempool_accounting_new(__UNUSED__ Eina_List *list)
{
@@ -139,6 +160,108 @@
};
#endif
+static Eina_Bool
+eina_list_iterator_next(Eina_Iterator_List *it, void **data)
+{
+ if (it-current == NULL) return EINA_FALSE;
+ if (data) *data = eina_list_data(it-current);
+
+ it-current = eina_list_next(it-current);
+
+ return EINA_TRUE;
+}
+
+static Eina_List *
+eina_list_iterator_get_container(Eina_Iterator_List *it)
+{
+ return (Eina_List *) it-head;
+}
+
+static void
+eina_list_iterator_free(Eina_Iterator_List *it)
+{
+ free(it);
+}
+
+static Eina_Bool
+eina_list_accessor_get_at(Eina_Accessor_List *it, unsigned int index, void
**data)
+{
+ const Eina_List *over;
+ unsigned int middle;
+ unsigned int i;
+
+ if (index eina_list_count(it-head)) return EINA_FALSE;
+
+ if (it-index == index)
+ {
+ over = it-current;
+ }
+ else if (index it-index)
+ {
+ /* After current position. */
+ middle = ((eina_list_count(it-head) - it-index) 1) + it-index;
+
+ if (index middle)
+ {
+/* Go backward from the end. */
+for (i = eina_list_count(it-head) - 1, over =
eina_list_last(it-head);
+ i index over != NULL;
+ --i, over = eina_list_prev(over))
+ ;
+ }
+ else
+ {
+/* Go forward from current. */
+for (i = it-index, over = it-current;
+ i index over != NULL;
+ ++i, over = eina_list_next(over))
+ ;
+ }
+ }
+ else
+ {
+ /* Before current position. */
+ middle = it-index 1;
+
+ if (index middle)
+ {
+/* Go backward from current. */
+for (i = it-index, over = it-current;
+ i index over != NULL;
+ --i, over = eina_list_prev(over))
+ ;
+ }
+ else
+ {
+/* Go forward from start. */
+for (i = 0, over = it-head;
+ i index over != NULL;
+ ++i, over = eina_list_next(over))
+ ;
+ }
+ }
+
+ if (over == NULL) return EINA_FALSE;
+
+ it-current = over;
+ it-index = index;
+
+ if (data) *data = eina_list_data(it-current);
+ return EINA_TRUE;
+}
+
+static Eina_List *
+eina_list_accessor_get_container(Eina_Accessor_List *it)
+{
+ return (Eina_List *) it-head;
+}
+
+static void
+eina_list_accessor_free(Eina_Accessor_List *it)
+{
+ free(it);
+}
+
/**
* Global *
**/
@@ -589,7 +712,7 @@
EAPI void *
eina_list_find(const Eina_List *list, const void *data)
{
- if (eina_list_find_list(list, data)) return data;
+ if (eina_list_find_list(list, data)) return (void*) data;
return NULL;
}
@@ -789,7 +912,7 @@
* @endcode
* @ingroup Eina_List_General_Group
*/
-static inline int eina_list_count(const Eina_List *list);
+static inline unsigned int eina_list_count(const Eina_List *list);
/**
* Get the nth member's data pointer in a list
@@ -814,10 +937,10 @@
* @ingroup Eina_List_Find_Group
*/
EAPI void *
-eina_list_nth(const Eina_List *list, int n)
+eina_list_nth(const Eina_List *list, unsigned int n)
{
Eina_List *l;
-
+
l = eina_list_nth_list(list, n);
return l ? l-data : NULL;
}
@@ -845,14 +968,13 @@
* @ingroup Eina_List_Find_Group
*/
EAPI Eina_List *
-eina_list_nth_list(const Eina_List *list, int n)
+eina_list_nth_list(const Eina_List *list, unsigned int n)
{
- int i;
const Eina_List *l;
+
E CVS: proto/eina cedric
Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/lib
Modified Files:
eina_inlist.c
Log Message:
Merge common code.
===
RCS file: /cvs/e/e17/proto/eina/src/lib/eina_inlist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- eina_inlist.c 12 Aug 2008 15:58:41 - 1.5
+++ eina_inlist.c 13 Aug 2008 09:21:33 - 1.6
@@ -79,7 +79,6 @@
++i, over = over-next)
;
- if (over == NULL) return EINA_FALSE;
} else {
middle = it-index 1;
@@ -89,18 +88,16 @@
i index over != NULL;
--i, over = over-prev)
;
-
- if (over == NULL) return EINA_FALSE;
} else {
/* Looking from the start. */
for (i = 0, over = it-head;
i index over != NULL;
++i, over = over-next)
;
-
- if (over == NULL) return EINA_FALSE;
}
}
+
+ if (over == NULL) return EINA_FALSE;
it-current = over;
it-index = index;
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/eina cedric
Enlightenment CVS committal Author : cedric Project : e17 Module : proto/eina Dir : e17/proto/eina/src/lib Modified Files: eina_main.c Log Message: Remove warning and only include needed stuff. === RCS file: /cvs/e/e17/proto/eina/src/lib/eina_main.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eina_main.c 7 Aug 2008 13:12:57 - 1.3 +++ eina_main.c 13 Aug 2008 09:22:50 - 1.4 @@ -16,7 +16,11 @@ * if not, see http://www.gnu.org/licenses/. */ -#include Eina.h +#include eina_error.h +#include eina_hash.h +#include eina_stringshare.h +#include eina_list.h +#include eina_array.h EAPI int eina_init(void) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/eina cedric
Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/include
Modified Files:
eina_inline_array.x eina_array.h
Log Message:
Constness++
===
RCS file: /cvs/e/e17/proto/eina/src/include/eina_inline_array.x,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- eina_inline_array.x 11 Aug 2008 16:21:19 - 1.6
+++ eina_inline_array.x 13 Aug 2008 09:24:49 - 1.7
@@ -42,12 +42,12 @@
}
static inline void
-eina_array_append(Eina_Array *array, void *data)
+eina_array_append(Eina_Array *array, const void *data)
{
if (UNLIKELY((array-count + array-step) array-total))
if (!eina_array_grow(array)) return ;
- array-data[array-count++] = data;
+ array-data[array-count++] = (void*) data;
}
static inline void *
===
RCS file: /cvs/e/e17/proto/eina/src/include/eina_array.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- eina_array.h11 Aug 2008 16:30:15 - 1.8
+++ eina_array.h13 Aug 2008 09:24:49 - 1.9
@@ -50,7 +50,7 @@
EAPI Eina_Accessor *eina_array_accessor_new(const Eina_Array *array);
static inline void* eina_array_get(const Eina_Array *array,
unsigned int index);
-static inline void eina_array_append (Eina_Array *array, void *data);
+static inline void eina_array_append (Eina_Array *array, const void
*data);
static inline unsigned int eina_array_count (const Eina_Array *array);
#define EINA_ARRAY_ITER_NEXT(array, index, item, iterator) \
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/eina cedric
Enlightenment CVS committal Author : cedric Project : e17 Module : proto/eina Dir : e17/proto/eina/src/include Modified Files: eina_error.h Log Message: Use the right type name. === RCS file: /cvs/e/e17/proto/eina/src/include/eina_error.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- eina_error.h8 Aug 2008 10:39:47 - 1.7 +++ eina_error.h13 Aug 2008 09:25:22 - 1.8 @@ -49,7 +49,7 @@ const char *fnc, int line, const char *fmt, void *data, va_list args); -EAPI extern int EINA_ERROR_OUT_OF_MEMORY; +EAPI extern Eina_Error EINA_ERROR_OUT_OF_MEMORY; EAPI int eina_error_init(void); EAPI int eina_error_shutdown(void); - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/eina cedric
Enlightenment CVS committal Author : cedric Project : e17 Module : proto/eina Dir : e17/proto/eina/src/lib Modified Files: eina_error.c Log Message: Use the right type. === RCS file: /cvs/e/e17/proto/eina/src/lib/eina_error.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- eina_error.c9 Aug 2008 05:47:15 - 1.9 +++ eina_error.c13 Aug 2008 09:26:13 - 1.10 @@ -46,7 +46,7 @@ #define WHITE \033[37;1m #define NOTHING \033[0m -int EINA_ERROR_OUT_OF_MEMORY = 0; +EAPI Eina_Error EINA_ERROR_OUT_OF_MEMORY = 0; #ifdef DEBUG static Eina_Error_Level _error_level = EINA_ERROR_LEVEL_DBG; - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/eina cedric
Enlightenment CVS committal
Author : cedric
Project : e17
Module : proto/eina
Dir : e17/proto/eina/src/tests
Modified Files:
eina_bench.c
Log Message:
Line give nicer graphics.
===
RCS file: /cvs/e/e17/proto/eina/src/tests/eina_bench.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- eina_bench.c8 Aug 2008 15:55:09 - 1.4
+++ eina_bench.c13 Aug 2008 09:33:08 - 1.5
@@ -158,7 +158,7 @@
else fprintf(main_script, , \\\n);
fprintf(main_script,
- \%s\ using 1:2 title \'%s\' with points,
+ \%s\ using 1:2 title \'%s\' with line,
buffer, run-name);
}
@@ -177,9 +177,9 @@
};
static const Eina_Bench_Case etc[] = {
- { Hash, eina_bench_hash },
+/* { Hash, eina_bench_hash }, */
{ Array vs List vs Inlist, eina_bench_array },
- { Stringshare, eina_bench_stringshare },
+/* { Stringshare, eina_bench_stringshare }, */
{ NULL, NULL }
};
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e
Modified Files:
enlightenment.pc.in
Log Message:
Add packages which e requires
===
RCS file: /cvs/e/e17/apps/e/enlightenment.pc.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- enlightenment.pc.in 6 Aug 2008 05:42:53 - 1.5
+++ enlightenment.pc.in 13 Aug 2008 16:36:20 - 1.6
@@ -5,6 +5,7 @@
Name: enlightenment
Description: Enlightenmnt Window Manager
+Requires: @requirements_e@
Version: @VERSION@
Libs: -L${libdir}
Libs.private:
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet cedric
Enlightenment CVS committal
Author : cedric
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_lib.c
Log Message:
Delay unlink and reopen as long as possible in read/write mode.
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -3 -r1.112 -r1.113
--- eet_lib.c 17 Jul 2008 15:33:40 - 1.112
+++ eet_lib.c 13 Aug 2008 16:40:53 - 1.113
@@ -377,6 +377,13 @@
return EET_ERROR_NOT_WRITABLE;
if (!ef-writes_pending)
return EET_ERROR_NONE;
+ if (ef-mode == EET_FILE_MODE_READ_WRITE ef-fp == NULL)
+ {
+ unlink(ef-path);
+ ef-fp = fopen(ef-path, wb);
+ if (!ef-fp) return EET_ERROR_NOT_WRITABLE;
+ fcntl(fileno(ef-fp), F_SETFD, FD_CLOEXEC);
+ }
/* calculate string base offset and data base offset */
num = (1 ef-header-directory-size);
@@ -523,7 +530,7 @@
case EPIPE: error = EET_ERROR_WRITE_ERROR_FILE_CLOSED; break;
default: error = EET_ERROR_WRITE_ERROR; break;
}
- fclose(ef-fp);
+ if (ef-fp) fclose(ef-fp);
ef-fp = NULL;
return error;
}
@@ -1266,11 +1273,7 @@
if (ef-mode == EET_FILE_MODE_READ_WRITE)
{
ef-readfp = ef-fp;
- unlink(ef-path);
- ef-fp = fopen(ef-path, wb);
- if (eet_test_close(!ef-fp, ef))
- return NULL;
- fcntl(fileno(ef-fp), F_SETFD, FD_CLOEXEC);
+ ef-fp = NULL;
}
/* add to cache */
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/imlib2 kwo
Enlightenment CVS committal
Author : kwo
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/lib
Modified Files:
Imlib2.h api.c rend.c rend.h
Log Message:
Introduce imlib_context_disconnect_display().
imlib_context_disconnect_display() should be called when a display
connection is closed but the application continues using imlib2 with a
different display connection.
This is required to avoid to attempt to free cached GCs (in
__imlib_RenderImage) after the associated display connection has been
closed.
It is not unlikely that similar cleanups should be performed elsewhere
in this situation, but the __imlib_RenderImage GCs is the only case I
have found to cause trouble so far.
===
RCS file: /cvs/e/e17/libs/imlib2/src/lib/Imlib2.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Imlib2.h27 Jul 2007 18:46:11 - 1.7
+++ Imlib2.h13 Aug 2008 17:55:16 - 1.8
@@ -131,6 +131,7 @@
/* context setting */
# ifndef X_DISPLAY_MISSING
EAPI void imlib_context_set_display(Display * display);
+ EAPI void imlib_context_disconnect_display(void);
EAPI void imlib_context_set_visual(Visual * visual);
EAPI void imlib_context_set_colormap(Colormap colormap);
EAPI void imlib_context_set_drawable(Drawable drawable);
===
RCS file: /cvs/e/e17/libs/imlib2/src/lib/api.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- api.c 7 May 2008 21:38:39 - 1.21
+++ api.c 13 Aug 2008 17:55:16 - 1.22
@@ -314,8 +314,8 @@
}
#ifdef BUILD_X11
-/**
- * @param display Current display to bu used.
+/**
+ * @param display Current display to be used.
*
* Sets the current X display to be used for rendering of images to
* drawables. You do not need to set this if you do not intend to
@@ -343,6 +343,22 @@
{
CHECK_CONTEXT(ctx);
return ctx-display;
+}
+
+/**
+ * Tell Imlib2 that the current display connection has been closed.
+ *
+ * Call when (and only when) you close a display connection but continue
+ * using Imlib2 on a different connection.
+ */
+EAPI void
+imlib_context_disconnect_display(void)
+{
+ CHECK_CONTEXT(ctx);
+ if (!ctx-display)
+ return;
+ __imlib_RenderDisconnect(ctx-display);
+ ctx-display = NULL;
}
/**
===
RCS file: /cvs/e/e17/libs/imlib2/src/lib/rend.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- rend.c 20 May 2007 13:26:25 - 1.7
+++ rend.c 13 Aug 2008 17:55:16 - 1.8
@@ -235,6 +235,21 @@
}
}
+static Display *disp = NULL;
+static GC gc = NULL;
+static GC gcm = NULL;
+static int last_depth = 0;
+
+void
+__imlib_RenderDisconnect(Display * d)
+{
+ if (d != disp)
+ return;
+ disp = NULL;
+ gc = gcm = NULL;
+ last_depth = 0;
+}
+
void
__imlib_RenderImage(Display * d, ImlibImage * im,
Drawable w, Drawable m,
@@ -248,10 +263,6 @@
Context*ct;
DATA32 *buf = NULL, *pointer = NULL, *back = NULL;
int y, h, hh, jump;
- static Display *disp = NULL;
- static int last_depth = 0;
- static GC gc = 0;
- static GC gcm = 0;
XGCValues gcv;
ImlibScaleInfo *scaleinfo = NULL;
int psx, psy, psw, psh;
===
RCS file: /cvs/e/e17/libs/imlib2/src/lib/rend.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- rend.h 5 Sep 2006 18:50:35 - 1.3
+++ rend.h 13 Aug 2008 17:55:16 - 1.4
@@ -7,6 +7,9 @@
__imlib_RenderGetPixel(Display *d, Drawable w, Visual *v, Colormap cm, int
depth, DATA8 r, DATA8 g, DATA8 b);
__hidden void
+__imlib_RenderDisconnect(Display *d);
+
+__hidden void
__imlib_RenderImage(Display *d, ImlibImage *im,
Drawable w, Drawable m,
Visual *v, Colormap cm, int depth,
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/imlib2 kwo
Enlightenment CVS committal Author : kwo Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2/src/modules/loaders Modified Files: loader_xpm.c Log Message: Return value is not a pointer. === RCS file: /cvs/e/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- loader_xpm.c18 Jun 2008 17:52:38 - 1.11 +++ loader_xpm.c13 Aug 2008 17:56:08 - 1.12 @@ -154,7 +154,7 @@ count = 0; line = malloc(lsz); if (!line) - return NULL; + return 0; backslash = 0; memset(lookup, 0, sizeof(lookup)); - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/imlib2 kwo
Enlightenment CVS committal Author : kwo Project : e17 Module : libs/imlib2 Dir : e17/libs/imlib2 Modified Files: .cvsignore Log Message: Ignore+-. === RCS file: /cvs/e/e17/libs/imlib2/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- .cvsignore 1 Sep 2005 20:45:21 - 1.18 +++ .cvsignore 13 Aug 2008 18:17:19 - 1.19 @@ -1,7 +1,5 @@ Makefile.in Makefile -.deps -.libs stamp-h* mkinstalldirs missing @@ -10,26 +8,20 @@ install-sh *.pc *-config -*.tar.gz +imlib2-*.tar.bz2 +imlib2-*.tar.gz configure config.status config.log config.h* config.cache aclocal.m4 -*.patch -*.orig -*.rej -*.la autom4te* depcomp -imlib2.c build-stamp configure-stamp config.guess config.sub ltmain.sh -*.oe -*.bb *.spec README - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_theme Modified Files: e_int_config_theme.c e_int_config_theme_import.c e_int_config_theme_web.c Log Message: Web dialog returns an E_Dialog object, not E_Win. === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_int_config_theme.c2 Jul 2008 11:29:14 - 1.13 +++ e_int_config_theme.c13 Aug 2008 18:31:15 - 1.14 @@ -4,6 +4,7 @@ #include e.h #include e_int_config_theme_import.h +#include e_int_config_theme_web.h static void*_create_data (E_Config_Dialog *cfd); static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); @@ -36,8 +37,8 @@ Evas_List *parts_list; /* Dialog */ - E_Win *win_import; - E_Win *win_web; + E_Win*win_import; + E_Dialog *dia_web; }; EAPI E_Config_Dialog * @@ -78,7 +79,7 @@ E_Config_Dialog_Data *cfdata; cfdata = dia-cfdata; - cfdata-win_web = NULL; + cfdata-dia_web = NULL; } EAPI void @@ -262,10 +263,10 @@ E_Config_Dialog_Data *cfdata; cfdata = data1; - if (cfdata-win_web) - e_win_raise(cfdata-win_web); + if (cfdata-dia_web) + e_dialog_raise(cfdata-dia_web); else - cfdata-win_web = e_int_config_theme_web(cfdata-cfd); + cfdata-dia_web = e_int_config_theme_web(cfdata-cfd); } static void === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme_import.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_theme_import.c 25 Jul 2007 17:00:51 - 1.3 +++ e_int_config_theme_import.c 13 Aug 2008 18:31:15 - 1.4 @@ -1,5 +1,6 @@ #include e.h #include e_int_config_theme.h +#include e_int_config_theme_import.h typedef struct _Import Import; === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme_web.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_theme_web.c2 Jul 2008 12:43:33 - 1.1 +++ e_int_config_theme_web.c13 Aug 2008 18:31:15 - 1.2 @@ -4,6 +4,7 @@ #include e.h #include e_int_config_theme.h +#include e_int_config_theme_web.h #defineMAGIC_WEB 0x425581cb #define TEMPLATE /tmp/themeXX - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/mixer Added Files: .cvsignore Log Message: ignore - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: .cvsignore Log Message: ignore++ === RCS file: /cvs/e/e17/apps/e/src/bin/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- .cvsignore 25 Sep 2007 14:26:36 - 1.8 +++ .cvsignore 13 Aug 2008 18:51:23 - 1.9 @@ -12,3 +12,4 @@ enlightenment_thumb enlightenment_fm enlightenment_init +enlightenment_fm_op - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_main.c
Log Message:
- Add e_prefix.h for e_prefix_bin_get()
- Formatting
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_fm_main.c 11 Aug 2008 02:13:22 - 1.44
+++ e_fm_main.c 13 Aug 2008 18:56:09 - 1.45
@@ -36,6 +36,7 @@
#include config.h
#include e_fm_op.h
+#include e_prefix.h
/* E_DBUS support */
#ifdef HAVE_EDBUS
@@ -2177,7 +2178,8 @@
free(ed);
}
-static const char *_e_prepare_command(E_Fm_Op_Type type, const char *args)
+static const char *
+_e_prepare_command(E_Fm_Op_Type type, const char *args)
{
char *buffer;
unsigned int length = 0;
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/temperature Modified Files: e_mod_main.c Log Message: - embryo is not a needed pkg - make ecore_imf optional - add pkg-config requirements to enlightenment.pc - remove battery check dependant on ecore-txt - move Ecore_Txt.h from e.h to temperature module === RCS file: /cvs/e/e17/apps/e/src/modules/temperature/e_mod_main.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- e_mod_main.c17 Mar 2008 07:23:22 - 1.94 +++ e_mod_main.c13 Aug 2008 19:22:01 - 1.95 @@ -4,6 +4,8 @@ #include e.h #include e_mod_main.h +#include Ecore_Txt.h + #ifdef __FreeBSD__ #include sys/types.h #include sys/sysctl.h - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: - embryo is not a needed pkg - make ecore_imf optional - add pkg-config requirements to enlightenment.pc - remove battery check dependant on ecore-txt - move Ecore_Txt.h from e.h to temperature module === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.211 retrieving revision 1.212 diff -u -3 -r1.211 -r1.212 --- configure.in6 Aug 2008 05:42:53 - 1.211 +++ configure.in13 Aug 2008 19:22:01 - 1.212 @@ -183,35 +183,37 @@ PKG_CHECK_MODULES(E, [ evas ecore + ecore-x ecore-evas - ecore-file - ecore-ipc ecore-con + ecore-ipc ecore-job - ecore-imf - ecore-imf-evas - edje + ecore-file eet = 1.0.1 - embryo + edje efreet efreet-mime ]) +requirements_e=evas ecore ecore-x ecore-evas ecore-con ecore-ipc ecore-job ecore-file eet edje efreet efreet-mime + +PKG_CHECK_MODULES(ECORE_IMF, [ + ecore-imf + ecore-imf-evas +], [ + have_ecore_imf=yes + AC_DEFINE(HAVE_ECORE_IMF, 1, [Ecore IMF support]) +], [ have_ecore_imf=no ] +) PKG_CHECK_MODULES(ECORE_TXT, [ ecore-txt ], [ have_temp=yes - have_battery=yes # This test will succeed as these modules are also checked before PKG_CHECK_MODULES(TEMPERATURE, [ ecore ecore-file ]) - PKG_CHECK_MODULES(BATTERY, [ -ecore -ecore-file -ecore-con - ]) ], [ have_temp=no]) AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = xyes) AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = xyes) @@ -224,6 +226,7 @@ define_e_dbus= if test x$have_edbus = xyes; then define_e_dbus=-DHAVE_EDBUS + requirements_e=$requirements_e edbus if test x$have_ehal = xyes; then AC_DEFINE(HAVE_EDBUS, 1, [E_Dbus support]) fi @@ -236,6 +239,7 @@ AC_SUBST(e_libs) AC_SUBST(e_cflags) AC_SUBST(e_configflags) +AC_SUBST(requirements_e) profile=SLOW_PC AC_ARG_WITH(profile, - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e.h e_entry.c e_main.c
Log Message:
- embryo is not a needed pkg
- make ecore_imf optional
- add pkg-config requirements to enlightenment.pc
- remove battery check dependant on ecore-txt
- move Ecore_Txt.h from e.h to temperature module
===
RCS file: /cvs/e/e17/apps/e/src/bin/e.h,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- e.h 5 Aug 2008 13:11:47 - 1.74
+++ e.h 13 Aug 2008 19:22:01 - 1.75
@@ -64,14 +64,13 @@
#include Evas_Engine_Buffer.h
#include Ecore.h
#include Ecore_X.h
+#include Ecore_X_Atoms.h
+#include Ecore_X_Cursor.h
#include Ecore_Evas.h
#include Ecore_Con.h
#include Ecore_Ipc.h
#include Ecore_Job.h
-#include Ecore_Txt.h
#include Ecore_File.h
-#include Ecore_X_Atoms.h
-#include Ecore_X_Cursor.h
#include Eet.h
#include Edje.h
#include Efreet.h
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- e_entry.c 15 May 2008 21:08:30 - 1.55
+++ e_entry.c 13 Aug 2008 19:22:01 - 1.56
@@ -3,8 +3,10 @@
*/
#include e.h
+#ifdef HAVE_ECORE_IMF
#include Ecore_IMF.h
#include Ecore_IMF_Evas.h
+#endif
typedef struct _E_Entry_Smart_Data E_Entry_Smart_Data;
@@ -14,7 +16,9 @@
Evas_Object *editable_object;
E_Menu *popup;
Ecore_Event_Handler *selection_handler;
+#ifdef HAVE_ECORE_IMF
Ecore_IMF_Context *imf_context;
+#endif
Ecore_Event_Handler *imf_ee_commit_handler;
Ecore_Event_Handler *imf_ee_delete_handler;
@@ -54,9 +58,11 @@
static void _e_entry_cb_paste(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_entry_cb_select_all(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_entry_cb_delete(void *data, E_Menu *m, E_Menu_Item *mi);
+#ifdef HAVE_ECORE_IMF
static int _e_entry_cb_imf_retrieve_surrounding(void *data, Ecore_IMF_Context
*ctx, char **text, int *cursor_pos);
static int _e_entry_cb_imf_event_commit(void *data, int type, void *event);
static int _e_entry_cb_imf_event_delete_surrounding(void *data, int type, void
*event);
+#endif
/* local subsystem globals */
static Evas_Smart *_e_entry_smart = NULL;
@@ -181,10 +187,12 @@
if ((!entry) || (!(sd = evas_object_smart_data_get(entry
return;
e_editable_password_set(sd-editable_object, password_mode);
+#ifdef HAVE_ECORE_IMF
if (sd-imf_context)
ecore_imf_context_input_mode_set(sd-imf_context,
password_mode ?
ECORE_IMF_INPUT_MODE_FULL ECORE_IMF_INPUT_MODE_INVISIBLE :
ECORE_IMF_INPUT_MODE_FULL);
+#endif
}
/**
@@ -228,22 +236,26 @@
if (!sd-selection_dragging)
{
e_editable_cursor_move_to_end(sd-editable_object);
+#ifdef HAVE_ECORE_IMF
if (sd-imf_context)
{
ecore_imf_context_reset(sd-imf_context);
ecore_imf_context_cursor_position_set(sd-imf_context,
e_editable_cursor_pos_get(sd-editable_object));
}
+#endif
e_editable_selection_move_to_end(sd-editable_object);
}
if (sd-enabled)
e_editable_cursor_show(sd-editable_object);
e_editable_selection_show(sd-editable_object);
+#ifdef HAVE_ECORE_IMF
if (sd-imf_context)
{
ecore_imf_context_reset(sd-imf_context);
ecore_imf_context_focus_in(sd-imf_context);
}
+#endif
sd-focused = 1;
}
@@ -268,11 +280,13 @@
edje_object_signal_emit(sd-entry_object, e,state,unfocused, e);
e_editable_cursor_hide(sd-editable_object);
e_editable_selection_hide(sd-editable_object);
+#ifdef HAVE_ECORE_IMF
if (sd-imf_context)
{
ecore_imf_context_reset(sd-imf_context);
ecore_imf_context_focus_out(sd-imf_context);
}
+#endif
sd-focused = 0;
}
@@ -332,6 +346,7 @@
if ((!obj) || (!(sd = evas_object_smart_data_get(obj
return;
+#ifdef HAVE_ECORE_IMF
if (sd-imf_context)
{
Ecore_IMF_Event_Key_Down ev;
@@ -342,6 +357,7 @@
(Ecore_IMF_Event *) ev))
return;
}
+#endif
if (_e_entry_emacs_keybindings)
_e_entry_key_down_emacs(obj, event_info);
@@ -358,6 +374,7 @@
if ((!obj) || (!(sd = evas_object_smart_data_get(obj
return;
+#ifdef HAVE_ECORE_IMF
if (sd-imf_context)
{
Ecore_IMF_Event_Key_Up ev;
@@ -368,6 +385,7 @@
(Ecore_IMF_Event *) ev))
return;
}
+#endif
}
/* Called when the entry object is pressed by the mouse */
@@ -384,6 +402,7 @@
if (!(event = event_info))
return;
+#ifdef HAVE_ECORE_IMF
if
E CVS: proto/eflpp andreas
Enlightenment CVS committal
Author : andreas
Project : e17
Module : proto/eflpp
Dir : e17/proto/eflpp/src/ecore
Modified Files:
eflpp_ecore_x_window.cpp eflpp_ecore_x_window.h
Log Message:
DPMS
===
RCS file: /cvs/e/e17/proto/eflpp/src/ecore/eflpp_ecore_x_window.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eflpp_ecore_x_window.cpp10 Aug 2008 20:58:10 - 1.2
+++ eflpp_ecore_x_window.cpp13 Aug 2008 22:52:51 - 1.3
@@ -39,4 +39,14 @@
return ret;
}
+bool EcoreXWindow::getDPMSEnabled ()
+{
+ return ecore_x_dpms_enabled_get ();
+}
+
+void EcoreXWindow::setDPMSEnabled (bool enabled)
+{
+ ecore_x_dpms_enabled_set (enabled);
+}
+
} // end namespace efl
===
RCS file: /cvs/e/e17/proto/eflpp/src/ecore/eflpp_ecore_x_window.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- eflpp_ecore_x_window.h 10 Aug 2008 20:58:10 - 1.2
+++ eflpp_ecore_x_window.h 13 Aug 2008 22:52:51 - 1.3
@@ -40,6 +40,10 @@
//void getNetWMWindowTypeFetc ();
bool getNetWMWindowType( EcoreXWindowType outType );
+// TODO: not sure where to put DPMS and all other functions
+static bool getDPMSEnabled ();
+static void setDPMSEnabled (bool enabled);
+
protected:
private:
-
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100url=/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: tiling morlenxus
Enlightenment CVS committal Author : morlenxus Project : e_modules Module : tiling Dir : e_modules/tiling Modified Files: COPYING e_mod_main.c e_mod_main.h trivials.c Log Message: Fix two bugs found by Toby Cubitt, one was that windows were incorrectly maximized (not visible when using xterms however, only in thunderbird etc.), the other one was about a maximized window setting big_perc to 100% More of Toby's bugs: Windows are now rearranged correctly when you send a window to another desk Remove unnecessary variable Bugfix: Don't screw up if the user sends the mainbd to another desk. Bugfix: Rearrange the windows of another desk as soon as it's shown after the user sent a window there. (Thanks Toby) Fix compilation warnings by renaming DEBUG to TILING_DEBUG Change license to BSD (was GPL by mistake) === RCS file: /cvs/e/e_modules/tiling/COPYING,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- COPYING 5 Jun 2008 10:55:51 - 1.1 +++ COPYING 13 Aug 2008 22:54:08 - 1.2 @@ -1,340 +1,29 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +Copyright (C) 2008 Michael Stapelberg +Copyright (C) 2000 Carsten Haitzler and various contributors (see AUTHORS) - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The Program, below, -refers to any such program or work, and a work based on the Program -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term modification.) Each licensee is addressed as you. - -Activities other than copying,
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: build! fix breaks! === RCS file: /cvs/e/e17/apps/e/configure.in,v retrieving revision 1.212 retrieving revision 1.213 diff -u -3 -r1.212 -r1.213 --- configure.in13 Aug 2008 19:22:01 - 1.212 +++ configure.in14 Aug 2008 01:16:26 - 1.213 @@ -209,14 +209,24 @@ ecore-txt ], [ have_temp=yes - # This test will succeed as these modules are also checked before + have_bat=yes +], [ have_temp=no]) + +AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = xyes) +if test x$have_temp = xyes; then PKG_CHECK_MODULES(TEMPERATURE, [ ecore ecore-file ]) -], [ have_temp=no]) -AM_CONDITIONAL(HAVE_TEMPERATURE, test x$have_temp = xyes) +fi AM_CONDITIONAL(HAVE_BATTERY, test x$have_bat = xyes) +if test x$have_bat = xyes; then + PKG_CHECK_MODULES(BATTERY, [ +ecore +ecore-file +ecore-con + ]) +fi PKG_CHECK_MODULES(E_DBUS, edbus, have_edbus=yes, have_edbus=no) PKG_CHECK_MODULES(E_HAL, ehal, have_ehal=yes, have_ehal=no) @@ -232,8 +242,8 @@ fi fi -e_libs=$E_LIBS $LIBINTL $fnmatch_libs -e_cflags=-DUSE_E_CONFIG_H $define_e_dbus $E_CFLAGS $E_DBUS_CFLAGS +e_libs=$E_LIBS $LIBINTL $fnmatch_libs $ECORE_IMF_LIBS +e_cflags=-DUSE_E_CONFIG_H $define_e_dbus $E_CFLAGS $E_DBUS_CFLAGS $ECORE_IMF_CFLAGS e_configflags=-DUSE_E_CONFIG_H $define_e_dbus AC_SUBST(e_libs) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_main.c Log Message: build! fix breaks! === RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v retrieving revision 1.244 retrieving revision 1.245 diff -u -3 -r1.244 -r1.245 --- e_main.c13 Aug 2008 19:22:01 - 1.244 +++ e_main.c14 Aug 2008 01:16:27 - 1.245 @@ -3,7 +3,9 @@ */ #include e.h +#ifdef HAVE_ECORE_IMF #include Ecore_IMF.h +#endif EAPI int e_precache_end = 0; - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_theme Modified Files: e_int_config_theme.c Log Message: and use the right func.. that exists! === RCS file: /cvs/e/e17/apps/e/src/modules/conf_theme/e_int_config_theme.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_int_config_theme.c13 Aug 2008 18:31:15 - 1.14 +++ e_int_config_theme.c14 Aug 2008 01:29:02 - 1.15 @@ -264,7 +264,7 @@ cfdata = data1; if (cfdata-dia_web) - e_dialog_raise(cfdata-dia_web); + e_win_raise(cfdata-dia_web-win); else cfdata-dia_web = e_int_config_theme_web(cfdata-cfd); } - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
