Ecore: Removed trailing whitespaces.

SVN revision: 58753
This commit is contained in:
Daniel Juyung Seo 2011-04-20 14:15:33 +00:00
parent b44bf7f8ff
commit 6ef3841a37
49 changed files with 466 additions and 466 deletions

View File

@ -137,7 +137,7 @@ ecore_init(void)
#if defined(GLIB_INTEGRATION_ALWAYS)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif
return _ecore_init_count;
shutdown_log_dom:

View File

@ -16,7 +16,7 @@ struct _Ecore_Animator
Ecore_Task_Cb func;
void *data;
double start, run;
Ecore_Timeline_Cb run_func;
void *run_data;
@ -99,13 +99,13 @@ ecore_animator_add(Ecore_Task_Cb func, const void *data)
* deleted. The callback function @p func can return ECORE_CALLBACK_RENEW to
* keep the animator running or ECORE_CALLBACK_CANCEL ro stop it and have
* it be deleted automatically at any time.
*
*
* The @p func will ALSO be passed a position parameter that will be in value
* from 0.0 to 1.0 to indicate where along the timeline (0.0 start, 1.0 end)
* the animator run is at. If the callback wishes not to have a linear
* transition it can "map" this value to one of several curves and mappings
* via ecore_animator_pos_map().
*
*
* @since 1.1.0
*/
EAPI Ecore_Animator *
@ -169,30 +169,30 @@ _pos_map_spring(double pos, int bounces, double decfac)
/**
* Maps an input position from 0.0 to 1.0 along a timeline to another position
*
*
* Takes an input position (0.0 to 1.0) and maps to a new position (normally
* between 0.0 and 1.0, but it may go above/below 0.0 or 1.0 to show that it
* has "overshot" the mark) using some interpolation (mapping) algorithm.
*
*
* You might normally use this like:
* @code
* double pos; // input position in a timeline from 0.0 to 1.0
* double out; // output position after mapping
* int x1, y1, x2, y2; // x1 & y1 are start position, x2 & y2 are end position
* int x, y; // x & y are the calculated position
*
*
* out = ecore_animator_pos_map(pos, ECORE_POS_MAP_BOUNCE, 1.8, 7);
* x = (x1 * out) + (x2 * (1.0 - out));
* y = (y1 * out) + (y2 * (1.0 - out));
* move_my_object_to(myobject, x, y);
* @endcode
*
*
* @param pos The input position to map
* @param map The mapping to use
* @param v1 A parameter use by the mapping (pass 0.0 if not used)
* @param v2 A parameter use by the mapping (pass 0.0 if not used)
* @return The mapped value
*
*
* @since 1.1.0
*/
EAPI double

View File

@ -201,7 +201,7 @@ ecore_exe_pipe_run(const char *exe_cmd, Ecore_Exe_Flags flags, const void *data)
if (exe->flags & ECORE_EXE_PIPE_READ)
if (!_ecore_exe_win32_pipes_set(exe))
goto free_exe;
if (exe->flags & ECORE_EXE_PIPE_WRITE)
if (!_ecore_exe_win32_pipes_set(exe))
goto close_pipes;
@ -685,7 +685,7 @@ _ecore_exe_win32_pipe_thread_generic_cb(void *data, Ecore_Exe_Flags flags)
exe->pipe_error.data_buf = current_buf;
exe->pipe_error.data_size = current_size;
}
event = ecore_exe_event_data_get(exe, flags);
if (event)
ecore_pipe_write(ecore_pipe, &event, sizeof(event));
@ -948,7 +948,7 @@ _ecore_exe_close_cb(void *data, Ecore_Win32_Handler *wh __UNUSED__)
ecore_event_add(ECORE_EXE_EVENT_DEL, e,
_ecore_exe_event_del_free, NULL);
return 0;
}

View File

