summaryrefslogtreecommitdiffstats
path: root/meta-agl-profile-graphical/recipes-graphics/wayland/weston/0008-ivi-layout-use-libweston-desktop-api-for-views.patch
blob: e53a8c458db886f6aa52299c806417755b74d78f (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

index 086d0fd2..6b854503 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -153,7 +153,10 @@ ivi_view_destroy(struct ivi_layout_view *ivi_view)
 	wl_list_remove(&ivi_view->pending_link);
 	wl_list_remove(&ivi_view->order_link);
 
-	weston_view_destroy(ivi_view->view);
+	if (weston_surface_is_desktop_surface(ivi_view->ivisurf->surface))
+		weston_desktop_surface_unlink_view(ivi_view->view);
+	else
+		weston_view_destroy(ivi_view->view);
 
 	free(ivi_view);
 }
@@ -170,7 +173,13 @@ ivi_view_create(struct ivi_layout_layer *ivilayer,
 		return NULL;
 	}
 
-	ivi_view->view = weston_view_create(ivisurf->surface);
+	if (weston_surface_is_desktop_surface(ivisurf->surface)) {
+		ivi_view->view = weston_desktop_surface_create_view(
+				ivisurf->weston_desktop_surface);
+	} else {
+		ivi_view->view = weston_view_create(ivisurf->surface);
+	}
+
 	if (ivi_view->view == NULL) {
 		weston_log("fails to allocate memory\n");
 		free(ivi_view);
} /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
/*
 * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

#ifndef WINDOWMANAGER_H
#define WINDOWMANAGER_H

#include <QtDBus>

#define WINDOWMANAGER_NO_ERROR 0
#define WINDOWMANAGER_ERROR_ID_ALREADY_DEFINED 1
#define WINDOWMANAGER_ERROR_NAME_ALREADY_DEFINED 2
#define WINDOWMANAGER_ERROR_ID_NOT_FOUND 3
#define WINDOWMANAGER_ERROR_NAME_NOT_FOUND 4
#define WINDOWMANAGER_ERROR_ID_IN_USE 5

class SimplePoint
{
public:
    SimplePoint();
    virtual ~SimplePoint();

	int x;
	int y;

    friend QDBusArgument &operator <<(QDBusArgument &argument, const SimplePoint &mSimplePoint);
    friend const QDBusArgument &operator >>(const QDBusArgument &argument, SimplePoint &mSimplePoint);
};


class LayoutArea
{
public:
    LayoutArea();
    virtual ~LayoutArea();

	int x;
	int y;
	int width;
	int height;

    friend QDBusArgument &operator <<(QDBusArgument &argument, const LayoutArea &mLayoutArea);
    friend const QDBusArgument &operator >>(const QDBusArgument &argument, LayoutArea &mLayoutArea);
};

class Layout
{
public:
    Layout();
    Layout(int layoutId, const QString &layoutName, const QList<LayoutArea> &surfaceAreas);
    virtual ~Layout();

    int id;
    QString name;
    QList<LayoutArea> layoutAreas;

    friend QDBusArgument &operator <<(QDBusArgument &argument, const Layout &mLayout);
    friend const QDBusArgument &operator >>(const QDBusArgument &argument, Layout &mLayout);
};

Q_DECLARE_METATYPE(SimplePoint)
Q_DECLARE_METATYPE(QList<SimplePoint>)

Q_DECLARE_METATYPE(LayoutArea)
Q_DECLARE_METATYPE(QList<LayoutArea>)

Q_DECLARE_METATYPE(Layout)
Q_DECLARE_METATYPE(QList<Layout>)

#endif // WINDOWMANAGER_H