webOS: wl_proxy_marshal_constructor_versioned workaround for older versions

Author: cscd98

Makefile.common

@@ -1290,11 +1290,13 @@ ifeq ($(HAVE_WAYLAND), 1)
    endif
 
 ifeq ($(WEBOS), 1)
- OBJ += input/common/wayland_common_webos.o
- OBJ += gfx/common/wayland/webos-foreign.o
- OBJ += gfx/common/wayland/webos-input-manager.o
- OBJ += gfx/common/wayland/webos-shell.o
- OBJ += gfx/common/wayland/webos-surface-group.o
+   OBJ += input/common/wayland_common_webos.o
+   OBJ += gfx/common/wayland/webos-shell.o
+   ifeq ($(HAVE_WEBOS_EXTRA_PROTOS), 1)
+      OBJ += gfx/common/wayland/webos-foreign.o
+      OBJ += gfx/common/wayland/webos-input-manager.o
+      OBJ += gfx/common/wayland/webos-surface-group.o
+   endif
 endif
 
  DEF_FLAGS += $(WAYLAND_CFLAGS) $(WAYLAND_CURSOR_CFLAGS)

Makefile.webos

@@ -132,6 +132,7 @@ HAVE_UPDATE_ASSETS = 1
 HAVE_UPDATE_CORES = 1
 HAVE_UPDATE_CORE_INFO = 1
 HAVE_USERLAND ?= 0
+HAVE_WEBOS_EXTRA_PROTOS ?= 0
 HAVE_CORE_INFO_CACHE = 1
 HAVE_WAYLAND ?= 0
 
@@ -187,6 +188,9 @@ ifeq ($(HAVE_WAYLAND),1)
   DEFINES += -DHAVE_WAYLAND=1
   WAYLAND_LIBS = -lwayland-client -lwayland-cursor -lwayland-egl
 endif
+ifeq ($(HAVE_WEBOS_EXTRA_PROTOS),1)
+  DEFINES += -DHAVE_WEBOS_EXTRA_PROTOS=1
+endif
 ifeq ($(HAVE_USERLAND),1)
   DEFINES += -DHAVE_USERLAND
   WAYLAND_LIBS += -lhelpers

gfx/common/egl_common.c

