From 246d4a95b966b160664bd50593995b26b5103afa Mon Sep 17 00:00:00 2001 From: NickVStepin <52532223+NickVStepin@users.noreply.github.com> Date: Tue, 16 Apr 2024 08:58:28 +0300 Subject: [PATCH 1/3] ru_ru_qwerty.keymap for Russian keyboard for RDP Add Russian keyboard support for RDP --- src/protocols/rdp/keymaps/ru_ru_qwerty.keymap | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 src/protocols/rdp/keymaps/ru_ru_qwerty.keymap diff --git a/src/protocols/rdp/keymaps/ru_ru_qwerty.keymap b/src/protocols/rdp/keymaps/ru_ru_qwerty.keymap new file mode 100644 index 000000000..f741d02f1 --- /dev/null +++ b/src/protocols/rdp/keymaps/ru_ru_qwerty.keymap @@ -0,0 +1,59 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +parent "base" +name "ru-ru-qwerty" +# We use the "KBD_US" layout because we switch the language, not the layout +freerdp "KBD_US" + +# Let's define the scan codes of the main Latin keys +# +map -caps -shift 0x10..0x19 ~ "qwertyuiop" +map -caps -shift 0x1E..0x26 ~ "asdfghjkl" +map -caps -shift 0x2C..0x32 ~ "zxcvbnm" + +map -caps +shift 0x10..0x19 ~ "QWERTYUIOP" +map -caps +shift 0x1E..0x26 ~ "ASDFGHJKL" +map -caps +shift 0x2C..0x32 ~ "ZXCVBNM" + +map -caps +shift 0x10..0x19 ~ "QWERTYUIOP" +map -caps +shift 0x1E..0x26 ~ "ASDFGHJKL" +map -caps +shift 0x2C..0x32 ~ "ZXCVBNM" + +map +caps +shift 0x10..0x19 ~ "qwertyuiop" +map +caps +shift 0x1E..0x26 ~ "asdfghjkl" +map +caps +shift 0x2C..0x32 ~ "zxcvbnm" + +# Let's define the scan codes of the main Russian keys +# +map -caps -shift 0x10..0x19 ~ "йцукенгшщз" +map -caps -shift 0x1E..0x26 ~ "фывапролд" +map -caps -shift 0x2C..0x32 ~ "ячсмить" + +map -caps +shift 0x10..0x19 ~ "ЙЦУКЕНГШЩЗ" +map -caps +shift 0x1E..0x26 ~ "ФЫВАПРОЛД" +map -caps +shift 0x2C..0x32 ~ "ЯЧСМИТЬ" + +map +caps -shift 0x10..0x19 ~ "ЙЦУКЕНГШЩЗ" +map +caps -shift 0x1E..0x26 ~ "ФЫВАПРОЛД" +map +caps -shift 0x2C..0x32 ~ "ЯЧСМИТЬ" + +map +caps +shift 0x10..0x19 ~ "йцукенгшщз" +map +caps +shift 0x1E..0x26 ~ "фывапролд" +map +caps +shift 0x2C..0x32 ~ "ячсмить" From b732985b73b3e028a93e21e1008da2c5a7b92d8b Mon Sep 17 00:00:00 2001 From: NickVStepin <52532223+NickVStepin@users.noreply.github.com> Date: Tue, 16 Apr 2024 09:30:32 +0300 Subject: [PATCH 2/3] Update Makefile.am Add Russian keyboard keymap support for RDP --- src/protocols/rdp/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 1c393c30d..1fe5ccf89 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -252,7 +252,8 @@ rdp_keymaps = \ $(srcdir)/keymaps/ro_ro_qwerty.keymap \ $(srcdir)/keymaps/sv_se_qwerty.keymap \ $(srcdir)/keymaps/da_dk_qwerty.keymap \ - $(srcdir)/keymaps/tr_tr_qwerty.keymap + $(srcdir)/keymaps/tr_tr_qwerty.keymap \ + $(srcdir)/keymaps/ru_ru_qwerty.keymap _generated_keymaps.c: $(rdp_keymaps) $(srcdir)/keymaps/generate.pl $(AM_V_GEN) $(srcdir)/keymaps/generate.pl $(rdp_keymaps) From 72bac5edbc080889499564c0541bb57f18612228 Mon Sep 17 00:00:00 2001 From: NickVStepin <52532223+NickVStepin@users.noreply.github.com> Date: Tue, 16 Apr 2024 15:08:03 +0300 Subject: [PATCH 3/3] Update Makefile.am --- src/protocols/rdp/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am index 1fe5ccf89..27e757019 100644 --- a/src/protocols/rdp/Makefile.am +++ b/src/protocols/rdp/Makefile.am @@ -250,10 +250,10 @@ rdp_keymaps = \ $(srcdir)/keymaps/pt_br_qwerty.keymap \ $(srcdir)/keymaps/pt_pt_qwerty.keymap \ $(srcdir)/keymaps/ro_ro_qwerty.keymap \ + $(srcdir)/keymaps/ru_ru_qwerty.keymap \ $(srcdir)/keymaps/sv_se_qwerty.keymap \ $(srcdir)/keymaps/da_dk_qwerty.keymap \ - $(srcdir)/keymaps/tr_tr_qwerty.keymap \ - $(srcdir)/keymaps/ru_ru_qwerty.keymap + $(srcdir)/keymaps/tr_tr_qwerty.keymap _generated_keymaps.c: $(rdp_keymaps) $(srcdir)/keymaps/generate.pl $(AM_V_GEN) $(srcdir)/keymaps/generate.pl $(rdp_keymaps)