From 9fee04afd58d7e3407d6550aa6baeae943c94ae1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 8 Dec 2008 12:03:51 +0000
Subject: - keyboarddrake:   o configure hal so Xorg can get xkb info     (nb:
 for now, you must "service haldaemon restart" to be taken into account)

---
 lib/keyboard.pm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'lib/keyboard.pm')

diff --git a/lib/keyboard.pm b/lib/keyboard.pm
index 4ad9a23..a3c7f15 100644
--- a/lib/keyboard.pm
+++ b/lib/keyboard.pm
@@ -620,6 +620,22 @@ sub configure_xorg {
 	Xconfig::default::config_keyboard($xfree_conf, $keyboard);
 	$xfree_conf->write;
     }
+    my $hal_dir = "$::prefix/etc/hal/fdi/policy";
+    if (-d $hal_dir) {
+	my $xkb = keyboard::keyboard2full_xkb($keyboard);
+	mkdir "$hal_dir/10osvendor";
+	output("$hal_dir/10osvendor/10-keymap.fdi", sprintf(<<'EOF', $xkb->{XkbLayout}, $xkb->{XkbOptions}));
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.capabilities" contains="input.keys">
+      <merge key="input.xkb.layout" type="string">%s</merge>
+      <merge key="input.xkb.options" type="string">%s</merge>
+    </match>
+  </device>
+</deviceinfo>
+EOF
+    }
 }
 
 sub configure_and_set_standalone {
-- 
cgit v1.2.1