Re: [PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-15 Thread Sergey Udaltsov
Hi Hans

I can push, of course, if the mutual consensus is that now is the right
time for it.

Cheers

Sergey

On Mon, May 15, 2017 at 8:26 AM, Hans de Goede  wrote:

> Hi,
>
> On 15-05-17 03:06, Peter Hutterer wrote:
>
>> adding svu to CC:
>>
>> On Fri, May 12, 2017 at 04:18:42PM +0200, Hans de Goede wrote:
>>
>>> KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
>>> current xproto master defines keysyms for these. Add mappings for
>>> these keys.
>>>
>>> The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND
>>> evdev code for it, so lets adds a mapping for that too.
>>>
>>> Note that this replaces the I255 to XF86Hibernate mapping in
>>> xkb_symbols "evdev", I don't know where that came from, but it is
>>> wrong, I255 was until now not defined in keycodes/evdev and
>>> KEY_HIBERNATE is not defined in linux/input-event-codes.h .
>>>
>>
>> see xk-c commit 7b3bfb3ec4b, has a link to the thread. After a bit of
>> digging, this got merged into dmitry's next tree (see
>> https://patchwork.kernel.org/patch/9742/) but never ended up in master.
>> My email archives trail out from there and I'm not sure what exactly
>> happens, google isn't forthcoming either.
>>
>> Looks like we simply pushed the xk-c patch too early, assumign that -next
>> will end up in master. But anyway, we've survived 8 years without it, so I
>> think we're good :)
>>
>
> Thank you for the digging I've updated the commit message to reflect
> this info and correct the grammar errors Bastien pointed out. I've
> tried to push this, but it just hangs ? Maybe because I don't have
> write access to xkeyboard-config (it is sitting outside of the
> xorg tree after all) ?
>
> Anyways I'll send a v2 with the improved commit message, if you can push
> that, that would be great.
>
> Regards,
>
> Hans
>
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-15 Thread Bastien Nocera
Hey,

Comments inline.

On Mon, 2017-05-15 at 08:36 +0200, Hans de Goede wrote:
> KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
> current xproto master defines keysyms for these. Add mappings for
> these keys.
> 
> The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND

"keysym has existed"

> evdev code for it, so lets adds a mapping for that too.

"let's add"

> Note that this replaces the I255 to XF86Hibernate mapping in
> xkb_symbols "evdev", I don't know where that came from, but it is
> wrong, I255 was until now not defined in keycodes/evdev and
> KEY_HIBERNATE is not defined in linux/input-event-codes.h .
> 
> BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100970
> Cc: Bastien Nocera 
> Cc: Benjamin Berg 
> Signed-off-by: Hans de Goede 
> Reviewed-by: Peter Hutterer 
> ---
>  keycodes/evdev | 2 ++
>  symbols/inet   | 7 ---
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/keycodes/evdev b/keycodes/evdev
> index 624ac68..51a6e26 100644
> --- a/keycodes/evdev
> +++ b/keycodes/evdev
> @@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
>    = 251;   // #define KEY_BRIGHTNESS_CYCLE243
>    = 252;   // #define KEY_BRIGHTNESS_ZERO 244
>    = 253;   // #define KEY_DISPLAY_OFF 245
> +  = 254;   // #define KEY_WWAN246
> +  = 255;   // #define KEY_RFKILL  247
>  
>   // Fake keycodes for virtual keys
>    =   92;
> diff --git a/symbols/inet b/symbols/inet
> index 5403e77..1e06aa9 100644
> --- a/symbols/inet
> +++ b/symbols/inet
> @@ -184,7 +184,7 @@ xkb_symbols "evdev" {
>  key    {  [ Print ]   };
>  //  key    {  [ ]   }; // KEY_HP
>  key    {  [ XF86WebCam]   };
> -//  key    {  [ ]   }; // KEY_SOUND
> +key    {  [ XF86AudioPreset   ]   };

This is an existing keysym, but what does it correspond to?

>  //  key    {  [ ]   }; // KEY_QUESTION
>  key    {  [ XF86Mail  ]   };
>  key    {  [ XF86Messenger ]   }; //
> KEY_CHAT
> @@ -210,13 +210,14 @@ xkb_symbols "evdev" {
>  key    {  [ XF86Battery   ]   };
>  key    {  [ XF86Bluetooth ]   };
>  key    {  [ XF86WLAN  ]   };
> +key    {  [ XF86UWB   ]   };

Feels weird using up a slot for a key that toggles an obsolete wireless
protocol...

>  //  key    {  [ ]   }; // KEY_VIDEO_NEXT  --  drive
> next video source
>  //  key    {  [ ]   }; // KEY_VIDEO_PREV  --  drive
> previous video source
>  //  key    {  [ ]   }; // KEY_BRIGHTNESS_CYCLE  
> --  bright up, max++ == min
>  //  key    {  [ ]   }; // KEY_BRIGHTNESS_ZERO  
> --  brightness off
>  //  key    {  [ ]   }; // KEY_DISPLAY_OFF  --  turn
> off display
> -//  key    {  [ ]   }; // KEY_WIMAX
> -key    {  [ XF86Hibernate ]   }; //
> KEY_HIBERNATE
> +key    {  [ XF86WWAN  ]   }; //
> KEY_WWAN
> +key    {  [ XF86RFKill]   }; //
> KEY_RFKILL
>  
>  key    {  [ XF86Tools ]   };
>  key    {  [ XF86Launch5   ]   };

Cheers
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-15 Thread Bastien Nocera
On Mon, 2017-05-15 at 09:07 +0200, Hans de Goede wrote:
> > > -//  key    {  [ ]   }; // KEY_SOUND
> > > +    key    {  [ XF86AudioPreset   ]   };
> > 
> > This is an existing keysym, but what does it correspond to?
> 
>  From XF86keysym.h :
> 
> #define XF86XK_AudioPreset 0x1008FFB6 /* Select equalizer preset,
> e.g. theatre-mode */
> 
> I221 corresponds to KEY_SOUND which gets used in the kernel in
> the following ways:
> 
> drivers/platform/x86/peaq-wmi.c:
> Used for the Dolby button which under windows toggles through
> theater/game/speach/music mode.
> 
> drivers/media/rc/keymaps/rc-kworld-pc150u.c
> 73: { 0x48, KEY_SOUND}, /* switch theater mode */
> 
> drivers/media/rc/keymaps/rc-cec.c
> 67: { 0x33, KEY_SOUND }, /* CEC Spec: Sound Select */
> 
> drivers/media/rc/keymaps/rc-encore-enltv.c
> 74: { 0x4d, KEY_SOUND },    /* DVD sound */

Looks like we won't need to handle *that* one in gnome-settings-daemon.

Thanks
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-15 Thread Hans de Goede

Hi,

On 15-05-17 16:59, Sergey Udaltsov wrote:

Hi Hans

I can push, of course, if the mutual consensus is that now is the right time 
for it.


I consider the patch ready for merging / pushing, which is why I tried to push 
it
myself :)

Regards,

Hans


On Mon, May 15, 2017 at 8:26 AM, Hans de Goede > wrote:

Hi,

On 15-05-17 03:06, Peter Hutterer wrote:

adding svu to CC:

On Fri, May 12, 2017 at 04:18:42PM +0200, Hans de Goede wrote:

KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
current xproto master defines keysyms for these. Add mappings for
these keys.

The XF86UWB keysm exists for quite a while now, as does the 
KEY_SOUND
evdev code for it, so lets adds a mapping for that too.

Note that this replaces the I255 to XF86Hibernate mapping in
xkb_symbols "evdev", I don't know where that came from, but it is
wrong, I255 was until now not defined in keycodes/evdev and
KEY_HIBERNATE is not defined in linux/input-event-codes.h .


see xk-c commit 7b3bfb3ec4b, has a link to the thread. After a bit of
digging, this got merged into dmitry's next tree (see
https://patchwork.kernel.org/patch/9742/ 
) but never ended up in master.
My email archives trail out from there and I'm not sure what exactly
happens, google isn't forthcoming either.

Looks like we simply pushed the xk-c patch too early, assumign that 
-next
will end up in master. But anyway, we've survived 8 years without it, 
so I
think we're good :)


Thank you for the digging I've updated the commit message to reflect
this info and correct the grammar errors Bastien pointed out. I've
tried to push this, but it just hangs ? Maybe because I don't have
write access to xkeyboard-config (it is sitting outside of the
xorg tree after all) ?

Anyways I'll send a v2 with the improved commit message, if you can push
that, that would be great.

Regards,

Hans



___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-15 Thread Hans de Goede

Hi,

On 15-05-17 03:06, Peter Hutterer wrote:

adding svu to CC:

On Fri, May 12, 2017 at 04:18:42PM +0200, Hans de Goede wrote:

KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
current xproto master defines keysyms for these. Add mappings for
these keys.

The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND
evdev code for it, so lets adds a mapping for that too.

Note that this replaces the I255 to XF86Hibernate mapping in
xkb_symbols "evdev", I don't know where that came from, but it is
wrong, I255 was until now not defined in keycodes/evdev and
KEY_HIBERNATE is not defined in linux/input-event-codes.h .


see xk-c commit 7b3bfb3ec4b, has a link to the thread. After a bit of
digging, this got merged into dmitry's next tree (see
https://patchwork.kernel.org/patch/9742/) but never ended up in master.
My email archives trail out from there and I'm not sure what exactly
happens, google isn't forthcoming either.

Looks like we simply pushed the xk-c patch too early, assumign that -next
will end up in master. But anyway, we've survived 8 years without it, so I
think we're good :)


Thank you for the digging I've updated the commit message to reflect
this info and correct the grammar errors Bastien pointed out. I've
tried to push this, but it just hangs ? Maybe because I don't have
write access to xkeyboard-config (it is sitting outside of the
xorg tree after all) ?

Anyways I'll send a v2 with the improved commit message, if you can push
that, that would be great.

Regards,

Hans
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-15 Thread Hans de Goede

Hi,

On 15-05-17 08:50, Bastien Nocera wrote:

Hey,

Comments inline.

On Mon, 2017-05-15 at 08:36 +0200, Hans de Goede wrote:

KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
current xproto master defines keysyms for these. Add mappings for
these keys.

The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND


"keysym has existed"


evdev code for it, so lets adds a mapping for that too.


"let's add"


Thank you both fixed.




Note that this replaces the I255 to XF86Hibernate mapping in
xkb_symbols "evdev", I don't know where that came from, but it is
wrong, I255 was until now not defined in keycodes/evdev and
KEY_HIBERNATE is not defined in linux/input-event-codes.h .

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100970
Cc: Bastien Nocera 
Cc: Benjamin Berg 
Signed-off-by: Hans de Goede 
Reviewed-by: Peter Hutterer 
---
  keycodes/evdev | 2 ++
  symbols/inet   | 7 ---
  2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/keycodes/evdev b/keycodes/evdev
index 624ac68..51a6e26 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
 = 251; // #define KEY_BRIGHTNESS_CYCLE243
 = 252; // #define KEY_BRIGHTNESS_ZERO 244
 = 253; // #define KEY_DISPLAY_OFF 245
+= 254; // #define KEY_WWAN246
+= 255; // #define KEY_RFKILL  247
  
  	// Fake keycodes for virtual keys

 =   92;
diff --git a/symbols/inet b/symbols/inet
index 5403e77..1e06aa9 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -184,7 +184,7 @@ xkb_symbols "evdev" {
  key{  [ Print ]   };
  //  key{  [ ]   }; // KEY_HP
  key{  [ XF86WebCam]   };
-//  key{  [ ]   }; // KEY_SOUND
+key{  [ XF86AudioPreset   ]   };


This is an existing keysym, but what does it correspond to?


From XF86keysym.h :

#define XF86XK_AudioPreset 0x1008FFB6 /* Select equalizer preset, e.g. 
theatre-mode */

I221 corresponds to KEY_SOUND which gets used in the kernel in
the following ways:

drivers/platform/x86/peaq-wmi.c:
Used for the Dolby button which under windows toggles through 
theater/game/speach/music mode.

drivers/media/rc/keymaps/rc-kworld-pc150u.c
73: { 0x48, KEY_SOUND}, /* switch theater mode */

drivers/media/rc/keymaps/rc-cec.c
67: { 0x33, KEY_SOUND }, /* CEC Spec: Sound Select */

drivers/media/rc/keymaps/rc-encore-enltv.c
74: { 0x4d, KEY_SOUND },/* DVD sound */





  //  key{  [ ]   }; // KEY_QUESTION
  key{  [ XF86Mail  ]   };
  key{  [ XF86Messenger ]   }; //
KEY_CHAT
@@ -210,13 +210,14 @@ xkb_symbols "evdev" {
  key{  [ XF86Battery   ]   };
  key{  [ XF86Bluetooth ]   };
  key{  [ XF86WLAN  ]   };
+key{  [ XF86UWB   ]   };


Feels weird using up a slot for a key that toggles an obsolete wireless
protocol...


The keycodes such as I247 are hardcoded to EV_FOO keycodes (with an
offset of 8) and the kernel has had:

#define KEY_UWB 239

For ages, so this is not taking a slot, it is merely adding a
mapping since both the keycode and the keysym have existed for
quite a while now.




  //  key{  [ ]   }; // KEY_VIDEO_NEXT  --  drive
next video source
  //  key{  [ ]   }; // KEY_VIDEO_PREV  --  drive
previous video source
  //  key{  [ ]   }; // KEY_BRIGHTNESS_CYCLE
--  bright up, max++ == min
  //  key{  [ ]   }; // KEY_BRIGHTNESS_ZERO
--  brightness off
  //  key{  [ ]   }; // KEY_DISPLAY_OFF  --  turn
off display
-//  key{  [ ]   }; // KEY_WIMAX
-key{  [ XF86Hibernate ]   }; //
KEY_HIBERNATE
+key{  [ XF86WWAN  ]   }; //
KEY_WWAN
+key{  [ XF86RFKill]   }; //
KEY_RFKILL
  
  key{  [ XF86Tools ]   };

  key{  [ XF86Launch5   ]   };


Cheers



Regards,

Hans
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-15 Thread Hans de Goede
KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
current xproto master defines keysyms for these. Add mappings for
these keys.

The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND
evdev code for it, so lets adds a mapping for that too.

Note that this replaces the I255 to XF86Hibernate mapping in
xkb_symbols "evdev", I don't know where that came from, but it is
wrong, I255 was until now not defined in keycodes/evdev and
KEY_HIBERNATE is not defined in linux/input-event-codes.h .

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100970
Cc: Bastien Nocera 
Cc: Benjamin Berg 
Signed-off-by: Hans de Goede 
Reviewed-by: Peter Hutterer 
---
 keycodes/evdev | 2 ++
 symbols/inet   | 7 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/keycodes/evdev b/keycodes/evdev
index 624ac68..51a6e26 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
 = 251;   // #define KEY_BRIGHTNESS_CYCLE243
 = 252;   // #define KEY_BRIGHTNESS_ZERO 244
 = 253;   // #define KEY_DISPLAY_OFF 245
+= 254;   // #define KEY_WWAN246
+= 255;   // #define KEY_RFKILL  247
 
// Fake keycodes for virtual keys
 =   92;
diff --git a/symbols/inet b/symbols/inet
index 5403e77..1e06aa9 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -184,7 +184,7 @@ xkb_symbols "evdev" {
 key{  [ Print ]   };
 //  key{  [ ]   }; // KEY_HP
 key{  [ XF86WebCam]   };
-//  key{  [ ]   }; // KEY_SOUND
+key{  [ XF86AudioPreset   ]   };
 //  key{  [ ]   }; // KEY_QUESTION
 key{  [ XF86Mail  ]   };
 key{  [ XF86Messenger ]   }; // KEY_CHAT
@@ -210,13 +210,14 @@ xkb_symbols "evdev" {
 key{  [ XF86Battery   ]   };
 key{  [ XF86Bluetooth ]   };
 key{  [ XF86WLAN  ]   };
+key{  [ XF86UWB   ]   };
 //  key{  [ ]   }; // KEY_VIDEO_NEXT  --  drive next video 
source
 //  key{  [ ]   }; // KEY_VIDEO_PREV  --  drive previous 
video source
 //  key{  [ ]   }; // KEY_BRIGHTNESS_CYCLE  --  bright up, 
max++ == min
 //  key{  [ ]   }; // KEY_BRIGHTNESS_ZERO  --  brightness off
 //  key{  [ ]   }; // KEY_DISPLAY_OFF  --  turn off display
-//  key{  [ ]   }; // KEY_WIMAX
-key{  [ XF86Hibernate ]   }; // KEY_HIBERNATE
+key{  [ XF86WWAN  ]   }; // KEY_WWAN
+key{  [ XF86RFKill]   }; // KEY_RFKILL
 
 key{  [ XF86Tools ]   };
 key{  [ XF86Launch5   ]   };
-- 
2.12.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

Re: [PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-14 Thread Peter Hutterer
adding svu to CC:

On Fri, May 12, 2017 at 04:18:42PM +0200, Hans de Goede wrote:
> KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
> current xproto master defines keysyms for these. Add mappings for
> these keys.
> 
> The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND
> evdev code for it, so lets adds a mapping for that too.
> 
> Note that this replaces the I255 to XF86Hibernate mapping in
> xkb_symbols "evdev", I don't know where that came from, but it is
> wrong, I255 was until now not defined in keycodes/evdev and
> KEY_HIBERNATE is not defined in linux/input-event-codes.h .

see xk-c commit 7b3bfb3ec4b, has a link to the thread. After a bit of
digging, this got merged into dmitry's next tree (see
https://patchwork.kernel.org/patch/9742/) but never ended up in master.
My email archives trail out from there and I'm not sure what exactly
happens, google isn't forthcoming either. 

Looks like we simply pushed the xk-c patch too early, assumign that -next
will end up in master. But anyway, we've survived 8 years without it, so I
think we're good :)

Reviewed-by: Peter Hutterer 

Cheers,
   Peter


> 
> BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100970
> Cc: Bastien Nocera 
> Cc: Benjamin Berg 
> Signed-off-by: Hans de Goede 
> ---
>  keycodes/evdev | 2 ++
>  symbols/inet   | 7 ---
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/keycodes/evdev b/keycodes/evdev
> index 624ac68..51a6e26 100644
> --- a/keycodes/evdev
> +++ b/keycodes/evdev
> @@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
>= 251;   // #define KEY_BRIGHTNESS_CYCLE243
>= 252;   // #define KEY_BRIGHTNESS_ZERO 244
>= 253;   // #define KEY_DISPLAY_OFF 245
> +  = 254;   // #define KEY_WWAN246
> +  = 255;   // #define KEY_RFKILL  247
>  
>   // Fake keycodes for virtual keys
>=   92;
> diff --git a/symbols/inet b/symbols/inet
> index 5403e77..1e06aa9 100644
> --- a/symbols/inet
> +++ b/symbols/inet
> @@ -184,7 +184,7 @@ xkb_symbols "evdev" {
>  key{  [ Print ]   };
>  //  key{  [ ]   }; // KEY_HP
>  key{  [ XF86WebCam]   };
> -//  key{  [ ]   }; // KEY_SOUND
> +key{  [ XF86AudioPreset   ]   };
>  //  key{  [ ]   }; // KEY_QUESTION
>  key{  [ XF86Mail  ]   };
>  key{  [ XF86Messenger ]   }; // KEY_CHAT
> @@ -210,13 +210,14 @@ xkb_symbols "evdev" {
>  key{  [ XF86Battery   ]   };
>  key{  [ XF86Bluetooth ]   };
>  key{  [ XF86WLAN  ]   };
> +key{  [ XF86UWB   ]   };
>  //  key{  [ ]   }; // KEY_VIDEO_NEXT  --  drive next video 
> source
>  //  key{  [ ]   }; // KEY_VIDEO_PREV  --  drive previous 
> video source
>  //  key{  [ ]   }; // KEY_BRIGHTNESS_CYCLE  --  bright up, 
> max++ == min
>  //  key{  [ ]   }; // KEY_BRIGHTNESS_ZERO  --  brightness 
> off
>  //  key{  [ ]   }; // KEY_DISPLAY_OFF  --  turn off display
> -//  key{  [ ]   }; // KEY_WIMAX
> -key{  [ XF86Hibernate ]   }; // KEY_HIBERNATE
> +key{  [ XF86WWAN  ]   }; // KEY_WWAN
> +key{  [ XF86RFKill]   }; // KEY_RFKILL
>  
>  key{  [ XF86Tools ]   };
>  key{  [ XF86Launch5   ]   };
> -- 
> 2.12.2
> 
> ___
> xorg-devel@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: https://lists.x.org/mailman/listinfo/xorg-devel
> 
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel

[PATCH xkeyboard-config] Add evdev mappings for KEY_SOUND, KEY_UWB, KEY_WWAN and KEY_RFKILL

2017-05-12 Thread Hans de Goede
KEY_SOUND, KEY_WWAN and KEY_RFKILL are used on actual devices and
current xproto master defines keysyms for these. Add mappings for
these keys.

The XF86UWB keysm exists for quite a while now, as does the KEY_SOUND
evdev code for it, so lets adds a mapping for that too.

Note that this replaces the I255 to XF86Hibernate mapping in
xkb_symbols "evdev", I don't know where that came from, but it is
wrong, I255 was until now not defined in keycodes/evdev and
KEY_HIBERNATE is not defined in linux/input-event-codes.h .

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100970
Cc: Bastien Nocera 
Cc: Benjamin Berg 
Signed-off-by: Hans de Goede 
---
 keycodes/evdev | 2 ++
 symbols/inet   | 7 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/keycodes/evdev b/keycodes/evdev
index 624ac68..51a6e26 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -281,6 +281,8 @@ default xkb_keycodes "evdev" {
 = 251;   // #define KEY_BRIGHTNESS_CYCLE243
 = 252;   // #define KEY_BRIGHTNESS_ZERO 244
 = 253;   // #define KEY_DISPLAY_OFF 245
+= 254;   // #define KEY_WWAN246
+= 255;   // #define KEY_RFKILL  247
 
// Fake keycodes for virtual keys
 =   92;
diff --git a/symbols/inet b/symbols/inet
index 5403e77..1e06aa9 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -184,7 +184,7 @@ xkb_symbols "evdev" {
 key{  [ Print ]   };
 //  key{  [ ]   }; // KEY_HP
 key{  [ XF86WebCam]   };
-//  key{  [ ]   }; // KEY_SOUND
+key{  [ XF86AudioPreset   ]   };
 //  key{  [ ]   }; // KEY_QUESTION
 key{  [ XF86Mail  ]   };
 key{  [ XF86Messenger ]   }; // KEY_CHAT
@@ -210,13 +210,14 @@ xkb_symbols "evdev" {
 key{  [ XF86Battery   ]   };
 key{  [ XF86Bluetooth ]   };
 key{  [ XF86WLAN  ]   };
+key{  [ XF86UWB   ]   };
 //  key{  [ ]   }; // KEY_VIDEO_NEXT  --  drive next video 
source
 //  key{  [ ]   }; // KEY_VIDEO_PREV  --  drive previous 
video source
 //  key{  [ ]   }; // KEY_BRIGHTNESS_CYCLE  --  bright up, 
max++ == min
 //  key{  [ ]   }; // KEY_BRIGHTNESS_ZERO  --  brightness off
 //  key{  [ ]   }; // KEY_DISPLAY_OFF  --  turn off display
-//  key{  [ ]   }; // KEY_WIMAX
-key{  [ XF86Hibernate ]   }; // KEY_HIBERNATE
+key{  [ XF86WWAN  ]   }; // KEY_WWAN
+key{  [ XF86RFKill]   }; // KEY_RFKILL
 
 key{  [ XF86Tools ]   };
 key{  [ XF86Launch5   ]   };
-- 
2.12.2

___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel