#include "shared/helpers.h"
#include <libweston/libweston.h>
-#include <libweston-desktop/libweston-desktop.h>
+#include <libweston/desktop.h>
+#ifdef BUILD_XWAYLAND
+#include <libweston/xwayland-api.h>
+#endif
#include "agl-shell-desktop-server-protocol.h"
-#if 0
-static struct weston_output *
-get_default_output(struct weston_compositor *compositor)
+static void
+ivi_layout_destroy_saved_outputs(struct ivi_compositor *ivi)
{
- if (wl_list_empty(&compositor->output_list))
- return NULL;
+ struct ivi_output *output, *output_next;
- return wl_container_of(compositor->output_list.next,
- struct weston_output, link);
+ wl_list_for_each_safe(output, output_next, &ivi->saved_outputs, link) {
+ free(output->app_ids);
+ free(output->name);
+
+ wl_list_remove(&output->link);
+ free(output);
+ }
}
-#endif
static void
desktop_advertise_app(struct wl_listener *listener, void *data)
return output;
}
+void
+ivi_shell_activate_surface(struct ivi_surface *ivi_surf,
+ struct ivi_shell_seat *ivi_seat,
+ uint32_t flags)
+{
+ struct weston_desktop_surface *dsurface = ivi_surf->dsurface;
+ struct weston_surface *surface =
+ weston_desktop_surface_get_surface(dsurface);
+
+ weston_view_activate_input(ivi_surf->view, ivi_seat->seat, flags);
+
+ if (ivi_seat->focused_surface) {
+ struct ivi_surface *current_focus =
+ get_ivi_shell_surface(ivi_seat->focused_surface);
+ struct weston_desktop_surface *dsurface_focus;
+ assert(current_focus);
+
+ dsurface_focus = current_focus->dsurface;
+ if (--current_focus->focus_count == 0)
+ weston_desktop_surface_set_activated(dsurface_focus, false);
+ }
+
+ ivi_seat->focused_surface = surface;
+ if (ivi_surf->focus_count++ == 0)
+ weston_desktop_surface_set_activated(dsurface, true);
+}
+
+
+static void
+desktop_surface_added_configure(struct ivi_surface *surface,
+ struct ivi_output *ivi_output)
+{
+ enum ivi_surface_role role = IVI_SURFACE_ROLE_NONE;
+ struct weston_desktop_surface *dsurface = surface->dsurface;
+
+ ivi_check_pending_surface_desktop(surface, &role);
+ if ((role != IVI_SURFACE_ROLE_DESKTOP &&
+ role != IVI_SURFACE_ROLE_FULLSCREEN &&
+ role != IVI_SURFACE_ROLE_REMOTE) ||
+ role == IVI_SURFACE_ROLE_NONE)
+ return;
+
+ if (role == IVI_SURFACE_ROLE_FULLSCREEN) {
+ struct ivi_output *bg_output =
+ ivi_layout_find_bg_output(surface->ivi);
+ assert(bg_output);
+ weston_desktop_surface_set_fullscreen(dsurface, true);
+ weston_desktop_surface_set_size(dsurface,
+ bg_output->output->width,
+ bg_output->output->height);
+ return;
+ }
+
+ weston_desktop_surface_set_maximized(dsurface, true);
+ weston_desktop_surface_set_size(dsurface,
+ ivi_output->area.width,
+ ivi_output->area.height);
+}
+
static void
desktop_surface_added(struct weston_desktop_surface *dsurface, void *userdata)
dclient = weston_desktop_surface_get_client(dsurface);
client = weston_desktop_client_get_client(dclient);
+ if (ivi->shell_client.resource &&
+ ivi->shell_client.status == BOUND_FAILED) {
+ wl_client_post_implementation_error(client,
+ "agl_shell has already been bound. "
+ "Check out bound_fail event");
+ return;
+ }
+
surface = zalloc(sizeof *surface);
if (!surface) {
wl_client_post_no_memory(client);
surface->ivi = ivi;
surface->dsurface = dsurface;
surface->role = IVI_SURFACE_ROLE_NONE;
- surface->activated_by_default = false;
+ surface->mapped = false;
surface->advertised_on_launch = false;
surface->checked_pending = false;
wl_list_init(&surface->link);
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);
if (output && ivi->shell_client.ready) {
struct ivi_output *ivi_output = to_ivi_output(output);
-
- /* verify if by any chance this surfaces hasn't been assigned a
- * different role before sending the maximized state */
- if (!ivi_check_pending_surface(surface)) {
- weston_log("Setting surface to initial size of surface to %dx%d\n",
- ivi_output->area.width, ivi_output->area.height);
- weston_desktop_surface_set_maximized(dsurface, true);
- weston_desktop_surface_set_size(dsurface,
- ivi_output->area.width, ivi_output->area.height);
- }
+ if (active_output)
+ desktop_surface_added_configure(surface, active_output);
+ else
+ desktop_surface_added_configure(surface, ivi_output);
}
/*
* We delay creating "normal" desktop surfaces until later, to
}
-static bool
-desktop_surface_check_last_remote_surfaces(struct ivi_compositor *ivi, 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;
- wl_list_for_each(surf, &ivi->surfaces, link)
- if (surf->role == role)
+ wl_list_for_each(surf, &ivi_output->ivi->surfaces, link)
+ if (surf->role == role &&
+ surf->current_completed_output == ivi_output)
count++;
return (count == 1);
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
const char *app_id = NULL;
+ struct weston_seat *wseat = NULL;
+ struct ivi_shell_seat *ivi_seat = NULL;
+ struct ivi_output *output = NULL;
+
+ /* we might not have a valid ivi_surface if _added failed due to
+ * protocol errors */
+ if (!surface)
+ return;
+
+ wseat = get_ivi_shell_weston_first_seat(surface->ivi);
+ if (wseat)
+ ivi_seat = get_ivi_shell_seat(wseat);
- struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
+ output = ivi_layout_get_output_from_surface(surface);
wl_list_remove(&surface->listener_advertise_app.link);
surface->listener_advertise_app.notify = NULL;
* 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);
output->area = output->area_saved;
}
+
/* reset the active surface as well */
if (output && output->active && output->active == surface) {
output->active->view->is_mapped = false;
output->active->view->surface->is_mapped = false;
- weston_layer_entry_remove(&output->active->view->layer_link);
+ weston_view_move_to_layer(output->active->view, NULL);
output->active = NULL;
}
- if (surface->role == IVI_SURFACE_ROLE_REMOTE &&
- output->type == OUTPUT_REMOTE)
- ivi_destroy_waltham_destroy(surface);
+ /* clear out focused_surface to avoid a stale focused_surface. the
+ * client shell is responsible for keeping track and switch back to the
+ * last active surface so we don't get do anything at removal, just
+ * reset it */
+ if (ivi_seat && ivi_seat->focused_surface == wsurface)
+ ivi_seat->focused_surface = NULL;
/* 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_remote_surfaces(output->ivi,
- IVI_SURFACE_ROLE_REMOTE) ||
- desktop_surface_check_last_remote_surfaces(output->ivi,
- IVI_SURFACE_ROLE_DESKTOP)) && output->type == OUTPUT_REMOTE)
+ if (ivi_surface_count_one(output, IVI_SURFACE_ROLE_REMOTE) ||
+ ivi_surface_count_one(output, IVI_SURFACE_ROLE_DESKTOP))
if (!output->background)
- insert_black_surface(output);
+ insert_black_curtain(output);
if (weston_surface_is_mapped(wsurface)) {
weston_view_destroy(surface->view);
}
+ if (surface->role == IVI_SURFACE_ROLE_TILE) {
+ ivi_layout_reset_split_surfaces(surface->ivi);
+ // activate previous when resizing back to give input set
+ // output active for allowing to resizing again if needed
+ if (output->previous_active)
+ ivi_layout_activate_by_surf(output, output->previous_active);
+ }
+
/* invalidate agl-shell surfaces so we can re-use them when
* binding again */
if (surface->role == IVI_SURFACE_ROLE_PANEL) {
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)
+ shell_send_app_state(output->ivi, app_id, AGL_SHELL_APP_STATE_TERMINATED);
+ }
wl_list_remove(&surface->link);
static void
desktop_committed(struct weston_desktop_surface *dsurface,
- int32_t sx, int32_t sy, void *userdata)
+ struct weston_coord_surface buf_offset, void *userdata)
{
struct ivi_compositor *ivi = userdata;
struct ivi_surface *surface =
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
+ * */
+ shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_STARTED);
}
if (!surface->advertised_on_launch &&
!wl_list_empty(&surface->ivi->desktop_clients))
wl_signal_emit(&surface->signal_advertise_app, surface);
+ /* this repaint schedule is needed to allow resizing to work with the
+ * help of the hidden layer:
+ *
+ * 1. add the view in the hidden layer and send out correct dimensions
+ * 2. clients changes its dimensions
+ * 3. client commits with the new dimensions
+ *
+ * For desktop and fullscreen, desktop_surface_added() sends the
+ * dimensions from the beginning so applications no need to resize, but
+ * if that weren't the case we still need this in.
+ */
weston_compositor_schedule_repaint(surface->ivi->compositor);
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;
static void
desktop_show_window_menu(struct weston_desktop_surface *dsurface,
- struct weston_seat *seat, int32_t x, int32_t y,
+ struct weston_seat *seat, struct weston_coord_surface offset,
void *userdata)
{
/* not supported */
static void
desktop_set_xwayland_position(struct weston_desktop_surface *dsurface,
- int32_t x, int32_t y, void *userdata)
+ struct weston_coord_global pos, void *userdata)
{
- /* not supported */
+ struct ivi_surface *ivisurf =
+ weston_desktop_surface_get_user_data(dsurface);
+
+ ivisurf->xwayland.x = pos.c.x;
+ ivisurf->xwayland.y = pos.c.y;
+ ivisurf->xwayland.is_set = true;
}
static const struct weston_desktop_api desktop_api = {
struct ivi_compositor *ivi = container_of(listener,
struct ivi_compositor, destroy_listener);
+ 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
return -1;
}
+ ivi->transform_listener.notify = transform_handler;
+ wl_signal_add(&ivi->compositor->transform_signal,
+ &ivi->transform_listener);
+
+
return 0;
}
Code Review / src / agl-compositor.git / blobdiff