[feat] Altgr modifier key

* Added "Alt graph" or "Alt gr" modifier key. Right alt key will no longer behave like the left alt key. * Modified test to include "Altgr" modifier * Added altgr/mod5 modifier keys to manual Signed-off-by: Samson Nagamani <[email protected]> Signed-off-by: Aakash Sen Sharma <[email protected]>
waycrate · Jun 30, 2023 · 0602847 · 0602847
1 parent 0318d82
commit 0602847
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,11 +15,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `DESTDIR` variable for the `install` target in the `Makefile` to help
   packaging and installation. To install in a subdirectory, just call `make
   DESTDIR=subdir install`.
+- `Altgr` modifier added (https://github.com/waycrate/swhkd/pull/213).
 
 ### Changed
 
 - The project `Makefile` now builds the polkit policy file dynamically depending
   on the target installation directories.
+- Alt modifier no longer maps to the right aly key. It only maps to the left alt key. Right alt is referred to as Altgr (alt graph).
 
 ### Fixed
 

diff --git a/docs/swhkd-keys.5.scd b/docs/swhkd-keys.5.scd
@@ -12,6 +12,8 @@ swhkd	- Hotkey daemon inspired by sxhkd written in Rust
 	- Mod4
 	- Alt
 	- Mod1
+	- Altgr
+	- Mod5
 	- Shift
 
 # VALID KEYS

diff --git a/swhkd/src/config.rs b/swhkd/src/config.rs
@@ -228,6 +228,7 @@ pub struct Hotkey {
 pub enum Modifier {
     Super,
     Alt,
+    Altgr,
     Control,
     Shift,
     Any,
@@ -452,6 +453,8 @@ pub fn parse_contents(path: PathBuf, contents: String) -> Result<Vec<Mode>, Erro
         ("mod4", Modifier::Super),
         ("alt", Modifier::Alt),
         ("mod1", Modifier::Alt),
+        ("altgr", Modifier::Altgr),
+        ("mod5", Modifier::Altgr),
         ("shift", Modifier::Shift),
         ("any", Modifier::Any),
     ]);

diff --git a/swhkd/src/daemon.rs b/swhkd/src/daemon.rs
@@ -193,7 +193,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
         (Key::KEY_LEFTMETA, config::Modifier::Super),
         (Key::KEY_RIGHTMETA, config::Modifier::Super),
         (Key::KEY_LEFTALT, config::Modifier::Alt),
-        (Key::KEY_RIGHTALT, config::Modifier::Alt),
+        (Key::KEY_RIGHTALT, config::Modifier::Altgr),
         (Key::KEY_LEFTCTRL, config::Modifier::Control),
         (Key::KEY_RIGHTCTRL, config::Modifier::Control),
         (Key::KEY_LEFTSHIFT, config::Modifier::Shift),

diff --git a/swhkd/src/tests.rs b/swhkd/src/tests.rs
@@ -398,6 +398,9 @@ control + 5
 alt + 2
     notify-send 'Hello world!'
 
+altgr + i
+    notify-send 'Hello world!'
+
 super + z
     notify-send 'Hello world!'
             ";
@@ -418,6 +421,11 @@ super + z
                 vec![Modifier::Alt],
                 "notify-send 'Hello world!'".to_string(),
             ),
+            Hotkey::new(
+                evdev::Key::KEY_I,
+                vec![Modifier::Altgr],
+                "notify-send 'Hello world!'".to_string(),
+            ),
             Hotkey::new(
                 evdev::Key::KEY_Z,
                 vec![Modifier::Super],