[Qemu-trivial] [PATCH 0/2] Fix key 'numerosign' missing in Russian keyboard

[Qemu-trivial] [PATCH 0/2] Fix key 'numerosign' missing in Russian keyboard

[arei.gonglei]

From: Wang Xin <wangxinxin.wang@huawei.com>

Add the keysym and keycode of 'numerosign' in Russian keyboard layout
to VNC keysyms table and keymap.

Wang Xin (2):
  qemu-char: add cyrillic characters 'numerosign' to VNC keysyms
  qemu-char: add cyrillic key 'numerosign' to Russian keymap

 pc-bios/keymaps/ru | 1 +
 ui/vnc_keysym.h    | 1 +
 2 files changed, 2 insertions(+)

-- 
1.8.3.4

[Qemu-devel] [PATCH 0/2] Fix key 'numerosign' missing in Russian keyboard

[arei.gonglei]

From: Wang Xin <wangxinxin.wang@huawei.com>

Add the keysym and keycode of 'numerosign' in Russian keyboard layout
to VNC keysyms table and keymap.

Wang Xin (2):
  qemu-char: add cyrillic characters 'numerosign' to VNC keysyms
  qemu-char: add cyrillic key 'numerosign' to Russian keymap

 pc-bios/keymaps/ru | 1 +
 ui/vnc_keysym.h    | 1 +
 2 files changed, 2 insertions(+)

-- 
1.8.3.4

[Qemu-trivial] [PATCH 1/2] qemu-char: add cyrillic characters 'numerosign' to VNC keysyms

[arei.gonglei]

From: Wang Xin <wangxinxin.wang@huawei.com>

This patch adds missing cyrillic characters 'numerosign' to the VNC
keysym table, it's need by Russian keyboard. And I get the keysym from
'<X11/keysymdef.h>', the current keysym table in Qemu was generated from
it.

