update keybroad to xorg 1.9

4 files changed, 110 insertions, 64 deletions

diff --git a/src/SW/my-layout/document.en.rest.txt b/src/SW/my-layout/document.en.rest.txt
index 2c90144..48c404c 100644
--- a/src/SW/my-layout/document.en.rest.txt
+++ b/src/SW/my-layout/document.en.rest.txt
@@ -13,13 +13,18 @@ I use a `Dvorak layout
 Gentoo Linux PC.
 
 I could *mostly* do with the `xorg`-provided dvorak layout, by putting
-this in my ``/etc/hal/fdi/policy/10-x11-input.fdi`` file::
-
- <match key="input.product" string="Apple, Inc Apple Keyboard">
-  <merge key="input.x11_options.XkbLayout" type="string">us</merge>
-  <merge key="input.x11_options.XkbModel" type="string">evdev</merge>
-  <merge key="input.x11_options.XkbVariant" type="string">dvorak</merge>
- </match>
+this in my ``xorg.conf`` file::
+
+  Section "InputClass"
+   Identifier "keyboard-generic"
+   Driver "evdev"
+   Option "XkbOptions" "compose:ralt,altwin:meta_win,terminate:ctrl_alt_bksp"
+   Option "XkbLayout"  "us"
+   Option "XkbModel"   "evdev"
+   Option "XkbVariant" "dvorak"
+  
+   MatchIsKeyboard "on"
+  EndSection
 
 but a few keys were wrong: the "tilde" and "section" keys were
 swapped, the "fn" key was not recognized, and most function keys did
@@ -29,14 +34,27 @@ For the "fn" key, I had to `write a bit of code
 <../xf86-input-evdev/>`_, but for the rest I only had to configure
 `XKB` properly.
 
-Now my `HAL` policy file contains::
-
- <match key="input.product" string="Apple, Inc Apple Keyboard">
-  <merge key="input.x11_options.XkbLayout" type="string">dakkar</merge>
-  <merge key="input.x11_options.XkbModel" type="string">evdev</merge>
-  <merge key="input.x11_options.XkbVariant" type="string">dvorak-apple-al</merge>
-  <merge key="input.x11_options.event_key_remap" type="string">464=118 120=210 204=211</merge>
- </match>
+Now my ``xorg.conf`` file contains::
+
+  Section "InputClass"
+   Identifier "keyboard-generic"
+   Driver "evdev"
+   Option "XkbOptions" "compose:ralt,altwin:meta_win,terminate:ctrl_alt_bksp"
+  
+   MatchIsKeyboard "on"
+  EndSection
+  
+  Section "InputClass"
+   Identifier "keyboard-apple-alu"
+   Driver "evdev"
+   Option "XkbLayout"  "dakkar"
+   Option "XkbModel"   "applealu_iso"
+   Option "XkbVariant" "dvorak-apple-al"
+   Option "event_key_remap" "464=118 120=210 204=211"
+  
+   MatchIsKeyboard "on"
+   MatchProduct    "Apple, Inc Apple Keyboard"
+  EndSection
 
 and I have a ``/usr/share/X11/xkb/symbols/dakkar`` file with::
 
diff --git a/src/SW/my-layout/document.it.rest.txt b/src/SW/my-layout/document.it.rest.txt
index fe59d9b..5315bb1 100644
--- a/src/SW/my-layout/document.it.rest.txt
+++ b/src/SW/my-layout/document.it.rest.txt
@@ -13,13 +13,18 @@ Io uso un `layout Dvorak
 Linux.
 
 Avrei potuto *quasi* usare il layout dvorak di serie di `xorg`,
-scrivendo questo in ``/etc/hal/fdi/policy/10-x11-input.fdi``::
-
- <match key="input.product" string="Apple, Inc Apple Keyboard">
-  <merge key="input.x11_options.XkbLayout" type="string">us</merge>
-  <merge key="input.x11_options.XkbModel" type="string">evdev</merge>
-  <merge key="input.x11_options.XkbVariant" type="string">dvorak</merge>
- </match>
+scrivendo questo in ``xorg.conf``::
+
+  Section "InputClass"
+   Identifier "keyboard-generic"
+   Driver "evdev"
+   Option "XkbOptions" "compose:ralt,altwin:meta_win,terminate:ctrl_alt_bksp"
+   Option "XkbLayout"  "us"
+   Option "XkbModel"   "evdev"
+   Option "XkbVariant" "dvorak"
+  
+   MatchIsKeyboard "on"
+  EndSection
 
 ma avrei avuto un po' di problemi: i tasti "tilde" e "sezione"
 sarebbero stati scambiati, il tasto "fn" non sarebbe stato
@@ -30,14 +35,27 @@ Per il tasto "fn" ho dovuto `scrivere un po' di codice
 <../xf86-input-evdev/>`_, ma per il resto è bastato configurare per
 bene `XKB`.
 
-Ora il file di `HAL` contiene::
-
- <match key="input.product" string="Apple, Inc Apple Keyboard">
-  <merge key="input.x11_options.XkbLayout" type="string">dakkar</merge>
-  <merge key="input.x11_options.XkbModel" type="string">evdev</merge>
-  <merge key="input.x11_options.XkbVariant" type="string">dvorak-apple-al</merge>
-  <merge key="input.x11_options.event_key_remap" type="string">464=118 120=210 204=211</merge>
- </match>
+Ora il file ``xorg.conf`` contiene::
+
+  Section "InputClass"
+   Identifier "keyboard-generic"
+   Driver "evdev"
+   Option "XkbOptions" "compose:ralt,altwin:meta_win,terminate:ctrl_alt_bksp"
+  
+   MatchIsKeyboard "on"
+  EndSection
+  
+  Section "InputClass"
+   Identifier "keyboard-apple-alu"
+   Driver "evdev"
+   Option "XkbLayout"  "dakkar"
+   Option "XkbModel"   "applealu_iso"
+   Option "XkbVariant" "dvorak-apple-al"
+   Option "event_key_remap" "464=118 120=210 204=211"
+  
+   MatchIsKeyboard "on"
+   MatchProduct    "Apple, Inc Apple Keyboard"
+  EndSection
 
 e ho un file ``/usr/share/X11/xkb/symbols/dakkar`` con::
 
diff --git a/src/SW/xf86-input-evdev/document.en.rest.txt b/src/SW/xf86-input-evdev/document.en.rest.txt
index a1ce1be..04dafaa 100644
--- a/src/SW/xf86-input-evdev/document.en.rest.txt
+++ b/src/SW/xf86-input-evdev/document.en.rest.txt
@@ -37,22 +37,27 @@ only the pages needed. This way, devices with no remapping use only
 one more pointer in their structures, and devices with very few codes
 to remap use only 256 bytes.
 
-Of course, the configuration can be set either in the ``xorg.conf``
-file, or via `HAL`. My ``/etc/hal/fdi/policy/10-x11-input.fdi`` file
-contains::
-
- <?xml version="1.0" encoding="utf-8"?>
- <deviceinfo version="0.2">
-  <match key="info.capabilities" contains="input.keyboard">
-   <append key="input.x11_options.XkbOptions" type="strlist">compose:ralt</append>
-   <append key="input.x11_options.XkbOptions" type="strlist">altwin:meta_win</append>
-  </match>
-  <match key="input.product" string="Apple, Inc Apple Keyboard">
-   <merge key="input.x11_options.XkbLayout" type="string">dakkar</merge>
-   <merge key="input.x11_options.XkbModel" type="string">evdev</merge>
-   <merge key="input.x11_options.XkbVariant" type="string">dvorak-apple-al</merge>
-   <merge key="input.x11_options.event_key_remap" type="string">464=118 120=210 204=211</merge>
-  </match>
- </deviceinfo>
+Of course, the configuration can be set in the ``xorg.conf``
+file. Mine contains::
+
+  Section "InputClass"
+   Identifier "keyboard-generic"
+   Driver "evdev"
+   Option "XkbOptions" "compose:ralt,altwin:meta_win,terminate:ctrl_alt_bksp"
+  
+   MatchIsKeyboard "on"
+  EndSection
+  
+  Section "InputClass"
+   Identifier "keyboard-apple-alu"
+   Driver "evdev"
+   Option "XkbLayout"  "dakkar"
+   Option "XkbModel"   "applealu_iso"
+   Option "XkbVariant" "dvorak-apple-al"
+   Option "event_key_remap" "464=118 120=210 204=211"
+  
+   MatchIsKeyboard "on"
+   MatchProduct    "Apple, Inc Apple Keyboard"
+  EndSection
 
 (Details about my keyboard layout are `elsewhere <../my-layout/>`_.
diff --git a/src/SW/xf86-input-evdev/document.it.rest.txt b/src/SW/xf86-input-evdev/document.it.rest.txt
index 88910a4..d8873ea 100644
--- a/src/SW/xf86-input-evdev/document.it.rest.txt
+++ b/src/SW/xf86-input-evdev/document.it.rest.txt
@@ -38,22 +38,27 @@ pagine che servono. In questo modo, i device senza rimappature
 occupano solo un puntatore in più nelle loro strutture, e i device con
 pochi codici da mappare occupano 256 byte in più.
 
-Ovviamente, la configurazione può essere impostata sia dal file
-``xorg.conf`` sia tramite `HAL`. Il mio file
-``/etc/hal/fdi/policy/10-x11-input.fdi`` contiene::
-
- <?xml version="1.0" encoding="utf-8"?>
- <deviceinfo version="0.2">
-  <match key="info.capabilities" contains="input.keyboard">
-   <append key="input.x11_options.XkbOptions" type="strlist">compose:ralt</append>
-   <append key="input.x11_options.XkbOptions" type="strlist">altwin:meta_win</append>
-  </match>
-  <match key="input.product" string="Apple, Inc Apple Keyboard">
-   <merge key="input.x11_options.XkbLayout" type="string">dakkar</merge>
-   <merge key="input.x11_options.XkbModel" type="string">evdev</merge>
-   <merge key="input.x11_options.XkbVariant" type="string">dvorak-apple-al</merge>
-   <merge key="input.x11_options.event_key_remap" type="string">464=118 120=210 204=211</merge>
-  </match>
- </deviceinfo>
+Ovviamente, la configurazione può essere impostata dal file
+``xorg.conf``. Il mio contiene::
+
+  Section "InputClass"
+   Identifier "keyboard-generic"
+   Driver "evdev"
+   Option "XkbOptions" "compose:ralt,altwin:meta_win,terminate:ctrl_alt_bksp"
+  
+   MatchIsKeyboard "on"
+  EndSection
+  
+  Section "InputClass"
+   Identifier "keyboard-apple-alu"
+   Driver "evdev"
+   Option "XkbLayout"  "dakkar"
+   Option "XkbModel"   "applealu_iso"
+   Option "XkbVariant" "dvorak-apple-al"
+   Option "event_key_remap" "464=118 120=210 204=211"
+  
+   MatchIsKeyboard "on"
+   MatchProduct    "Apple, Inc Apple Keyboard"
+  EndSection
 
 (I dettagli sul mio layout di tastiera stanno `altrove <../my-layout/>`_.