Putting altwin:super_win into default mapping, dropping the option, b.fd.o#19500

4 files changed, 2 insertions, 14 deletions

diff --git a/rules/base.o_s.part b/rules/base.o_s.part
index c8c7290..c401790 100644
--- a/rules/base.o_s.part
+++ b/rules/base.o_s.part
@@ -4,7 +4,6 @@
   altwin:ctrl_alt_win	=	+altwin(ctrl_alt_win)
   altwin:meta_win	=	+altwin(meta_win)
   altwin:left_meta_win	=	+altwin(left_meta_win)
-  altwin:super_win	=	+altwin(super_win)
   altwin:hyper_win	=	+altwin(hyper_win)
   altwin:alt_super_win	=	+altwin(alt_super_win)
   altwin:swap_lalt_lwin	=	+altwin(swap_lalt_lwin)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index abf90b0..25f3110 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4671,12 +4671,6 @@
       </option>
       <option>
         <configItem>
-          <name>altwin:super_win</name>
-          <_description>Super is mapped to Win keys</_description>
-        </configItem>
-      </option>
-      <option>
-        <configItem>
           <name>altwin:hyper_win</name>
           <_description>Hyper is mapped to Win-keys</_description>
         </configItem>
diff --git a/symbols/altwin b/symbols/altwin
index ead6a4c..64e8a35 100644
--- a/symbols/altwin
+++ b/symbols/altwin
@@ -49,13 +49,6 @@ xkb_symbols "left_meta_win" {
 };
 
 partial modifier_keys 
-xkb_symbols "super_win" {
-    key <LWIN> {	[ 	Super_L			]	};
-    key <RWIN> {	[ 	Super_R			]	};
-    modifier_map Mod4	{ Super_L, Super_R };
-};
-
-partial modifier_keys 
 xkb_symbols "hyper_win" {
     key <LWIN> {	[ 	Hyper_L			]	};
     key <RWIN> {	[ 	Hyper_R			]	};
diff --git a/symbols/pc b/symbols/pc
index 444e3c1..07472b8 100644
--- a/symbols/pc
+++ b/symbols/pc
@@ -35,11 +35,13 @@ xkb_symbols "pc105" {
     key <LCTL> {	[ Control_L	]	};
 
     key <LWIN> {	[ Super_L			]	};
+    modifier_map Mod4   { <LWIN> };
 
     key <RTSH> {	[ Shift_R	]	};
     key <RCTL> {	[ Control_R	]	};
 
     key <RWIN> {	[ Super_R			]	};
+    modifier_map Mod4   { <RWIN> };
 
     key <MENU> {	[ Menu			]	};