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

Update shell for recent wl_resource and wl_client changes 

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2013-06-25 09:00:44 +01:00
parent b8081e7c05
commit 101a1f7bea
1 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/modules/wl_desktop/e_mod_main.c
View File

@ -169,7 +169,7 @@ _e_desktop_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resour
E_Shell_Surface *ess; E_Shell_Surface *ess;
/* try to cast the resource to our structure */ /* try to cast the resource to our structure */
if (!(es = surface_resource->data)) return; if (!(es = wl_resource_get_user_data(surface_resource))) return;
/* check if this surface has already been configured */ /* check if this surface has already been configured */
if ((es->configure) && if ((es->configure) &&
@ -193,17 +193,18 @@ _e_desktop_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resour
es->unmap = _e_desktop_shell_shell_surface_unmap; es->unmap = _e_desktop_shell_shell_surface_unmap;
/* setup shell surface destroy callback */ /* setup shell surface destroy callback */
wl_signal_init(&ess->signals.destroy);
ess->wl.surface_destroy.notify = ess->wl.surface_destroy.notify =
_e_desktop_shell_shell_surface_cb_destroy_notify; _e_desktop_shell_shell_surface_cb_destroy_notify;
wl_signal_add(&es->signals.destroy, &ess->wl.surface_destroy); wl_signal_add(&es->signals.destroy, &ess->wl.surface_destroy);
/* setup shell surface interface */ /* setup shell surface interface */
ess->wl.resource.destroy = _e_desktop_shell_shell_surface_cb_destroy; ess->wl.resource =
ess->wl.resource.object.implementation = wl_client_add_object(client, &wl_shell_surface_interface,
(void (**)(void))&_e_desktop_shell_surface_interface; &_e_desktop_shell_surface_interface, id, ess);
/* add this shell surface to the client */ wl_resource_set_destructor(ess->wl.resource,
wl_client_add_resource(client, &ess->wl.resource); _e_desktop_shell_shell_surface_cb_destroy);
} }
static void static void
@ -212,8 +213,8 @@ _e_desktop_shell_cb_ping(E_Surface *es, unsigned int serial)
E_Shell_Surface *ess; E_Shell_Surface *ess;
if (!(ess = es->shell_surface)) return; if (!(ess = es->shell_surface)) return;
if (!ess->wl.resource.client) return; if (!ess->wl.resource) return;
/* FIXME */
if (!ess->ping_timer) if (!ess->ping_timer)
{ {
struct wl_event_loop *loop; struct wl_event_loop *loop;
@ -226,7 +227,7 @@ _e_desktop_shell_cb_ping(E_Surface *es, unsigned int serial)
ess->ping_timer->source = ess->ping_timer->source =
wl_event_loop_add_timer(loop, _e_desktop_shell_cb_ping_timeout, ess); wl_event_loop_add_timer(loop, _e_desktop_shell_cb_ping_timeout, ess);
wl_event_source_timer_update(ess->ping_timer->source, 200); wl_event_source_timer_update(ess->ping_timer->source, 200);
wl_shell_surface_send_ping(&ess->wl.resource, serial); wl_shell_surface_send_ping(ess->wl.resource, serial);
} }
} }
@ -261,10 +262,10 @@ _e_desktop_shell_shell_surface_cb_destroy_notify(struct wl_listener *listener, v
if (!(ess = container_of(listener, E_Shell_Surface, wl.surface_destroy))) if (!(ess = container_of(listener, E_Shell_Surface, wl.surface_destroy)))
return; return;
if (ess->wl.resource.client) if (ess->wl.resource)
wl_resource_destroy(&ess->wl.resource); wl_resource_destroy(ess->wl.resource);
else else
wl_signal_emit(&ess->wl.resource.destroy_signal, &ess->wl.resource); e_shell_surface_destroy(ess);
} }
static void static void
@ -273,25 +274,9 @@ _e_desktop_shell_shell_surface_cb_destroy(struct wl_resource *resource)
E_Shell_Surface *ess; E_Shell_Surface *ess;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
/* TODO: finish me */ e_shell_surface_destroy(ess);
/* if we have a popup grab, end it */
/* if (!wl_list_empty(&ess->popup.grabs)) */
/* { */
/* wl_list_remove(&ess->popup.grabs); */
/* wl_list_init(&ess->popup.grabs); */
/* } */
wl_list_remove(&ess->wl.surface_destroy.link);
ess->surface->configure = NULL;
/* TODO: handle ping timer */
wl_list_remove(&ess->wl.link);
/* free the allocated structure */
E_FREE(ess);
} }
static void static void
@ -456,7 +441,7 @@ _e_desktop_shell_shell_surface_cb_pong(struct wl_client *client EINA_UNUSED, str
E_Shell_Surface *ess; E_Shell_Surface *ess;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
if (!ess->ping_timer) return; if (!ess->ping_timer) return;
if (ess->ping_timer->serial == serial) if (ess->ping_timer->serial == serial)
@ -479,8 +464,8 @@ _e_desktop_shell_shell_surface_cb_move(struct wl_client *client EINA_UNUSED, str
E_Input *seat; E_Input *seat;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
if (!(seat = seat_resource->data)) return; if (!(seat = wl_resource_get_user_data(seat_resource))) return;
printf("Shell Surface Move\n"); printf("Shell Surface Move\n");
@ -498,7 +483,7 @@ _e_desktop_shell_shell_surface_cb_resize(struct wl_client *client EINA_UNUSED, s
E_Shell_Surface *ess; E_Shell_Surface *ess;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
printf("Shell Surface Resize\n"); printf("Shell Surface Resize\n");
} }
@ -508,7 +493,7 @@ _e_desktop_shell_shell_surface_cb_toplevel_set(struct wl_client *client EINA_UNU
E_Shell_Surface *ess; E_Shell_Surface *ess;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
/* set next surface type */ /* set next surface type */
ess->ntype = E_SHELL_SURFACE_TYPE_TOPLEVEL; ess->ntype = E_SHELL_SURFACE_TYPE_TOPLEVEL;
@ -521,9 +506,8 @@ _e_desktop_shell_shell_surface_cb_transient_set(struct wl_client *client EINA_UN
E_Surface *es; E_Surface *es;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
es = wl_resource_get_user_data(parent_resource);
es = parent_resource->data;
ess->parent = es; ess->parent = es;
ess->transient.x = x; ess->transient.x = x;
@ -540,7 +524,7 @@ _e_desktop_shell_shell_surface_cb_fullscreen_set(struct wl_client *client EINA_U
E_Shell_Surface *ess; E_Shell_Surface *ess;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
/* set next surface type */ /* set next surface type */
ess->ntype = E_SHELL_SURFACE_TYPE_FULLSCREEN; ess->ntype = E_SHELL_SURFACE_TYPE_FULLSCREEN;
@ -552,12 +536,12 @@ _e_desktop_shell_shell_surface_cb_popup_set(struct wl_client *client EINA_UNUSED
E_Shell_Surface *ess; E_Shell_Surface *ess;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
/* set next surface type */ /* set next surface type */
ess->ntype = E_SHELL_SURFACE_TYPE_POPUP; ess->ntype = E_SHELL_SURFACE_TYPE_POPUP;
ess->parent = parent_resource->data; ess->parent = wl_resource_get_user_data(parent_resource);
ess->popup.seat = seat_resource->data; ess->popup.seat = wl_resource_get_user_data(seat_resource);
/* FIXME: BIG GIAN HACK !!! */ /* FIXME: BIG GIAN HACK !!! */
ess->popup.serial = serial - 1; ess->popup.serial = serial - 1;
ess->popup.x = x; ess->popup.x = x;
@ -570,7 +554,7 @@ _e_desktop_shell_shell_surface_cb_maximized_set(struct wl_client *client EINA_UN
E_Shell_Surface *ess; E_Shell_Surface *ess;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
/* set next surface type */ /* set next surface type */
ess->ntype = E_SHELL_SURFACE_TYPE_MAXIMIZED; ess->ntype = E_SHELL_SURFACE_TYPE_MAXIMIZED;
@ -583,7 +567,7 @@ _e_desktop_shell_shell_surface_cb_title_set(struct wl_client *client EINA_UNUSED
E_Surface *es; E_Surface *es;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
/* free any previous title */ /* free any previous title */
free(ess->title); free(ess->title);
@ -603,7 +587,7 @@ _e_desktop_shell_shell_surface_cb_class_set(struct wl_client *client EINA_UNUSED
E_Surface *es; E_Surface *es;
/* try to cast the resource to our shell surface */ /* try to cast the resource to our shell surface */
if (!(ess = resource->data)) return; if (!(ess = wl_resource_get_user_data(resource))) return;
/* free any previous title */ /* free any previous title */
free(ess->clas); free(ess->clas);
@ -729,7 +713,7 @@ _e_desktop_shell_surface_map_popup(E_Shell_Surface *ess)
_e_desktop_shell_popup_grab_add(ess, seat); _e_desktop_shell_popup_grab_add(ess, seat);
else else
{ {
wl_shell_surface_send_popup_done(&ess->wl.resource); wl_shell_surface_send_popup_done(ess->wl.resource);
seat->pointer->grab->client = NULL; seat->pointer->grab->client = NULL;
} }
} }
@ -739,7 +723,7 @@ _e_desktop_shell_popup_grab_add(E_Shell_Surface *ess, E_Input *seat)
{ {
if (wl_list_empty(&seat->pointer->grab->surfaces)) if (wl_list_empty(&seat->pointer->grab->surfaces))
{ {
seat->pointer->grab->client = ess->wl.resource.client; seat->pointer->grab->client = wl_resource_get_client(ess->wl.resource);
seat->pointer->grab->interface = &_popup_grab_interface; seat->pointer->grab->interface = &_popup_grab_interface;
if (seat->pointer->grab->button_count > 0) if (seat->pointer->grab->button_count > 0)
@ -816,7 +800,7 @@ _e_desktop_shell_popup_grab_end(E_Input_Pointer *pointer)
grab->interface = NULL; grab->interface = NULL;
wl_list_for_each(ess, &grab->surfaces, wl.link) wl_list_for_each(ess, &grab->surfaces, wl.link)
wl_shell_surface_send_popup_done(&ess->wl.resource); wl_shell_surface_send_popup_done(ess->wl.resource);
wl_list_init(&grab->surfaces); wl_list_init(&grab->surfaces);
} }