#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"
+static void
+ivi_layout_destroy_saved_outputs(struct ivi_compositor *ivi)
+{
+ struct ivi_output *output, *output_next;
+
+ 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);
+ }
+}
+
static void
desktop_advertise_app(struct wl_listener *listener, void *data)
{
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;
}
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) {
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 =
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)
{
struct ivi_surface *ivisurf =
weston_desktop_surface_get_user_data(dsurface);
- ivisurf->xwayland.x = x;
- ivisurf->xwayland.y = y;
+ ivisurf->xwayland.x = pos.c.x;
+ ivisurf->xwayland.y = pos.c.y;
ivisurf->xwayland.is_set = true;
}
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;
if (!weston_view_is_mapped(ivisurf->view))
return;
- x = ivisurf->view->geometry.x;
- y = ivisurf->view->geometry.y;
+ x = ivisurf->view->geometry.pos_offset.x;
+ y = ivisurf->view->geometry.pos_offset.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;
surface = weston_desktop_surface_get_surface(surf->dsurface);
return api->is_xwayland_surface(surface);
+#else
+ return false;
+#endif
}
int