Update e_surface for recent wayland changes.
Signed-off-by: Chris Michael <devilhorns@comcast.net>
This commit is contained in:
parent
b2062d0934
commit
a92d6850b4
|
@ -34,7 +34,7 @@ e_surface_new(unsigned int id)
|
|||
if (!(es = E_NEW(E_Surface, 1))) return NULL;
|
||||
|
||||
/* initialize the destroy signal */
|
||||
wl_signal_init(&es->wl.surface.resource.destroy_signal);
|
||||
wl_signal_init(&es->wl.resource.destroy_signal);
|
||||
|
||||
/* initialize the link */
|
||||
wl_list_init(&es->wl.link);
|
||||
|
@ -55,11 +55,11 @@ e_surface_new(unsigned int id)
|
|||
UINT32_MAX, UINT32_MAX);
|
||||
|
||||
/* setup the surface object */
|
||||
es->wl.surface.resource.object.id = id;
|
||||
es->wl.surface.resource.object.interface = &wl_surface_interface;
|
||||
es->wl.surface.resource.object.implementation =
|
||||
es->wl.resource.object.id = id;
|
||||
es->wl.resource.object.interface = &wl_surface_interface;
|
||||
es->wl.resource.object.implementation =
|
||||
(void (**)(void))&_e_surface_interface;
|
||||
es->wl.surface.resource.data = es;
|
||||
es->wl.resource.data = es;
|
||||
|
||||
return es;
|
||||
}
|
||||
|
@ -115,8 +115,8 @@ e_surface_destroy(E_Surface *es)
|
|||
if (!es) return;
|
||||
|
||||
/* emit the destroy signal */
|
||||
wl_signal_emit(&es->wl.surface.resource.destroy_signal,
|
||||
&es->wl.surface.resource);
|
||||
wl_signal_emit(&es->wl.resource.destroy_signal,
|
||||
&es->wl.resource);
|
||||
|
||||
/* if this surface is mapped, unmap it */
|
||||
if (es->mapped) e_surface_unmap(es);
|
||||
|
|
Loading…
Reference in New Issue