From 50008adf4af5360f87109d6264aa77ac82f2a80a Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 26 Jun 2017 21:07:00 +0200
Subject: options: handle suffixes like -add in a more generic way

This affects options like --vf or --display-tags. These used a "*"
suffix to match all options starting with a specific name, and handled
the rest in the option parser. Change this to remove the "*" special
case, and require every option parser to declare a list of allowed
suffixes via m_option_type.actions.

The new way is conceptually simpler, because we don't have to account
for the "*" in a bunch of places anymore, and instead everything is
centrally handled in the CLI part of the option parser, where it's
actually needed.

It automatically enables suffixes like -add for a bunch of other
stringlist options.
---
 options/m_option.h | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'options/m_option.h')

diff --git a/options/m_option.h b/options/m_option.h
index 20021c2122..fc879d44f1 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -243,6 +243,15 @@ union m_option_value {
 
 ////////////////////////////////////////////////////////////////////////////
 
+struct m_option_action {
+    // The name of the suffix, e.g. "add" for a list. If the option is named
+    // "foo", this will be available as "--foo-add". Note that no suffix (i.e.
+    // "--foo" is implicitly always available.
+    const char *name;
+    // One of M_OPT_TYPE*.
+    unsigned int flags;
+};
+
 // Option type description
 struct m_option_type {
     const char *name;
@@ -318,6 +327,10 @@ struct m_option_type {
     // static strings (and even mpv_node_list.keys), though.
     int (*get)(const m_option_t *opt, void *ta_parent, struct mpv_node *dst,
                void *src);
+
+    // Optional: list of suffixes, terminated with a {0} entry. An empty list
+    // behaves like the list being NULL.
+    const struct m_option_action *actions;
 };
 
 // Option description
@@ -412,17 +425,11 @@ struct m_option {
 
 // These flags are used to describe special parser capabilities or behavior.
 
-// Wildcard matching flag.
-/** If set the option type has a use for option names ending with a *
- *  (used for -aa*), this only affects the option name matching.
- */
-#define M_OPT_TYPE_ALLOW_WILDCARD       (1 << 1)
-
 // The parameter is optional and by default no parameter is preferred. If
 // ambiguous syntax is used ("--opt value"), the command line parser will
 // assume that the argument takes no parameter. In config files, these
 // options can be used without "=" and value.
-#define M_OPT_TYPE_OPTIONAL_PARAM       (1 << 2)
+#define M_OPT_TYPE_OPTIONAL_PARAM       (1 << 0)
 
 ///////////////////////////// Parser flags /////////////////////////////////
 
@@ -460,14 +467,6 @@ struct m_option {
 char *m_option_strerror(int code);
 
 // Find the option matching the given name in the list.
-/** \ingroup Options
- *  This function takes the possible wildcards into account (see
- *  \ref M_OPT_TYPE_ALLOW_WILDCARD).
- *
- *  \param list Pointer to an array of \ref m_option.
- *  \param name Name of the option.
- *  \return The matching option or NULL.
- */
 const m_option_t *m_option_list_find(const m_option_t *list, const char *name);
 
 // Helper to parse options, see \ref m_option_type::parse.
-- 
cgit v1.2.3