@@ -470,12 +470,19 @@ static bool check_egl_client_extension(const char *name, size_t name_len)
 
 static EGLDisplay get_egl_display(EGLenum platform, void *native)
 {
+   RARCH_LOG("[EGL] get_egl_display(platform=0x%x, native=%p)\n", (unsigned)platform, native);
+
+   RARCH_LOG("[EGL] DISPLAY=%s\n", getenv("DISPLAY"));
+   RARCH_LOG("[EGL] EGL_PLATFORM=%s\n", getenv("EGL_PLATFORM"));
+   RARCH_LOG("[EGL] WAYLAND_DISPLAY=%s\n", getenv("WAYLAND_DISPLAY"));
+   RARCH_LOG("[EGL] XDG_DIR=%s\n", getenv("XDG_DIR"));
+   RARCH_LOG("[EGL] XDG_RUNTIME_DIR=%s\n", getenv("XDG_RUNTIME_DIR"));
+   RARCH_LOG("[EGL] XKB_CONFIG_ROOT=%s\n", getenv("XKB_CONFIG_ROOT"));
+
    if (platform != EGL_NONE)
    {
-      /* If the client library supports at least EGL 1.5, then we can call
-       * eglGetPlatformDisplay. Otherwise, see if eglGetPlatformDisplayEXT
-       * is available. */
 #if defined(EGL_VERSION_1_5)
+      RARCH_LOG("[EGL] Checking for EGL 1.5 support...\n");
       if (check_egl_version(1, 5))
       {
          typedef EGLDisplay (EGLAPIENTRY * pfn_eglGetPlatformDisplay)
@@ -485,40 +492,66 @@ static EGLDisplay get_egl_display(EGLenum platform, void *native)
          RARCH_LOG("[EGL] Found EGL client version >= 1.5, trying eglGetPlatformDisplay.\n");
          ptr_eglGetPlatformDisplay = (pfn_eglGetPlatformDisplay)
             _egl_get_proc_address("eglGetPlatformDisplay");
+         RARCH_LOG("[EGL] eglGetPlatformDisplay symbol=%p\n", (void*)ptr_eglGetPlatformDisplay);
 
          if (ptr_eglGetPlatformDisplay)
          {
             EGLDisplay dpy = ptr_eglGetPlatformDisplay(platform, native, NULL);
             if (dpy != EGL_NO_DISPLAY)
+            {
+               RARCH_LOG("[EGL] eglGetPlatformDisplay succeeded: %p\n", (void*)dpy);
                return dpy;
+            }
+            else
+            {
+               EGLint err = eglGetError();
+               RARCH_ERR("[EGL] eglGetPlatformDisplay failed, error=0x%x\n", err);
+            }
          }
       }
 #endif /* defined(EGL_VERSION_1_5) */
 
 #if defined(EGL_EXT_platform_base)
+      RARCH_LOG("[EGL] Checking for EGL_EXT_platform_base...\n");
       if (check_egl_client_extension("EGL_EXT_platform_base", STRLEN_CONST("EGL_EXT_platform_base")))
       {
          PFNEGLGETPLATFORMDISPLAYEXTPROC ptr_eglGetPlatformDisplayEXT;
 
          RARCH_LOG("[EGL] Found EGL_EXT_platform_base, trying eglGetPlatformDisplayEXT.\n");
          ptr_eglGetPlatformDisplayEXT = (PFNEGLGETPLATFORMDISPLAYEXTPROC)
             _egl_get_proc_address("eglGetPlatformDisplayEXT");
+         RARCH_LOG("[EGL] eglGetPlatformDisplayEXT symbol=%p\n", (void*)ptr_eglGetPlatformDisplayEXT);
 
          if (ptr_eglGetPlatformDisplayEXT)
          {
             EGLDisplay dpy = ptr_eglGetPlatformDisplayEXT(platform, native, NULL);
             if (dpy != EGL_NO_DISPLAY)
+            {
+               RARCH_LOG("[EGL] eglGetPlatformDisplayEXT succeeded: %p\n", (void*)dpy);
                return dpy;
+            }
+            else
+            {
+               EGLint err = eglGetError();
+               RARCH_ERR("[EGL] eglGetPlatformDisplayEXT failed, error=0x%x\n", err);
+            }
          }
       }
 #endif /* defined(EGL_EXT_platform_base) */
    }
 
-   /* Either the caller didn't provide a platform type, or the EGL
-    * implementation doesn't support eglGetPlatformDisplay. In this case, try
-    * eglGetDisplay and hope for the best. */
-   RARCH_LOG("[EGL] Falling back to eglGetDisplay.\n");
-   return _egl_get_display((EGLNativeDisplayType) native);
+   RARCH_LOG("[EGL] Falling back to eglGetDisplay(native=%p)\n", native);
+   EGLDisplay dpy = _egl_get_display((EGLNativeDisplayType) native);
+   if (dpy == EGL_NO_DISPLAY)
+   {
+      EGLint err = eglGetError();
+      RARCH_ERR("[EGL] eglGetDisplay failed, error=0x%x\n", err);
+   }
+   else
+   {
+      RARCH_LOG("[EGL] eglGetDisplay succeeded: %p\n", (void*)dpy);
+   }
+   return dpy;
 }
 
 bool egl_get_native_visual_id(egl_ctx_data_t *egl, EGLint *value)

input/common/wayland_common.h

@@ -180,9 +180,11 @@ typedef struct gfx_ctx_wayland_data
    struct wl_shell_surface *shell_surface;
    struct wl_webos_shell *webos_shell;
    struct wl_webos_shell_surface *webos_shell_surface;
+#ifdef HAVE_WEBOS_EXTRA_PROTOS
    struct wl_webos_foreign *webos_foreign;
    struct wl_webos_surface_group_compositor *webos_surface_group_compositor;
    struct wl_webos_input_manager *webos_input_manager;
+#endif
 #endif
    data_offer_ctx *current_drag_offer;
 #ifdef HAVE_LIBDECOR_H

input/common/wayland_common_webos.c

@@ -23,6 +23,7 @@
 #include <poll.h>
 #include <unistd.h>
 #include <string/stdstring.h>
