Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/etoys.in
diff options
context:
space:
mode:
Diffstat (limited to 'etoys.in')
-rw-r--r--etoys.in23
1 files changed, 19 insertions, 4 deletions
diff --git a/etoys.in b/etoys.in
index b593975..ef59ec9 100644
--- a/etoys.in
+++ b/etoys.in
@@ -85,14 +85,29 @@ export DBUS_FATAL_WARNINGS=0
# make Compose input methods work
[ -z "$LC_ALL" ] && export LC_ALL="$LANG"
-# if pulseaudio is running, fall back to OSS
+# if pulseaudio is running, use it if VM has the driver, or fall back to OSS
if pulseaudio --check 2>/dev/null ; then
- VMOPTIONS="$VMOPTIONS -vm-sound-oss"
- if padsp true 2>/dev/null ; then
- WRAPPER=padsp
+ if "$VM" -help 2> /dev/null | grep -q vm-sound-pulse ; then
+ VMOPTIONS="$VMOPTIONS -vm-sound-pulse"
+ else
+ VMOPTIONS="$VMOPTIONS -vm-sound-oss"
+ if padsp true 2>/dev/null ; then
+ WRAPPER=padsp
+ fi
fi
fi
+# enable compositioninput
+case "$LANG" in
+ bn* | gu* | hi* | kn* | ml* | mr* | ta* | te* | sa* )
+ case "$LANG" in
+ *.[uU][tT][fF]-8 | *.[uU][tT][fF]8)
+ VMOPTIONS="$VMOPTIONS -compositioninput"
+ ;;
+ esac
+ ;;
+esac
+
# VM, Image, and Document are non-optional
# Document has to be present even if empty for IMOPTIONS to work
$DEBUG $WRAPPER "$VM" $VMOPTIONS "$IMAGE" "$DOCUMENT" $IMOPTIONS