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

Update desktop shell for recent Wayland 1.2 changes (wl_global, 

wl_resource, etc).

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2013-07-16 12:18:25 +01:00
parent 1d8b816819
commit 98ddf4d05c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,8 +97,8 @@ e_modapi_init(E_Module *m)
/* try to add this shell to the globals */ /* try to add this shell to the globals */
if (!(global = if (!(global =
wl_display_add_global(_e_comp->wl.display, &wl_shell_interface, wl_global_create(_e_comp->wl.display, &wl_shell_interface, 1,
shell, _e_desktop_shell_cb_bind))) shell, _e_desktop_shell_cb_bind)))
{ {
ERR("Could not add shell to globals: %m"); ERR("Could not add shell to globals: %m");
goto err; goto err;
@ -153,13 +153,15 @@ static void
_e_desktop_shell_cb_bind(struct wl_client *client, void *data, unsigned int version EINA_UNUSED, unsigned int id) _e_desktop_shell_cb_bind(struct wl_client *client, void *data, unsigned int version EINA_UNUSED, unsigned int id)
{ {
E_Desktop_Shell *shell; E_Desktop_Shell *shell;
struct wl_resource *res;
/* try to cast data to our shell */ /* try to cast data to our shell */
if (!(shell = data)) return; if (!(shell = data)) return;
/* try to add the shell to the client */ res = wl_resource_create(client, &wl_shell_interface, 1, id);
wl_client_add_object(client, &wl_shell_interface, if (res)
&_e_desktop_shell_interface, id, shell); wl_resource_set_implementation(res, &_e_desktop_shell_interface,
shell, NULL);
} }
static void static void
@ -200,11 +202,10 @@ _e_desktop_shell_cb_shell_surface_get(struct wl_client *client, struct wl_resour
/* setup shell surface interface */ /* setup shell surface interface */
ess->wl.resource = ess->wl.resource =
wl_client_add_object(client, &wl_shell_surface_interface, wl_resource_create(client, &wl_shell_surface_interface, 1, id);
&_e_desktop_shell_surface_interface, id, ess); wl_resource_set_implementation(ess->wl.resource,
&_e_desktop_shell_surface_interface,
wl_resource_set_destructor(ess->wl.resource, ess, _e_desktop_shell_shell_surface_cb_destroy);
_e_desktop_shell_shell_surface_cb_destroy);
} }
static void static void