Merge remote-tracking branch 'upstream/pull/139'

* upstream/pull/139
  multi-touch-viewer: add the type of shell selection input

  Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
  Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com>
  Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>

1 files changed, 8 insertions, 1 deletions

diff --git a/ivi-layermanagement-examples/multi-touch-viewer/include/window.h b/ivi-layermanagement-examples/multi-touch-viewer/include/window.h
index 40e2925..d81dda6 100644
--- a/ivi-layermanagement-examples/multi-touch-viewer/include/window.h
+++ b/ivi-layermanagement-examples/multi-touch-viewer/include/window.h
@@ -46,6 +46,12 @@ struct Task
     struct wl_list link;
 };
 
+enum TypeOfShell
+{
+    WL_SHELL  = 1,
+    IVI_SHELL = 2
+};
+
 struct WaylandDisplay
 {
     struct Task           display_task;
@@ -57,6 +63,7 @@ struct WaylandDisplay
     EGLDisplay            egldisplay;
     EGLConfig             eglconfig;
     EGLContext            eglcontext;
+    enum TypeOfShell      shell_type;
 
     int                   running;
     int                   epoll_fd;
@@ -102,7 +109,7 @@ struct WaylandEglWindow
 };
 
 struct WaylandDisplay*
-CreateDisplay(int argc, char **argv);
+CreateDisplay(int argc, char **argv, enum TypeOfShell shell_type);
 
 void
 DestroyDisplay(struct WaylandDisplay *p_display);