diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-12-18 14:41:18 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-12-18 14:41:18 +0000 |
| commit | 1796d6a2b2b9ec6060c7daa07e318d94ac35160e (patch) | |
| tree | b89d399a651c9c41f8ce1dc29ef28f1a93707523 | |
| parent | d70c29d43189277f97dc9b4d9487cf17c4fdcaaa (diff) | |
| download | drakx-kbd-mouse-x11-1796d6a2b2b9ec6060c7daa07e318d94ac35160e.tar drakx-kbd-mouse-x11-1796d6a2b2b9ec6060c7daa07e318d94ac35160e.tar.gz drakx-kbd-mouse-x11-1796d6a2b2b9ec6060c7daa07e318d94ac35160e.tar.bz2 drakx-kbd-mouse-x11-1796d6a2b2b9ec6060c7daa07e318d94ac35160e.tar.xz drakx-kbd-mouse-x11-1796d6a2b2b9ec6060c7daa07e318d94ac35160e.zip | |
- keyboarddrake:
o do not configure hal directly, but write in /etc/sysconfig/keyboard Xkb
information so hal can get them
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | lib/keyboard.pm | 17 |
2 files changed, 3 insertions, 18 deletions
@@ -1,8 +1,8 @@ - keyboarddrake: - o correctly handle default XkbModel - (so that we do not force pc105 when we should not) o do not configure hal directly, but write in /etc/sysconfig/keyboard Xkb information so hal can get them + o correctly handle default XkbModel + (so that we do not force pc105 when we should not) Version 0.65 - 8 December 2008 diff --git a/lib/keyboard.pm b/lib/keyboard.pm index 8d9460f..98b2477 100644 --- a/lib/keyboard.pm +++ b/lib/keyboard.pm @@ -604,6 +604,7 @@ sub write { log::l("keyboard::write $keyboard->{KEYBOARD}"); $keyboard = { %$keyboard }; + add2hash($keyboard, keyboard2full_xkb($keyboard)); delete $keyboard->{unsafe}; $keyboard->{KEYTABLE} = keyboard2kmap($keyboard); @@ -627,22 +628,6 @@ 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 { |