From 8689e2583aa71eb9fe84a774de3064adefe6ae52 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.ch>
Date: Wed, 22 Aug 2018 19:44:50 +0200
Subject: [PATCH] input: make compose work with any right key

---
 bin/input-event |  3 ---
 xkb/default.xkb |  4 ++--
 xkb/norwin.xkb  | 15 ---------------
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 xkb/norwin.xkb

diff --git a/bin/input-event b/bin/input-event
index 296df7f..7a5a429 100755
--- a/bin/input-event
+++ b/bin/input-event
@@ -32,9 +32,6 @@ case "$event,$use,$(uname -n),$name" in
     *,XISlaveKeyboard,zoro,"AT Translated Set 2 keyboard")
         xkb x1
         ;;
-    *,XISlaveKeyboard,guybrush,"AT Translated Set 2 keyboard")
-        xkb norwin
-        ;;
     *,XISlaveKeyboard,*,"ThinkPad Extra Buttons")
         xkb thinkpad-extra
         ;;
diff --git a/xkb/default.xkb b/xkb/default.xkb
index ea87920..0afc39b 100644
--- a/xkb/default.xkb
+++ b/xkb/default.xkb
@@ -1,7 +1,7 @@
 # -*- conf -*-
 
 # Default configuration with:
-#  - compose → rwin or menu
+#  - compose → rwin, ralt or menu
 #  - capslock as ctrl
 #  - us+fr and switch with rctrl+rshift
 #  - pause key becomes xscreensaver
@@ -10,7 +10,7 @@ xkb_keymap {
         xkb_types     { include "complete" };
         xkb_compat    { include "complete" };
         xkb_symbols   { include "pc+us+fr:2+inet(evdev)"
-                        include "compose(rwin)+compose(menu)"
+                        include "compose(rwin)+compose(menu)+compose(ralt)"
                         include "ctrl(nocaps)"
                         include "group(rctrl_rshift_toggle)"
                         include "vbe(pause)" };
diff --git a/xkb/norwin.xkb b/xkb/norwin.xkb
deleted file mode 100644
index c035f21..0000000
--- a/xkb/norwin.xkb
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- conf -*-
-
-# Configuration with:
-#  - compose → ralt
-#  - capslock as ctrl
-#  - us+fr and switch with rctrl+rshift
-xkb_keymap {
-        xkb_keycodes  { include "evdev+aliases(qwerty)" };
-        xkb_types     { include "complete" };
-        xkb_compat    { include "complete" };
-        xkb_symbols   { include "pc+us+fr:2+inet(evdev)"
-                        include "compose(ralt)+ctrl(nocaps)"
-                        include "group(rctrl_rshift_toggle)" };
-        xkb_geometry  { include "pc(pc105)" };
-};