enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

wl_desktop_shell: Remove resize.width/height compositor data fields. 

Add some debugging print outs.
Don't check client size compared to new size.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-10-22 11:47:53 -04:00
parent 458ce8e86f
commit 1203b36635
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -224,10 +224,10 @@ _e_shell_surface_cb_resize(struct wl_client *client EINA_UNUSED, struct wl_resou
return;
}
DBG("Comp Resize Edges Set: %d", edges);
cdata->resize.resource = resource;
cdata->resize.edges = edges;
cdata->resize.width = ec->client.w;
cdata->resize.height = ec->client.h;
cdata->ptr.grab_x = cdata->ptr.x;
cdata->ptr.grab_y = cdata->ptr.y;
@ -480,7 +480,7 @@ _e_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_Coor
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.h = h;
@ -641,8 +641,8 @@ _e_xdg_shell_surface_configure_send(struct wl_resource *resource, uint32_t edges
uint32_t *s;
uint32_t serial;
DBG("XDG_SHELL: Surface Configure Send: %d \t%d %d",
wl_resource_get_id(resource), width, height);
DBG("XDG_SHELL: Surface Configure Send: %d \t%d %d\tEdges: %d",
wl_resource_get_id(resource), width, height, edges);
/* get the client for this resource */
if (!(ec = wl_resource_get_user_data(resource)))
@ -668,7 +668,6 @@ _e_xdg_shell_surface_configure_send(struct wl_resource *resource, uint32_t edges
if (edges != 0)
{
DBG("\tResizing");
s = wl_array_add(&states, sizeof(*s));
*s = XDG_SURFACE_STATE_RESIZING;
}
@ -828,7 +827,8 @@ _e_xdg_shell_surface_cb_resize(struct wl_client *client EINA_UNUSED, struct wl_r
E_Comp_Data *cdata;
E_Binding_Event_Mouse_Button ev;
/* DBG("XDG_SHELL: Surface Resize"); */
DBG("XDG_SHELL: Surface Resize: %d\tEdges: %d",
wl_resource_get_id(resource), edges);
/* get the client for this resource */
if (!(ec = wl_resource_get_user_data(resource)))
@ -853,10 +853,10 @@ _e_xdg_shell_surface_cb_resize(struct wl_client *client EINA_UNUSED, struct wl_r
return;
}
DBG("Comp Resize Edges Set: %d", edges);
cdata->resize.resource = resource;
cdata->resize.edges = edges;
cdata->resize.width = ec->client.w;
cdata->resize.height = ec->client.h;
cdata->ptr.grab_x = cdata->ptr.x;
cdata->ptr.grab_y = cdata->ptr.y;
@ -1032,8 +1032,8 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_
{
E_Client *ec;
/* DBG("XDG_SHELL: Surface Configure: %d \t%d %d %d %d", */
/* wl_resource_get_id(resource), x, y, w, h); */
DBG("XDG_SHELL: Surface Configure: %d \t%d %d %d %d",
wl_resource_get_id(resource), x, y, w, h);
/* get the client for this resource */
if (!(ec = wl_resource_get_user_data(resource)))
@ -1044,6 +1044,8 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_
return;
}
DBG("\tClient Size: %d %d", ec->client.w, ec->client.h);
if (ec->parent)
{
if ((ec->netwm.type == E_WINDOW_TYPE_MENU) ||
@ -1064,7 +1066,7 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_
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.h = h;
@ -1073,7 +1075,10 @@ _e_xdg_shell_surface_configure(struct wl_resource *resource, Evas_Coord x, Evas_
ec->changes.size = EINA_TRUE;
}
if (ec->changes.pos) EC_CHANGED(ec);
/* TODO: ack configure ?? */
if ((ec->changes.pos) || (ec->changes.size))
EC_CHANGED(ec);
}
static void