diff mbox

[v2,4/5] qapi: rename input axises

Message ID 1453817255-10287-4-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann Jan. 26, 2016, 2:07 p.m. UTC 
Lowercase them.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---
 qapi-schema.json | 5 +----
 qmp-commands.hx  | 4 ++--
 scripts/qapi.py  | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

Comments

Eric Blake Jan. 26, 2016, 4:08 p.m. UTC | #1 
On 01/26/2016 07:07 AM, Gerd Hoffmann wrote:
> Lowercase them.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
> ---
>  qapi-schema.json | 5 +----
>  qmp-commands.hx  | 4 ++--
>  scripts/qapi.py  | 1 -
>  3 files changed, 3 insertions(+), 7 deletions(-)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>
Eric Blake Jan. 26, 2016, 4:10 p.m. UTC | #2 
On 01/26/2016 07:07 AM, Gerd Hoffmann wrote:
> Lowercase them.

In the subject, s/axises/axes/, or, since that can be confused with the
plural of a weapon, try this rewrite:

qapi: rename InputAxis values

> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
> ---
diff mbox

Patch

diff --git a/qapi-schema.json b/qapi-schema.json
index 596d109..a269ea1 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3699,12 +3699,9 @@ 
 # Position axis of a pointer input device (mouse, tablet).
 #
 # Since: 2.0
-#
-# Note that the spelling of these values may change when the
-# x-input-send-event is promoted out of experimental status.
 ##
 { 'enum'  : 'InputAxis',
-  'data'  : [ 'X', 'Y' ] }
+  'data'  : [ 'x', 'y' ] }
 
 ##
 # @InputKeyEvent
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 8a39839..636c2e6 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -4660,8 +4660,8 @@  Move mouse pointer to absolute coordinates (20000, 400).
 
 -> { "execute": "x-input-send-event" ,
   "arguments": { "events": [
-               { "type": "abs", "data" : { "axis": "X", "value" : 20000 } },
-               { "type": "abs", "data" : { "axis": "Y", "value" : 400 } } ] } }
+               { "type": "abs", "data" : { "axis": "x", "value" : 20000 } },
+               { "type": "abs", "data" : { "axis": "y", "value" : 400 } } ] } }
 <- { "return": {} }
 
 EQMP
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 096fb24..4dcaf5a 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -66,7 +66,6 @@  case_whitelist = [
     'CpuInfoBase',          # CPU, visible through query-cpu
     'CpuInfoMIPS',          # PC, visible through query-cpu
     'CpuInfoTricore',       # PC, visible through query-cpu
-    'InputAxis',            # TODO: drop when x-input-send-event is fixed
     'QapiErrorClass',       # all members, visible through errors
     'UuidInfo',             # UUID, visible through query-uuid
     'X86CPURegister32',     # all members, visible indirectly through qom-get