From d4d629b77742e60caac3d120ff40e9f386380af2 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 4 Mar 2013 08:18:40 +0100
Subject: fontconfig libX11 mesalib pixman xserver xkeyboard-config git update
 4 Mar 2013

xserver          commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6
xkeyboard-config commit fa2f330df22511c3846cb1cb0760551c6e244a81
libX11           commit c23d61d1b84dca3740bf4786978c7908d0065fb9
pixman           commit 5feda20fc39407879993ed4a6d861ef7f78d9432
fontconfig       commit 612ee2a5c91b8929b2cc5abce4af84d8d7e66bd0
mesa             commit e29124717eae4f8d329bb6a9707b802c0ff4bdd9
---
 xorg-server/xkeyboard-config/rules/base.o_s.part |  7 ++++
 xorg-server/xkeyboard-config/rules/base.xml.in   | 42 ++++++++++++++++++++++++
 xorg-server/xkeyboard-config/symbols/compose     | 35 ++++++++++++++++++++
 3 files changed, 84 insertions(+)

(limited to 'xorg-server/xkeyboard-config')

diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part
index 253effded..721291985 100644
--- a/xorg-server/xkeyboard-config/rules/base.o_s.part
+++ b/xorg-server/xkeyboard-config/rules/base.o_s.part
@@ -78,12 +78,19 @@
   ctrl:ralt_rctrl	=	+ctrl(ralt_rctrl)
   compose:ralt		=	+compose(ralt)
   compose:lwin		=	+compose(lwin)
+  compose:lwin-altgr	=	+compose(lwin-altgr)
   compose:rwin		=	+compose(rwin)
+  compose:rwin-altgr	=	+compose(rwin-altgr)
   compose:menu		=	+compose(menu)
+  compose:menu-altgr	=	+compose(menu-altgr)
   compose:lctrl		=	+compose(lctrl)
+  compose:lctrl-altgr	=	+compose(lctrl-altgr)
   compose:rctrl		=	+compose(rctrl)
+  compose:rctrl-altgr	=	+compose(rctrl-altgr)
   compose:caps		=	+compose(caps)
+  compose:caps-altgr	=	+compose(caps-altgr)
   compose:102		=	+compose(102)
+  compose:102-altgr	=	+compose(102-altgr)
   compose:paus		=	+compose(paus)
   compose:prsc		=	+compose(prsc)
   compose:sclk		=	+compose(sclk)
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 83dc894e2..95790dda8 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -6280,42 +6280,84 @@
           <_description>Left Win</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>compose:lwin-altgr</name>
+          <_description>3rd level of Left Win</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>compose:rwin</name>
           <_description>Right Win</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>compose:rwin-altgr</name>
+          <_description>3rd level of Right Win</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>compose:menu</name>
           <_description>Menu</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>compose:menu-altgr</name>
+          <_description>3rd level of Menu</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>compose:lctrl</name>
           <_description>Left Ctrl</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>compose:lctrl-altgr</name>
+          <_description>3rd level of Left Ctrl</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>compose:rctrl</name>
           <_description>Right Ctrl</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>compose:rctrl-altgr</name>
+          <_description>3rd level of Right Ctrl</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>compose:caps</name>
           <_description>Caps Lock</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>compose:caps-altgr</name>
+          <_description>3rd level of Caps Lock</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>compose:102</name>
           <_description>&lt;Less/Greater&gt;</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>compose:102-altgr</name>
+          <_description>3rd level of &lt;Less/Greater&gt;</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>compose:paus</name>
diff --git a/xorg-server/xkeyboard-config/symbols/compose b/xorg-server/xkeyboard-config/symbols/compose
index d7257329e..08446bf24 100644
--- a/xorg-server/xkeyboard-config/symbols/compose
+++ b/xorg-server/xkeyboard-config/symbols/compose
@@ -8,36 +8,71 @@ xkb_symbols "lwin" {
     key <LWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
+partial modifier_keys
+xkb_symbols "lwin-altgr" {
+    key <LWIN>	{ type[Group1]="FOUR_LEVEL", [ Super_L, Super_L, Multi_key, Multi_key ] };
+};
+
 partial modifier_keys
 xkb_symbols "rwin" {
     key <RWIN>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
+partial modifier_keys
+xkb_symbols "rwin-altgr" {
+    key <RWIN>	{ type[Group1]="FOUR_LEVEL", [ Super_R, Super_R, Multi_key, Multi_key ] };
+};
+
 partial modifier_keys
 xkb_symbols "menu" {
     key <MENU>	{ type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
+partial modifier_keys
+xkb_symbols "menu-altgr" {
+    key <MENU>	{ type[Group1]="FOUR_LEVEL", [ Menu, Menu, Multi_key, Multi_key ] };
+};
+
 partial modifier_keys
 xkb_symbols "rctrl" {
     key <RCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
+partial modifier_keys
+xkb_symbols "rctrl-altgr" {
+    key <RCTL> { type[Group1]="FOUR_LEVEL", [ Control_R, Control_R, Multi_key, Multi_key ] };
+};
+
 partial modifier_keys
 xkb_symbols "lctrl" {
     key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
+partial modifier_keys
+xkb_symbols "lctrl-altgr" {
+    key <LCTL> { type[Group1]="FOUR_LEVEL", [ Control_L, Control_L, Multi_key, Multi_key ] };
+};
+
 partial modifier_keys
 xkb_symbols "caps" {
     key <CAPS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
+partial modifier_keys
+xkb_symbols "caps-altgr" {
+    key <CAPS> { type[Group1]="FOUR_LEVEL", [ Caps_Lock, Caps_Lock, Multi_key, Multi_key ] };
+};
+
 partial modifier_keys
 xkb_symbols "102" {
     key <LSGT> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
 };
 
+partial modifier_keys
+xkb_symbols "102-altgr" {
+    key <LSGT> { type[Group1]="FOUR_LEVEL", [ less, greater, Multi_key, Multi_key ] };
+};
+
 partial modifier_keys
 xkb_symbols "paus" {
     key <PAUS> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] };
-- 
cgit v1.2.3