diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-28 09:54:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-28 09:54:37 +0000 |
| commit | 43e5da9aab683418e6ada092e15cf40409357374 (patch) | |
| tree | 8301768492932ade3100f726729f9062b59f672e /xorg-server | |
| parent | f331b3c351021681044b2594d1ec5b49bd8edb47 (diff) | |
| parent | f6ba83c963bf48dfa349ab8c54d1968c4c69f7b8 (diff) | |
| download | vcxsrv-43e5da9aab683418e6ada092e15cf40409357374.tar.gz vcxsrv-43e5da9aab683418e6ada092e15cf40409357374.tar.bz2 vcxsrv-43e5da9aab683418e6ada092e15cf40409357374.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/xkeyboard-config/rules/base.lists.part | 3 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/tests/xkbTestFunc.pm | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/xorg-server/xkeyboard-config/rules/base.lists.part b/xorg-server/xkeyboard-config/rules/base.lists.part index 4cf47331a..a18585680 100644 --- a/xorg-server/xkeyboard-config/rules/base.lists.part +++ b/xorg-server/xkeyboard-config/rules/base.lists.part @@ -52,7 +52,6 @@ hp250x hp5xx hp500fa hpdv5 \
hpi6 hpxe3gc hpxe3gf hpxe4xxx hpxt1000 hpzt11xx \
ibm_spacesaver ipaq inspiron intel \
- kinesis \
logiaccess logicda logicink \
logiex110 logiclx300 \
logiinkse logiinkseusb logiitc logiik \
@@ -71,7 +70,7 @@ silvercrest \
sk1300 sk2500 sk6200 sk7100 \
sven sven303 symplon \
- tm2030USB toshiba_s3000 trust trustda \
+ toshiba_s3000 trust trustda \
unitekkb1925 yahoo
// all layouts with 3rd and 4th groups
diff --git a/xorg-server/xkeyboard-config/tests/xkbTestFunc.pm b/xorg-server/xkeyboard-config/tests/xkbTestFunc.pm index 1d7881d23..77f03144f 100644 --- a/xorg-server/xkeyboard-config/tests/xkbTestFunc.pm +++ b/xorg-server/xkeyboard-config/tests/xkbTestFunc.pm @@ -38,13 +38,14 @@ sub getXkbSettings sub setXkbSettings
{
my ( $xkbRules, $xkbModel, $xkbLayouts, $xkbVariants, $xkbOptions ) = @_;
- ( system ( "setxkbmap", "-synch",
- "-rules", $xkbRules,
- "-model", $xkbModel,
- "-layout", $xkbLayouts,
- "-variant", $xkbVariants,
- "-option", $xkbOptions ) == 0 ) or die "Could not set xkb configuration";
- sleep 1;
+ my $outfile = ".test.out.xkb";
+ ( system ( "setxkbmap -rules \"$xkbRules\" " .
+ "-model \"$xkbModel\" " .
+ "-layout \"$xkbLayouts\" " .
+ "-variant \"$xkbVariants\" " .
+ "-option \"$xkbOptions\" " .
+ "-print | xkbcomp - -xkb $outfile" ) == 0 ) or die "Could not set xkb configuration";
+ unlink($outfile);
}
sub restoreXkbSettings
|