+#include <dlfcn.h>
 
 #include "wayland_common.h"
 #include "wayland_common_webos.h"
@@ -34,9 +35,12 @@
 #include "../input_keymaps.h"
 
 #include "../../gfx/common/wayland/webos-shell.h"
+
+#ifdef HAVE_WEBOS_EXTRA_PROTOS
 #include "../../gfx/common/wayland/webos-foreign.h"
 #include "../../gfx/common/wayland/webos-surface-group.h"
 #include "../../gfx/common/wayland/webos-input-manager.h"
+#endif
 
 #ifdef HAVE_USERLAND
 #include <webos-helpers/libhelpers.h>
@@ -88,7 +92,7 @@ bool LunaRequest(const char *uri,
 #ifdef HAVE_USERLAND
 static bool registerAppCallback(LSHandle* sh, LSMessage* msg, void* context)
 {
-   RARCH_DBG("[LunaRequest] registerAppCallback returned.\n");
+   RARCH_LOG("[LunaRequest] registerAppCallback returned.\n");
    return true;
 }
 
@@ -217,7 +221,7 @@ static void wl_registry_handle_global_webos(void *data,
 {
    gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
 
-   RARCH_DBG("[Wayland/webOS] Registry: %s (id=%u, version=%u)\n",
+   RARCH_LOG("[Wayland/webOS] Registry: %s (id=%u, version=%u)\n",
              interface, id, version);
 
    if (string_is_equal(interface, "wl_compositor"))
@@ -260,6 +264,7 @@ static void wl_registry_handle_global_webos(void *data,
       wl->webos_shell = (struct wl_webos_shell*)wl_registry_bind(reg,
          id, &wl_webos_shell_interface, 1);
    }
+#ifdef HAVE_WEBOS_EXTRA_PROTOS
    else if (string_is_equal(interface, "wl_webos_foreign"))
    {
       wl->webos_foreign = (struct wl_webos_foreign*)wl_registry_bind(reg,
@@ -276,6 +281,7 @@ static void wl_registry_handle_global_webos(void *data,
       wl->webos_input_manager = (struct wl_webos_input_manager*)wl_registry_bind(reg,
          id, &wl_webos_input_manager_interface, 1);
    }
+#endif
 }
 
 static void wl_registry_handle_global_remove_webos(void *data,
@@ -385,12 +391,14 @@ void gfx_ctx_wl_destroy_resources_webos(gfx_ctx_wayland_data_t *wl)
    if (wl->surface)
       wl_surface_destroy(wl->surface);
 
+#ifdef HAVE_WEBOS_EXTRA_PROTOS
    if (wl->webos_input_manager)
       wl_webos_input_manager_destroy(wl->webos_input_manager);
    if (wl->webos_surface_group_compositor)
       wl_webos_surface_group_compositor_destroy(wl->webos_surface_group_compositor);
    if (wl->webos_foreign)
       wl_webos_foreign_destroy(wl->webos_foreign);
+#endif
    if (wl->seat)
       wl_seat_destroy(wl->seat);
    if (wl->webos_shell)
@@ -674,7 +682,7 @@ static bool screenSaverCallback(LSHandle* sh, LSMessage* reply, void* context)
                             ? (const char *)((HContext*)context)->userdata
                             : "";
 
-   RARCH_DBG("[LunaRequest] screenSaverCallback: %s\n", msg ? msg : "(null)");
+   RARCH_LOG("[LunaRequest] screenSaverCallback: %s\n", msg ? msg : "(null)");
    if (!msg || !len)
       return true;
 
@@ -721,8 +729,7 @@ static bool screenSaverCallback(LSHandle* sh, LSMessage* reply, void* context)
    rjsonwriter_raw(w, "}", 1);
 
    char *resp = rjsonwriter_get_memory_buffer(w, NULL);
-   RARCH_DBG("[LunaRequest] responseScreenSaverRequest payload: %s\n", resp);
-
+   RARCH_LOG("[LunaRequest] responseScreenSaverRequest payload: %s\n", resp);
    HContext response_ctx;
    memset(&response_ctx, 0, sizeof(response_ctx));
    response_ctx.multiple = false;
@@ -864,3 +871,100 @@ void shutdown_webos_contexts()
    }
 #endif
 }
+
+/*
+   Backwards compatibility for older versions of libwayland-client that
+   do not have wl_proxy_marshal_constructor_versioned and
+   wl_proxy_marshal_array_constructor_versioned.
+*/
+static int parse_msg_signature(const char *signature, int *new_id_index)
+{
+   int count = 0;
+   if (new_id_index) *new_id_index = -1;
+   if (!signature) return 0;
+
+   for (; *signature; ++signature) {
+      switch (*signature) {
+      case 'n':
+         if (new_id_index) *new_id_index = count;
+         /* fallthrough */
+      case 'i': case 'u': case 'f':
+      case 's': case 'o': case 'a': case 'h':
+         ++count;
+         break;
+      default:
+         break;
+      }
+   }
+   return count;
+}
+
+static void wl_marshal_20(struct wl_proxy *proxy, uint32_t opcode, void **varargs)
+{
+   wl_proxy_marshal(proxy, opcode,
+      varargs[0],  varargs[1],  varargs[2],  varargs[3],  varargs[4],
+      varargs[5],  varargs[6],  varargs[7],  varargs[8],  varargs[9],
+      varargs[10], varargs[11], varargs[12], varargs[13], varargs[14],
+      varargs[15], varargs[16], varargs[17], varargs[18], varargs[19]);
+}
+
+struct wl_proxy *wl_proxy_marshal_constructor(struct wl_proxy *proxy,
+                                              uint32_t opcode,
+                                              const struct wl_interface *interface, ...)
+{
+   va_list ap;
+   void *varargs[WL_CLOSURE_MAX_ARGS];
+   int num_args, new_id_index = -1;
+
+   struct wl_proxy *id = wl_proxy_create(proxy, interface);
+   if (!id) return NULL;
+
+   struct wl_interface *proxy_iface = (*(struct wl_interface **)proxy);
+   if (!proxy_iface) return NULL;
+   if (opcode >= proxy_iface->method_count) return NULL;
+
+   const char *sig = proxy_iface->methods[opcode].signature;
+   num_args = parse_msg_signature(sig, &new_id_index);
+   if (new_id_index < 0) return NULL;
+
+   memset(varargs, 0, sizeof(varargs));
+   va_start(ap, interface);
+   for (int i = 0; i < num_args; i++)
+      varargs[i] = va_arg(ap, void *);
+   va_end(ap);
+
+   varargs[new_id_index] = id;
+   wl_marshal_20(proxy, opcode, varargs);
+   return id;
+}
+
+struct wl_proxy *wl_proxy_marshal_constructor_versioned(struct wl_proxy *proxy,
+                                                        uint32_t opcode,
+                                                        const struct wl_interface *interface,
+                                                        uint32_t version, ...)
+{
+   va_list ap;
+   void *varargs[WL_CLOSURE_MAX_ARGS];
+   int num_args, new_id_index = -1;
+
+   struct wl_proxy *id = wl_proxy_create(proxy, interface);
+   if (!id) return NULL;
+
+   struct wl_interface *proxy_iface = (*(struct wl_interface **)proxy);
+   if (!proxy_iface) return NULL;
+   if (opcode >= proxy_iface->method_count) return NULL;
+
+   const char *sig = proxy_iface->methods[opcode].signature;
+   num_args = parse_msg_signature(sig, &new_id_index);
+   if (new_id_index < 0) return NULL;
+
+   memset(varargs, 0, sizeof(varargs));
+   va_start(ap, version);
+   for (int i = 0; i < num_args; i++)
+      varargs[i] = va_arg(ap, void *);
+   va_end(ap);
+
+   varargs[new_id_index] = id;
+   wl_marshal_20(proxy, opcode, varargs);
+   return id;
+}

input/common/wayland_common_webos.h

@@ -37,4 +37,8 @@ enum webos_wl_special_keymap
 extern uint8_t webos_wl_special_keymap[webos_wl_key_size];
 extern void shutdown_webos_contexts();
 
+/* Backwards compatibility for webOS 3 */
+#define WL_CLOSURE_MAX_ARGS 20
+/* end: backwards compatibility for webOS 3 */
+
 #endif