summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--symbols/mk8
-rwxr-xr-xtests/testLayouts.pl8
3 files changed, 12 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index 105870c..83539ab 100644
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ AC_PROG_INTLTOOL
AC_SUBST(xkb_base)
AC_SUBST(xkb_rules_symlink)
-AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile
+AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile
Makefile
compat/Makefile
compiled/Makefile
diff --git a/symbols/mk b/symbols/mk
index eaf0478..2dc79b5 100644
--- a/symbols/mk
+++ b/symbols/mk
@@ -62,6 +62,12 @@ xkb_symbols "basic" {
partial alphanumeric_keys
xkb_symbols "pc104" {
include "mk(basic)"
- // include "mk(win)"
+ include "mk(win)"
};
+partial alphanumeric_keys
+xkb_symbols "win" {
+ key <MENU> { [ ISO_Next_Group ] };
+ key <RWIN> { [ Multi_key ] };
+ key <LWIN> { [ Mode_switch ] };
+};
diff --git a/tests/testLayouts.pl b/tests/testLayouts.pl
index f172ebf..bf7478f 100755
--- a/tests/testLayouts.pl
+++ b/tests/testLayouts.pl
@@ -4,10 +4,10 @@ use strict;
use warnings;
use xkbTestFunc;
-backupXkbSettings();
+xkbTestFunc::backupXkbSettings();
-dumpXkbSettingsBackup();
+xkbTestFunc::dumpXkbSettingsBackup();
-testLevel2( "layout", "variant", 2, "(", ")" );
+xkbTestFunc::testLevel2( "layout", "variant", 2, "(", ")" );
-restoreXkbSettings();
+xkbTestFunc::restoreXkbSettings();