kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2021-03-03 09:59:08 +09:00
parent a5f22e73d2 91f07de890
commit ec2356e9fb
19 changed files with 111 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
header_checks/meson.build
View File

@ -113,6 +113,7 @@ function_checks = [
['dlopen', ['dlfcn.h'], ['dl']],
['dlsym', ['dlfcn.h'], ['dl']],
['lround', ['math.h'], ['m']],
['mallinfo2', ['malloc.h'], ['malloc']],
['mallinfo', ['malloc.h'], ['malloc']],
['shm_open', ['sys/mman.h', 'sys/stat.h', 'fcntl.h'], ['rt']],
#from here on we specify arguments

63
src/lib/ecore/ecore.c
View File

@ -32,8 +32,8 @@
#include "ecore_private.h"
#include "../../static_libs/buildsystem/buildsystem.h"
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
#include <malloc.h>
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
# include <malloc.h>
#endif
#ifndef O_BINARY
@ -45,14 +45,19 @@ EAPI Ecore_Version *ecore_version = &_version;
EAPI double _efl_startup_time = 0;
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
#define KEEP_MAX(Global, Local) \
if (Global < (Local)) \
Global = Local;
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
# define KEEP_MAX(Global, Local) \
if (Global < (Local)) \
Global = Local;
static Eina_Bool _ecore_memory_statistic(void *data);
# ifdef HAVE_MALLINFO2
static size_t _ecore_memory_max_total = 0;
static size_t _ecore_memory_max_free = 0;
# else
static int _ecore_memory_max_total = 0;
static int _ecore_memory_max_free = 0;
# endif
static pid_t _ecore_memory_pid = 0;
#ifdef HAVE_MALLOC_INFO
static FILE *_ecore_memory_statistic_file = NULL;
@ -291,7 +296,7 @@ ecore_init(void)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
if (getenv("ECORE_MEM_STAT"))
{
#ifdef HAVE_MALLOC_INFO
@ -432,16 +437,22 @@ ecore_shutdown(void)
_ecore_main_loop_shutdown();
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
if (getenv("ECORE_MEM_STAT"))
{
_ecore_memory_statistic(NULL);
#ifdef HAVE_MALLINFO2
ERR("[%i] Memory MAX total: %lu, free: %lu",
_ecore_memory_pid,
_ecore_memory_max_total,
_ecore_memory_max_free);
#else
ERR("[%i] Memory MAX total: %i, free: %i",
_ecore_memory_pid,
_ecore_memory_max_total,
_ecore_memory_max_free);
#endif
#ifdef HAVE_MALLOC_INFO
fclose(_ecore_memory_statistic_file);
@ -963,20 +974,30 @@ _systemd_watchdog_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
}
#endif
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO)
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLOC_INFO) || defined(HAVE_MALLINFO2)
static Eina_Bool
_ecore_memory_statistic(EINA_UNUSED void *data)
{
#ifdef HAVE_MALLOC_INFO
static int frame = 0;
#endif
#ifdef HAVE_MALLINFO
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
Eina_Bool changed = EINA_FALSE;
# if defined(HAVE_MALLINFO2)
struct mallinfo2 mi;
static size_t uordblks = 0;
static size_t fordblks = 0;
mi = mallinfo2();
# else
struct mallinfo mi;
static int uordblks = 0;
static int fordblks = 0;
Eina_Bool changed = EINA_FALSE;
mi = mallinfo();
# endif
#define HAS_CHANGED(Global, Local) \
if (Global != Local) \
@ -989,14 +1010,24 @@ _ecore_memory_statistic(EINA_UNUSED void *data)
HAS_CHANGED(fordblks, mi.fordblks);
if (changed)
ERR("[%i] Memory total: %i, free: %i",
_ecore_memory_pid,
mi.uordblks,
mi.fordblks);
{
#ifdef HAVE_MALLINFO2
ERR("[%i] Memory total: %lu, free: %lu",
_ecore_memory_pid,
mi.uordblks,
mi.fordblks);
#else
ERR("[%i] Memory total: %i, free: %i",
_ecore_memory_pid,
mi.uordblks,
mi.fordblks);
#endif
}
KEEP_MAX(_ecore_memory_max_total, mi.uordblks);
KEEP_MAX(_ecore_memory_max_free, mi.fordblks);
#endif
#ifdef HAVE_MALLOC_INFO
if (frame) fputs("\n", _ecore_memory_statistic_file);
malloc_info(0, _ecore_memory_statistic_file);

6
src/lib/ecore/efl_loop.c
View File

@ -140,7 +140,11 @@ efl_loop_exit_code_process(Eina_Value *value)
eina_value_setup(&v, EINA_VALUE_TYPE_INT);
if (!eina_value_convert(value, &v)) r = -1;
else eina_value_get(&v, &r);
else
{
if (!eina_value_get(&v, &r))
r = -1;
}
}
else
{

16
src/lib/ecore_wl2/ecore_wl2_display.c
View File

@ -307,15 +307,6 @@ _cb_global_add(void *data, struct wl_registry *registry, unsigned int id, const
ewd->wl.data_device_manager =
wl_registry_bind(registry, id, &wl_data_device_manager_interface, ewd->wl.data_device_manager_version);
}
else if ((eina_streq(interface, "www")) &&
(getenv("EFL_WAYLAND_ENABLE_WWW")))
{
Ecore_Wl2_Window *window;
ewd->wl.www = wl_registry_bind(registry, id, &www_interface, 1);
EINA_INLIST_FOREACH(ewd->windows, window)
_ecore_wl2_window_www_surface_init(window);
}
else if ((!strcmp(interface, "zwp_e_session_recovery")) &&
(!no_session_recovery))
{
@ -335,12 +326,6 @@ _cb_global_add(void *data, struct wl_registry *registry, unsigned int id, const
EINA_INLIST_FOREACH(ewd->windows, window)
if (window->surface) efl_aux_hints_get_supported_aux_hints(ewd->wl.efl_aux_hints, window->surface);
}
else if (!strcmp(interface, "zwp_teamwork"))
{
ewd->wl.teamwork =
wl_registry_bind(registry, id,
&zwp_teamwork_interface, EFL_TEAMWORK_VERSION);
}
else if (!strcmp(interface, "wl_output"))
_ecore_wl2_output_add(ewd, id);
else if (!strcmp(interface, "wl_seat"))
@ -452,7 +437,6 @@ _ecore_wl2_display_globals_cleanup(Ecore_Wl2_Display *ewd)
{
if (ewd->wl.session_recovery)
zwp_e_session_recovery_destroy(ewd->wl.session_recovery);
if (ewd->wl.www) www_destroy(ewd->wl.www);
if (ewd->wl.xdg_wm_base) xdg_wm_base_destroy(ewd->wl.xdg_wm_base);
if (ewd->wl.zxdg_shell) zxdg_shell_v6_destroy(ewd->wl.zxdg_shell);
if (ewd->wl.shm) wl_shm_destroy(ewd->wl.shm);

25
src/lib/ecore_wl2/ecore_wl2_private.h
View File

@ -5,12 +5,8 @@
# include "Ecore_Wl2.h"
# include "Ecore_Input.h"
# include <xkbcommon/xkbcommon-compose.h>
# include "www-client-protocol.h"
# include "ecore_wl2_internal.h"
# define EFL_TEAMWORK_VERSION 2
# include "teamwork-client-protocol.h"
# include "session-recovery-client-protocol.h"
# include "xdg-shell-client-protocol.h"
@ -91,10 +87,8 @@ struct _Ecore_Wl2_Display
struct zwp_linux_dmabuf_v1 *dmabuf;
struct zxdg_shell_v6 *zxdg_shell;
struct xdg_wm_base *xdg_wm_base;
struct www *www;
struct zwp_e_session_recovery *session_recovery;
struct efl_aux_hints *efl_aux_hints;
struct zwp_teamwork *teamwork;
struct efl_hints *efl_hints;
int compositor_version;
} wl;
@ -182,7 +176,6 @@ struct _Ecore_Wl2_Window
struct wl_surface *surface;
void *buffer;
struct wl_callback *callback;
struct www_surface *www_surface;
struct xdg_surface *xdg_surface;
struct xdg_toplevel *xdg_toplevel;
struct xdg_popup *xdg_popup;
@ -529,20 +522,6 @@ struct _Ecore_Wl2_Input
Eina_List *devices_list;
};
typedef struct Ecore_Wl2_Event_Window_WWW
{
Ecore_Wl2_Window *window;
int x_rel;
int y_rel;
uint32_t timestamp;
} Ecore_Wl2_Event_Window_WWW;
typedef struct Ecore_Wl2_Event_Window_WWW_Drag
{
Ecore_Wl2_Window *window;
Eina_Bool dragging;
} Ecore_Wl2_Event_Window_WWW_Drag;
typedef struct _Buffer_Handle Buffer_Handle;
typedef struct _Ecore_Wl2_Buffer
{
@ -573,9 +552,6 @@ typedef struct _Ecore_Wl2_Surface
Eina_Bool alpha : 1;
} Ecore_Wl2_Surface;
EAPI extern int _ecore_wl2_event_window_www;
EAPI extern int _ecore_wl2_event_window_www_drag;
Ecore_Wl2_Window *_ecore_wl2_display_window_surface_find(Ecore_Wl2_Display *display, struct wl_surface *wl_surface);
void _display_event_free(void *d, void *event EINA_UNUSED);
@ -605,7 +581,6 @@ void _ecore_wl2_subsurf_free(Ecore_Wl2_Subsurface *subsurf);
void _ecore_wl2_window_surface_create(Ecore_Wl2_Window *window);
void _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window);
void _ecore_wl2_window_www_surface_init(Ecore_Wl2_Window *window);
void _ecore_wl2_window_semi_free(Ecore_Wl2_Window *window);
void _ecore_wl2_offer_unref(Ecore_Wl2_Offer *offer);

