xserver: Branch 'master' - 3 commits

[GitLab Mirror]

 hw/xwin/winkeynames.h |    4 ++--
 hw/xwin/winlayouts.h  |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 8f7e4b56d2e0abd09526c7d0eeee15bfb754e557
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Sun Oct 8 22:17:40 2017 +0100

    hw/xwin: Fix transposed RaiseVolume and LowerVolume scan codes

diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h
index bfed9d427..6159f623e 100644
--- a/hw/xwin/winkeynames.h
+++ b/hw/xwin/winkeynames.h
@@ -191,8 +191,8 @@
 #define KEY_BSlash2      /* \           _         0xcb  */  203
 
 #define KEY_Mute         /* Audio Mute                  */  152
-#define KEY_AudioLower   /* Audio Lower                 */  168
-#define KEY_AudioRaise   /* Audio Raise                 */  166
+#define KEY_AudioLower   /* Audio Lower                 */  166
+#define KEY_AudioRaise   /* Audio Raise                 */  168
 
 #define KEY_NEXTSONG     /* Media next                  */  145
 #define KEY_PLAYPAUSE    /* Media play/pause toggle     */  154
commit bfcaaecc552c7a3d85f6309b8079eb8e6fda8779
Author: Colin Harrison <colin at xming.myzen.co.uk>
Date:   Sat Jun 30 13:43:11 2018 +0100

    hw/xwin: Add the Belgian (Comma) keyboard layout

diff --git a/hw/xwin/winlayouts.h b/hw/xwin/winlayouts.h
index 0b02fa446..904410a2d 100644
--- a/hw/xwin/winlayouts.h
+++ b/hw/xwin/winlayouts.h
@@ -65,6 +65,7 @@ WinKBLayoutRec winKBLayouts[] = {
     {0x0000040b, -1, "pc105", "fi", NULL, NULL, "Finnish"},
     {0x0000040c, -1, "pc105", "fr", NULL, NULL, "French (Standard)"},
     {0x0000080c, -1, "pc105", "be", NULL, NULL, "French (Belgian)"},
+    {0x0001080c, -1, "pc105", "be", NULL, NULL, "Belgian (Comma)"},
     {0x00000c0c, -1, "pc105", "ca", "fr-legacy", NULL,
      "French (Canada, Legacy)"},
     {0x0000100c, -1, "pc105", "ch", "fr", NULL, "French (Switzerland)"},
commit 188f461463fcc60432f9d7a76ad69ec97631db5d
Author: Colin Harrison <colin at xming.myzen.co.uk>
Date:   Thu Feb 22 13:18:42 2018 +0000

    hw/xwin: Add Russian keyboard layout

diff --git a/hw/xwin/winlayouts.h b/hw/xwin/winlayouts.h
index c7905e3c2..0b02fa446 100644
--- a/hw/xwin/winlayouts.h
+++ b/hw/xwin/winlayouts.h
@@ -82,6 +82,7 @@ WinKBLayoutRec winKBLayouts[] = {
     {0x00000416, -1, "pc105", "br", NULL, NULL, "Portuguese (Brazil,ABNT)"},
     {0x00010416, -1, "abnt2", "br", NULL, NULL, "Portuguese (Brazil,ABNT2)"},
     {0x00000816, -1, "pc105", "pt", NULL, NULL, "Portuguese (Portugal)"},
+    {0x00000419, -1, "pc105", "ru", NULL, NULL, "Russian"},
     {0x0000041a, -1, "pc105", "hr", NULL, NULL, "Croatian"},
     {0x0000041d, -1, "pc105", "se", NULL, NULL, "Swedish (Sweden)"},
     {0x0000041f, -1, "pc105", "tr", NULL, NULL, "Turkish (Q)"},