#include "ivi-compositor.h"
#include "policy.h"
+#include "shared/helpers.h"
#include <libweston/libweston.h>
#include <libweston-desktop/libweston-desktop.h>
+#include "agl-shell-desktop-server-protocol.h"
+
#if 0
static struct weston_output *
get_default_output(struct weston_compositor *compositor)
/* 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;
+}
+
+
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->role = IVI_SURFACE_ROLE_NONE;
surface->activated_by_default = 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);
- if (ivi->shell_client.ready) {
- ivi_check_pending_desktop_surface(surface);
- weston_log("Added surface %p, app_id %s, role %s\n", surface,
- app_id, ivi_layout_get_surface_role_name(surface));
- } else {
- /*
- * We delay creating "normal" desktop surfaces until later, to
- * give the shell-client an oppurtunity to set the surface as a
- * background/panel.
- */
- weston_log("Added surface %p, app_id %s to pending list\n",
- surface, app_id);
- wl_list_insert(&ivi->pending_surfaces, &surface->link);
+ 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);
+
+ 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);
}
+ /*
+ * We delay creating "normal" desktop surfaces until later, to
+ * give the shell-client an oppurtunity to set the surface as a
+ * background/panel.
+ * Also delay the creation in order to have a valid app_id
+ * which will be used to set the proper role.
+ */
+ weston_log("Added surface %p, app_id %s to pending list\n",
+ surface, app_id);
+ wl_list_insert(&ivi->pending_surfaces, &surface->link);
+
}
static bool
weston_desktop_surface_get_user_data(dsurface);
struct weston_surface *wsurface =
weston_desktop_surface_get_surface(dsurface);
+ const char *app_id = NULL;
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;
}
+ 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
*/
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);
}
desktop_committed(struct weston_desktop_surface *dsurface,
int32_t sx, int32_t sy, void *userdata)
{
+ struct ivi_compositor *ivi = userdata;
struct ivi_surface *surface =
weston_desktop_surface_get_user_data(dsurface);
struct ivi_policy *policy = surface->ivi->policy;
!policy->api.surface_commited(surface, surface->ivi))
return;
- if (!surface->advertised_on_launch)
+ if (ivi->shell_client.ready && !surface->checked_pending) {
+ 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);
+ ivi_check_pending_desktop_surface(surface);
+ surface->checked_pending = true;
+ }
+
+ if (!surface->advertised_on_launch &&
+ !wl_list_empty(&surface->ivi->desktop_clients))
wl_signal_emit(&surface->signal_advertise_app, surface);
weston_compositor_schedule_repaint(surface->ivi->compositor);
Code Review / src / agl-compositor.git / blobdiff