E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/modules/engines/software_x11 Modified Files: evas_outbuf.c Log Message: poosible segv - but never gets run so it never happens === RCS file: /cvs/e/e17/libs/evas/src/modules/engines/software_x11/evas_outbuf.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- evas_outbuf.c 1 Mar 2008 06:38:09 - 1.17 +++ evas_outbuf.c 9 Mar 2008 09:35:12 - 1.18 @@ -596,11 +596,11 @@ xr.y = rect-y; xr.width = rect-w; xr.height = rect-h; -free(rect); XUnionRectWithRegion(xr, tmpr, tmpr); if (buf-priv.debug) evas_software_x11_outbuf_debug_show(buf, buf-priv.x.win, rect-x, rect-y, rect-w, rect-h); +free(rect); } XSetRegion(buf-priv.x.disp, buf-priv.x.gc, tmpr); evas_software_x11_x_output_buffer_paste(obr-xob, buf-priv.x.win, - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : libs/evas Dir : e17/libs/evas Modified Files: configure.in Log Message: update of the software xcb engine: * use the pixman library for the region code (it is required, now). That libray can be found in the cairo ftp. * use the new xcb_image api that is in git repository. There is still a seg fault occuring because of xcb_image. I'll commit the fix in git next week. The performance are not good at all. With expedite, 360 fps compared to the 470 fps with xlib. I don't know why yet. === RCS file: /cvs/e/e17/libs/evas/configure.in,v retrieving revision 1.249 retrieving revision 1.250 diff -u -3 -r1.249 -r1.250 --- configure.in1 Mar 2008 15:27:20 - 1.249 +++ configure.in9 Mar 2008 13:21:15 - 1.250 @@ -347,7 +347,7 @@ if test x$want_evas_software_xcb = xyes; then PKG_CHECK_MODULES( XCB, -xcb xcb-shm xcb-image, +xcb xcb-shm xcb-image pixman-1, [ AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend]) have_evas_software_xcb=yes - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/e Dir : e17/apps/e/debian Modified Files: enlightenment.install rules Log Message: add batget and fix permissions. === RCS file: /cvs/e/e17/apps/e/debian/enlightenment.install,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- enlightenment.install 24 Jan 2008 21:52:56 - 1.21 +++ enlightenment.install 9 Mar 2008 14:53:30 - 1.22 @@ -5,6 +5,7 @@ debian/tmp/usr/lib/enlightenment/modules/*/*.edj debian/tmp/usr/lib/enlightenment/modules/*/*/freqset debian/tmp/usr/lib/enlightenment/modules/*/*/tempget +debian/tmp/usr/lib/enlightenment/modules/*/*/batget debian/tmp/usr/lib/enlightenment/preload/*.so debian/tmp/usr/share/enlightenment debian/tmp/usr/share/locale === RCS file: /cvs/e/e17/apps/e/debian/rules,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- rules 24 Jan 2008 21:52:56 - 1.18 +++ rules 9 Mar 2008 14:53:30 - 1.19 @@ -3,14 +3,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -DEB_FIXPERMS_EXCLUDE := enlightenment_sys freqset tempget +DEB_FIXPERMS_EXCLUDE := enlightenment_sys freqset tempget batget install/enlightenment:: mkdir debian/enlightenment/etc mv debian/tmp/usr/etc/enlightenment debian/enlightenment/etc/ find debian/tmp/usr/lib/enlightenment/modules/cpufreq/ -name 'freqset' -exec chmod 4755 {} \; find debian/tmp/usr/lib/enlightenment/modules/temperature/ -name 'tempget' -exec chmod 4755 {} \; - chmod 4511 debian/tmp/usr/bin/enlightenment_sys + find debian/tmp/usr/lib/enlightenment/modules/temperature/ -name 'batget' -exec chmod 4755 {} \; + chmod 4555 debian/tmp/usr/bin/enlightenment_sys clean:: ./autogen.sh --prefix=/usr - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: Ecore.h ecore_private.h ecore_timer.c Log Message: cedric's timer freeze code. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/Ecore.h,v retrieving revision 1.60 retrieving revision 1.61 diff -u -3 -r1.60 -r1.61 --- Ecore.h 26 Jan 2008 14:41:34 - 1.60 +++ Ecore.h 9 Mar 2008 15:56:17 - 1.61 @@ -277,6 +277,8 @@ EAPI Ecore_Timer *ecore_timer_add(double in, int (*func) (void *data), const void *data); EAPI void*ecore_timer_del(Ecore_Timer *timer); EAPI void ecore_timer_interval_set(Ecore_Timer *timer, double in); + EAPI void ecore_timer_freeze(Ecore_Timer *timer); + EAPI void ecore_timer_thaw(Ecore_Timer *timer); EAPI Ecore_Animator *ecore_animator_add(int (*func) (void *data), const void *data); EAPI void *ecore_animator_del(Ecore_Animator *animator); === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_private.h,v retrieving revision 1.50 retrieving revision 1.51 diff -u -3 -r1.50 -r1.51 --- ecore_private.h 28 Jan 2008 11:20:57 - 1.50 +++ ecore_private.h 9 Mar 2008 15:56:17 - 1.51 @@ -281,14 +281,16 @@ struct _Ecore_Timer { - Ecore_List2 __list_data; + Ecore_List2 __list_data; ECORE_MAGIC; - double in; - double at; - signed char delete_me : 1; - signed char just_added : 1; - int(*func) (void *data); - void*data; + double in; + double at; + double pending; + unsigned char delete_me : 1; + unsigned char just_added : 1; + unsigned char frozen : 1; + int (*func) (void *data); + void *data; }; struct _Ecore_Idler === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_timer.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ecore_timer.c 25 Jan 2008 18:28:16 - 1.18 +++ ecore_timer.c 9 Mar 2008 15:56:17 - 1.19 @@ -6,6 +6,7 @@ static int timers_added = 0; static int timers_delete_me = 0; static Ecore_Timer *timers = NULL; +static Ecore_Timer *suspended = NULL; static double last_check = 0.0; /** @@ -95,6 +96,58 @@ timer-in = in; } +/** + * + * + */ +EAPI void +ecore_timer_freeze(Ecore_Timer *timer) +{ + double now; + + if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) + { + ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER, + ecore_timer_freeze); +return ; + } + + /* Timer already frozen */ + if (timer-frozen) + return ; + + timers = _ecore_list2_remove(timers, timer); + suspended = _ecore_list2_prepend(suspended, timer); + + now = ecore_time_get(); + + timer-pending = timer-at - now; + timer-at = 0.0; + timer-frozen = 1; +} + +EAPI void +ecore_timer_thaw(Ecore_Timer *timer) +{ + double now; + + if (!ECORE_MAGIC_CHECK(timer, ECORE_MAGIC_TIMER)) + { + ECORE_MAGIC_FAIL(timer, ECORE_MAGIC_TIMER, + ecore_timer_thaw); +return ; + } + + /* Timer not frozen */ + if (!timer-frozen) + return ; + + suspended = _ecore_list2_remove(suspended, timer); + now = ecore_time_get(); + + _ecore_timer_set(timer, timer-pending + now, timer-in, timer-func, timer-data); +} + void _ecore_timer_shutdown(void) { @@ -107,6 +160,16 @@ ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE); free(timer); } + + while (suspended) + { +Ecore_Timer *timer; + +timer = suspended; +suspended = _ecore_list2_remove(suspended, timer); +ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE); +free(timer); + } } void @@ -130,6 +193,21 @@ if (timers_delete_me == 0) return; } } + for (l = (Ecore_List2 *)suspended; l;) + { + Ecore_Timer *timer; + + timer = (Ecore_Timer *)l; + l = l-next; + if (timer-delete_me) + { +suspended = _ecore_list2_remove(suspended, timer); +ECORE_MAGIC_SET(timer, ECORE_MAGIC_NONE); +free(timer); +timers_delete_me--; +if (timers_delete_me == 0) return; + } + } timers_delete_me = 0; } @@ -188,8 +266,8 @@ { timer = (Ecore_Timer *)l; if ((timer-at = when) - (!timer-just_added) - (!timer-delete_me)) + (timer-just_added == 0) + (timer-delete_me == 0)) { timers = _ecore_list2_remove(timers, timer); _ecore_timer_call(when); @@ -233,6 +311,8 @@ timer-func = func; timer-data = data; timer-just_added = 1; +
E CVS: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/nm Modified Files: E_Nm.h e_nm_manager.c e_nm_private.h Log Message: stefan's nm patches for edbus. === RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/E_Nm.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- E_Nm.h 6 Nov 2007 23:58:56 - 1.4 +++ E_Nm.h 9 Mar 2008 16:08:42 - 1.5 @@ -2,6 +2,7 @@ #define E_HM_H #include E_DBus.h +#include Ecore_Data.h #ifdef EAPI #undef EAPI @@ -25,6 +26,77 @@ #endif typedef struct E_NM_Context E_NM_Context; + +/** + * Matching structs for the new object based DBus API + * VPN is missing as this was still missing the redesign for the new 0.7 API + */ +typedef struct E_NM_Device E_NM_Device; +struct E_NM_Device +{ + char *udi; /* object_path */ + char *interface; + char *driver; + uint capabilities; + int ip4address; + uint state; + char *ip4config; /* object_path */ + int carrier; + uint type; +}; + +typedef struct E_NM_Device_Wireless E_NM_Device_Wireless; +struct E_NM_Device_Wireless +{ + char *hwaddress; + int mode; + uint bitrate; + char *activeaccesspoint; /* object_path */ + uint wirelesscapabilities; +}; + +typedef struct E_NM_Device_Wired E_NM_Device_Wired; +struct E_NM_Device_Wired +{ + char *hwaddress; + uint speed; +}; + +typedef struct E_NM_Access_Point E_NM_Access_Point; +struct E_NM_Access_Point +{ + uint flags; + uint wpaflags; + uint rsnflags; + char *ssid; + uint frequency; + char *hwaddress; + int mode; + uint rate; + uint strength; +}; + +typedef struct E_NM_IP4Config E_NM_IP4Config; +struct E_NM_IP4Config +{ + uint address; + uint gateway; + uint netmask; + uint broadcast; + char *hostname; + Ecore_List *nameserver; /* uints */ + Ecore_List *domains; /* char* */ + char *nisdomain; + Ecore_List *nisserver; /* uints */ +}; + +typedef struct E_NM_Manager E_NM_Manager; +struct E_NM_Manager +{ + int wirelessenabled; /* writeable*/ + int wirelesshardwareenabled; + uint state; +}; typedef void (*E_NM_Cb_Manager_State_Change) (void *data, int state); typedef void (*E_NM_Cb_Manager_Device_Added) (void *data, const char *device); === RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/e_nm_manager.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_nm_manager.c 4 Nov 2007 07:51:37 - 1.2 +++ e_nm_manager.c 9 Mar 2008 16:08:42 - 1.3 @@ -18,7 +18,7 @@ DBusMessage *msg; int ret; - msg = e_nm_manager_call_new(getDevices); + msg = e_nm_manager_call_new(GetDevices); ret = e_dbus_method_call_send(ctx-conn, msg, cb_nm_string_list, cb_func, free_nm_string_list, -1, data) ? 1 : 0; dbus_message_unref(msg); === RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/e_nm_private.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_nm_private.h 29 Oct 2007 02:20:48 - 1.1 +++ e_nm_private.h 9 Mar 2008 16:08:42 - 1.2 @@ -2,10 +2,13 @@ #define E_NM_PRIVATE_H #define E_NM_SERVICE org.freedesktop.NetworkManager -#define E_NM_INTERFACE_NETWORK_MANAGER org.freedesktop.NetworkManager #define E_NM_PATH_NETWORK_MANAGER /org/freedesktop/NetworkManager +#define E_NM_INTERFACE_NETWORK_MANAGER org.freedesktop.NetworkManager +#define E_NM_INTERFACE_ACCESSPOINT org.freedesktop.NetworkManager.AccessPoint #define E_NM_INTERFACE_DEVICE org.freedesktop.NetworkManager.Device - +#define E_NM_INTERFACE_DEVICE_WIRELESS org.freedesktop.NetworkManager.Device.Wireless +#define E_NM_INTERFACE_DEVICE_WIRED org.freedesktop.NetworkManager.Device.Wired +#define E_NM_INTERFACE_IP4CONFIG org.freedesktop.NetworkManager.IP4Config #define e_nm_manager_call_new(member) dbus_message_new_method_call(E_NM_SERVICE, E_NM_PATH_NETWORK_MANAGER, E_NM_INTERFACE_NETWORK_MANAGER, member) @@ -27,7 +30,6 @@ E_NM_Cb_Manager_Device_Removed cb_manager_device_removed; void *data_manager_device_removed; }; - int e_nm_get_from_nm(E_NM_Context *ctx, E_DBus_Callback_Func cb_func, void *data, - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/e_dbus raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/e_dbus Dir : e17/libs/e_dbus/src/lib/dbus Modified Files: e_dbus_interfaces.c e_dbus_object.c Log Message: stefan's nm patches for edbus. === RCS file: /cvs/e/e17/libs/e_dbus/src/lib/dbus/e_dbus_interfaces.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_dbus_interfaces.c 4 Nov 2007 07:51:36 - 1.2 +++ e_dbus_interfaces.c 9 Mar 2008 16:08:42 - 1.3 @@ -6,6 +6,15 @@ * objects on the bus should implement. */ +/** + * Ping the dbus peer + * + * @param conn the dbus connection + * @param destination the bus name that the object is on + * @param path the object path + * @param cb_return a callback for a successful return + * @param data data to pass to the callbacks + */ EAPI void e_dbus_peer_ping(E_DBus_Connection*conn, const char *destination, const char *path, E_DBus_Method_Return_Cb cb_return, void *data) { @@ -15,6 +24,15 @@ e_dbus_message_send(conn, msg, cb_return, -1, data); } +/** + * Get the UUID of the peer + * + * @param conn the dbus connection + * @param destination the bus name that the object is on + * @param path the object path + * @param cb_return a callback for a successful return + * @param data data to pass to the callbacks + */ EAPI void e_dbus_peer_get_machine_id(E_DBus_Connection*conn, const char *destination, const char *path, E_DBus_Method_Return_Cb cb_return, void *data) { @@ -23,7 +41,6 @@ msg = dbus_message_new_method_call(destination, path, org.freedesktop.DBus.Peer, GetMachineId); e_dbus_message_send(conn, msg, cb_return, -1, data); } - /** * Get the value of a property on an object === RCS file: /cvs/e/e17/libs/e_dbus/src/lib/dbus/e_dbus_object.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_dbus_object.c 24 Nov 2007 13:22:03 - 1.3 +++ e_dbus_object.c 9 Mar 2008 16:08:42 - 1.4 @@ -172,7 +172,7 @@ { if (introspectable_interface) e_dbus_interface_unref(introspectable_interface); introspectable_interface = NULL; -if (properties_interface) e_dbus_interface_unref(introspectable_interface); +if (properties_interface) e_dbus_interface_unref(properties_interface); properties_interface = NULL; return 0; } @@ -188,6 +188,9 @@ { e_dbus_interface_unref(introspectable_interface); introspectable_interface = NULL; + + e_dbus_interface_unref(properties_interface); + properties_interface = NULL; } /** - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/eet raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/eet Dir : e17/libs/eet/src/lib Modified Files: Eet_private.h eet_data.c eet_dictionary.c eet_lib.c Log Message: the rest of cedrics patchesfor fixing dictionaries and read_write === RCS file: /cvs/e/e17/libs/eet/src/lib/Eet_private.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- Eet_private.h 8 Mar 2008 07:28:12 - 1.22 +++ Eet_private.h 9 Mar 2008 16:16:40 - 1.23 @@ -61,22 +61,23 @@ const char*mmap; char *str; - struct - { -unsigned int converted : 1; -unsigned int is_float : 1; - } flags; + inthash; + intlen; + + intnext; + intprev; + union { floatf; double d; } convert; - inthash; - intlen; - - intnext; - intprev; + struct + { +unsigned int converted : 1; +unsigned int is_float : 1; + } flags; }; struct _Eet_Dictionary { === RCS file: /cvs/e/e17/libs/eet/src/lib/eet_data.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -3 -r1.67 -r1.68 --- eet_data.c 8 Mar 2008 07:28:12 - 1.67 +++ eet_data.c 9 Mar 2008 16:16:40 - 1.68 @@ -981,10 +981,6 @@ edd-func.str_alloc = eddc-func.str_alloc; if (eddc-func.str_free) edd-func.str_free = eddc-func.str_free; - if (eddc-func.str_direct_alloc) - edd-func.str_direct_alloc = eddc-func.str_direct_alloc; - if (eddc-func.str_direct_free) - edd-func.str_direct_free = eddc-func.str_direct_free; edd-func.list_next = eddc-func.list_next; edd-func.list_append = eddc-func.list_append; edd-func.list_data = eddc-func.list_data; === RCS file: /cvs/e/e17/libs/eet/src/lib/eet_dictionary.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eet_dictionary.c8 Mar 2008 07:28:12 - 1.3 +++ eet_dictionary.c9 Mar 2008 16:16:40 - 1.4 @@ -20,9 +20,6 @@ if (!new) return NULL; - new-count = 0; - new-total = 0; - memset(new-hash, -1, sizeof (int) * 256); return new; === RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- eet_lib.c 8 Mar 2008 07:28:12 - 1.94 +++ eet_lib.c 9 Mar 2008 16:16:40 - 1.95 @@ -29,6 +29,7 @@ { char *path; FILE *fp; + FILE*readfp; Eet_File_Header *header; const unsigned char *data; Eet_Dictionary *ed; @@ -818,6 +819,7 @@ if (eet_test_close(!ef-ed-all, ef)) return NULL; ef-ed-count = num_dictionary_entries; + ef-ed-total = num_dictionary_entries; ef-ed-start = start + bytes_dictionary_entries + bytes_directory_entries; ef-ed-end = ef-ed-start; @@ -1092,6 +1094,7 @@ if (ef) { eet_flush2(ef); +ef-references++; ef-delete_me_now = 1; eet_close(ef); } @@ -1104,6 +1107,7 @@ if (ef) { ef-delete_me_now = 1; +ef-references++; eet_close(ef); } ef = eet_cache_find((char *)file, eet_writers, eet_writers_num); @@ -1159,6 +1163,7 @@ /* fill some of the members */ ef-fp = fp; + ef-readfp = NULL; ef-path = ((char *)ef) + sizeof(Eet_File); strcpy(ef-path, file); ef-magic = EET_MAGIC_FILE; @@ -1193,35 +1198,7 @@ /* we need to delete the original file in read-write mode and re-open for writing */ if (ef-mode == EET_FILE_MODE_READ_WRITE) { - int i; - - for (i = 0; i ef-header-directory-size; i++) - { -Eet_File_Node *efn; - -for (efn = ef-header-directory-nodes[i]; efn; efn = efn-next) - { - if (!efn-free_name) - { - efn-free_name = 1; - efn-name = strdup(efn-name); - } - } - } - -if (ef-ed) - { - for (i = 0; i ef-ed-count; ++i) - { - if (ef-ed-all[i].mmap) - { - ef-ed-all[i].str = strdup(ef-ed-all[i].mmap); - ef-ed-all[i].mmap = NULL; - } - } - } - - fclose(ef-fp); + ef-readfp = ef-fp; unlink(ef-path); ef-fp = fopen(ef-path, wb); } @@ -1311,8
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_file Modified Files: Makefile.am ecore_file_download.c Log Message: cedrics ecore_cn_url stuff for file downloads === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- Makefile.am 5 Nov 2007 18:57:11 - 1.13 +++ Makefile.am 9 Mar 2008 16:43:32 - 1.14 @@ -2,6 +2,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ +-I$(top_srcdir)/src/lib/ecore_con \ -I$(top_builddir)/src/lib/ecore \ @CURL_CFLAGS@ @@ -21,7 +22,8 @@ libecore_file_la_LIBADD = \ $(top_builddir)/src/lib/ecore/libecore.la \ [EMAIL PROTECTED]@ @ecore_file_win32_lib@ @winsock_libs@ +$(top_builddir)/src/lib/ecore_con/libecore_con.la \ [EMAIL PROTECTED]@ @winsock_libs@ libecore_file_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@ === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file_download.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ecore_file_download.c 14 Jan 2008 01:58:43 - 1.18 +++ ecore_file_download.c 9 Mar 2008 16:43:32 - 1.19 @@ -1,111 +1,98 @@ /* * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2 */ +#include Ecore_Con.h #include ecore_file_private.h -static int init = 0; - -#ifdef HAVE_CURL -#include curl/curl.h - -typedef struct _Ecore_File_Download_Job Ecore_File_Download_Job; +#define ECORE_MAGIC_FILE_DOWNLOAD_JOB 0xf7427cb8 +typedef struct _Ecore_File_Download_JobEcore_File_Download_Job; struct _Ecore_File_Download_Job { - Ecore_Fd_Handler *fd_handler; - CURL *curl; - void (*completion_cb)(void *data, const char *file, int status); - int (*progress_cb)(void *data, const char *file, long int dltotal, long int dlnow, long int ultotal, long int ulnow); - void *data; - FILE *file; - char *dst; + ECORE_MAGIC; + + Ecore_Con_Url *url_con; + FILE*file; + + char*dst; + + void(*completion_cb)(void *data, const char *file, int status); + + int (*progress_cb) (void *data, const char *file, +long int dltotal, long int dlnow, +long int ultotal, long int ulnow); }; +#ifdef HAVE_CURL Ecore_File_Download_Job *_ecore_file_download_curl(const char *url, const char *dst, void (*completion_cb)(void *data, const char *file, int status), int (*progress_cb)(void *data, const char *file, long int dltotal, long int dlnow, long int ultotal, long int ulnow), void *data); static int _ecore_file_download_curl_fd_handler(void *data, Ecore_Fd_Handler *fd_handler); -static CURLM *curlm; -static Ecore_List *_job_list; -static fd_set _current_fd_set; +static void _ecore_file_download_abort(Ecore_File_Download_Job *job); + +static int _ecore_file_download_url_complete_cb(void *data, int type, void *event); +static int _ecore_file_download_url_progress_cb(void *data, int type, void *event); #endif -int +static int init = 0; +static Ecore_Event_Handler *_url_complete_handler = NULL; +static Ecore_Event_Handler *_url_progress_download = NULL; +static Ecore_List *_job_list; + +EAPI int ecore_file_download_init(void) { - if (++init != 1) return init; + ecore_con_url_init(); + if (init++ == 0) + { #ifdef HAVE_CURL - FD_ZERO(_current_fd_set); - _job_list = ecore_list_new(); - if (!_job_list) return --init; - - if (curl_global_init(CURL_GLOBAL_NOTHING)) return 0; - - curlm = curl_multi_init(); - if (!curlm) + _url_complete_handler = ecore_event_handler_add(ECORE_CON_EVENT_URL_COMPLETE, _ecore_file_download_url_complete_cb, NULL); + _url_progress_download = ecore_event_handler_add(ECORE_CON_EVENT_URL_PROGRESS, _ecore_file_download_url_progress_cb, NULL); +#endif + } + if (!_job_list) { - ecore_list_destroy(_job_list); - _job_list = NULL; - return --init; + _job_list = ecore_list_new(); + if (!_job_list) return 0; } -#endif - return init; + + return 1; } -int +EAPI int ecore_file_download_shutdown(void) { - if (--init != 0) return init; -#ifdef HAVE_CURL - Ecore_File_Download_Job *job; - - if (!ecore_list_empty_is(_job_list)) + if (--init == 0) { - ecore_list_first_goto(_job_list); - while ((job = ecore_list_next(_job_list))) - { -ecore_main_fd_handler_del(job-fd_handler); -curl_multi_remove_handle(curlm, job-curl); -curl_easy_cleanup(job-curl); -
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf_wallpaper Modified Files: e_int_config_wallpaper_web.c Log Message: cedrics for web === RCS file: /cvs/e/e17/apps/e/src/modules/conf_wallpaper/e_int_config_wallpaper_web.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_int_config_wallpaper_web.c5 Mar 2008 06:03:49 - 1.1 +++ e_int_config_wallpaper_web.c9 Mar 2008 16:43:58 - 1.2 @@ -8,12 +8,16 @@ #include e_mod_main.h #define D(x) do {printf(### DBG line %d ### , __LINE__); printf x; fflush(stdout);} while (0) +#defineMAGIC_IMPORT0x427781cb + typedef struct _Import Import; struct _Import { - E_Config_Dialog *parent; + int magic; + + E_Config_Dialog *parent; E_Config_Dialog_Data *cfdata; - E_Dialog *dia; + E_Dialog*dia; }; struct _E_Config_Dialog_Data @@ -73,6 +77,8 @@ if (!import) return NULL; + import-magic = MAGIC_IMPORT; + dia = e_dialog_new (parent-con, E, _wallpaper_web_dialog); if (!dia) { @@ -89,6 +95,8 @@ cfdata = E_NEW (E_Config_Dialog_Data, 1); ecore_con_url_init (); + ecore_file_download_init (); + cfdata-ecu = ecore_con_url_new (http://fake.url;); cfdata-ready_for_edj = 0; @@ -206,6 +214,7 @@ { ecore_event_handler_del (cfdata-hcomplete); } + ecore_file_download_shutdown(); ecore_con_url_shutdown (); if (cfdata-tmpdir) @@ -233,8 +242,13 @@ euc = (Ecore_Con_Event_Url_Complete *)event; import = data; + if (import-magic != MAGIC_IMPORT) return 1; + cfdata = import-cfdata; + if (cfdata-ecu != euc-url_con) return 1; + fclose (cfdata-feed); + cfdata-feed = NULL; ecore_event_handler_del (cfdata-hdata); ecore_event_handler_del (cfdata-hcomplete); cfdata-hdata = NULL; @@ -262,7 +276,12 @@ eud = (Ecore_Con_Event_Url_Data *)event; import = data; + if (import-magic != MAGIC_IMPORT) return 1; + cfdata = import-cfdata; + + if (cfdata-ecu != eud-url_con) return 1; + fwrite (eud-data, sizeof(unsigned char), eud-size, cfdata-feed); return 0; } @@ -597,6 +616,10 @@ cfdata-tmpdir = mkdtemp (strdup (tmpdir_tpl)); ecore_con_url_url_set (cfdata-ecu, url); + ecore_file_download_abort_all (); + if (cfdata-hdata) ecore_event_handler_del (cfdata-hdata); + if (cfdata-hcomplete) ecore_event_handler_del (cfdata-hcomplete); + if (cfdata-feed) fclose (cfdata-feed); cfdata-hdata = ecore_event_handler_add (ECORE_CON_EVENT_URL_DATA, _feed_data, - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ 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_border.c e_int_border_menu.c e_int_border_remember.c e_remember.c e_remember.h Log Message: cedrics for web === RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.629 retrieving revision 1.630 diff -u -3 -r1.629 -r1.630 --- e_border.c 7 Mar 2008 11:51:31 - 1.629 +++ e_border.c 9 Mar 2008 16:43:58 - 1.630 @@ -5204,7 +5204,6 @@ if (bd-client.netwm.type == ECORE_X_WINDOW_TYPE_DOCK) { -/* TODO: Make this user options */ if (!bd-client.netwm.state.skip_pager) { bd-client.netwm.state.skip_pager = 1; @@ -5837,6 +5836,10 @@ } if (rem-apply E_REMEMBER_APPLY_SKIP_WINLIST) bd-user_skip_winlist = rem-prop.skip_winlist; +if (rem-apply E_REMEMBER_APPLY_SKIP_PAGER) + bd-client.netwm.state.skip_pager = rem-prop.skip_pager; +if (rem-apply E_REMEMBER_APPLY_SKIP_TASKBAR) + bd-client.netwm.state.skip_taskbar = rem-prop.skip_taskbar; if (rem-apply E_REMEMBER_APPLY_ICON_PREF) bd-icon_preference = rem-prop.icon_preference; if (rem-apply E_REMEMBER_SET_FOCUS_ON_START) === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -3 -r1.78 -r1.79 --- e_int_border_menu.c 12 Jan 2008 07:58:18 - 1.78 +++ e_int_border_menu.c 9 Mar 2008 16:43:58 - 1.79 @@ -24,6 +24,7 @@ static void _e_border_menu_cb_fullscreen(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_skip_winlist(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_skip_pager(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_border_menu_cb_skip_taskbar(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_sendto(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_border_menu_cb_pin(void *data, E_Menu *m, E_Menu_Item *mi); @@ -660,6 +661,7 @@ bd-user_skip_winlist = e_menu_item_toggle_get(mi); else bd-user_skip_winlist = 0; + bd-changed = 1; if (bd-remember) e_remember_update(bd-remember, bd); } @@ -680,6 +682,22 @@ } static void +_e_border_menu_cb_skip_taskbar(void *data, E_Menu *m, E_Menu_Item *mi) +{ + E_Border *bd; + + bd = data; + if (!bd) return; + + if ((bd-client.icccm.accepts_focus) || (bd-client.icccm.take_focus)) + bd-client.netwm.state.skip_taskbar = e_menu_item_toggle_get(mi); + else + bd-client.netwm.state.skip_taskbar = 0; + bd-changed = 1; + if (bd-remember) e_remember_update(bd-remember, bd); +} + +static void _e_border_menu_cb_sendto_pre(void *data, E_Menu *m, E_Menu_Item *mi) { E_Menu *subm; @@ -985,6 +1003,16 @@ e_theme_edje_file_get(base/theme/borders, e/widgets/border/default/skip_pager), e/widgets/border/default/skip_pager); + + submi = e_menu_item_new(subm); + e_menu_item_label_set(submi, _(Taskbar)); + e_menu_item_check_set(submi, 1); + e_menu_item_toggle_set(submi, bd-client.netwm.state.skip_taskbar); + e_menu_item_callback_set(submi, _e_border_menu_cb_skip_taskbar, bd); + e_menu_item_icon_edje_set(submi, +e_theme_edje_file_get(base/theme/borders, + e/widgets/border/default/skip_taskbar), +e/widgets/border/default/skip_taskbar); } static void === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_remember.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- e_int_border_remember.c 28 Dec 2007 03:18:37 - 1.17 +++ e_int_border_remember.c 9 Mar 2008 16:43:58 - 1.18 @@ -42,6 +42,8 @@ int apply_shade; int apply_zone; int apply_skip_winlist; + int apply_skip_pager; + int apply_skip_taskbar; int apply_run; int apply_icon_pref; int set_focus_on_start; @@ -99,6 +101,8 @@ if (cfdata-border-remember-apply E_REMEMBER_APPLY_SHADE) cfdata-remember.apply_shade = 1; if (cfdata-border-remember-apply E_REMEMBER_APPLY_ZONE) cfdata-remember.apply_zone = 1; if (cfdata-border-remember-apply E_REMEMBER_APPLY_SKIP_WINLIST) cfdata-remember.apply_skip_winlist = 1; + if (cfdata-border-remember-apply E_REMEMBER_APPLY_SKIP_PAGER) cfdata-remember.apply_skip_pager = 1; + if (cfdata-border-remember-apply
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: cedrics ecore_cn_url stuff for file downloads === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.248 retrieving revision 1.249 diff -u -3 -r1.248 -r1.249 --- configure.in26 Jan 2008 05:40:52 - 1.248 +++ configure.in9 Mar 2008 16:43:32 - 1.249 @@ -100,7 +100,6 @@ PKG_CHECK_MODULES(CURL, libcurl, [ AC_DEFINE(HAVE_CURL, 1, [ Downloading with CURL ]) - requirements_ecore_file=$requirements_ecore_file libcurl requirements_ecore_con=$requirements_ecore_con libcurl have_curl=yes ], @@ -721,6 +720,7 @@ AC_DEFINE(HAVE_POLL, 1, [ File monitoring with polling ]) have_poll=yes fi + requirements_ecore_file=$requirements_ecore_file $requirements_ecore_con fi dnl ecore_desktop - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_con Modified Files: Ecore_Con.h ecore_con_private.h ecore_con_url.c Log Message: cedrics ecore_cn_url stuff for file downloads === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/Ecore_Con.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- Ecore_Con.h 11 Feb 2008 23:24:11 - 1.35 +++ Ecore_Con.h 9 Mar 2008 16:43:32 - 1.36 @@ -149,8 +149,14 @@ struct _Ecore_Con_Event_Url_Progress { Ecore_Con_Url*url_con; - doubletotal; - doublenow; + struct { + double total; + double now; + } down; + struct { + double total; + double now; + } up; }; EAPI extern int ECORE_CON_EVENT_CLIENT_ADD; @@ -161,8 +167,7 @@ EAPI extern int ECORE_CON_EVENT_SERVER_DATA; EAPI extern int ECORE_CON_EVENT_URL_DATA; EAPI extern int ECORE_CON_EVENT_URL_COMPLETE; - EAPI extern int ECORE_CON_EVENT_URL_PROGRESS_DOWNLOAD; - EAPI extern int ECORE_CON_EVENT_URL_PROGRESS_UPLOAD; + EAPI extern int ECORE_CON_EVENT_URL_PROGRESS; EAPI int ecore_con_init(void); EAPI int ecore_con_shutdown(void); @@ -196,6 +201,8 @@ EAPI void ecore_con_url_data_set(Ecore_Con_Url *url_con, void *data); EAPI void *ecore_con_url_data_get(Ecore_Con_Url *url_con); EAPI int ecore_con_url_url_set(Ecore_Con_Url *url_con, const char *url); + EAPI void ecore_con_url_fd_set(Ecore_Con_Url *url_con, int fd); + EAPI int ecore_con_url_received_bytes_get(Ecore_Con_Url *url_con); EAPI int ecore_con_url_send(Ecore_Con_Url *url_con, void *data, size_t length, char *content_type); EAPI void ecore_con_url_time(Ecore_Con_Url *url_con, Ecore_Con_Url_Time condition, time_t tm); === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con_private.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- ecore_con_private.h 18 Feb 2008 06:27:26 - 1.22 +++ ecore_con_private.h 9 Mar 2008 16:43:32 - 1.23 @@ -78,6 +78,11 @@ void *data; Ecore_Fd_Handler *fd_handler; + int fd; + int flags; + + int received; + int write_fd; unsigned char active : 1; }; === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con_url.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ecore_con_url.c 5 Mar 2008 05:15:37 - 1.18 +++ ecore_con_url.c 9 Mar 2008 16:43:32 - 1.19 @@ -40,6 +40,8 @@ #include Ecore_Con.h #include ecore_con_private.h +#include errno.h + /** * @defgroup Ecore_Con_Url_Group Ecore URL Connection Functions * @@ -50,8 +52,7 @@ int ECORE_CON_EVENT_URL_DATA = 0; int ECORE_CON_EVENT_URL_COMPLETE = 0; -int ECORE_CON_EVENT_URL_PROGRESS_DOWNLOAD = 0; -int ECORE_CON_EVENT_URL_PROGRESS_UPLOAD = 0; +int ECORE_CON_EVENT_URL_PROGRESS = 0; #ifdef HAVE_CURL static int _ecore_con_url_fd_handler(void *data, Ecore_Fd_Handler *fd_handler); @@ -61,10 +62,11 @@ static void _ecore_con_event_url_free(void *data __UNUSED__, void *ev); static int _ecore_con_url_process_completed_jobs(Ecore_Con_Url *url_con_to_match); -static CURLM *curlm = NULL; -static Ecore_List *_url_con_list = NULL; -static fd_set _current_fd_set; -static int init_count = 0; +static Ecore_Idler *_fd_idler_handler = NULL; +static Ecore_List *_url_con_list = NULL; +static CURLM *curlm = NULL; +static fd_set _current_fd_set; +static int init_count = 0; struct _Ecore_Con_Url_Event { @@ -114,8 +116,7 @@ { ECORE_CON_EVENT_URL_DATA = ecore_event_type_new(); ECORE_CON_EVENT_URL_COMPLETE = ecore_event_type_new(); - ECORE_CON_EVENT_URL_PROGRESS_DOWNLOAD = ecore_event_type_new(); - ECORE_CON_EVENT_URL_PROGRESS_UPLOAD = ecore_event_type_new(); + ECORE_CON_EVENT_URL_PROGRESS = ecore_event_type_new(); } if (!_url_con_list) @@ -168,7 +169,7 @@ if (!ecore_list_empty_is(_url_con_list)) { Ecore_Con_Url *url_con; -while ((url_con = ecore_list_first_remove(_url_con_list))) +while ((url_con = ecore_list_first(_url_con_list))) { ecore_con_url_destroy(url_con); } @@ -230,6 +231,11 @@ curl_easy_setopt(url_con-curl_easy, CURLOPT_TIMEOUT, 300); curl_easy_setopt(url_con-curl_easy, CURLOPT_FOLLOWLOCATION, 1); +
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/battery Modified Files: e_mod_main.c Log Message: fix batget restart on shelf re-config so it displays right === RCS file: /cvs/e/e17/apps/e/src/modules/battery/e_mod_main.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- e_mod_main.c5 Mar 2008 06:00:25 - 1.111 +++ e_mod_main.c9 Mar 2008 17:31:12 - 1.112 @@ -56,6 +56,11 @@ E_Gadcon_Client *gcc; Instance *inst; + battery_config-full = -2; + battery_config-time_left = -2; + battery_config-have_battery = -2; + battery_config-have_power = -2; + inst = E_NEW(Instance, 1); o = edje_object_add(gc-evas); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto/eflpp mickeyl
Enlightenment CVS committal Author : mickeyl Project : e17 Module : proto/eflpp Dir : e17/proto/eflpp/examples/angstrom/bootmanager Removed Files: app.o Log Message: eflpp: remove .o file - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs