latest

Author: jwinarske

CMakeLists.txt

@@ -45,11 +45,9 @@ 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)
 
-# Executable
 set(FLUTTER_WAYLAND_SRC
-  #src/flutter_application.cc
-  #src/flutter_application.h
   src/utils.cc
   src/utils.h
   src/wayland_display.cc
@@ -62,12 +60,13 @@ link_directories(${CMAKE_BINARY_DIR})
 add_executable(flutter_wayland ${FLUTTER_WAYLAND_SRC})
 
 target_link_libraries(flutter_wayland
+  flutter_engine
   ${WAYLANDPP_CLIENT_LIBRARIES}
   ${WAYLANDPP_EGL_LIBRARIES}
   ${WAYLANDPP_CURSOR_LIBRARIES}
   ${WAYLANDPP_CLIENT_EXTRA_LIBRARIES}
-  flutter_engine
   ${EGL_LDFLAGS}
+  ${OPENGL_LDFLAGS}
 )
 
 target_include_directories(flutter_wayland
@@ -76,6 +75,7 @@ target_include_directories(flutter_wayland
   ${WAYLANDPP_CURSOR_INCLUDE_DIRS}
   ${WAYLANDPP_EGL_INCLUDE_DIRS}
   ${WAYLANDPP_CLIENT_EXTRA_INCLUDE_DIRS}
+  ${OPENGL_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
 )
 

src/wayland_display.cc

@@ -66,6 +66,12 @@ void WaylandDisplay::InitializeApplication(
     return reinterpret_cast<WaylandDisplay*>(userdata)
         ->OnApplicationGetOnscreenFBO();
   };
+#if 0
+  config.open_gl.make_resource_current = [](void* userdata) -> bool {
+    return reinterpret_cast<WaylandDisplay*>(userdata)
+        ->OnApplicationMakeResouceCurrent();
+  };
+#endif  
   config.open_gl.gl_proc_resolver = [](void* userdata,
                                        const char* name) -> void* {
     auto address = eglGetProcAddress(name);
@@ -91,12 +97,15 @@ void WaylandDisplay::InitializeApplication(
     command_line_args_c.push_back(arg.c_str());
   }
 
-  FlutterProjectArgs args = {
-      .struct_size = sizeof(FlutterProjectArgs),
-      .assets_path = bundle_path.c_str(),
-      .icu_data_path = icu_data_path.c_str(),
-      .command_line_argc = static_cast<int>(command_line_args_c.size()),
-      .command_line_argv = command_line_args_c.data(),
+  FlutterProjectArgs args = {};
+  args.struct_size = sizeof(FlutterProjectArgs);
+  args.assets_path = bundle_path.c_str();
+  args.icu_data_path = icu_data_path.c_str();
+  args.command_line_argc = static_cast<int>(command_line_args_c.size());
+  args.command_line_argv = command_line_args_c.data();
+  args.platform_message_callback = [](const FlutterPlatformMessage* msg,
+                                      void* userdata) -> void {
+    return reinterpret_cast<WaylandDisplay*>(userdata)->OnPlatformMessage(msg);
   };
 
   FlutterEngine engine = nullptr;
@@ -187,9 +196,6 @@ WaylandDisplay::WaylandDisplay(size_t width, size_t height,
 
   display.roundtrip();
 
-  // Get input devices
-//  touch = seat.get_touch();
-
   // load cursor theme
   #if 0
   cursor_theme_t cursor_theme = cursor_theme_t("default", 16, shm);
@@ -203,13 +209,16 @@ WaylandDisplay::WaylandDisplay(size_t width, size_t height,
 
   if(has_touch)
   {
+    std::cout << "Touch Present" << std::endl;
     touch = seat.get_touch();
+    static FlutterPointerPhase TouchPhase = kUp;
 
     touch.on_down() = [&] (uint32_t serial, uint32_t time, surface_t surface, int32_t id, double x, double y)
       {
         FlutterPointerEvent event = {};
         event.struct_size = sizeof(event);
         event.phase = kDown;
+        TouchPhase = event.phase;
         cur_x = x;
         cur_y = y;
         event.x = x;
@@ -226,6 +235,7 @@ WaylandDisplay::WaylandDisplay(size_t width, size_t height,
         FlutterPointerEvent event = {};
         event.struct_size = sizeof(event);
         event.phase = kUp;
+        TouchPhase = event.phase;
         event.x = cur_x;
         event.y = cur_y;
         event.timestamp =
@@ -242,7 +252,7 @@ WaylandDisplay::WaylandDisplay(size_t width, size_t height,
 
         FlutterPointerEvent event = {};
         event.struct_size = sizeof(event);
-        event.phase = kMove;
+        event.phase = (TouchPhase == kUp) ? kHover : kMove;
         event.x = cur_x;
         event.y = cur_y;
         event.timestamp =
@@ -255,7 +265,9 @@ WaylandDisplay::WaylandDisplay(size_t width, size_t height,
 
   if(has_pointer)
   {
+    std::cout << "Pointer Present" << std::endl;
     pointer = seat.get_pointer();
+    static FlutterPointerPhase PointerPhase = kUp;
 
     pointer.on_enter() = [&] (uint32_t serial, surface_t surface, int32_t surface_x, int32_t surface_y)
       {
@@ -283,14 +295,15 @@ WaylandDisplay::WaylandDisplay(size_t width, size_t height,
         FlutterEngineSendPointerEvent(engine_, &event, 1);
       };
 
-    pointer.on_motion() = [&] (uint32_t time, double surface_x, double surface_y)
+      static bool button = false;
+      pointer.on_motion() = [&] (uint32_t time, double surface_x, double surface_y)
       {
         cur_x = surface_x;
         cur_y = surface_y;
 
         FlutterPointerEvent event = {};
         event.struct_size = sizeof(event);
-        event.phase = kMove;
+        event.phase = (PointerPhase == kUp) ? kHover : kMove;
         event.x = surface_x;
         event.y = surface_y;
         event.timestamp =
@@ -305,6 +318,7 @@ WaylandDisplay::WaylandDisplay(size_t width, size_t height,
         FlutterPointerEvent event = {};
         event.struct_size = sizeof(event);
         event.phase = (state == pointer_button_state::pressed) ? kDown : kUp;
+        PointerPhase = event.phase;
         switch(button)
         {
           case BTN_LEFT:
@@ -324,15 +338,6 @@ WaylandDisplay::WaylandDisplay(size_t width, size_t height,
                 std::chrono::high_resolution_clock::now().time_since_epoch())
                 .count();
         FlutterEngineSendPointerEvent(engine_, &event, 1);
-#if 0
-        if(button == BTN_LEFT && state == pointer_button_state::pressed)
-          {
-            if(xdg_toplevel)
-              xdg_toplevel.move(seat, serial);
-            else
-              shell_surface.move(seat, serial);
-          }
-#endif          
       };
 
     pointer.on_axis() = [&] (uint32_t time, pointer_axis axis, double value)
@@ -381,7 +386,7 @@ WaylandDisplay::~WaylandDisplay() noexcept(false) {
 
 void WaylandDisplay::init_egl()
 {
-  if(eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE)
+  if(eglBindAPI(EGL_OPENGL_API) == EGL_FALSE)
     throw std::runtime_error("eglBindAPI");
 
   egldisplay = eglGetDisplay(display);
@@ -543,4 +548,26 @@ uint32_t WaylandDisplay::OnApplicationGetOnscreenFBO() {
   return 0;  // FBO0
 }
 
+  /// This is an optional callback. Flutter will ask the emebdder to create a GL
+  /// context current on a background thread. If the embedder is able to do so,
+  /// Flutter will assume that this context is in the same sharegroup as the
+  /// main rendering context and use this context for asynchronous texture
+  /// uploads.
+bool WaylandDisplay::OnApplicationMakeResouceCurrent() {
+    return true;
+}
+
+void WaylandDisplay::OnPlatformMessage(const FlutterPlatformMessage* msg)
+{
+  FLWAY_LOG << "Channel: " << msg->channel << std::endl;
+  FLWAY_LOG << "Message Size: " << msg->message_size << std::endl;
+  FLWAY_LOG << "Message: " << msg->message << std::endl;
+
+  auto result = FlutterEngineSendPlatformMessageResponse(engine_, msg->response_handle, NULL, 0);
+  if (result != kSuccess) {
+    FLWAY_ERROR << "Could not send platform message response" << std::endl;
+    return;
+  }
+}
+
 }  // namespace flutter

src/wayland_display.h

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#define USE_FULL_GL 0
-
 
 #include <stdexcept>
 #include <iostream>
@@ -14,12 +12,8 @@
 #include <wayland-client-protocol-extra.hpp>
 #include <wayland-egl.hpp>
 
-#if USE_FULL_GL
-#include <GL/gl.h>  /* use full OpenGL */
-#else
-#include <GLES2/gl2.h>  /* use OpenGL ES 2.x */
-#endif
-#include <EGL/egl.h>
+#include <GLES3/gl3.h>
+//#include <EGL/egl.h>
 
 #include <linux/input.h>
 #include <wayland-cursor.hpp>
@@ -118,6 +112,9 @@ class WaylandDisplay {
 
   uint32_t OnApplicationGetOnscreenFBO();
 
+  bool OnApplicationMakeResouceCurrent();
+
+  void OnPlatformMessage(const FlutterPlatformMessage* msg);
 
   FLWAY_DISALLOW_COPY_AND_ASSIGN(WaylandDisplay);
 };