*/
#include "ivi-compositor.h"
+#include "policy.h"
#include <assert.h>
#include <string.h>
-#include <libweston-6/compositor.h>
-#include <libweston-6/libweston-desktop.h>
+#include <libweston/libweston.h>
+#include <libweston-desktop/libweston-desktop.h>
#define AGL_COMP_DEBUG
panel->panel.edge, view, x, y);
#endif
+ /* this is necessary for cases we already mapped it desktop_committed()
+ * but we not running the older qtwayland, so we still have a chance
+ * for this to run at the next test */
+ if (view->surface->is_mapped) {
+ weston_layer_entry_remove(&view->layer_link);
+
+ view->is_mapped = false;
+ view->surface->is_mapped = false;
+ }
+
+ /* give ivi_layout_panel_committed() a chance to map the view/surface
+ * instead */
+ if ((geom.width == geom.height && geom.width == 0) &&
+ (geom.x == geom.y && geom.x == 0) &&
+ panel->panel.edge != AGL_SHELL_EDGE_TOP)
+ return;
+
view->is_mapped = true;
view->surface->is_mapped = true;
-
+#ifdef AGL_COMP_DEBUG
+ weston_log("panel type %d inited\n", panel->panel.edge);
+#endif
weston_layer_entry_insert(&ivi->panel.view_list, &view->layer_link);
}
/* force repaint of the entire output */
weston_output_damage(output->output);
+ surf->desktop.last_output = surf->desktop.pending_output;
surf->desktop.pending_output = NULL;
}
output = surf->desktop.pending_output;
if (!output) {
struct ivi_output *ivi_bg_output;
+ struct ivi_policy *policy = surf->ivi->policy;
+
+ if (policy && policy->api.surface_activate_by_default)
+ if (policy->api.surface_activate_by_default(surf, surf->ivi))
+ goto skip_config_check;
- /* FIXME: This should be changed to determine if the policy
- * database allows that to happen */
if (!surf->ivi->quirks.activate_apps_by_default)
return;
+skip_config_check:
+ /* we can only activate it again by using the protocol */
+ if (surf->activated_by_default)
+ return;
+
ivi_bg_output = ivi_layout_find_bg_output(surf->ivi);
/* use the output of the bg to activate the app on start-up by
if (surf->view && ivi_bg_output) {
const char *app_id =
weston_desktop_surface_get_app_id(dsurf);
- if (app_id && ivi_bg_output)
+ if (app_id && ivi_bg_output) {
ivi_layout_activate(ivi_bg_output, app_id);
+ surf->activated_by_default = true;
+ }
}
return;
ivi_layout_activate_complete(output, surf);
}
+void
+ivi_layout_popup_committed(struct ivi_surface *surface)
+{
+ struct ivi_compositor *ivi = surface->ivi;
+
+ struct weston_desktop_surface *dsurface = surface->dsurface;
+ struct weston_surface *wsurface =
+ weston_desktop_surface_get_surface(dsurface);
+
+ struct ivi_output *output = surface->popup.output;
+ struct weston_output *woutput = output->output;
+
+ struct weston_view *view = surface->view;
+ struct weston_geometry geom;
+
+ if (surface->view->is_mapped)
+ return;
+
+ geom = weston_desktop_surface_get_geometry(dsurface);
+ weston_log("geom x %d, y %d, width %d, height %d\n", geom.x, geom.y,
+ geom.width, geom.height);
+
+ assert(surface->role == IVI_SURFACE_ROLE_POPUP);
+
+ weston_view_set_output(view, woutput);
+ if (surface->popup.x || surface->popup.y)
+ weston_view_set_position(view, surface->popup.x, surface->popup.y);
+ else
+ weston_view_set_position(view, geom.x, geom.y);
+ weston_layer_entry_insert(&ivi->popup.view_list, &view->layer_link);
+
+ weston_view_update_transform(view);
+ weston_view_schedule_repaint(view);
+
+ wsurface->is_mapped = true;
+ surface->view->is_mapped = true;
+}
+
+void
+ivi_layout_panel_committed(struct ivi_surface *surface)
+{
+ struct ivi_compositor *ivi = surface->ivi;
+ struct ivi_output *output = surface->bg.output;
+ struct weston_output *woutput = output->output;
+ struct weston_desktop_surface *dsurface = surface->dsurface;
+ struct weston_surface *wsurface =
+ weston_desktop_surface_get_surface(dsurface);
+ struct weston_geometry geom;
+ int x = woutput->x;
+ int y = woutput->y;
+
+ assert(surface->role == IVI_SURFACE_ROLE_PANEL);
+
+ /*
+ * If the desktop_surface geometry is not set and the panel is not a
+ * top one, we'll give this a chance to run, as some qtwayland version
+ * seem to have a 'problem', where the panel initilization part will
+ * have a desktop surface with 0 as geometry for *all* its members
+ * (width/height). Doing that will result in the panel not being
+ * displayed at all.
+ *
+ * Later versions of qtwayland do have the correct window geometry for
+ * the desktop surface so the weston_surface is already mapped in
+ * ivi_panel_init().
+ */
+ if (wsurface->is_mapped)
+ return;
+
+ geom = weston_desktop_surface_get_geometry(dsurface);
+
+#ifdef AGL_COMP_DEBUG
+ weston_log("geom.width %d, geom.height %d, geom.x %d, geom.y %d\n",
+ geom.width, geom.height, geom.x, geom.y);
+#endif
+
+ switch (surface->panel.edge) {
+ case AGL_SHELL_EDGE_TOP:
+ /* Do nothing */
+ break;
+ case AGL_SHELL_EDGE_BOTTOM:
+ y += woutput->height - geom.height;
+ break;
+ case AGL_SHELL_EDGE_LEFT:
+ /* Do nothing */
+ break;
+ case AGL_SHELL_EDGE_RIGHT:
+ x += woutput->width - geom.width;
+ break;
+ }
+#ifndef AGL_COMP_DEBUG
+ weston_log("panel type %d commited\n", surface->panel.edge);
+#endif
+
+ weston_view_set_output(surface->view, woutput);
+ weston_view_set_position(surface->view, x, y);
+ weston_layer_entry_insert(&ivi->panel.view_list,
+ &surface->view->layer_link);
+
+ weston_view_update_transform(surface->view);
+ weston_view_schedule_repaint(surface->view);
+
+ wsurface->is_mapped = true;
+ surface->view->is_mapped = true;
+}
+
void
ivi_layout_activate(struct ivi_output *output, const char *app_id)
{
struct weston_desktop_surface *dsurf;
struct weston_view *view;
struct weston_geometry geom;
+ struct ivi_policy *policy = output->ivi->policy;
surf = ivi_find_app(ivi, app_id);
if (!surf)
return;
+
+ if (policy && policy->api.surface_activate &&
+ !policy->api.surface_activate(surf, surf->ivi)) {
+ return;
+ }
+
#ifdef AGL_COMP_DEBUG
weston_log("Found app_id %s\n", app_id);
#endif
Code Review / src / agl-compositor.git / blobdiff