Changeset 96c6a00 in mainline for uspace/lib/ui/src/paint.c

Timestamp:

2022-03-10T13:44:10Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c88d7f99

Parents:

ca2680d

git-author:

Jiri Svoboda <jiri@…> (2022-03-09 18:44:00)

git-committer:

Jiri Svoboda <jiri@…> (2022-03-10 13:44:10)

Message:

Menu accelerators

Open a menu by pressing F10, then accelerator key (e.g. 'F').

File:

• uspace/lib/ui/src/paint.c (modified) (4 diffs)

uspace/lib/ui/src/paint.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <gfx/render.h>
 #include <gfx/text.h>
+#include <ui/accel.h>
 #include <ui/paint.h>
 #include <stdlib.h>
@@ -566 +567 @@
 }
 
-/** Process text with '~' markup.
- *
- * Parse text with tilde markup into a list of strings. @a *rbuf is set
- * to point to a newly allocated buffer containing consecutive null-terminated
- * strings.
- *
- * Each part between two '~' becomes one string. '~~' is translated into
- * a literal '~' character. @a *endptr is set to point to the first character
- * beyond the end of the list.
- *
- * @param str String with tilde markup
- * @param rbuf Place to store pointer to newly allocated buffer.
- * @param endptr Place to store end pointer (just after last character)
- * @return EOK on success or an error code
- */
-static int ui_text_process(const char *str, char **rbuf, char **endptr)
-{
-        const char *sp;
-        char *dp;
-        char *buf;
-
-        buf = malloc(str_size(str) + 1);
-        if (buf == NULL)
-                return ENOMEM;
-
-        /* Break down string into list of (non)highlighted parts */
-        sp = str;
-        dp = buf;
-        while (*sp != '\0') {
-                if (*sp == '~') {
-                        if (sp[1] == '~') {
-                                sp += 2;
-                                *dp++ = '~';
-                        } else {
-                                ++sp;
-                                *dp++ = '\0';
-                        }
-                } else {
-                        *dp++ = *sp++;
-                }
-        }
-
-        *dp++ = '\0';
-        *rbuf = buf;
-        *endptr = dp;
-
-        return EOK;
-}
-
 /** Compute UI text width.
  *
@@ -664 +616 @@
 
         /* Break down string into list of (non)highlighted parts */
-        rc = ui_text_process(str, &buf, &endptr);
+        rc = ui_accel_process(str, &buf, &endptr);
         if (rc != EOK)
                 return rc;