signed-off-by: Wang xin <wangxinxin.wang@huawei.com>
signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 ui/vnc_keysym.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/vnc_keysym.h b/ui/vnc_keysym.h
index 1dc039f..7fa2bc1 100644
--- a/ui/vnc_keysym.h
+++ b/ui/vnc_keysym.h
@@ -404,6 +404,7 @@ static const name2keysym_t name2keysym[]={
 {"breve",                         0x01a2},  /* U+02D8 BREVE */
 {"caron",                         0x01b7},  /* U+02C7 CARON */
 {"Ccaron",                        0x01c8},  /* U+010C LATIN CAPITAL LETTER C WITH CARON */
+{"numerosign",                    0x06b0},  /* U+2116 NUMERO SIGN */
 {"Cyrillic_a",                    0x06c1},  /* U+0430 CYRILLIC SMALL LETTER A */
 {"Cyrillic_A",                    0x06e1},  /* U+0410 CYRILLIC CAPITAL LETTER A */
 {"Cyrillic_be",                   0x06c2},  /* U+0431 CYRILLIC SMALL LETTER BE */
-- 
1.8.3.4

[Qemu-devel] [PATCH 1/2] qemu-char: add cyrillic characters 'numerosign' to VNC keysyms

[arei.gonglei]

From: Wang Xin <wangxinxin.wang@huawei.com>

This patch adds missing cyrillic characters 'numerosign' to the VNC
keysym table, it's need by Russian keyboard. And I get the keysym from
'<X11/keysymdef.h>', the current keysym table in Qemu was generated from
it.

signed-off-by: Wang xin <wangxinxin.wang@huawei.com>
signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 ui/vnc_keysym.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/vnc_keysym.h b/ui/vnc_keysym.h
index 1dc039f..7fa2bc1 100644
--- a/ui/vnc_keysym.h
+++ b/ui/vnc_keysym.h
@@ -404,6 +404,7 @@ static const name2keysym_t name2keysym[]={
 {"breve",                         0x01a2},  /* U+02D8 BREVE */
 {"caron",                         0x01b7},  /* U+02C7 CARON */
 {"Ccaron",                        0x01c8},  /* U+010C LATIN CAPITAL LETTER C WITH CARON */
+{"numerosign",                    0x06b0},  /* U+2116 NUMERO SIGN */
 {"Cyrillic_a",                    0x06c1},  /* U+0430 CYRILLIC SMALL LETTER A */
 {"Cyrillic_A",                    0x06e1},  /* U+0410 CYRILLIC CAPITAL LETTER A */
 {"Cyrillic_be",                   0x06c2},  /* U+0431 CYRILLIC SMALL LETTER BE */
-- 
1.8.3.4

[Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[arei.gonglei]

From: Wang Xin <wangxinxin.wang@huawei.com>

'numerosign' is the numbersign key of Russian keyboard layout, we
get this key with press 'shift + 3'. It's missing in current
Russian keymap file, this patch fix it.

signed-off-by: Wang Xin <wangxinxin.wang@huawei.com>
signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 pc-bios/keymaps/ru | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pc-bios/keymaps/ru b/pc-bios/keymaps/ru
index b3e7d24..9432945 100644
--- a/pc-bios/keymaps/ru
+++ b/pc-bios/keymaps/ru
@@ -5,6 +5,7 @@ exclam 0x02 shift
 at 0x03 shift
 quotedbl 0x03 shift altgr
 numbersign 0x04 shift
+numerosign 0x04 shift
 dollar 0x05 shift
 asterisk 0x05 shift altgr
 percent 0x06 shift
-- 
1.8.3.4

[Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[arei.gonglei]

From: Wang Xin <wangxinxin.wang@huawei.com>

'numerosign' is the numbersign key of Russian keyboard layout, we
get this key with press 'shift + 3'. It's missing in current
Russian keymap file, this patch fix it.

signed-off-by: Wang Xin <wangxinxin.wang@huawei.com>
signed-off-by: Gonglei <arei.gonglei@huawei.com>
---
 pc-bios/keymaps/ru | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pc-bios/keymaps/ru b/pc-bios/keymaps/ru
index b3e7d24..9432945 100644
--- a/pc-bios/keymaps/ru
+++ b/pc-bios/keymaps/ru
@@ -5,6 +5,7 @@ exclam 0x02 shift
 at 0x03 shift
 quotedbl 0x03 shift altgr
 numbersign 0x04 shift
+numerosign 0x04 shift
 dollar 0x05 shift
 asterisk 0x05 shift altgr
 percent 0x06 shift
-- 
1.8.3.4

Re: [Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gerd Hoffmann]

> 'numerosign' is the numbersign key of Russian keyboard layout, we
> get this key with press 'shift + 3'. It's missing in current
> Russian keymap file, this patch fix it.


>  quotedbl 0x03 shift altgr
>  numbersign 0x04 shift

Looks like this line should be removed.

> +numerosign 0x04 shift
>  dollar 0x05 shift

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gerd Hoffmann]

> 'numerosign' is the numbersign key of Russian keyboard layout, we
> get this key with press 'shift + 3'. It's missing in current
> Russian keymap file, this patch fix it.


>  quotedbl 0x03 shift altgr
>  numbersign 0x04 shift

Looks like this line should be removed.

> +numerosign 0x04 shift
>  dollar 0x05 shift

cheers,
  Gerd

Re: [Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Michael Tokarev]

16.02.2015 11:28, Gerd Hoffmann wrote:
>> 'numerosign' is the numbersign key of Russian keyboard layout, we
>> get this key with press 'shift + 3'. It's missing in current
>> Russian keymap file, this patch fix it.
> 
> 
>>  quotedbl 0x03 shift altgr
>>  numbersign 0x04 shift
> 
> Looks like this line should be removed.

Or alternatively, it should be kept but the patch 1/2 should introduce
"numbersign" not "numerosign".  But I don't know the official name of
this sign.

/mjt

Re: [Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Michael Tokarev]

16.02.2015 11:28, Gerd Hoffmann wrote:
>> 'numerosign' is the numbersign key of Russian keyboard layout, we
>> get this key with press 'shift + 3'. It's missing in current
>> Russian keymap file, this patch fix it.
> 
> 
>>  quotedbl 0x03 shift altgr
>>  numbersign 0x04 shift
> 
> Looks like this line should be removed.

Or alternatively, it should be kept but the patch 1/2 should introduce
"numbersign" not "numerosign".  But I don't know the official name of
this sign.

/mjt

Re: [Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gonglei]

On 2015/2/16 16:33, Michael Tokarev wrote:
> 16.02.2015 11:28, Gerd Hoffmann wrote:
>>> 'numerosign' is the numbersign key of Russian keyboard layout, we
>>> get this key with press 'shift + 3'. It's missing in current
>>> Russian keymap file, this patch fix it.
>>
>>
>>>  quotedbl 0x03 shift altgr
>>>  numbersign 0x04 shift
>>
>> Looks like this line should be removed.
> 
> Or alternatively, it should be kept but the patch 1/2 should introduce
> "numbersign" not "numerosign".  But I don't know the official name of
> this sign.
> 
Both "numbersign" and "numerosign" needed. Although they have the same
keymap characters, their keysym in vnc_keysym.h are different:

static const name2keysym_t name2keysym[]={
...
     { "numbersign",           0x023},
...
    +{"numerosign",                    0x06b0},  /* U+2116 NUMERO SIGN */
...
Please see the provenance:
 http://www.cl.cam.ac.uk/~mgk25/ucs/keysymdef.h
#define XK_numbersign                    0x0023  /* U+0023 NUMBER SIGN */
#define XK_numerosign                    0x06b0  /* U+2116 NUMERO SIGN */

Regards,
-Gonglei

Re: [Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gonglei]

On 2015/2/16 16:33, Michael Tokarev wrote:
> 16.02.2015 11:28, Gerd Hoffmann wrote:
>>> 'numerosign' is the numbersign key of Russian keyboard layout, we
>>> get this key with press 'shift + 3'. It's missing in current
>>> Russian keymap file, this patch fix it.
>>
>>
>>>  quotedbl 0x03 shift altgr
>>>  numbersign 0x04 shift
>>
>> Looks like this line should be removed.
> 
> Or alternatively, it should be kept but the patch 1/2 should introduce
> "numbersign" not "numerosign".  But I don't know the official name of
> this sign.
> 
Both "numbersign" and "numerosign" needed. Although they have the same
keymap characters, their keysym in vnc_keysym.h are different:

static const name2keysym_t name2keysym[]={
...
     { "numbersign",           0x023},
...
    +{"numerosign",                    0x06b0},  /* U+2116 NUMERO SIGN */
...
Please see the provenance:
 http://www.cl.cam.ac.uk/~mgk25/ucs/keysymdef.h
#define XK_numbersign                    0x0023  /* U+0023 NUMBER SIGN */
#define XK_numerosign                    0x06b0  /* U+2116 NUMERO SIGN */

Regards,
-Gonglei

Re: [Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Michael Tokarev]

16.02.2015 11:53, Gonglei wrote:

> Both "numbersign" and "numerosign" needed. Although they have the same
> keymap characters, their keysym in vnc_keysym.h are different:
> 
> static const name2keysym_t name2keysym[]={
> ...
>      { "numbersign",           0x023},
> ...
>     +{"numerosign",                    0x06b0},  /* U+2116 NUMERO SIGN */
> ...
> Please see the provenance:
>  http://www.cl.cam.ac.uk/~mgk25/ucs/keysymdef.h
> #define XK_numbersign                    0x0023  /* U+0023 NUMBER SIGN */
> #define XK_numerosign                    0x06b0  /* U+2116 NUMERO SIGN */

Oh.  That's funny.  "Number sign" is actually just a hash character - #.
While numero sign is this -- №.  So yes, okay, both are neecessary indeed.
And yes, this "numero sign" (named after french word) is used in russia.

Thanks,

/mjt

Re: [Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Michael Tokarev]

16.02.2015 11:53, Gonglei wrote:

> Both "numbersign" and "numerosign" needed. Although they have the same
> keymap characters, their keysym in vnc_keysym.h are different:
> 
> static const name2keysym_t name2keysym[]={
> ...
>      { "numbersign",           0x023},
> ...
>     +{"numerosign",                    0x06b0},  /* U+2116 NUMERO SIGN */
> ...
> Please see the provenance:
>  http://www.cl.cam.ac.uk/~mgk25/ucs/keysymdef.h
> #define XK_numbersign                    0x0023  /* U+0023 NUMBER SIGN */
> #define XK_numerosign                    0x06b0  /* U+2116 NUMERO SIGN */

Oh.  That's funny.  "Number sign" is actually just a hash character - #.
While numero sign is this -- №.  So yes, okay, both are neecessary indeed.
And yes, this "numero sign" (named after french word) is used in russia.

Thanks,

/mjt

Re: [Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gerd Hoffmann]

  Hi,

> Both "numbersign" and "numerosign" needed. Although they have the same
> keymap characters, their keysym in vnc_keysym.h are different:
> 
> static const name2keysym_t name2keysym[]={
> ...
>      { "numbersign",           0x023},
> ...
>     +{"numerosign",                    0x06b0},  /* U+2116 NUMERO SIGN */

Not questioning that for the vnc keysym table.

But the russian keymap needs numerosign only, right?
Or does a russian keyboard have *both*?

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gerd Hoffmann]

  Hi,

> Both "numbersign" and "numerosign" needed. Although they have the same
> keymap characters, their keysym in vnc_keysym.h are different:
> 
> static const name2keysym_t name2keysym[]={
> ...
>      { "numbersign",           0x023},
> ...
>     +{"numerosign",                    0x06b0},  /* U+2116 NUMERO SIGN */

Not questioning that for the vnc keysym table.

But the russian keymap needs numerosign only, right?
Or does a russian keyboard have *both*?

cheers,
  Gerd

Re: [Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Michael Tokarev]

16.02.2015 13:18, Gerd Hoffmann wrote:
[]
> But the russian keymap needs numerosign only, right?
> Or does a russian keyboard have *both*?

Now maybe I don't understand how keymap works.

When switching my keyboard to russian (cyrillic) layout,
I can't type # without switching back to latin layout.
Both symbols are produced by the same key - it is key
with number 3 on it, when used with Shift.  On latin
layout it produces #, on cyrillic layout it produces №.

Does it mean the layout does not have # key?

Thanks,

/mjt

Re: [Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Michael Tokarev]

16.02.2015 13:18, Gerd Hoffmann wrote:
[]
> But the russian keymap needs numerosign only, right?
> Or does a russian keyboard have *both*?

Now maybe I don't understand how keymap works.

When switching my keyboard to russian (cyrillic) layout,
I can't type # without switching back to latin layout.
Both symbols are produced by the same key - it is key
with number 3 on it, when used with Shift.  On latin
layout it produces #, on cyrillic layout it produces №.

Does it mean the layout does not have # key?

Thanks,

/mjt

Re: [Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gerd Hoffmann]

On Mo, 2015-02-16 at 13:27 +0300, Michael Tokarev wrote:
> 16.02.2015 13:18, Gerd Hoffmann wrote:
> []
> > But the russian keymap needs numerosign only, right?
> > Or does a russian keyboard have *both*?
> 
> Now maybe I don't understand how keymap works.
> 
> When switching my keyboard to russian (cyrillic) layout,
> I can't type # without switching back to latin layout.
> Both symbols are produced by the same key - it is key
> with number 3 on it, when used with Shift.  On latin
> layout it produces #, on cyrillic layout it produces №.

As the patch description suggests.  Thanks for confirming.

> Does it mean the layout does not have # key?

It might be somewhere else, in theory.  Seems not to be the case for the
russian layout though.

On a german keyboard shift-3 is '§', and the number sign is somewhere
else.  So I can get '#' with both 'us' and 'de' layouts, but I have to
use different keys ...

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gerd Hoffmann]

On Mo, 2015-02-16 at 13:27 +0300, Michael Tokarev wrote:
> 16.02.2015 13:18, Gerd Hoffmann wrote:
> []
> > But the russian keymap needs numerosign only, right?
> > Or does a russian keyboard have *both*?
> 
> Now maybe I don't understand how keymap works.
> 
> When switching my keyboard to russian (cyrillic) layout,
> I can't type # without switching back to latin layout.
> Both symbols are produced by the same key - it is key
> with number 3 on it, when used with Shift.  On latin
> layout it produces #, on cyrillic layout it produces №.

As the patch description suggests.  Thanks for confirming.

> Does it mean the layout does not have # key?

It might be somewhere else, in theory.  Seems not to be the case for the
russian layout though.

On a german keyboard shift-3 is '§', and the number sign is somewhere
else.  So I can get '#' with both 'us' and 'de' layouts, but I have to
use different keys ...

cheers,
  Gerd

Re: [Qemu-trivial] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gonglei]

On 2015/2/16 19:02, Gerd Hoffmann wrote:
> On Mo, 2015-02-16 at 13:27 +0300, Michael Tokarev wrote:
>> 16.02.2015 13:18, Gerd Hoffmann wrote:
>> []
>>> But the russian keymap needs numerosign only, right?
>>> Or does a russian keyboard have *both*?
>>
>> Now maybe I don't understand how keymap works.
>>
>> When switching my keyboard to russian (cyrillic) layout,
>> I can't type # without switching back to latin layout.
>> Both symbols are produced by the same key - it is key
>> with number 3 on it, when used with Shift.  On latin
>> layout it produces #, on cyrillic layout it produces №.
> 
> As the patch description suggests.  Thanks for confirming.
> 
>> Does it mean the layout does not have # key?
> 
> It might be somewhere else, in theory.  Seems not to be the case for the
> russian layout though.
> 
> On a german keyboard shift-3 is '§', and the number sign is somewhere
> else.  So I can get '#' with both 'us' and 'de' layouts, but I have to
> use different keys ...
> 
I think the number sign(#) should be deleted from russian keymap file, for
the following reasons:
(1) In standard Russian keyboard layout we can not find key '#'[1][2];
(2) on the other hand, '№' is Russian number sign[3], so there is no need '#'
    in Russian input mode.

  [1] http://en.wikipedia.org/wiki/Keyboard_layout#Russian
  [2] http://kbd-intl.narod.ru/english/layouts
  [3] http://en.wikipedia.org/wiki/Numero_sign

Any thoughts?

Regards,
-Gonglei

Re: [Qemu-devel] [PATCH 2/2] qemu-char: add cyrillic key 'numerosign' to Russian keymap

[Gonglei]

On 2015/2/16 19:02, Gerd Hoffmann wrote:
> On Mo, 2015-02-16 at 13:27 +0300, Michael Tokarev wrote:
>> 16.02.2015 13:18, Gerd Hoffmann wrote:
>> []
>>> But the russian keymap needs numerosign only, right?
>>> Or does a russian keyboard have *both*?
>>
>> Now maybe I don't understand how keymap works.
>>
>> When switching my keyboard to russian (cyrillic) layout,
>> I can't type # without switching back to latin layout.
>> Both symbols are produced by the same key - it is key
>> with number 3 on it, when used with Shift.  On latin
>> layout it produces #, on cyrillic layout it produces №.
> 
> As the patch description suggests.  Thanks for confirming.
> 
>> Does it mean the layout does not have # key?
> 
> It might be somewhere else, in theory.  Seems not to be the case for the
> russian layout though.
> 
> On a german keyboard shift-3 is '§', and the number sign is somewhere
> else.  So I can get '#' with both 'us' and 'de' layouts, but I have to
> use different keys ...
> 
I think the number sign(#) should be deleted from russian keymap file, for
the following reasons:
(1) In standard Russian keyboard layout we can not find key '#'[1][2];
(2) on the other hand, '№' is Russian number sign[3], so there is no need '#'
    in Russian input mode.

  [1] http://en.wikipedia.org/wiki/Keyboard_layout#Russian
  [2] http://kbd-intl.narod.ru/english/layouts
  [3] http://en.wikipedia.org/wiki/Numero_sign

Any thoughts?

Regards,
-Gonglei