@ -23,14 +23,14 @@ static Eina_Bool
_ecore_glib_fds_resize(size_t size)
{
void *tmp = realloc(_ecore_glib_fds, sizeof(GPollFD) * size);
if (!tmp)
{
ERR("Could not realloc from %zu to %zu buckets.",
_ecore_glib_fds_size, size);
return EINA_FALSE;
}
_ecore_glib_fds = tmp;
_ecore_glib_fds_size = size;
return EINA_TRUE;
@ -45,11 +45,11 @@ _ecore_glib_context_query(GMainContext *ctx, int priority, int *p_timer)
{
if (!_ecore_glib_fds_resize(ECORE_GLIB_FDS_INITIAL)) return -1;
}
while (1)
{
size_t size;
reqfds = g_main_context_query
(ctx, priority, p_timer, _ecore_glib_fds, _ecore_glib_fds_size);
if (reqfds <= (int)_ecore_glib_fds_size) break;
@ -74,7 +74,7 @@ _ecore_glib_context_poll_from(const GPollFD *pfds, int count, fd_set *rfds, fd_s
{
const GPollFD *itr = pfds, *itr_end = pfds + count;
int glib_fds = -1;
for (; itr < itr_end; itr++)
{
if (glib_fds < itr->fd)
@ -95,7 +95,7 @@ static int
_ecore_glib_context_poll_to(GPollFD *pfds, int count, const fd_set *rfds, const fd_set *wfds, const fd_set *efds, int ready)
{
GPollFD *itr = pfds, *itr_end = pfds + count;
for (; itr < itr_end && ready > 0; itr++)
{
itr->revents = 0;
@ -137,7 +137,7 @@ _ecore_glib_select__locked(GMainContext *ctx, int ecore_fds, fd_set *rfds, fd_se
{
glib_timeout.tv_sec = reqtimeout / 1000;
glib_timeout.tv_usec = (reqtimeout % 1000) * 1000;
if (!ecore_timeout || timercmp(ecore_timeout, &glib_timeout, >))
timeout = &glib_timeout;
else
@ -203,7 +203,7 @@ _ecore_glib_shutdown(void)
if (ecore_main_loop_select_func_get() == _ecore_glib_select)
ecore_main_loop_select_func_set(_ecore_glib_select_original);
if (_ecore_glib_fds)
{
free(_ecore_glib_fds);
@ -284,7 +284,7 @@ Eina_Bool _ecore_glib_always_integrate = 1;
/**
* Disable always integrating glib
*
*
* If ecore is compiled with --enable-glib-integration-always (to always
* call ecore_main_loop_glib_integrate() when ecore_init() is called), then
* calling this before calling ecore_init() will disable the integration.

View File

@ -63,7 +63,7 @@ EAPI Ecore_Job *
ecore_job_add(Ecore_Cb func, const void *data)
{
Ecore_Job *job;
if (!func) return NULL;
job = calloc(1, sizeof(Ecore_Job));
@ -89,7 +89,7 @@ EAPI void *
ecore_job_del(Ecore_Job *job)
{
void *data;
if (!ECORE_MAGIC_CHECK(job, ECORE_MAGIC_JOB))
{
ECORE_MAGIC_FAIL(job, ECORE_MAGIC_JOB,
@ -114,7 +114,7 @@ static Eina_Bool
_ecore_job_event_handler(void *data __UNUSED__, int type __UNUSED__, void *ev)
{
Ecore_Job *job;
job = ev;
job->func(job->data);
return ECORE_CALLBACK_CANCEL;

View File

@ -409,7 +409,7 @@ ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes)
}
if (p->delete_me) return EINA_FALSE;
if (p->fd_write == PIPE_FD_INVALID) return EINA_FALSE;
/* First write the len into the pipe */
@ -454,7 +454,7 @@ ecore_pipe_write(Ecore_Pipe *p, const void *buffer, unsigned int nbytes)
ret = pipe_write(p->fd_write,
((unsigned char *)buffer) + already_written,
nbytes - already_written);
if (ret == (ssize_t)(nbytes - already_written))
return EINA_TRUE;
else if (ret >= 0)
@ -511,7 +511,7 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
p = (Ecore_Pipe *)data;
start_time = ecore_time_get();
p->handling++;
for (i = 0; i < 16; i++)
{
@ -547,7 +547,7 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
return ECORE_CALLBACK_CANCEL;
}
#ifndef _WIN32
else if ((ret == PIPE_FD_ERROR) &&
else if ((ret == PIPE_FD_ERROR) &&
((errno == EINTR) || (errno == EAGAIN)))
{
_ecore_pipe_unhandle(p);
@ -585,7 +585,7 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
ret = pipe_read(p->fd_read,
((unsigned char *)p->passed_data) + p->already_read,
p->len - p->already_read);
/* catch the non error case first */
if (ret == (ssize_t)(p->len - p->already_read))
{
@ -614,7 +614,7 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
return ECORE_CALLBACK_CANCEL;
}
#ifndef _WIN32
else if ((ret == PIPE_FD_ERROR) &&
else if ((ret == PIPE_FD_ERROR) &&
((errno == EINTR) || (errno == EAGAIN)))
return ECORE_CALLBACK_RENEW;
else
@ -643,7 +643,7 @@ _ecore_pipe_read(void *data, Ecore_Fd_Handler *fd_handler __UNUSED__)
}
#endif
}
_ecore_pipe_unhandle(p);
return ECORE_CALLBACK_RENEW;
}

View File

@ -168,7 +168,7 @@ typedef struct
LONG readers_count;
LONG writers_count;
int readers;
int writers;
int writers;
LK(mutex);
CD(cond_read);
CD(cond_write);

View File

@ -180,7 +180,7 @@ ecore_con_shutdown(void)
{
Eina_List *l, *l2;
Ecore_Con_Server *svr;
if (--_ecore_con_init_count != 0)
return _ecore_con_init_count;
@ -1194,10 +1194,10 @@ void
ecore_con_event_server_data(Ecore_Con_Server *svr, unsigned char *buf, int num)
{
Ecore_Con_Event_Server_Data *e;
e = malloc(sizeof(Ecore_Con_Event_Server_Data));
EINA_SAFETY_ON_NULL_RETURN(e);
svr->event_count++;
e->server = svr;
e->data = malloc(num);
@ -1438,7 +1438,7 @@ _ecore_con_server_kill(Ecore_Con_Server *svr)
{
if (!svr->delete_me)
ecore_con_event_server_del(svr);
svr->dead = EINA_TRUE;
if (svr->fd_handler)
ecore_main_fd_handler_del(svr->fd_handler);
@ -1514,13 +1514,13 @@ _ecore_con_cb_tcp_listen(void *data,
ecore_con_event_server_error(svr, strerror(errno));
goto error;
}
if (fcntl(svr->fd, F_SETFD, FD_CLOEXEC) < 0)
{
ecore_con_event_server_error(svr, strerror(errno));
goto error;
}
lin.l_onoff = 1;
lin.l_linger = 0;
if (setsockopt(svr->fd, SOL_SOCKET, SO_LINGER, (const void *)&lin,
@ -1529,7 +1529,7 @@ _ecore_con_cb_tcp_listen(void *data,
ecore_con_event_server_error(svr, strerror(errno));
goto error;
}
if ((svr->type & ECORE_CON_TYPE) == ECORE_CON_REMOTE_NODELAY)
{
int flag = 1;
@ -2001,13 +2001,13 @@ _ecore_con_svr_tcp_handler(void *data,
}
cl->client_addr_len = client_addr_len;
memcpy(cl->client_addr, &client_addr, client_addr_len);
svr->clients = eina_list_append(svr->clients, cl);
svr->client_count++;
if ((!cl->delete_me) && (!cl->handshaking))
ecore_con_event_client_add(cl);
return ECORE_CALLBACK_RENEW;
error:
@ -2038,7 +2038,7 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
if (!ecore_con_ssl_server_init(svr))
lost_server = EINA_FALSE;
}
if (!(svr->type & ECORE_CON_SSL))
{
num = read(svr->fd, buf, sizeof(buf));
@ -2055,7 +2055,7 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
if (num >= 0)
lost_server = EINA_FALSE;
}
if ((!svr->delete_me) && (num > 0))
ecore_con_event_server_data(svr, buf, num);
@ -2564,7 +2564,7 @@ _ecore_con_event_client_error_free(Ecore_Con_Server *svr, Ecore_Con_Event_Client
_ecore_con_server_free(svr);
if (e->error) free(e->error);
free(e);
}
static void

View File

@ -78,7 +78,7 @@ int
ecore_con_info_init(void)
{
struct ares_options opts;
if (!info_init)
{
if (ares_library_init(ARES_LIB_INIT_ALL))
@ -336,7 +336,7 @@ _ecore_con_info_cares_fd_cb(Ecore_Con_FD *ecf,
read = ecf->fd;
if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE))
write = ecf->fd;
ares_process_fd(info_channel, read, write);
return ECORE_CALLBACK_RENEW;

View File

@ -49,9 +49,9 @@ static void
_gnutls_print_errors(void *conn, int type, int ret)
{
char buf[1024];
if (!ret) return;
snprintf(buf, sizeof(buf), "GNUTLS error: %s - %s", gnutls_strerror_name(ret), gnutls_strerror(ret));
if (type == ECORE_CON_EVENT_CLIENT_ERROR)
ecore_con_event_client_error(conn, buf);
@ -129,7 +129,7 @@ _openssl_print_errors(void *conn, int type)
ecore_con_event_client_error(conn, buf);
else
ecore_con_event_server_error(conn, buf);
} while (1);
}

View File

@ -445,17 +445,17 @@ ecore_con_url_free(Ecore_Con_Url *url_con)
// FIXME: For an unknown reason, progress continue to arrive after destruction
// this prevent any further call to the callback.
curl_easy_setopt(url_con->curl_easy, CURLOPT_PROGRESSFUNCTION, NULL);
if (url_con->active)
{
url_con->active = EINA_FALSE;
ret = curl_multi_remove_handle(_curlm, url_con->curl_easy);
if (ret != CURLM_OK)
ERR("curl_multi_remove_handle failed: %s",
curl_multi_strerror(ret));
}
curl_easy_cleanup(url_con->curl_easy);
}
@ -876,12 +876,12 @@ _ecore_con_url_send(Ecore_Con_Url *url_con,
snprintf(tmp, sizeof(tmp), "Content-Type: %s", content_type);
url_con->headers = curl_slist_append(url_con->headers, tmp);
}
curl_easy_setopt(url_con->curl_easy, CURLOPT_POSTFIELDS, data);
curl_easy_setopt(url_con->curl_easy, CURLOPT_POSTFIELDSIZE, length);
}
}
switch (url_con->time_condition)
{
case ECORE_CON_URL_TIME_NONE:
@ -957,7 +957,7 @@ ecore_con_url_send(Ecore_Con_Url *url_con,
* Sends a get request.
*
* @param url_con Connection object to perform a request on, previously created
*
*
* @return #EINA_TRUE on success, #EINA_FALSE on error.
*
* @see ecore_con_url_custom_new()
@ -1471,19 +1471,19 @@ ecore_con_url_ssl_verify_peer_set(Ecore_Con_Url *url_con,
/**
* Set a custom CA to trust for SSL/TLS connections.
*
*
* Specify the path of a file (in PEM format) containing one or more
* CA certificate(s) to use for the validation of the server certificate.
*
*
* This function can also disable CA validation if @p ca_path is @c NULL.
* However, the server certificate still needs to be valid for the connection
* to succeed (i.e., the certificate must concern the server the
* connection is made to).
*
*
* @param url_con Connection object that will use the custom CA.
* @param ca_path Path to a CA certificate(s) file or @c NULL to disable
* CA validation.
*
*
* @return @c 0 on success. When cURL is used, non-zero return values
* are equal to cURL error codes.
*/

View File

@ -205,7 +205,7 @@ _ecore_config_int_get(Ecore_Config_Prop *e)
/**
* Returns the specified property as a float.
* @param key The property key.
* @return The float value of the property. The function returns 0.0 if the
* @return The float value of the property. The function returns 0.0 if the
* property is not a float or is not set.
* @ingroup Ecore_Config_Get_Group
*/
@ -1185,7 +1185,7 @@ _ecore_config_struct_typed_add(const char *key, const char *name, const void *va
ret = _ecore_config_struct_append(ecore_config_get(key),
ecore_config_get(subkey));
free(subkey);
return ret;
return ret;
}
/**
@ -1250,7 +1250,7 @@ ecore_config_struct_argb_add(const char *key, const char *name, int a, int r,
int g, int b)
{
long argb;
__ecore_argb_to_long(a, r, g, b, &argb);
return _ecore_config_struct_typed_add(key, name, &argb, ECORE_CONFIG_RGB);
}
@ -1451,7 +1451,7 @@ ecore_config_deaf(const char *name, const char *key,
for (p = NULL, l = e->listeners; l; p = l)
{
Ecore_Config_Listener_List *nl;
nl = l->next;
if ((name && !strcmp(l->name, name)) || (l->listener == listener))
{
@ -1672,7 +1672,7 @@ ecore_config_init(const char *name)
Ecore_Config_Prop *list;
_ecore_config_log_dom = eina_log_domain_register
("ecore_config", ECORE_CONFIG_DEFAULT_LOG_COLOR);
if(_ecore_config_log_dom < 0)
if(_ecore_config_log_dom < 0)
{
EINA_LOG_ERR("Impossible to create a log domain for the Ecore config module.");
return -1;
@ -1769,7 +1769,7 @@ _ecore_config_system_init_no_load(void)
/* set up a simple default path */
ecore_config_string_default("/e/themes/search_path", PACKAGE_DATA_DIR "../ewl/themes");
return ECORE_CONFIG_ERR_SUCC;
}
@ -1789,7 +1789,7 @@ _ecore_config_system_load(void)
{
snprintf(buf, PATH_MAX, "%s/.e/config.eet", p);
if (ecore_config_file_load(buf) != 0) {
/* even if this file (system.eet) doesn't exist we can
/* even if this file (system.eet) doesn't exist we can
* continue without it as it isn't striclty necessary.
*/
ecore_config_file_load(PACKAGE_DATA_DIR "/system.eet");

View File

@ -29,7 +29,7 @@ _ecore_config_db_open_read(const char *file)
{
Eet_File *ef;
Ecore_Config_DB_File *db;
eet_init();
db = malloc(sizeof(Ecore_Config_DB_File));
if (!db) return NULL;
@ -48,7 +48,7 @@ _ecore_config_db_open_write(const char *file)
{
Eet_File *ef;
Ecore_Config_DB_File *db;
eet_init();
db = malloc(sizeof(Ecore_Config_DB_File));
if (!db) return NULL;
@ -76,7 +76,7 @@ _ecore_config_db_keys_get(Ecore_Config_DB_File *db, int *num_ret)
char **keys;
int key_count;
int i;
keys = eet_list(db->ef, (char*)"*", &key_count);
if (!keys)
{
@ -94,7 +94,7 @@ _ecore_config_db_key_type_get(Ecore_Config_DB_File *db, const char *key)
{
char *data;
int size;
data = eet_read(db->ef, (char*)key, &size);
if (data)
{
@ -119,7 +119,7 @@ _ecore_config_db_read(Ecore_Config_DB_File *db, const char *key)
char *data, *value;
int size;
Ecore_Config_Type type;
data = eet_read(db->ef, (char*)key, &size);
if (data)
{
@ -143,11 +143,11 @@ _ecore_config_db_read(Ecore_Config_DB_File *db, const char *key)
free(data);
return 0;
}
type = data[0];
value = data + l + 1;
switch (type)
switch (type)
{
case ECORE_CONFIG_INT:
case ECORE_CONFIG_BLN:
@ -166,7 +166,7 @@ _ecore_config_db_read(Ecore_Config_DB_File *db, const char *key)
prev_locale = setlocale(LC_NUMERIC, "C");
tmp = atof(value);
if (prev_locale) setlocale(LC_NUMERIC, prev_locale);
ecore_config_typed_set(key, (void *)&tmp, type);
break;
}
@ -195,13 +195,13 @@ _ecore_config_db_key_data_get(Ecore_Config_DB_File *db, const char *key, int *si
{
char *data;
int size;
data = eet_read(db->ef, (char*)key, &size);
if (data)
{
int l;
char *dat;
if (size <= 2)
{
free(data);
@ -235,10 +235,10 @@ _ecore_config_db_write(Ecore_Config_DB_File *db, Ecore_Config_Prop *e)
char *val = NULL;
char *r = NULL;
int num;
prev_locale = setlocale(LC_NUMERIC, "C");
switch (e->type)
switch (e->type)
{
case ECORE_CONFIG_INT:
esprintf(&val, "%i", _ecore_config_int_get(e));
@ -249,7 +249,7 @@ _ecore_config_db_write(Ecore_Config_DB_File *db, Ecore_Config_Prop *e)
case ECORE_CONFIG_FLT:
esprintf(&val, "%16.16f", _ecore_config_float_get(e));
break;
case ECORE_CONFIG_STR:
case ECORE_CONFIG_STR:
val = _ecore_config_string_get(e);
break;
case ECORE_CONFIG_THM:
@ -266,7 +266,7 @@ _ecore_config_db_write(Ecore_Config_DB_File *db, Ecore_Config_Prop *e)
{
setlocale(LC_NUMERIC, prev_locale);
}
if(val)
{
num = esprintf(&r, "%c%c%s%c", (char) e->type, 0, val, 0);
@ -283,7 +283,7 @@ _ecore_config_db_key_data_set(Ecore_Config_DB_File *db, const char *key, void *d
{
char *buf;
int num;
num = 1 + 1 + data_size + 1;
buf = malloc(num);
if (!buf) return;

View File

@ -403,7 +403,7 @@ ecore_config_theme_search_path_get(void)
* should be called @b after @ref ecore_config_load to allow a user to
* override the default search path.
*
* @param path The given
* @param path The given
* @return @c ECORE_CONFIG_ERR_SUCC on success. @c ECORE_CONFIG_ERR_FAIL
* will be returned if @p path already exists in the search path.
* @c ECORE_CONFIG_ERR_FAIL is returned if @p path is @c NULL.
@ -422,8 +422,8 @@ ecore_config_theme_search_path_append(const char *path)
loc = strstr(search_path, path);
len = strlen(path);
search_len = strlen(search_path);
if (!loc || (loc != search_path && *(loc - 1) != '|') ||
if (!loc || (loc != search_path && *(loc - 1) != '|') ||
(loc != (search_path + search_len - len) && *(loc + len - 1) != '|'))
{
new_search_path = malloc(search_len + len + 2); /* 2 = \0 + | */
@ -477,9 +477,9 @@ ecore_config_theme_with_path_from_name_get(char *name)
file = malloc(strlen(search_path_tmp) + strlen(name) + 6);
/* 6 = / + .edj + \0 */
snprintf(file, strlen(search_path_tmp) + strlen(name) + 6,
snprintf(file, strlen(search_path_tmp) + strlen(name) + 6,
"%s/%s.edj", search_path_tmp, name);
if (stat(file, &st) == 0)
{
free(search_path);
@ -582,7 +582,7 @@ ecore_config_parse_set(Ecore_Config_Prop * prop, char *arg, char *opt,
{
ecore_config_set(prop->key, arg);
prop->flags |= ECORE_CONFIG_FLAG_CMDLN;
}
}
return ECORE_CONFIG_PARSE_CONTINUE;
}
@ -689,7 +689,7 @@ ecore_config_args_parse(void)
callback = _ecore_config_arg_callbacks;
while (callback)
{
if ((callback->long_opt &&
if ((callback->long_opt &&
!strcmp(long_opt, callback->long_opt)))
{
found = 1;
@ -697,7 +697,7 @@ ecore_config_args_parse(void)
{
callback->func(NULL, callback->data);
}
else
else
{
if (!argv[++nextarg])
{

View File

@ -57,7 +57,7 @@ _ecore_config_ipc_global_prop_list(Ecore_Config_Server * srv __UNUSED__, long se
int key_count, x;
estring *s;
int f;
char buf[PATH_MAX], *p;
char buf[PATH_MAX], *p;
// char *data; UNUSED
Ecore_Config_Type type;
@ -121,7 +121,7 @@ _ecore_config_ipc_global_prop_list(Ecore_Config_Server * srv __UNUSED__, long se
}
free(keys);
}
return estring_disown(s);
}

View File

@ -269,7 +269,7 @@ _ecore_config_ipc_init(const char *pipe_name)
if (!ipc_timer)
ipc_timer = ecore_timer_add(100, _ecore_config_ipc_poll, NULL);
return ret_srv;
}
/*****************************************************************************/

View File

@ -83,7 +83,7 @@ ecore_config_file_load(const char *file)
ERR("Cannot open database from file %s!", file);
return ECORE_CONFIG_ERR_NODATA;
}
key_count = 0;
key_count = 0;
keys = _ecore_config_db_keys_get(db, &key_count);
if (keys)
{

View File

@ -33,7 +33,7 @@ _ecore_evas_idle_enter(void *data __UNUSED__)
double t1 = 0.0;
double t2 = 0.0;
int rend = 0;
if (!ecore_evases) return ECORE_CALLBACK_RENEW;
if (_ecore_evas_fps_debug)
{
@ -225,12 +225,12 @@ ecore_evas_init(void)
ECORE_FD_READ,
_ecore_evas_async_events_fd_handler, NULL,
NULL, NULL);
ecore_evas_idle_enterer =
ecore_evas_idle_enterer =
ecore_idle_enterer_add(_ecore_evas_idle_enter, NULL);
if (getenv("ECORE_EVAS_FPS_DEBUG")) _ecore_evas_fps_debug = 1;
if (_ecore_evas_fps_debug) _ecore_evas_fps_debug_init();
return _ecore_evas_init_count;
shutdown_ecore:
@ -2491,7 +2491,7 @@ ecore_evas_withdrawn_set(Ecore_Evas *ee, Eina_Bool withdrawn)
"ecore_evas_withdrawn_set");
return;
}
IFC(ee, fn_withdrawn_set) (ee, withdrawn);
IFE;
}
@ -2530,7 +2530,7 @@ ecore_evas_sticky_set(Ecore_Evas *ee, Eina_Bool sticky)
"ecore_evas_sticky_set");
return;
}
IFC(ee, fn_sticky_set) (ee, sticky);
IFE;
}
@ -2570,7 +2570,7 @@ ecore_evas_ignore_events_set(Ecore_Evas *ee, Eina_Bool ignore)
"ecore_evas_ignore_events_set");
return;
}
IFC(ee, fn_ignore_events_set) (ee, ignore);
IFE;
}
@ -2883,7 +2883,7 @@ _ecore_evas_mouse_move_process(Ecore_Evas *ee, int x, int y, unsigned int timest
void
_ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
int x, int y,
int x, int y,
double radius,
double radius_x, double radius_y,
double pressure,
@ -2893,28 +2893,28 @@ _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
{
if (ee->rotation == 0)
evas_event_feed_multi_move(ee->evas, device,
x, y,
x, y,
radius,
radius_x, radius_y,
pressure,
pressure,
angle - ee->rotation,
mx, my,
timestamp, NULL);
else if (ee->rotation == 90)
evas_event_feed_multi_move(ee->evas, device,
ee->h - y - 1, x,
ee->h - y - 1, x,
radius,
radius_y, radius_x,
pressure,
pressure,
angle - ee->rotation,
ee->h - my - 1, mx,
timestamp, NULL);
else if (ee->rotation == 180)
evas_event_feed_multi_move(ee->evas, device,
ee->w - x - 1, ee->h - y - 1,
ee->w - x - 1, ee->h - y - 1,
radius,
radius_x, radius_y,
pressure,
pressure,
angle - ee->rotation,
ee->w - mx - 1, ee->h - my - 1,
timestamp, NULL);
@ -2923,7 +2923,7 @@ _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
y, ee->w - x - 1,
radius,
radius_y, radius_x,
pressure,
pressure,
angle - ee->rotation,
my, ee->w - mx - 1,
timestamp, NULL);
@ -2931,7 +2931,7 @@ _ecore_evas_mouse_multi_move_process(Ecore_Evas *ee, int device,
void
_ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
int x, int y,
int x, int y,
double radius,
double radius_x, double radius_y,
double pressure,
@ -2942,28 +2942,28 @@ _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
{
if (ee->rotation == 0)
evas_event_feed_multi_down(ee->evas, device,
x, y,
x, y,
radius,
radius_x, radius_y,
pressure,
pressure,
angle - ee->rotation,
mx, my,
flags, timestamp, NULL);
else if (ee->rotation == 90)
evas_event_feed_multi_down(ee->evas, device,
ee->h - y - 1, x,
ee->h - y - 1, x,
radius,
radius_y, radius_x,
pressure,
pressure,
angle - ee->rotation,
ee->h - my - 1, mx,
flags, timestamp, NULL);
else if (ee->rotation == 180)
evas_event_feed_multi_down(ee->evas, device,
ee->w - x - 1, ee->h - y - 1,
ee->w - x - 1, ee->h - y - 1,
radius,
radius_x, radius_y,
pressure,
pressure,
angle - ee->rotation,
ee->w - mx - 1, ee->h - my - 1,
flags, timestamp, NULL);
@ -2972,7 +2972,7 @@ _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
y, ee->w - x - 1,
radius,
radius_y, radius_x,
pressure,
pressure,
angle - ee->rotation,
my, ee->w - mx - 1,
flags, timestamp, NULL);
@ -2980,7 +2980,7 @@ _ecore_evas_mouse_multi_down_process(Ecore_Evas *ee, int device,
void
_ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
int x, int y,
int x, int y,
double radius,
double radius_x, double radius_y,
double pressure,
@ -2991,28 +2991,28 @@ _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
{
if (ee->rotation == 0)
evas_event_feed_multi_up(ee->evas, device,
x, y,
x, y,
radius,
radius_x, radius_y,
pressure,
pressure,
angle - ee->rotation,
mx, my,
flags, timestamp, NULL);
else if (ee->rotation == 90)
evas_event_feed_multi_up(ee->evas, device,
ee->h - y - 1, x,
ee->h - y - 1, x,
radius,
radius_y, radius_x,
pressure,
pressure,
angle - ee->rotation,
ee->h - my - 1, mx,
flags, timestamp, NULL);
else if (ee->rotation == 180)
evas_event_feed_multi_up(ee->evas, device,
ee->w - x - 1, ee->h - y - 1,
ee->w - x - 1, ee->h - y - 1,
radius,
radius_x, radius_y,
pressure,
pressure,
angle - ee->rotation,
ee->w - mx - 1, ee->h - my - 1,
flags, timestamp, NULL);
@ -3021,7 +3021,7 @@ _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
y, ee->w - x - 1,
radius,
radius_y, radius_x,
pressure,
pressure,
angle - ee->rotation,
my, ee->w - mx - 1,
flags, timestamp, NULL);
@ -3029,7 +3029,7 @@ _ecore_evas_mouse_multi_up_process(Ecore_Evas *ee, int device,
/**
* Get a list of all the ecore_evases.
*
*
* The returned list of ecore evases is only valid until the canvases are
* destroyed (and should not be cached for instance).
* The list can be free by just deleting the list.
@ -3041,11 +3041,11 @@ ecore_evas_ecore_evas_list_get(void)
{
Ecore_Evas *ee;
Eina_List *l = NULL;
EINA_INLIST_FOREACH(ecore_evases, ee)
{
l = eina_list_append(l, ee);
}
return l;
}

View File

@ -32,7 +32,7 @@ _ecore_evas_buffer_free(Ecore_Evas *ee)
}
else
{
ee->engine.buffer.free_func(ee->engine.buffer.data,
ee->engine.buffer.free_func(ee->engine.buffer.data,
ee->engine.buffer.pixels);
}
_ecore_evas_buffer_shutdown();
@ -63,7 +63,7 @@ _ecore_evas_resize(Ecore_Evas *ee, int w, int h)
if (ee->engine.buffer.pixels)
ee->engine.buffer.free_func(ee->engine.buffer.data,
ee->engine.buffer.pixels);
ee->engine.buffer.pixels =
ee->engine.buffer.pixels =
ee->engine.buffer.alloc_func(ee->engine.buffer.data,
ee->w * ee->h * sizeof(int));
stride = ee->w * sizeof(int);
@ -147,7 +147,7 @@ _ecore_evas_buffer_coord_translate(Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y)
if (fw < 1) fw = 1;
if (fh < 1) fh = 1;
if ((fx == 0) && (fy == 0) && (fw == ww) && (fh == hh))
{
*x = (ee->w * (*x - xx)) / fw;
@ -159,7 +159,7 @@ _ecore_evas_buffer_coord_translate(Ecore_Evas *ee, Evas_Coord *x, Evas_Coord *y)
while (xx < 0) xx += fw;
while (xx > fw) xx -= fw;
*x = (ee->w * xx) / fw;
yy = (*y - yy) - fy;
while (yy < 0) yy += fh;
while (yy > fh) yy -= fh;
@ -490,7 +490,7 @@ static Ecore_Evas_Engine_Func _ecore_buffer_engine_func =
NULL,
NULL,
NULL, //transparent
NULL // render
};
#endif
@ -569,7 +569,7 @@ ecore_evas_buffer_allocfunc_new(int w, int h, void *(*alloc_func) (void *data, i
evas_output_size_set(ee->evas, w, h);
evas_output_viewport_set(ee->evas, 0, 0, w, h);
ee->engine.buffer.pixels =
ee->engine.buffer.pixels =
ee->engine.buffer.alloc_func
(ee->engine.buffer.data, w * h * sizeof(int));
@ -602,7 +602,7 @@ ecore_evas_buffer_allocfunc_new(int w, int h, void *(*alloc_func) (void *data, i
ee->engine.func->fn_render = _ecore_evas_buffer_render;
_ecore_evas_register(ee);
return ee;
#else
return NULL;
@ -655,7 +655,7 @@ ecore_evas_object_image_new(Ecore_Evas *ee_target)
o = evas_object_image_add(ee_target->evas);
evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
ECORE_MAGIC_SET(ee, ECORE_MAGIC_EVAS);
_ecore_evas_buffer_init();
@ -770,9 +770,9 @@ ecore_evas_object_image_new(Ecore_Evas *ee_target)
evas_key_lock_add(ee->evas, "Scroll_Lock");
ee_target->sub_ecore_evas = eina_list_append(ee_target->sub_ecore_evas, ee);
ee->engine.func->fn_render = _ecore_evas_buffer_render;
return o;
#else
return NULL;

View File

@ -69,7 +69,7 @@ static Ecore_Evas *
_ecore_evas_directfb_match(DFBWindowID win)
{
Ecore_Evas *ee;
ee = eina_hash_find(ecore_evases_hash, _ecore_evas_directfb_winid_str_get(win));
return ee;
}
@ -485,7 +485,7 @@ static Ecore_Evas_Engine_Func _ecore_directfb_engine_func =
NULL, /* ignore events */
NULL, /* alpha */
NULL, //transparent
NULL // render
};
#endif
@ -546,10 +546,10 @@ ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w
ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
}
}
ee->engine.func->fn_render = _ecore_evas_directfb_render;
_ecore_evas_register(ee);
if (!ecore_evases_hash)
ecore_evases_hash = eina_hash_string_superfast_new(NULL);
eina_hash_add(ecore_evases_hash, _ecore_evas_directfb_winid_str_get(ee->engine.directfb.window->id), ee);

View File

@ -87,10 +87,10 @@ _ecore_evas_fb_gain(void *data __UNUSED__)
Eina_List *ll;
Ecore_Fb_Input_Device *dev;
if (fb_ee)
if (fb_ee)
{
ee = fb_ee;
ee->visible = 1;
if ((ee->rotation == 90) || (ee->rotation == 270))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w);
@ -290,7 +290,7 @@ _ecore_evas_fb_init(int w, int h)
}
}
closedir(input_dir);
if (!mouse_handled)