#define SURCAFE_ID_MASK 0x0ffff /* SurfaceId bit mask pattern */
#define UIFW_HASH 64 /* Hash value (2's compliment) */
-/* Cleint management table */
-struct uifw_client {
- struct wl_client *client; /* Wayland client */
- int pid; /* ProcessId (pid) */
- char appid[ICO_IVI_APPID_LENGTH]; /* ApplicationId(from AppCore AUL) */
- int manager; /* Manager flag (Need send event) */
- struct wl_resource *resource;
+/* Client attribute table */
+#define MAX_CLIENT_ATTR 4
+struct uifw_client_attr {
+ char appid[ICO_IVI_APPID_LENGTH]; /* ApplicationId */
+ struct _uifw_client_attr_value {
+ short attr;
+ short res;
+ int value;
+ } attrs[MAX_CLIENT_ATTR];
struct wl_list link;
};
-/* UIFW Surface */
-struct shell_surface;
-struct uifw_win_surface {
- uint32_t id; /* UIFW SurfaceId */
- int layer; /* LayerId */
- struct weston_surface *surface; /* Weston surface */
- struct shell_surface *shsurf; /* Shell(IVI-Shell) surface */
- struct uifw_client *uclient; /* Client */
- int x; /* X-axis */
- int y; /* Y-axis */
- int width; /* Width */
- int height; /* Height */
- char animation[ICO_WINDOW_ANIMATION_LEN];
- /* Animation name */
- struct wl_list link; /* */
- struct uifw_win_surface *next_idhash; /* UIFW SurfaceId hash list */
- struct uifw_win_surface *next_wshash; /* Weston SurfaceId hash list */
-};
-
/* Manager table */
struct uifw_manager {
struct wl_resource *resource; /* Manager resource */
struct wl_list manager_list; /* Manager(ex.HomeScreen) list */
int num_manager; /* Number of managers */
struct wl_list surface_list; /* Surface list */
+ struct wl_list client_attr_list; /* Client attribute list */
struct uifw_win_surface *active_pointer_surface; /* Active Pointer Surface */
struct uifw_win_surface *active_keyboard_surface; /* Active Keyboard Surface */
uint32_t surfaceid, int32_t visible, int32_t raise);
/* set surface animation */
static void uifw_set_animation(struct wl_client *client, struct wl_resource *resource,
- uint32_t surfaceid, const char *animation);
+ uint32_t surfaceid, int32_t change, const char *animation);
/* set active surface (form HomeScreen) */
static void uifw_set_active(struct wl_client *client, struct wl_resource *resource,
uint32_t surfaceid, uint32_t target);
static void uifw_set_layer_visible(struct wl_client *client, struct wl_resource *resource,
int32_t layer, int32_t visible);
/* send surface change event to manager */
+static void uifw_set_client_attr(struct wl_client *client, struct wl_resource *resource,
+ const char *appid, int32_t attr, int32_t value);
+ /* set client application attribute */
static void win_mgr_surface_change(struct weston_surface *surface,
const int to, const int manager);
/* surface change from manager */
const char *appid, const int param1,
const int param2, const int param3, const int param4,
const int param5, const int param6);
+ /* convert animation name to type value */
+static int ico_get_animation_type(const char *animation);
/* hook for set user */
static void (*win_mgr_hook_set_user)
(struct wl_client *client, const char *appid) = NULL;
int surfaceId, const char *appid) = NULL;
/* hook for surface destory */
static void (*win_mgr_hook_destroy)(struct weston_surface *surface) = NULL;
+ /* hook for animation */
+static int (*win_mgr_hook_animation)(const int op, void *data) = NULL;
/* static tables */
/* Multi Window Manager interface */
uifw_set_visible,
uifw_set_animation,
uifw_set_active,
- uifw_set_layer_visible
+ uifw_set_layer_visible,
+ uifw_set_client_attr
};
/* static management table */
bind_shell_client(struct wl_client *client)
{
struct uifw_client *uclient;
+ struct uifw_client_attr *lattr;
pid_t pid;
uid_t uid;
gid_t gid;
sprintf(uclient->appid, "?%d?", uclient->pid);
}
}
+
+ wl_list_for_each (lattr, &_ico_win_mgr->client_attr_list, link) {
+ if (strcmp(lattr->appid, uclient->appid) == 0) {
+ for (i = 0; i < MAX_CLIENT_ATTR; i++) {
+ switch (lattr->attrs[i].attr) {
+ case ICO_WINDOW_MGR_CLIENT_ATTR_NOCONFIGURE:
+ uclient->noconfigure = lattr->attrs[i].value;
+ ivi_shell_set_client_attr(uclient->client,
+ ICO_CLEINT_ATTR_NOCONFIGURE,
+ lattr->attrs[i].value);
+ uifw_trace("bind_shell_client: set to ivi-shell");
+ break;
+ default:
+ break;
+ }
+ }
+ break;
+ }
+ }
}
else {
uifw_trace("bind_shell_client: client=%08x pid dose not exist", (int)client);
/*--------------------------------------------------------------------------*/
/**
+ * @brief ico_get_animation_type: convert animation name to type value
+ *
+ * @param[in] animation animation name
+ * @return animation type value
+ */
+/*--------------------------------------------------------------------------*/
+static int
+ico_get_animation_type(const char *animation)
+{
+ int anima = ICO_WINDOW_MGR_ANIMATION_NONE;
+
+ if (strcasecmp(animation, "none") == 0) {
+ return ICO_WINDOW_MGR_ANIMATION_NONE;
+ }
+
+ if (win_mgr_hook_animation) {
+ anima = (*win_mgr_hook_animation)(ICO_WINDOW_MGR_ANIMATION_TYPE, (void *)animation);
+ }
+ if (anima <= 0) {
+ anima = ICO_WINDOW_MGR_ANIMATION_NONE;
+ }
+ return anima;
+}
+
+/*--------------------------------------------------------------------------*/
+/**
* @brief client_register_surface: create UIFW surface
*
* @param[in] client Wayland client
struct uifw_win_surface *us;
struct uifw_win_surface *phash;
struct uifw_win_surface *bhash;
+ struct uifw_client_attr *lattr;
uint32_t hash;
+ int i;
uifw_trace("client_register_surface: Enter(surf=%08x,client=%08x,res=%08x)",
(int)surface, (int)client, (int)resource);
us->id = generate_id();
us->surface = surface;
us->shsurf = shsurf;
- strncpy(us->animation, ivi_shell_default_animation(), sizeof(us->animation)-1);
+ wl_list_init(&us->animation.animation.link);
+ us->animation.type = ico_get_animation_type(ivi_shell_default_animation(NULL, NULL));
+ us->animation.type_next = us->animation.type;
if (_ico_win_mgr->num_manager <= 0) {
uifw_trace("client_register_surface: No Manager, Force visible");
/* set default layer id */
ivi_shell_set_layer(shsurf, 0);
+ /* set client attribute */
+ wl_list_for_each (lattr, &_ico_win_mgr->client_attr_list, link) {
+ if (strcmp(lattr->appid, us->uclient->appid) == 0) {
+ for (i = 0; i < MAX_CLIENT_ATTR; i++) {
+ switch (lattr->attrs[i].attr) {
+ case ICO_WINDOW_MGR_CLIENT_ATTR_NOCONFIGURE:
+ us->uclient->noconfigure = lattr->attrs[i].value;
+ ivi_shell_set_client_attr(us->uclient->client,
+ ICO_CLEINT_ATTR_NOCONFIGURE,
+ lattr->attrs[i].value);
+ uifw_trace("client_register_surface: set attr(%d=%d) to %08x",
+ lattr->attrs[i].attr, lattr->attrs[i].value, us->id);
+ break;
+ default:
+ break;
+ }
+ }
+ break;
+ }
+ }
+
/* send event to manager */
ico_win_mgr_send_to_mgr(ICO_WINDOW_MGR_WINDOW_CREATED,
us->id, us->uclient->appid, us->uclient->pid, 0,0,0,0,0);
if (win_mgr_hook_create) {
- /* call surface create hook for ico_window_mgr */
+ /* call surface create hook for other plugin */
(void) (*win_mgr_hook_create)(client, surface, us->id, us->uclient->appid);
}
uifw_trace("client_register_surface: Leave(surfaceId=%08x)", us->id);
if (width > ICO_IVI_MAX_COORDINATE) width = usurf->width;
if (height > ICO_IVI_MAX_COORDINATE) height = usurf->height;
+ /* check animation */
+ if ((usurf->animation.type != ICO_WINDOW_MGR_ANIMATION_NONE) &&
+ (usurf->animation.state != ICO_WINDOW_MGR_ANIMATION_STATE_NONE) &&
+ (win_mgr_hook_animation != NULL) &&
+ (x == usurf->x) && (y == usurf->y) &&
+ (width == usurf->width) && (height == usurf->height)) {
+ uifw_trace("uifw_set_positionsize: Leave(same position size at animation)");
+ return;
+ }
+
uclient = find_client_from_client(client);
if (uclient) {
if (! uclient->manager) uclient = NULL;
{
struct uifw_win_surface* usurf;
struct uifw_client *uclient;
+ int animation;
uifw_trace("uifw_set_visible: Enter(surf=%08x,%d,%d)", surfaceid, visible, raise);
return;
}
- if (visible == 1) {
+ if ((visible == ICO_WINDOW_MGR_VISIBLE_SHOW) ||
+ (visible == ICO_WINDOW_MGR_VISIBLE_SHOW_WO_ANIMATION)) {
if ((usurf->width <= 0) || (usurf->height <= 0)) {
/* not declare surface geometry, initialize */
usurf->width = usurf->surface->geometry.width;
usurf->width, usurf->height);
uifw_set_weston_surface(usurf);
ivi_shell_set_surface_type(usurf->shsurf);
+
+ if ((visible == ICO_WINDOW_MGR_VISIBLE_SHOW) &&
+ (usurf->animation.type != ICO_WINDOW_MGR_ANIMATION_NONE) &&
+ (win_mgr_hook_animation != NULL)) {
+ animation = (*win_mgr_hook_animation)(ICO_WINDOW_MGR_ANIMATION_OPIN,
+ (void *)usurf);
+ }
}
- else if ((raise != 0) && (raise != 1)) {
+ else if ((raise != ICO_WINDOW_MGR_RAISE_LOWER) &&
+ (raise != ICO_WINDOW_MGR_RAISE_RAISE)) {
uifw_trace("uifw_set_visible: Leave(No Change)");
return;
}
-#if 0 /* the animation function does not yet support it */
- if (strcasecmp(usurf->animation, "fade") == 0) {
- uifw_trace("uifw_set_visible: start animation fade(%08x)", (int)usurf->surface);
- weston_fade_run(usurf->surface, NULL, NULL);
- }
- else if (strcasecmp(usurf->animation, "zoom") == 0) {
- uifw_trace("uifw_set_visible: start animation zoom(%08x)", (int)usurf->surface);
- weston_zoom_run(usurf->surface, 0.8, 1.0, NULL, NULL);
- }
- else if (strcasecmp(usurf->animation, "slide") == 0) {
- uifw_trace("uifw_set_visible: start animation slide(%08x)", (int)usurf->surface);
- weston_slide_run(usurf->surface, (float)usurf->surface->geometry.height,
- 0.0, NULL, NULL);
- }
-#endif /* the animation function does not yet support it */
}
- else if (visible == 0) {
+ else if ((visible == ICO_WINDOW_MGR_VISIBLE_HIDE) ||
+ (visible == ICO_WINDOW_MGR_VISIBLE_HIDE_WO_ANIMATION)) {
if (ivi_shell_is_visible(usurf->shsurf)) {
- ivi_shell_set_visible(usurf->shsurf, 0);
- uifw_trace("uifw_set_visible: Change to UnVisible");
/* Weston surface configure */
uifw_set_weston_surface(usurf);
+
+ animation = ICO_WINDOW_MGR_ANIMATION_RET_ANIMA;
+ if ((visible == ICO_WINDOW_MGR_VISIBLE_HIDE) &&
+ (usurf->animation.type > 0) &&
+ (win_mgr_hook_animation != NULL)) {
+ animation = (*win_mgr_hook_animation)(ICO_WINDOW_MGR_ANIMATION_OPOUT,
+ (void *)usurf);
+ }
+ if (animation != ICO_WINDOW_MGR_ANIMATION_RET_ANIMASHOW) {
+ ivi_shell_set_visible(usurf->shsurf, 0);
+ uifw_trace("uifw_set_visible: Change to UnVisible");
+ }
+ else {
+ uifw_trace("uifw_set_visible: UnVisible but animation");
+ }
}
- else if ((raise != 0) && (raise != 1)) {
+ else if ((raise != ICO_WINDOW_MGR_RAISE_LOWER) &&
+ (raise != ICO_WINDOW_MGR_RAISE_RAISE)) {
uifw_trace("uifw_set_visible: Leave(No Change)");
return;
}
}
- else if ((raise != 0) && (raise != 1)) {
+ else if ((raise != ICO_WINDOW_MGR_RAISE_LOWER) &&
+ (raise != ICO_WINDOW_MGR_RAISE_RAISE)) {
uifw_trace("uifw_set_visible: Leave(No Change)");
return;
}
/* raise/lower */
- if ((raise == 1) || (raise == 0)) {
+ if ((raise == ICO_WINDOW_MGR_RAISE_LOWER) || (raise != ICO_WINDOW_MGR_RAISE_RAISE)) {
ivi_shell_set_raise(usurf->shsurf, raise);
}
}
/* send event(VISIBLE) to manager */
ico_win_mgr_send_to_mgr(ICO_WINDOW_MGR_WINDOW_VISIBLE,
- surfaceid, NULL, visible, raise, uclient ? 0 : 1, 0,0,0);
+ surfaceid, NULL,
+ (visible == ICO_WINDOW_MGR_VISIBLE_SHOW) ||
+ (visible == ICO_WINDOW_MGR_VISIBLE_SHOW_WO_ANIMATION) ? 1 :
+ ((visible == ICO_WINDOW_MGR_VISIBLE_HIDE) ||
+ (visible == ICO_WINDOW_MGR_VISIBLE_HIDE_WO_ANIMATION) ? 0 :
+ ICO_WINDOW_MGR_VISIBLE_NOCHANGE),
+ raise, uclient ? 0 : 1, 0,0,0);
uifw_trace("uifw_set_visible: Leave(OK)");
}
* @param[in] client Weyland client
* @param[in] resource resource of request
* @param[in] surfaceid UIFW surface id
- * @param[in] animation animation name
+ * @param[in] change change type(show/hide,reeize,move)
+ * @param[in] anmation animation name
* @return none
*/
/*--------------------------------------------------------------------------*/
static void
uifw_set_animation(struct wl_client *client, struct wl_resource *resource,
- uint32_t surfaceid, const char *animation)
+ uint32_t surfaceid, int32_t change, const char *animation)
{
struct uifw_win_surface* usurf = find_uifw_win_surface_by_id(surfaceid);
- uifw_trace("uifw_set_transition: Enter(surf=%08x, animation=%s)",
- surfaceid, animation);
+ uifw_trace("uifw_set_transition: Enter(surf=%08x, change=%d, animation=%s)",
+ surfaceid, change, animation);
if (usurf) {
- memset(usurf->animation, 0, sizeof(usurf->animation));
- strncpy(usurf->animation, animation, sizeof(usurf->animation)-1);
- uifw_trace("uifw_set_animation: Leave(OK)");
+ if (change != ICO_WINDOW_MGR_ANIMATION_CHANGE_VISIBLE) {
+ uifw_trace("uifw_set_animation: Leave(change type(%d9 not support)", change);
+ }
+ else {
+ usurf->animation.type_next = ico_get_animation_type(animation);
+ uifw_trace("uifw_set_animation: Leave(OK) type=%d", usurf->animation.type_next);
+ if (usurf->animation.state == ICO_WINDOW_MGR_ANIMATION_STATE_NONE) {
+ usurf->animation.type = usurf->animation.type_next;
+ }
+ }
}
else {
uifw_trace("uifw_set_animation: Leave(Surface(%08x) Not exist)", surfaceid);
/*--------------------------------------------------------------------------*/
/**
+ * @brief uifw_set_client_attr: set client application attribute
+ *
+ * @param[in] client Weyland client
+ * @param[in] resource resource of request
+ * @param[in] appid client application name
+ * @param[in] attr attribute
+ * @param[in] value attribute value
+ * @return none
+ */
+/*--------------------------------------------------------------------------*/
+static void
+uifw_set_client_attr(struct wl_client *client, struct wl_resource *resource,
+ const char *appid, int32_t attr, int32_t value)
+{
+ struct uifw_client_attr *lattr;
+ struct uifw_client *uclient;
+ int idx, freeidx;
+
+ uifw_trace("uifw_set_client_attr: Enter(appid=%s, attr=%d, value=%d)",
+ appid, attr, value);
+
+ freeidx = -1;
+ wl_list_for_each (lattr, &_ico_win_mgr->client_attr_list, link) {
+ if (strcmp(lattr->appid, appid) == 0) {
+ for (idx = 0; idx < MAX_CLIENT_ATTR; idx++) {
+ if (lattr->attrs[idx].attr == attr) {
+ lattr->attrs[idx].value = value;
+ freeidx = 999;
+ break;
+ }
+ if ((freeidx < 0) && (lattr->attrs[idx].attr < 0)) {
+ freeidx = idx;
+ }
+ }
+ if ((idx >= MAX_CLIENT_ATTR) && (freeidx >= 0)) {
+ lattr->attrs[freeidx].attr = attr;
+ lattr->attrs[freeidx].value = value;
+ }
+ else {
+ freeidx = 998;
+ }
+ break;
+ }
+ }
+ if (freeidx < 0) {
+ lattr = malloc(sizeof(struct uifw_client_attr));
+ if (lattr) {
+ memset(lattr, 0, sizeof(struct uifw_client_attr));
+ strncpy(lattr->appid, appid, ICO_IVI_APPID_LENGTH-1);
+ for (idx = 1; idx < MAX_CLIENT_ATTR; idx++) {
+ lattr->attrs[idx].attr = -1;
+ }
+ lattr->attrs[0].attr = attr;
+ lattr->attrs[0].value = value;
+ wl_list_insert(&_ico_win_mgr->client_attr_list, &lattr->link);
+ }
+ }
+
+ wl_list_for_each (uclient, &_ico_win_mgr->client_list, link) {
+ if (strcmp(uclient->appid, appid) == 0) {
+ switch(attr) {
+ case ICO_WINDOW_MGR_CLIENT_ATTR_NOCONFIGURE:
+ uclient->noconfigure = value;
+ ivi_shell_set_client_attr(uclient->client,
+ ICO_CLEINT_ATTR_NOCONFIGURE, value);
+ uifw_trace("uifw_set_client_attr: set to ivi-shell");
+ break;
+ default:
+ uifw_trace("uifw_set_client_attr: Unknown attr(%d)", attr);
+ break;
+ }
+ break;
+ }
+ }
+ uifw_trace("uifw_set_client_attr: Leave");
+}
+
+/*--------------------------------------------------------------------------*/
+/**
* @brief win_mgr_surface_change_mgr: surface chagen from manager(HomeScreen)
*
* @param[in] surface Weston surface
return;
}
+ /* destory animation extenson */
+ if (win_mgr_hook_animation) {
+ (*win_mgr_hook_animation)(ICO_WINDOW_MGR_ANIMATION_DESTROY, (void *)usurf);
+ }
hash = MAKE_IDHASH(usurf->id);
phash = _ico_win_mgr->idhash[hash];
bhash = NULL;
/*--------------------------------------------------------------------------*/
static void
bind_ico_win_mgr(struct wl_client *client,
- void *data, uint32_t version, uint32_t id)
+ void *data, uint32_t version, uint32_t id)
{
struct wl_resource *add_resource;
struct uifw_manager *nm;
win_mgr_hook_destroy = hook_destroy;
}
+/*--------------------------------------------------------------------------*/
+/**
+ * @brief ico_window_mgr_set_animation: set animation hook routine
+ *
+ * @param[in] hook_animation hook routine
+ * @return none
+ */
+/*--------------------------------------------------------------------------*/
+WL_EXPORT void
+ico_window_mgr_set_animation(int (*hook_animation)(const int op, void *data))
+{
+ win_mgr_hook_animation = hook_animation;
+}
/*--------------------------------------------------------------------------*/
/**
wl_list_init(&_ico_win_mgr->surface_list);
wl_list_init(&_ico_win_mgr->client_list);
wl_list_init(&_ico_win_mgr->manager_list);
+ wl_list_init(&_ico_win_mgr->client_attr_list);
nodeId = ico_ivi_get_mynode();
_ico_win_mgr->surface_head = ICO_IVI_SURFACEID_BASE(nodeId);
projects / profile / ivi / ico-uxf-weston-plugin.git / blobdiff