webOS: webOS 1 and 2 compatibility (set HOME, check folder is writeable, fix version check) (#18601)

Author: cscd98

Makefile.common

@@ -1289,13 +1289,15 @@ ifeq ($(HAVE_WAYLAND), 1)
       OBJ += gfx/drivers_context/wayland_vk_ctx.o
    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
-endif
+   ifeq ($(WEBOS), 1)
+      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)
  LIBS += $(WAYLAND_LIBS) $(WAYLAND_CURSOR_LIBS)

Makefile.webos

@@ -133,6 +133,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
 
@@ -188,6 +189,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

frontend/drivers/platform_unix.c

@@ -97,6 +97,10 @@
 
 #include "platform_unix.h"
 
+#ifdef WEBOS
+#include <formats/rjson.h>
+#endif
+
 #ifdef ANDROID
 static void frontend_unix_set_sustained_performance_mode(bool on);
 
@@ -1308,57 +1312,56 @@ const char *retroarch_get_webos_version(char *s, size_t len,
    FILE *f = fopen("/usr/lib/os-release", "r");
    if (!f)
    {
-      /* fallback to starfish-release */
-      f = fopen("/etc/starfish-release", "r");
+      /* fallback to nyx os_info.json */
+      f = fopen("/var/run/nyx/os_info.json", "r");
       if (!f)
          return strlcpy(s, "webOS (unknown)", len), "webOS (unknown)";
 
-      /* Example content:
-         Rockhopper release 3.9.0-62709 (dreadlocks2-dudhwa) */
-      char line[256];
-      if (fgets(line, sizeof(line), f))
-      {
-         char *nl = strchr(line, '\n');
-         if (nl) *nl = '\0';
-         snprintf(pretty, sizeof(pretty), "webOS - %s", line);
+      /* read whole file into buffer */
+      char buf[4096];
+      size_t n = fread(buf, 1, sizeof(buf)-1, f);
+      fclose(f);
+      buf[n] = '\0';
 
-         /* Try parse after the word "release", else first digit run in the line */
-         char *ver = strstr(line, "release");
-         if (ver)
-         {
-            ver += strlen("release");
-            while (*ver == ' ') ver++;
-         }
-         else
-         {
-            /* find first digit in the line */
-            ver = line;
-            while (*ver && ((*ver < '0') || (*ver > '9'))) ver++;
-            if (!*ver) ver = NULL;
-         }
+      rjson_t *json = rjson_open_string(buf, n);
+      enum rjson_type t;
+      const char *key = NULL, *val = NULL;
+      const char *name_str = NULL, *release_str = NULL;
 
-         if (ver)
+      while ((t = rjson_next(json)) != RJSON_DONE && t != RJSON_ERROR)
+      {
+         if (t == RJSON_STRING)
          {
-            char *endptr = NULL;
-            long maj = strtol(ver, &endptr, 10);
-            if (endptr != ver)
+            key = rjson_get_string(json, NULL);
+            t = rjson_next(json);
+            if (t == RJSON_STRING)
             {
-               if (major) *major = (int)maj;
-               if (endptr && *endptr == '.' && minor)
-               {
-                  long min = strtol(endptr + 1, NULL, 10);
-                  /* only set minor if a number was present */
-                  const char *p = endptr + 1;
-                  if (p && (*p >= '0' && *p <= '9'))
-                     *minor = (int)min;
-               }
+               val = rjson_get_string(json, NULL);
+               if (strcmp(key, "webos_name") == 0)
+                  name_str = val;
+               else if (strcmp(key, "webos_release") == 0)
+                  release_str = val;
             }
          }
       }
-      fclose(f);
+      rjson_free(json);
 
-      if (pretty[0] == '\0')
-         strlcpy(pretty, "webOS (unknown)", sizeof(pretty));
+      if (name_str && release_str)
+         snprintf(pretty, sizeof(pretty), "%s %s", name_str, release_str);
+      else if (name_str)
+         snprintf(pretty, sizeof(pretty), "%s", name_str);
+      else
+         snprintf(pretty, sizeof(pretty), "webOS (unknown)");
+
+      if (release_str) {
+         char *endptr = NULL;
+         long maj = strtol(release_str, &endptr, 10);
+         if (major) *major = (int)maj;
+         if (endptr && *endptr == '.' && minor)
+            *minor = (int)strtol(endptr+1, NULL, 10);
+         else if (minor)
+            *minor = 0;
+      }
 
       return strlcpy(s, pretty, len), pretty;
    }

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

@@ -34,9 +34,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 +263,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 +280,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 +390,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)

retroarch.c

@@ -45,6 +45,9 @@
 
 #if defined(WEBOS)
 #include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include "input/common/wayland_common_webos.h"
 #endif
 
@@ -5955,6 +5958,30 @@ void main_exit(void *args)
 #endif
 }
 
+#if defined(WEBOS)
+/* make a directory recursively */
+static int mkdir_p(const char *path, mode_t mode)
+{
+    char tmp[PATH_MAX_LENGTH];
+    char *p = NULL;
+    size_t len;
+
+    snprintf(tmp, sizeof(tmp), "%s", path);
+    len = strlen(tmp);
+    if (tmp[len - 1] == '/')
+        tmp[len - 1] = 0;
+
+    for (p = tmp + 1; *p; p++) {
+        if (*p == '/') {
+            *p = 0;
+            mkdir(tmp, mode);
+            *p = '/';
+        }
+    }
+    return mkdir(tmp, mode);
+}
+#endif
+
 /**
  * main_entry:
  *
@@ -5992,6 +6019,26 @@ int rarch_main(int argc, char *argv[], void *data)
 #endif
 
 #if defined(WEBOS)
+   /* compatibility with webOS 1 and 2 */
+   const char *home = getenv("HOME");
+   const char *appId = getenv("APPID");
+   char new_path[PATH_MAX_LENGTH];
+
+   if (home)
+   {
+      if (!appId || !*appId || strcmp(appId, "com.palm.devmode.openssh") == 0)
+         appId = WEBOS_APP_ID;
+
+      snprintf(new_path, sizeof(new_path), "/%s/.config", home);
+      if (access(new_path, F_OK) != 0 && mkdir(new_path, 0775) != 0)
+      {
+         snprintf(new_path, sizeof(new_path), "/media/developer/temp/webosbrew/%s", appId);
+         if (mkdir_p(new_path, 0775) != 0 && errno != EEXIST)
+            RARCH_ERR("FATAL: mkdir_p failed for '%s': %s\n", new_path, strerror(errno));
+         setenv("HOME", new_path, 1);
+      }
+   }
+
    /* compatibility with webOS 3 - 5 */
    if (getenv("EGL_PLATFORM") == NULL)
       setenv("EGL_PLATFORM", "wayland", 0);