[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#276143: xkb-data: altwin:meta_win breaks 3rd level modifier (AltGr)



Package: xkb-data
Version: 0.8-5
Followup-For: Bug #276143

I have a patch that modifies altwin:meta_win to leave Right-Alt
untouched. It also gives explanation to what happens to Left-Alt key.

------ patch included below ------


-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (499, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-1-686
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)

-- no debconf information
diff -ur ../xkb.orig/rules/base ./rules/base
--- ../xkb.orig/rules/base	2006-05-25 17:46:51.000000000 +0200
+++ ./rules/base	2006-05-25 17:46:41.000000000 +0200
@@ -989,6 +989,7 @@
   ctrl:ctrl_ra		=	+ctrl(ctrl_ra)
   altwin:menu		=	+altwin(menu)
   altwin:meta_alt	=	+altwin(meta_alt)
+  altwin:meta_win_orig	=	+altwin(meta_win_orig)
   altwin:meta_win	=	+altwin(meta_win)
   altwin:left_meta_win	=	+altwin(left_meta_win)
   altwin:super_win	=	+altwin(super_win)
diff -ur ../xkb.orig/rules/base.lst ./rules/base.lst
--- ../xkb.orig/rules/base.lst	2006-04-14 22:43:45.000000000 +0200
+++ ./rules/base.lst	2006-05-25 17:22:06.000000000 +0200
@@ -435,7 +435,8 @@
   altwin               Alt/Win key behavior
   altwin:menu          Add the standard behavior to Menu key.
   altwin:meta_alt      Alt and Meta are on the Alt keys (default).
-  altwin:meta_win      Meta is mapped to the Win-keys.
+  altwin:meta_win_orig Meta is mapped to the Win-keys.
+  altwin:meta_win      Meta is mapped to the Win-keys, Alt is mapped to the left Alt-key.
   altwin:left_meta_win Meta is mapped to the left Win-key.
   altwin:super_win     Super is mapped to the Win-keys (default).
   altwin:hyper_win     Hyper is mapped to the Win-keys.
diff -ur ../xkb.orig/rules/base.xml ./rules/base.xml
--- ../xkb.orig/rules/base.xml	2006-04-14 22:43:45.000000000 +0200
+++ ./rules/base.xml	2006-05-25 17:45:23.000000000 +0200
@@ -10884,7 +10884,7 @@
       </option>
       <option>
         <configItem>
-          <name>altwin:meta_win</name>
+          <name>altwin:meta_win_orig</name>
           <description>Meta is mapped to the Win-keys.</description>
           <description xml:lang="af">Meta is verbind aan die Win-sleutels.</description>
           <description xml:lang="az">Meta Win düymələrinə xəritələnib.</description>
@@ -10913,6 +10913,35 @@
       </option>
       <option>
         <configItem>
+          <name>altwin:meta_win</name>
+          <description>Meta is mapped to the Win-keys, Alt is mapped to the left Alt-key.</description>
+          <description xml:lang="af">Meta is verbind aan die Win-sleutels, Alt is verbind aan die linkerkantste Alt-sleutel.</description>
+          <description xml:lang="az">Meta Win düymələrinə xəritələnib, Alt sol Alt düyməsinə xəritələnib.</description>
+          <description xml:lang="bg">И двата Win-а фунцкионират като Meta, левият Alt функционира като Alt.</description>
+          <description xml:lang="cs">Meta je mapována na klávesy Win, Alt je mapována na levou klávesu Alt.</description>
+          <description xml:lang="da">Meta ligger på Win-tasterne, Alt ligger på venstre Alt-tast.</description>
+          <description xml:lang="en_GB">Meta is mapped to the Win-keys, Alt is mapped to the left Alt-key.</description>
+          <description xml:lang="fi">Meta tulee Win-näppäimistä, Alt tulee vasemmasta Alt-näppäimestä.</description>
+          <description xml:lang="fr">Méta est obtenu avec n'importe quelle touche Logo, Alt est obtenu avec la touche Alt de gauche.</description>
+          <description xml:lang="hu">A Meta a Win billentyűkhöz van rendelve, a Alt a bal Alt billentyűhöz van rendelve.</description>
+          <description xml:lang="it">Meta è mappato sul tasto Win, Alt è mappato sul tasto Alt sinistro.</description>
+          <description xml:lang="nl">Meta wordt afgebeeld op de Win-toetsen, Alt wordt afgebeeld op de linker Alt-toets.</description>
+          <description xml:lang="ru">Мета соответствует клавишам Win, Alt соответствует левой клавише Alt</description>
+          <description xml:lang="sk">Meta je mapovaný na Win-klávesy, Alt je mapovaný na ľavý Alt-kláves.</description>
+          <description xml:lang="sl">Meta funkcionalnost prevzameta Win tipki, Alt funkcionalnost prevzame leva Alt tipka.</description>
+          <description xml:lang="sq">Meta është vendosur tek pulsantët Win, Alt është vendosur tek pulsanti i majtë Alt.</description>
+          <description xml:lang="sr">Meta је мапиран на Windows тастере, Alt је мапиран на леви Windows тастер Alt.</description>
+          <description xml:lang="sr@Latn">Meta je mapiran na Windows tastere, Alt je mapiran na levi Alt taster.</description>
+          <description xml:lang="sv">Meta är mappat till Win-tangenterna, Alt är mappat till vänster Alt-tangent.</description>
+          <description xml:lang="tr">Meta, Win tuşları ile eşleştirilir, Alt, soldaki Alt tuşu ile eşleştirilir.</description>
+          <description xml:lang="uk">Клавіша Meta відповідає клавішам Win, клавіша Alt відповідає лівій клавіші Alt</description>
+          <description xml:lang="vi">Meta được gắn với các phím Win, Alt được gắn với phím Alt bên trái.</description>
+          <description xml:lang="zh_CN">Meta 被映射到 Windows 键。Alt 被映射到左 Alt 键。</description>
+          <description xml:lang="zh_TW">Meta 配置到兩個 Win-key。Alt 配置到左邊的 Alt-key。</description>
+        </configItem>
+      </option>
+      <option>
+        <configItem>
           <name>altwin:left_meta_win</name>
           <description>Meta is mapped to the left Win-key.</description>
           <description xml:lang="af">Meta is verbind aan die linkerkantste Win-sleutel.</description>
diff -ur ../xkb.orig/symbols/altwin ./symbols/altwin
--- ../xkb.orig/symbols/altwin	2006-04-14 22:43:47.000000000 +0200
+++ ./symbols/altwin	2006-05-25 17:18:03.000000000 +0200
@@ -11,7 +11,7 @@
 };
 
 partial modifier_keys 
