From c47036d6f8c86c0af07726d32b91819093aa3f12 Mon Sep 17 00:00:00 2001
From: "Casper V. Kristensen" <casper@vkristensen.dk>
Date: Tue, 3 May 2022 02:59:01 +0200
Subject: [PATCH] keyboard: Add left-hand AltGr keys

---
 dk_us/README.md                     | 13 -------------
 keyboard/README.md                  | 23 +++++++++++++++++++++++
 {dk_us => keyboard}/dk.patch        | 17 +++++++++++------
 {dk_us => keyboard}/evdev.lst.patch |  0
 {dk_us => keyboard}/evdev.xml.patch |  0
 5 files changed, 34 insertions(+), 19 deletions(-)
 delete mode 100644 dk_us/README.md
 create mode 100644 keyboard/README.md
 rename {dk_us => keyboard}/dk.patch (63%)
 rename {dk_us => keyboard}/evdev.lst.patch (100%)
 rename {dk_us => keyboard}/evdev.xml.patch (100%)

diff --git a/dk_us/README.md b/dk_us/README.md
deleted file mode 100644
index d4cd0b6..0000000
--- a/dk_us/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# dk_us
-US keyboard layout with Danish letters.
-
-## Install
-```
-sudo patch --directory=/ --strip=0 < dk.patch
-sudo patch --directory=/ --strip=0 < evdev.xml.patch
-sudo patch --directory=/ --strip=0 < evdev.lst.patch
-```
-
-
-## Uninstall
-Add the `--reverse` flag to the commands.
diff --git a/keyboard/README.md b/keyboard/README.md
new file mode 100644
index 0000000..6929d26
--- /dev/null
+++ b/keyboard/README.md
@@ -0,0 +1,23 @@
+# Keyboard
+US keyboard layout with Danish letters, and other additions.
+
+## Linux
+
+### Install
+```
+sudo patch --directory=/ --strip=0 < {dk,evdev.xml,evdev.lst}.patch
+```
+
+### Uninstall
+Add the `--reverse` flag to the command.
+
+### Testing
+Set or reload keyboard layout:
+```
+setxkbmap dk us
+```
+
+
+## Windows
+Install `setup.exe` and then go to `Advanced keyboard settings` and select
+`Danish - US, with Danish letters`.
diff --git a/dk_us/dk.patch b/keyboard/dk.patch
similarity index 63%
rename from dk_us/dk.patch
rename to keyboard/dk.patch
index c7e99be..4e9778a 100644
--- a/dk_us/dk.patch
+++ b/keyboard/dk.patch
@@ -1,6 +1,6 @@
 --- /usr/share/X11/xkb/symbols/dk	2021-02-22 10:36:46.000000000 +0100
 +++ /usr/share/X11/xkb/symbols/dk	2022-04-18 16:06:33.380498309 +0200
-@@ -86,3 +86,34 @@
+@@ -86,3 +86,39 @@
  	xkb_symbols "sun_type6" {
  	include "sun_vndr/dk(sun_type6)"
  };
@@ -12,26 +12,31 @@
 +    include "us(basic)"
 +    name[Group1]= "Danish (US, with Danish letters)";
 +
++    key <AE02> { [    NoSymbol,   quotedbl,            at,      NoSymbol  ] };
 +    key <AE03> { [    NoSymbol,   NoSymbol,      sterling,      NoSymbol  ] };
++    key <AE05> { [    NoSymbol,   NoSymbol,      EuroSign,      NoSymbol  ] };
 +    key <AE07> { [    NoSymbol,   NoSymbol,     braceleft,      NoSymbol  ] };
 +    key <AE08> { [    NoSymbol,   NoSymbol,   bracketleft,      NoSymbol  ] };
 +    key <AE09> { [    NoSymbol,   NoSymbol,  bracketright,      NoSymbol  ] };
 +    key <AE10> { [    NoSymbol,   NoSymbol,    braceright,      NoSymbol  ] };
 +    key <AE12> { [    NoSymbol,   NoSymbol,    dead_acute,    dead_grave  ] };
 +
-+    key <AD09> { [    NoSymbol,   NoSymbol,     braceleft,      NoSymbol  ] };
-+    key <AD10> { [    NoSymbol,   NoSymbol,    braceright,      NoSymbol  ] };
++    key <AD03> { [    NoSymbol,   NoSymbol,     braceleft,      NoSymbol  ] };
++    key <AD04> { [    NoSymbol,   NoSymbol,    braceright,      NoSymbol  ] };
 +    key <AD11> { [       aring,      Aring,   bracketleft,     braceleft  ] };
 +    key <AD12> { [  apostrophe,   quotedbl,  bracketright,    braceright  ] };
 +
++    key <AC03> { [    NoSymbol,   NoSymbol,   bracketleft,      NoSymbol  ] };
++    key <AC04> { [    NoSymbol,   NoSymbol,  bracketright,      NoSymbol  ] };
 +    key <AC10> { [          ae,         AE,     semicolon,         colon  ] };
 +    key <AC11> { [      oslash,   Ooblique,    apostrophe,      quotedbl  ] };
 +
++    key <AB01> { [    NoSymbol,   NoSymbol,          less,      NoSymbol  ] };
++    key <AB02> { [    NoSymbol,   NoSymbol,       greater,      NoSymbol  ] };
++    key <AB03> { [    NoSymbol,   NoSymbol,     parenleft,      NoSymbol  ] };
++    key <AB04> { [    NoSymbol,   NoSymbol,    parenright,      NoSymbol  ] };
 +    key <AB08> { [    NoSymbol,  semicolon,          less,      NoSymbol  ] };
 +    key <AB09> { [    NoSymbol,      colon,       greater,      NoSymbol  ] };
 +
-+    include "eurosign(5)"
-+    include "eurosign(e)"
-+
 +    include "level3(ralt_switch)"
 +};
diff --git a/dk_us/evdev.lst.patch b/keyboard/evdev.lst.patch
similarity index 100%
rename from dk_us/evdev.lst.patch
rename to keyboard/evdev.lst.patch
diff --git a/dk_us/evdev.xml.patch b/keyboard/evdev.xml.patch
similarity index 100%
rename from dk_us/evdev.xml.patch
rename to keyboard/evdev.xml.patch