E CVS: e raster
Enlightenment CVS committal Author : raster Project : web Module : e Dir : web/e/pages Modified Files: links.html Log Message: linkies === RCS file: /cvsroot/enlightenment/web/e/pages/links.html,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- links.html 17 Jul 2004 10:56:33 - 1.29 +++ links.html 21 Jul 2004 07:01:19 - 1.30 @@ -174,6 +174,9 @@ tr class=team-dark tda href=http://www.deaddreamer.com;Misery: VII/a/td tdNice set of backgrounds. Perfect for Enlightenment users./td + tr class=team-dark +tda href=http://www.lynucs.org/?enlightenment;Lynucs.org Screenshots/a/td + tdA good set of screenshots from an E user./td /table --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e raster
Enlightenment CVS committal Author : raster Project : web Module : e Dir : web/e/data Modified Files: links.html Log Message: linkies === RCS file: /cvsroot/enlightenment/web/e/data/links.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- links.html 1 Jun 2004 19:28:18 - 1.5 +++ links.html 21 Jul 2004 07:01:19 - 1.6 @@ -51,6 +51,9 @@ tr class=team-dark tda href=http://www.deaddreamer.com;Misery: VII/a/td tdNice set of backgrounds. Perfect for Enlightenment users./td + tr class=team-dark +tda href=http://www.lynucs.org/?enlightenment;Lynucs.org Screenshots/a/td + tdA good set of screenshots from an E user./td /table --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/modules
Modified Files:
emotion_xine.c
Log Message:
moe robus pos reporting
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/modules/emotion_xine.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- emotion_xine.c 21 Jul 2004 06:34:17 - 1.10
+++ emotion_xine.c 21 Jul 2004 07:38:17 - 1.11
@@ -293,8 +293,17 @@
}
if (xine_get_pos_length(ev-stream, pos_stream, pos_time, length_time))
{
- ev-pos = 0.0;
- ev-len = (double)length_time / 1000.0;
+ if (length_time == 0)
+ {
+ev-pos = (double)pos_stream / 65535;
+ev-len = 1.0;
+ev-no_time = 1;
+ }
+ else
+ {
+ev-pos = 0.0;
+ev-len = (double)length_time / 1000.0;
+ }
}
v = xine_get_stream_info(ev-stream, XINE_STREAM_INFO_FRAME_DURATION);
if (v 0) ev-fps = 9.0 / (double)v;
@@ -403,9 +412,19 @@
pos_time,
length_time))
{
- ev-pos = (double)pos_time / 1000.0;
- ev-len = (double)length_time / 1000.0;
+ if (length_time == 0)
+ {
+ev-pos = (double)pos_stream / 65535;
+ev-len = 1.0;
+ev-no_time = 1;
+ }
+ else
+ {
+ev-pos = (double)pos_time / 1000.0;
+ev-len = (double)length_time / 1000.0;
+ }
}
+
if ((xine_get_stream_info(ev-stream, XINE_STREAM_INFO_HAS_VIDEO))
(xine_get_stream_info(ev-stream, XINE_STREAM_INFO_VIDEO_HANDLED)))
_emotion_frame_new(ev-obj);
@@ -451,9 +470,12 @@
ev = (Emotion_Xine_Video *)ef;
if (ev-seek_to_pos == pos) return;
- ev-seek_to_pos = pos;
- ev-seek_to++;
- pthread_cond_broadcast((ev-seek_cond));
+// if (xine_get_stream_info(ev-stream, XINE_STREAM_INFO_SEEKABLE))
+ {
+ ev-seek_to_pos = pos;
+ ev-seek_to++;
+ pthread_cond_broadcast((ev-seek_cond));
+ }
}
static double
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_list.c
Log Message:
Forgot to commit this fix.
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_list.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_list.c15 Jul 2004 13:43:13 - 1.7
+++ ecore_list.c21 Jul 2004 13:55:31 - 1.8
@@ -1271,16 +1271,17 @@
void *ecore_dlist_remove(Ecore_DList * list)
{
void *ret;
- Ecore_List_Node *node;
+ Ecore_List *l2 = ECORE_LIST(list);
+ Ecore_DList_Node *node;
CHECK_PARAM_POINTER_RETURN(list, list, FALSE);
ECORE_WRITE_LOCK(list);
- if (list-current) {
- node = list-current-next;
- ECORE_DLIST_NODE(node)-previous =
- ECORE_DLIST_NODE(ECORE_LIST(list)-current)-previous;
+ if (l2-current) {
+ node = ECORE_DLIST_NODE(list-current-next);
+ if (node)
+ node-previous = ECORE_DLIST_NODE(l2-current)-previous;
}
ret = _ecore_list_remove_0(list);
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl werkt
Enlightenment CVS committal
Author : werkt
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src
Modified Files:
ewl_object.c ewl_object.h
Log Message:
Made ewl_object_get_alignment and ewl_object_get_fill_policy real functions.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- ewl_object.c9 Apr 2004 06:15:31 - 1.51
+++ ewl_object.c21 Jul 2004 18:59:21 - 1.52
@@ -1301,6 +1301,34 @@
}
/**
+ * @param o: the parameter to retrieve the current value of object alignment
+ * @return Returns the current setting of the object alignment for @a o.
+ * @brief Retrieves the current setting of the object alignment for @a o.
+ */
+unsigned int
+ewl_object_get_alignment(Ewl_Object *o)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(o, o);
+
+ DRETURN_INT(ewl_object_get_flags(o, EWL_FLAGS_ALIGN_MASK), DLEVEL_STABLE);
+}
+
+/**
+ * @param o: the parameter to retrieve the current value of object fill policy
+ * @return Returns the current setting of the object fill policy for @a o.
+ * @brief Retrieves the current setting of the object fill policy for @a o.
+ */
+unsigned int
+ewl_object_get_fill_policy(Ewl_Object *o)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(o, o);
+
+ DRETURN_INT(ewl_object_get_flags(o, EWL_FLAGS_FILL_MASK), DLEVEL_STABLE);
+}
+
+/**
* @param o: the parameter to retrieve the current value of object flags
* @param mask: get only the flags specified in mask
* @return Returns the current setting of the object flags for @a o.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_object.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ewl_object.h17 Feb 2004 05:18:38 - 1.40
+++ ewl_object.h21 Jul 2004 18:59:21 - 1.41
@@ -133,30 +133,13 @@
inline int ewl_object_get_maximum_w(Ewl_Object * o);
inline int ewl_object_get_maximum_h(Ewl_Object * o);
+unsigned int ewl_object_get_alignment(Ewl_Object * o);
inline void ewl_object_set_alignment(Ewl_Object * o, unsigned int align);
voidewl_object_place(Ewl_Object *o, int x, int y, int w, int h);
-/**
- * @def ewl_object_get_alignment(o)
- * @param o: the object to retrieve the alignment value
- * @return Returns the value stored in the objects alignment attribute.
- * @brief Retrieve the value of the objects alignment
- */
-#define ewl_object_get_alignment(o) \
- ewl_object_get_flags(o, EWL_FLAGS_ALIGN_MASK)
-
-
+unsigned int ewl_object_get_fill_policy(Ewl_Object * o);
inline void ewl_object_set_fill_policy(Ewl_Object * o, unsigned int fill);
-/**
- * @def ewl_object_get_fill_policy(o)
- * @param o: the object to retrieve the fill policy value
- * @return Returns the value stored in the objects fill policy attribute.
- * @brief Retrieve the value of the objects fill policy
- */
-#define ewl_object_get_fill_policy(o) \
- ewl_object_get_flags(o, EWL_FLAGS_FILL_MASK)
-
/*
* Padding setting and retrieval functions.
*/
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src Modified Files: ewl_callback.h Log Message: Fix warnings for some deprecated typecasts. === RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/ewl_callback.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- ewl_callback.h 22 Jun 2004 16:44:32 - 1.32 +++ ewl_callback.h 21 Jul 2004 19:44:27 - 1.33 @@ -64,8 +64,8 @@ * Sets the callback intercept flag from a widget for a certain event type. */ #define EWL_CALLBACK_FLAG_INTERCEPT(w, t) \ - ((long)w-callbacks[t] = \ -(long)EWL_CALLBACK_LIST_POINTER(w, t) | \ + w-callbacks[t] = \ +(void *)((long)EWL_CALLBACK_LIST_POINTER(w, t) | \ EWL_CALLBACK_NOTIFY_INTERCEPT) /** @@ -73,8 +73,8 @@ * Clears the callback intercept flag from a widget for a certain event type. */ #define EWL_CALLBACK_FLAG_NOINTERCEPT(w, t) \ - ((long)w-callbacks[t] = \ -(long)EWL_CALLBACK_LIST_POINTER(w, t) \ + w-callbacks[t] = \ +(void *)((long)EWL_CALLBACK_LIST_POINTER(w, t) \ EWL_CALLBACK_NOTIFY_MASK ~EWL_CALLBACK_NOTIFY_INTERCEPT) /** @@ -82,8 +82,8 @@ * Sets the callback notify flag from a widget for a certain event type. */ #define EWL_CALLBACK_FLAG_NOTIFY(w, t) \ - ((long)w-callbacks[t] = \ -(long)EWL_CALLBACK_LIST_POINTER(w, t) | \ + w-callbacks[t] = \ +(void *)((long)EWL_CALLBACK_LIST_POINTER(w, t) | \ EWL_CALLBACK_NOTIFY_NOTIFY) /** @@ -91,9 +91,9 @@ * Sets the callback list for a widget for a certain event type. */ #define EWL_CALLBACK_LIST_ASSIGN(w, t, l) \ - (long)w-callbacks[t] = (long)l | \ + w-callbacks[t] = (void *)((long)l | \ ((long)w-callbacks[t] \ -EWL_CALLBACK_NOTIFY_MASK) +EWL_CALLBACK_NOTIFY_MASK)) voidewl_callbacks_init(void); voidewl_callbacks_shutdown(void); --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libast mej
Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/include
Modified Files:
libast.h libast_internal.h
Log Message:
Wed Jul 21 18:16:43 2004Michael Jennings (mej)
Mmmm, beefy.
--
===
RCS file: /cvsroot/enlightenment/eterm/libast/include/libast.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- libast.h20 Jul 2004 22:32:07 - 1.53
+++ libast.h21 Jul 2004 22:17:49 - 1.54
@@ -30,8 +30,8 @@
* including all required system headers and LibAST Object headers.
*
* @author Michael Jennings [EMAIL PROTECTED]
- * @version $Revision: 1.53 $
- * @date $Date: 2004/07/20 22:32:07 $
+ * @version $Revision: 1.54 $
+ * @date $Date: 2004/07/21 22:17:49 $
*/
#ifndef _LIBAST_H_
@@ -1095,17 +1095,17 @@
* @ingroup DOXGRP_MEM
*/
#if (DEBUG = DEBUG_MEM)
-# define MALLOC(sz) spifmem_malloc(__FILE__, __LINE__,
(sz))
-# define CALLOC(type,n) spifmem_calloc(__FILE__, __LINE__,
(n), (sizeof(type)))
-# define REALLOC(mem,sz)spifmem_realloc(#mem, __FILE__,
__LINE__, (mem), (sz))
-# define FREE(ptr) do { spifmem_free(#ptr, __FILE__,
__LINE__, (ptr)); (ptr) = NULL; } while (0)
-# define STRDUP(s) spifmem_strdup(#s, __FILE__,
__LINE__, (char *) (s))
+# define MALLOC(sz) spifmem_malloc(SPIF_CAST(charptr)
__FILE__, __LINE__, (sz))
+# define CALLOC(type,n) spifmem_calloc(SPIF_CAST(charptr)
__FILE__, __LINE__, (n), (sizeof(type)))
+# define REALLOC(mem,sz)spifmem_realloc(SPIF_CAST(charptr)
#mem, SPIF_CAST(charptr) __FILE__, __LINE__, (mem), (sz))
+# define FREE(ptr) do { spifmem_free(SPIF_CAST(charptr)
#ptr, SPIF_CAST(charptr) __FILE__, __LINE__, (ptr)); (ptr) = NULL; } while (0)
+# define STRDUP(s) spifmem_strdup(SPIF_CAST(charptr) #s,
SPIF_CAST(charptr) __FILE__, __LINE__, SPIF_CAST(charptr) (s))
# define MALLOC_DUMP() spifmem_dump_mem_tables()
-# define X_CREATE_PIXMAP(d, win, w, h, depth) spifmem_x_create_pixmap(__FILE__,
__LINE__, (d), (win), (w), (h), (depth))
-# define X_FREE_PIXMAP(d, p)spifmem_x_free_pixmap(#p, __FILE__,
__LINE__, (d), (p))
+# define X_CREATE_PIXMAP(d, win, w, h, depth)
spifmem_x_create_pixmap(SPIF_CAST(charptr) __FILE__, __LINE__, (d), (win), (w), (h),
(depth))
+# define X_FREE_PIXMAP(d, p)
spifmem_x_free_pixmap(SPIF_CAST(charptr) #p, SPIF_CAST(charptr) __FILE__, __LINE__,
(d), (p))
# if LIBAST_IMLIB2_SUPPORT
-# define IMLIB_REGISTER_PIXMAP(p) spifmem_imlib_register_pixmap(#p,
__FILE__, __LINE__, (p))
-# define IMLIB_FREE_PIXMAP(p) spifmem_imlib_free_pixmap(#p,
__FILE__, __LINE__, (p))
+# define IMLIB_REGISTER_PIXMAP(p)
spifmem_imlib_register_pixmap(SPIF_CAST(charptr) #p, SPIF_CAST(charptr) __FILE__,
__LINE__, (p))
+# define IMLIB_FREE_PIXMAP(p)
spifmem_imlib_free_pixmap(SPIF_CAST(charptr) #p, SPIF_CAST(charptr) __FILE__,
__LINE__, (p))
# else
# define IMLIB_REGISTER_PIXMAP(p) NOP
# define IMLIB_FREE_PIXMAP(p) NOP
@@ -2671,22 +2671,28 @@
/* mem.c */
extern void spifmem_init(void);
-extern void *spifmem_malloc(const char *, unsigned long, size_t);
-extern void *spifmem_realloc(const char *, const char *, unsigned long, void *,
size_t);
-extern void *spifmem_calloc(const char *, unsigned long, size_t, size_t);
-extern void spifmem_free(const char *, const char *, unsigned long, void *);
-extern char *spifmem_strdup(const char *, const char *, unsigned long, const char *);
+extern void *spifmem_malloc(const spif_charptr_t, unsigned long, size_t);
+extern void *spifmem_realloc(const spif_charptr_t, const spif_charptr_t, unsigned
long, void *, size_t);
+extern void *spifmem_calloc(const spif_charptr_t, unsigned long, size_t, size_t);
+extern void spifmem_free(const spif_charptr_t, const spif_charptr_t, unsigned long,
void *);
+extern spif_charptr_t spifmem_strdup(const spif_charptr_t, const spif_charptr_t,
+ unsigned long, const spif_charptr_t);
extern void spifmem_dump_mem_tables(void);
#if LIBAST_X11_SUPPORT
-extern Pixmap spifmem_x_create_pixmap(const char *, unsigned long, Display *,
Drawable, unsigned int, unsigned int, unsigned int);
-extern void spifmem_x_free_pixmap(const char *, const char *, unsigned long, Display
*, Pixmap);
+extern Pixmap spifmem_x_create_pixmap(const spif_charptr_t, unsigned long, Display *,
+ Drawable, unsigned int, unsigned int, unsigned
int);
+extern void
E CVS: libast mej
Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
linked_list.c mem.c msgs.c obj.c objpair.c
Log Message:
Wed Jul 21 18:16:43 2004Michael Jennings (mej)
Mmmm, beefy.
--
===
RCS file: /cvsroot/enlightenment/eterm/libast/src/linked_list.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- linked_list.c 20 Jul 2004 22:32:08 - 1.24
+++ linked_list.c 21 Jul 2004 22:17:49 - 1.25
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = $Id: linked_list.c,v 1.24 2004/07/20 22:32:08 mej
Exp $;
+static const char cvs_ident[] = $Id: linked_list.c,v 1.25 2004/07/21 22:17:49 mej
Exp $;
#ifdef HAVE_CONFIG_H
# include config.h
@@ -264,15 +264,16 @@
}
memset(tmp, ' ', indent);
-snprintf(tmp + indent, sizeof(tmp) - indent, (spif_linked_list_item_t) %s (%9p
- %9p): ,
- name, self, self-next);
+snprintf(SPIF_CAST_C(char *) tmp + indent, sizeof(tmp) - indent,
+ (spif_linked_list_item_t) %s (%9p - %9p): ,
+ name, SPIF_CAST(ptr) self, SPIF_CAST(ptr) self-next);
if (SPIF_STR_ISNULL(buff)) {
buff = spif_str_new_from_ptr(tmp);
} else {
spif_str_append_from_ptr(buff, tmp);
}
if (SPIF_LINKED_LIST_ITEM_ISNULL(self-data)) {
-spif_str_append_from_ptr(buff, SPIF_NULLSTR_TYPE(obj) \n);
+spif_str_append_from_ptr(buff, SPIF_CAST(charptr) SPIF_NULLSTR_TYPE(obj)
\n);
} else {
buff = SPIF_OBJ_SHOW(self-data, buff, 0);
}
@@ -307,8 +308,8 @@
return SPIF_OBJ_CLASSNAME(self);
}
-SPIF_DEFINE_PROPERTY_FUNC(linked_list_item, obj, data);
-SPIF_DEFINE_PROPERTY_FUNC_NONOBJ(linked_list_item, linked_list_item, next);
+SPIF_DEFINE_PROPERTY_FUNC(linked_list_item, obj, data)
+SPIF_DEFINE_PROPERTY_FUNC_NONOBJ(linked_list_item, linked_list_item, next)
static spif_linked_list_t
@@ -431,27 +432,29 @@
}
memset(tmp, ' ', indent);
-snprintf(tmp + indent, sizeof(tmp) - indent, (spif_linked_list_t) %s: %10p
{\n, name, self);
+snprintf(SPIF_CAST_C(char *) tmp + indent, sizeof(tmp) - indent,
+ (spif_linked_list_t) %s: %10p {\n, name, SPIF_CAST(ptr) self);
if (SPIF_STR_ISNULL(buff)) {
buff = spif_str_new_from_ptr(tmp);
} else {
spif_str_append_from_ptr(buff, tmp);
}
-snprintf(tmp + indent, sizeof(tmp) - indent, len: %lu\n,
SPIF_CAST_C(unsigned long) self-len);
+snprintf(SPIF_CAST_C(char *) tmp + indent, sizeof(tmp) - indent, len: %lu\n,
+ SPIF_CAST_C(unsigned long) self-len);
spif_str_append_from_ptr(buff, tmp);
if (SPIF_LINKED_LIST_ITEM_ISNULL(self-head)) {
-spif_str_append_from_ptr(buff, SPIF_NULLSTR_TYPE(obj) \n);
+spif_str_append_from_ptr(buff, SPIF_CAST(charptr) SPIF_NULLSTR_TYPE(obj)
\n);
} else {
for (current = self-head, i = 0; current; current = current-next, i++) {
-sprintf(tmp, item %d, i);
+sprintf(SPIF_CAST_C(char *) tmp, item %d, i);
buff = spif_linked_list_item_show(current, tmp, buff, indent + 2);
}
}
memset(tmp, ' ', indent);
-snprintf(tmp + indent, sizeof(tmp) - indent, }\n);
+snprintf(SPIF_CAST_C(char *) tmp + indent, sizeof(tmp) - indent, }\n);
spif_str_append_from_ptr(buff, tmp);
return buff;
}
@@ -959,8 +962,8 @@
return tmp;
}
-SPIF_DEFINE_PROPERTY_FUNC_NONOBJ(linked_list, listidx, len);
-SPIF_DEFINE_PROPERTY_FUNC_NONOBJ(linked_list, linked_list_item, head);
+SPIF_DEFINE_PROPERTY_FUNC_NONOBJ(linked_list, listidx, len)
+SPIF_DEFINE_PROPERTY_FUNC_NONOBJ(linked_list, linked_list_item, head)
static spif_linked_list_iterator_t
@@ -1021,17 +1024,19 @@
}
memset(tmp, ' ', indent);
-snprintf(tmp + indent, sizeof(tmp) - indent, (spif_linked_list_iterator_t) %s:
%10p {\n, name, self);
+snprintf(SPIF_CAST_C(char *) tmp + indent, sizeof(tmp) - indent,
+ (spif_linked_list_iterator_t) %s: %10p {\n,
+ name, SPIF_CAST(ptr) self);
if (SPIF_STR_ISNULL(buff)) {
buff = spif_str_new_from_ptr(tmp);
} else {
spif_str_append_from_ptr(buff, tmp);
}
-buff = spif_linked_list_show(self-subject, subject, buff, indent + 2);
-buff = spif_linked_list_item_show(self-current, current, buff, indent + 2);
+buff = spif_linked_list_show(self-subject, SPIF_CAST(charptr) subject, buff,
indent + 2);
+buff = spif_linked_list_item_show(self-current, SPIF_CAST(charptr) current,
buff, indent + 2);
-snprintf(tmp + indent, sizeof(tmp) - indent, }\n);
+snprintf(SPIF_CAST_C(char *) tmp + indent, sizeof(tmp) - indent, }\n);
E CVS: libast mej
Enlightenment CVS committal Author : mej Project : eterm Module : libast Dir : eterm/libast Modified Files: ChangeLog Log Message: Wed Jul 21 18:16:43 2004Michael Jennings (mej) Mmmm, beefy. -- === RCS file: /cvsroot/enlightenment/eterm/libast/ChangeLog,v retrieving revision 1.121 retrieving revision 1.122 diff -u -3 -r1.121 -r1.122 --- ChangeLog 20 Jul 2004 22:32:07 - 1.121 +++ ChangeLog 21 Jul 2004 22:17:49 - 1.122 @@ -665,3 +665,7 @@ Tasty treats! -- +Wed Jul 21 18:16:43 2004Michael Jennings (mej) + +Mmmm, beefy. +-- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libast mej
Enlightenment CVS committal Author : mej Project : eterm Module : libast Dir : eterm/libast/include/libast Modified Files: types.h.in Log Message: Wed Jul 21 22:48:14 2004Michael Jennings (mej) More cleanups and fixed compile problems. -- === RCS file: /cvsroot/enlightenment/eterm/libast/include/libast/types.h.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- types.h.in 16 Jul 2004 23:22:18 - 1.20 +++ types.h.in 22 Jul 2004 02:49:50 - 1.21 @@ -119,8 +119,8 @@ * Obtain the size of a type from its basename. * * This macro returns the size of the given type basename (such as - * obj or charptr or uint8). This is primarily used for objects - * and other structures whose types are actually struct pointers. + * obj or str). This is only used for objects and other + * structures whose types are actually struct pointers. * * @param type The type basename. * @return The size of objects/structures of that type. @@ -608,6 +608,28 @@ */ typedef spif_charptr_t spif_classname_t; +/** + * Convenience macro for typecasting to spif_charptr_t. + * + * This macro typecasts a value to a spif_charptr_t. I got really + * tired of typing SPIF_CAST(charptr) all the time, especially for + * string constants. :-) + * + * @see @link DOXGRP_TYPES Portable Data Types @endlink, SPIF_CAST(), spif_charptr_t + */ +#define SPIF_CHARPTR(var)(SPIF_CAST(charptr) (var)) + +/** + * Convenience macro for typecasting to C's default char * type. + * + * This macro typecasts a value to whatever char * is on the current + * system. This is used to typecast a spif_charptr_t back to the + * native C type for use in standard libc functions. + * + * @see @link DOXGRP_TYPES Portable Data Types @endlink, SPIF_CAST(), spif_charptr_t + */ +#define SPIF_CHARPTR_C(var) (SPIF_CAST_C(char *) (var)) + /[EMAIL PROTECTED]/ /[EMAIL PROTECTED]/ --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libast mej
Enlightenment CVS committal
Author : mej
Project : eterm
Module : libast
Dir : eterm/libast/src
Modified Files:
options.c regexp.c socket.c strings.c
Log Message:
Wed Jul 21 22:48:14 2004Michael Jennings (mej)
More cleanups and fixed compile problems.
--
===
RCS file: /cvsroot/enlightenment/eterm/libast/src/options.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- options.c 10 Jan 2004 21:15:17 - 1.13
+++ options.c 22 Jul 2004 02:49:50 - 1.14
@@ -29,11 +29,11 @@
* option parser.
*
* @author Michael Jennings [EMAIL PROTECTED]
- * $Revision: 1.13 $
- * $Date: 2004/01/10 21:15:17 $
+ * $Revision: 1.14 $
+ * $Date: 2004/07/22 02:49:50 $
*/
-static const char cvs_ident[] = $Id: options.c,v 1.13 2004/01/10 21:15:17 mej Exp $;
+static const char cvs_ident[] = $Id: options.c,v 1.14 2004/07/22 02:49:50 mej Exp $;
#ifdef HAVE_CONFIG_H
# include config.h
@@ -55,7 +55,7 @@
*/
/** Next argument. Proceed to parsing the next argument in the argv[] list. */
-#define NEXT_ARG() D_OPTIONS((NEXT_ARG()\n)); i++; opt = argv[i]; continue
+#define NEXT_ARG() D_OPTIONS((NEXT_ARG()\n)); i++; opt =
SPIF_CHARPTR(argv[i]); continue
/** Next letter. Proceed to the next letter in a bundled option series. */
#define NEXT_LETTER()D_OPTIONS((NEXT_LETTER(%s)\n, opt)); if (*(opt + 1))
{opt++;} else {NEXT_ARG();} continue
/** Next loop. Proceed to the next parsing stage (letter or word). */
@@ -90,14 +90,14 @@
* @see @link DOXGRP_OPT Command Line Option Parser @endlink
* @ingroup DOXGRP_OPT
*/
-static const char *
+static spif_charptr_t
get_option_type_string(spif_uint16_t type)
{
switch (type) {
-case SPIFOPT_FLAG_BOOLEAN: return (bool); break;
-case SPIFOPT_FLAG_INTEGER: return (int); break;
-case SPIFOPT_FLAG_ARGLIST: return (strs); break;
-default: return (str);
+case SPIFOPT_FLAG_BOOLEAN: return SPIF_CHARPTR((bool)); break;
+case SPIFOPT_FLAG_INTEGER: return SPIF_CHARPTR((int)); break;
+case SPIFOPT_FLAG_ARGLIST: return SPIF_CHARPTR((strs)); break;
+default: return SPIF_CHARPTR((str));
}
ASSERT_NOTREACHED_RVAL(NULL);
}
@@ -160,7 +160,7 @@
printf( );
}
printf(--%s, SPIFOPT_OPT_LONG(i));
-for (col = strlen(SPIFOPT_OPT_LONG(i)); col l_long; col++) {
+for (col = strlen(SPIF_CAST_C(char *) SPIFOPT_OPT_LONG(i)); col l_long;
col++) {
printf( );
}
printf( %-6s %s\n, get_option_type_string(SPIFOPT_OPT_TYPE(i)),
SPIFOPT_OPT_DESC(i));
@@ -181,7 +181,7 @@
* @ingroup DOXGRP_OPT
*/
static spif_int32_t
-find_long_option(char *opt)
+find_long_option(spif_charptr_t opt)
{
spif_int32_t j;
@@ -190,9 +190,10 @@
for (j = 0; j SPIFOPT_NUMOPTS_GET(); j++) {
size_t l;
-l = strlen(SPIFOPT_OPT_LONG(j));
+l = strlen(SPIF_CHARPTR_C(SPIFOPT_OPT_LONG(j)));
/* Look for matches to the part before the =, if any. */
-if (!strncasecmp(SPIFOPT_OPT_LONG(j), opt, l) (opt[l] == '=' || !opt[l])) {
+if (!strncasecmp(SPIF_CHARPTR_C(SPIFOPT_OPT_LONG(j)), SPIF_CHARPTR_C(opt), l)
+ (opt[l] == '=' || !opt[l])) {
/* Got one. */
D_OPTIONS((Match found at %d: %s == %s\n, j, SPIFOPT_OPT_LONG(j),
opt));
return j;
@@ -251,12 +252,12 @@
* @see @link DOXGRP_OPT Command Line Option Parser @endlink, spifopt_parse()
* @ingroup DOXGRP_OPT
*/
-static char *
-find_value_long(char *arg, char *next_arg, unsigned char *hasequal)
+static spif_charptr_t
+find_value_long(spif_charptr_t arg, spif_charptr_t next_arg, spif_charptr_t hasequal)
{
-char *val_ptr;
+spif_charptr_t val_ptr;
-if ((val_ptr = strchr(arg, '=')) != NULL) {
+if ((val_ptr = SPIF_CHARPTR(strchr(SPIF_CHARPTR_C(arg), '='))) != NULL) {
val_ptr++;
*hasequal = 1;
} else {
@@ -283,10 +284,10 @@
* @see @link DOXGRP_OPT Command Line Option Parser @endlink, spifopt_parse()
* @ingroup DOXGRP_OPT
*/
-static char *
-find_value_short(char *arg, char *next_arg)
+static spif_charptr_t
+find_value_short(spif_charptr_t arg, spif_charptr_t next_arg)
{
-char *val_ptr = NULL;
+spif_charptr_t val_ptr = NULL;
if (arg[1]) {
val_ptr = arg + 1;
@@ -310,7 +311,7 @@
* @ingroup DOXGRP_OPT
*/
static spif_bool_t
-is_boolean_value(char *val_ptr)
+is_boolean_value(spif_charptr_t val_ptr)
{
if (!(val_ptr) || !(*val_ptr)) {
return FALSE;
@@ -332,7 +333,7 @@
* @ingroup DOXGRP_OPT
*/
static spif_bool_t
-is_valid_option(char *opt)
+is_valid_option(spif_charptr_t opt)
{
REQUIRE_RVAL(opt != NULL, FALSE);
@@ -371,7 +372,7 @@
* @ingroup DOXGRP_OPT
*/
static spif_bool_t
E CVS: libast mej
Enlightenment CVS committal Author : mej Project : eterm Module : libast Dir : eterm/libast Modified Files: ChangeLog Log Message: Wed Jul 21 22:48:14 2004Michael Jennings (mej) More cleanups and fixed compile problems. -- === RCS file: /cvsroot/enlightenment/eterm/libast/ChangeLog,v retrieving revision 1.122 retrieving revision 1.123 diff -u -3 -r1.122 -r1.123 --- ChangeLog 21 Jul 2004 22:17:49 - 1.122 +++ ChangeLog 22 Jul 2004 02:49:49 - 1.123 @@ -669,3 +669,7 @@ Mmmm, beefy. -- +Wed Jul 21 22:48:14 2004Michael Jennings (mej) + +More cleanups and fixed compile problems. +-- --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/emotion raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/emotion
Dir : e17/libs/emotion/src/lib
Modified Files:
emotion_smart.c
Log Message:
put jobs back... does this work?
===
RCS file: /cvsroot/enlightenment/e17/libs/emotion/src/lib/emotion_smart.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emotion_smart.c 18 Jul 2004 08:25:45 - 1.5
+++ emotion_smart.c 22 Jul 2004 04:13:28 - 1.6
@@ -42,6 +42,8 @@
double seek_pos;
double len;
+ Ecore_Job *job;
+
unsigned char play : 1;
unsigned char seek : 1;
@@ -62,6 +64,7 @@
static void _mouse_move(void *data, Evas *ev, Evas_Object *obj, void *event_info);
static void _mouse_down(void *data, Evas *ev, Evas_Object *obj, void *event_info);
+static void _pos_set_job(void *data);
static void _pixels_get(void *data, Evas_Object *obj);
static void _smart_init(void);
@@ -238,7 +241,10 @@
if (!sd-module) return;
if (!sd-video) return;
sd-seek_pos = sec;
- sd-module-pos_set(sd-video, sd-seek_pos);
+ sd-seek = 1;
+ sd-pos = sd-seek_pos;
+ if (sd-job) ecore_job_del(sd-job);
+ sd-job = ecore_job_add(_pos_set_job, obj);
}
double
@@ -874,6 +880,22 @@
sd-module-event_mouse_button_feed(sd-video, 1, x, y);
}
+static void
+_pos_set_job(void *data)
+{
+ Evas_Object *obj;
+ Smart_Data *sd;
+
+ obj = data;
+ E_SMART_OBJ_GET(sd, obj, E_OBJ_NAME);
+ sd-job = NULL;
+ if (sd-seek)
+ {
+ sd-module-pos_set(sd-video, sd-seek_pos);
+ sd-seek = 0;
+ }
+}
+
/* called by evas when it needs pixels for the image object */
static void
_pixels_get(void *data, Evas_Object *obj)
@@ -971,6 +993,7 @@
if (sd-module) _emotion_module_close(sd-module);
evas_object_del(sd-obj);
if (sd-file) free(sd-file);
+ if (sd-job) ecore_job_del(sd-job);
if (sd-progress.info) free(sd-progress.info);
if (sd-ref.file) free(sd-ref.file);
free(sd);
---
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/test
Modified Files:
ewl_simple_test.c
Log Message:
An example of using custom edjes for apps.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/ewl_simple_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ewl_simple_test.c 14 Jul 2004 01:45:02 - 1.1
+++ ewl_simple_test.c 22 Jul 2004 04:44:47 - 1.2
@@ -1,27 +1,115 @@
+#include ewl-config.h
#include Ewl.h
+Ewl_Widget *label = NULL;
+
+#define TRANS_TIME 2.0
+Ecore_Timer *transition = NULL;
+
+int trigger_tour(void *data)
+{
+ ewl_text_text_set(EWL_TEXT(label), NULL);
+ transition = NULL;
+ return 0;
+}
+
+void test_cb(Ewl_Widget *w, void *ev_data, void *user_data)
+{
+ printf(%s at: %d, %d (%d x %d)\n, (char *)user_data, CURRENT_X(w),
+ CURRENT_Y(w), CURRENT_W(w), CURRENT_H(w));
+}
+
void button_down(Ewl_Widget *w, void *ev_data, void *user_data)
{
- printf(%s\n, ewl_button_get_label(EWL_BUTTON(w)));
+ Ewl_Widget *logo = user_data;
+ ewl_widget_set_state(logo, logo_start);
+ transition = ecore_timer_add(TRANS_TIME, trigger_tour, NULL);
+}
+
+void quit_demo(Ewl_Widget *w, void *ev_data, void *user_data)
+{
+ ewl_main_quit();
}
int main(int argc, char **argv)
{
Ewl_Widget *win;
+ Ewl_Widget *vbox;
+ Ewl_Widget *hbox;
Ewl_Widget *button;
+ Ewl_Widget *logo;
+ char tmp[PATH_MAX];
ewl_init(argc, argv);
+ snprintf(tmp, PATH_MAX, %s/images/bg.eet, PACKAGE_DATA_DIR);
+
win = ewl_window_new();
+ ewl_callback_append(win, EWL_CALLBACK_CONFIGURE, test_cb,
+ configure window);
+ ewl_object_request_size(EWL_OBJECT(win), 240, 320);
+ ewl_theme_data_set_str(win, /window/file, tmp);
+ ewl_theme_data_set_str(win, /window/group, bg);
ewl_widget_show(win);
- button = ewl_button_new(Hello World!);
- ewl_container_append_child(EWL_CONTAINER(win), button);
+ vbox = ewl_vbox_new();
+ ewl_theme_data_set_str(vbox, /vbox/file, tmp);
+ ewl_theme_data_set_str(vbox, /vbox/group, box);
+ ewl_object_set_alignment(EWL_OBJECT(vbox), EWL_FLAG_ALIGN_TOP);
+ ewl_object_set_fill_policy(EWL_OBJECT(vbox), EWL_FLAG_FILL_HFILL);
+ ewl_container_append_child(EWL_CONTAINER(win), vbox);
+ ewl_widget_show(vbox);
+
+ snprintf(tmp, PATH_MAX, %s/demo/eets/e_logo.eet, getenv(HOME));
+
+ logo = NEW(Ewl_Widget, 1);
+ ewl_widget_init(logo, demo_logo);
+ ewl_callback_append(logo, EWL_CALLBACK_REALIZE, test_cb, realize logo);
+ ewl_callback_append(logo, EWL_CALLBACK_CONFIGURE, test_cb, configure logo);
+ ewl_theme_data_set_str(logo, /demo_logo/file, tmp);
+ ewl_theme_data_set_str(logo, /demo_logo/group, test);
+ ewl_object_set_preferred_size(EWL_OBJECT(logo), 100, 100);
+ ewl_object_set_fill_policy(EWL_OBJECT(logo), EWL_FLAG_FILL_NONE);
+ ewl_object_set_alignment(EWL_OBJECT(logo), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_append_child(EWL_CONTAINER(vbox), logo);
+ ewl_widget_show(logo);
+
+ label = ewl_text_new(NULL);
+ ewl_object_set_alignment(EWL_OBJECT(label), EWL_FLAG_ALIGN_CENTER);
+ ewl_text_align_set(EWL_TEXT(label), EWL_FLAG_ALIGN_CENTER);
+ ewl_text_font_set(EWL_TEXT(label), Vera, 12);
+ ewl_text_style_set(EWL_TEXT(label), soft_shadow);
+ ewl_text_text_append(EWL_TEXT(label), Welcome to Enlightenment!\n);
+ ewl_text_style_set(EWL_TEXT(label), none);
+ ewl_text_font_set(EWL_TEXT(label), Vera, 9);
+ ewl_text_text_append(EWL_TEXT(label), We hope you enjoy your stay.\n
+ Please visit us at:\n);
+ ewl_text_color_set(EWL_TEXT(label), 0, 0, 255, 190);
+ ewl_text_text_append(EWL_TEXT(label), http://www.enlightenment.org/;);
+ ewl_container_append_child(EWL_CONTAINER(vbox), label);
+ ewl_widget_show(label);
+
+ hbox = ewl_hbox_new();
+ ewl_box_set_spacing(EWL_BOX(hbox), 10);
+ ewl_container_append_child(EWL_CONTAINER(vbox), hbox);
+ ewl_object_set_fill_policy(EWL_OBJECT(hbox), EWL_FLAG_FILL_NONE);
+ ewl_object_set_alignment(EWL_OBJECT(hbox), EWL_FLAG_ALIGN_CENTER);
+ ewl_widget_show(hbox);
+
+ button = ewl_button_new(Take the tour!);
+ ewl_container_append_child(EWL_CONTAINER(hbox), button);
ewl_object_set_fill_policy(EWL_OBJECT(button), EWL_FLAG_FILL_NONE);
- ewl_object_set_alignment(EWL_OBJECT(button), EWL_FLAG_ALIGN_CENTER);
- ewl_callback_append(button, EWL_CALLBACK_MOUSE_DOWN, button_down, NULL);
+ ewl_callback_append(button, EWL_CALLBACK_MOUSE_DOWN, button_down, logo);
ewl_widget_show(button);
+ button = ewl_button_new(Quit);
+
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/images Modified Files: Makefile.am Added Files: bg.edc lilbottom.png Log Message: Add an edje for the simple test app. === RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/images/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 14 May 2004 15:44:30 - 1.3 +++ Makefile.am 22 Jul 2004 04:44:24 - 1.4 @@ -1,8 +1,20 @@ MAINTAINERCLEANFILES = Makefile.in -IMAGES = e-logo.png +EDCS = bg.edc + +EETS = $(EDCS:%.edc=%.eet) + +IMAGES = e-logo.png lilbottom.png themedir = $(pkgdatadir)/images -theme_DATA = $(IMAGES) +theme_DATA = $(IMAGES) $(EETS) + +EXTRA_DIST = $(IMAGES) $(EDCS) + +CLEANFILES = $(EETS) + +all: $(EETS) -EXTRA_DIST = $(IMAGES) +SUFFIXES = .edc .eet +.edc.eet: + edje_cc -v -id $(top_builddir)/data/images `basename $` $@ --- This SF.Net email is sponsored by BEA Weblogic Workshop FREE Java Enterprise J2EE developer tools! Get your free copy of BEA WebLogic Workshop 8.1 today. http://ads.osdn.com/?ad_id=4721alloc_id=10040op=click ___ enlightenment-cvs mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
