1 files changed, 19 insertions, 34 deletions

diff --git a/src/common/desktop.c b/src/common/desktop.c
index a9f72e3..b6dac7f 100644
--- a/src/common/desktop.c
+++ b/src/common/desktop.c
@@ -91,7 +91,6 @@ size_t yasl_private_default_locale(char *out, size_t cap)
 }
 
 #include "public_internal.h"
-#include "yasl/desktop.h"
 #include <errno.h>
 int yasl_open_uri(const char *uri)
 {
@@ -114,48 +113,34 @@ unsigned yasl_get_appearance(void)
 {
     return yasl_public_owner() ? yasl_private_display_appearance(yasl_public_display()) : 0;
 }
+int yasl_get_double_click_ms(void)
+{
+    return yasl_public_display() && yasl_public_owner()
+               ? yasl_private_display_double_click_ms(yasl_public_display())
+               : YASL_PRIVATE_DOUBLE_CLICK_MS_DEFAULT;
+}
 int yasl_surface_bell(yasl_surface *s)
 {
-    if (!yasl_public_surface(s, false))
+    if (!yasl_public_connected(s))
         return -errno;
     if (!s->display->ops->surface_bell)
         return yasl_public_error(ENOTSUP);
     errno = 0;
     return yasl_public_status(yasl_private_surface_bell(s) || yasl_public_fail(errno));
 }
-size_t yasl_get_executable_path(char *out, size_t cap)
+size_t yasl_get_system_string(enum yasl_system_string which, char *out, size_t cap)
 {
-    if (!out && cap) {
-        yasl_public_fail(EINVAL);
-        return 0;
-    }
-    errno = 0;
-    size_t n = yasl_private_executable_path(out, cap);
-    if (!n)
-        yasl_public_fail(errno);
-    return n;
-}
-size_t yasl_get_resource_dir(char *out, size_t cap)
-{
-    if (!out && cap) {
-        yasl_public_fail(EINVAL);
-        return 0;
-    }
-    errno = 0;
-    size_t n = yasl_private_resource_dir(out, cap);
-    if (!n)
-        yasl_public_fail(errno);
-    return n;
-}
-size_t yasl_get_default_locale(char *out, size_t cap)
-{
-    if (!out && cap) {
-        yasl_public_fail(EINVAL);
-        return 0;
-    }
+    if ((!out && cap) || (unsigned)which > YASL_LOCALE)
+        return yasl_public_fail(EINVAL), 0;
+    char buf[DESKTOP_STR_MAX];
     errno = 0;
-    size_t n = yasl_private_default_locale(out, cap);
+    size_t n = which == YASL_EXECUTABLE_PATH ? desktop_executable_path(buf, sizeof(buf))
+               : which == YASL_RESOURCE_DIR  ? desktop_resource_dir(buf, sizeof(buf))
+                                             : desktop_default_locale(buf, sizeof(buf));
     if (!n)
-        yasl_public_fail(errno);
-    return n;
+        return yasl_public_fail(errno ? errno : ENOENT), 0;
+    /* A POSIX locale name without its encoding or modifier, the same on every platform. */
+    if (which == YASL_LOCALE)
+        n = strcspn(buf, ".@");
+    return copy_out(out, cap, buf, n);
 }