#include "ivi-compositor.h"
#include "policy.h"
+#include "shared/helpers.h"
#include <libweston/libweston.h>
#include <libweston-desktop/libweston-desktop.h>
-#if 0
-static struct weston_output *
-get_default_output(struct weston_compositor *compositor)
-{
- if (wl_list_empty(&compositor->output_list))
- return NULL;
-
- return wl_container_of(compositor->output_list.next,
- struct weston_output, link);
-}
-#endif
+#include "agl-shell-desktop-server-protocol.h"
static void
desktop_advertise_app(struct wl_listener *listener, void *data)
/* not supported */
}
+struct weston_output *
+get_default_output(struct weston_compositor *compositor)
+{
+ if (wl_list_empty(&compositor->output_list))
+ return NULL;
+
+ return container_of(compositor->output_list.next,
+ struct weston_output, link);
+}
+
+struct weston_output *
+get_focused_output(struct weston_compositor *compositor)
+{
+ struct weston_seat *seat;
+ struct weston_output *output = NULL;
+
+ wl_list_for_each(seat, &compositor->seat_list, link) {
+ struct weston_touch *touch = weston_seat_get_touch(seat);
+ struct weston_pointer *pointer = weston_seat_get_pointer(seat);
+ struct weston_keyboard *keyboard =
+ weston_seat_get_keyboard(seat);
+
+ if (touch && touch->focus)
+ output = touch->focus->output;
+ else if (pointer && pointer->focus)
+ output = pointer->focus->output;
+ else if (keyboard && keyboard->focus)
+ output = keyboard->focus->output;
+
+ if (output)
+ break;
+ }
+
+ 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_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)
{
struct wl_client *client;
struct ivi_surface *surface;
struct ivi_output *active_output = NULL;
+ struct weston_output *output = NULL;
const char *app_id = NULL;
dclient = weston_desktop_surface_get_client(dsurface);
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);
wl_signal_init(&surface->signal_advertise_app);
/* reset any caps to make sure we apply the new caps */
ivi_seat_reset_caps_sent(ivi);
+ output = get_focused_output(ivi->compositor);
+ if (!output)
+ output = get_default_output(ivi->compositor);
+
+ if (output && ivi->shell_client.ready) {
+ struct ivi_output *ivi_output = to_ivi_output(output);
+ desktop_surface_added_configure(surface, ivi_output);
+ }
/*
* We delay creating "normal" desktop surfaces until later, to
* give the shell-client an oppurtunity to set the surface as a
weston_desktop_surface_get_user_data(dsurface);
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
+ const char *app_id = NULL;
+ struct weston_seat *wseat = get_ivi_shell_weston_first_seat(surface->ivi);
+ struct ivi_shell_seat *ivi_seat = get_ivi_shell_seat(wseat);
struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
wl_list_remove(&surface->listener_advertise_app.link);
surface->listener_advertise_app.notify = NULL;
+ app_id = weston_desktop_surface_get_app_id(dsurface);
+
/* special corner-case, pending_surfaces which are never activated or
* being assigned an output might land here so just remove the surface;
*
output->active = NULL;
}
+ /* 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;
+
if (surface->role == IVI_SURFACE_ROLE_REMOTE &&
output->type == OUTPUT_REMOTE)
ivi_destroy_waltham_destroy(surface);
skip_output_asignment:
weston_log("Removed surface %p, app_id %s, role %s\n", surface,
- weston_desktop_surface_get_app_id(dsurface),
- ivi_layout_get_surface_role_name(surface));
+ app_id, ivi_layout_get_surface_role_name(surface));
- /* we weren't added to any list if we are still with 'none' as role */
- if (surface->role != IVI_SURFACE_ROLE_NONE)
- wl_list_remove(&surface->link);
+ if (app_id && output)
+ shell_advertise_app_state(output->ivi, app_id,
+ NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
+
+ wl_list_remove(&surface->link);
free(surface);
}
!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) {
.set_xwayland_position = desktop_set_xwayland_position,
};
+static void
+ivi_shell_destroy(struct wl_listener *listener, void *data)
+{
+ struct ivi_compositor *ivi = container_of(listener,
+ struct ivi_compositor, destroy_listener);
+
+ ivi_shell_finalize(ivi);
+ ivi_compositor_destroy_pending_surfaces(ivi);
+
+ weston_desktop_destroy(ivi->desktop);
+ wl_list_remove(&listener->link);
+}
+
int
ivi_desktop_init(struct ivi_compositor *ivi)
{
return -1;
}
+ if (!weston_compositor_add_destroy_listener_once(ivi->compositor,
+ &ivi->destroy_listener, ivi_shell_destroy)) {
+ return -1;
+ }
+
return 0;
}