From 633186778b322234b705ba7dd40cebcf0efc789f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 9 Sep 2020 12:11:50 +0200 Subject: [PATCH] [keyboard] Add test for Turkish F variant - test keyboard lookup for "tr" - "f" variations - add data mapping "tr" - "f" to legacy keymap "trf" FIXES #1397 --- src/modules/keyboard/Tests.cpp | 3 +++ src/modules/keyboard/kbd-model-map | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/src/modules/keyboard/Tests.cpp b/src/modules/keyboard/Tests.cpp index 95c317b79..16983685a 100644 --- a/src/modules/keyboard/Tests.cpp +++ b/src/modules/keyboard/Tests.cpp @@ -42,6 +42,9 @@ KeyboardLayoutTests::testSimpleLayoutLookup_data() QTest::addColumn< QString >( "vconsole" ); QTest::newRow( "us" ) << QString( "us" ) << QString() << QString() << QString( "us" ); + QTest::newRow( "turkish default" ) << QString( "tr" ) << QString() << QString() << QString( "trq" ); + QTest::newRow( "turkish alt-q" ) << QString( "tr" ) << QString() << QString( "alt" ) << QString( "trq" ); + QTest::newRow( "turkish f" ) << QString( "tr" ) << QString() << QString( "f" ) << QString( "trf" ); } diff --git a/src/modules/keyboard/kbd-model-map b/src/modules/keyboard/kbd-model-map index e113c92ba..6ec00c81b 100644 --- a/src/modules/keyboard/kbd-model-map +++ b/src/modules/keyboard/kbd-model-map @@ -12,6 +12,13 @@ # # Updates: # - 2018-09-26 Added "Austrian" keyboard (de at). Issue #1035 +# - 2020-09-09 Added "Turkish F" keyboard. Issue #1397 +# +# Note that keyboard variants should be listed from least to most-specific +# within a layout. Keyboard lookups only consider a subsequent +# line if it has a strictly better match than previous ones: +# listing specific variants early can mean a poor match with them +# is not overridden by a poor match with a later generic variant. # # Generated from system-config-keyboard's model list # consolelayout xlayout xmodel xvariant xoptions @@ -19,6 +26,7 @@ sg ch pc105 de_nodeadkeys terminate:ctrl_alt_bksp nl nl pc105 - terminate:ctrl_alt_bksp mk-utf mk,us pc105 - terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:scroll trq tr pc105 - terminate:ctrl_alt_bksp +trf tr pc105 f terminate:ctrl_alt_bksp uk gb pc105 - terminate:ctrl_alt_bksp is-latin1 is pc105 - terminate:ctrl_alt_bksp de de pc105 - terminate:ctrl_alt_bksp