#include "shared/helpers.h"
#include <libweston/libweston.h>
#include <libweston-desktop/libweston-desktop.h>
+#ifdef BUILD_XWAYLAND
+#include <libweston/xwayland-api.h>
+#endif
#include "agl-shell-desktop-server-protocol.h"
app_id = weston_desktop_surface_get_app_id(dsurface);
- if ((active_output = ivi_layout_find_with_app_id(app_id, ivi)))
+ if ((active_output = ivi_layout_find_with_app_id(app_id, ivi))) {
ivi_set_pending_desktop_surface_remote(active_output, app_id);
+ shell_send_app_on_output(ivi, app_id, active_output->output->name);
+ }
/* reset any caps to make sure we apply the new caps */
ivi_seat_reset_caps_sent(ivi);
}
-static bool
-desktop_surface_check_last_surfaces(struct ivi_output *ivi_output, enum ivi_surface_role role)
+bool
+ivi_surface_count_one(struct ivi_output *ivi_output,
+ enum ivi_surface_role role)
{
int count = 0;
struct ivi_surface *surf;
* the DESKTOP role can happen here as well, because we can fall-back
* to that when we try to determine the role type. Application that
* do not set the app_id will be land here, when destroyed */
- if (output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE ||
- surface->role == IVI_SURFACE_ROLE_DESKTOP))
+ if ((output == NULL && (surface->role == IVI_SURFACE_ROLE_NONE ||
+ surface->role == IVI_SURFACE_ROLE_DESKTOP)) ||
+ output->output == NULL)
goto skip_output_asignment;
assert(output != NULL);
if (ivi_seat && ivi_seat->focused_surface == wsurface)
ivi_seat->focused_surface = NULL;
- if (surface->role == IVI_SURFACE_ROLE_REMOTE &&
- output->type == OUTPUT_REMOTE)
- ivi_destroy_waltham_destroy(surface);
-
/* check if there's a last 'remote' surface and insert a black
* surface view if there's no background set for that output
*/
- if (desktop_surface_check_last_surfaces(output, IVI_SURFACE_ROLE_REMOTE) ||
- desktop_surface_check_last_surfaces(output, IVI_SURFACE_ROLE_DESKTOP))
+ if (ivi_surface_count_one(output, IVI_SURFACE_ROLE_REMOTE) ||
+ ivi_surface_count_one(output, IVI_SURFACE_ROLE_DESKTOP))
if (!output->background)
insert_black_curtain(output);
weston_log("Removed surface %p, app_id %s, role %s\n", surface,
app_id, ivi_layout_get_surface_role_name(surface));
- if (app_id && output) {
+ if (app_id && output && output->output) {
shell_advertise_app_state(output->ivi, app_id,
NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
-
- if (output->ivi->shell_client.ready &&
- wl_resource_get_version(output->ivi->shell_client.resource)
- >= AGL_SHELL_APP_STATE_SINCE_VERSION)
- agl_shell_send_app_state(output->ivi->shell_client.resource,
- app_id, AGL_SHELL_APP_STATE_TERMINATED);
+ if (output->ivi->shell_client.ready)
+ shell_send_app_state(output->ivi, app_id, AGL_SHELL_APP_STATE_TERMINATED);
}
wl_list_remove(&surface->link);
return;
if (ivi->shell_client.ready && !surface->checked_pending) {
- const char * app_id = weston_desktop_surface_get_app_id(dsurface);
+ struct ivi_output *remote_output = NULL;
+ const char *app_id = weston_desktop_surface_get_app_id(dsurface);
weston_log("Checking pending surface %p, app_id %s\n", surface,
app_id);
wl_list_remove(&surface->link);
wl_list_init(&surface->link);
+
+ if ((remote_output = ivi_layout_find_with_app_id(app_id, ivi))) {
+ ivi_set_pending_desktop_surface_remote(remote_output, app_id);
+ shell_send_app_on_output(ivi, app_id, remote_output->output->name);
+ }
+
+
ivi_check_pending_desktop_surface(surface);
surface->checked_pending = true;
/* we'll do it now at commit time, because we might not have an
* appid by the time we've created the weston_desktop_surface
* */
- if (wl_resource_get_version(ivi->shell_client.resource) >= AGL_SHELL_APP_STATE_SINCE_VERSION)
- agl_shell_send_app_state(ivi->shell_client.resource,
- app_id, AGL_SHELL_APP_STATE_STARTED);
+ shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_STARTED);
}
if (!surface->advertised_on_launch &&
switch (surface->role) {
case IVI_SURFACE_ROLE_DESKTOP:
- case IVI_SURFACE_ROLE_REMOTE:
ivi_layout_desktop_committed(surface);
break;
+ case IVI_SURFACE_ROLE_REMOTE:
+ ivi_layout_remote_committed(surface);
+ break;
case IVI_SURFACE_ROLE_POPUP:
ivi_layout_popup_committed(surface);
break;
desktop_set_xwayland_position(struct weston_desktop_surface *dsurface,
int32_t x, int32_t y, void *userdata)
{
- /* not supported */
+ struct ivi_surface *ivisurf =
+ weston_desktop_surface_get_user_data(dsurface);
+
+ ivisurf->xwayland.x = x;
+ ivisurf->xwayland.y = y;
+ ivisurf->xwayland.is_set = true;
}
static const struct weston_desktop_api desktop_api = {
ivi_shell_finalize(ivi);
ivi_compositor_destroy_pending_surfaces(ivi);
+ ivi_layout_destroy_saved_outputs(ivi);
weston_desktop_destroy(ivi->desktop);
+ wl_list_remove(&ivi->transform_listener.link);
wl_list_remove(&listener->link);
}
+static void
+transform_handler(struct wl_listener *listener, void *data)
+{
+#ifdef BUILD_XWAYLAND
+ struct weston_surface *surface = data;
+ struct ivi_surface *ivisurf = get_ivi_shell_surface(surface);
+ const struct weston_xwayland_surface_api *api;
+ int x, y;
+
+ if (!ivisurf)
+ return;
+
+ api = ivisurf->ivi->xwayland_surface_api;
+ if (!api) {
+ api = weston_xwayland_surface_get_api(ivisurf->ivi->compositor);
+ ivisurf->ivi->xwayland_surface_api = api;
+ }
+
+ if (!api || !api->is_xwayland_surface(surface))
+ return;
+
+ if (!weston_view_is_mapped(ivisurf->view))
+ return;
+
+ x = ivisurf->view->geometry.x;
+ y = ivisurf->view->geometry.y;
+
+ api->send_position(surface, x, y);
+#endif
+}
+
+bool
+is_shell_surface_xwayland(struct ivi_surface *surf)
+{
+#ifdef BUILD_XWAYLAND
+ const struct weston_xwayland_surface_api *api;
+ struct ivi_compositor *ivi = surf->ivi;
+ struct weston_surface *surface;
+
+ api = ivi->xwayland_surface_api;
+
+ if (!api)
+ return false;
+
+ surface = weston_desktop_surface_get_surface(surf->dsurface);
+ return api->is_xwayland_surface(surface);
+#else
+ return false;
+#endif
+}
+
int
ivi_desktop_init(struct ivi_compositor *ivi)
{
return -1;
}
+ ivi->transform_listener.notify = transform_handler;
+ wl_signal_add(&ivi->compositor->transform_signal,
+ &ivi->transform_listener);
+
+
return 0;
}