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

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>
@@ -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)
@@ -864,3 +872,127 @@ 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.
+*/
+
+/* Simple DirectMedia Layer
+   Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org */
+static int parse_msg_signature(const char *signature, int *new_id_index)
+{
+    int count = 0;
+    for (; *signature; ++signature) {
+        switch (*signature) {
+        case 'n':
+            *new_id_index = count;
+            // Intentional fallthrough
+        case 'i':
+        case 'u':
+        case 'f':
+        case 's':
+        case 'o':
+        case 'a':
+        case 'h':
+            ++count;
+        }
+    }
+    return count;
+}
+
+struct wl_proxy *RA_wl_proxy_marshal_constructor_versioned(
+    struct wl_proxy *proxy, uint32_t opcode,
+    const struct wl_interface *iface, uint32_t version, ...)
+{
+    static struct wl_proxy *(*fn)(struct wl_proxy *, uint32_t,
+                                  const struct wl_interface *, uint32_t, ...) = NULL;
+    static int dlsym_called = 0;
+
+    if (!dlsym_called) {
+        fn = dlsym(RTLD_NEXT, "wl_proxy_marshal_constructor_versioned");
+        dlsym_called = 1;
+    }
+
+    if (fn) {
+        /* real symbol exists, just call it */
+        va_list ap;
+        va_start(ap, version);
+        struct wl_proxy *ret = fn(proxy, opcode, iface, version, ap);
+        va_end(ap);
+        return ret;
+    }
+
+    /* fallback path: reconstruct arguments */
+    void *varargs[WL_CLOSURE_MAX_ARGS];
+    int num_args;
+    int new_id_index = -1;
+    struct wl_interface *proxy_interface;
+    struct wl_proxy *id = wl_proxy_create(proxy, iface);
+    if (!id)
+        return NULL;
+
+    proxy_interface = (*(struct wl_interface **)proxy);
+    if (opcode > proxy_interface->method_count)
+        return NULL;
+
+    num_args = parse_msg_signature(proxy_interface->methods[opcode].signature,
+                                   &new_id_index);
+    if (new_id_index < 0)
+        return NULL;
+
+    memset(varargs, 0, sizeof(varargs));
+
+    va_list ap;
+    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_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]);
+
+    return id;
+}
+
+struct wl_proxy *RA_wl_proxy_marshal_array_constructor_versioned(
+    struct wl_proxy *proxy, uint32_t opcode,
+    union wl_argument *args,
+    const struct wl_interface *iface, uint32_t version)
+{
+    static struct wl_proxy *(*fn)(struct wl_proxy *, uint32_t,
+                                  union wl_argument *, const struct wl_interface *, uint32_t) = NULL;
+    static int dlsym_called = 0;
+
+    if (!dlsym_called) {
+        fn = dlsym(RTLD_NEXT, "wl_proxy_marshal_array_constructor_versioned");
+        dlsym_called = 1;
+    }
+
+    if (!fn) {
+        return wl_proxy_marshal_array_constructor(proxy, opcode, args, iface);
+    }
+
+    return fn(proxy, opcode, args, iface, version);
+}
+
+struct wl_proxy *wl_proxy_marshal_constructor_versioned(
+    struct wl_proxy *proxy, uint32_t opcode,
+    const struct wl_interface *iface, uint32_t version, ...)
+{
+    return RA_wl_proxy_marshal_constructor_versioned(proxy, opcode, iface, version);
+}
+
+struct wl_proxy *wl_proxy_marshal_array_constructor_versioned(
+    struct wl_proxy *proxy, uint32_t opcode,
+    union wl_argument *args,
+    const struct wl_interface *iface, uint32_t version)
+{
+    return RA_wl_proxy_marshal_array_constructor_versioned(proxy, opcode, args, iface, version);
+}

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