forked from enlightenment/enlightenment
don't need to e_pixmap_ref here.
fix wayland client application resizing. Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
parent
9f56b2aafc
commit
4da7f486fa
|
@ -38,7 +38,7 @@ _e_shell_surface_cb_destroy(struct wl_resource *resource)
|
||||||
{
|
{
|
||||||
E_Client *ec;
|
E_Client *ec;
|
||||||
|
|
||||||
/* DBG("Shell Surface Destroy: %d", wl_resource_get_id(resource)); */
|
DBG("Shell Surface Destroy: %d", wl_resource_get_id(resource));
|
||||||
|
|
||||||
/* get the client for this resource */
|
/* get the client for this resource */
|
||||||
if ((ec = wl_resource_get_user_data(resource)))
|
if ((ec = wl_resource_get_user_data(resource)))
|
||||||
|
@ -187,7 +187,7 @@ _e_shell_surface_cb_class_set(struct wl_client *client EINA_UNUSED, struct wl_re
|
||||||
}
|
}
|
||||||
|
|
||||||
/* use the wl_client to get the pid * and set it in the netwm props */
|
/* use the wl_client to get the pid * and set it in the netwm props */
|
||||||
/* wl_client_get_credentials(client, &ec->netwm.pid, NULL, NULL); */
|
wl_client_get_credentials(client, &ec->netwm.pid, NULL, NULL);
|
||||||
|
|
||||||
/* set class */
|
/* set class */
|
||||||
eina_stringshare_replace(&ec->icccm.class, clas);
|
eina_stringshare_replace(&ec->icccm.class, clas);
|
||||||
|
@ -353,7 +353,6 @@ _e_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resource *reso
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
e_pixmap_ref(ep);
|
|
||||||
ec->netwm.ping = EINA_TRUE;
|
ec->netwm.ping = EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -459,6 +458,8 @@ _e_xdg_shell_surface_cb_app_id_set(struct wl_client *client EINA_UNUSED, struct
|
||||||
{
|
{
|
||||||
E_Client *ec;
|
E_Client *ec;
|
||||||
|
|
||||||
|
/* DBG("XDG_SHELL: App Id: %s", id); */
|
||||||
|
|
||||||
/* get the client for this resource */
|
/* get the client for this resource */
|
||||||
if (!(ec = wl_resource_get_user_data(resource)))
|
if (!(ec = wl_resource_get_user_data(resource)))
|
||||||
{
|
{
|
||||||
|
@ -469,7 +470,7 @@ _e_xdg_shell_surface_cb_app_id_set(struct wl_client *client EINA_UNUSED, struct
|
||||||
}
|
}
|
||||||
|
|
||||||
/* use the wl_client to get the pid * and set it in the netwm props */
|
/* use the wl_client to get the pid * and set it in the netwm props */
|
||||||
/* wl_client_get_credentials(client, &ec->netwm.pid, NULL, NULL); */
|
wl_client_get_credentials(client, &ec->netwm.pid, NULL, NULL);
|
||||||
|
|
||||||
/* set class */
|
/* set class */
|
||||||
eina_stringshare_replace(&ec->icccm.class, id);
|
eina_stringshare_replace(&ec->icccm.class, id);
|
||||||
|
@ -536,6 +537,8 @@ _e_xdg_shell_surface_cb_resize(struct wl_client *client EINA_UNUSED, struct wl_r
|
||||||
E_Comp_Data *cdata;
|
E_Comp_Data *cdata;
|
||||||
E_Binding_Event_Mouse_Button ev;
|
E_Binding_Event_Mouse_Button ev;
|
||||||
|
|
||||||
|
/* DBG("XDG_SHELL: Surface Resize"); */
|
||||||
|
|
||||||
/* get the client for this resource */
|
/* get the client for this resource */
|
||||||
if (!(ec = wl_resource_get_user_data(resource)))
|
if (!(ec = wl_resource_get_user_data(resource)))
|
||||||
{
|
{
|
||||||
|
@ -748,7 +751,7 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_
|
||||||
y = ec->parent->client.y + ec->comp_data->popup.y;
|
y = ec->parent->client.y + ec->comp_data->popup.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((ec->client.x != x) || (ec->client.y != y))
|
// if ((ec->client.x != x) || (ec->client.y != y))
|
||||||
{
|
{
|
||||||
ec->client.x = x;
|
ec->client.x = x;
|
||||||
ec->client.y = y;
|
ec->client.y = y;
|
||||||
|
@ -757,7 +760,7 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_
|
||||||
ec->changes.pos = EINA_TRUE;
|
ec->changes.pos = EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((ec->client.w != w) || (ec->client.h != h))
|
// if ((ec->client.w != w) || (ec->client.h != h))
|
||||||
{
|
{
|
||||||
ec->client.w = w;
|
ec->client.w = w;
|
||||||
ec->client.h = h;
|
ec->client.h = h;
|
||||||
|
@ -919,7 +922,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client, struct wl_resource *resour
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
e_pixmap_ref(ep);
|
/* e_pixmap_ref(ep); */
|
||||||
ec->netwm.ping = EINA_TRUE;
|
ec->netwm.ping = EINA_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1076,7 +1079,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client, struct wl_resource *resource
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
e_pixmap_ref(ep);
|
/* e_pixmap_ref(ep); */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* get the client data */
|
/* get the client data */
|
||||||
|
|
Loading…
Reference in New Issue