diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c index ff17209297..3e33e95fcd 100644 --- a/legacy/ecore/src/lib/ecore/ecore.c +++ b/legacy/ecore/src/lib/ecore/ecore.c @@ -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: diff --git a/legacy/ecore/src/lib/ecore/ecore_anim.c b/legacy/ecore/src/lib/ecore/ecore_anim.c index 87fa52a7e1..42f16017be 100644 --- a/legacy/ecore/src/lib/ecore/ecore_anim.c +++ b/legacy/ecore/src/lib/ecore/ecore_anim.c @@ -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 diff --git a/legacy/ecore/src/lib/ecore/ecore_exe_win32.c b/legacy/ecore/src/lib/ecore/ecore_exe_win32.c index 7f4435a80c..2d5f535230 100644 --- a/legacy/ecore/src/lib/ecore/ecore_exe_win32.c +++ b/legacy/ecore/src/lib/ecore/ecore_exe_win32.c @@ -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; } diff --git a/legacy/ecore/src/lib/ecore/ecore_glib.c b/legacy/ecore/src/lib/ecore/ecore_glib.c index 739c05a26e..64440e502f 100644 --- a/legacy/ecore/src/lib/ecore/ecore_glib.c +++ b/legacy/ecore/src/lib/ecore/ecore_glib.c @@ -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. diff --git a/legacy/ecore/src/lib/ecore/ecore_job.c b/legacy/ecore/src/lib/ecore/ecore_job.c index c9de10a8c1..0ab34ce940 100644 --- a/legacy/ecore/src/lib/ecore/ecore_job.c +++ b/legacy/ecore/src/lib/ecore/ecore_job.c @@ -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; diff --git a/legacy/ecore/src/lib/ecore/ecore_pipe.c b/legacy/ecore/src/lib/ecore/ecore_pipe.c index ad537a6b1d..bd6efa193f 100644 --- a/legacy/ecore/src/lib/ecore/ecore_pipe.c +++ b/legacy/ecore/src/lib/ecore/ecore_pipe.c @@ -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; } diff --git a/legacy/ecore/src/lib/ecore/ecore_thread.c b/legacy/ecore/src/lib/ecore/ecore_thread.c index 4dc7381c7e..717b14efb4 100644 --- a/legacy/ecore/src/lib/ecore/ecore_thread.c +++ b/legacy/ecore/src/lib/ecore/ecore_thread.c @@ -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); diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c index 31315519e7..611c59f497 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c @@ -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 diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c b/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c index 2dac118721..1335e390f4 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_ares.c @@ -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; diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c index b36a74b7d2..cede4f5079 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_ssl.c @@ -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); } diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c index 04b3227fb2..074b6ceede 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c @@ -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. */ diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config.c b/legacy/ecore/src/lib/ecore_config/ecore_config.c index d8b587e9b6..e81538eb62 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config.c @@ -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"); diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_db.c b/legacy/ecore/src/lib/ecore_config/ecore_config_db.c index 458aae3728..6238958aa1 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_db.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_db.c @@ -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; diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c b/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c index 6d47c8175b..a134952ee8 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_extra.c @@ -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]) { diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c index 688e3d788c..b1622f3992 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_ecore.c @@ -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); } diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c index a8ecdc6e63..35bd7835ae 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_ipc_main.c @@ -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; } /*****************************************************************************/ diff --git a/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c b/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c index b9034f3be2..d059645bc0 100644 --- a/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c +++ b/legacy/ecore/src/lib/ecore_config/ecore_config_storage.c @@ -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) { diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c index 56e165ea85..9779f65e6f 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c @@ -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; } diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c index 2103dcd9d4..6da3bc22d0 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c @@ -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; diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c index 7bea20ebe5..2f4b612d33 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c @@ -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); diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c index df9f70f1a3..32d74f0722 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c @@ -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) { if (ecore_fb_ts_init()) @@ -571,7 +571,7 @@ static Ecore_Evas_Engine_Func _ecore_fb_engine_func = NULL, NULL, NULL, //transparent - + NULL // render }; #endif @@ -670,7 +670,7 @@ ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h) ee->engine.func->fn_render = _ecore_evas_buffer_render; _ecore_evas_register(ee); fb_ee = ee; - + evas_event_feed_mouse_in(ee->evas, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL); evas_focus_in(ee->evas); diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c index 1d08322084..525b5787ec 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_sdl.c @@ -163,10 +163,10 @@ _ecore_evas_sdl_init(int w __UNUSED__, int h __UNUSED__) #ifndef _WIN32 if (getenv("ECORE_EVAS_FPS_DEBUG")) _ecore_evas_fps_debug = 1; #endif /* _WIN32 */ - // this is pretty bad: poller? and set poll time? pol time is meant to be + // this is pretty bad: poller? and set poll time? pol time is meant to be // adjustable for things like polling battery state, or amoutn of spare // memory etc. - // + // ecore_evas_event = ecore_poller_add(ECORE_POLLER_CORE, 1, _ecore_evas_sdl_event, NULL); ecore_poller_poll_interval_set(ECORE_POLLER_CORE, 0.006); #ifndef _WIN32 @@ -208,7 +208,7 @@ static void _ecore_evas_sdl_free(Ecore_Evas *ee) { if (sdl_ee == ee) sdl_ee = NULL; - + ecore_event_window_unregister(0); _ecore_evas_sdl_shutdown(); ecore_sdl_shutdown(); @@ -332,7 +332,7 @@ static Ecore_Evas_Engine_Func _ecore_sdl_engine_func = NULL, NULL, NULL, //transparent - + NULL // render }; @@ -437,9 +437,9 @@ _ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fu ee->engine.func->fn_render = _ecore_evas_sdl_render; _ecore_evas_register(ee); - + sdl_ee = ee; - + evas_event_feed_mouse_in(ee->evas, (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff), NULL); evas_focus_in(ee->evas); diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c index 67287848ac..7d8a61e0d7 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c @@ -93,7 +93,7 @@ _ecore_evas_win32_init(void) _ecore_evas_init_count++; if (_ecore_evas_init_count > 1) return _ecore_evas_init_count; - + ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_IN, _ecore_evas_win32_event_mouse_in, NULL); ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_WIN32_EVENT_MOUSE_OUT, _ecore_evas_win32_event_mouse_out, NULL); ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_WIN32_EVENT_WINDOW_DAMAGE, _ecore_evas_win32_event_window_damage, NULL); @@ -924,7 +924,7 @@ static Ecore_Evas_Engine_Func _ecore_win32_engine_func = NULL, /* _ecore_evas_x_ignore_events_set */ NULL, /* _ecore_evas_x_alpha_set */ NULL, //transparent - + NULL // render }; @@ -1175,7 +1175,7 @@ _ecore_evas_win32_new_internal(int (*_ecore_evas_engine_init)(Ecore_Evas *ee), (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process, (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); - + return ee; } diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c index ef17beaba2..277ab46ebc 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c @@ -91,7 +91,7 @@ _ecore_evas_wince_init(void) _ecore_evas_init_count++; if (_ecore_evas_init_count > 1) return _ecore_evas_init_count; - + ecore_evas_event_handlers[0] = ecore_event_handler_add(ECORE_WINCE_EVENT_MOUSE_IN, _ecore_evas_wince_event_mouse_in, NULL); ecore_evas_event_handlers[1] = ecore_event_handler_add(ECORE_WINCE_EVENT_MOUSE_OUT, _ecore_evas_wince_event_mouse_out, NULL); ecore_evas_event_handlers[2] = ecore_event_handler_add(ECORE_WINCE_EVENT_WINDOW_DAMAGE, _ecore_evas_wince_event_window_damage, NULL); @@ -720,7 +720,7 @@ static Ecore_Evas_Engine_Func _ecore_wince_engine_func = NULL, /* _ecore_evas_x_ignore_events_set */ NULL, /* _ecore_evas_x_alpha_set */ NULL, //transparent - + NULL // render }; diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c index 471bec18c2..d1f667e4e1 100644 --- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c +++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c @@ -19,7 +19,7 @@ #ifndef HAVE_ECORE_X_XCB # undef BUILD_ECORE_EVAS_XRENDER_XCB # undef BUILD_ECORE_EVAS_SOFTWARE_XCB -#endif +#endif #include "ecore_evas_private.h" #include "Ecore_Evas.h" @@ -77,19 +77,19 @@ _ecore_evas_x_protocols_set(Ecore_Evas *ee) { Ecore_X_Atom protos[10]; int num = 0; - + if (ee->func.fn_delete_request) protos[num++] = ECORE_X_ATOM_WM_DELETE_WINDOW; protos[num++] = ECORE_X_ATOM_NET_WM_PING; protos[num++] = ECORE_X_ATOM_NET_WM_SYNC_REQUEST; ecore_x_icccm_protocol_atoms_set(ee->prop.window, protos, num); - + if (!ee->engine.x.netwm_sync_counter) ee->engine.x.netwm_sync_counter = ecore_x_sync_counter_new(0); //////// { unsigned int tmp = ee->engine.x.netwm_sync_counter; - ecore_x_window_prop_card32_set(ee->prop.window, + ecore_x_window_prop_card32_set(ee->prop.window, ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER, &tmp, 1); } @@ -166,7 +166,7 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y, if (opt) { int op; - + for (op = 0; opt[op]; op++) { if (opt[op] == ECORE_EVAS_GL_X11_OPT_INDIRECT) @@ -181,7 +181,7 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y, } } } - + /* FIXME: this is inefficient as its 1 or more round trips */ screen = DefaultScreen(ecore_x_display_get()); if (ScreenCount(ecore_x_display_get()) > 1) @@ -212,13 +212,13 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y, } einfo->info.display = ecore_x_display_get(); einfo->info.screen = screen; - + einfo->info.destination_alpha = argb; - + einfo->info.visual = einfo->func.best_visual_get(einfo); einfo->info.colormap = einfo->func.best_colormap_get(einfo); einfo->info.depth = einfo->func.best_depth_get(einfo); - + if ((!einfo->info.visual) || (!einfo->info.colormap) || @@ -231,7 +231,7 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y, return 0; } } - + attr.backing_store = NotUseful; attr.override_redirect = override; attr.colormap = einfo->info.colormap; @@ -248,7 +248,7 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y, win = XCreateWindow(einfo->info.display, parent, x, y, w, h, 0, einfo->info.depth, InputOutput, einfo->info.visual, - CWBackingStore | CWColormap | CWBackPixmap | + CWBackingStore | CWColormap | CWBackPixmap | CWBorderPixel | CWBitGravity | CWEventMask | CWOverrideRedirect, &attr); einfo->info.drawable = win; @@ -283,7 +283,7 @@ _ecore_evas_x_render(Ecore_Evas *ee) (ee->engine.x.sync_counter) && (!ee->engine.x.sync_began) && (!ee->engine.x.sync_cancel)) return 0; - + EINA_LIST_FOREACH(ee->sub_ecore_evas, ll, ee2) { if (ee2->func.fn_pre_render) ee2->func.fn_pre_render(ee2); @@ -429,9 +429,9 @@ _ecore_evas_x_render(Ecore_Evas *ee) ((ee->should_be_visible) && (ee->prop.override))) { updates = evas_render_updates(ee->evas); - if (updates) + if (updates) { - if (ee->shaped) + if (ee->shaped) { #ifdef EVAS_FRAME_QUEUING /* wait until ee->engine.x.mask being updated */ @@ -455,13 +455,13 @@ _ecore_evas_x_render(Ecore_Evas *ee) else evas_norender(ee->evas); if (ee->func.fn_post_render) ee->func.fn_post_render(ee); -/* +/* if (rend) { static int frames = 0; static double t0 = 0.0; double t, td; - + t = ecore_time_get(); frames++; if ((t - t0) > 1.0) @@ -1072,7 +1072,7 @@ _ecore_evas_x_event_window_show(void *data __UNUSED__, int type __UNUSED__, void Ecore_Evas *ee; Ecore_X_Event_Window_Show *e; static int first_map_bug = -1; - + e = event; ee = ecore_event_window_match(e->win); if (!ee) return ECORE_CALLBACK_PASS_ON; /* pass on event */ @@ -1522,7 +1522,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize, else { int w, h; - + ecore_x_window_size_get(ee->prop.window, &w, &h); ecore_x_window_resize(ee->prop.window, h, w); if ((rotation == 0) || (rotation == 180)) @@ -1545,7 +1545,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize, else { int w, h; - + ecore_x_window_size_get(ee->prop.window, &w, &h); if ((rotation == 0) || (rotation == 180)) { @@ -1585,7 +1585,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize, _ecore_evas_mouse_move_process(ee, ee->mouse.x, ee->mouse.y, ecore_x_current_time_get()); if (ee->func.fn_resize) ee->func.fn_resize(ee); - + if ((ee->rotation == 90) || (ee->rotation == 270)) evas_damage_rectangle_add(ee->evas, 0, 0, ee->h, ee->w); else @@ -1965,16 +1965,16 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha) ecore_x_window_free(ee->prop.window); ecore_event_window_unregister(ee->prop.window); ee->prop.window = 0; - + einfo->info.destination_alpha = alpha; - + if (ee->engine.x.win_root != 0) { /* FIXME: round trip in ecore_x_window_argb_get */ if (ecore_x_window_argb_get(ee->engine.x.win_root)) { ee->prop.window = _ecore_evas_x_gl_window_new - (ee, ee->engine.x.win_root, + (ee, ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h, ee->prop.override, 1, NULL); } @@ -1986,14 +1986,14 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha) } else ee->prop.window = _ecore_evas_x_gl_window_new - (ee, ee->engine.x.win_root, + (ee, ee->engine.x.win_root, ee->req.x, ee->req.y, ee->req.w, ee->req.h, ee->prop.override, ee->alpha, NULL); if (!ee->prop.window) { return; } -/* +/* if (ee->alpha) { if (ee->prop.override) @@ -2348,7 +2348,7 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha) static void _ecore_evas_x_transparent_set(Ecore_Evas *ee, int transparent) { - if (((ee->transparent) && (transparent)) || + if (((ee->transparent) && (transparent)) || ((!ee->transparent) && (!transparent))) return; @@ -2367,7 +2367,7 @@ _ecore_evas_x_transparent_set(Ecore_Evas *ee, int transparent) ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver); } evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h); -#endif +#endif } } #endif /* BUILD_ECORE_EVAS_X11 */ @@ -2979,7 +2979,7 @@ static Ecore_Evas_Engine_Func _ecore_x_engine_func = _ecore_evas_x_ignore_events_set, _ecore_evas_x_alpha_set, _ecore_evas_x_transparent_set, - + NULL // render }; #endif /* BUILD_ECORE_EVAS_X11 */ @@ -3034,8 +3034,8 @@ _ecore_evas_x_flush_post(void *data, Evas *e __UNUSED__, void *event_info __UNUS } if (ee->engine.x.netwm_sync_set) { - ecore_x_sync_counter_2_set(ee->engine.x.netwm_sync_counter, - ee->engine.x.netwm_sync_val_hi, + ecore_x_sync_counter_2_set(ee->engine.x.netwm_sync_counter, + ee->engine.x.netwm_sync_val_hi, ee->engine.x.netwm_sync_val_lo); ee->engine.x.netwm_sync_set = 0; } @@ -3102,7 +3102,7 @@ ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, ee->engine.x.win_root = parent; ee->engine.x.screen_num = 0; - + if (parent != 0) { ee->engine.x.screen_num = 1; /* FIXME: get real scren # */ @@ -3294,7 +3294,7 @@ ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, return NULL; } } - + ecore_x_icccm_hints_set(ee->prop.window, 1 /* accepts_focus */, ECORE_X_WINDOW_STATE_HINT_NORMAL /* initial_state */, @@ -3656,9 +3656,9 @@ EAPI void ecore_evas_gl_x11_pre_post_swap_callback_set(const Ecore_Evas *ee, void *data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas *e)) { Evas_Engine_Info_GL_X11 *einfo; - + if (!(!strcmp(ee->driver, "opengl_x11"))) return; - + einfo = (Evas_Engine_Info_GL_X11 *)evas_engine_info_get(ee->evas); if (einfo) { @@ -4547,7 +4547,7 @@ ecore_evas_x11_leader_set(Ecore_Evas *ee, Ecore_X_Window win) return; ee = NULL; win = 0; -#endif +#endif } EAPI Ecore_X_Window @@ -4558,7 +4558,7 @@ ecore_evas_x11_leader_get(Ecore_Evas *ee) #else return 0; ee = NULL; -#endif +#endif } EAPI void diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb.c index 53b379bd0d..77071e3e15 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb.c @@ -42,10 +42,10 @@ ecore_fb_init(const char *name __UNUSED__) { if (++_ecore_fb_init_count != 1) return _ecore_fb_init_count; - + if (!ecore_fb_vt_init()) return --_ecore_fb_init_count; - + ECORE_FB_EVENT_KEY_DOWN = ecore_event_type_new(); ECORE_FB_EVENT_KEY_UP = ecore_event_type_new(); ECORE_FB_EVENT_MOUSE_BUTTON_DOWN = ecore_event_type_new(); @@ -68,7 +68,7 @@ ecore_fb_init(const char *name __UNUSED__) */ EAPI int ecore_fb_shutdown(void) -{ +{ if (--_ecore_fb_init_count != 0) return _ecore_fb_init_count; @@ -102,7 +102,7 @@ _ecore_fb_size_get(int *w, int *h) { struct fb_var_screeninfo fb_var; int fb; - + fb = open("/dev/fb0", O_RDWR); if (fb < 0) { diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c index 8dcd29d7c3..25d7aef3a1 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_kbd.c @@ -9,116 +9,116 @@ static const char *_ecore_fb_kbd_syms[128 * 6] = static const char *_ecore_fb_btn_syms[128] = { "0x00", - "Escape", - "F1", - "F2", - "F3", - "F4", - "Up", + "Escape", + "F1", + "F2", + "F3", + "F4", + "Up", "Right", - "Left", - "Down", - "Return", - "0x1b", - "0x1c", - "0x1d", + "Left", + "Down", + "Return", + "0x1b", + "0x1c", + "0x1d", "0x1e", "0x1f", - "0x20", - "0x21", - "0x22", - "0x23", - "0x24", - "0x25", - "0x26", + "0x20", + "0x21", + "0x22", + "0x23", + "0x24", + "0x25", + "0x26", "0x27", - "0x28", - "0x29", + "0x28", + "0x29", "0x2a", "0x2b", "0x2c", "0x2d", - "0x2e", - "0x2f", - "0x30", - "0x31", - "0x32", - "0x33", - "0x34", - "0x35", - "0x36", + "0x2e", + "0x2f", + "0x30", + "0x31", + "0x32", + "0x33", + "0x34", + "0x35", + "0x36", "0x37", - "0x38", - "0x39", + "0x38", + "0x39", "0x3a", "0x3b", "0x3c", "0x3d", - "0x3e", - "0x3f", - "0x40", - "0x41", - "0x42", - "0x43", - "0x44", - "0x45", - "0x46", + "0x3e", + "0x3f", + "0x40", + "0x41", + "0x42", + "0x43", + "0x44", + "0x45", + "0x46", "0x47", - "0x48", - "0x49", + "0x48", + "0x49", "0x4a", "0x4b", "0x4c", "0x4d", - "0x4e", - "0x4f", - "0x50", - "0x51", - "0x52", - "0x53", - "0x54", - "0x55", - "0x56", + "0x4e", + "0x4f", + "0x50", + "0x51", + "0x52", + "0x53", + "0x54", + "0x55", + "0x56", "0x57", - "0x58", - "0x59", + "0x58", + "0x59", "0x5a", "0x5b", "0x5c", "0x5d", - "0x5e", - "0x5f", - "0x60", - "0x61", - "0x62", - "0x63", - "0x64", - "0x65", - "0x66", + "0x5e", + "0x5f", + "0x60", + "0x61", + "0x62", + "0x63", + "0x64", + "0x65", + "0x66", "0x67", - "0x68", - "0x69", + "0x68", + "0x69", "0x6a", "0x6b", "0x6c", "0x6d", - "0x6e", - "0x6f", - "0x70", - "0x71", - "0x72", - "0x73", - "0x74", - "0x75", - "0x76", + "0x6e", + "0x6f", + "0x70", + "0x71", + "0x72", + "0x73", + "0x74", + "0x75", + "0x76", "0x77", - "0x78", - "0x79", + "0x78", + "0x79", "0x7a", "0x7b", "0x7c", "0x7d", - "0x7e", + "0x7e", "0x7f" }; static int _ecore_fb_kbd_fd = -1; @@ -130,7 +130,7 @@ static int _ecore_fb_lock = 0; static Ecore_Fd_Handler *_ecore_fb_kbd_fd_handler_handle = NULL; static Eina_Bool _ecore_fb_kbd_fd_handler(void *data, Ecore_Fd_Handler *fd_handler); -static void +static void _ecore_fb_event_free_key_down(void *data __UNUSED__, void *ev) { Ecore_Fb_Event_Key_Up *e; @@ -145,7 +145,7 @@ static void _ecore_fb_event_free_key_up(void *data __UNUSED__, void *ev) { Ecore_Fb_Event_Key_Up *e; - + e = ev; free(e->keyname); if (e->keysymbol) free(e->keysymbol); @@ -157,11 +157,11 @@ static Eina_Bool _ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__) { int v = 0; - + do { unsigned char buf; - + v = read(_ecore_fb_kbd_fd, &buf, 1); if (v < 0) return EINA_TRUE; if (v < 1) return EINA_TRUE; @@ -170,13 +170,13 @@ _ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U /* DOWN */ int vt_switch = -1; Ecore_Fb_Event_Key_Down *e; - + e = calloc(1, sizeof(Ecore_Fb_Event_Key_Down)); if (!e) goto retry; if (_ecore_fb_kbd_fd == _ecore_fb_tty_fd) { int add = 0; - + if (_ecore_fb_shift) add = 1; else if (_ecore_fb_lock) add = 2; e->keyname = strdup(_ecore_fb_kbd_syms[(buf & 0x7f) * 6]); @@ -228,13 +228,13 @@ _ecore_fb_kbd_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U { /* UP */ Ecore_Fb_Event_Key_Up *e; - + e = calloc(1, sizeof(Ecore_Fb_Event_Key_Up)); if (!e) goto retry; if (_ecore_fb_kbd_fd == _ecore_fb_tty_fd) { int add = 0; - + if (_ecore_fb_shift) add = 1; else if (_ecore_fb_lock) add = 2; e->keyname = strdup(_ecore_fb_kbd_syms[(buf & 0x7f) * 6]); @@ -279,7 +279,7 @@ int ecore_fb_kbd_init(void) { int prev_flags; - + prev_flags = fcntl(_ecore_fb_kbd_fd, F_GETFL); fcntl(_ecore_fb_kbd_fd, F_SETFL, prev_flags | O_NONBLOCK); _ecore_fb_kbd_fd_handler_handle = ecore_main_fd_handler_add(_ecore_fb_kbd_fd, @@ -293,7 +293,7 @@ ecore_fb_kbd_init(void) void ecore_fb_kbd_shutdown(void) { - if (_ecore_fb_kbd_fd_handler_handle) + if (_ecore_fb_kbd_fd_handler_handle) ecore_main_fd_handler_del(_ecore_fb_kbd_fd_handler_handle); if (_ecore_fb_kbd_fd >= 0) close(_ecore_fb_kbd_fd); _ecore_fb_kbd_fd = -1; diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c index b25c28ee86..65e5f61513 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_li.c @@ -405,7 +405,7 @@ ecore_fb_input_device_listen(Ecore_Fb_Input_Device *dev, Eina_Bool listen) * @return The @ref Ecore_Fb_Input_Device object that has been opened. * * This function opens the input device named @p dev and returns the - * object for it, or returns @c NULL on failure. + * object for it, or returns @c NULL on failure. */ EAPI Ecore_Fb_Input_Device * ecore_fb_input_device_open(const char *dev) diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c index e57da15a30..c43a71ae7e 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ps2.c @@ -20,7 +20,7 @@ ecore_fb_ps2_init(void) { prev_flags = fcntl(_ecore_fb_ps2_fd, F_GETFL); fcntl(_ecore_fb_ps2_fd, F_SETFL, prev_flags | O_NONBLOCK); - _ecore_fb_ts_fd_handler_handle = ecore_main_fd_handler_add(_ecore_fb_ps2_fd, + _ecore_fb_ts_fd_handler_handle = ecore_main_fd_handler_add(_ecore_fb_ps2_fd, ECORE_FD_READ, _ecore_fb_ps2_fd_handler, NULL, NULL, NULL); if (!_ecore_fb_ts_fd_handler_handle) @@ -30,7 +30,7 @@ ecore_fb_ps2_init(void) } return 1; } - return 0; + return 0; } void @@ -47,7 +47,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U static double last_time = 0; static double last_last_time = 0; int v = 0; - + do { int x, y, button, i; @@ -56,7 +56,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U double t; static int did_double = 0; static int did_triple = 0; - + ptr = (char *)&(_ecore_fb_ps2_event); ptr += _ecore_fb_ps2_event_byte_count; num = sizeof(Ecore_Fb_Ps2_Event) - _ecore_fb_ps2_event_byte_count; @@ -85,7 +85,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U { /* MOVE: mouse is down and was */ Ecore_Fb_Event_Mouse_Move *e; - + e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Move)); if (!e) goto retry; e->x = x; @@ -95,13 +95,13 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U for (i = 1; i <= 3; i++) { int mask; - + mask = 1 << (i - 1); if (((button & mask)) && (!(prev_button & mask))) { /* DOWN: mouse is down, but was not now */ Ecore_Fb_Event_Mouse_Button_Down *e; - + e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Button_Down)); if (!e) goto retry; e->x = x; @@ -132,7 +132,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U { /* UP: mouse was down, but is not now */ Ecore_Fb_Event_Mouse_Button_Up *e; - + e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Button_Up)); if (!e) goto retry; e->x = x; @@ -155,7 +155,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U last_last_time = last_time; last_time = t; } - retry: + retry: prev_x = x; prev_y = y; prev_button = button; @@ -171,7 +171,7 @@ _ecore_fb_ps2_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __U /** * Sets the timeout for a double and triple clicks to be flagged. - * + * * This sets the time between clicks before the double_click flag is * set in a button down event. If 3 clicks occur within double this * time, the triple_click flag is also set. diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c index caef71b7fb..33b2d8c70d 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_ts.c @@ -22,7 +22,7 @@ struct _Ecore_Fb_Ts_Event unsigned short pressure; unsigned short x; unsigned short y; - unsigned short _unused; + unsigned short _unused; }; struct _Ecore_Fb_Ts_Calibrate @@ -84,13 +84,13 @@ ecore_fb_ts_init(void) { printf( "ECORE_FB: TSLIB_TSDEVICE = '%s'\n", tslib_tsdevice ); _ecore_fb_tslib_tsdev = ts_open( tslib_tsdevice, 1 ); /* 1 = nonblocking, 0 = blocking */ - + if ( !_ecore_fb_tslib_tsdev ) { printf( "ECORE_FB: Can't ts_open (%s)\n", strerror( errno ) ); return 0; } - + if ( ts_config( _ecore_fb_tslib_tsdev ) ) { printf( "ECORE_FB: Can't ts_config (%s)\n", strerror( errno ) ); @@ -108,7 +108,7 @@ ecore_fb_ts_init(void) #endif if (_ecore_fb_ts_fd >= 0) { - _ecore_fb_ts_fd_handler_handle = ecore_main_fd_handler_add(_ecore_fb_ts_fd, + _ecore_fb_ts_fd_handler_handle = ecore_main_fd_handler_add(_ecore_fb_ts_fd, ECORE_FD_READ, _ecore_fb_ts_fd_handler, NULL, NULL, NULL); @@ -153,7 +153,7 @@ EAPI void ecore_fb_touch_screen_calibrate_set(int xscale, int xtrans, int yscale, int ytrans, int xyswap) { Ecore_Fb_Ts_Calibrate cal; - + if (_ecore_fb_ts_fd < 0) return; cal.xscale = xscale; cal.xtrans = xtrans; @@ -181,7 +181,7 @@ EAPI void ecore_fb_touch_screen_calibrate_get(int *xscale, int *xtrans, int *yscale, int *ytrans, int *xyswap) { Ecore_Fb_Ts_Calibrate cal; - + if (_ecore_fb_ts_fd < 0) return; if (!_ecore_fb_ts_apply_cal) { @@ -204,7 +204,7 @@ _ecore_fb_ts_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UN static double last_time = 0; static double last_last_time = 0; int v = 0; - + do { int x, y, pressure; @@ -245,14 +245,14 @@ _ecore_fb_ts_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UN y = _ecore_fb_ts_event.y; } pressure = _ecore_fb_ts_event.pressure; -#endif +#endif /* add event to queue */ /* always add a move event */ if ((pressure) || (prev_pressure)) { /* MOVE: mouse is down and was */ Ecore_Fb_Event_Mouse_Move *e; - + e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Move)); if (!e) goto retry; e->x = x; @@ -263,7 +263,7 @@ _ecore_fb_ts_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UN { /* DOWN: mouse is down, but was not now */ Ecore_Fb_Event_Mouse_Button_Down *e; - + e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Button_Down)); if (!e) goto retry; e->x = x; @@ -294,7 +294,7 @@ _ecore_fb_ts_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UN { /* UP: mouse was down, but is not now */ Ecore_Fb_Event_Mouse_Button_Up *e; - + e = calloc(1, sizeof(Ecore_Fb_Event_Mouse_Button_Up)); if (!e) goto retry; e->x = prev_x; @@ -316,7 +316,7 @@ _ecore_fb_ts_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UN last_last_time = last_time; last_time = t; } -retry: +retry: prev_x = x; prev_y = y; prev_pressure = pressure; diff --git a/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c b/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c index ab94f83c52..3d76f14030 100644 --- a/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c +++ b/legacy/ecore/src/lib/ecore_fb/ecore_fb_vt.c @@ -42,7 +42,7 @@ static Eina_Bool _ecore_fb_signal_usr_handler(void *data __UNUSED__, int type __UNUSED__, void *ev) { Ecore_Event_Signal_User *e; - + e = (Ecore_Event_Signal_User *)ev; if (e->number == 1) { @@ -82,10 +82,10 @@ static int _ecore_fb_vt_setup(void) { char buf[64]; -// XXX: unused +// XXX: unused // struct termios tio; struct vt_mode new_vtmode; - + if (_ecore_fb_vt_current_vt != _ecore_fb_vt_prev_vt) { snprintf(buf, sizeof(buf), "/dev/tty%i", _ecore_fb_vt_current_vt); @@ -104,7 +104,7 @@ _ecore_fb_vt_setup(void) tcgetattr(_ecore_fb_vt_tty_fd, &_ecore_fb_tty_prev_tio_mode); ioctl(_ecore_fb_vt_tty_fd, KDGETMODE, &_ecore_fb_tty_prev_kd_mode); ioctl(_ecore_fb_vt_tty_fd, VT_GETMODE, &_ecore_fb_vt_prev_mode); - + if (ioctl(_ecore_fb_vt_tty_fd, KDSETMODE, KD_GRAPHICS) < 0) { perror("[ecore_fb:vt_setup] can't set the mode to KD_GRAPHICS"); @@ -113,7 +113,7 @@ _ecore_fb_vt_setup(void) return 0; } ioctl(_ecore_fb_vt_tty_fd, KDGKBMODE, &_ecore_fb_tty_prev_mode); - + /* support of switching */ new_vtmode.mode = VT_PROCESS; new_vtmode.waitv = 0; @@ -132,7 +132,7 @@ _ecore_fb_vt_setup(void) NULL); /* What does this do? */ _ecore_fb_filter_handler = ecore_event_filter_add(_ecore_fb_event_filter_start, _ecore_fb_event_filter_filter, _ecore_fb_event_filter_end, NULL); - + usleep(40000); if (ioctl(_ecore_fb_vt_tty_fd, VT_ACTIVATE, _ecore_fb_vt_current_vt) < 0) { @@ -156,7 +156,7 @@ int ecore_fb_vt_init(void) { struct vt_stat vtstat; - + /* as root you can allocate another tty */ if (!geteuid()) _ecore_fb_vt_do_switch = 1; @@ -176,7 +176,7 @@ ecore_fb_vt_init(void) if (_ecore_fb_vt_do_switch) { int vtno; - + if ((ioctl(_ecore_fb_vt_tty0_fd, VT_OPENQRY, &vtno) < 0)) { printf("[ecore_fb:init] can't query for a vt\n"); @@ -214,10 +214,10 @@ ecore_fb_vt_shutdown(void) close(_ecore_fb_vt_tty_fd); _ecore_fb_vt_tty_fd = -1; } - + if (_ecore_fb_user_handler) ecore_event_handler_del(_ecore_fb_user_handler); _ecore_fb_user_handler = NULL; - + if (_ecore_fb_filter_handler) ecore_event_filter_del(_ecore_fb_filter_handler); _ecore_fb_filter_handler = NULL; } @@ -275,12 +275,12 @@ struct _Ecore_Fb_Filter_Data { int last_event_type; }; - + static void * _ecore_fb_event_filter_start(void *data __UNUSED__) { Ecore_Fb_Filter_Data *filter_data; - + filter_data = calloc(1, sizeof(Ecore_Fb_Filter_Data)); return filter_data; } @@ -289,7 +289,7 @@ static Eina_Bool _ecore_fb_event_filter_filter(void *data __UNUSED__, void *loop_data,int type, void *event __UNUSED__) { Ecore_Fb_Filter_Data *filter_data; - + filter_data = loop_data; if (!filter_data) return EINA_TRUE; if (type == ECORE_FB_EVENT_MOUSE_MOVE) @@ -308,7 +308,7 @@ static void _ecore_fb_event_filter_end(void *data __UNUSED__, void *loop_data) { Ecore_Fb_Filter_Data *filter_data; - + filter_data = loop_data; if (filter_data) free(filter_data); } diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file.c b/legacy/ecore/src/lib/ecore_file/ecore_file.c index 906c65215a..d934bda526 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file.c @@ -242,7 +242,7 @@ ecore_file_mkdirs(const char **dirs) * returns -1 if @p dirs or @p base are @c NULL, or if @p base is * empty ("\0"). It returns 0 is @p base is not a directory or * invalid, or if it can't be created. Otherwise if returns the number - * of suceesfully created directories. + * of suceesfully created directories. */ EAPI int ecore_file_mksubdirs(const char *base, const char **subdirs) @@ -490,7 +490,7 @@ ecore_file_mkpath(const char *path) * and call ecore_file_mkpath(), hence on Windows, '\' must be * replaced by '/' before calling that function. This function * returns -1 if @p paths is @c NULL. Otherwise if returns the number - * of suceesfully created directories. + * of suceesfully created directories. */ EAPI int ecore_file_mkpaths(const char **paths) @@ -578,10 +578,10 @@ ecore_file_mv(const char *src, const char *dst) char *dir; dir = ecore_file_dir_get(dst); - // Since we can't directly rename, try to + // Since we can't directly rename, try to // copy to temp file in the dst directory // and then rename. - snprintf(buf, sizeof(buf), "%s/.%s.tmp.XXXXXX", + snprintf(buf, sizeof(buf), "%s/.%s.tmp.XXXXXX", dir, ecore_file_file_get(dst)); free(dir); fd = mkstemp(buf); @@ -1095,7 +1095,7 @@ ecore_file_dir_is_empty(const char *dir) return 0; } } - + closedir(dirp); return 1; } diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c index ab8294a898..043a797f6a 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c @@ -191,13 +191,13 @@ _ecore_file_download(const char *url, * download using http and ftp protocols. If @p dst is ill-formed, or * if it already exists, the function returns EINA_FALSE. When the * download is complete, the callback @p completion_cb is called and - * @p data is passed to it. The @p status parameter of @p completion_cb + * @p data is passed to it. The @p status parameter of @p completion_cb * will be filled with the status of the download (200, 404,...). The * @p progress_cb is called during the download operation, each time a * packet is received or when CURL wants. It can be used to display the * percentage of the downloaded file. Return 0 from this callback, if provided, * to continue the operation or anything else to abort the download. The only - * operations that can be aborted are those with protocol 'http' or 'ftp'. In + * operations that can be aborted are those with protocol 'http' or 'ftp'. In * that case @p job_ret can be filled. It can be used with * ecore_file_download_abort() or ecore_file_download_abort_all() to * respectively abort one or all download operations. This function returns diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c index 255ca1b382..c3533ad865 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c @@ -65,7 +65,7 @@ ecore_file_monitor_inotify_init(void) fd = inotify_init(); if (fd < 0) return 0; - + _fdh = ecore_main_fd_handler_add(fd, ECORE_FD_READ, _ecore_file_monitor_inotify_handler, NULL, NULL, NULL); if (!_fdh) @@ -113,7 +113,7 @@ ecore_file_monitor_inotify_add(const char *path, ecore_file_monitor_inotify_shutdown(); ecore_file_monitor_inotify_init(); } - + em = calloc(1, sizeof(Ecore_File_Monitor_Inotify)); if (!em) return NULL; @@ -284,19 +284,19 @@ _ecore_file_monitor_inotify_events(Ecore_File_Monitor *em, char *file, int mask) static int _ecore_file_monitor_inotify_monitor(Ecore_File_Monitor *em, const char *path) { - int mask = - IN_ATTRIB | + int mask = + IN_ATTRIB | IN_CLOSE_WRITE | - IN_MOVED_FROM | + IN_MOVED_FROM | IN_MOVED_TO | - IN_DELETE | + IN_DELETE | IN_CREATE | IN_MODIFY | - IN_DELETE_SELF | + IN_DELETE_SELF | IN_MOVE_SELF | IN_UNMOUNT; - - ECORE_FILE_MONITOR_INOTIFY(em)->wd = + + ECORE_FILE_MONITOR_INOTIFY(em)->wd = inotify_add_watch(ecore_main_fd_handler_fd_get(_fdh), path, mask); if (ECORE_FILE_MONITOR_INOTIFY(em)->wd < 0) { diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_path.c b/legacy/ecore/src/lib/ecore_file/ecore_file_path.c index d6e5ea63c9..ade3bc6422 100644 --- a/legacy/ecore/src/lib/ecore_file/ecore_file_path.c +++ b/legacy/ecore/src/lib/ecore_file/ecore_file_path.c @@ -119,7 +119,7 @@ ecore_file_path_dir_exists(const char *in_dir) * @return EINA_TRUE if the exe is in PATH and is executable, * EINA_FALSE otherwise. * - * + * * This function checks if @p exe exists in PATH and is executable. If * @p exe is @c NULL or is not executable, the function returns * EINA_FALSE, otherwise it returns EINA_TRUE. @@ -162,7 +162,7 @@ ecore_file_app_list(void) Eina_List *files; Eina_List *l; char buf[PATH_MAX], *dir, *exe; - + EINA_LIST_FOREACH(__ecore_file_path_bin, l, dir) { files = ecore_file_ls(dir); diff --git a/legacy/ecore/src/lib/ecore_input/ecore_input.c b/legacy/ecore/src/lib/ecore_input/ecore_input.c index 22740bfc30..ce4c275414 100644 --- a/legacy/ecore/src/lib/ecore_input/ecore_input.c +++ b/legacy/ecore/src/lib/ecore_input/ecore_input.c @@ -30,7 +30,7 @@ ecore_event_init(void) { if (++_ecore_event_init_count != 1) return _ecore_event_init_count; - + _ecore_input_log_dom = eina_log_domain_register ("ecore_input", ECORE_INPUT_DEFAULT_LOG_COLOR); if(_ecore_input_log_dom < 0) diff --git a/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c b/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c index 0f445a0391..2ab8a7ea1c 100644 --- a/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c +++ b/legacy/ecore/src/lib/ecore_input_evas/ecore_input_evas.c @@ -166,10 +166,10 @@ _ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Press pr { ecore_event_evas_modifier_lock_update(lookup->evas, e->modifiers); if (press == ECORE_DOWN) - evas_event_feed_mouse_down(lookup->evas, e->buttons, flags, + evas_event_feed_mouse_down(lookup->evas, e->buttons, flags, e->timestamp, NULL); else - evas_event_feed_mouse_up(lookup->evas, e->buttons, flags, + evas_event_feed_mouse_up(lookup->evas, e->buttons, flags, e->timestamp, NULL); } else @@ -177,35 +177,35 @@ _ecore_event_evas_mouse_button(Ecore_Event_Mouse_Button *e, Ecore_Event_Press pr if (press == ECORE_DOWN) { if (lookup->down_multi) - lookup->down_multi(lookup->window, e->multi.device, - e->x, e->y, e->multi.radius, - e->multi.radius_x, e->multi.radius_y, - e->multi.pressure, e->multi.angle, - e->multi.x, e->multi.y, flags, + lookup->down_multi(lookup->window, e->multi.device, + e->x, e->y, e->multi.radius, + e->multi.radius_x, e->multi.radius_y, + e->multi.pressure, e->multi.angle, + e->multi.x, e->multi.y, flags, e->timestamp); else - evas_event_feed_multi_down(lookup->evas, e->multi.device, - e->x, e->y, e->multi.radius, - e->multi.radius_x, e->multi.radius_y, - e->multi.pressure, e->multi.angle, - e->multi.x, e->multi.y, flags, + evas_event_feed_multi_down(lookup->evas, e->multi.device, + e->x, e->y, e->multi.radius, + e->multi.radius_x, e->multi.radius_y, + e->multi.pressure, e->multi.angle, + e->multi.x, e->multi.y, flags, e->timestamp, NULL); } else { if (lookup->up_multi) - lookup->up_multi(lookup->window, e->multi.device, - e->x, e->y, e->multi.radius, - e->multi.radius_x, e->multi.radius_y, - e->multi.pressure, e->multi.angle, - e->multi.x, e->multi.y, flags, + lookup->up_multi(lookup->window, e->multi.device, + e->x, e->y, e->multi.radius, + e->multi.radius_x, e->multi.radius_y, + e->multi.pressure, e->multi.angle, + e->multi.x, e->multi.y, flags, e->timestamp); else - evas_event_feed_multi_up(lookup->evas, e->multi.device, - e->x, e->y, e->multi.radius, - e->multi.radius_x, e->multi.radius_y, - e->multi.pressure, e->multi.angle, - e->multi.x, e->multi.y, flags, + evas_event_feed_multi_up(lookup->evas, e->multi.device, + e->x, e->y, e->multi.radius, + e->multi.radius_x, e->multi.radius_y, + e->multi.pressure, e->multi.angle, + e->multi.x, e->multi.y, flags, e->timestamp, NULL); } } @@ -227,23 +227,23 @@ ecore_event_evas_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *ev if (lookup->move_mouse) lookup->move_mouse(lookup->window, e->x, e->y, e->timestamp); else - evas_event_feed_mouse_move(lookup->evas, e->x, e->y, e->timestamp, + evas_event_feed_mouse_move(lookup->evas, e->x, e->y, e->timestamp, NULL); } else { if (lookup->move_multi) - lookup->move_multi(lookup->window, e->multi.device, - e->x, e->y, e->multi.radius, - e->multi.radius_x, e->multi.radius_y, - e->multi.pressure, e->multi.angle, + lookup->move_multi(lookup->window, e->multi.device, + e->x, e->y, e->multi.radius, + e->multi.radius_x, e->multi.radius_y, + e->multi.pressure, e->multi.angle, e->multi.x, e->multi.y, e->timestamp); else - evas_event_feed_multi_move(lookup->evas, e->multi.device, - e->x, e->y, e->multi.radius, - e->multi.radius_x, e->multi.radius_y, - e->multi.pressure, e->multi.angle, - e->multi.x, e->multi.y, e->timestamp, + evas_event_feed_multi_move(lookup->evas, e->multi.device, + e->x, e->y, e->multi.radius, + e->multi.radius_x, e->multi.radius_y, + e->multi.pressure, e->multi.angle, + e->multi.x, e->multi.y, e->timestamp, NULL); } return ECORE_CALLBACK_RENEW; @@ -371,14 +371,14 @@ ecore_event_evas_init(void) ecore_event_evas_handlers[7] = ecore_event_handler_add(ECORE_EVENT_MOUSE_OUT, ecore_event_evas_mouse_out, NULL); - + _window_hash = eina_hash_pointer_new(free); - + return _ecore_event_evas_init_count; - + shutdown_ecore: ecore_shutdown(); - + return --_ecore_event_evas_init_count; } @@ -386,10 +386,10 @@ EAPI int ecore_event_evas_shutdown(void) { size_t i; - + if (--_ecore_event_evas_init_count != 0) return _ecore_event_evas_init_count; - + eina_hash_free(_window_hash); _window_hash = NULL; for (i = 0; i < sizeof(ecore_event_evas_handlers) / sizeof(Ecore_Event_Handler *); i++) @@ -397,12 +397,12 @@ ecore_event_evas_shutdown(void) ecore_event_handler_del(ecore_event_evas_handlers[i]); ecore_event_evas_handlers[i] = NULL; } - + ecore_event_shutdown(); ecore_shutdown(); - + eina_log_domain_unregister(_ecore_input_evas_log_dom); _ecore_input_evas_log_dom = -1; - + return _ecore_event_evas_init_count; } diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c index 2d6a52ed53..ee4f45772e 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x.c @@ -1518,7 +1518,7 @@ _ecore_x_window_grab_remove(Ecore_X_Window win) { int i, shuffle = 0; Window *t; - + if (_ecore_window_grabs_num > 0) { for (i = 0; i < _ecore_window_grabs_num; i++) @@ -1635,7 +1635,7 @@ _ecore_x_key_grab_remove(Ecore_X_Window win) { int i, shuffle = 0; Window *t; - + if (_ecore_key_grabs_num > 0) { for (i = 0; i < _ecore_key_grabs_num; i++) diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c index 309ee3ff10..3e3d951c71 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_composite.c @@ -27,7 +27,7 @@ _ecore_x_composite_init(void) } # endif } -# endif +# endif } #endif } /* _ecore_x_composite_init */ diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c index 2f8dd849b8..4caf1fd4fe 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_e.c @@ -684,7 +684,7 @@ ecore_x_e_illume_quickpanel_priority_major_set(Ecore_X_Window win, &priority, 1); } /* ecore_x_e_illume_quickpanel_priority_major_set */ -EAPI int +EAPI int ecore_x_e_illume_quickpanel_priority_major_get(Ecore_X_Window win) { unsigned int val = 0; @@ -708,7 +708,7 @@ ecore_x_e_illume_quickpanel_priority_minor_set(Ecore_X_Window win, &priority, 1); } /* ecore_x_e_illume_quickpanel_priority_minor_set */ -EAPI int +EAPI int ecore_x_e_illume_quickpanel_priority_minor_get(Ecore_X_Window win) { unsigned int val = 0; @@ -751,7 +751,7 @@ ecore_x_e_illume_quickpanel_position_update_send(Ecore_X_Window win) LOGFN(__FILE__, __LINE__, __FUNCTION__); ecore_x_client_message32_send(win, ECORE_X_ATOM_E_ILLUME_QUICKPANEL_POSITION_UPDATE, - ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, + ECORE_X_EVENT_MASK_WINDOW_CONFIGURE, 1, 0, 0, 0, 0); } /* ecore_x_e_illume_quickpanel_position_update_send */ diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c index 22d95a9582..34e9d9a795 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_events.c @@ -398,7 +398,7 @@ _ecore_mouse_button(int event, if (event_window == window) { if (event == ECORE_EVENT_MOUSE_BUTTON_DOWN) - { + { if (((int)(timestamp - _ecore_x_mouse_down_last_time) <= (int)(1000 * _ecore_x_double_click_time)) && (window == _ecore_x_mouse_down_last_win) && @@ -413,7 +413,7 @@ _ecore_mouse_button(int event, _ecore_x_mouse_down_did_double = 0; _ecore_x_mouse_down_did_triple = 0; } - + if (((int)(timestamp - _ecore_x_mouse_down_last_last_time) <= (int)(2 * 1000 * _ecore_x_double_click_time)) && (window == _ecore_x_mouse_down_last_win) && @@ -437,12 +437,12 @@ _ecore_mouse_button(int event, if (_ecore_x_mouse_down_did_triple) e->triple_click = 1; } - + } - /* NB: Block commented out as _ecore_x_mouse_up_count appears to have - * no use. The variable is also commented out above. This code block is - * the only place that this variable is used, and appears to serve no + /* NB: Block commented out as _ecore_x_mouse_up_count appears to have + * no use. The variable is also commented out above. This code block is + * the only place that this variable is used, and appears to serve no * purpose. - dh if (event == ECORE_EVENT_MOUSE_BUTTON_DOWN && !e->double_click @@ -1935,7 +1935,7 @@ void _ecore_x_event_handle_mapping_notify(XEvent *xevent) { Ecore_X_Event_Mapping_Change *e; - + _ecore_x_last_event_mouse_move = 0; XRefreshKeyboardMapping((XMappingEvent *)xevent); e = calloc(1, sizeof(Ecore_X_Event_Mapping_Change)); diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c index 9a0acd06d3..12fbf45d7b 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_icccm.c @@ -130,7 +130,7 @@ ecore_x_icccm_hints_set(Ecore_X_Window win, Ecore_X_Pixmap icon_pixmap, Ecore_X_Pixmap icon_mask, Ecore_X_Window icon_window, - Ecore_X_Window window_group, + Ecore_X_Window window_group, Eina_Bool is_urgent) { XWMHints *hints; diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c index 10cdfd8b8a..a81941f542 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_image.c @@ -293,7 +293,7 @@ ecore_x_image_put(Ecore_X_Image *im, gc = tgc; } if (!im->xim) _ecore_x_image_shm_create(im); - if (im->xim) + if (im->xim) XShmPutImage(_ecore_x_disp, draw, gc, im->xim, sx, sy, x, y, w, h, False); if (tgc) ecore_x_gc_free(tgc); } /* ecore_x_image_put */ @@ -315,7 +315,7 @@ ecore_x_image_is_argb32_get(Ecore_X_Image *im) { Visual *vis = im->vis; if (!im->xim) _ecore_x_image_shm_create(im); - if (((vis->class == TrueColor) || + if (((vis->class == TrueColor) || (vis->class == DirectColor)) && (im->depth >= 24) && (vis->red_mask == 0xff0000) && @@ -324,9 +324,9 @@ ecore_x_image_is_argb32_get(Ecore_X_Image *im) { #ifdef WORDS_BIGENDIAN if (im->xim->bitmap_bit_order == LSBFirst) return EINA_TRUE; -#else +#else if (im->xim->bitmap_bit_order == MSBFirst) return EINA_TRUE; -#endif +#endif } return EINA_FALSE; } @@ -360,7 +360,7 @@ ecore_x_image_to_argb_convert(void *src, int sbpp, int mode = 0; sbpp *= 8; - + n = vis->map_entries; if ((n <= 256) && ((vis->class == PseudoColor) || @@ -382,14 +382,14 @@ ecore_x_image_to_argb_convert(void *src, int sbpp, XQueryColors(_ecore_x_disp, c, cols, n); for (i = 0; i < n; i++) { - pal[i] = 0xff000000 | + pal[i] = 0xff000000 | ((cols[i].red >> 8) << 16) | ((cols[i].green >> 8) << 8 ) | ((cols[i].blue >> 8) ); } nret = n; } - else if ((vis->class == TrueColor) || + else if ((vis->class == TrueColor) || (vis->class == DirectColor)) { if ((vis->red_mask == 0x00ff0000) && @@ -434,7 +434,7 @@ ecore_x_image_to_argb_convert(void *src, int sbpp, unsigned int *s32; unsigned int *dp, *de; - dp = ((unsigned int *)(((unsigned char *)dst) + + dp = ((unsigned int *)(((unsigned char *)dst) + ((dy + row) * dbpl))) + dx; de = dp + w; switch (sbpp) diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c index 9d406b111b..9bc5e5912c 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr.c @@ -80,7 +80,7 @@ ecore_x_randr_version_get(void) { return Ecore_X_Randr_Unset; } -#else +#else return -1; #endif } diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c index d94675f2fc..2c1a589768 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c @@ -81,7 +81,7 @@ _ecore_x_randr_crtc_validate(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc) int i; Eina_Bool ret = EINA_FALSE; - if ((crtc == Ecore_X_Randr_None) || + if ((crtc == Ecore_X_Randr_None) || (crtc == Ecore_X_Randr_Unset)) return ret; @@ -836,7 +836,7 @@ ecore_x_randr_crtc_orientations_get(Ecore_X_Window root, } if (crtc_info) XRRFreeCrtcInfo(crtc_info); - + if (res) XRRFreeScreenResources(res); @@ -866,10 +866,10 @@ ecore_x_randr_crtc_orientation_get(Ecore_X_Window root, Ecore_X_Randr_Crtc crtc) } if (crtc_info) XRRFreeCrtcInfo(crtc_info); - + if (res) XRRFreeScreenResources(res); - + return ret; #else return Ecore_X_Randr_None; @@ -2104,8 +2104,8 @@ ecore_x_randr_window_outputs_get(Ecore_X_Window window, if (_randr_version < RANDR_1_2) goto _ecore_x_randr_current_output_get_fail; - ecore_x_window_geometry_get(window, - &w_geo.x, &w_geo.y, + ecore_x_window_geometry_get(window, + &w_geo.x, &w_geo.y, &w_geo.w, &w_geo.h); root = ecore_x_window_root_get(window); @@ -2116,19 +2116,19 @@ ecore_x_randr_window_outputs_get(Ecore_X_Window window, XTranslateCoordinates(_ecore_x_disp, window, root, 0, 0, &rx, &ry, &tw); w_geo.x = rx; w_geo.y = ry; - + for (i = 0; i < ncrtcs; i++) { /* if crtc is not enabled, don't bother about it any further */ mode = ecore_x_randr_crtc_mode_get(root, crtcs[i]); if (mode == Ecore_X_Randr_None) continue; - ecore_x_randr_crtc_geometry_get(root, crtcs[i], - &c_geo.x, &c_geo.y, + ecore_x_randr_crtc_geometry_get(root, crtcs[i], + &c_geo.x, &c_geo.y, &c_geo.w, &c_geo.h); if (eina_rectangles_intersect(&w_geo, &c_geo)) { - outputs = ecore_x_randr_crtc_outputs_get(root, crtcs[i], + outputs = ecore_x_randr_crtc_outputs_get(root, crtcs[i], &noutputs); /* The case below should be impossible, but for safety reasons * remains */ diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c index 262c5bc307..dadfc923f6 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12_edid.c @@ -101,7 +101,7 @@ typedef enum _Ecore_X_Randr_Edid_Aspect_Ratio_Preferred { EAPI Eina_Bool ecore_x_randr_edid_has_valid_header(unsigned char *edid, unsigned long edid_length) { - const unsigned char header[] = + const unsigned char header[] = { 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00 }; if (!edid) return EINA_FALSE; if (edid_length < 8) return EINA_FALSE; @@ -112,9 +112,9 @@ ecore_x_randr_edid_has_valid_header(unsigned char *edid, unsigned long edid_leng EAPI int ecore_x_randr_edid_version_get(unsigned char *edid, unsigned long edid_length) { - if ((edid_length > _ECORE_X_RANDR_EDID_OFFSET_VERSION_MINOR) && + if ((edid_length > _ECORE_X_RANDR_EDID_OFFSET_VERSION_MINOR) && (ecore_x_randr_edid_has_valid_header(edid, edid_length))) - return ((edid[_ECORE_X_RANDR_EDID_OFFSET_VERSION_MAJOR] << 8) | + return ((edid[_ECORE_X_RANDR_EDID_OFFSET_VERSION_MAJOR] << 8) | edid[_ECORE_X_RANDR_EDID_OFFSET_VERSION_MINOR]); return ECORE_X_RANDR_EDID_UNKNOWN_VALUE; } @@ -122,7 +122,7 @@ ecore_x_randr_edid_version_get(unsigned char *edid, unsigned long edid_length) EAPI int ecore_x_randr_edid_manufacturer_model_get(unsigned char *edid, unsigned long edid_length) { - if ((edid_length > 0x0b) && + if ((edid_length > 0x0b) && (ecore_x_randr_edid_has_valid_header(edid, edid_length))) return (int)(edid[0x0a] + (edid[0x0b] << 8)); return ECORE_X_RANDR_EDID_UNKNOWN_VALUE; @@ -131,9 +131,9 @@ ecore_x_randr_edid_manufacturer_model_get(unsigned char *edid, unsigned long edi EAPI int ecore_x_randr_edid_manufacturer_serial_number_get(unsigned char *edid, unsigned long edid_length) { - if ((edid_length > 0x0f) && + if ((edid_length > 0x0f) && (ecore_x_randr_edid_has_valid_header(edid, edid_length))) - return (int)(edid[0x0c] + (edid[0x0d] << 8) + + return (int)(edid[0x0c] + (edid[0x0d] << 8) + (edid[0x0e] << 16) + (edid[0x0f] << 24)); return ECORE_X_RANDR_EDID_UNKNOWN_VALUE; } @@ -141,12 +141,12 @@ ecore_x_randr_edid_manufacturer_serial_number_get(unsigned char *edid, unsigned EAPI char * ecore_x_randr_edid_manufacturer_name_get(unsigned char *edid, unsigned long edid_length) { - if ((edid_length > (_ECORE_X_RANDR_EDID_OFFSET_MANUFACTURER + 1)) && + if ((edid_length > (_ECORE_X_RANDR_EDID_OFFSET_MANUFACTURER + 1)) && (ecore_x_randr_edid_has_valid_header(edid, edid_length))) { unsigned char *x; char *name; - + x = (edid + _ECORE_X_RANDR_EDID_OFFSET_MANUFACTURER); name = malloc(sizeof(char) * 4); if (!name) return NULL; @@ -164,7 +164,7 @@ ecore_x_randr_edid_display_name_get(unsigned char *edid, unsigned long edid_leng { unsigned char *block = NULL; int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return NULL; _ECORE_X_RANDR_EDID_FOR_EACH_NON_PIXEL_DESCRIPTOR_BLOCK(edid, block) { @@ -172,7 +172,7 @@ ecore_x_randr_edid_display_name_get(unsigned char *edid, unsigned long edid_leng { char *name, *p; const char *edid_name; - + edid_name = (const char *)block + _ECORE_X_RANDR_EDID_OFFSET_DESCRIPTOR_BLOCK_CONTENT; name = malloc(sizeof(char) * _ECORE_X_RANDR_EDID_DISPLAY_DESCRIPTOR_BLOCK_CONTENT_LENGTH_MAX); if (!name) return NULL; @@ -202,7 +202,7 @@ ecore_x_randr_edid_display_aspect_ratio_preferred_get(unsigned char *edid, unsig { Ecore_X_Randr_Edid_Aspect_Ratio_Preferred preferred_ratio = (Ecore_X_Randr_Edid_Aspect_Ratio_Preferred) - ((block[_ECORE_X_RANDR_EDID_OFFSET_ASPECT_RATIO_PREFERRED] & + ((block[_ECORE_X_RANDR_EDID_OFFSET_ASPECT_RATIO_PREFERRED] & _ECORE_X_RANDR_EDID_MASK_ASPECT_RATIO_PREFERRED) >> 5); switch (preferred_ratio) { @@ -230,7 +230,7 @@ ecore_x_randr_edid_display_aspect_ratios_get(unsigned char *edid, unsigned long Ecore_X_Randr_Edid_Aspect_Ratio ret = ECORE_X_RANDR_EDID_UNKNOWN_VALUE; unsigned char *block = NULL; int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return ECORE_X_RANDR_EDID_UNKNOWN_VALUE; _ECORE_X_RANDR_EDID_FOR_EACH_NON_PIXEL_DESCRIPTOR_BLOCK(edid, block) { @@ -264,7 +264,7 @@ ecore_x_randr_edid_display_ascii_get(unsigned char *edid, unsigned long edid_len if (block[_ECORE_X_RANDR_EDID_OFFSET_DESCRIPTOR_BLOCK_TYPE] == 0xfe) { char *ascii, *p; - const char *edid_ascii = (const char*)block + + const char *edid_ascii = (const char*)block + _ECORE_X_RANDR_EDID_OFFSET_DESCRIPTOR_BLOCK_CONTENT; /* * TODO: Two of these in a row, in the third and fouth slots, @@ -289,14 +289,14 @@ ecore_x_randr_edid_display_serial_get(unsigned char *edid, unsigned long edid_le { unsigned char *block = NULL; int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return NULL; _ECORE_X_RANDR_EDID_FOR_EACH_NON_PIXEL_DESCRIPTOR_BLOCK(edid, block) { if (block[_ECORE_X_RANDR_EDID_OFFSET_DESCRIPTOR_BLOCK_TYPE] == 0xff) { char *serial, *p; - const char *edid_serial = (const char*)block + + const char *edid_serial = (const char*)block + _ECORE_X_RANDR_EDID_OFFSET_DESCRIPTOR_BLOCK_CONTENT; /* * TODO: Two of these in a row, in the third and fouth slots, @@ -326,11 +326,11 @@ ecore_x_randr_edid_info_has_valid_checksum(unsigned char *edid, unsigned long ed if (version < ECORE_X_RANDR_EDID_VERSION_13) return EINA_FALSE; if (edid_length < 128) return EINA_FALSE; - + /* Check the EDID block itself */ for (i = 0; i < 128; i++) sum += edid[i]; if (sum) return EINA_FALSE; - + /* Check the cea extension blocks */ _ECORE_X_RANDR_EDID_FOR_EACH_CEA_BLOCK(edid, edid_length, cea_block_iter) { @@ -344,9 +344,9 @@ EAPI Eina_Bool ecore_x_randr_edid_dpms_available_get(unsigned char *edid, unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return EINA_FALSE; - return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & + return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & _ECORE_X_RANDR_EDID_MASK_DPMS)); } @@ -354,10 +354,10 @@ EAPI Eina_Bool ecore_x_randr_edid_dpms_standby_available_get(unsigned char *edid, unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return EINA_FALSE; if (edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & _ECORE_X_RANDR_EDID_MASK_DPMS) - return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & + return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & _ECORE_X_RANDR_EDID_MASK_DPMS_STANDBY)); return EINA_FALSE; } @@ -366,10 +366,10 @@ EAPI Eina_Bool ecore_x_randr_edid_dpms_suspend_available_get(unsigned char *edid, unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return EINA_FALSE; if (edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & _ECORE_X_RANDR_EDID_MASK_DPMS) - return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & + return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & _ECORE_X_RANDR_EDID_MASK_DPMS_SUSPEND)); return EINA_FALSE; } @@ -378,10 +378,10 @@ EAPI Eina_Bool ecore_x_randr_edid_dpms_off_available_get(unsigned char *edid, unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return EINA_FALSE; if (edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & _ECORE_X_RANDR_EDID_MASK_DPMS) - return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & + return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_DPMS] & _ECORE_X_RANDR_EDID_MASK_DPMS_OFF)); return EINA_FALSE; } @@ -390,9 +390,9 @@ EAPI Eina_Bool ecore_x_randr_edid_display_type_digital_get(unsigned char *edid, unsigned long edid_length) { int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return EINA_FALSE; - return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_TYPE] & + return (!!(edid[_ECORE_X_RANDR_EDID_OFFSET_TYPE] & _ECORE_X_RANDR_EDID_MASK_DIGITAL)); } @@ -401,15 +401,15 @@ ecore_x_randr_edid_display_colorscheme_get(unsigned char *edid, unsigned long ed { Ecore_X_Randr_Edid_Display_Colorscheme colorscheme = ECORE_X_RANDR_EDID_UNKNOWN_VALUE; int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return colorscheme; if (ecore_x_randr_edid_display_type_digital_get(edid, edid_length)) { colorscheme = ECORE_X_RANDR_EDID_DISPLAY_COLORSCHEME_COLOR_RGB_4_4_4; - if (edid[_ECORE_X_RANDR_EDID_OFFSET_COLORSPACE] & + if (edid[_ECORE_X_RANDR_EDID_OFFSET_COLORSPACE] & _ECORE_X_RANDR_EDID_MASK_COLORSCHEME_DIGITAL_YCRCB_444) colorscheme |= ECORE_X_RANDR_EDID_DISPLAY_COLORSCHEME_COLOR_RGB_YCRCB_4_4_4; - if (edid[_ECORE_X_RANDR_EDID_OFFSET_COLORSPACE] & + if (edid[_ECORE_X_RANDR_EDID_OFFSET_COLORSPACE] & _ECORE_X_RANDR_EDID_MASK_COLORSCHEME_DIGITAL_YCRCB_422) colorscheme |= ECORE_X_RANDR_EDID_DISPLAY_COLORSCHEME_COLOR_RGB_YCRCB_4_2_2; } @@ -423,9 +423,9 @@ ecore_x_randr_edid_display_interface_type_get(unsigned char *edid, unsigned long { Ecore_X_Randr_Edid_Display_Interface_Type type = ECORE_X_RANDR_EDID_UNKNOWN_VALUE; int version = ecore_x_randr_edid_version_get(edid, edid_length); - + if (version < ECORE_X_RANDR_EDID_VERSION_13) return type; - type = edid[_ECORE_X_RANDR_EDID_OFFSET_TYPE] & + type = edid[_ECORE_X_RANDR_EDID_OFFSET_TYPE] & _ECORE_X_RANDR_EDID_MASK_INTERFACE_TYPE; if (type > ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_DISPLAY_PORT) type = ECORE_X_RANDR_EDID_UNKNOWN_VALUE; diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c index 86232c8065..d33b9482c5 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_screensaver.c @@ -54,7 +54,7 @@ ecore_x_screensaver_idle_time_get(void) XFree(xss); return idle; -#else +#else return 0; #endif /* ifdef ECORE_XSS */ } /* ecore_x_screensaver_idle_time_get */ diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c index 28276e5cc7..bc2bb1feae 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_sync.c @@ -118,7 +118,7 @@ EAPI void ecore_x_sync_counter_set(Ecore_X_Sync_Counter counter, int val) { XSyncValue v; - + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncIntToValue(&v, val); XSyncSetCounter(_ecore_x_disp, counter, v); @@ -128,7 +128,7 @@ EAPI void ecore_x_sync_counter_2_set(Ecore_X_Sync_Counter counter, int val_hi, unsigned int val_lo) { XSyncValue v; - + LOGFN(__FILE__, __LINE__, __FUNCTION__); XSyncIntsToValue(&v, val_lo, val_hi); XSyncSetCounter(_ecore_x_disp, counter, v); diff --git a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c index 53ceab03c1..b9dd944d39 100644 --- a/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c +++ b/legacy/ecore/src/lib/ecore_x/xlib/ecore_x_window_shape.c @@ -66,7 +66,7 @@ EAPI void ecore_x_window_shape_input_window_set(Ecore_X_Window win, Ecore_X_Window shape_win) { -#ifdef ShapeInput +#ifdef ShapeInput LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineShape(_ecore_x_disp, win, @@ -79,7 +79,7 @@ ecore_x_window_shape_input_window_set(Ecore_X_Window win, #else return; win = shape_win = 0; -#endif +#endif } /* ecore_x_window_shape_input_window_set */ EAPI void @@ -105,7 +105,7 @@ ecore_x_window_shape_input_window_set_xy(Ecore_X_Window win, int x, int y) { -#ifdef ShapeInput +#ifdef ShapeInput LOGFN(__FILE__, __LINE__, __FUNCTION__); XShapeCombineShape(_ecore_x_disp, win, @@ -118,7 +118,7 @@ ecore_x_window_shape_input_window_set_xy(Ecore_X_Window win, #else return; win = shape_win = x = y = 0; -#endif +#endif } /* ecore_x_window_shape_input_window_set_xy */ EAPI void @@ -173,7 +173,7 @@ ecore_x_window_shape_input_rectangle_set(Ecore_X_Window win, #else return; win = x = y = w = h = 0; -#endif +#endif } /* ecore_x_window_shape_input_rectangle_set */ EAPI void @@ -251,7 +251,7 @@ ecore_x_window_shape_input_rectangles_set(Ecore_X_Window win, #else return; win = rects = num = 0; -#endif +#endif } /* ecore_x_window_shape_input_rectangles_set */ EAPI void @@ -286,7 +286,7 @@ ecore_x_window_shape_input_rectangle_subtract(Ecore_X_Window win, int w, int h) { -#ifdef ShapeInput +#ifdef ShapeInput XRectangle rect; LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -306,7 +306,7 @@ ecore_x_window_shape_input_rectangle_subtract(Ecore_X_Window win, #else return; win = x = y = w = h = 0; -#endif +#endif } /* ecore_x_window_shape_input_rectangle_subtract */ EAPI void @@ -359,7 +359,7 @@ ecore_x_window_shape_input_window_add_xy(Ecore_X_Window win, #else return; win = shape_win = x = y = 0; -#endif +#endif } /* ecore_x_window_shape_input_window_add_xy */ EAPI void @@ -394,7 +394,7 @@ ecore_x_window_shape_input_rectangle_add(Ecore_X_Window win, int w, int h) { -#ifdef ShapeInput +#ifdef ShapeInput XRectangle rect; LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -414,7 +414,7 @@ ecore_x_window_shape_input_rectangle_add(Ecore_X_Window win, #else return; win = x = y = w = h = 0; -#endif +#endif } /* ecore_x_window_shape_input_rectangle_add */ EAPI void @@ -469,7 +469,7 @@ ecore_x_window_shape_input_rectangle_clip(Ecore_X_Window win, #else return; win = x = y = w = h = 0; -#endif +#endif } /* ecore_x_window_shape_input_rectangle_clip */ EAPI void @@ -493,7 +493,7 @@ ecore_x_window_shape_rectangles_add(Ecore_X_Window win, rect[i].height = rects[i].height; } } - + XShapeCombineRectangles(_ecore_x_disp, win, ShapeBounding, @@ -528,7 +528,7 @@ ecore_x_window_shape_input_rectangles_add(Ecore_X_Window win, rect[i].height = rects[i].height; } } - + XShapeCombineRectangles(_ecore_x_disp, win, ShapeInput, @@ -542,7 +542,7 @@ ecore_x_window_shape_input_rectangles_add(Ecore_X_Window win, #else return; win = rects = num = 0; -#endif +#endif } /* ecore_x_window_shape_input_rectangles_add */ EAPI Ecore_X_Rectangle * @@ -622,7 +622,7 @@ ecore_x_window_shape_input_rectangles_get(Ecore_X_Window win, int *num_ret) if (num_ret) *num_ret = 0; return NULL; win = 0; -#endif +#endif } /* ecore_x_window_shape_input_rectangles_get */ EAPI void