From 0d00f7e1cf8a0fa1e2b1aa2732bceaae39f4e23c Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Wed, 9 Sep 2020 16:59:03 -0400
Subject: Scanning input generalization (#789)

* Add inputs to options.scanning

* Update CSS for mouse buttons

* Update list counters

* Set up HTML/CSS

* Add input controller

* Use new inputs

* Include mouse buttons

* Update how button inputs are detected

* Add index/empty fields to the input details object

* Update none check for scanning modifier

* Remove old settings

* Remove unused global
---
 ext/bg/data/options-schema.json | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

(limited to 'ext/bg/data')

diff --git a/ext/bg/data/options-schema.json b/ext/bg/data/options-schema.json
index 52d96db9..17fe096c 100644
--- a/ext/bg/data/options-schema.json
+++ b/ext/bg/data/options-schema.json
@@ -318,7 +318,7 @@
                             "scanning": {
                                 "type": "object",
                                 "required": [
-                                    "middleMouse",
+                                    "inputs",
                                     "touchInputEnabled",
                                     "selectText",
                                     "alphanumeric",
@@ -336,9 +336,30 @@
                                     "layoutAwareScan"
                                 ],
                                 "properties": {
-                                    "middleMouse": {
-                                        "type": "boolean",
-                                        "default": true
+                                    "inputs": {
+                                        "type": "array",
+                                        "default": [
+                                            {
+                                                "include": "shift",
+                                                "exclude": ""
+                                            }
+                                        ],
+                                        "items": {
+                                            "required": [
+                                                "include",
+                                                "exclude"
+                                            ],
+                                            "properties": {
+                                                "include": {
+                                                    "type": "string",
+                                                    "default": "shift"
+                                                },
+                                                "exclude": {
+                                                    "type": "string",
+                                                    "default": ""
+                                                }
+                                            }
+                                        }
                                     },
                                     "touchInputEnabled": {
                                         "type": "boolean",
@@ -371,11 +392,6 @@
                                         "minimum": 1,
                                         "default": 10
                                     },
-                                    "modifier": {
-                                        "type": "string",
-                                        "enum": ["none", "alt", "ctrl", "shift", "meta"],
-                                        "default": "shift"
-                                    },
                                     "deepDomScan": {
                                         "type": "boolean",
                                         "default": false
-- 
cgit v1.2.3