Waylandpp

egl resource context
Pointer handler
Touch handler
Keyboard handler
Runs on Ubuntu and Raspberry Pi 3

Author: jwinarske

.gitignore

@@ -33,3 +33,5 @@ Icon?
 
 *.sublime-workspace
 cmake-*/
+
+.vscode

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.5.2)
 
 project(flutter_wayland)
 
-set(FLUTTER_ENGINE_SHA b9523318caa1a99ffde8adaf331212eb879cabc9)
+set(FLUTTER_ENGINE_SHA af51afceb8886cc11e25047523c4e0c7e1f5d408)
 
 set(FLUTTER_EMBEDDER_ARTIFACTS_ZIP ${CMAKE_BINARY_DIR}/flutter_embedder_${FLUTTER_ENGINE_SHA}.zip)
 set(FLUTTER_ARTIFACTS_ZIP          ${CMAKE_BINARY_DIR}/flutter_artifact_${FLUTTER_ENGINE_SHA}.zip)
@@ -37,32 +37,53 @@ if(NOT EXISTS ${FLUTTER_ARTIFACTS_ZIP})
   )
 endif()
 
-find_package(PkgConfig)
-pkg_check_modules(WAYLAND_CLIENT REQUIRED wayland-client)
-pkg_check_modules(WAYLAND_EGL    REQUIRED wayland-egl)
-pkg_check_modules(EGL            REQUIRED egl)
+set(CMAKE_CXX_STANDARD 14)
 
-# Executable
-file(GLOB_RECURSE FLUTTER_WAYLAND_SRC
-  "src/*.cc"
-  "src/*.h"
+include(FindPkgConfig)
+pkg_check_modules(WAYLANDPP_CLIENT REQUIRED "wayland-client++>=0.2.7")
+pkg_check_modules(WAYLANDPP_CURSOR REQUIRED "wayland-cursor++>=0.2.7")
+pkg_check_modules(WAYLANDPP_EGL REQUIRED "wayland-egl++>=0.2.7")
+pkg_check_modules(WAYLANDPP_CLIENT_EXTRA REQUIRED "wayland-client-extra++>=0.2.7")
+pkg_check_modules(EGL REQUIRED egl)
+pkg_check_modules(OPENGL REQUIRED gl)
+pkg_check_modules(XKBCOMMON REQUIRED xkbcommon)
+pkg_check_modules(RAPIDJSON REQUIRED "RapidJSON>=1.1.0")
+
+
+
+set(FLUTTER_WAYLAND_SRC
+  src/utils.cc
+  src/utils.h
+  src/wayland_display.cc
+  src/wayland_display.h
+  src/main.cc
 )
 
 link_directories(${CMAKE_BINARY_DIR})
 
 add_executable(flutter_wayland ${FLUTTER_WAYLAND_SRC})
 
 target_link_libraries(flutter_wayland
-  ${WAYLAND_CLIENT_LIBRARIES}
-  ${WAYLAND_EGL_LIBRARIES}
-  ${EGL_LIBRARIES}
   flutter_engine
+  ${WAYLANDPP_CLIENT_LIBRARIES}
+  ${WAYLANDPP_EGL_LIBRARIES}
+  ${WAYLANDPP_CURSOR_LIBRARIES}
+  ${WAYLANDPP_CLIENT_EXTRA_LIBRARIES}
+  ${XKBCOMMON_LIBRARIES}
+  ${RAPIDJSON_LIBRARIES}
+  ${EGL_LDFLAGS}
+  ${OPENGL_LDFLAGS}
 )
 
 target_include_directories(flutter_wayland
   PRIVATE
-  ${WAYLAND_CLIENT_INCLUDE_DIRS}
-  ${WAYLAND_EGL_INCLUDE_DIRS}
-  ${EGL_INCLUDE_DIRS}
+  ${WAYLANDPP_CLIENT_INCLUDE_DIRS}
+  ${WAYLANDPP_CURSOR_INCLUDE_DIRS}
+  ${WAYLANDPP_EGL_INCLUDE_DIRS}
+  ${WAYLANDPP_CLIENT_EXTRA_INCLUDE_DIRS}
+  ${RAPIDJSON_INCLUDE_DIRS}
+  ${OPENGL_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
 )
+
+target_compile_options(flutter_wayland PUBLIC ${EGL_CFLAGS})

README.md

@@ -3,7 +3,7 @@ Flutter Wayland
 
 A Flutter Embedder that talks to Wayland.
 
-![Running in Weston](assets/image.png)
+![Running in Weston](assets/ubuntu_wayland_18.0.4.png)
 
 Build Setup Instructions
 ------------------------

assets/ubuntu_wayland_18.0.4.png

@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "flutter_application.h"
 #include "utils.h"
 #include "wayland_display.h"
 
@@ -55,27 +54,27 @@ static bool Main(std::vector<std::string> args) {
     return false;
   }
 
-  const size_t kWidth = 800;
-  const size_t kHeight = 600;
+  const size_t kWidth = 640;
+  const size_t kHeight = 480;
 
   for (const auto& arg : args) {
-    FLWAY_ERROR << "Arg: " << arg << std::endl;
+    FLWAY_LOG << "Arg: " << arg << std::endl;
   }
 
-  WaylandDisplay display(kWidth, kHeight);
+  WaylandDisplay display(kWidth, kHeight, asset_bundle_path, args);
 
   if (!display.IsValid()) {
     FLWAY_ERROR << "Wayland display was not valid." << std::endl;
     return false;
   }
 
-  FlutterApplication application(asset_bundle_path, args, display);
-  if (!application.IsValid()) {
+  display.InitializeApplication(asset_bundle_path, args);
+  if (!display.IsValid()) {
     FLWAY_ERROR << "Flutter application was not valid." << std::endl;
     return false;
   }
 
-  if (!application.SetWindowSize(kWidth, kHeight)) {
+  if (!display.SetWindowSize(kWidth, kHeight)) {
     FLWAY_ERROR << "Could not update Flutter application size." << std::endl;
     return false;
   }