From ea739ebb4795269479f3115a74a49aed82c22819 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <mboes@cs.mcgill.ca>
Date: Sun, 2 Dec 2012 12:49:30 -0500
Subject: [PATCH] Add altwin:swap_alt_win and altwin:swap_lalt_lwin options.

This completes the existing option altwin:swap_lalt_lwin.
---
 rules/base.o_s.part |  2 ++
 rules/base.xml.in   | 12 ++++++++++++
 symbols/altwin      | 13 +++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index b4772b4..a4cc7b5 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -6,7 +6,9 @@
   altwin:left_meta_win	=	+altwin(left_meta_win)
   altwin:hyper_win	=	+altwin(hyper_win)
   altwin:alt_super_win	=	+altwin(alt_super_win)
+  altwin:swap_alt_win	=	+altwin(swap_alt_win)
   altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
+  altwin:swap_ralt_rwin	=	+altwin(swap_ralt_rwin)
   grp:switch		=	+group(switch)
   grp:lswitch		=	+group(lswitch)
   grp:win_switch	=	+group(win_switch)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 5f06181..09bf8df 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -6190,10 +6190,22 @@
       </option>
       <option>
         <configItem>
+          <name>altwin:swap_alt_win</name>
+          <_description>Alt is swapped with Win</_description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>altwin:swap_lalt_lwin</name>
           <_description>Left Alt is swapped with Left Win</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>altwin:swap_ralt_rwin</name>
+          <_description>Right Alt is swapped with Right Win</_description>
+        </configItem>
+      </option>
     </group>
     <group allowMultipleSelection="true">
       <!-- Tweaking the position of the "Compose" key: mapping to existing PC keys -->
diff --git a/symbols/altwin b/symbols/altwin
index 9259912..fc4e744 100644
--- a/symbols/altwin
+++ b/symbols/altwin
@@ -72,8 +72,21 @@ xkb_symbols "alt_super_win" {
 };
 
 partial modifier_keys 
+xkb_symbols "swap_alt_win" {
+    include "altwin(swap_lalt_lwin)"
+    include "altwin(swap_ralt_rwin)"
+};
+
+partial modifier_keys 
 xkb_symbols "swap_lalt_lwin" {
     key <LALT> { type[Group1] = "ONE_LEVEL",
                  symbols[Group1] = [ Super_L ] };
     key <LWIN> {	[	Alt_L,	Meta_L		]	};
 };
+
+partial modifier_keys 
+xkb_symbols "swap_ralt_rwin" {
+    key <RALT> { type[Group1] = "ONE_LEVEL",
+                 symbols[Group1] = [ Super_R ] };
+    key <RWIN> {	[	Alt_R,	Meta_R		]	};
+};
-- 
1.8.0