69
src/lib/ecore_wl2/ecore_wl2_window.c
View File

@ -28,10 +28,6 @@ _ecore_wl2_window_semi_free(Ecore_Wl2_Window *window)
if (window->zxdg_surface) zxdg_surface_v6_destroy(window->zxdg_surface);
window->zxdg_surface = NULL;
if (window->www_surface)
www_surface_destroy(window->www_surface);
window->www_surface = NULL;
if (window->surface) wl_surface_destroy(window->surface);
window->surface = NULL;
window->surface_id = -1;
@ -131,70 +127,6 @@ _configure_complete(Ecore_Wl2_Window *window)
#include "window_v6.x"
static void
_www_surface_end_drag(void *data, struct www_surface *www_surface EINA_UNUSED)
{
Ecore_Wl2_Window *window = data;
Ecore_Wl2_Event_Window_WWW_Drag *ev;
ev = malloc(sizeof(Ecore_Wl2_Event_Window_WWW_Drag));
EINA_SAFETY_ON_NULL_RETURN(ev);
ev->window = window;
ev->dragging = 0;
ecore_event_add(_ecore_wl2_event_window_www_drag, ev, NULL, NULL);
}
static void
_www_surface_start_drag(void *data, struct www_surface *www_surface EINA_UNUSED)
{
Ecore_Wl2_Window *window = data;
Ecore_Wl2_Event_Window_WWW_Drag *ev;
ev = malloc(sizeof(Ecore_Wl2_Event_Window_WWW_Drag));
EINA_SAFETY_ON_NULL_RETURN(ev);
ev->window = window;
ev->dragging = 1;
ecore_event_add(_ecore_wl2_event_window_www_drag, ev, NULL, NULL);
}
static void
_www_surface_status(void *data, struct www_surface *www_surface EINA_UNUSED, int32_t x_rel, int32_t y_rel, uint32_t timestamp)
{
Ecore_Wl2_Window *window = data;
Ecore_Wl2_Event_Window_WWW *ev;
ev = malloc(sizeof(Ecore_Wl2_Event_Window_WWW));
EINA_SAFETY_ON_NULL_RETURN(ev);
ev->window = window;
ev->x_rel = x_rel;
ev->y_rel = y_rel;
ev->timestamp = timestamp;
ecore_event_add(_ecore_wl2_event_window_www, ev, NULL, NULL);
}
static struct www_surface_listener _www_surface_listener =
{
.status = _www_surface_status,
.start_drag = _www_surface_start_drag,
.end_drag = _www_surface_end_drag,
};
void
_ecore_wl2_window_www_surface_init(Ecore_Wl2_Window *window)
{
if (!window->surface) return;
if (!window->display->wl.www) return;
if (window->www_surface) return;
window->www_surface = www_create(window->display->wl.www, window->surface);
www_surface_set_user_data(window->www_surface, window);
www_surface_add_listener(window->www_surface, &_www_surface_listener,
window);
}
static void
_xdg_surface_cb_configure(void *data, struct xdg_surface *xdg_surface EINA_UNUSED, uint32_t serial)
{
@ -639,7 +571,6 @@ ecore_wl2_window_show(Ecore_Wl2_Window *window)
(window->type != ECORE_WL2_WINDOW_TYPE_NONE))
{
_ecore_wl2_window_shell_surface_init(window);
_ecore_wl2_window_www_surface_init(window);
_ecore_wl2_window_show_send(window);
}
else

9
src/lib/eeze/eeze_disk.c
View File

@ -174,10 +174,12 @@ eeze_disk_new(const char *path)
else if (!(dev = _new_device(path)))
return NULL;
if (!(disk = calloc(1, sizeof(Eeze_Disk))))
return NULL;
{
eina_stringshare_del(syspath);
udev_device_unref(dev);
return NULL;
}
if (is_dev)
{
@ -187,7 +189,6 @@ eeze_disk_new(const char *path)
else
disk->syspath = eina_stringshare_add(udev_device_get_syspath(dev));
disk->device = dev;
disk->mount_opts = EEZE_DISK_MOUNTOPT_DEFAULTS;
disk->mount_cmd_changed = EINA_TRUE;

4
src/lib/eina/eina_promise.c
View File

@ -1468,7 +1468,9 @@ _eina_future_cb_ignore_error(void *data, const Eina_Value value,
if (value.type == EINA_VALUE_TYPE_ERROR)
{
Eina_Error err;
eina_value_get(&value, &err);
if (!eina_value_get(&value, &err))
return EINA_VALUE_EMPTY;
if ((!expected_err) || (expected_err == err))
{
DBG("ignored error %d (%s)", err, eina_error_msg_get(err));

24
src/lib/eina/eina_value.c
View File

@ -4614,27 +4614,27 @@ eina_value_optional_pset(Eina_Value *value,
{
eina_value_optional_reset(value);
if(sizeof(Eina_Value_Optional_Outer) <= sizeof(Eina_Value_Union))
if (sizeof(Eina_Value_Optional_Outer) <= sizeof(Eina_Value_Union))
{
Eina_Value_Optional_Outer outer;
outer.subtype = subtype;
outer.value = malloc(subtype->value_size);
eina_value_type_setup(subtype, outer.value);
eina_value_type_pset(subtype, outer.value, subvalue);
if (!eina_value_pset(value, &outer))
{
return EINA_FALSE;
}
Eina_Value_Optional_Outer outer;
outer.subtype = subtype;
outer.value = malloc(subtype->value_size);
if (!eina_value_type_setup(subtype, outer.value))
return EINA_FALSE;
eina_value_type_pset(subtype, outer.value, subvalue);
if (!eina_value_pset(value, &outer))
return EINA_FALSE;
}
else
{
Eina_Value_Optional_Inner *inner =
malloc(sizeof(Eina_Value_Optional_Inner) + subtype->value_size);
inner->subtype = subtype;
eina_value_type_setup(subtype, inner->value);
if (!eina_value_type_setup(subtype, inner->value))
return EINA_FALSE;
eina_value_type_pset(subtype, inner->value, subvalue);
if (!eina_value_pset(value, &inner))
return EINA_FALSE;
return EINA_FALSE;
}
return EINA_TRUE;

22
src/lib/elementary/efl_ui_format.c
View File

@ -336,15 +336,19 @@ _efl_ui_format_decimal_places_get(Eo *obj EINA_UNUSED, Efl_Ui_Format_Data *pd)
EOLIAN static void
_efl_ui_format_efl_object_destructor(Eo *obj, Efl_Ui_Format_Data *pd EINA_UNUSED)
{
/* Legacy widgets keep their own formatting data and have their own destructors */
if (!elm_widget_is_legacy(obj))
{
/* Otherwise, free formatting data */
efl_ui_format_func_set(obj, NULL, NULL, NULL);
efl_ui_format_values_set(obj, NULL);
efl_ui_format_string_set(obj, NULL, 0);
}
efl_destructor(efl_super(obj, EFL_UI_FORMAT_MIXIN));
if (pd->format_func_free)
{
efl_ui_format_func_set(obj, NULL, NULL, NULL);
}
if (pd->format_values)
{
efl_ui_format_values_set(obj, NULL);
}
if (pd->format_string_type)
{
efl_ui_format_string_set(obj, NULL, 0);
}
efl_destructor(efl_super(obj, EFL_UI_FORMAT_MIXIN));
}
#include "efl_ui_format.eo.c"

3
src/lib/elementary/elm_glview.c
View File

@ -53,7 +53,8 @@ _glview_update_surface(Evas_Object *obj)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (!sd) return;
evas_gl_make_current(sd->evasgl, NULL, NULL);
if (!evas_gl_make_current(sd->evasgl, NULL, NULL))
return;
if (sd->surface)
{

7
src/lib/elementary/elm_slider.c
View File

@ -1270,6 +1270,9 @@ _elm_slider_efl_ui_format_format_cb_set(Eo *obj, Elm_Slider_Data *sd, void *func
if (sd->format_cb_data && sd->format_free_cb)
sd->format_free_cb(sd->format_cb_data);
// sd->format_cb = NULL;
// sd->format_cb_data = NULL;
// sd->format_free_cb = NULL;
if (efl_invalidated_get(obj)) return;
@ -1571,7 +1574,9 @@ _format_legacy_to_format_eo_cb(void *data, Eina_Strbuf *str, const Eina_Value va
const Eina_Value_Type *type = eina_value_type_get(&value);
if (type == EINA_VALUE_TYPE_DOUBLE)
eina_value_get(&value, &val);
{
if (!eina_value_get(&value, &val)) return EINA_FALSE;
}
if (sfwd->format_cb)
buf = sfwd->format_cb(val);

48
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -987,45 +987,6 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
}
}
static Eina_Bool
_ecore_evas_wl_common_cb_www_drag(void *d EINA_UNUSED, int t EINA_UNUSED, void *event)
{
Ecore_Wl2_Event_Window_WWW_Drag *ev = event;
Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Evas *ee;
ee = ecore_event_window_match((Ecore_Window)ev->window);
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
if ((Ecore_Window)ev->window != ee->prop.window)
return ECORE_CALLBACK_PASS_ON;
wdata = ee->engine.data;
wdata->dragging = !!ev->dragging;
if (!ev->dragging)
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
_ecore_evas_wl_common_cb_www(void *d EINA_UNUSED, int t EINA_UNUSED, void *event)
{
Ecore_Wl2_Event_Window_WWW *ev = event;
Ecore_Evas_Engine_Wl_Data *wdata;
Ecore_Evas *ee;
ee = ecore_event_window_match((Ecore_Window)ev->window);
if ((!ee) || (ee->ignore_events)) return ECORE_CALLBACK_PASS_ON;
if ((Ecore_Window)ev->window != ee->prop.window)
return ECORE_CALLBACK_PASS_ON;
wdata = ee->engine.data;
wdata->x_rel += ev->x_rel;
wdata->y_rel += ev->y_rel;
wdata->timestamp = ev->timestamp;
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
return ECORE_CALLBACK_RENEW;
}
static void
_ecore_evas_wl_common_cb_device_event_free(void *user_data, void *func_data)
{
@ -1361,14 +1322,6 @@ _ecore_evas_wl_common_init(void)
_ecore_evas_wl_common_cb_window_configure, NULL);
eina_array_push(_ecore_evas_wl_event_hdls, h);
h = ecore_event_handler_add(_ecore_wl2_event_window_www,
_ecore_evas_wl_common_cb_www, NULL);
eina_array_push(_ecore_evas_wl_event_hdls, h);
h = ecore_event_handler_add(_ecore_wl2_event_window_www_drag,
_ecore_evas_wl_common_cb_www_drag, NULL);
eina_array_push(_ecore_evas_wl_event_hdls, h);
h = ecore_event_handler_add(ECORE_WL2_EVENT_DISCONNECT,
_ecore_evas_wl_common_cb_disconnect, NULL);
eina_array_push(_ecore_evas_wl_event_hdls, h);
@ -2255,7 +2208,6 @@ _ecore_evas_wl_common_show(Ecore_Evas *ee)
einfo->info.destination_alpha = ee_needs_alpha(ee);
einfo->info.wl2_win = wdata->win;
einfo->info.hidden = wdata->win->pending.configure; //EINA_FALSE;
einfo->www_avail = !!wdata->win->www_surface;
if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
if (ECORE_EVAS_PORTRAIT(ee))

4
src/tests/eina/eina_test_file.c
View File

@ -357,12 +357,12 @@ EFL_START_TEST(eina_file_map_new_test)
strcat(test_file2_path, test_file2_name_part);
fd = open(test_file_path, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, S_IWUSR | S_IRUSR);
fail_if(fd == 0);
fail_if(fd <= 0);
fail_if(write(fd, eina_map_test_string, strlen(eina_map_test_string)) != (ssize_t) strlen(eina_map_test_string));
close(fd);
fd = open(test_file2_path, O_WRONLY | O_BINARY | O_CREAT | O_TRUNC, S_IWUSR | S_IRUSR);
fail_if(fd == 0);
fail_if(fd <= 0);
fail_if(write(fd, big_buffer, big_buffer_size - file_min_offset) != big_buffer_size - file_min_offset);
close(fd);

2
src/tests/eio/eio_test_manager.c
View File

@ -88,7 +88,7 @@ _done_cb(void *data,
unsigned long files_count = 0;
eina_value_setup(&convert, EINA_VALUE_TYPE_ULONG);
eina_value_convert(&file, &convert);
fail_if(eina_value_convert(&file, &convert) != EINA_TRUE);
fail_unless(eina_value_ulong_get(&convert, &files_count));
fail_if((*number_of_listed_files) != test_count);

18
src/tests/eldbus/eldbus_fake_server.c
View File

@ -153,12 +153,20 @@ _fake_server_property_set(const Eldbus_Service_Interface *iface,
ck_assert_ptr_ne(NULL, data);
if (strcmp(propname, FAKE_SERVER_WRITEONLY_PROPERTY) == 0)
eldbus_message_iter_arguments_get(iter, "i", &data->writeonly_property);
{
if (!eldbus_message_iter_arguments_get(iter, "i", &data->writeonly_property))
ck_abort_msg("error getting iter arguments on _fake_server_property_set");
}
else
if (strcmp(propname, FAKE_SERVER_READWRITE_PROPERTY) == 0)
eldbus_message_iter_arguments_get(iter, "i", &data->readwrite_property);
else
return eldbus_message_error_new(msg, "Invalid property", "Invalid property.");
{
if (strcmp(propname, FAKE_SERVER_READWRITE_PROPERTY) == 0)
{
if (!eldbus_message_iter_arguments_get(iter, "i", &data->readwrite_property))
ck_abort_msg("error getting iter arguments on _fake_server_property_set");
}
else
return eldbus_message_error_new(msg, "Invalid property", "Invalid property.");
}
return eldbus_message_method_return_new(msg);
}

4
src/wayland_protocol/meson.build
View File

@ -7,9 +7,7 @@ wayland_client = dependency('wayland-client')
wl_protocol_local = [
'efl-aux-hints.xml',
'efl-hints.xml',
'session-recovery.xml',
'teamwork.xml',
'www.xml'
'session-recovery.xml'
]
wl_unstable_protocol_sys = [

39
src/wayland_protocol/teamwork.xml
View File

@ -1,39 +0,0 @@
<protocol name="teamwork">
<interface name="zwp_teamwork" version="2">
<request name="preload_uri">
<arg name="surface" type="object" interface="wl_surface"/>
<arg name="uri" type="string"/>
</request>
<request name="activate_uri">
<arg name="surface" type="object" interface="wl_surface"/>
<arg name="uri" type="string"/>
<arg name="x" type="fixed" summary="surface local coords"/>
<arg name="y" type="fixed" summary="surface local coords"/>
</request>
<request name="deactivate_uri">
<arg name="surface" type="object" interface="wl_surface"/>
<arg name="uri" type="string"/>
</request>
<request name="open_uri">
<arg name="surface" type="object" interface="wl_surface"/>
<arg name="uri" type="string"/>
</request>
<event name="fetching_uri">
<arg name="surface" type="object" interface="wl_surface"/>
<arg name="uri" type="string"/>
</event>
<event name="completed_uri">
<arg name="surface" type="object" interface="wl_surface"/>
<arg name="uri" type="string"/>
<arg name="valid" type="int" summary="1 if uri can be displayed, else 0"/>
</event>
<event name="fetch_info">
<arg name="surface" type="object" interface="wl_surface"/>
<arg name="uri" type="string"/>
<arg name="progress" type="uint" summary="percentage of download"/>
</event>
</interface>
</protocol>

28
src/wayland_protocol/www.xml
View File

@ -1,28 +0,0 @@
<protocol name="zwp_www">
<interface name="www" version="1">
<request name="create">
<description summary="Create an object for WWW notifications">
</description>
<arg name="id" type="new_id" interface="www_surface"/>
<arg name="surface" type="object" interface="wl_surface"/>
</request>
</interface>
<interface name="www_surface" version="1">
<event name="status">
<description summary="Status update on a www_surface"></description>
<arg name="x_rel" type="int"/>
<arg name="y_rel" type="int"/>
<arg name="timestamp" type="uint"/>
</event>
<event name="start_drag">
<description summary="Drag has started"></description>
</event>
<event name="end_drag">
<description summary="Drag has ended"></description>
</event>
<request name="destroy" type="destructor">
<description summary="Destroy a www_surface">
</description>
</request>
</interface>
</protocol>