From 44cc60af15655e2ed5c9529c37bc79522f857cb9 Mon Sep 17 00:00:00 2001
From: VAGurko <123146241+VAGurko@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:15:04 +0400
Subject: [PATCH 1/2] GUACAMOLE-925: Add Russian keymap support "ru-ru-qwerty"

The keymap "ru_ru_qwerty.keymap" has been added to the "src/protocols/rdp/Makefile.am" file to support the Russian keyboard layout.
---
 src/protocols/rdp/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 12a2e68b41..efd2dab203 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -246,6 +246,7 @@ 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

From 744bc4c6b1d770e8007449c36b670617a8a5d1f2 Mon Sep 17 00:00:00 2001
From: VAGurko <123146241+VAGurko@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:16:21 +0400
Subject: [PATCH 2/2] GUACAMOLE-925: Add Russian keymap support

The file "src/protocols/rdp/keymaps/ru_ru_qwerty.keymap" has been added to support the Russian keyboard layout.
---
 src/protocols/rdp/keymaps/ru_ru_qwerty.keymap | 62 +++++++++++++++++++
 1 file changed, 62 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 0000000000..d42159d052
--- /dev/null
+++ b/src/protocols/rdp/keymaps/ru_ru_qwerty.keymap
@@ -0,0 +1,62 @@
+#
+# 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"
+freerdp "KBD_RUSSIAN"
+
+# Let's define the scan codes of the main Latin keys
+# 
+map -caps -shift 0x10..0x1B 0x2B ~ "qwertyuiop[]\"
+map -caps -shift 0x1E..0x28      ~ "asdfghjkl;'"
+map -caps -shift 0x2C..0x35      ~ "zxcvbnm,./"
+
+map -caps +shift 0x10..0x1B 0x2B ~ "QWERTYUIOP{}|"
+map -caps +shift 0x1E..0x28      ~ "ASDFGHJKL:""
+map -caps +shift 0x2C..0x35      ~ "ZXCVBNM<>?"
+
+map +caps -shift 0x10..0x1B 0x2B ~ "QWERTYUIOP[]\"
+map +caps -shift 0x1E..0x28      ~ "ASDFGHJKL;'"
+map +caps -shift 0x2C..0x35      ~ "ZXCVBNM,./"
+
+map +caps +shift 0x10..0x1B 0x2B ~ "qwertyuiop{}|"
+map +caps +shift 0x1E..0x28      ~ "asdfghjkl:""
+map +caps +shift 0x2C..0x35      ~ "zxcvbnm<>?"
+
+# Let's define the scan codes of the main Russian keys
+#
+map -caps -shift 0x29 0x02..0x0D ~ "ё1234567890-="
+map -caps -shift 0x10..0x1B 0x2B ~ "йцукенгшщзхъ\"
+map -caps -shift 0x1E..0x28      ~ "фывапролджэ"
+map -caps -shift 0x2C..0x35      ~ "ячсмитьбю."
+
+map -caps +shift 0x29 0x02..0x0D ~ "Ё!"№;%:?*()_+"
+map -caps +shift 0x10..0x1B 0x2B ~ "ЙЦУКЕНГШЩЗХЪ/"
+map -caps +shift 0x1E..0x28      ~ "ФЫВАПРОЛДЖЭ"
+map -caps +shift 0x2C..0x35      ~ "ЯЧСМИТЬБЮ,"
+
+map +caps -shift 0x29 0x02..0x0D ~ "Ё1234567890-="
+map +caps -shift 0x10..0x1B 0x2B ~ "ЙЦУКЕНГШЩЗХЪ\"
+map +caps -shift 0x1E..0x28      ~ "ФЫВАПРОЛДЖЭ"
+map +caps -shift 0x2C..0x35      ~ "ЯЧСМИТЬБЮ,"
+
+map +caps +shift 0x29 0x02..0x0D ~ "ё!"№;%:?*()_+"
+map +caps +shift 0x10..0x1B 0x2B ~ "йцукенгшщзхъ/"
+map +caps +shift 0x1E..0x28      ~ "фывапролджэ"
+map +caps +shift 0x2C..0x35      ~ "ячсмитьбю,"