-xkb_symbols "meta_win" {
+xkb_symbols "meta_win_orig" {
     key <LALT> {	[ 	Alt_L	]	};
     key <RALT> {	[ 	Alt_R	]	};
     key <LWIN> {	[ 	Meta_L	]	};
@@ -21,6 +21,15 @@
 };
 
 partial modifier_keys 
+xkb_symbols "meta_win" {
+    key <LALT> {	[ 	Alt_L	]	};
+    key <LWIN> {	[ 	Meta_L	]	};
+    key <RWIN> {	[ 	Meta_R	]	};
+    modifier_map Mod1	{ Alt_L };
+    modifier_map Mod4	{ <META>, Meta_L, Meta_R };
+};
+
+partial modifier_keys 
 xkb_symbols "left_meta_win" {
     key <LALT> {	[ 	Alt_L,	Alt_L		]	};
     key <LWIN> {	[ 	Meta_L			]	};
diff -ur ../xkb.orig/symbols.dir ./symbols.dir
--- ../xkb.orig/symbols.dir	2006-04-14 22:43:46.000000000 +0200
+++ ./symbols.dir	2006-05-25 17:50:03.000000000 +0200
@@ -304,6 +304,7 @@
 -dp----- a------- vn(basic)
 -dp----- am------ za(basic)
 --p----- -m------ altwin(meta_alt)
+--p----- -m------ altwin(meta_win_orig)
 --p----- -m------ altwin(meta_win)
 --p----- -m------ altwin(left_meta_win)
 --p----- -m------ altwin(super_win)

Reply to: