extern "C" {
#endif
int screen_connector_provider_remote_enable(const char *id, struct wl_surface *surface);
-int screen_connector_provider_init();
-int screen_connector_provider_fini();
+int screen_connector_provider_init(void);
+int screen_connector_provider_fini(void);
#ifdef __cplusplus
}
#endif
-#endif
+#endif /* __SCREEN_CONNECTOR_PROVIDER_H__ */
/*
- * Screen Connector Watcher
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the License);
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include <stdio.h>
#include <errno.h>
#include <glib.h>
#include <sys/mman.h>
-
#include <tizen.h>
#include <dlog.h>
#include <wayland-client.h>
#include <tizen-remote-surface-client-protocol.h>
#include <aul_screen_connector.h>
-
#include "screen_connector_provider.h"
#ifdef LOG_TAG
static void __rsp_resource_id_cb(void *data, struct tizen_remote_surface_provider *provider, uint32_t res_id)
{
-
LOGE("add app screen : %d", res_id);
aul_screen_connector_add_app_screen(res_id);
}
return 0;
}
-EXPORT_API int screen_connector_provider_init()
+EXPORT_API int screen_connector_provider_init(void)
{
- int ret = 0;
struct wl_registry *registry;
Ecore_Wl_Global *global;
Eina_Inlist *globals;
- if (__init_count > 0) {
+ if (__init_count > 0)
return 0;
- }
+
ecore_wl_init(NULL);
registry = ecore_wl_registry_get();
if (!registry || !globals) {
LOGE("could not get registry(%p) or global list(%p)", registry,
- globals);
+ globals);
return -1;
}
EINA_INLIST_FOREACH(globals, global) {
if (!strcmp(global->interface, "tizen_remote_surface_manager")) {
__rsm = wl_registry_bind(registry, global->id,
- &tizen_remote_surface_manager_interface, 1);
+ &tizen_remote_surface_manager_interface, 1);
}
}
}
__init_count++;
- return ret;
+ return 0;
}
-EXPORT_API int screen_connector_provider_fini()
+EXPORT_API int screen_connector_provider_fini(void)
{
- int ret = 0;
-
if (__init_count > 1)
return 0;
ecore_wl_shutdown();
__init_count--;
- return ret;
+ return 0;
}
typedef void (*screen_connector_watcher_update_cb)(struct tizen_remote_surface *trs, struct wl_buffer *buffer, uint32_t time, void *data);
typedef void (*screen_connector_watcher_missing_cb)(struct tizen_remote_surface *trs, void *data);
typedef void (*screen_connector_watcher_change_cb)(struct tizen_remote_surface *trs, uint32_t type, struct wl_buffer *tbm,
- int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys, void *data);
+ int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys, void *data);
typedef struct _screen_connector_watcher_ops {
screen_connector_watcher_update_cb update_cb;
typedef struct _screen_connector_watcher_h *screen_connector_watcher_h;
-int screen_connector_watcher_init();
-int screen_connector_watcher_fini();
+int screen_connector_watcher_init(void);
+int screen_connector_watcher_fini(void);
screen_connector_watcher_h screen_connector_watcher_add(screen_connector_watcher_ops *ops, char *id, void *data);
int screen_connector_watcher_remove(screen_connector_watcher_h h);
int screen_connector_watcher_update(const char *appid);
}
#endif
-#endif
+#endif /* __SCREEN_CONNECTOR_WATCHER_H__ */
/*
- * Screen Connector Watcher
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the License);
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include <stdio.h>
#include <errno.h>
#include <glib.h>
-
#include <dlog.h>
#include <wayland-client.h>
#include <Ecore_Wayland.h>
void (*update_cb)(struct tizen_remote_surface *trs, struct wl_buffer *buffer, uint32_t time, void *data);
void (*missing_cb)(struct tizen_remote_surface *trs, void *data);
void (*change_cb)(struct tizen_remote_surface *trs, uint32_t type, struct wl_buffer *tbm,
- int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys, void *data);
+ int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys, void *data);
void *data;
struct tizen_remote_surface *surface;
int resource_id;
static struct tizen_remote_surface_manager *__rsm;
static struct wayland_tbm_client *__tbm_client;
static struct wl_tbm *__tbm;
-static bool __is_init = false;
+static bool __is_init;
static GList *__watcher_list;
static GList *__pending_watcher_list;
static aul_screen_viewer_handler __aul_cbs;
static void __buffer_updated(void *data, struct tizen_remote_surface *trs, struct wl_buffer *buffer, uint32_t time)
{
screen_connector_watcher_h watcher_h = (screen_connector_watcher_h)data;
+
if (watcher_h)
watcher_h->update_cb(trs, buffer, time, watcher_h->data);
}
static void __buffer_missing(void *data, struct tizen_remote_surface *trs)
{
screen_connector_watcher_h watcher_h = (screen_connector_watcher_h)data;
+
if (watcher_h)
watcher_h->missing_cb(trs, watcher_h->data);
}
#if 0
static void __buffer_changed(void *data, struct tizen_remote_surface *trs, uint32_t type, struct wl_buffer *tbm,
- int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys)
+ int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys)
{
screen_connector_watcher_h watcher_h = (screen_connector_watcher_h)data;
+
if (watcher_h)
watcher_h->change_cb(trs, type, tbm, img_file_fd, img_file_size, time, keys, watcher_h->data);
}
EXPORT_API void screen_connector_watcher_redirect_surface(screen_connector_watcher_h watcher_h)
{
- watcher_h->surface =
- tizen_remote_surface_manager_create_surface(__rsm, (uint32_t)watcher_h->resource_id, __tbm);
+ if (watcher_h == NULL)
+ return;
+
+ watcher_h->surface = tizen_remote_surface_manager_create_surface(__rsm, (uint32_t)watcher_h->resource_id, __tbm);
LOGD("resource_id : %d, (%p)", watcher_h->resource_id, watcher_h->surface);
- tizen_remote_surface_add_listener(watcher_h->surface, &__rs_listener,
- watcher_h);
+ tizen_remote_surface_add_listener(watcher_h->surface, &__rs_listener, watcher_h);
tizen_remote_surface_redirect(watcher_h->surface);
}
static screen_connector_watcher_h __create_watcher_handle_info(char *appid)
{
- screen_connector_watcher_h watcher_h = NULL;
+ screen_connector_watcher_h watcher_h;
+
watcher_h = (screen_connector_watcher_h)calloc(1, sizeof(struct _screen_connector_watcher_h));
if (watcher_h == NULL) {
LOGE("watcher_h calloc fail");
return NULL;
}
+
watcher_h->appid = strdup(appid);
+ if (watcher_h->appid == NULL) {
+ LOGE("out of memory");
+ free(watcher_h);
+ return NULL;
+ }
return watcher_h;
}
static void __app_added(const char *appid, const int pid, const unsigned int resource_id, void *data)
{
- LOGD("__app_added pid: %d, resource_id: %d, appid: %s", pid, resource_id, appid);
screen_connector_watcher_h watcher_h = NULL;
- screen_connector_watcher_h cur_h = NULL;
+ screen_connector_watcher_h cur_h;
GList *watcher_list = __watcher_list;
+ LOGD("__app_added pid: %d, resource_id: %d, appid: %s", pid, resource_id, appid);
for (; watcher_list != NULL; watcher_list = watcher_list->next) {
cur_h = (screen_connector_watcher_h)watcher_list->data;
if (strcmp(cur_h->appid, appid) == 0) {
screen_connector_watcher_redirect_surface(watcher_h);
else
LOGE("bad tbm message received. missing arguments");
-
}
-EXPORT_API int screen_connector_watcher_init()
+EXPORT_API int screen_connector_watcher_init(void)
{
int ret = 0;
struct wl_registry *registry;
if (!registry || !globals) {
LOGE("could not get registry(%p) or global list(%p)", registry,
- globals);
+ globals);
return -1;
}
EINA_INLIST_FOREACH(globals, global) {
if (!strcmp(global->interface, "tizen_remote_surface_manager")) {
__rsm = wl_registry_bind(registry, global->id,
- &tizen_remote_surface_manager_interface,
- global->version < 2 ? global->version : 2);
+ &tizen_remote_surface_manager_interface,
+ global->version < 2 ? global->version : 2);
}
}
return ret;
}
-EXPORT_API int screen_connector_watcher_fini()
+EXPORT_API int screen_connector_watcher_fini(void)
{
if (!__is_init)
return 0;
screen_connector_watcher_h watcher_h = NULL;
watcher_h = __create_watcher_handle_info(id);
+ if (watcher_h == NULL)
+ return NULL;
+
watcher_h->update_cb = ops->update_cb;
watcher_h->change_cb = ops->change_cb;
watcher_h->missing_cb = ops->missing_cb;
EXPORT_API screen_connector_watcher_h screen_connector_watcher_add(screen_connector_watcher_ops *ops, char *id, void *data)
{
-
screen_connector_watcher_h watcher_h = NULL;
- screen_connector_watcher_h cur_h = NULL;
+ screen_connector_watcher_h cur_h;
GList *watcher_list = __pending_watcher_list;
for (; watcher_list != NULL; watcher_list = watcher_list->next) {
EXPORT_API int screen_connector_watcher_remove(screen_connector_watcher_h h)
{
- int ret = 0;
__destroy_watcher_h(h);
- return ret;
+
+ return 0;
}
EXPORT_API int screen_connector_watcher_update(const char *appid)
{
- int ret = 0;
- ret = aul_screen_connector_update_app_screen(appid);
- return ret;
+ return aul_screen_connector_update_app_screen(appid);
}
EXPORT_API char *screen_connector_watcher_get_appid(screen_connector_watcher_h h)
* limitations under the License.
*/
-#ifndef __SCREEN_CONNECTOR_WATCHER_EVAS_H
-#define __SCREEN_CONNECTOR_WATCHER_EVAS_H
+#ifndef __SCREEN_CONNECTOR_WATCHER_EVAS_H__
+#define __SCREEN_CONNECTOR_WATCHER_EVAS_H__
#include <Evas.h>
#include <tizen.h>
*/
typedef enum {
- VISIBILITY_TYPE_UNOBSCURED = 0,
+ VISIBILITY_TYPE_UNOBSCURED,
VISIBILITY_TYPE_PARTIALLY_OBSCURED,
VISIBILITY_TYPE_FULLY_OBSCURED,
} visibility_type;
typedef void (*screen_connector_watcher_evas_updated_cb)(const char *appid, Evas_Object *image, void *data);
typedef struct _screen_connector_watcher_evas_ops {
- screen_connector_watcher_evas_added_cb added;
- screen_connector_watcher_evas_removed_cb removed;
- screen_connector_watcher_evas_updated_cb updated;
-}screen_connector_watcher_evas_ops;
+ screen_connector_watcher_evas_added_cb added;
+ screen_connector_watcher_evas_removed_cb removed;
+ screen_connector_watcher_evas_updated_cb updated;
+} screen_connector_watcher_evas_ops;
typedef struct _screen_connector_watcher_evas_h *screen_connector_watcher_evas_h;
int screen_connector_watcher_evas_init(Evas_Object *win);
-int screen_connector_watcher_evas_fini();
+int screen_connector_watcher_evas_fini(void);
screen_connector_watcher_evas_h screen_connector_watcher_evas_add(screen_connector_watcher_evas_ops *ops, char *id, void *data);
int screen_connector_watcher_evas_remove(screen_connector_watcher_evas_h handle);
int screen_connector_watcher_evas_update(const char *appid);
-
-int screen_connector_watcher_evas_start_visibility_notify();
-int screen_connector_watcher_evas_stop_visibility_notify();
+int screen_connector_watcher_evas_start_visibility_notify(void);
+int screen_connector_watcher_evas_stop_visibility_notify(void);
int screen_connector_watcher_evas_freeze_visibility(Evas_Object *obj, visibility_type type);
int screen_connector_watcher_evas_thaw_visibility(Evas_Object *obj);
int screen_connector_watcher_evas_send_mouse_up(Evas_Object *obj);
}
#endif
-#endif
-
-/* End of a file */
+#endif /* __SCREEN_CONNECTOR_WATCHER_EVAS_H__ */
/*
- * Screen Connector Watcher Evas
* Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the License);
#include <errno.h>
#include <glib.h>
#include <sys/mman.h>
-
#include <dlog.h>
#include <Elementary.h>
#include <Ecore_Wayland.h>
struct wl_buffer *pre_buffer;
void *data;
};
+
static Evas_Object *__viewer_win;
static Ecore_Event_Handler *__visibility_listener;
static GHashTable *__watcher_tbl;
EXPORT_API int screen_connector_watcher_evas_init(Evas_Object *win)
{
- int ret = 0;
__viewer_win = win;
__watcher_tbl = g_hash_table_new(g_direct_hash, g_direct_equal);
return -1;
}
- ret = screen_connector_watcher_init();
- return ret;
+ return screen_connector_watcher_init();
}
-EXPORT_API int screen_connector_watcher_evas_fini()
+EXPORT_API int screen_connector_watcher_evas_fini(void)
{
- int ret = 0;
-
if (__watcher_tbl)
g_hash_table_destroy(__watcher_tbl);
- ret = screen_connector_watcher_fini();
- return ret;
+ return screen_connector_watcher_fini();
}
static bool __obj_is_visible(Evas_Object *obj)
y >= 0 && y < window_h &&
(rotation == 0 || rotation == 180)) {
LOGD("x %d, y %d w %d h %d, window_w %d window_h %d rotation %d",
- x, y, w, h, window_w, window_h, rotation);
+ x, y, w, h, window_w, window_h, rotation);
return true;
} else if (x >= 0 && x < window_h &&
y >= 0 && y < window_w &&
(rotation == 90 || rotation == 270)) {
LOGD("x %d, y %d w %d h %d, window_w %d window_h %d rotation %d",
- x, y, w, h, window_w, window_h, rotation);
+ x, y, w, h, window_w, window_h, rotation);
return true;
}
+
return false;
}
evas_device_subclass_get(ev->dev),
desc,
ev->timestamp);
-
}
static void __rs_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info)
evas_device_subclass_get(ev->dev),
desc,
ev->timestamp);
-
}
static void __rs_cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info)
evas_device_subclass_get(ev->dev),
desc,
ev->timestamp);
-
}
static void __rs_cb_show(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
static void __watcher_change_cb(struct tizen_remote_surface *trs, uint32_t type, struct wl_buffer *tbm,
- int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys, void *data)
+ int32_t img_file_fd, uint32_t img_file_size, uint32_t time, struct wl_array *keys, void *data)
{
-
bool is_added = false;
Evas_Native_Surface ns;
tbm_surface_h tbm_surface;
pid = screen_connector_watcher_get_pid(watcher_evas_h->watcher_h);
if (watcher_evas_h->img_tbm == NULL) {
-
LOGD("first added !!!! %d, %d %s", (watcher_evas_h->img_tbm == NULL), type, appid);
watcher_evas_h->img_tbm = evas_object_image_filled_add(
- evas_object_evas_get(__viewer_win));
+ evas_object_evas_get(__viewer_win));
/* Image alpha set */
evas_object_image_alpha_set(watcher_evas_h->img_tbm, 1);
evas_object_event_callback_add(watcher_evas_h->img_tbm,
- EVAS_CALLBACK_MOUSE_DOWN,
- __rs_cb_mouse_down, watcher_evas_h);
+ EVAS_CALLBACK_MOUSE_DOWN,
+ __rs_cb_mouse_down, watcher_evas_h);
evas_object_event_callback_add(watcher_evas_h->img_tbm,
- EVAS_CALLBACK_MOUSE_UP,
- __rs_cb_mouse_up, watcher_evas_h);
+ EVAS_CALLBACK_MOUSE_UP,
+ __rs_cb_mouse_up, watcher_evas_h);
evas_object_event_callback_add(watcher_evas_h->img_tbm,
- EVAS_CALLBACK_MOUSE_MOVE,
- __rs_cb_mouse_move, watcher_evas_h);
+ EVAS_CALLBACK_MOUSE_MOVE,
+ __rs_cb_mouse_move, watcher_evas_h);
evas_object_event_callback_add(watcher_evas_h->img_tbm,
- EVAS_CALLBACK_MOUSE_WHEEL,
- __rs_cb_mouse_wheel, watcher_evas_h);
+ EVAS_CALLBACK_MOUSE_WHEEL,
+ __rs_cb_mouse_wheel, watcher_evas_h);
evas_object_event_callback_add(watcher_evas_h->img_tbm,
- EVAS_CALLBACK_SHOW,
- __rs_cb_show, watcher_evas_h);
+ EVAS_CALLBACK_SHOW,
+ __rs_cb_show, watcher_evas_h);
evas_object_event_callback_add(watcher_evas_h->img_tbm,
- EVAS_CALLBACK_HIDE,
- __rs_cb_hide, watcher_evas_h);
+ EVAS_CALLBACK_HIDE,
+ __rs_cb_hide, watcher_evas_h);
/* Store watcher_evas_h */
g_hash_table_insert(__watcher_tbl, watcher_evas_h->img_tbm, watcher_evas_h);
snprintf(plug_id, sizeof(plug_id), "%s:%d", appid, pid);
evas_object_data_set(watcher_evas_h->img_tbm, "___PLUGID", strdup(plug_id));
evas_object_event_callback_add(watcher_evas_h->img_tbm,
- EVAS_CALLBACK_MOVE, __obj_move_cb, watcher_evas_h);
+ EVAS_CALLBACK_MOVE, __obj_move_cb, watcher_evas_h);
is_added = true;
}
/* check type of given buffer */
- if (type == 0) {//if (type == TIZEN_REMOTE_SURFACE_BUFFER_TYPE_TBM) {
-
+ if (type == 0) {
/* get tbm surface from buffer */
tbm_surface = wl_buffer_get_user_data(tbm);
width = tbm_surface_get_width(tbm_surface);
evas_object_image_size_set(watcher_evas_h->img_tbm, width, height);
evas_object_image_native_surface_set(watcher_evas_h->img_tbm, &ns); /* set native surface */
evas_object_image_pixels_dirty_set(watcher_evas_h->img_tbm, EINA_TRUE); /* set dirty for image updating */
-
- //evas_object_del(watcher_evas_h->img_file); /* delete previous object for the image file type */
-
- } else if (type == 1) {//} else if (type == TIZEN_REMOTE_SURFACE_BUFFER_TYPE_IMAGE_FILE) {
-
- if (!watcher_evas_h->img_file) {
- watcher_evas_h->img_file = evas_object_image_filled_add(
- evas_object_evas_get(__viewer_win));
- }
+ } else if (type == 1) {
+ if (!watcher_evas_h->img_file)
+ watcher_evas_h->img_file = evas_object_image_filled_add(evas_object_evas_get(__viewer_win));
map = mmap(NULL, img_file_size, PROT_READ, MAP_SHARED, img_file_fd, 0);
evas_object_image_memfile_set(watcher_evas_h->img_file, map, img_file_size, format, NULL);
}
watcher_evas_h->pre_buffer = tbm;
-
if (is_added) {
LOGD("call added !!!! %s", appid);
watcher_evas_h->ops->added(appid, watcher_evas_h->img_tbm,
watcher_evas_h->ops->updated(appid, watcher_evas_h->img_tbm,
watcher_evas_h->data);
}
-
}
static void __watcher_update_cb(struct tizen_remote_surface *trs, struct wl_buffer *buffer, uint32_t time, void *data)
__free_watcher_evas_h(watcher_evas_h);
}
-
EXPORT_API screen_connector_watcher_evas_h screen_connector_watcher_evas_add(screen_connector_watcher_evas_ops *ops, char *id, void *data)
{
screen_connector_watcher_evas_h handle;
EXPORT_API int screen_connector_watcher_evas_remove(screen_connector_watcher_evas_h handle)
{
- int ret = 0;
+ int ret;
+
ret = screen_connector_watcher_remove(handle->watcher_h);
__destroy_watcher_evas_handle(handle);
return ret;
EXPORT_API int screen_connector_watcher_evas_update(const char *appid)
{
- int ret = 0;
- ret = screen_connector_watcher_update(appid);
- return ret;
+ return screen_connector_watcher_update(appid);
}
-
static void __send_visibility(gpointer key, gpointer value, gpointer user_data)
{
screen_connector_watcher_evas_h watcher_evas_h = (screen_connector_watcher_evas_h)value;
Ecore_Wl_Event_Window_Visibility_Change *ev = event;
LOGD("visibility change: %d %d", (unsigned int)ev->win,
- (unsigned int)ev->fully_obscured);
+ (unsigned int)ev->fully_obscured);
if (!__watcher_tbl)
return ECORE_CALLBACK_RENEW;
g_hash_table_foreach(__watcher_tbl, __send_visibility,
- GINT_TO_POINTER(ev->fully_obscured));
+ GINT_TO_POINTER(ev->fully_obscured));
return ECORE_CALLBACK_RENEW;
}
-EXPORT_API int screen_connector_watcher_evas_start_visibility_notify()
+EXPORT_API int screen_connector_watcher_evas_start_visibility_notify(void)
{
if (__visibility_listener)
return 0;
- __visibility_listener = ecore_event_handler_add(
- ECORE_WL_EVENT_WINDOW_VISIBILITY_CHANGE, __visibility_cb, NULL);
+ __visibility_listener = ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_VISIBILITY_CHANGE, __visibility_cb, NULL);
return 0;
}
-
-EXPORT_API int screen_connector_watcher_evas_stop_visibility_notify()
+EXPORT_API int screen_connector_watcher_evas_stop_visibility_notify(void)
{
if (!__visibility_listener)
return 0;
evas_object_geometry_get(obj, &x, &y, &w, &h);
timestamp = (unsigned int)((unsigned long long)(ecore_time_get() * 1000.0) & 0xffffffff);
tizen_remote_surface_transfer_mouse_event(surface,
- TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_UP,
- 0,
- 1,
- w / 2,
- h / 2,
- 0,
- 0,
- 0,
- 0,
- TIZEN_INPUT_DEVICE_CLAS_MOUSE,
- TIZEN_INPUT_DEVICE_SUBCLAS_NONE,
- "",
- timestamp);
+ TIZEN_REMOTE_SURFACE_EVENT_TYPE_MOUSE_UP,
+ 0,
+ 1,
+ w / 2,
+ h / 2,
+ 0,
+ 0,
+ 0,
+ 0,
+ TIZEN_INPUT_DEVICE_CLAS_MOUSE,
+ TIZEN_INPUT_DEVICE_SUBCLAS_NONE,
+ "",
+ timestamp);
return 0;
}
watcher_evas_h->data = data;
watcher_evas_h->watcher_h = screen_connector_watcher_create_handle(appid, pid, &watcher_ops, watcher_evas_h);
screen_connector_watcher_redirect_surface(watcher_evas_h->watcher_h);
+
return 0;
}
EXPORT_API int screen_connector_watcher_evas_get_rid(Evas_Object *obj, int *resource_id)
{
-
screen_connector_watcher_evas_h watcher_evas_h;
watcher_evas_h = (screen_connector_watcher_evas_h)g_hash_table_lookup(__watcher_tbl, obj);
return screen_connector_watcher_get_resource_id(watcher_evas_h->watcher_h);
}
-
EXPORT_API int screen_connector_watcher_evas_get_pid(Evas_Object *obj, int *pid)
{
screen_connector_watcher_evas_h watcher_evas_h;
return screen_connector_watcher_get_pid(watcher_evas_h->watcher_h);
}
-
-/* End of a file */
projects / platform / core / appfw / screen-connector.git / commitdiff