diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-09 13:35:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-09 13:35:19 +0000 |
| commit | ede533057612d4a01c554f449f047399c0226532 (patch) | |
| tree | dd71837ec556c564fcc72c8b38627f31e4817009 /perl-install/Xconfig.pm | |
| parent | 90de85d9f5905f92507b78f32a43e354a6181e2f (diff) | |
| download | drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.tar drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.tar.gz drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.tar.bz2 drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.tar.xz drakx-backup-do-not-use-ede533057612d4a01c554f449f047399c0226532.zip | |
handle XkbModel (especially for abnt2 (br))
Diffstat (limited to 'perl-install/Xconfig.pm')
| -rw-r--r-- | perl-install/Xconfig.pm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm index 726651849..6e53f4069 100644 --- a/perl-install/Xconfig.pm +++ b/perl-install/Xconfig.pm @@ -50,6 +50,7 @@ sub getinfoFromXF86Config { $c{driver} = $1 if /^\s*Driver\s+"(.*?)"/; $c{id} = $1 if /^\s*Identifier\s+"[^\d"]*(\d*)"/; + $c{xkb_model} ||= $1 if /^\s*Option\s+"XkbModel"\s+"(.*?)"/; $c{xkb_keymap} ||= $1 if /^\s*Option\s+"XkbLayout"\s+"(.*?)"/; $c{XMOUSETYPE} ||= $1 if /^\s*Option\s+"Protocol"\s+"(.*?)"/; $c{device} ||= $1 if /^\s*Option\s+"Device"\s+"\/dev\/(.*?)"/; @@ -93,6 +94,7 @@ sub getinfoFromXF86Config { local *F; open F, "$prefix/etc/X11/XF86Config"; while (<F>) { if (/^Section "Keyboard"/ .. /^EndSection/) { + $keyboard{xkb_model} ||= $1 if /^\s*XkbModel\s+"(.*?)"/; $keyboard{xkb_keymap} ||= $1 if /^\s*XkbLayout\s+"(.*?)"/; } elsif (/^Section "Pointer"/ .. /^EndSection/) { $mouse{XMOUSETYPE} ||= $1 if /^\s*Protocol\s+"(.*?)"/; |