Compare commits
18 Commits
Author | SHA1 | Date |
---|---|---|
Dmitri Chudinov | e371555774 | |
Dmitri Chudinov | 7d74e3fad8 | |
Dmitri Chudinov | 32e5fb84b0 | |
Dmitri Chudinov | 72d191bde7 | |
Dmitri Chudinov | 5f2df980ac | |
Dmitri Chudinov | c67c6ccc01 | |
Dmitri Chudinov | 67dde68af7 | |
Dmitri Chudinov | 986c4f9214 | |
Dmitri Chudinov | d87e2f54df | |
Dmitri Chudinov | 20e4c949df | |
Dmitri Chudinov | 45d7e64775 | |
Dmitri Chudinov | 7309b85f27 | |
Dmitri Chudinov | 16decad1aa | |
Dmitri Chudinov | 6d0c8f4c82 | |
Dmitri Chudinov | f5ce4f8290 | |
Dmitri Chudinov | 847093ae23 | |
Dmitri Chudinov | 6cadc4f41e | |
Dmitri Chudinov | b6d43ec705 |
|
@ -889,6 +889,7 @@ ICON("preferences-desktop-screensaver", "i-screen")
|
|||
ICON("preferences-desktop-wallpaper", "i-picture-landscape")
|
||||
ICON("preferences-system", "i-gear")
|
||||
ICON("preferences-other", "i-gear-spanner")
|
||||
ICON("preferences-etc", "i-utilities")
|
||||
ICON("system-file-manager", "i-folder")
|
||||
ICON("applications-accessories", "i-scissor-rule")
|
||||
ICON("applications-development", "i-gear-curly-braces")
|
||||
|
|
|
@ -360,7 +360,7 @@ I160("i-monitor-speakers", "monitor-speakers")
|
|||
I160("i-briefcase", "briefcase")
|
||||
I160("i-app-window", "app-window")
|
||||
I160("i-beaker", "beaker")
|
||||
// not used yet I160("i-utilities", "utilities")
|
||||
I160("i-utilities", "utilities")
|
||||
I160("i-sun", "sun")
|
||||
I160("i-moon", "moon")
|
||||
I160("i-moon-clouds", "moon-clouds")
|
||||
|
|
|
@ -3376,7 +3376,7 @@ _profiles_list_unselect_cb(void *data EINA_UNUSED,
|
|||
Evas_Object *obj,
|
||||
void *event_info EINA_UNUSED)
|
||||
{
|
||||
if (elm_list_selected_item_get(obj)) return;
|
||||
if (!elm_list_selected_item_get(obj)) return;
|
||||
elm_object_disabled_set(evas_object_data_get(obj, "prof_del_btn"),
|
||||
EINA_TRUE);
|
||||
elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"),
|
||||
|
@ -4383,11 +4383,16 @@ _status_config_full(Evas_Object *win,
|
|||
"Audio", _cf_audio, win);
|
||||
elm_toolbar_item_append(tb, "preferences-profile",
|
||||
"Profiles", _cf_profiles, win);
|
||||
elm_toolbar_item_append(tb, NULL, "Scrolling", _cf_scrolling, win);
|
||||
elm_toolbar_item_append(tb, NULL, "Rendering", _cf_rendering, win);
|
||||
elm_toolbar_item_append(tb, NULL, "Caches", _cf_caches, win);
|
||||
elm_toolbar_item_append(tb, NULL, "Focus", _cf_focus, win);
|
||||
elm_toolbar_item_append(tb, NULL, "Etc", _cf_etc, win);
|
||||
elm_toolbar_item_append(tb, "system-run",
|
||||
"Scrolling", _cf_scrolling, win);
|
||||
elm_toolbar_item_append(tb, "preferences-desktop",
|
||||
"Rendering", _cf_rendering, win);
|
||||
elm_toolbar_item_append(tb, "appointment-new",
|
||||
"Caches", _cf_caches, win);
|
||||
elm_toolbar_item_append(tb, "magnifying-glass",
|
||||
"Focus", _cf_focus, win);
|
||||
elm_toolbar_item_append(tb, "preferences-etc",
|
||||
"Etc", _cf_etc, win);
|
||||
|
||||
elm_box_pack_end(bx0, tb);
|
||||
evas_object_show(tb);
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
// Compile with:
|
||||
// gcc -o ecore_audio_custom ecore_audio_custom.c `pkg-config --libs --cflags ecore ecore-audio`
|
||||
#define EFL_BETA_API_SUPPORT
|
||||
#ifndef EFL_BETA_API_SUPPORT
|
||||
# define EFL_BETA_API_SUPPORT
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
// Compile with:
|
||||
// gcc -o ecore_audio_playback ecore_audio_playback.c `pkg-config --libs --cflags ecore eina ecore-audio`
|
||||
#define EFL_BETA_API_SUPPORT
|
||||
#ifndef EFL_BETA_API_SUPPORT
|
||||
# define EFL_BETA_API_SUPPORT
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
// Compile with:
|
||||
// gcc -o ecore_audio_to_ogg ecore_audio_to_ogg.c `pkg-config --libs --cflags ecore eina ecore-audio`
|
||||
#define EFL_BETA_API_SUPPORT
|
||||
#ifndef EFL_BETA_API_SUPPORT
|
||||
# define EFL_BETA_API_SUPPORT
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <libgen.h>
|
||||
|
|
|
@ -447,7 +447,11 @@ _ecore_main_fdh_poll_add(Efl_Loop_Data *pd EINA_UNUSED, Ecore_Fd_Handler *fdh)
|
|||
fdh->gfd.events = _gfd_events_from_fdh(fdh);
|
||||
fdh->gfd.revents = 0;
|
||||
DBG("adding gpoll on %d %08x", fdh->fd, fdh->gfd.events);
|
||||
g_source_add_poll(ecore_glib_source, &fdh->gfd);
|
||||
if (ecore_glib_source)
|
||||
g_source_add_poll(ecore_glib_source, &fdh->gfd);
|
||||
else
|
||||
ERR("Failed to add gpoll on %d %08x. GSource is NULL",
|
||||
fdh->fd, fdh->gfd.events);
|
||||
#endif
|
||||
}
|
||||
return r;
|
||||
|
@ -939,29 +943,6 @@ quit:
|
|||
static void
|
||||
_ecore_main_loop_setup(Eo *obj, Efl_Loop_Data *pd)
|
||||
{
|
||||
// Please note that this function is being also called in case of a bad
|
||||
// fd to reset the main loop.
|
||||
#ifdef HAVE_SYS_EPOLL_H
|
||||
pd->epoll_fd = epoll_create(1);
|
||||
if (pd->epoll_fd < 0) WRN("Failed to create epoll fd!");
|
||||
else
|
||||
{
|
||||
eina_file_close_on_exec(pd->epoll_fd, EINA_TRUE);
|
||||
|
||||
pd->epoll_pid = getpid();
|
||||
|
||||
// add polls on all our file descriptors
|
||||
Ecore_Fd_Handler *fdh;
|
||||
EINA_INLIST_FOREACH(pd->fd_handlers, fdh)
|
||||
{
|
||||
if (fdh->delete_me) continue;
|
||||
_ecore_epoll_add(pd->epoll_fd, fdh->fd,
|
||||
_ecore_poll_events_from_fdh(fdh), fdh);
|
||||
_ecore_main_fdh_poll_add(pd, fdh);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
if (obj == ML_OBJ)
|
||||
{
|
||||
#ifdef HAVE_LIBUV
|
||||
|
@ -1072,6 +1053,30 @@ _ecore_main_loop_setup(Eo *obj, Efl_Loop_Data *pd)
|
|||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
// Please note that this function is being also called in case of a bad
|
||||
// fd to reset the main loop.
|
||||
#ifdef HAVE_SYS_EPOLL_H
|
||||
pd->epoll_fd = epoll_create(1);
|
||||
if (pd->epoll_fd < 0) WRN("Failed to create epoll fd!");
|
||||
else
|
||||
{
|
||||
eina_file_close_on_exec(pd->epoll_fd, EINA_TRUE);
|
||||
|
||||
pd->epoll_pid = getpid();
|
||||
|
||||
// add polls on all our file descriptors
|
||||
Ecore_Fd_Handler *fdh;
|
||||
EINA_INLIST_FOREACH(pd->fd_handlers, fdh)
|
||||
{
|
||||
if (fdh->delete_me) continue;
|
||||
_ecore_epoll_add(pd->epoll_fd, fdh->fd,
|
||||
_ecore_poll_events_from_fdh(fdh), fdh);
|
||||
_ecore_main_fdh_poll_add(pd, fdh);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
_ecore_main_timechanges_start(obj);
|
||||
}
|
||||
|
||||
|
|
|
@ -193,11 +193,13 @@ elua_state_new(const char *progname)
|
|||
lua_setfield(L, LUA_REGISTRYINDEX, "elua_ptr1");
|
||||
lua_setfield(L, LUA_REGISTRYINDEX, "elua_ptr2");
|
||||
return ret;
|
||||
#ifdef ENABLE_LUA_OLD
|
||||
err:
|
||||
lua_close(L);
|
||||
eina_stringshare_del(ret->progname);
|
||||
free(ret);
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
|
||||
EAPI void
|
||||
|
|
|
@ -458,7 +458,7 @@ static Ecore_Evas_Engine_Func _ecore_sdl_engine_func =
|
|||
};
|
||||
|
||||
static Ecore_Evas*
|
||||
_ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha)
|
||||
_ecore_evas_internal_sdl_new(int rmethod, const char* name, int w, int h, int fullscreen, int hwsurface, int noframe EINA_UNUSED, int alpha)
|
||||
{
|
||||
Ecore_Evas_SDL_Switch_Data *swd;
|
||||
Ecore_Evas *ee;
|
||||
|
|
|
@ -21,9 +21,9 @@ EFL_START_TEST(elua_api)
|
|||
lua_State *lst;
|
||||
FILE *f;
|
||||
int fd;
|
||||
char *cargv[2];
|
||||
char arg1[] = "test";
|
||||
char arg2[] = "test";
|
||||
const char *cargv[2];
|
||||
const char arg1[] = "test";
|
||||
const char arg2[] = "test";
|
||||
int quit = 0;
|
||||
cargv[0] = arg1;
|
||||
cargv[1] = arg2;
|
||||
|
@ -106,14 +106,14 @@ EFL_START_TEST(elua_api)
|
|||
fprintf(f, "return true");
|
||||
fclose(f);
|
||||
cargv[1] = tmpf;
|
||||
fail_if(!elua_util_script_run(st, 2, cargv, 1, &quit));
|
||||
fail_if(!elua_util_script_run(st, 2, (char **)cargv, 1, &quit));
|
||||
fail_if(quit != 1);
|
||||
|
||||
f = fopen(tmpf, "wb");
|
||||
fail_if(!f);
|
||||
fprintf(f, "return false");
|
||||
fclose(f);
|
||||
fail_if(!elua_util_script_run(st, 2, cargv, 1, &quit));
|
||||
fail_if(!elua_util_script_run(st, 2, (char **)cargv, 1, &quit));
|
||||
fail_if(quit != 0);
|
||||
fail_if(remove(tmpf));
|
||||
|
||||
|
|
Loading…
Reference in New Issue