E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_con
Modified Files:
ecore_con.c
Log Message:
Some formatting fixes while I'm in here reading :)
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/ecore_con.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- ecore_con.c 21 Oct 2007 15:16:14 - 1.87
+++ ecore_con.c 30 Nov 2007 08:21:37 - 1.88
@@ -147,9 +147,7 @@
* @ingroup Ecore_Con_Server_Group
*/
EAPI Ecore_Con_Server *
-ecore_con_server_add(Ecore_Con_Type compl_type,
-const char *name,
-int port,
+ecore_con_server_add(Ecore_Con_Type compl_type, const char *name, int port,
const void *data)
{
Ecore_Con_Server *svr;
@@ -172,8 +170,7 @@
type &= ~ECORE_CON_USE_SSL;
#endif
- if ((type == ECORE_CON_LOCAL_USER) ||
- (type == ECORE_CON_LOCAL_SYSTEM) ||
+ if ((type == ECORE_CON_LOCAL_USER) || (type == ECORE_CON_LOCAL_SYSTEM) ||
(type == ECORE_CON_LOCAL_ABSTRACT))
{
const char *homedir;
@@ -182,9 +179,7 @@
int socket_unix_len;
if (!name) goto error;
- mask =
- S_IRGRP | S_IWGRP | S_IXGRP |
- S_IROTH | S_IWOTH | S_IXOTH;
+ mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH;
if (type == ECORE_CON_LOCAL_USER)
{
@@ -197,9 +192,7 @@
snprintf(buf, sizeof(buf), "%s/.ecore/%s", homedir, name);
if (stat(buf, &st) < 0) mkdir(buf, mask);
snprintf(buf, sizeof(buf), "%s/.ecore/%s/%i", homedir, name, port);
-mask =
- S_IRGRP | S_IWGRP | S_IXGRP |
- S_IROTH | S_IWOTH | S_IXOTH;
+mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH;
}
else if (type == ECORE_CON_LOCAL_SYSTEM)
{
@@ -210,9 +203,7 @@
snprintf(buf, sizeof(buf), "/tmp/.ecore_service|%s|%i", name,
port);
}
else if (type == ECORE_CON_LOCAL_ABSTRACT)
- {
-strncpy(buf, name, sizeof(buf));
- }
+ strncpy(buf, name, sizeof(buf));
pmode = umask(mask);
start:
svr->fd = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -263,7 +254,7 @@
if (connect(svr->fd, (struct sockaddr *)&socket_unix,
socket_unix_len) < 0)
{
- if ((type == ECORE_CON_LOCAL_USER) ||
+ if ((type == ECORE_CON_LOCAL_USER) ||
(type == ECORE_CON_LOCAL_SYSTEM))
{
if (unlink(buf) < 0)
@@ -297,10 +288,9 @@
umask(pmode);
goto error;
}
- svr->fd_handler = ecore_main_fd_handler_add(svr->fd,
- ECORE_FD_READ,
- _ecore_con_svr_handler, svr,
- NULL, NULL);
+ svr->fd_handler =
+ ecore_main_fd_handler_add(svr->fd, ECORE_FD_READ,
+ _ecore_con_svr_handler, svr, NULL, NULL);
umask(pmode);
if (!svr->fd_handler) goto error;
}
@@ -318,10 +308,9 @@
socket_addr.sin_addr.s_addr = htonl(INADDR_ANY);
if (bind(svr->fd, (struct sockaddr *)&socket_addr, sizeof(struct
sockaddr_in)) < 0) goto error;
if (listen(svr->fd, 4096) < 0) goto error;
- svr->fd_handler = ecore_main_fd_handler_add(svr->fd,
- ECORE_FD_READ,
- _ecore_con_svr_handler, svr,
- NULL, NULL);
+ svr->fd_handler =
+ ecore_main_fd_handler_add(svr->fd, ECORE_FD_READ,
+ _ecore_con_svr_handler, svr, NULL, NULL);
if (!svr->fd_handler) goto error;
}
@@ -403,9 +392,7 @@
* @ingroup Ecore_Con_Server_Group
*/
EAPI Ecore_Con_Server *
-ecore_con_server_connect(Ecore_Con_Type compl_type,
-const char *name,
-int port,
+ecore_con_server_connect(Ecore_Con_Type compl_type, const char *name, int port,
const void *data)
{
Ecore_Con_Server *svr;
@@ -428,8 +415,7 @@
#endif
if ((type == ECORE_CON_REMOTE_SYSTEM) && (port < 0)) return NULL;
- if ((type == ECORE_CON_LOCAL_USER) ||
- (type == ECORE_CON_LOCAL_SYSTEM) ||
+ if ((type == ECORE_CON_LOCAL_USER) || (type == ECORE_CON_LOCAL_SYSTEM) ||
(type == ECORE_CON_LOCAL_ABSTRACT))
{
const char *homedir;
@@ -460,9 +446,7 @@
}
}
else if (type == ECORE_CON_LOCAL_ABSTRACT)
- {
-strncpy(buf, name, sizeof(buf));
- }
+ strncpy(buf, na
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_con Modified Files: Ecore_Con.h Log Message: Reword Ecore_Con doxy a little to be a bit nicer. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_con/Ecore_Con.h,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- Ecore_Con.h 21 Oct 2007 15:16:14 - 1.31 +++ Ecore_Con.h 30 Nov 2007 08:10:37 - 1.32 @@ -40,9 +40,9 @@ * There are two main objects in the @c Ecore_Con library: the @c * Ecore_Con_Server and the @c Ecore_Con_Client. * - * The @c Ecore_Con_Server represents a server to connect to. It is - * represents a server that can be connected to. It is used regardless - * of whether the program is acting as a server or client itself. + * The @c Ecore_Con_Server represents a server that can be connected to. + * It is used regardless of whether the program is acting as a server or + * client itself. * * To create a listening server, call @c ecore_con_server_add(). * - SF.Net email is sponsored by: The Future of Linux Business White Paper from Novell. From the desktop to the data center, Linux is going mainstream. Let it simplify your IT future. http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: Patch from caro to fix ecore_config dependency checks during configure.in. Ecore_Config depends on ecore_ipc, but that was never previously checked for. === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.204 retrieving revision 1.205 diff -u -3 -r1.204 -r1.205 --- configure.in16 Jul 2007 07:23:10 - 1.204 +++ configure.in28 Jul 2007 19:54:40 - 1.205 @@ -655,8 +655,12 @@ [ have_eet="no" ] ) -ECORE_CHECK_MODULE([Config], [yes], [$have_eet], - [requirements_ecore_config="$requirements_ecore_config eet"]) +ecore_config_deps="no" +if test "x$have_eet" = "xyes" -a "x$have_ecore_ipc" = "xyes" ; then + ecore_config_deps="yes" +fi +ECORE_CHECK_MODULE([Config], [yes], [$ecore_config_deps], + [requirements_ecore_config="$requirements_ecore_config ecore-ipc eet"]) ECORE_CHECK_MODULE([File], [yes]) - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x.c
Log Message:
Part 1 of ravenlocks mouse acceleration patch that provides the ecore_x
functions for setting mouse accel.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -3 -r1.184 -r1.185
--- Ecore_X.h 13 Mar 2007 16:29:02 - 1.184
+++ Ecore_X.h 20 Mar 2007 00:54:49 - 1.185
@@ -1418,7 +1418,8 @@
EAPI void ecore_x_window_save_set_del(Ecore_X_Window win);
EAPI Ecore_X_Window *ecore_x_window_children_get(Ecore_X_Window win, int *num);
-
+EAPI int ecore_x_pointer_control_set(int accel_num, int accel_denom, int
threshold);
+EAPI int ecore_x_pointer_control_get(int *accel_num, int *accel_denom, int
*threshold);
EAPI int ecore_x_pointer_grab(Ecore_X_Window win);
EAPI int ecore_x_pointer_confine_grab(Ecore_X_Window win);
EAPI void ecore_x_pointer_ungrab(void);
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- ecore_x.c 9 Mar 2007 01:11:09 - 1.125
+++ ecore_x.c 20 Mar 2007 00:54:49 - 1.126
@@ -1089,6 +1089,21 @@
}
EAPI int
+ecore_x_pointer_control_set(int accel_num, int accel_denom, int threshold)
+{
+ return XChangePointerControl(_ecore_x_disp, 1, 1,
+ accel_num, accel_denom, threshold);
+}
+
+
+EAPI int
+ecore_x_pointer_control_get(int *accel_num, int *accel_denom, int *threshold)
+{
+ return XGetPointerControl(_ecore_x_disp,
+ accel_num, accel_denom, threshold);
+}
+
+EAPI int
ecore_x_pointer_grab(Ecore_X_Window win)
{
if (XGrabPointer(_ecore_x_disp, win, False,
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_dpms.c
Log Message:
With Seb's recent #ifdef's the if (!dpms_available) checks are not needed now.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_dpms.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_x_dpms.c 13 Mar 2007 16:05:57 - 1.5
+++ ecore_x_dpms.c 13 Mar 2007 16:49:48 - 1.6
@@ -50,7 +50,6 @@
ecore_x_dpms_capable_get(void)
{
#ifdef ECORE_XDPMS
- if (!_dpms_available) return 0;
return DPMSCapable(_ecore_x_disp);
#else
return 0;
@@ -69,7 +68,6 @@
unsigned char state;
unsigned short power_lvl;
- if (!_dpms_available) return 0;
DPMSInfo(_ecore_x_disp, &power_lvl, &state);
return state;
#else
@@ -86,7 +84,6 @@
ecore_x_dpms_enabled_set(int enabled)
{
#ifdef ECORE_XDPMS
- if (!_dpms_available) return;
if (enabled)
DPMSEnable(_ecore_x_disp);
else
@@ -105,7 +102,6 @@
ecore_x_dpms_timeouts_get(unsigned int *standby, unsigned int *suspend,
unsigned int *off)
{
#ifdef ECORE_XDPMS
- if (!_dpms_available) return;
DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby,
(unsigned short *)suspend, (unsigned short *)off);
#endif
@@ -122,7 +118,6 @@
ecore_x_dpms_timeouts_set(unsigned int standby, unsigned int suspend, unsigned
int off)
{
#ifdef ECORE_XDPMS
- if (!_dpms_available) return 0;
return DPMSSetTimeouts(_ecore_x_disp, standby, suspend, off);
#else
return 0;
@@ -140,7 +135,6 @@
#ifdef ECORE_XDPMS
unsigned short standby, suspend, off;
- if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
return standby;
#else
@@ -160,7 +154,6 @@
#ifdef ECORE_XDPMS
unsigned short standby, suspend, off;
- if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
return suspend;
#else
@@ -180,7 +173,6 @@
#ifdef ECORE_XDPMS
unsigned short standby, suspend, off;
- if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
return off;
#else
@@ -199,7 +191,6 @@
#ifdef ECORE_XDPMS
unsigned short standby, suspend, off;
- if (!_dpms_available) return;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
DPMSSetTimeouts(_ecore_x_disp, new_timeout, suspend, off);
#endif
@@ -216,7 +207,6 @@
#ifdef ECORE_XDPMS
unsigned short standby, suspend, off;
- if (!_dpms_available) return;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
DPMSSetTimeouts(_ecore_x_disp, standby, new_timeout, off);
#endif
@@ -233,7 +223,6 @@
#ifdef ECORE_XDPMS
unsigned short standby, suspend, off;
- if (!_dpms_available) return;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
DPMSSetTimeouts(_ecore_x_disp, standby, suspend, new_timeout);
#endif
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: ecore_x_dpms.c Log Message: Call correct DPMSGetVersion function. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_dpms.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ecore_x_dpms.c 13 Mar 2007 09:30:17 - 1.3 +++ ecore_x_dpms.c 13 Mar 2007 11:14:44 - 1.4 @@ -15,7 +15,7 @@ _dpms_major = 1; _dpms_minor = 0; - if (DpmsGetVersion(_ecore_x_disp, &_dpms_major, &_dpms_minor)) + if (DPMSGetVersion(_ecore_x_disp, &_dpms_major, &_dpms_minor)) _dpms_available = 1; else _dpms_available = 0; - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: Fix minor typo..should be ECORE_XDPMS, thanks ravenlock :) === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.167 retrieving revision 1.168 diff -u -3 -r1.167 -r1.168 --- configure.in13 Mar 2007 09:31:22 - 1.167 +++ configure.in13 Mar 2007 09:45:00 - 1.168 @@ -490,14 +490,14 @@ [ AC_CHECK_LIB(Xdpms, DPMSQueryExtension, [ - AC_DEFINE(ECORE_DPMS, 1, [Build support for DPMS]) + AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS]) Xdpms_cflags="" Xdpms_libs="-lXdpms" use_Xdpms="yes" ], [ AC_CHECK_LIB(Xext, DPMSQueryExtension, [ - AC_DEFINE(ECORE_DPMS, 1, [Build support for DPMS]) + AC_DEFINE(ECORE_XDPMS, 1, [Build support for DPMS]) Xdpms_cflags="" Xdpms_libs="-lXext" use_Xdpms="yes" - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: Added checks for dpms available in X so we know to build ecore_x_dpms or not. Added a fallback check that looks in the Xext if not found in Xdpms. === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.166 retrieving revision 1.167 diff -u -3 -r1.166 -r1.167 --- configure.in10 Mar 2007 22:12:01 - 1.166 +++ configure.in13 Mar 2007 09:31:22 - 1.167 @@ -481,6 +481,51 @@ AC_SUBST(Xdamage_cflags) AC_SUBST(Xdamage_libs) + Xdpms_libs="" + Xdpms_cflags="" + use_Xdpms="no" + PCFLAGS=$CFLAGS + CFLAGS=$x_cflags" "$x_includes + AC_CHECK_HEADER(X11/extensions/dpms.h, +[ + AC_CHECK_LIB(Xdpms, DPMSQueryExtension, +[ + AC_DEFINE(ECORE_DPMS, 1, [Build support for DPMS]) + Xdpms_cflags="" + Xdpms_libs="-lXdpms" + use_Xdpms="yes" +], [ + AC_CHECK_LIB(Xext, DPMSQueryExtension, + [ + AC_DEFINE(ECORE_DPMS, 1, [Build support for DPMS]) + Xdpms_cflags="" + Xdpms_libs="-lXext" + use_Xdpms="yes" + ], [ + Xdpms_cflags="" + Xdpms_libs="" + use_Xdpms="no" + ], [ + $x_libs + ] + ) +], [ + $x_libs +] + ) +], [ + Xdpms_cflags="" + Xdpms_libs="" + use_Xdpms="no" +], [ + #include +] + ) + CFLAGS=$PCFLAGS + + AC_SUBST(Xdpms_cflags) + AC_SUBST(Xdpms_libs) + fi AC_SUBST(ecore_x_cflags) @@ -1287,7 +1332,7 @@ echo " Ecore_Job: $have_ecore_job" echo " Ecore_Con: $have_ecore_con (OpenSSL: $use_openssl)" echo " Ecore_Txt: $have_ecore_txt" -echo " Ecore_X..: $have_ecore_x (Xcursor: $use_Xcursor) (Xprint: $use_Xprint) (Xinerama: $use_Xinerama) (Xrandr: $use_Xrandr) (Xscreensaver: $use_Xss) (Xrender: $use_Xrender) (Xfixes: $use_Xfixes) (Xdamage: $use_Xdamage)" +echo " Ecore_X..: $have_ecore_x (Xcursor: $use_Xcursor) (Xprint: $use_Xprint) (Xinerama: $use_Xinerama) (Xrandr: $use_Xrandr) (Xscreensaver: $use_Xss) (Xrender: $use_Xrender) (Xfixes: $use_Xfixes) (Xdamage: $use_Xdamage) (Xdpms: $use_Xdpms)" echo " Ecore_FB.: $have_ecore_fb" echo " Ecore_DFB: $have_ecore_dfb" echo " Ecore_Evas...: $have_ecore_evas" - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_dpms.c
Log Message:
Fix up ecore_x_dpms...formatting, removed the static int's for dpms version
as they are not used anywhere other than the init function. Added traps for
dpms_available before calling any dpms functions.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_dpms.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_x_dpms.c 9 Mar 2007 01:11:09 - 1.2
+++ ecore_x_dpms.c 13 Mar 2007 09:30:17 - 1.3
@@ -4,17 +4,14 @@
#include "ecore_x_private.h"
-
static int _dpms_available;
-#ifdef ECORE_XDPMS
-static int _dpms_major, _dpms_minor;
-#endif
-
void
_ecore_x_dpms_init(void)
{
#ifdef ECORE_XDPMS
+ int _dpms_major, _dpms_minor;
+
_dpms_major = 1;
_dpms_minor = 0;
@@ -27,15 +24,12 @@
#endif
}
-
/**
* @defgroup Ecore_X_DPMS_Group X DPMS Extension Functions
*
* Functions related to the X DPMS extension.
*/
-
-
/**
* Checks if the X DPMS extension is available on the server.
* @return @c 1 if the X DPMS extension is available, @c 0 otherwise.
@@ -55,10 +49,10 @@
EAPI int
ecore_x_dpms_capable_get(void)
{
+ if (!_dpms_available) return 0;
return DPMSCapable(_ecore_x_disp);
}
-
/**
* Checks the DPMS state of the display.
* @return @c 1 if DPMS is enabled, @c 0 otherwise.
@@ -70,11 +64,11 @@
unsigned char state;
unsigned short power_lvl;
+ if (!_dpms_available) return 0;
DPMSInfo(_ecore_x_disp, &power_lvl, &state);
return state;
}
-
/**
* Sets the DPMS state of the display.
* @param enabled @c 0 to disable DPMS characteristics of the server, enable
it otherwise.
@@ -83,13 +77,13 @@
EAPI void
ecore_x_dpms_enabled_set(int enabled)
{
+ if (!_dpms_available) return;
if (enabled)
- DPMSEnable(_ecore_x_disp);
+ DPMSEnable(_ecore_x_disp);
else
- DPMSDisable(_ecore_x_disp);
+ DPMSDisable(_ecore_x_disp);
}
-
/**
* Gets the timeouts. The values are in unit of seconds.
* @param standby Amount of time of inactivity before standby mode will be
invoked.
@@ -100,10 +94,11 @@
EAPI void
ecore_x_dpms_timeouts_get(unsigned int *standby, unsigned int *suspend,
unsigned int *off)
{
- DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby, (unsigned short
*)suspend, (unsigned short *)off);
+ if (!_dpms_available) return;
+ DPMSGetTimeouts(_ecore_x_disp, (unsigned short *)standby,
+ (unsigned short *)suspend, (unsigned short *)off);
}
-
/**
* Sets the timeouts. The values are in unit of seconds.
* @param standby Amount of time of inactivity before standby mode will be
invoked.
@@ -114,13 +109,10 @@
EAPI int
ecore_x_dpms_timeouts_set(unsigned int standby, unsigned int suspend, unsigned
int off)
{
- return DPMSSetTimeouts(_ecore_x_disp,
- standby,
- suspend,
- off);
+ if (!_dpms_available) return 0;
+ return DPMSSetTimeouts(_ecore_x_disp, standby, suspend, off);
}
-
/**
* Returns the amount of time of inactivity before standby mode is invoked.
* @return The standby timeout value.
@@ -131,11 +123,11 @@
{
unsigned short standby, suspend, off;
+ if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
return standby;
}
-
/**
* Returns the amount of time of inactivity before the second level of
* power saving is invoked.
@@ -147,11 +139,11 @@
{
unsigned short standby, suspend, off;
+ if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
return suspend;
}
-
/**
* Returns the amount of time of inactivity before the third and final
* level of power saving is invoked.
@@ -163,11 +155,11 @@
{
unsigned short standby, suspend, off;
+ if (!_dpms_available) return 0;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
return off;
}
-
/**
* Sets the standby timeout (in unit of seconds).
* @param new_standby Amount of time of inactivity before standby mode will be
invoked.
@@ -178,14 +170,11 @@
{
unsigned short standby, suspend, off;
+ if (!_dpms_available) return;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
- DPMSSetTimeouts(_ecore_x_disp,
- new_timeout,
- suspend,
- off);
+ DPMSSetTimeouts(_ecore_x_disp, new_timeout, suspend, off);
}
-
/**
* Sets the suspend timeout (in unit of seconds).
* @param suspend Amount of time of inactivity before the screen is placed
into suspend mode.
@@ -196,14 +185,11 @@
{
unsigned short standby, suspend, off;
+ if (!_dpms_available) return;
DPMSGetTimeouts(_ecore_x_disp, &standby, &suspend, &off);
- DPMSSetTime
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: Re-enable setting x_ variables to nothing at start of X checks. Not sure if this was an accidental change or not, but it breaks things like pbuilder for building pacakges. === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.164 retrieving revision 1.165 diff -u -3 -r1.164 -r1.165 --- configure.in2 Mar 2007 17:02:48 - 1.164 +++ configure.in5 Mar 2007 04:38:54 - 1.165 @@ -161,10 +161,10 @@ ecore_x_cflags=""; ecore_x_libs=""; -#x_dir=""; -#x_includes=""; -#x_cflags=""; -#x_libs=""; +x_dir=""; +x_includes=""; +x_cflags=""; +x_libs=""; if test "x$have_ecore_txt" = "xyes"; then AC_MSG_CHECKING(whether ecore_x module is to be built) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x.c ecore_x_events.c ecore_x_private.h
ecore_x_screensaver.c
Log Message:
Applied Ravenlock's screensaver patches.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- Ecore_X.h 29 Dec 2006 02:56:33 - 1.181
+++ Ecore_X.h 13 Feb 2007 16:24:37 - 1.182
@@ -981,6 +981,7 @@
EAPI void ecore_x_kill(Ecore_X_Window win);
EAPI Ecore_X_Time ecore_x_current_time_get(void);
+EAPI Ecore_X_Time ecore_x_current_user_activity_time_get(void);
EAPI void ecore_x_error_handler_set(void (*func) (void *data),
const void *data);
EAPI void ecore_x_io_error_handler_set(void (*func) (void *data),
const void *data);
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -3 -r1.123 -r1.124
--- ecore_x.c 2 Dec 2006 06:40:24 - 1.123
+++ ecore_x.c 13 Feb 2007 16:24:37 - 1.124
@@ -37,6 +37,7 @@
Display *_ecore_x_disp = NULL;
double _ecore_x_double_click_time = 0.25;
Time _ecore_x_event_last_time = 0;
+Time _ecore_x_event_last_user_activity_time = 0;
Window _ecore_x_event_last_win = 0;
int _ecore_x_event_last_root_x = 0;
int _ecore_x_event_last_root_y = 0;
@@ -51,7 +52,7 @@
EAPI Ecore_X_Atom ECORE_X_ATOM_UTF8_STRING = 0;
EAPI Ecore_X_Atom ECORE_X_ATOM_COMPOUND_TEXT = 0;
-Ecore_X_Atom _ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_NUM];
+Ecore_X_Atom _ecore_x_atoms_wm_protocols[ECORE_X_WM_PROTOCOL_NUM];
/*
* GNOME hints.
@@ -646,6 +647,16 @@
ecore_x_current_time_get(void)
{
return _ecore_x_event_last_time;
+}
+
+/*
+ * Return the last time a *USER* generated an event
+ * Should corespond to key-down, key-up, mouse-down, mouse-up, mouse move
+ */
+EAPI Ecore_X_Time
+ecore_x_current_user_activity_time_get()
+{
+ return _ecore_x_event_last_user_activity_time;
}
static int
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_events.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- ecore_x_events.c19 Dec 2006 06:51:51 - 1.93
+++ ecore_x_events.c13 Feb 2007 16:24:37 - 1.94
@@ -228,6 +228,7 @@
e->time = xevent->xkey.time;
e->modifiers = xevent->xkey.state;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
ecore_event_add(ECORE_X_EVENT_KEY_DOWN, e, _ecore_x_event_free_key_down,
NULL);
}
@@ -279,6 +280,7 @@
e->time = xevent->xkey.time;
e->modifiers = xevent->xkey.state;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
ecore_event_add(ECORE_X_EVENT_KEY_UP, e, _ecore_x_event_free_key_up, NULL);
}
@@ -332,6 +334,7 @@
e->event_win = xevent->xbutton.window;
e->time = xevent->xbutton.time;
_ecore_x_event_last_time = e->time;
+ _ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -376,6 +379,7 @@
e->event_win = xevent->xbutton.window;
e->time = xevent->xbutton.time;
_ecore_x_event_last_time = e->time;
+_ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -431,6 +435,7 @@
if (!e->double_click && !e->triple_click)
_ecore_x_mouse_up_count = 0;
_ecore_x_event_last_time = e->time;
+_ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -497,6 +502,7 @@
e->event_win = xevent->xbutton.window;
e->time = xevent->xbutton.time;
_ecore_x_event_last_time = e->time;
+_ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y = e->root.y;
@@ -538,6 +544,7 @@
e->triple_click = 1;
}
_ecore_x_event_last_time = e->time;
+_ecore_x_event_last_user_activity_time = e->time;
_ecore_x_event_last_win = e->win;
_ecore_x_event_last_root_x = e->root.x;
_ecore_x_event_last_root_y
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: Makefile.am ecore_x_private.h Added Files: ecore_x_dpms.c Log Message: Added Ravenlock's DPMS code for ecore_x. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Makefile.am,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- Makefile.am 7 Aug 2006 07:03:12 - 1.30 +++ Makefile.am 13 Feb 2007 02:29:01 - 1.31 @@ -51,6 +51,7 @@ ecore_x_gc.c \ ecore_x_xinerama.c \ ecore_x_screensaver.c \ +ecore_x_dpms.c \ ecore_x_private.h libecore_x_la_LIBADD = \ @@ -98,4 +99,5 @@ ecore_x_gc.c \ ecore_x_xinerama.c \ ecore_x_screensaver.c \ +ecore_x_dpms.c \ ecore_x_private.h === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_private.h,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- ecore_x_private.h 5 Nov 2006 15:14:49 - 1.56 +++ ecore_x_private.h 13 Feb 2007 02:29:01 - 1.57 @@ -18,6 +18,7 @@ #include #include #include +#include #ifdef ECORE_XCURSOR #include #endif - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier. Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore.c
Log Message:
Comment out unused strcmp block. It used todo a printf, which was commented
out, so really no reason to run the strcmp in the first place if we do
nothing with the result.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore.c 13 Jan 2006 04:31:41 - 1.15
+++ ecore.c 3 Feb 2007 20:44:35 - 1.16
@@ -46,10 +46,12 @@
if (++_ecore_init_count == 1)
{
setlocale(LC_CTYPE, "");
+ /*
if (strcmp(nl_langinfo(CODESET), "UTF-8"))
{
-// printf("WARNING: not a utf8 locale!\n");
+printf("WARNING: not a utf8 locale!\n");
}
+*/
#ifndef WIN32
if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
if (_ecore_fps_debug) _ecore_fps_debug_init();
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_menu.c
Log Message:
Revert that recent trap commit.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ecore_desktop_menu.c26 Dec 2006 05:06:11 - 1.41
+++ ecore_desktop_menu.c26 Dec 2006 05:10:48 - 1.42
@@ -934,10 +934,8 @@
int i;
chartemp[PATH_MAX];
- if (!tree) return;
for (i = 0; i < tree->size; i++)
{
- if (!tree->elements[i]) continue;
if (tree->elements[i].type == ECORE_DESKTOP_TREE_ELEMENT_TYPE_STRING)
{
/* FIXME or would be valid input (which
this won't catch) */
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_menu.c
Log Message:
Added some safety traps to help avoid segfaults.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- ecore_desktop_menu.c21 Dec 2006 14:42:20 - 1.40
+++ ecore_desktop_menu.c26 Dec 2006 05:06:11 - 1.41
@@ -934,8 +934,10 @@
int i;
chartemp[PATH_MAX];
+ if (!tree) return;
for (i = 0; i < tree->size; i++)
{
+ if (!tree->elements[i]) continue;
if (tree->elements[i].type == ECORE_DESKTOP_TREE_ELEMENT_TYPE_STRING)
{
/* FIXME or would be valid input (which
this won't catch) */
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: Move tslib (Touchscreen) checks inside the "want_ecore_fb" block, as tslib is only used if we're building ecore_fb. === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.160 retrieving revision 1.161 diff -u -3 -r1.160 -r1.161 --- configure.in16 Nov 2006 16:53:59 - 1.160 +++ configure.in25 Nov 2006 19:24:46 - 1.161 @@ -59,15 +59,6 @@ AC_CHECK_FUNCS(gettimeofday) -tslib_libs="" -AC_CHECK_HEADER(tslib.h, - [ -tslib_libs="-ltslib" -AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_X Module]) - ] -) -AC_SUBST(tslib_libs) - AC_CHECK_HEADERS(netinet/in.h) case "$host_os" in @@ -586,7 +577,15 @@ ] ) +tslib_libs="" if test "x$want_ecore_fb" = "xyes"; then + AC_CHECK_HEADER(tslib.h, +[ + tslib_libs="-ltslib" + AC_DEFINE(HAVE_TSLIB, 1, [Build Ecore_FB Touchscreen Code]) +] + ) + AC_CHECK_HEADER(linux/fb.h, [ AC_CHECK_HEADER(linux/input.h, @@ -607,6 +606,7 @@ AM_CONDITIONAL(BUILD_ECORE_FB, false) fi +AC_SUBST(tslib_libs) AC_SUBST(ecore_fb_cflags) AC_SUBST(ecore_fb_libs) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop.c
Log Message:
Fix glibc invalid next size on free.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- ecore_desktop.c 16 Sep 2006 20:01:59 - 1.32
+++ ecore_desktop.c 17 Sep 2006 13:34:11 - 1.33
@@ -837,7 +837,7 @@
len += strlen(p);
}
free(params);
- params = malloc(len);
+ params = malloc(len + 1);
if (params)
{
params[0] = '\0';
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_value.c
Log Message:
Format to 'E' style.
Note: No functional changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_value.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_value.c 6 Jan 2006 17:58:12 - 1.8
+++ ecore_value.c 23 Jun 2006 06:43:00 - 1.9
@@ -28,20 +28,23 @@
#include "Ecore_Data.h"
#include "ecore_private.h"
-EAPI const unsigned int ecore_prime_table[] = { 17, 31, 61, 127, 257, 509,
1021,
- 2053, 4093, 8191, 16381, 32771, 65537, 131071, 262147, 524287, 1048573,
- 2097143, 4194301, 8388617, 16777213
+EAPI const unsigned int ecore_prime_table[] =
+{
+ 17, 31, 61, 127, 257, 509, 1021,
+ 2053, 4093, 8191, 16381, 32771, 65537, 131071, 262147, 524287, 1048573,
+ 2097143, 4194301, 8388617, 16777213
};
-inline void ecore_print_warning(const char *function, const char *sparam)
+inline void
+ecore_print_warning(const char *function, const char *sparam)
{
- fprintf(stderr, "* Developer Warning * :\n"
- "\tThis program is calling:\n\n"
- "\t%s();\n\n"
- "\tWith the parameter:\n\n"
- "\t%s\n\n"
- "\tbeing NULL. Please fix your program.\n", function,
sparam);
- fflush(stderr);
+ fprintf(stderr, "* Developer Warning * :\n"
+ "\tThis program is calling:\n\n"
+ "\t%s();\n\n"
+ "\tWith the parameter:\n\n"
+ "\t%s\n\n"
+ "\tbeing NULL. Please fix your program.\n", function, sparam);
+ fflush(stderr);
}
/**
@@ -49,9 +52,10 @@
* @param key The key to return compute a hash value
* @return The key cast to an unsigned int.
*/
-EAPI unsigned int ecore_direct_hash(void *key)
+EAPI unsigned int
+ecore_direct_hash(void *key)
{
- return ((unsigned int) key);
+ return ((unsigned int) key);
}
/**
@@ -59,21 +63,23 @@
* @param key A pointer to the string to compute a hash value
* @return A computed hash value for @a key.
*/
-EAPI unsigned int ecore_str_hash(void *key)
+EAPI unsigned int
+ecore_str_hash(void *key)
{
- int i;
- unsigned int value = 0;
- char *k = (char *) key;
-
- if (!k)
- return 0;
-
- for (i = 0; k[i] != '\0'; i++) {
- value ^= ((unsigned int) k[i] << ((i * 5) %
- (sizeof(unsigned int) * 8)));
- }
+ int i;
+ unsigned int value = 0;
+ char *k = (char *) key;
+
+ if (!k)
+ return 0;
+
+ for (i = 0; k[i] != '\0'; i++)
+ {
+ value ^= ((unsigned int) k[i] << ((i * 5) %
+ (sizeof(unsigned int) * 8)));
+ }
- return value;
+ return value;
}
/**
@@ -82,20 +88,21 @@
* @param key2 The second key to compare
* @return A strcmp style value to indicate the larger key
*/
-EAPI int ecore_direct_compare(void *key1, void *key2)
+EAPI int
+ecore_direct_compare(void *key1, void *key2)
{
- unsigned int k1, k2;
+ unsigned int k1, k2;
- k1 = (unsigned int) key1;
- k2 = (unsigned int) key2;
+ k1 = (unsigned int) key1;
+ k2 = (unsigned int) key2;
- if (k1 > k2)
- return 1;
+ if (k1 > k2)
+ return 1;
- if (k1 < k2)
- return -1;
+ if (k1 < k2)
+ return -1;
- return 0;
+ return 0;
}
/**
@@ -104,17 +111,18 @@
* @param key2 The second key to compare
* @return A strcmp style value to indicate the larger key
*/
-EAPI int ecore_str_compare(void *key1, void *key2)
+EAPI int
+ecore_str_compare(void *key1, void *key2)
{
- char *k1, *k2;
+ char *k1, *k2;
- if (!key1 || !key2)
- return ecore_direct_compare(key1, key2);
- else if (key1 == key2)
- return 0;
+ if (!key1 || !key2)
+ return ecore_direct_compare(key1, key2);
+ else if (key1 == key2)
+ return 0;
- k1 = (char *) key1;
- k2 = (char *) key2;
+ k1 = (char *) key1;
+ k2 = (char *) key2;
- return strcmp(k1, k2);
+ return strcmp(k1, k2);
}
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_tree.c
Log Message:
Format to 'E' style.
Note: No functional changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_tree.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore_tree.c12 Jan 2006 03:01:58 - 1.9
+++ ecore_tree.c23 Jun 2006 06:42:35 - 1.10
@@ -18,29 +18,31 @@
/* Fucntions for executing a specified function on each node of a tree */
static int tree_for_each_node(Ecore_Tree_Node * node, Ecore_For_Each
for_each_func,
-void *user_data);
+ void *user_data);
static int tree_for_each_node_value(Ecore_Tree_Node * node,
-Ecore_For_Each for_each_func, void *user_data);
+ Ecore_For_Each for_each_func, void
*user_data);
/**
* @brief Allocate a new tree structure.
* @param compare_func: function used to compare the two values
* @return Returns NULL if the operation fails, otherwise the new tree
*/
-EAPI Ecore_Tree *ecore_tree_new(Ecore_Compare_Cb compare_func)
+EAPI Ecore_Tree *
+ecore_tree_new(Ecore_Compare_Cb compare_func)
{
- Ecore_Tree *new_tree;
+ Ecore_Tree *new_tree;
- new_tree = ECORE_TREE(malloc(sizeof(Ecore_Tree)));
- if (!new_tree)
- return NULL;
+ new_tree = ECORE_TREE(malloc(sizeof(Ecore_Tree)));
+ if (!new_tree)
+ return NULL;
+
+ if (!ecore_tree_init(new_tree, compare_func))
+ {
+ IF_FREE(new_tree);
+ return NULL;
+ }
- if (!ecore_tree_init(new_tree, compare_func)) {
- IF_FREE(new_tree);
- return NULL;
- }
-
- return new_tree;
+ return new_tree;
}
/**
@@ -49,18 +51,19 @@
* @param compare_func: the function used to compare node keys
* @return Returns TRUE on successful initialization, FALSE on an error
*/
-EAPI int ecore_tree_init(Ecore_Tree * new_tree, Ecore_Compare_Cb compare_func)
+EAPI int
+ecore_tree_init(Ecore_Tree *new_tree, Ecore_Compare_Cb compare_func)
{
- CHECK_PARAM_POINTER_RETURN("new_tree", new_tree, FALSE);
+ CHECK_PARAM_POINTER_RETURN("new_tree", new_tree, FALSE);
- memset(new_tree, 0, sizeof(Ecore_Tree));
+ memset(new_tree, 0, sizeof(Ecore_Tree));
- if (!compare_func)
- new_tree->compare_func = ecore_direct_compare;
- else
- new_tree->compare_func = compare_func;
+ if (!compare_func)
+ new_tree->compare_func = ecore_direct_compare;
+ else
+ new_tree->compare_func = compare_func;
- return TRUE;
+ return TRUE;
}
/*
@@ -69,53 +72,57 @@
* @param free_func: the function that will be passed the node being freed
* @return Returns TRUE on successful set, FALSE otherwise.
*/
-EAPI int ecore_tree_set_free_cb(Ecore_Tree * tree, Ecore_Free_Cb free_func)
+EAPI int
+ecore_tree_set_free_cb(Ecore_Tree *tree, Ecore_Free_Cb free_func)
{
- CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
+ CHECK_PARAM_POINTER_RETURN("tree", tree, FALSE);
- tree->free_func = free_func;
+ tree->free_func = free_func;
- return TRUE;
+ return TRUE;
}
/*
* @brief Initialize a new tree node
* @return Returns FALSE if the operation fails, otherwise TRUE
*/
-EAPI int ecore_tree_node_init(Ecore_Tree_Node * new_node)
+EAPI int
+ecore_tree_node_init(Ecore_Tree_Node *new_node)
{
- CHECK_PARAM_POINTER_RETURN("new_node", new_node, FALSE);
+ CHECK_PARAM_POINTER_RETURN("new_node", new_node, FALSE);
- new_node->key = NULL;
- new_node->value = NULL;
+ new_node->key = NULL;
+ new_node->value = NULL;
- new_node->parent = NULL;
- new_node->right_child = NULL;
- new_node->left_child = NULL;
+ new_node->parent = NULL;
+ new_node->right_child = NULL;
+ new_node->left_child = NULL;
- new_node->max_left = new_node->max_right = 0;
+ new_node->max_left = new_node->max_right = 0;
- return TRUE;
+ return TRUE;
}
/*
* @brief Allocate a new tree node
* @return Returns NULL if the operation fails, otherwise the new node.
*/
-EAPI Ecore_Tree_Node *ecore_tree_node_new()
+EAPI Ecore_Tree_Node *
+ecore_tree_node_new()
{
- Ecore_Tree_Node *new_node;
-
- new_node = ECORE_TREE_NODE(malloc(sizeof(Ecore_Tree_Node)));
- if (!new_node)
- return NULL;
+ Ecore_Tree_Node *new_node;
- if (!ecore_tree_node_init(new_node)) {
- IF_FREE(new_node);
- return NULL;
- }
+ new_node = ECORE_TREE_NODE(malloc(sizeof(Ecore_Tree_Node)));
+ if (!new_node)
+ return NULL;
+
+ if (!ecore_tree_node_init(new_node))
+ {
+ IF_FREE(new_node);
+ return NULL;
+ }
- return new_node;
+
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_strings.c
Log Message:
Format to 'E' style.
Note: No functional changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_strings.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ecore_strings.c 6 Jan 2006 18:06:23 - 1.12
+++ ecore_strings.c 23 Jun 2006 06:42:09 - 1.13
@@ -17,21 +17,23 @@
* Initialize the ecore string internal structure.
* @return Zero on failure, non-zero on successful initialization.
*/
-EAPI int ecore_string_init()
+EAPI int
+ecore_string_init()
{
- /*
-* No strings have been loaded at this point, so create the hash
-* table for storing string info for later.
-*/
- if (!ecore_string_init_count) {
- ecore_strings = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
- if (!ecore_strings)
- return 0;
- ecore_hash_set_free_value(ecore_strings, ecore_string_free_cb);
- }
- ecore_string_init_count++;
+ /*
+* No strings have been loaded at this point, so create the hash
+* table for storing string info for later.
+*/
+ if (!ecore_string_init_count)
+ {
+ ecore_strings = ecore_hash_new(ecore_str_hash, ecore_str_compare);
+ if (!ecore_strings)
+ return 0;
+ ecore_hash_set_free_value(ecore_strings, ecore_string_free_cb);
+ }
+ ecore_string_init_count++;
- return 1;
+ return 1;
}
/**
@@ -41,78 +43,85 @@
* @c NULL on failure.
* @ingroup Ecore_String_Group
*/
-EAPI const char *ecore_string_instance(char *string)
+EAPI const char *
+ecore_string_instance(char *string)
{
- Ecore_String *str;
+ Ecore_String *str;
+
+ CHECK_PARAM_POINTER_RETURN("string", string, NULL);
- CHECK_PARAM_POINTER_RETURN("string", string, NULL);
+ /*
+* Check for a previous instance of the string, if not found, create
+* it.
+*/
+ str = ecore_hash_get(ecore_strings, string);
+ if (!str)
+ {
/*
-* Check for a previous instance of the string, if not found, create
-* it.
+* Allocate and initialize a new string reference.
*/
- str = ecore_hash_get(ecore_strings, string);
- if (!str) {
+ str = (Ecore_String *)malloc(sizeof(Ecore_String));
- /*
-* Allocate and initialize a new string reference.
-*/
- str = (Ecore_String *)malloc(sizeof(Ecore_String));
+ str->string = strdup(string);
+ str->references = 0;
- str->string = strdup(string);
- str->references = 0;
+ ecore_hash_set(ecore_strings, str->string, str);
+ }
- ecore_hash_set(ecore_strings, str->string, str);
- }
+ str->references++;
- str->references++;
-
- return str->string;
+ return str->string;
}
/**
* Notes that the given string has lost an instance.
- *
+ *
* It will free the string if no other instances are left.
*
* @param string The given string.
* @ingroup Ecore_String_Group
*/
-EAPI void ecore_string_release(const char *string)
+EAPI void
+ecore_string_release(const char *string)
{
- Ecore_String *str;
+ Ecore_String *str;
- CHECK_PARAM_POINTER("string", string);
+ CHECK_PARAM_POINTER("string", string);
- str = ecore_hash_get(ecore_strings, (char *)string);
- if (!str)
- return;
-
- str->references--;
- if (str->references < 1) {
- ecore_hash_remove(ecore_strings, (char *)string);
- FREE(str->string);
- FREE(str);
- }
+ str = ecore_hash_get(ecore_strings, (char *)string);
+ if (!str)
+ return;
+
+ str->references--;
+ if (str->references < 1)
+ {
+ ecore_hash_remove(ecore_strings, (char *)string);
+ FREE(str->string);
+ FREE(str);
+ }
}
/**
* Shutdown the ecore string internal structures
*/
-EAPI void ecore_string_shutdown()
+EAPI void
+ecore_string_shutdown()
{
- --ecore_string_init_count;
- if (!ecore_string_init_count) {
- ecore_hash_destroy(ecore_strings);
- ecore_strings = NULL;
- }
+ --ecore_string_init_count;
+ if (!ecore_string_init_count)
+ {
+ ecore_hash_destroy(ecore_strings);
+ ecore_strings = NULL;
+ }
}
-static void ecore_string_free_cb(void *data)
+static void
+ecore_string_free_cb(void *data)
{
- Ecore_String *str;
+ Ecore_String *str;
- str = data;
- FREE(str->string);
- FREE(str);
+ str = data;
+ FREE(str->string);
+ FREE(str);
}
Using Tomcat but need to do more? Need to support web services, security?
Get stuff
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_sheap.c
Log Message:
Format to 'E' style.
Note: No functional changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_sheap.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_sheap.c 6 Jan 2006 17:58:12 - 1.10
+++ ecore_sheap.c 23 Jun 2006 06:41:44 - 1.11
@@ -18,21 +18,23 @@
* @return A pointer to the newly allocated binary heap on success, NULL on
* failure.
*/
-EAPI Ecore_Sheap *ecore_sheap_new(Ecore_Compare_Cb compare, int size)
+EAPI Ecore_Sheap *
+ecore_sheap_new(Ecore_Compare_Cb compare, int size)
{
- Ecore_Sheap *heap = NULL;
+ Ecore_Sheap *heap = NULL;
- heap = (Ecore_Sheap *)malloc(sizeof(Ecore_Sheap));
- if (!heap)
- return NULL;
- memset(heap, 0, sizeof(Ecore_Sheap));
+ heap = (Ecore_Sheap *)malloc(sizeof(Ecore_Sheap));
+ if (!heap)
+ return NULL;
+ memset(heap, 0, sizeof(Ecore_Sheap));
- if (!ecore_sheap_init(heap, compare, size)) {
- FREE(heap);
- return NULL;
- }
+ if (!ecore_sheap_init(heap, compare, size))
+ {
+ FREE(heap);
+ return NULL;
+ }
- return heap;
+ return heap;
}
/**
@@ -42,23 +44,24 @@
* @param sizeThe number of elements to allow in the heap
* @returnTRUE on success, FALSE on failure
*/
-EAPI int ecore_sheap_init(Ecore_Sheap *heap, Ecore_Compare_Cb compare, int
size)
+EAPI int
+ecore_sheap_init(Ecore_Sheap *heap, Ecore_Compare_Cb compare, int size)
{
- CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
-
- heap->space = size;
- if (!compare)
- heap->compare = ecore_direct_compare;
- else
- heap->compare = compare;
- heap->order = ECORE_SHEAP_MIN;
+ CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
- heap->data = (void **)malloc(heap->space * sizeof(void *));
- if (!heap->data)
- return FALSE;
- memset(heap->data, 0, heap->space * sizeof(void *));
+ heap->space = size;
+ if (!compare)
+ heap->compare = ecore_direct_compare;
+ else
+ heap->compare = compare;
+ heap->order = ECORE_SHEAP_MIN;
+
+ heap->data = (void **)malloc(heap->space * sizeof(void *));
+ if (!heap->data)
+ return FALSE;
+ memset(heap->data, 0, heap->space * sizeof(void *));
- return TRUE;
+ return TRUE;
}
/**
@@ -69,22 +72,23 @@
*
* @param heap The heap to be freed
*/
-EAPI void ecore_sheap_destroy(Ecore_Sheap *heap)
+EAPI void
+ecore_sheap_destroy(Ecore_Sheap *heap)
{
- int i;
+ int i;
- CHECK_PARAM_POINTER("heap", heap);
+ CHECK_PARAM_POINTER("heap", heap);
- /*
-* Free data in heap
-*/
- if (heap->free_func)
- for (i = 0; i < heap->size; i++)
- heap->free_func(heap->data[i]);
+ /*
+* Free data in heap
+*/
+ if (heap->free_func)
+ for (i = 0; i < heap->size; i++)
+ heap->free_func(heap->data[i]);
- FREE(heap->data);
+ FREE(heap->data);
- FREE(heap);
+ FREE(heap);
}
/**
@@ -94,13 +98,14 @@
* @param free_func The function that will free the key data.
* @return @c TRUE on successful set, @c FALSE otherwise.
*/
-EAPI int ecore_sheap_set_free_cb(Ecore_Sheap *heap, Ecore_Free_Cb free_func)
+EAPI int
+ecore_sheap_set_free_cb(Ecore_Sheap *heap, Ecore_Free_Cb free_func)
{
- CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
+ CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
- heap->free_func = free_func;
+ heap->free_func = free_func;
- return TRUE;
+ return TRUE;
}
/**
@@ -110,85 +115,90 @@
* @return TRUE on success, NULL on failure. Increases the size of the heap if
* it becomes larger than available space.
*/
-EAPI int ecore_sheap_insert(Ecore_Sheap *heap, void *data)
+EAPI int
+ecore_sheap_insert(Ecore_Sheap *heap, void *data)
{
- int i;
- void *temp;
- int parent;
- int position;
-
- CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
+ int i;
+ void *temp;
+ int parent;
+ int position;
+
+ CHECK_PARAM_POINTER_RETURN("heap", heap, FALSE);
+
+ /*
+* Increase the size of the allocated data area if there isn't enough
+* space available to add this data
+*/
+ if (heap->size >= heap->space)
+ return FALSE;
+
+ heap->sorted = FALSE;
+
+ /*
+* Place the data at the end of the heap initially. Then determine the
+* parent and position in the array of it's parent.
+*/
+ heap->data[heap->size] = data;
+ position = heap->size;
+ heap->size++;
+ i = heap->size;
+ parent = PARENT(i) - 1;
+
+ /*
+* Check the order of the heap to decide where to place the
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_plugin.c
Log Message:
Format to 'E' style.
Note: No functional changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_plugin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_plugin.c 6 Jan 2006 17:58:12 - 1.7
+++ ecore_plugin.c 23 Jun 2006 06:41:20 - 1.8
@@ -1,7 +1,7 @@
#ifndef WIN32
-#include
-#include "ecore_private.h"
-#include "Ecore_Data.h"
+# include
+# include "ecore_private.h"
+# include "Ecore_Data.h"
static Ecore_List *loaded_plugins = NULL;
@@ -22,44 +22,44 @@
EAPI Ecore_Plugin *
ecore_plugin_load(int group_id, char *plugin_name)
{
- char *path;
- char temp[PATH_MAX];
+ char *path;
+ char temp[PATH_MAX];
- Ecore_Plugin *plugin;
- void *handle = NULL;
+ Ecore_Plugin *plugin;
+ void *handle = NULL;
- CHECK_PARAM_POINTER_RETURN("plugin_name", plugin_name, NULL);
+ CHECK_PARAM_POINTER_RETURN("plugin_name", plugin_name, NULL);
- snprintf(temp, PATH_MAX, "%s.so", plugin_name);
- path = ecore_path_group_find(group_id, temp);
- if (!path)
- return NULL;
+ snprintf(temp, PATH_MAX, "%s.so", plugin_name);
+ path = ecore_path_group_find(group_id, temp);
+ if (!path)
+ return NULL;
- handle = dlopen(path, RTLD_LAZY);
- if (!handle)
- return NULL;
+ handle = dlopen(path, RTLD_LAZY);
+ if (!handle)
+ return NULL;
- /*
-* Allocate the new plugin and initialize it's fields
-*/
- plugin = malloc(sizeof(Ecore_Plugin));
- memset(plugin, 0, sizeof(Ecore_Plugin));
+ /*
+* Allocate the new plugin and initialize it's fields
+*/
+ plugin = malloc(sizeof(Ecore_Plugin));
+ memset(plugin, 0, sizeof(Ecore_Plugin));
- plugin->group = group_id;
- plugin->name = strdup(plugin_name);
- plugin->handle = handle;
+ plugin->group = group_id;
+ plugin->name = strdup(plugin_name);
+ plugin->handle = handle;
- /*
-* Now add it to the list of the groups loaded plugins
-*/
- if (!loaded_plugins)
- loaded_plugins = ecore_list_new();
+ /*
+* Now add it to the list of the groups loaded plugins
+*/
+ if (!loaded_plugins)
+ loaded_plugins = ecore_list_new();
- ecore_list_append(loaded_plugins, plugin);
+ ecore_list_append(loaded_plugins, plugin);
- FREE(path);
+ FREE(path);
- return plugin;
+ return plugin;
}
/**
@@ -68,20 +68,20 @@
* @ingroup Ecore_Plugin
*/
EAPI void
-ecore_plugin_unload(Ecore_Plugin * plugin)
+ecore_plugin_unload(Ecore_Plugin *plugin)
{
- CHECK_PARAM_POINTER("plugin", plugin);
+ CHECK_PARAM_POINTER("plugin", plugin);
- if (!plugin->handle)
- return;
+ if (!plugin->handle)
+ return;
- if (ecore_list_goto(loaded_plugins, plugin))
- ecore_list_remove(loaded_plugins);
+ if (ecore_list_goto(loaded_plugins, plugin))
+ ecore_list_remove(loaded_plugins);
- dlclose(plugin->handle);
+ dlclose(plugin->handle);
- FREE(plugin->name);
- FREE(plugin);
+ FREE(plugin->name);
+ FREE(plugin);
}
/*
@@ -92,18 +92,18 @@
* @ingroup Ecore_Plugin
*/
EAPI void *
-ecore_plugin_call(Ecore_Plugin * plugin, char *symbol_name)
+ecore_plugin_call(Ecore_Plugin *plugin, char *symbol_name)
{
- void *ret;
+ void *ret;
- CHECK_PARAM_POINTER_RETURN("plugin", plugin, NULL);
- CHECK_PARAM_POINTER_RETURN("symbol_name", symbol_name, NULL);
+ CHECK_PARAM_POINTER_RETURN("plugin", plugin, NULL);
+ CHECK_PARAM_POINTER_RETURN("symbol_name", symbol_name, NULL);
- if (!plugin->handle)
- return NULL;
+ if (!plugin->handle)
+ return NULL;
- ret = dlsym(plugin->handle, symbol_name);
+ ret = dlsym(plugin->handle, symbol_name);
- return ret;
+ return ret;
}
#endif
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_path.c
Log Message:
Format to 'E' formatting.
Note: No functional changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_path.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_path.c6 Jan 2006 17:58:12 - 1.8
+++ ecore_path.c23 Jun 2006 06:40:52 - 1.9
@@ -23,30 +23,30 @@
EAPI int
ecore_path_group_new(char *group_name)
{
- Ecore_Path_Group *last;
- Ecore_Path_Group *group;
+ Ecore_Path_Group *last;
+ Ecore_Path_Group *group;
- CHECK_PARAM_POINTER_RETURN("group_name", group_name, -1);
+ CHECK_PARAM_POINTER_RETURN("group_name", group_name, -1);
- if (!group_list) {
- group_list = ecore_list_new();
- }
- else {
- group = __ecore_path_group_find(group_name);
- if (group)
- return -1;
- }
-
- group = (Ecore_Path_Group *)malloc(sizeof(Ecore_Path_Group));
- memset(group, 0, sizeof(Ecore_Path_Group));
+ if (!group_list)
+ group_list = ecore_list_new();
+ else
+ {
+ group = __ecore_path_group_find(group_name);
+ if (group)
+ return -1;
+ }
+
+ group = (Ecore_Path_Group *)malloc(sizeof(Ecore_Path_Group));
+ memset(group, 0, sizeof(Ecore_Path_Group));
- group->name = strdup(group_name);
- ecore_list_append(group_list, group);
+ group->name = strdup(group_name);
+ ecore_list_append(group_list, group);
- last = ecore_list_goto_last(group_list);
- group->id = last->id + 1;
+ last = ecore_list_goto_last(group_list);
+ group->id = last->id + 1;
- return group->id;
+ return group->id;
}
/**
@@ -57,21 +57,21 @@
EAPI void
ecore_path_group_del(int group_id)
{
- Ecore_Path_Group *group;
+ Ecore_Path_Group *group;
- group = __ecore_path_group_find_id(group_id);
+ group = __ecore_path_group_find_id(group_id);
- if (!group)
- return;
+ if (!group)
+ return;
- if (group->paths) {
- ecore_list_for_each(group->paths,
- ECORE_FOR_EACH(free), NULL);
- ecore_list_destroy(group->paths);
- }
+ if (group->paths)
+ {
+ ecore_list_for_each(group->paths, ECORE_FOR_EACH(free), NULL);
+ ecore_list_destroy(group->paths);
+ }
- free(group->name);
- free(group);
+ free(group->name);
+ free(group);
}
/**
@@ -83,19 +83,19 @@
EAPI void
ecore_path_group_add(int group_id, char *path)
{
- Ecore_Path_Group *group;
+ Ecore_Path_Group *group;
- CHECK_PARAM_POINTER("path", path);
+ CHECK_PARAM_POINTER("path", path);
- group = __ecore_path_group_find_id(group_id);
+ group = __ecore_path_group_find_id(group_id);
- if (!group)
- return;
+ if (!group)
+ return;
- if (!group->paths)
- group->paths = ecore_list_new();
+ if (!group->paths)
+ group->paths = ecore_list_new();
- ecore_list_append(group->paths, strdup(path));
+ ecore_list_append(group->paths, strdup(path));
}
/**
@@ -107,32 +107,32 @@
EAPI void
ecore_path_group_remove(int group_id, char *path)
{
- char *found;
- Ecore_Path_Group *group;
+ char *found;
+ Ecore_Path_Group *group;
- CHECK_PARAM_POINTER("path", path);
+ CHECK_PARAM_POINTER("path", path);
- group = __ecore_path_group_find_id(group_id);
+ group = __ecore_path_group_find_id(group_id);
- if (!group || !group->paths)
- return;
-
- /*
-* Find the path in the list of available paths
-*/
- ecore_list_goto_first(group->paths);
-
- while ((found = ecore_list_current(group->paths))
- && strcmp(found, path))
- ecore_list_next(group->paths);
-
- /*
-* If the path is found, remove and free it
-*/
- if (found) {
- ecore_list_remove(group->paths);
- free(found);
- }
+ if (!group || !group->paths)
+ return;
+
+ /*
+* Find the path in the list of available paths
+*/
+ ecore_list_goto_first(group->paths);
+
+ while ((found = ecore_list_current(group->paths)) && strcmp(found, path))
+ ecore_list_next(group->paths);
+
+ /*
+* If the path is found, remove and free it
+*/
+ if (found)
+ {
+ ecore_list_remove(group->paths);
+ free(found);
+ }
}
/**
@@ -146,31 +146,33 @@
EAPI char *
ecore_path_group_find(int group_id, char *name)
{
- int r;
- char *p;
- struct stat st;
- char path[PATH_MAX];
- Ecore_Path_Group *group;
-
- CHECK_PARAM_POINTER_RETURN("name", name, NULL);
-
-
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_list.c
Log Message:
Formatting to 'E' format.
Note: No functional changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_list.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ecore_list.c21 Feb 2006 05:45:18 - 1.22
+++ ecore_list.c23 Jun 2006 06:40:26 - 1.23
@@ -37,12 +37,12 @@
{
Ecore_List2 *l, *new_l;
Ecore_List2 *list, *item;
-
+
list = in_list;
item = in_item;
new_l = item;
new_l->next = NULL;
- if (!list)
+ if (!list)
{
new_l->prev = NULL;
new_l->last = new_l;
@@ -61,15 +61,15 @@
{
Ecore_List2 *new_l;
Ecore_List2 *list, *item;
-
+
list = in_list;
- item = in_item;
+ item = in_item;
new_l = item;
new_l->prev = NULL;
- if (!list)
+ if (!list)
{
new_l->next = NULL;
- new_l->last = new_l;
+ new_l->last = new_l;
return new_l;
}
new_l->next = list;
@@ -84,7 +84,7 @@
{
Ecore_List2 *l;
Ecore_List2 *list, *item, *relative;
-
+
list = in_list;
item = in_item;
relative = in_relative;
@@ -93,7 +93,7 @@
if (l == relative)
{
Ecore_List2 *new_l;
-
+
new_l = item;
if (l->next)
{
@@ -117,7 +117,7 @@
{
Ecore_List2 *l;
Ecore_List2 *list, *item, *relative;
-
+
list = in_list;
item = in_item;
relative = in_relative;
@@ -126,7 +126,7 @@
if (l == relative)
{
Ecore_List2 *new_l;
-
+
new_l = item;
new_l->prev = l->prev;
new_l->next = l;
@@ -192,9 +192,9 @@
{
Ecore_List2 *l;
Ecore_List2 *list, *item;
-
+
list = in_list;
- item = in_item;
+ item = in_item;
for (l = list; l; l = l->next)
{
if (l == item) return item;
@@ -214,20 +214,22 @@
* @return A new initialized list on success, @c NULL on failure.
* @ingroup Ecore_Data_List_Creation_Group
*/
-EAPI Ecore_List *ecore_list_new()
+EAPI Ecore_List *
+ecore_list_new()
{
- Ecore_List *list;
+ Ecore_List *list;
- list = (Ecore_List *)malloc(sizeof(Ecore_List));
- if (!list)
- return NULL;
+ list = (Ecore_List *)malloc(sizeof(Ecore_List));
+ if (!list)
+ return NULL;
- if (!ecore_list_init(list)) {
- FREE(list);
- return NULL;
- }
+ if (!ecore_list_init(list))
+ {
+ FREE(list);
+ return NULL;
+ }
- return list;
+ return list;
}
/**
@@ -236,13 +238,14 @@
* @return @c TRUE if successful, @c FALSE if an error occurs.
* @ingroup Ecore_Data_List_Creation_Group
*/
-EAPI int ecore_list_init(Ecore_List *list)
+EAPI int
+ecore_list_init(Ecore_List *list)
{
- CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
+ CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- memset(list, 0, sizeof(Ecore_List));
+ memset(list, 0, sizeof(Ecore_List));
- return TRUE;
+ return TRUE;
}
/**
@@ -250,19 +253,21 @@
* @param list The list to be freed.
* @ingroup Ecore_Data_List_Creation_Group
*/
-EAPI void ecore_list_destroy(Ecore_List * list)
+EAPI void
+ecore_list_destroy(Ecore_List *list)
{
- void *data;
+ void *data;
- CHECK_PARAM_POINTER("list", list);
+ CHECK_PARAM_POINTER("list", list);
- while (list->first) {
- data = _ecore_list_remove_first(list);
- if (list->free_func)
- list->free_func(data);
- }
+ while (list->first)
+ {
+ data = _ecore_list_remove_first(list);
+ if (list->free_func)
+ list->free_func(data);
+ }
- FREE(list);
+ FREE(list);
}
/**
@@ -272,13 +277,14 @@
* @param free_func The function that will free the key data.
* @return @c TRUE on successful set, @c FALSE otherwise.
*/
-EAPI int ecore_list_set_free_cb(Ecore_List * list, Ecore_Free_Cb free_func)
+EAPI int
+ecore_list_set_free_cb(Ecore_List *list, Ecore_Free_Cb free_func)
{
- CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
+ CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- list->free_func = free_func;
+ list->free_func = free_func;
- return TRUE;
+ return TRUE;
}
/**
@@ -286,16 +292,17 @@
* @param list The list to check for nodes
* @return @c TRUE if no nodes in list, @c FALSE if the list contains nodes
*/
-EAPI int ecore_list_is_empty(Ecore_List * list)
+EAPI int
+ecore_list_is_empty(Ecore_List *list)
{
- int ret = TRUE;
+ int ret = TRUE;
- CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
+ CHECK_PARAM_POINTER_RETURN("list", list, FALSE);
- if (list->nodes)
-
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: ecore_idle_exiter.c Log Message: Formatting to 'E' format. Note: No functional changes, only formatting. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_idle_exiter.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ecore_idle_exiter.c 6 Jan 2006 17:58:12 - 1.5 +++ ecore_idle_exiter.c 23 Jun 2006 06:39:55 - 1.6 @@ -2,7 +2,7 @@ #include "Ecore.h" static Ecore_Idle_Exiter *idle_exiters = NULL; -static int idle_exiters_delete_me = 0; +static intidle_exiters_delete_me = 0; /** * Add an idle exiter handler. Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_hash.c
Log Message:
Formatting like 'E' format.
Note: No function changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_hash.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ecore_hash.c15 Feb 2006 05:06:01 - 1.25
+++ ecore_hash.c23 Jun 2006 06:39:24 - 1.26
@@ -18,7 +18,6 @@
(double)hash->nodes / (double)ecore_prime_table[hash->size-1] \
< ((double)ECORE_HASH_CHAIN_MAX * 0.375) : FALSE)
-
/* Private hash manipulation functions */
static int _ecore_hash_add_node(Ecore_Hash *hash, Ecore_Hash_Node *node);
static Ecore_Hash_Node * _ecore_hash_get_node(Ecore_Hash *hash, void *key);
@@ -26,14 +25,14 @@
static int _ecore_hash_decrease(Ecore_Hash *hash);
inline int _ecore_hash_rehash(Ecore_Hash *hash, Ecore_Hash_Node **old_table,
int old_size);
static int _ecore_hash_bucket_destroy(Ecore_Hash_Node *list, Ecore_Free_Cb
keyd,
- Ecore_Free_Cb valued);
+ Ecore_Free_Cb valued);
inline Ecore_Hash_Node * _ecore_hash_get_bucket(Ecore_Hash *hash,
- Ecore_Hash_Node *bucket, void *key);
+ Ecore_Hash_Node *bucket, void
*key);
static Ecore_Hash_Node *_ecore_hash_node_new(void *key, void *value);
static int _ecore_hash_node_init(Ecore_Hash_Node *node, void *key, void
*value);
static int _ecore_hash_node_destroy(Ecore_Hash_Node *node, Ecore_Free_Cb keyd,
- Ecore_Free_Cb valued);
+ Ecore_Free_Cb valued);
/**
* @defgroup Ecore_Data_Hash_ADT_Creation_Group Hash Creation Functions
@@ -48,18 +47,20 @@
* @return @c NULL on error, a new hash on success.
* @ingroup Ecore_Data_Hash_ADT_Creation_Group
*/
-EAPI Ecore_Hash *ecore_hash_new(Ecore_Hash_Cb hash_func, Ecore_Compare_Cb
compare)
+EAPI Ecore_Hash *
+ecore_hash_new(Ecore_Hash_Cb hash_func, Ecore_Compare_Cb compare)
{
- Ecore_Hash *new_hash = (Ecore_Hash *)malloc(sizeof(Ecore_Hash));
- if (!new_hash)
- return NULL;
-
- if (!ecore_hash_init(new_hash, hash_func, compare)) {
- FREE(new_hash);
- return NULL;
- }
+ Ecore_Hash *new_hash = (Ecore_Hash *)malloc(sizeof(Ecore_Hash));
+ if (!new_hash)
+ return NULL;
+
+ if (!ecore_hash_init(new_hash, hash_func, compare))
+ {
+ FREE(new_hash);
+ return NULL;
+ }
- return new_hash;
+ return new_hash;
}
/**
@@ -70,19 +71,20 @@
* @return @c TRUE on success, @c FALSE on an error.
* @ingroup Ecore_Data_Hash_ADT_Creation_Group
*/
-EAPI int ecore_hash_init(Ecore_Hash *hash, Ecore_Hash_Cb hash_func,
Ecore_Compare_Cb compare)
+EAPI int
+ecore_hash_init(Ecore_Hash *hash, Ecore_Hash_Cb hash_func, Ecore_Compare_Cb
compare)
{
- CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
+ CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
- memset(hash, 0, sizeof(Ecore_Hash));
+ memset(hash, 0, sizeof(Ecore_Hash));
- hash->hash_func = hash_func;
- hash->compare = compare;
+ hash->hash_func = hash_func;
+ hash->compare = compare;
- hash->buckets = (Ecore_Hash_Node **)calloc(ecore_prime_table[0],
- sizeof(Ecore_Hash_Node *));
+ hash->buckets = (Ecore_Hash_Node **)calloc(ecore_prime_table[0],
+ sizeof(Ecore_Hash_Node *));
- return TRUE;
+ return TRUE;
}
/**
@@ -98,14 +100,15 @@
* @return @c TRUE on success, @c FALSE on error.
* @ingroup Ecore_Data_Hash_ADT_Destruction_Group
*/
-EAPI int ecore_hash_set_free_key(Ecore_Hash *hash, Ecore_Free_Cb function)
+EAPI int
+ecore_hash_set_free_key(Ecore_Hash *hash, Ecore_Free_Cb function)
{
- CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
- CHECK_PARAM_POINTER_RETURN("function", function, FALSE);
+ CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
+ CHECK_PARAM_POINTER_RETURN("function", function, FALSE);
- hash->free_key = function;
+ hash->free_key = function;
- return TRUE;
+ return TRUE;
}
/**
@@ -115,14 +118,15 @@
* @return @c TRUE on success, @c FALSE on error
* @ingroup Ecore_Data_Hash_ADT_Destruction_Group
*/
-EAPI int ecore_hash_set_free_value(Ecore_Hash *hash, Ecore_Free_Cb function)
+EAPI int
+ecore_hash_set_free_value(Ecore_Hash *hash, Ecore_Free_Cb function)
{
- CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
- CHECK_PARAM_POINTER_RETURN("function", function, FALSE);
+ CHECK_PARAM_POINTER_RETURN("hash", hash, FALSE);
+ CHECK_PARAM_POINTER_RETURN("function", function, FALSE);
- hash->free_value = function;
+ hash->free_value = function;
- return TRUE;
+ retu
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_events.c
Log Message:
Format like 'E' formatting.
Note: No functional changes, only formatting.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_events.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- ecore_events.c 16 Jan 2006 03:20:35 - 1.22
+++ ecore_events.c 23 Jun 2006 06:38:52 - 1.23
@@ -108,7 +108,8 @@
return event_handler->data;
}
-static void _ecore_event_generic_free (void *data __UNUSED__, void *event)
+static void
+_ecore_event_generic_free (void *data __UNUSED__, void *event)
{
free (event);
}
@@ -157,8 +158,7 @@
{
if (!ECORE_MAGIC_CHECK(event, ECORE_MAGIC_EVENT))
{
- ECORE_MAGIC_FAIL(event, ECORE_MAGIC_EVENT,
-"ecore_event_del");
+ ECORE_MAGIC_FAIL(event, ECORE_MAGIC_EVENT, "ecore_event_del");
return NULL;
}
event->delete_me = 1;
@@ -233,8 +233,7 @@
{
if (!ECORE_MAGIC_CHECK(ef, ECORE_MAGIC_EVENT_FILTER))
{
- ECORE_MAGIC_FAIL(ef, ECORE_MAGIC_EVENT_FILTER,
-"ecore_event_filter_del");
+ ECORE_MAGIC_FAIL(ef, ECORE_MAGIC_EVENT_FILTER,
"ecore_event_filter_del");
return NULL;
}
ef->delete_me = 1;
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: Fix alignment of configure --help descriptions. === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.134 retrieving revision 1.135 diff -u -3 -r1.134 -r1.135 --- configure.in6 Apr 2006 22:44:31 - 1.134 +++ configure.in7 Apr 2006 21:47:53 - 1.135 @@ -1102,7 +1102,7 @@ use_curl="yes" AC_MSG_CHECKING(whether CURL is to be used for file download) AC_ARG_ENABLE(curl, -[ --disable-curl disable curl in the ecore_file module], +[ --disable-curldisable curl in the ecore_file module], [ if test "$enableval" = "yes"; then AC_MSG_RESULT(yes) --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore Modified Files: configure.in Log Message: Make curl support work like others by making curl enabled by default and using --disable-curl as an option. === RCS file: /cvs/e/e17/libs/ecore/configure.in,v retrieving revision 1.133 retrieving revision 1.134 diff -u -3 -r1.133 -r1.134 --- configure.in29 Mar 2006 08:00:28 - 1.133 +++ configure.in6 Apr 2006 22:44:31 - 1.134 @@ -989,7 +989,7 @@ use_fam="no" use_inotify="yes" use_poll="yes" -use_curl="no" +use_curl="yes" AC_MSG_CHECKING(whether ecore_file module is to be built) AC_ARG_ENABLE(ecore-file, @@ -1099,19 +1099,19 @@ AC_DEFINE(HAVE_POLL, 1, [ File monitoring with polling ]) fi - use_curl="no" + use_curl="yes" AC_MSG_CHECKING(whether CURL is to be used for file download) AC_ARG_ENABLE(curl, -[ --enable-curl enable curl in the ecore_file module], +[ --disable-curl disable curl in the ecore_file module], [ if test "$enableval" = "yes"; then AC_MSG_RESULT(yes) -use_curl="yes" else AC_MSG_RESULT(no) +use_curl="no" fi ], [ - AC_MSG_RESULT(no) + AC_MSG_RESULT(yes) ] ) --- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_randr.c
Log Message:
--printf
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x_randr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_x_randr.c 19 Mar 2006 11:05:59 - 1.8
+++ ecore_x_randr.c 28 Mar 2006 18:36:19 - 1.9
@@ -188,7 +188,6 @@
}
if (size_index == -1) return 0;
- printf("Size: %d\n", size_index);
sc = XRRGetScreenInfo(_ecore_x_disp, root);
if (XRRSetScreenConfigAndRate(_ecore_x_disp, sc,
root, size_index,
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_randr.c
Log Message:
--printf
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_randr.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ecore_x_randr.c 3 Feb 2006 21:42:18 - 1.7
+++ ecore_x_randr.c 19 Mar 2006 11:05:59 - 1.8
@@ -95,7 +95,6 @@
}
if (size_index == -1) return 0;
- printf("Size: %d\n", size_index);
sc = XRRGetScreenInfo(_ecore_x_disp, root);
if (XRRSetScreenConfig(_ecore_x_disp, sc,
root, size_index,
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
ecore_evas_x.c
Log Message:
Fix incorrect #ifdef. Be sure we're building XRender before trying to access
xrender structs. If the user was not building with XRender then the
build would fail here.
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- ecore_evas_x.c 9 Mar 2006 03:51:43 - 1.76
+++ ecore_evas_x.c 19 Mar 2006 11:03:57 - 1.77
@@ -357,7 +357,7 @@
}
else if (!strcmp(ee->driver, "xrender_x11"))
{
-#ifdef BUILD_ECORE_X
+#ifdef BUILD_ECORE_EVAS_XRENDER
Evas_Engine_Info_XRender_X11 *einfo;
einfo = (Evas_Engine_Info_XRender_X11 *)evas_engine_info_get(ee->evas);
---
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: ecore_exe.c Log Message: Set some defaults on the child_fd_x's just like the normal child_fd's. This fixes the error 'Bad File Descriptor: ecore_exe.c @788' that some people are getting. === RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_exe.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- ecore_exe.c 14 Feb 2006 12:54:25 - 1.54 +++ ecore_exe.c 15 Feb 2006 04:55:14 - 1.55 @@ -277,6 +277,10 @@ exe->child_fd_error = -1; exe->child_fd_read = -1; exe->child_fd_write = -1; + exe->child_fd_error_x = -1; + exe->child_fd_read_x = -1; + exe->child_fd_write_x = -1; + /* Create some pipes. */ if (ok) E_IF_NO_ERRNO_NOLOOP(result, pipe(statusPipe), ok) ; --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h
Log Message:
Some refresh rate fixes
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -3 -r1.156 -r1.157
--- Ecore_X.h 1 Feb 2006 11:24:49 - 1.156
+++ Ecore_X.h 3 Feb 2006 21:42:38 - 1.157
@@ -1421,7 +1421,7 @@
{
int rate;
};
-
+
EAPI int ecore_x_randr_events_select(Ecore_X_Window win, int
on);
EAPI Ecore_X_Screen_Size *ecore_x_randr_screen_sizes_get(Ecore_X_Window root,
int *num);
EAPI Ecore_X_Screen_Size ecore_x_randr_current_screen_size_get(Ecore_X_Window
root);
@@ -1431,8 +1431,8 @@
EAPI Ecore_X_Screen_Refresh_Rate
*ecore_x_randr_screen_refresh_rates_get(Ecore_X_Window root, int size_id, int
*num);
EAPI Ecore_X_Screen_Refresh_Rate
ecore_x_randr_current_screen_refresh_rate_get(Ecore_X_Window root);
-EAPI int ecore_x_randr_screen_refresh_rate_set(Ecore_X_Window root,
Ecore_X_Screen_Refresh_Rate rate);
-
+EAPI int ecore_x_randr_screen_refresh_rate_set(Ecore_X_Window root,
Ecore_X_Screen_Size size, Ecore_X_Screen_Refresh_Rate rate);
+
#ifdef __cplusplus
}
#endif
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_randr.c
Log Message:
Some refresh rate fixes
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_randr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_x_randr.c 25 Jan 2006 18:52:46 - 1.6
+++ ecore_x_randr.c 3 Feb 2006 21:42:18 - 1.7
@@ -171,40 +171,37 @@
}
EAPI int
-ecore_x_randr_screen_refresh_rate_set(Ecore_X_Window root,
Ecore_X_Screen_Refresh_Rate rate)
+ecore_x_randr_screen_refresh_rate_set(Ecore_X_Window root, Ecore_X_Screen_Size
size, Ecore_X_Screen_Refresh_Rate rate)
{
#ifdef ECORE_XRANDR
XRRScreenConfiguration *sc;
XRRScreenSize *sizes;
- Rotation rotation;
- SizeID size_index;
- int n;
+ int i, n, size_index = -1;
- sc = XRRGetScreenInfo(_ecore_x_disp, root);
- if (!sc)
- {
- printf("ERROR: Couldn't set screen refresh rate for %d\n", root);
- return 0;
- }
-
- size_index = XRRConfigCurrentConfiguration(sc, &rotation);
sizes = XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &n);
- if (size_index < n)
+ for (i = 0; i < n; i++)
{
- if (XRRSetScreenConfigAndRate(_ecore_x_disp, sc,
- root, size_index,
- RR_Rotate_0, rate.rate, CurrentTime))
+ if ((sizes[i].width == size.width) && (sizes[i].height == size.height))
{
-printf("ERROR: Can't set new screen size and refresh rate!\n");
-XRRFreeScreenConfigInfo(sc);
-return 0;
+size_index = i;
+break;
}
+ }
+ if (size_index == -1) return 0;
+
+ printf("Size: %d\n", size_index);
+ sc = XRRGetScreenInfo(_ecore_x_disp, root);
+ if (XRRSetScreenConfigAndRate(_ecore_x_disp, sc,
+root, size_index,
+RR_Rotate_0, rate.rate, CurrentTime))
+ {
+ printf("ERROR: Can't set new screen size and refresh rate!\n");
XRRFreeScreenConfigInfo(sc);
- return 1;
+ return 0;
}
XRRFreeScreenConfigInfo(sc);
- return 0;
+ return 1;
#else
- return 0;
+ return 1;
#endif
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_window.c
Log Message:
Remove Unused Variable
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_window.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ecore_x_window.c1 Feb 2006 11:24:49 - 1.46
+++ ecore_x_window.c3 Feb 2006 20:04:12 - 1.47
@@ -801,7 +801,7 @@
EAPI Ecore_X_Window
ecore_x_window_at_xy_begin_get(Ecore_X_Window begin, int x, int y)
{
- Ecore_X_Windowwin, root;
+ Ecore_X_Windowwin;
ecore_x_grab();
win = _ecore_x_window_at_xy_get(begin, 0, 0, x, y, NULL, 0);
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
ecore_x_randr.c
Log Message:
Remove C++ comments
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_randr.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ecore_x_randr.c 25 Jan 2006 13:29:42 - 1.5
+++ ecore_x_randr.c 25 Jan 2006 18:52:46 - 1.6
@@ -137,8 +137,6 @@
#ifdef ECORE_XRANDR
Ecore_X_Screen_Refresh_Rate *ret = NULL;
XRRScreenConfiguration *sc;
- //SizeID size_index;
- //Rotation rotation;
short *rates;
int i, n;
@@ -150,8 +148,6 @@
printf("ERROR: Couldn't get screen information for %d\n", root);
return ret;
}
-
- //size_index = XRRConfigCurrentConfiguration(sc, &rotation);
rates = XRRRates(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root),
size_id, &n);
ret = calloc(n, sizeof(Ecore_X_Screen_Refresh_Rate));
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_x
Modified Files:
Ecore_X.h ecore_x_randr.c
Log Message:
Add ecore refresh rate functions.
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -3 -r1.154 -r1.155
--- Ecore_X.h 6 Jan 2006 20:18:41 - 1.154
+++ Ecore_X.h 25 Jan 2006 13:29:42 - 1.155
@@ -1412,12 +1412,22 @@
int width, height;
};
+typedef struct _Ecore_X_Screen_Refresh_Rate Ecore_X_Screen_Refresh_Rate;
+struct _Ecore_X_Screen_Refresh_Rate
+{
+ int rate;
+};
+
EAPI int ecore_x_randr_events_select(Ecore_X_Window win, int
on);
EAPI Ecore_X_Screen_Size *ecore_x_randr_screen_sizes_get(Ecore_X_Window root,
int *num);
EAPI Ecore_X_Screen_Size ecore_x_randr_current_screen_size_get(Ecore_X_Window
root);
EAPI int ecore_x_randr_screen_size_set(Ecore_X_Window root,
Ecore_X_Screen_Size
size);
+
+EAPI Ecore_X_Screen_Refresh_Rate
*ecore_x_randr_screen_refresh_rates_get(Ecore_X_Window root, int size_id, int
*num);
+EAPI Ecore_X_Screen_Refresh_Rate
ecore_x_randr_current_screen_refresh_rate_get(Ecore_X_Window root);
+EAPI int ecore_x_randr_screen_refresh_rate_set(Ecore_X_Window root,
Ecore_X_Screen_Refresh_Rate rate);
#ifdef __cplusplus
}
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_x/ecore_x_randr.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ecore_x_randr.c 6 Jan 2006 20:22:09 - 1.4
+++ ecore_x_randr.c 25 Jan 2006 13:29:42 - 1.5
@@ -71,6 +71,7 @@
ret.width = sizes[size_index].width;
ret.height = sizes[size_index].height;
}
+ XRRFreeScreenConfigInfo(sc);
#endif
return ret;
}
@@ -93,7 +94,7 @@
}
}
if (size_index == -1) return 0;
-
+
printf("Size: %d\n", size_index);
sc = XRRGetScreenInfo(_ecore_x_disp, root);
if (XRRSetScreenConfig(_ecore_x_disp, sc,
@@ -110,3 +111,104 @@
return 0;
#endif
}
+
+EAPI Ecore_X_Screen_Refresh_Rate
+ecore_x_randr_current_screen_refresh_rate_get(Ecore_X_Window root)
+{
+ Ecore_X_Screen_Refresh_Rate ret = { -1 };
+#ifdef ECORE_XRANDR
+ XRRScreenConfiguration *sc;
+
+ sc = XRRGetScreenInfo(_ecore_x_disp, root);
+ if (!sc)
+ {
+ printf("ERROR: Couldn't get screen information for %d\n", root);
+ return ret;
+ }
+ ret.rate = XRRConfigCurrentRate(sc);
+ XRRFreeScreenConfigInfo(sc);
+#endif
+ return ret;
+}
+
+EAPI Ecore_X_Screen_Refresh_Rate *
+ecore_x_randr_screen_refresh_rates_get(Ecore_X_Window root, int size_id, int
*num)
+{
+#ifdef ECORE_XRANDR
+ Ecore_X_Screen_Refresh_Rate *ret = NULL;
+ XRRScreenConfiguration *sc;
+ //SizeID size_index;
+ //Rotation rotation;
+ short *rates;
+ int i, n;
+
+ if (num) *num = 0;
+
+ sc = XRRGetScreenInfo(_ecore_x_disp, root);
+ if (!sc)
+ {
+ printf("ERROR: Couldn't get screen information for %d\n", root);
+ return ret;
+ }
+
+ //size_index = XRRConfigCurrentConfiguration(sc, &rotation);
+
+ rates = XRRRates(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root),
size_id, &n);
+ ret = calloc(n, sizeof(Ecore_X_Screen_Refresh_Rate));
+ if (!ret)
+ {
+ XRRFreeScreenConfigInfo(sc);
+ return NULL;
+ }
+
+ if (num) *num = n;
+ for (i = 0; i < n; i++)
+ {
+ ret[i].rate = rates[i];
+ }
+ XRRFreeScreenConfigInfo(sc);
+ return ret;
+#else
+ if (num) *num = 0;
+ return NULL;
+#endif
+}
+
+EAPI int
+ecore_x_randr_screen_refresh_rate_set(Ecore_X_Window root,
Ecore_X_Screen_Refresh_Rate rate)
+{
+#ifdef ECORE_XRANDR
+ XRRScreenConfiguration *sc;
+ XRRScreenSize *sizes;
+ Rotation rotation;
+ SizeID size_index;
+ int n;
+
+ sc = XRRGetScreenInfo(_ecore_x_disp, root);
+ if (!sc)
+ {
+ printf("ERROR: Couldn't set screen refresh rate for %d\n", root);
+ return 0;
+ }
+
+ size_index = XRRConfigCurrentConfiguration(sc, &rotation);
+ sizes = XRRSizes(_ecore_x_disp, XRRRootToScreen(_ecore_x_disp, root), &n);
+ if (size_index < n)
+ {
+ if (XRRSetScreenConfigAndRate(_ecore_x_disp, sc,
+ root, size_index,
+ RR_Rotate_0, rate.rate, CurrentTime))
+ {
+printf("ERROR: Can't set new screen size and refresh rate!\n");
+XRRFreeScreenConfigInfo(sc);
+return 0;
+ }
+ XRRFreeScreenConfigInfo(sc);
+ return 1;
+ }
+ XRRFreeScreenConfigInfo(sc);
+ return 0;
+#else
+ return 0;
+#endif
+}
---
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_signal.c
Log Message:
Formatting
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_signal.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ecore_signal.c 1 Jan 2006 04:02:52 - 1.21
+++ ecore_signal.c 1 Jan 2006 04:18:38 - 1.22
@@ -214,9 +214,9 @@
else
{
if (e->exe) printf("Sending exit event for %s.\n",
e->exe->cmd);
-_ecore_event_add(ECORE_EVENT_EXE_EXIT, e,
+ _ecore_event_add(ECORE_EVENT_EXE_EXIT, e,
_ecore_event_exe_exit_free, NULL);
-}
+ }
}
}
sigchld_count--;
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_signal.c
Log Message:
Don't try to printf e->exe->cmd if e->exe doesn't exist
===
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_signal.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- ecore_signal.c 30 Dec 2005 19:17:21 - 1.20
+++ ecore_signal.c 1 Jan 2006 04:02:52 - 1.21
@@ -208,12 +208,12 @@
* check to see for Last Words, and only delay if there
are any.
* This has it's own set of problems.
*/
-printf("Delaying exit event for %s.\n", e->exe->cmd);
+ printf("Delaying exit event for %s.\n", e->exe->cmd);
ecore_timer_add(0.1, _ecore_signal_exe_exit_delay, e);
}
else
-{
-printf("Sending exit event for %s.\n", e->exe->cmd);
+ {
+ if (e->exe) printf("Sending exit event for %s.\n",
e->exe->cmd);
_ecore_event_add(ECORE_EVENT_EXE_EXIT, e,
_ecore_event_exe_exit_free, NULL);
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
