diff -Nru brltty-5.4/absdeps.mk brltty-5.5/absdeps.mk --- brltty-5.4/absdeps.mk 2016-06-28 11:21:49.000000000 +0000 +++ brltty-5.5/absdeps.mk 2017-04-18 22:38:33.000000000 +0000 @@ -686,6 +686,8 @@ $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(BLD_TOP)config.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/ktb.h +$(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/ktb_types.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/ascii.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/bitmask.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/async.h @@ -702,7 +704,6 @@ $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/driver.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/gio_types.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/io_generic.h -$(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/ktb_types.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/queue.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/serial_types.h $(BLD_TOP)Drivers/Braille/HumanWare/braille.$O: $(SRC_TOP)Headers/status_types.h @@ -1125,6 +1126,7 @@ $(BLD_TOP)Drivers/Braille/TTY/braille.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Drivers/Braille/TTY/braille.$O: $(SRC_TOP)Headers/charset.h $(BLD_TOP)Drivers/Braille/TTY/braille.$O: $(SRC_TOP)Headers/lock.h +$(BLD_TOP)Drivers/Braille/TTY/braille.$O: $(SRC_TOP)Headers/unicode.h $(BLD_TOP)Drivers/Braille/TTY/braille.$O: $(SRC_TOP)Headers/get_curses.h $(BLD_TOP)Drivers/Braille/TTY/braille.$O: $(SRC_TOP)Headers/api_types.h $(BLD_TOP)Drivers/Braille/TTY/braille.$O: $(SRC_TOP)Headers/async.h @@ -1375,6 +1377,7 @@ $(BLD_TOP)Drivers/Screen/Android/screen.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Drivers/Screen/Android/screen.$O: $(SRC_TOP)Headers/brl_cmds.h $(BLD_TOP)Drivers/Screen/Android/screen.$O: $(SRC_TOP)Headers/brl_dots.h +$(BLD_TOP)Drivers/Screen/Android/screen.$O: $(SRC_TOP)Headers/unicode.h $(BLD_TOP)Drivers/Screen/Android/screen.$O: $(SRC_TOP)Headers/driver.h $(BLD_TOP)Drivers/Screen/Android/screen.$O: $(SRC_TOP)Headers/ktb_types.h $(BLD_TOP)Drivers/Screen/Android/screen.$O: $(SRC_TOP)Headers/scr_base.h @@ -2120,6 +2123,8 @@ $(BLD_TOP)Programs/auth.$O: $(SRC_TOP)Headers/strfmth.h $(BLD_TOP)Programs/auth.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Programs/auth.$O: $(SRC_TOP)Headers/auth.h +$(BLD_TOP)Programs/auth.$O: $(SRC_TOP)Headers/async.h +$(BLD_TOP)Programs/auth.$O: $(SRC_TOP)Headers/async_wait.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Programs/beep.$O: @@ -2138,7 +2143,6 @@ $(BLD_TOP)Programs/beep_linux.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/beep_linux.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/beep_linux.$O: $(SRC_TOP)Headers/log.h -$(BLD_TOP)Programs/beep_linux.$O: $(SRC_TOP)Headers/device.h $(BLD_TOP)Programs/beep_linux.$O: $(SRC_TOP)Headers/beep.h $(BLD_TOP)Programs/beep_linux.$O: $(SRC_TOP)Headers/system_linux.h cd $(@D) && $(MAKE) $(@F) @@ -2164,6 +2168,7 @@ $(BLD_TOP)Programs/beep_solaris.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/beep_solaris.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/beep_solaris.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Programs/beep_solaris.$O: $(SRC_TOP)Headers/log.h $(BLD_TOP)Programs/beep_solaris.$O: $(SRC_TOP)Headers/beep.h cd $(@D) && $(MAKE) $(@F) @@ -3822,6 +3827,12 @@ $(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Headers/usb_types.h $(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Programs/gio_internal.h $(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Headers/io_bluetooth.h +$(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Headers/api_types.h +$(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Headers/brl_types.h +$(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Headers/driver.h +$(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Headers/ktb_types.h +$(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Headers/queue.h +$(BLD_TOP)Programs/gio_bluetooth.$O: $(SRC_TOP)Programs/brl.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Programs/gio_null.$O: @@ -4217,15 +4228,30 @@ $(BLD_TOP)Programs/log.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/log.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/get_pthreads.h +$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/log_history.h +$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/thread.h +$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/timing.h +$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/win_pthread.h $(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/strfmt.h $(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/strfmth.h -$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/timing.h -$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/addresses.h $(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/get_sockets.h -$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/get_pthreads.h -$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/thread.h -$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/win_pthread.h +$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/addresses.h +$(BLD_TOP)Programs/log.$O: $(SRC_TOP)Headers/stdiox.h + cd $(@D) && $(MAKE) $(@F) + +# Dependencies for Programs/log_history.$O: +$(BLD_TOP)Programs/log_history.$O: $(SRC_TOP)Programs/log_history.c +$(BLD_TOP)Programs/log_history.$O: $(SRC_TOP)Headers/prologue.h +$(BLD_TOP)Programs/log_history.$O: $(BLD_TOP)config.h +$(BLD_TOP)Programs/log_history.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Programs/log_history.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/log_history.$O: $(SRC_TOP)Headers/get_pthreads.h +$(BLD_TOP)Programs/log_history.$O: $(SRC_TOP)Headers/log_history.h +$(BLD_TOP)Programs/log_history.$O: $(SRC_TOP)Headers/thread.h +$(BLD_TOP)Programs/log_history.$O: $(SRC_TOP)Headers/timing.h +$(BLD_TOP)Programs/log_history.$O: $(SRC_TOP)Headers/win_pthread.h cd $(@D) && $(MAKE) $(@F) # Dependencies for Programs/menu.$O: @@ -4247,6 +4273,11 @@ $(BLD_TOP)Programs/menu_prefs.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/menu_prefs.$O: $(BLD_TOP)forbuild.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/get_pthreads.h +$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/log_history.h +$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/thread.h +$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/timing.h +$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/win_pthread.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/embed.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/pid.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/program.h @@ -4282,7 +4313,6 @@ $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/spk.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/spk_types.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/strfmth.h -$(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/timing.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Headers/usb_types.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Programs/brl.h $(BLD_TOP)Programs/menu_prefs.$O: $(SRC_TOP)Programs/core.h @@ -4294,6 +4324,12 @@ $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/prologue.h $(BLD_TOP)Programs/message.$O: $(BLD_TOP)config.h $(BLD_TOP)Programs/message.$O: $(BLD_TOP)forbuild.h +$(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/log.h +$(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/get_pthreads.h +$(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/log_history.h +$(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/thread.h +$(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/timing.h +$(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/win_pthread.h $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/message.h $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/api_types.h $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/async.h @@ -4330,7 +4366,6 @@ $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/program.h $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/scr_types.h $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/strfmth.h -$(BLD_TOP)Programs/message.$O: $(SRC_TOP)Headers/timing.h $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Programs/brl.h $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Programs/core.h $(BLD_TOP)Programs/message.$O: $(SRC_TOP)Programs/profile_types.h @@ -5901,6 +5936,7 @@ $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/strfmt.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/strfmth.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Programs/parameters.h +$(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/bitmask.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/parse.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/file.h $(BLD_TOP)Programs/usb.$O: $(SRC_TOP)Headers/get_sockets.h diff -Nru brltty-5.4/acdir/install-sh brltty-5.5/acdir/install-sh --- brltty-5.4/acdir/install-sh 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/acdir/install-sh 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/aclocal.m4 brltty-5.5/aclocal.m4 --- brltty-5.4/aclocal.m4 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/aclocal.m4 2017-04-18 22:35:14.000000000 +0000 @@ -1,7 +1,7 @@ AC_DEFUN([BRLTTY_UPPERCASE_TRANSLATE], [translit([$1], [a-z], [A-Z])]) AC_DEFUN([BRLTTY_TRANSLATE_ASSIGN], [$1=`echo "$2" | sed -e 'y%$3%$4%'`]) -AC_DEFUN([BRLTTY_UPPERCASE_ASSIGN], [BRLTTY_TRANSLATE_ASSIGN([$1], [$2], [abcdefghijklmnopqrstuvwxyz$3], [ABCDEFGHIJKLMNOPQRSTUVWXYZ$4])]) +AC_DEFUN([BRLTTY_UPPERCASE_ASSIGN], BRLTTY_TRANSLATE_ASSIGN([$1], [$2], [abcdefghijklmnopqrstuvwxyz$3], [ABCDEFGHIJKLMNOPQRSTUVWXYZ$4])) AC_DEFUN([BRLTTY_LOWERCASE_ASSIGN], [BRLTTY_TRANSLATE_ASSIGN([$1], [$2], [ABCDEFGHIJKLMNOPQRSTUVWXYZ$3], [abcdefghijklmnopqrstuvwxyz$4])]) AC_DEFUN([BRLTTY_INCLUDE_HEADERS], [dnl @@ -29,6 +29,10 @@ AC_DEFUN([BRLTTY_VAR_EXPAND], [dnl eval '$1="'"$2"'"']) +AC_DEFUN([BRLTTY_SUBST_EXPANDED], [dnl +BRLTTY_VAR_EXPAND([brltty_expanded], [$2]) +AC_SUBST([$1], ["${brltty_expanded}"])]) + AC_DEFUN([BRLTTY_DEFINE_STRING], [dnl AC_SUBST([$1], [$2]) AC_DEFINE([$1], ["$2"], [Define this to be a string containing $3.]) @@ -139,8 +143,7 @@ test -n "${packages}" && { for package in ${packages} do - BRLTTY_HAVE_PACKAGE([$1], ["${package}"]) - test -n "${$1_package}" && break + BRLTTY_HAVE_PACKAGE([$1], [${package}], [break], []) ifelse(len([$5]), 0, [], [dnl case "${package}" @@ -521,34 +524,56 @@ [where the $1 package is installed], [$2_root], ["yes"] ) + +$2_found=false +m4_define([$2_find], ifelse(m4_eval($# > 4), 1, [true], [false])) +ifelse($2_find, [true], [BRLTTY_HAVE_PACKAGE([$2], [$1], [$2_found=true], [])]) + if test "${$2_root}" = "no" then $2_root="" elif test "${$2_root}" = "yes" then - $2_root="" - roots="/usr /usr/local /usr/local/$1 /usr/local/$2 /opt/$1 /opt/$2 /mingw /mingw/$1 /mingw/$2" - for root in ${roots} - do - if test -f "${root}/$3" + "${$2_found}" || { + $2_root="" + roots="/usr /usr/local /usr/local/$1 /usr/local/$2 /opt/$1 /opt/$2 /mingw /mingw/$1 /mingw/$2" + + for root in ${roots} + do + test -f "${root}/$3" && { + $2_root="${root}" + AC_MSG_NOTICE([$1 root: ${$2_root}]) + break + } + done + + if test -z "${$2_root}" then - $2_root="${root}" - break + AC_MSG_WARN([$1 package not found: ${roots}]) fi - done - if test -z "${$2_root}" - then - AC_MSG_WARN([$1 package not found: ${roots}]) - fi + } fi + AC_SUBST([$2_root]) BRLTTY_SUMMARY_ITEM([$2-root], [$2_root]) -if test -n "${$2_root}" -then + +test -n "${$2_root}" && { AC_DEFINE_UNQUOTED(BRLTTY_UPPERCASE_TRANSLATE([$2_root]), ["${$2_root}"], [Define this to be a string containing the path to the root of the $1 package.]) + + ifelse($2_find, [true], [dnl + test "${$2_root}" = "yes" || { + $2_includes="BRLTTY_WORDS_PREPEND([$5], [-I${$2_root}/])" + $2_libs="BRLTTY_WORDS_PREPEND([$6], [-L${$2_root}/]) BRLTTY_WORDS_PREPEND([$7], [-l])" + } + ]) + $4 -fi]) +} +]) + +AC_DEFUN([BRLTTY_WORDS_PREPEND], [dnl +patsubst([$1], [\(\S+\)], [$2\1])]) AC_DEFUN([BRLTTY_HAVE_PACKAGE], [dnl $1_package="" @@ -558,14 +583,26 @@ for package_specification in $2 do ${PKG_CONFIG} --exists "${package_specification}" && { + AC_DEFINE(BRLTTY_UPPERCASE_TRANSLATE([HAVE_PKG_$1])) + $1_package="${package_specification%% *}" + AC_MSG_NOTICE([$1 package: ${$1_package}]) + $1_includes=`${PKG_CONFIG} --cflags-only-I "${$1_package}"` + AC_MSG_NOTICE([$1 includes: ${$1_includes}]) + $1_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${$1_package}"` + AC_MSG_NOTICE([$1 libs: ${$1_libs}]) + $3 break } done +test -n "${$1_package}" || { + ifelse([$#], 4, [:], AC_MSG_WARN([$1 support not available])) +} + AC_SUBST([$1_package]) AC_SUBST([$1_includes]) AC_SUBST([$1_libs]) diff -Nru brltty-5.4/Android/Application/AndroidManifest.xml brltty-5.5/Android/Application/AndroidManifest.xml --- brltty-5.4/Android/Application/AndroidManifest.xml 2016-06-28 11:05:46.000000000 +0000 +++ brltty-5.5/Android/Application/AndroidManifest.xml 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ @@ -12,6 +12,7 @@ + + + + + @@ -295,6 +299,10 @@ + + + + @@ -396,6 +404,7 @@ + diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ApplicationHooks.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ApplicationParameters.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ApplicationUtilities.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/BluetoothConnection.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -19,6 +19,7 @@ package org.a11y.brltty.android; import java.lang.reflect.*; +import java.util.Set; import java.io.IOException; import java.io.InputStream; @@ -256,4 +257,44 @@ return false; } + + private static BluetoothDevice[] pairedDevices = null; + + public static int getPairedDeviceCount () { + if (bluetoothAdapter != null) { + Set devices = bluetoothAdapter.getBondedDevices(); + + if (devices != null) { + pairedDevices = devices.toArray(new BluetoothDevice[devices.size()]); + return pairedDevices.length; + } + } + + pairedDevices = null; + return 0; + } + + private static BluetoothDevice getPairedDevice (int index) { + if (index >= 0) { + if (pairedDevices != null) { + if (index < pairedDevices.length) { + return pairedDevices[index]; + } + } + } + + return null; + } + + public static String getPairedDeviceAddress (int index) { + BluetoothDevice device = getPairedDevice(index); + if (device == null) return null; + return device.getAddress(); + } + + public static String getPairedDeviceName (int index) { + BluetoothDevice device = getPairedDevice(index); + if (device == null) return null; + return device.getName(); + } } diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/BrailleRenderer.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/BrailleService.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/BrailleService.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/BrailleService.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/BrailleService.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/CoreThread.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/CoreThread.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/CoreThread.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/CoreThread.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/GridBrailleRenderer.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/InputService.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/InputService.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/InputService.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/InputService.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/LanguageUtilities.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ListBrailleRenderer.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/LockUtilities.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/LockUtilities.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/LockUtilities.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/LockUtilities.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/PcmDevice.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/PcmDevice.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/PcmDevice.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/PcmDevice.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/RealScreenElement.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -62,11 +62,7 @@ @Override public boolean isEditable () { - if (ApplicationUtilities.haveSdkVersion(Build.VERSION_CODES.JELLY_BEAN_MR2)) { - return accessibilityNode.isEditable(); - } else { - return LanguageUtilities.canAssign(android.widget.EditText.class, accessibilityNode.getClassName().toString()); - } + return ScreenUtilities.isEditable(accessibilityNode); } @Override diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/RenderedScreen.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -220,7 +220,11 @@ { CharSequence actualText = root.getText(); - if (actualText != null) text = actualText.toString().trim(); + + if (actualText != null) { + text = actualText.toString(); + if (!ScreenUtilities.isEditable(root)) text = text.trim(); + } } if (text == null) { diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenDriver.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenElement.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenElement.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenElement.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenElement.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenElementList.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenLogger.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenNodeTester.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenTextEditor.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenUtilities.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -35,6 +35,14 @@ return ScreenDriver.getWindow().contains(location); } + public static boolean isEditable (AccessibilityNodeInfo node) { + if (ApplicationUtilities.haveSdkVersion(Build.VERSION_CODES.JELLY_BEAN_MR2)) { + return node.isEditable(); + } else { + return LanguageUtilities.canAssign(android.widget.EditText.class, node.getClassName().toString()); + } + } + public static AccessibilityNodeInfo getRefreshedNode (AccessibilityNodeInfo node) { if (node != null) { if (ApplicationUtilities.haveSdkVersion(Build.VERSION_CODES.JELLY_BEAN_MR2)) { diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/ScreenWindow.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/SettingsActivity.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/SingletonReference.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/SingletonReference.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/SingletonReference.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/SingletonReference.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/SpeechDriver.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/StringMaker.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/StringMaker.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/StringMaker.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/StringMaker.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/SystemServiceReference.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/UsbHelper.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/UsbHelper.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/UsbHelper.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/UsbHelper.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java brltty-5.5/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java --- brltty-5.4/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Application/src/org/a11y/brltty/android/VirtualScreenElement.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Core/Makefile brltty-5.5/Android/Core/Makefile --- brltty-5.4/Android/Core/Makefile 2016-06-28 11:22:14.000000000 +0000 +++ brltty-5.5/Android/Core/Makefile 2017-04-18 22:38:53.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java brltty-5.5/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java --- brltty-5.4/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Core/src/org/a11y/brltty/core/ArgumentsBuilder.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java brltty-5.5/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java --- brltty-5.4/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Core/src/org/a11y/brltty/core/CoreWrapper.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -48,6 +48,8 @@ public static native boolean restartSpeechDriver (); public static native boolean changeSpeechDriver (String driver); + public static native boolean setEnvironmentVariable (String name, String value); + public static boolean changeLogCategories (Set categories) { StringBuffer sb = new StringBuffer(); @@ -110,8 +112,35 @@ System.exit(run(arguments, Integer.MAX_VALUE)); } + private static void setOverrideDirectories () { + String[] names = new String[] { + "EXTERNAL_STORAGE", + "SECONDARY_STORAGE" + }; + + StringBuilder sb = new StringBuilder(); + boolean first = true; + + for (String name : names) { + String value = System.getenv(name); + + if ((value != null) && (!value.isEmpty())) { + if (first) { + first = false; + } else { + sb.append(':'); + } + + sb.append(value); + } + } + + setEnvironmentVariable("XDG_CONFIG_DIRS", sb.toString()); + } + static { System.loadLibrary("brltty_core"); System.loadLibrary("brltty_jni"); + setOverrideDirectories(); } } diff -Nru brltty-5.4/Android/Core/src/org/a11y/brltty/core/LogLevel.java brltty-5.5/Android/Core/src/org/a11y/brltty/core/LogLevel.java --- brltty-5.4/Android/Core/src/org/a11y/brltty/core/LogLevel.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Core/src/org/a11y/brltty/core/LogLevel.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java brltty-5.5/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java --- brltty-5.4/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Android/Core/src/org/a11y/brltty/core/ProgramExitStatus.java 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Authorization/Polkit/org.a11y.brlapi.policy brltty-5.5/Authorization/Polkit/org.a11y.brlapi.policy --- brltty-5.4/Authorization/Polkit/org.a11y.brlapi.policy 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Authorization/Polkit/org.a11y.brlapi.policy 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,22 @@ + + + + + + The BRLTTY Developers + http://brltty.com/ + + + Write to the braille display + Privileges are required to access the braille display + + + no + no + yes + + + diff -Nru brltty-5.4/Authorization/Polkit/org.brltty.policy brltty-5.5/Authorization/Polkit/org.brltty.policy --- brltty-5.4/Authorization/Polkit/org.brltty.policy 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Authorization/Polkit/org.brltty.policy 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ - - - - - - The BRLTTY Developers - http://www.brltty.com/ - - - Write to the braille display - Privileges are required to access the braille display - - - no - no - yes - - - diff -Nru brltty-5.4/autogen brltty-5.5/autogen --- brltty-5.4/autogen 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/autogen 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Autostart/AppStream/org.a11y.brltty.metainfo.xml brltty-5.5/Autostart/AppStream/org.a11y.brltty.metainfo.xml --- brltty-5.4/Autostart/AppStream/org.a11y.brltty.metainfo.xml 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Autostart/AppStream/org.a11y.brltty.metainfo.xml 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,456 @@ + + + + + + + + org.a11y.brltty + BRLTTY + Support for braille devices + + + A background process providing access to the console screen (when in + text mode) for a blind person using a refreshable braille display. + + + The BRLTTY Developers + http://brltty.com/ + + FSFAP + GPL-2.0 + + + + + + + + + + + + + + usb:v0403p6001* + + + + usb:v0403pDE58* + + + + usb:v0403pDE59* + + + + usb:v0403pF208* + + + + usb:v0403pFE70* + + + + usb:v0403pFE71* + + + + usb:v0403pFE72* + + + + usb:v0403pFE73* + + + + usb:v0403pFE74* + + + + usb:v0403pFE75* + + + + usb:v0403pFE76* + + + + usb:v0403pFE77* + + + + usb:v0452p0100* + + + + + + usb:v045Ep930A* + + + + usb:v045Ep930B* + + + + usb:v06B0p0001* + + + + usb:v0798p0001* + + + + usb:v0798p0600* + + + + usb:v0798p0624* + + + + usb:v0798p0640* + + + + usb:v0798p0680* + + + + usb:v0904p2000* + + + + usb:v0904p2001* + + + + usb:v0904p2002* + + + + usb:v0904p2007* + + + + usb:v0904p2008* + + + + usb:v0904p2009* + + + + usb:v0904p2010* + + + + usb:v0904p2011* + + + + usb:v0904p2014* + + + + usb:v0904p2015* + + + + usb:v0904p2016* + + + + usb:v0904p3000* + + + + usb:v0904p3001* + + + + usb:v0904p4004* + + + + usb:v0904p4005* + + + + usb:v0904p4007* + + + + usb:v0904p4008* + + + + usb:v0904p6001* + + + + usb:v0904p6002* + + + + usb:v0904p6003* + + + + usb:v0904p6004* + + + + usb:v0904p6005* + + + + usb:v0904p6006* + + + + usb:v0904p6007* + + + + usb:v0904p6008* + + + + usb:v0904p6009* + + + + usb:v0904p600A* + + + + usb:v0904p6011* + + + + usb:v0904p6012* + + + + usb:v0904p6013* + + + + usb:v0904p6101* + + + + usb:v0904p6102* + + + + usb:v0904p6103* + + + + usb:v0921p1200* + + + + usb:v0F4Ep0100* + + + + usb:v0F4Ep0111* + + + + usb:v0F4Ep0112* + + + + usb:v0F4Ep0114* + + + + + + + + usb:v10C4pEA60* + + + + + + + usb:v10C4pEA80* + + + + usb:v1148p0301* + + + + usb:v1C71pC004* + + + + usb:v1C71pC005* + + + + usb:v1C71pC006* + + + + usb:v1C71pC00A* + + + + usb:v1FE4p0003* + + + + usb:v1FE4p0044* + + + + usb:v1FE4p0054* + + + + usb:v1FE4p0055* + + + + usb:v1FE4p0061* + + + + usb:v1FE4p0064* + + + + usb:v1FE4p0074* + + + + usb:v1FE4p0081* + + + + usb:v1FE4p0082* + + + + usb:v1FE4p0083* + + + + usb:v1FE4p0084* + + + + usb:v1FE4p0086* + + + + usb:v1FE4p0087* + + + + usb:v1FE4p008A* + + + + usb:v1FE4p008B* + + + + usb:v4242p0001* + + + + usb:vC251p1122* + + + + usb:vC251p1123* + + + + usb:vC251p1124* + + + + usb:vC251p1125* + + + + usb:vC251p1126* + + + + usb:vC251p1127* + + + + usb:vC251p1128* + + + + usb:vC251p1129* + + + + usb:vC251p112A* + + + + usb:vC251p112B* + + + + usb:vC251p112C* + + + + usb:vC251p112D* + + + + usb:vC251p112E* + + + + usb:vC251p112F* + + + + + usb:vC251p1130* + + + + usb:vC251p1131* + + + + usb:vC251p1132* + + + + diff -Nru brltty-5.4/Autostart/Hotplug/brltty brltty-5.5/Autostart/Hotplug/brltty --- brltty-5.4/Autostart/Hotplug/brltty 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Autostart/Hotplug/brltty 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Autostart/Hotplug/brltty.usermap brltty-5.5/Autostart/Hotplug/brltty.usermap --- brltty-5.4/Autostart/Hotplug/brltty.usermap 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Autostart/Hotplug/brltty.usermap 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -294,6 +294,10 @@ # HumanWare [all models (HID protocol)] brltty 0x0003 0x1c71 0xc006 +# Device: 1C71:C00A +# HumanWare [BrailleNote Touch (HID protocol)] +brltty 0x0003 0x1c71 0xc00a + # Device: 1FE4:0003 # HandyTech [USB-HID adapter] brltty 0x0003 0x1fe4 0x0003 @@ -310,6 +314,10 @@ # HandyTech [Connect Braille 40] brltty 0x0003 0x1fe4 0x0055 +# Device: 1FE4:0061 +# HandyTech [Actilino] +brltty 0x0003 0x1fe4 0x0061 + # Device: 1FE4:0064 # HandyTech [Active Star 40] brltty 0x0003 0x1fe4 0x0064 @@ -411,6 +419,7 @@ brltty 0x0003 0xc251 0x112f # Device: C251:1130 +# EuroBraille [Esytime (firmware 1.03, 2014-03-31)] # EuroBraille [Esytime] brltty 0x0003 0xc251 0x1130 diff -Nru brltty-5.4/Autostart/Systemd/brltty.service brltty-5.5/Autostart/Systemd/brltty.service --- brltty-5.4/Autostart/Systemd/brltty.service 2016-06-28 11:02:04.000000000 +0000 +++ brltty-5.5/Autostart/Systemd/brltty.service 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -[Unit] - -Description=Default BRLTTY Instance -Documentation=man:brltty(1) -Documentation=http://brltty.com/ - -DefaultDependencies=no -Before=sysinit.target -Requires=brltty@-etc-brltty.conf.service - - -[Service] - -Type=oneshot -RemainAfterExit=true -ExecStart=/bin/true - - -[Install] -WantedBy=sysinit.target - - diff -Nru brltty-5.4/Autostart/Systemd/brltty@.service.in brltty-5.5/Autostart/Systemd/brltty@.service.in --- brltty-5.4/Autostart/Systemd/brltty@.service.in 2016-06-28 11:02:04.000000000 +0000 +++ brltty-5.5/Autostart/Systemd/brltty@.service.in 2017-04-18 22:35:13.000000000 +0000 @@ -1,13 +1,41 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU General Public License, as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. Please see the file LICENSE-GPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + [Unit] Description=BRLTTY Instance: %I Documentation=man:brltty(1) Documentation=@PACKAGE_URL@ +ConditionPathExists=%I +RequiresMountsFor=@UPDATABLE_DIRECTORY@ +RequiresMountsFor=@api_socket_directory@ DefaultDependencies=no -StopWhenUnneeded=true -RequiresMountsFor=@UPDATABLE_DIRECTORY@ +After=local-fs.target +Before=sysinit.target + +Wants=systemd-udev-settle.service +After=systemd-udev-settle.service + +StopWhenUnneeded=true +RefuseManualStart=true +RefuseManualStop=true [Service] @@ -19,18 +47,15 @@ Environment="BRLTTY_EXECUTABLE_ARGUMENTS=@SYSTEMD_SERVICE_ARGUMENTS@" PIDFile=%t/brltty-%i.pid -Environment=BRLTTY_PID_FILE=%t/brltty-%i.pid +Environment="BRLTTY_PID_FILE=%t/brltty-%i.pid" TimeoutStartSec=5 TimeoutStopSec=10 -Restart=always +Restart=on-failure RestartSec=30 Nice=-10 OOMScoreAdjust=-900 -ProtectHome=read-only -ProtectSystem=full - diff -Nru brltty-5.4/Autostart/Systemd/brltty-systemd-wrapper brltty-5.5/Autostart/Systemd/brltty-systemd-wrapper --- brltty-5.4/Autostart/Systemd/brltty-systemd-wrapper 2016-06-28 09:03:03.000000000 +0000 +++ brltty-5.5/Autostart/Systemd/brltty-systemd-wrapper 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Autostart/Systemd/brltty.target brltty-5.5/Autostart/Systemd/brltty.target --- brltty-5.4/Autostart/Systemd/brltty.target 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Autostart/Systemd/brltty.target 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,25 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU General Public License, as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. Please see the file LICENSE-GPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +[Unit] +Description=Default BRLTTY Instance +Requires=brltty@-etc-brltty.conf.service + +[Install] +WantedBy=sysinit.target + diff -Nru brltty-5.4/Autostart/Systemd/brltty@.target brltty-5.5/Autostart/Systemd/brltty@.target --- brltty-5.4/Autostart/Systemd/brltty@.target 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Autostart/Systemd/brltty@.target 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,25 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU General Public License, as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. Please see the file LICENSE-GPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +[Unit] +Description=BRLTTY (using configuration file /etc/brltty_%I.conf) +Requires=brltty@-etc-brltty_%i.conf.service + +[Install] +WantedBy=sysinit.target + diff -Nru brltty-5.4/Autostart/Systemd/Makefile.in brltty-5.5/Autostart/Systemd/Makefile.in --- brltty-5.4/Autostart/Systemd/Makefile.in 2016-06-28 09:43:38.000000000 +0000 +++ brltty-5.5/Autostart/Systemd/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,26 +16,27 @@ # This software is maintained by Dave Mielke . ############################################################################### -SYSTEMD_UNIT_DIRECTORY = $(INSTALL_ROOT)/usr/lib/systemd/system -SYSTEMD_SCRIPT_DIRECTORY = $(INSTALL_ROOT)$(sbindir) +SYSTEMD_UNITS_DIRECTORY = $(INSTALL_ROOT)$(libdir)/systemd/system +SYSTEMD_SCRIPTS_DIRECTORY = $(INSTALL_ROOT)$(sbindir) install: install-units install-scripts -install-unit-directory: - $(INSTALL_DIRECTORY) $(SYSTEMD_UNIT_DIRECTORY) +install-units-directory: + $(INSTALL_DIRECTORY) $(SYSTEMD_UNITS_DIRECTORY) -install-units: install-unit-directory - $(INSTALL_DATA) $(SRC_DIR)/brltty.service $(SYSTEMD_UNIT_DIRECTORY) - $(INSTALL_DATA) $(BLD_DIR)/brltty@.service $(SYSTEMD_UNIT_DIRECTORY) +install-units: install-units-directory + for extension in service target; do \ + $(INSTALL_DATA) $(SRC_DIR)/*.$$extension $(SYSTEMD_UNITS_DIRECTORY); \ + done -install-script-directory: - $(INSTALL_DIRECTORY) $(SYSTEMD_SCRIPT_DIRECTORY) +install-scripts-directory: + $(INSTALL_DIRECTORY) $(SYSTEMD_SCRIPTS_DIRECTORY) -install-scripts: install-script-directory - $(INSTALL_SCRIPT) $(SRC_DIR)/brltty-systemd-wrapper $(SYSTEMD_SCRIPT_DIRECTORY) +install-scripts: install-scripts-directory + $(INSTALL_SCRIPT) $(SRC_DIR)/$(PACKAGE_TARNAME)-systemd-wrapper $(SYSTEMD_SCRIPTS_DIRECTORY) uninstall: - -rm -f $(SYSTEMD_UNIT_DIRECTORY)/brltty.* - -rm -f $(SYSTEMD_UNIT_DIRECTORY)/brltty@.* - -rm -f $(SYSTEMD_SCRIPT_DIRECTORY)/brltty-systemd-* + -rm -f $(SYSTEMD_UNITS_DIRECTORY)/$(PACKAGE_TARNAME).* + -rm -f $(SYSTEMD_UNITS_DIRECTORY)/$(PACKAGE_TARNAME)@.* + -rm -f $(SYSTEMD_SCRIPTS_DIRECTORY)/$(PACKAGE_TARNAME)-systemd-* diff -Nru brltty-5.4/Autostart/Udev/brltty-wrapper brltty-5.5/Autostart/Udev/brltty-wrapper --- brltty-5.4/Autostart/Udev/brltty-wrapper 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Autostart/Udev/brltty-wrapper 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,32 @@ +#!/bin/sh +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU General Public License, as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. Please see the file LICENSE-GPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# This script must be installed in the udev programs directory: /usr/lib/udev/ + +set -e +readonly rootDirectory="/sys/fs/cgroup/systemd" + +[ ! -d "${rootDirectory}" ] || { + groupDirectory="${rootDirectory}/brltty" + [ -d "${groupDirectory}" ] || mkdir "${groupDirectory}" + echo $$ >"${groupDirectory}/tasks" +} + +exec "${BRLTTY_EXECUTABLE_PATH:-brltty}" -E "${@}" +exit "${?}" diff -Nru brltty-5.4/Autostart/Udev/Makefile.in brltty-5.5/Autostart/Udev/Makefile.in --- brltty-5.4/Autostart/Udev/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Autostart/Udev/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,49 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU General Public License, as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. Please see the file LICENSE-GPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +UDEV_RULES_SEQUENCE = 90 +#UDEV_RULES_TYPE = all +UDEV_RULES_TYPE = no-generic + +UDEV_LIBRARY_DIRECTORY = $(INSTALL_ROOT)$(libdir)/udev +UDEV_RULES_DIRECTORY = $(UDEV_LIBRARY_DIRECTORY)/rules.d + +UDEV_RULES_EXTENSION = rules +UDEV_RULES_FILE = $(UDEV_RULES_SEQUENCE)-$(PACKAGE_TARNAME).$(UDEV_RULES_EXTENSION) + +install-library-directory: + $(INSTALL_DIRECTORY) $(UDEV_LIBRARY_DIRECTORY) + +install-programs: install-library-directory + $(INSTALL_SCRIPT) $(SRC_DIR)/$(PACKAGE_TARNAME)-wrapper $(UDEV_LIBRARY_DIRECTORY) + +install-rules-directory: + $(INSTALL_DIRECTORY) $(UDEV_RULES_DIRECTORY) + +install-rules-all: install-programs install-rules-directory + $(INSTALL_DATA) $(SRC_DIR)/rules $(UDEV_RULES_DIRECTORY)/$(UDEV_RULES_FILE) + +install-rules-no-generic: install-rules-all + $(SRC_TOP)updusbdevs -quiet -quiet -nogeneric udev:$(UDEV_RULES_DIRECTORY)/$(UDEV_RULES_FILE) + +install: install-rules-$(UDEV_RULES_TYPE) + +uninstall: + -rm -f $(UDEV_RULES_DIRECTORY)/?*-$(PACKAGE_TARNAME).$(UDEV_RULES_EXTENSION) + -rm -f $(UDEV_LIBRARY_DIRECTORY)/$(PACKAGE_TARNAME)-* + diff -Nru brltty-5.4/Autostart/Udev/rules brltty-5.5/Autostart/Udev/rules --- brltty-5.4/Autostart/Udev/rules 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Autostart/Udev/rules 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,467 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU General Public License, as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any +# later version. Please see the file LICENSE-GPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# udev rules file for BRLTTY + +SUBSYSTEM=="usb_device", GOTO="brltty_usb_begin" +SUBSYSTEM=="usb", KERNEL!="*:*", GOTO="brltty_usb_begin" +GOTO="brltty_end" + +LABEL="brltty_usb_begin" +# BEGIN_USB_DEVICES + +# Device: 0403:6001 +# Generic Identifier +# Vendor: Future Technology Devices International, Ltd +# Product: FT232 USB-Serial (UART) IC +# Albatross [all models] +# Cebra [all models] +# HIMS [Sync Braille] +# HandyTech [FTDI chip] +# MDV [all models] +ENV{PRODUCT}=="403/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="at,ce,hm,ht,md", GOTO="brltty_usb_run" + +# Device: 0403:DE58 +# Hedo [MobilLine] +ENV{PRODUCT}=="403/de58/*", ENV{BRLTTY_BRAILLE_DRIVER}="hd", GOTO="brltty_usb_run" + +# Device: 0403:DE59 +# Hedo [ProfiLine] +ENV{PRODUCT}=="403/de59/*", ENV{BRLTTY_BRAILLE_DRIVER}="hd", GOTO="brltty_usb_run" + +# Device: 0403:F208 +# Papenmeier [all models] +ENV{PRODUCT}=="403/f208/*", ENV{BRLTTY_BRAILLE_DRIVER}="pm", GOTO="brltty_usb_run" + +# Device: 0403:FE70 +# Baum [Vario 40 (40 cells)] +ENV{PRODUCT}=="403/fe70/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0403:FE71 +# Baum [PocketVario (24 cells)] +ENV{PRODUCT}=="403/fe71/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0403:FE72 +# Baum [SuperVario 40 (40 cells)] +ENV{PRODUCT}=="403/fe72/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0403:FE73 +# Baum [SuperVario 32 (32 cells)] +ENV{PRODUCT}=="403/fe73/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0403:FE74 +# Baum [SuperVario 64 (64 cells)] +ENV{PRODUCT}=="403/fe74/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0403:FE75 +# Baum [SuperVario 80 (80 cells)] +ENV{PRODUCT}=="403/fe75/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0403:FE76 +# Baum [VarioPro 80 (80 cells)] +ENV{PRODUCT}=="403/fe76/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0403:FE77 +# Baum [VarioPro 64 (64 cells)] +ENV{PRODUCT}=="403/fe77/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0452:0100 +# Metec [all models] +ENV{PRODUCT}=="452/100/*", ENV{BRLTTY_BRAILLE_DRIVER}="mt", GOTO="brltty_usb_run" + +# Device: 045E:930A +# HIMS [Braille Sense (USB 1.1)] +# HIMS [Braille Sense (USB 2.0)] +# HIMS [Braille Sense U2 (USB 2.0)] +ENV{PRODUCT}=="45e/930a/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run" + +# Device: 045E:930B +# HIMS [Braille Edge] +ENV{PRODUCT}=="45e/930b/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run" + +# Device: 06B0:0001 +# Alva [Satellite (5nn)] +ENV{PRODUCT}=="6b0/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" + +# Device: 0798:0001 +# Voyager [all models] +ENV{PRODUCT}=="798/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="vo", GOTO="brltty_usb_run" + +# Device: 0798:0600 +# Alva [Voyager Protocol Converter] +ENV{PRODUCT}=="798/600/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" + +# Device: 0798:0624 +# Alva [BC624] +ENV{PRODUCT}=="798/624/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" + +# Device: 0798:0640 +# Alva [BC640] +ENV{PRODUCT}=="798/640/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" + +# Device: 0798:0680 +# Alva [BC680] +ENV{PRODUCT}=="798/680/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" + +# Device: 0904:2000 +# Baum [VarioPro 40 (40 cells)] +ENV{PRODUCT}=="904/2000/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2001 +# Baum [EcoVario 24 (24 cells)] +ENV{PRODUCT}=="904/2001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2002 +# Baum [EcoVario 40 (40 cells)] +ENV{PRODUCT}=="904/2002/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2007 +# Baum [VarioConnect 40 (40 cells)] +ENV{PRODUCT}=="904/2007/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2008 +# Baum [VarioConnect 32 (32 cells)] +ENV{PRODUCT}=="904/2008/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2009 +# Baum [VarioConnect 24 (24 cells)] +ENV{PRODUCT}=="904/2009/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2010 +# Baum [VarioConnect 64 (64 cells)] +ENV{PRODUCT}=="904/2010/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2011 +# Baum [VarioConnect 80 (80 cells)] +ENV{PRODUCT}=="904/2011/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2014 +# Baum [EcoVario 32 (32 cells)] +ENV{PRODUCT}=="904/2014/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2015 +# Baum [EcoVario 64 (64 cells)] +ENV{PRODUCT}=="904/2015/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:2016 +# Baum [EcoVario 80 (80 cells)] +ENV{PRODUCT}=="904/2016/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:3000 +# Baum [Refreshabraille 18 (18 cells)] +ENV{PRODUCT}=="904/3000/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:3001 +# Baum [Refreshabraille 18 (18 cells)] +ENV{PRODUCT}=="904/3001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:4004 +# Baum [Pronto! V3 18 (18 cells)] +ENV{PRODUCT}=="904/4004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:4005 +# Baum [Pronto! V3 40 (40 cells)] +ENV{PRODUCT}=="904/4005/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:4007 +# Baum [Pronto! V4 18 (18 cells)] +ENV{PRODUCT}=="904/4007/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:4008 +# Baum [Pronto! V4 40 (40 cells)] +ENV{PRODUCT}=="904/4008/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6001 +# Baum [SuperVario2 40 (40 cells)] +ENV{PRODUCT}=="904/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6002 +# Baum [PocketVario2 (24 cells)] +ENV{PRODUCT}=="904/6002/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6003 +# Baum [SuperVario2 32 (32 cells)] +ENV{PRODUCT}=="904/6003/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6004 +# Baum [SuperVario2 64 (64 cells)] +ENV{PRODUCT}=="904/6004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6005 +# Baum [SuperVario2 80 (80 cells)] +ENV{PRODUCT}=="904/6005/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6006 +# Baum [Brailliant2 40 (40 cells)] +ENV{PRODUCT}=="904/6006/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6007 +# Baum [Brailliant2 24 (24 cells)] +ENV{PRODUCT}=="904/6007/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6008 +# Baum [Brailliant2 32 (32 cells)] +ENV{PRODUCT}=="904/6008/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6009 +# Baum [Brailliant2 64 (64 cells)] +ENV{PRODUCT}=="904/6009/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:600A +# Baum [Brailliant2 80 (80 cells)] +ENV{PRODUCT}=="904/600a/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6011 +# Baum [VarioConnect 24 (24 cells)] +ENV{PRODUCT}=="904/6011/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6012 +# Baum [VarioConnect 32 (32 cells)] +ENV{PRODUCT}=="904/6012/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6013 +# Baum [VarioConnect 40 (40 cells)] +ENV{PRODUCT}=="904/6013/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6101 +# Baum [VarioUltra 20 (20 cells)] +ENV{PRODUCT}=="904/6101/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6102 +# Baum [VarioUltra 40 (40 cells)] +ENV{PRODUCT}=="904/6102/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0904:6103 +# Baum [VarioUltra 32 (32 cells)] +ENV{PRODUCT}=="904/6103/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" + +# Device: 0921:1200 +# HandyTech [GoHubs chip] +ENV{PRODUCT}=="921/1200/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 0F4E:0100 +# FreedomScientific [Focus 1] +ENV{PRODUCT}=="f4e/100/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" + +# Device: 0F4E:0111 +# FreedomScientific [PAC Mate] +ENV{PRODUCT}=="f4e/111/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" + +# Device: 0F4E:0112 +# FreedomScientific [Focus 2] +ENV{PRODUCT}=="f4e/112/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" + +# Device: 0F4E:0114 +# FreedomScientific [Focus Blue] +ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" + +# Device: 10C4:EA60 +# Generic Identifier +# Vendor: Cygnal Integrated Products, Inc. +# Product: CP210x UART Bridge / myAVR mySmartUSB light +# BrailleMemo [Pocket] +# Seika [Braille Display] +ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run" + +# Device: 10C4:EA80 +# Generic Identifier +# Vendor: Cygnal Integrated Products, Inc. +# Product: CP210x UART Bridge +# Seika [Note Taker] +ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run" + +# Device: 1148:0301 +# BrailleMemo [Smart] +ENV{PRODUCT}=="1148/301/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm", GOTO="brltty_usb_run" + +# Device: 1C71:C004 +# BrailleNote [HumanWare APEX] +ENV{PRODUCT}=="1c71/c004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bn", GOTO="brltty_usb_run" + +# Device: 1C71:C005 +# HumanWare [all models (serial protocol)] +ENV{PRODUCT}=="1c71/c005/*", ENV{BRLTTY_BRAILLE_DRIVER}="hw", GOTO="brltty_usb_run" + +# Device: 1C71:C006 +# HumanWare [all models (HID protocol)] +ENV{PRODUCT}=="1c71/c006/*", ENV{BRLTTY_BRAILLE_DRIVER}="hw", GOTO="brltty_usb_run" + +# Device: 1C71:C00A +# HumanWare [BrailleNote Touch (HID protocol)] +ENV{PRODUCT}=="1c71/c00a/*", ENV{BRLTTY_BRAILLE_DRIVER}="hw", GOTO="brltty_usb_run" + +# Device: 1FE4:0003 +# HandyTech [USB-HID adapter] +ENV{PRODUCT}=="1fe4/3/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0044 +# HandyTech [Easy Braille (HID)] +ENV{PRODUCT}=="1fe4/44/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0054 +# HandyTech [Active Braille] +ENV{PRODUCT}=="1fe4/54/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0055 +# HandyTech [Connect Braille 40] +ENV{PRODUCT}=="1fe4/55/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0061 +# HandyTech [Actilino] +ENV{PRODUCT}=="1fe4/61/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0064 +# HandyTech [Active Star 40] +ENV{PRODUCT}=="1fe4/64/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0074 +# HandyTech [Braille Star 40 (HID)] +ENV{PRODUCT}=="1fe4/74/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0081 +# HandyTech [Basic Braille 16] +ENV{PRODUCT}=="1fe4/81/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0082 +# HandyTech [Basic Braille 20] +ENV{PRODUCT}=="1fe4/82/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0083 +# HandyTech [Basic Braille 32] +ENV{PRODUCT}=="1fe4/83/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0084 +# HandyTech [Basic Braille 40] +ENV{PRODUCT}=="1fe4/84/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0086 +# HandyTech [Basic Braille 64] +ENV{PRODUCT}=="1fe4/86/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:0087 +# HandyTech [Basic Braille 80] +ENV{PRODUCT}=="1fe4/87/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:008A +# HandyTech [Basic Braille 48] +ENV{PRODUCT}=="1fe4/8a/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 1FE4:008B +# HandyTech [Basic Braille 160] +ENV{PRODUCT}=="1fe4/8b/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" + +# Device: 4242:0001 +# Pegasus [all models] +ENV{PRODUCT}=="4242/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="pg", GOTO="brltty_usb_run" + +# Device: C251:1122 +# EuroBraille [Esys (version < 3.0, no SD card)] +ENV{PRODUCT}=="c251/1122/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1123 +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/1123/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1124 +# EuroBraille [Esys (version < 3.0, with SD card)] +ENV{PRODUCT}=="c251/1124/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1125 +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/1125/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1126 +# EuroBraille [Esys (version >= 3.0, no SD card)] +ENV{PRODUCT}=="c251/1126/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1127 +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/1127/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1128 +# EuroBraille [Esys (version >= 3.0, with SD card)] +ENV{PRODUCT}=="c251/1128/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1129 +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/1129/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:112A +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/112a/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:112B +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/112b/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:112C +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/112c/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:112D +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/112d/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:112E +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/112e/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:112F +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/112f/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1130 +# EuroBraille [Esytime (firmware 1.03, 2014-03-31)] +# EuroBraille [Esytime] +ENV{PRODUCT}=="c251/1130/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1131 +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/1131/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# Device: C251:1132 +# EuroBraille [reserved] +ENV{PRODUCT}=="c251/1132/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" + +# END_USB_DEVICES +GOTO="brltty_end" + +LABEL="brltty_usb_run" +ENV{BRLTTY_BRAILLE_DEVICE}="usb:vendor=0X$sysfs{idVendor}+product=0X$sysfs{idProduct}+serial=$sysfs{serial}" +GOTO="brltty_run" + +LABEL="brltty_run" +TEST=="/sys/fs/cgroup/systemd", GOTO="brltty_systemd" +ENV{BRLTTY_PID_FILE}="/run/brltty.$kernel.pid" + +ACTION=="add", GOTO="brltty_add" +ACTION=="remove", GOTO="brltty_remove" +GOTO="brltty_end" + +LABEL="brltty_add" +RUN+="brltty-wrapper" +GOTO="brltty_end" + +LABEL="brltty_remove" +RUN+="brltty-wrapper -C" +GOTO="brltty_end" + +LABEL="brltty_systemd" +ACTION!="add", GOTO="brltty_end" +TAG+="systemd", ENV{SYSTEMD_WANTS}+="brltty@$env{DEVNAME}.service" +LABEL="brltty_end" diff -Nru brltty-5.4/Autostart/Udev/udev.rules brltty-5.5/Autostart/Udev/udev.rules --- brltty-5.4/Autostart/Udev/udev.rules 2016-06-28 09:01:22.000000000 +0000 +++ brltty-5.5/Autostart/Udev/udev.rules 1970-01-01 00:00:00.000000000 +0000 @@ -1,462 +0,0 @@ -############################################################################### -# BRLTTY - A background process providing access to the console screen (when in -# text mode) for a blind person using a refreshable braille display. -# -# Copyright (C) 1995-2016 by The BRLTTY Developers. -# -# BRLTTY comes with ABSOLUTELY NO WARRANTY. -# -# This is free software, placed under the terms of the -# GNU General Public License, as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any -# later version. Please see the file LICENSE-GPL for details. -# -# Web Page: http://brltty.com/ -# -# This software is maintained by Dave Mielke . -############################################################################### - -# udev rules file for brltty - -SUBSYSTEM=="usb_device", GOTO="brltty_usb_begin" -SUBSYSTEM=="usb", KERNEL!="*:*", GOTO="brltty_usb_begin" -GOTO="brltty_end" - -LABEL="brltty_usb_begin" - -# BEGIN_USB_DEVICES - -# Device: 0403:6001 -# Generic Identifier -# Vendor: Future Technology Devices International, Ltd -# Product: FT232 USB-Serial (UART) IC -# Albatross [all models] -# Cebra [all models] -# HIMS [Sync Braille] -# HandyTech [FTDI chip] -# MDV [all models] -ENV{PRODUCT}=="403/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="at,ce,hm,ht,md", GOTO="brltty_usb_run" - -# Device: 0403:DE58 -# Hedo [MobilLine] -ENV{PRODUCT}=="403/de58/*", ENV{BRLTTY_BRAILLE_DRIVER}="hd", GOTO="brltty_usb_run" - -# Device: 0403:DE59 -# Hedo [ProfiLine] -ENV{PRODUCT}=="403/de59/*", ENV{BRLTTY_BRAILLE_DRIVER}="hd", GOTO="brltty_usb_run" - -# Device: 0403:F208 -# Papenmeier [all models] -ENV{PRODUCT}=="403/f208/*", ENV{BRLTTY_BRAILLE_DRIVER}="pm", GOTO="brltty_usb_run" - -# Device: 0403:FE70 -# Baum [Vario 40 (40 cells)] -ENV{PRODUCT}=="403/fe70/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0403:FE71 -# Baum [PocketVario (24 cells)] -ENV{PRODUCT}=="403/fe71/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0403:FE72 -# Baum [SuperVario 40 (40 cells)] -ENV{PRODUCT}=="403/fe72/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0403:FE73 -# Baum [SuperVario 32 (32 cells)] -ENV{PRODUCT}=="403/fe73/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0403:FE74 -# Baum [SuperVario 64 (64 cells)] -ENV{PRODUCT}=="403/fe74/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0403:FE75 -# Baum [SuperVario 80 (80 cells)] -ENV{PRODUCT}=="403/fe75/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0403:FE76 -# Baum [VarioPro 80 (80 cells)] -ENV{PRODUCT}=="403/fe76/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0403:FE77 -# Baum [VarioPro 64 (64 cells)] -ENV{PRODUCT}=="403/fe77/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0452:0100 -# Metec [all models] -ENV{PRODUCT}=="452/100/*", ENV{BRLTTY_BRAILLE_DRIVER}="mt", GOTO="brltty_usb_run" - -# Device: 045E:930A -# HIMS [Braille Sense (USB 1.1)] -# HIMS [Braille Sense (USB 2.0)] -# HIMS [Braille Sense U2 (USB 2.0)] -ENV{PRODUCT}=="45e/930a/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run" - -# Device: 045E:930B -# HIMS [Braille Edge] -ENV{PRODUCT}=="45e/930b/*", ENV{BRLTTY_BRAILLE_DRIVER}="hm", GOTO="brltty_usb_run" - -# Device: 06B0:0001 -# Alva [Satellite (5nn)] -ENV{PRODUCT}=="6b0/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" - -# Device: 0798:0001 -# Voyager [all models] -ENV{PRODUCT}=="798/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="vo", GOTO="brltty_usb_run" - -# Device: 0798:0600 -# Alva [Voyager Protocol Converter] -ENV{PRODUCT}=="798/600/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" - -# Device: 0798:0624 -# Alva [BC624] -ENV{PRODUCT}=="798/624/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" - -# Device: 0798:0640 -# Alva [BC640] -ENV{PRODUCT}=="798/640/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" - -# Device: 0798:0680 -# Alva [BC680] -ENV{PRODUCT}=="798/680/*", ENV{BRLTTY_BRAILLE_DRIVER}="al", GOTO="brltty_usb_run" - -# Device: 0904:2000 -# Baum [VarioPro 40 (40 cells)] -ENV{PRODUCT}=="904/2000/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2001 -# Baum [EcoVario 24 (24 cells)] -ENV{PRODUCT}=="904/2001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2002 -# Baum [EcoVario 40 (40 cells)] -ENV{PRODUCT}=="904/2002/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2007 -# Baum [VarioConnect 40 (40 cells)] -ENV{PRODUCT}=="904/2007/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2008 -# Baum [VarioConnect 32 (32 cells)] -ENV{PRODUCT}=="904/2008/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2009 -# Baum [VarioConnect 24 (24 cells)] -ENV{PRODUCT}=="904/2009/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2010 -# Baum [VarioConnect 64 (64 cells)] -ENV{PRODUCT}=="904/2010/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2011 -# Baum [VarioConnect 80 (80 cells)] -ENV{PRODUCT}=="904/2011/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2014 -# Baum [EcoVario 32 (32 cells)] -ENV{PRODUCT}=="904/2014/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2015 -# Baum [EcoVario 64 (64 cells)] -ENV{PRODUCT}=="904/2015/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:2016 -# Baum [EcoVario 80 (80 cells)] -ENV{PRODUCT}=="904/2016/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:3000 -# Baum [Refreshabraille 18 (18 cells)] -ENV{PRODUCT}=="904/3000/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:3001 -# Baum [Refreshabraille 18 (18 cells)] -ENV{PRODUCT}=="904/3001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:4004 -# Baum [Pronto! V3 18 (18 cells)] -ENV{PRODUCT}=="904/4004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:4005 -# Baum [Pronto! V3 40 (40 cells)] -ENV{PRODUCT}=="904/4005/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:4007 -# Baum [Pronto! V4 18 (18 cells)] -ENV{PRODUCT}=="904/4007/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:4008 -# Baum [Pronto! V4 40 (40 cells)] -ENV{PRODUCT}=="904/4008/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6001 -# Baum [SuperVario2 40 (40 cells)] -ENV{PRODUCT}=="904/6001/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6002 -# Baum [PocketVario2 (24 cells)] -ENV{PRODUCT}=="904/6002/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6003 -# Baum [SuperVario2 32 (32 cells)] -ENV{PRODUCT}=="904/6003/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6004 -# Baum [SuperVario2 64 (64 cells)] -ENV{PRODUCT}=="904/6004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6005 -# Baum [SuperVario2 80 (80 cells)] -ENV{PRODUCT}=="904/6005/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6006 -# Baum [Brailliant2 40 (40 cells)] -ENV{PRODUCT}=="904/6006/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6007 -# Baum [Brailliant2 24 (24 cells)] -ENV{PRODUCT}=="904/6007/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6008 -# Baum [Brailliant2 32 (32 cells)] -ENV{PRODUCT}=="904/6008/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6009 -# Baum [Brailliant2 64 (64 cells)] -ENV{PRODUCT}=="904/6009/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:600A -# Baum [Brailliant2 80 (80 cells)] -ENV{PRODUCT}=="904/600a/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6011 -# Baum [VarioConnect 24 (24 cells)] -ENV{PRODUCT}=="904/6011/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6012 -# Baum [VarioConnect 32 (32 cells)] -ENV{PRODUCT}=="904/6012/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6013 -# Baum [VarioConnect 40 (40 cells)] -ENV{PRODUCT}=="904/6013/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6101 -# Baum [VarioUltra 20 (20 cells)] -ENV{PRODUCT}=="904/6101/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6102 -# Baum [VarioUltra 40 (40 cells)] -ENV{PRODUCT}=="904/6102/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0904:6103 -# Baum [VarioUltra 32 (32 cells)] -ENV{PRODUCT}=="904/6103/*", ENV{BRLTTY_BRAILLE_DRIVER}="bm", GOTO="brltty_usb_run" - -# Device: 0921:1200 -# HandyTech [GoHubs chip] -ENV{PRODUCT}=="921/1200/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 0F4E:0100 -# FreedomScientific [Focus 1] -ENV{PRODUCT}=="f4e/100/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" - -# Device: 0F4E:0111 -# FreedomScientific [PAC Mate] -ENV{PRODUCT}=="f4e/111/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" - -# Device: 0F4E:0112 -# FreedomScientific [Focus 2] -ENV{PRODUCT}=="f4e/112/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" - -# Device: 0F4E:0114 -# FreedomScientific [Focus Blue] -ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run" - -# Device: 10C4:EA60 -# Generic Identifier -# Vendor: Cygnal Integrated Products, Inc. -# Product: CP210x UART Bridge / myAVR mySmartUSB light -# BrailleMemo [Pocket] -# Seika [Braille Display] -ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run" - -# Device: 10C4:EA80 -# Generic Identifier -# Vendor: Cygnal Integrated Products, Inc. -# Product: CP210x UART Bridge -# Seika [Note Taker] -ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run" - -# Device: 1148:0301 -# BrailleMemo [Smart] -ENV{PRODUCT}=="1148/301/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm", GOTO="brltty_usb_run" - -# Device: 1C71:C004 -# BrailleNote [HumanWare APEX] -ENV{PRODUCT}=="1c71/c004/*", ENV{BRLTTY_BRAILLE_DRIVER}="bn", GOTO="brltty_usb_run" - -# Device: 1C71:C005 -# HumanWare [all models (serial protocol)] -ENV{PRODUCT}=="1c71/c005/*", ENV{BRLTTY_BRAILLE_DRIVER}="hw", GOTO="brltty_usb_run" - -# Device: 1C71:C006 -# HumanWare [all models (HID protocol)] -ENV{PRODUCT}=="1c71/c006/*", ENV{BRLTTY_BRAILLE_DRIVER}="hw", GOTO="brltty_usb_run" - -# Device: 1FE4:0003 -# HandyTech [USB-HID adapter] -ENV{PRODUCT}=="1fe4/3/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0044 -# HandyTech [Easy Braille (HID)] -ENV{PRODUCT}=="1fe4/44/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0054 -# HandyTech [Active Braille] -ENV{PRODUCT}=="1fe4/54/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0055 -# HandyTech [Connect Braille 40] -ENV{PRODUCT}=="1fe4/55/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0064 -# HandyTech [Active Star 40] -ENV{PRODUCT}=="1fe4/64/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0074 -# HandyTech [Braille Star 40 (HID)] -ENV{PRODUCT}=="1fe4/74/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0081 -# HandyTech [Basic Braille 16] -ENV{PRODUCT}=="1fe4/81/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0082 -# HandyTech [Basic Braille 20] -ENV{PRODUCT}=="1fe4/82/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0083 -# HandyTech [Basic Braille 32] -ENV{PRODUCT}=="1fe4/83/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0084 -# HandyTech [Basic Braille 40] -ENV{PRODUCT}=="1fe4/84/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0086 -# HandyTech [Basic Braille 64] -ENV{PRODUCT}=="1fe4/86/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:0087 -# HandyTech [Basic Braille 80] -ENV{PRODUCT}=="1fe4/87/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:008A -# HandyTech [Basic Braille 48] -ENV{PRODUCT}=="1fe4/8a/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 1FE4:008B -# HandyTech [Basic Braille 160] -ENV{PRODUCT}=="1fe4/8b/*", ENV{BRLTTY_BRAILLE_DRIVER}="ht", GOTO="brltty_usb_run" - -# Device: 4242:0001 -# Pegasus [all models] -ENV{PRODUCT}=="4242/1/*", ENV{BRLTTY_BRAILLE_DRIVER}="pg", GOTO="brltty_usb_run" - -# Device: C251:1122 -# EuroBraille [Esys (version < 3.0, no SD card)] -ENV{PRODUCT}=="c251/1122/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1123 -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/1123/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1124 -# EuroBraille [Esys (version < 3.0, with SD card)] -ENV{PRODUCT}=="c251/1124/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1125 -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/1125/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1126 -# EuroBraille [Esys (version >= 3.0, no SD card)] -ENV{PRODUCT}=="c251/1126/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1127 -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/1127/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1128 -# EuroBraille [Esys (version >= 3.0, with SD card)] -ENV{PRODUCT}=="c251/1128/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1129 -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/1129/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:112A -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/112a/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:112B -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/112b/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:112C -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/112c/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:112D -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/112d/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:112E -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/112e/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:112F -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/112f/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1130 -# EuroBraille [Esytime] -ENV{PRODUCT}=="c251/1130/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1131 -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/1131/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# Device: C251:1132 -# EuroBraille [reserved] -ENV{PRODUCT}=="c251/1132/*", ENV{BRLTTY_BRAILLE_DRIVER}="eu", GOTO="brltty_usb_run" - -# END_USB_DEVICES - -GOTO="brltty_end" - -LABEL="brltty_usb_run" -ENV{BRLTTY_BRAILLE_DEVICE}="usb:vendor=0X$sysfs{idVendor}+product=0X$sysfs{idProduct}+serial=$sysfs{serial}" -GOTO="brltty_run" - -LABEL="brltty_run" -ENV{BRLTTY_PID_FILE}="/run/brltty.$kernel.pid" -ACTION=="add", GOTO="brltty_add" -ACTION=="remove", GOTO="brltty_remove" -GOTO="brltty_end" - -LABEL="brltty_add" -SYMLINK+="brltty/$env{BRLTTY_BRAILLE_DEVICE}" -TEST=="/sys/fs/cgroup/systemd", GOTO="brltty_add_systemd" -RUN+="/bin/brltty -E -GOTO="brltty_end" - -LABEL="brltty_add_systemd" -TAG+="systemd", ENV{SYSTEMD_WANTS}+="brltty@$env{DEVNAME}.service" -GOTO="brltty_end" - -LABEL="brltty_remove" -TEST=="/sys/fs/cgroup/systemd", GOTO="brltty_end" -RUN+="/bin/sh -c 'kill -TERM `cat $env{BRLTTY_PID_FILE}`'" -GOTO="brltty_end" - -LABEL="brltty_end" diff -Nru brltty-5.4/Autostart/Windows/brltty-libusb-1.0.inf brltty-5.5/Autostart/Windows/brltty-libusb-1.0.inf --- brltty-5.4/Autostart/Windows/brltty-libusb-1.0.inf 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Autostart/Windows/brltty-libusb-1.0.inf 2017-04-18 22:35:13.000000000 +0000 @@ -246,6 +246,9 @@ ; Device: 1C71:C006 "LibUSB-1.0: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +; Device: 1C71:C00A +"LibUSB-1.0: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A + ; Device: 1FE4:0003 "LibUSB-1.0: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 @@ -258,6 +261,9 @@ ; Device: 1FE4:0055 "LibUSB-1.0: HandyTech [Connect Braille 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0055 +; Device: 1FE4:0061 +"LibUSB-1.0: HandyTech [Actilino]"=LIBUSB_DEV, USB\VID_1FE4&PID_0061 + ; Device: 1FE4:0064 "LibUSB-1.0: HandyTech [Active Star 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0064 @@ -334,7 +340,7 @@ "LibUSB-1.0: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_112F ; Device: C251:1130 -"LibUSB-1.0: EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 +"LibUSB-1.0: EuroBraille [Esytime (firmware 1.03, 2014-03-31)], EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 ; Device: C251:1131 "LibUSB-1.0: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_1131 @@ -551,6 +557,9 @@ ; Device: 1C71:C006 "LibUSB-1.0: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +; Device: 1C71:C00A +"LibUSB-1.0: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A + ; Device: 1FE4:0003 "LibUSB-1.0: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 @@ -563,6 +572,9 @@ ; Device: 1FE4:0055 "LibUSB-1.0: HandyTech [Connect Braille 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0055 +; Device: 1FE4:0061 +"LibUSB-1.0: HandyTech [Actilino]"=LIBUSB_DEV, USB\VID_1FE4&PID_0061 + ; Device: 1FE4:0064 "LibUSB-1.0: HandyTech [Active Star 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0064 @@ -639,7 +651,7 @@ "LibUSB-1.0: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_112F ; Device: C251:1130 -"LibUSB-1.0: EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 +"LibUSB-1.0: EuroBraille [Esytime (firmware 1.03, 2014-03-31)], EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 ; Device: C251:1131 "LibUSB-1.0: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_1131 diff -Nru brltty-5.4/Autostart/Windows/brltty-libusb.inf brltty-5.5/Autostart/Windows/brltty-libusb.inf --- brltty-5.4/Autostart/Windows/brltty-libusb.inf 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Autostart/Windows/brltty-libusb.inf 2017-04-18 22:35:13.000000000 +0000 @@ -46,7 +46,7 @@ libusb0.sys [libusb_files_sys_x64] -libusb0.sys,libusb0_x64.sys +libusb0_x64.sys [libusb_files_dll] libusb0.dll @@ -55,7 +55,7 @@ libusb0.dll [libusb_files_dll_x64] -libusb0.dll,libusb0_x64.dll +libusb0_x64.dll ;-------------------------------------------------------------------------- ; Device driver @@ -87,7 +87,7 @@ AddService = libusb0, 0x00000002, libusb_add_service [LIBUSB_DEV.NTAMD64.Services] -AddService = libusb0, 0x00000002, libusb_add_service +AddService = libusb0, 0x00000002, libusb_add_service_amd64 [libusb_add_reg] HKR,,DevLoader,,*ntkern @@ -114,6 +114,14 @@ ErrorControl = 0 ServiceBinary = %12%\libusb0.sys +[libusb_add_service_amd64] +DisplayName = "LibUsb-Win32 - Kernel Driver 03/31/2007, 0.1.12.1" +ServiceType = 1 +StartType = 3 +ErrorControl = 0 +ServiceBinary = %12%\libusb0_x64.sys + + ;-------------------------------------------------------------------------- ; Devices ;-------------------------------------------------------------------------- @@ -325,6 +333,9 @@ ; Device: 1C71:C006 "LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +; Device: 1C71:C00A +"LibUSB-Win32: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A + ; Device: 1FE4:0003 "LibUSB-Win32: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 @@ -337,6 +348,9 @@ ; Device: 1FE4:0055 "LibUSB-Win32: HandyTech [Connect Braille 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0055 +; Device: 1FE4:0061 +"LibUSB-Win32: HandyTech [Actilino]"=LIBUSB_DEV, USB\VID_1FE4&PID_0061 + ; Device: 1FE4:0064 "LibUSB-Win32: HandyTech [Active Star 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0064 @@ -413,7 +427,7 @@ "LibUSB-Win32: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_112F ; Device: C251:1130 -"LibUSB-Win32: EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 +"LibUSB-Win32: EuroBraille [Esytime (firmware 1.03, 2014-03-31)], EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 ; Device: C251:1131 "LibUSB-Win32: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_1131 @@ -630,6 +644,9 @@ ; Device: 1C71:C006 "LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +; Device: 1C71:C00A +"LibUSB-Win32: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A + ; Device: 1FE4:0003 "LibUSB-Win32: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 @@ -642,6 +659,9 @@ ; Device: 1FE4:0055 "LibUSB-Win32: HandyTech [Connect Braille 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0055 +; Device: 1FE4:0061 +"LibUSB-Win32: HandyTech [Actilino]"=LIBUSB_DEV, USB\VID_1FE4&PID_0061 + ; Device: 1FE4:0064 "LibUSB-Win32: HandyTech [Active Star 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0064 @@ -718,7 +738,7 @@ "LibUSB-Win32: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_112F ; Device: C251:1130 -"LibUSB-Win32: EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 +"LibUSB-Win32: EuroBraille [Esytime (firmware 1.03, 2014-03-31)], EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 ; Device: C251:1131 "LibUSB-Win32: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_1131 @@ -935,6 +955,9 @@ ; Device: 1C71:C006 "LibUSB-Win32: HumanWare [all models (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C006 +; Device: 1C71:C00A +"LibUSB-Win32: HumanWare [BrailleNote Touch (HID protocol)]"=LIBUSB_DEV, USB\VID_1C71&PID_C00A + ; Device: 1FE4:0003 "LibUSB-Win32: HandyTech [USB-HID adapter]"=LIBUSB_DEV, USB\VID_1FE4&PID_0003 @@ -947,6 +970,9 @@ ; Device: 1FE4:0055 "LibUSB-Win32: HandyTech [Connect Braille 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0055 +; Device: 1FE4:0061 +"LibUSB-Win32: HandyTech [Actilino]"=LIBUSB_DEV, USB\VID_1FE4&PID_0061 + ; Device: 1FE4:0064 "LibUSB-Win32: HandyTech [Active Star 40]"=LIBUSB_DEV, USB\VID_1FE4&PID_0064 @@ -1023,7 +1049,7 @@ "LibUSB-Win32: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_112F ; Device: C251:1130 -"LibUSB-Win32: EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 +"LibUSB-Win32: EuroBraille [Esytime (firmware 1.03, 2014-03-31)], EuroBraille [Esytime]"=LIBUSB_DEV, USB\VID_C251&PID_1130 ; Device: C251:1131 "LibUSB-Win32: EuroBraille [reserved]"=LIBUSB_DEV, USB\VID_C251&PID_1131 diff -Nru brltty-5.4/Autostart/X11/60xbrlapi brltty-5.5/Autostart/X11/60xbrlapi --- brltty-5.4/Autostart/X11/60xbrlapi 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Autostart/X11/60xbrlapi 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1 @@ +if [ -x /usr/bin/xbrlapi ]; then /usr/bin/xbrlapi -q 2> /dev/null & fi diff -Nru brltty-5.4/Bindings/Java/apitest brltty-5.5/Bindings/Java/apitest --- brltty-5.4/Bindings/Java/apitest 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/apitest 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by +# Copyright (C) 2006-2017 by # Samuel Thibault # Sébastien Hinderer # diff -Nru brltty-5.4/Bindings/Java/bindings.c brltty-5.5/Bindings/Java/bindings.c --- brltty-5.4/Bindings/Java/bindings.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/bindings.c 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/bindings.m4 brltty-5.5/Bindings/Java/bindings.m4 --- brltty-5.4/Bindings/Java/bindings.m4 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/bindings.m4 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by +# Copyright (C) 2006-2017 by # Samuel Thibault # Sébastien Hinderer # diff -Nru brltty-5.4/Bindings/Java/Brlapi.java brltty-5.5/Bindings/Java/Brlapi.java --- brltty-5.4/Bindings/Java/Brlapi.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/Brlapi.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/ConnectionSettings.java brltty-5.5/Bindings/Java/ConnectionSettings.java --- brltty-5.4/Bindings/Java/ConnectionSettings.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/ConnectionSettings.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/constants.awk brltty-5.5/Bindings/Java/constants.awk --- brltty-5.4/Bindings/Java/constants.awk 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/constants.awk 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by +# Copyright (C) 2006-2017 by # Samuel Thibault # Sébastien Hinderer # diff -Nru brltty-5.4/Bindings/Java/DisplaySize.java brltty-5.5/Bindings/Java/DisplaySize.java --- brltty-5.4/Bindings/Java/DisplaySize.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/DisplaySize.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/Error.java brltty-5.5/Bindings/Java/Error.java --- brltty-5.4/Bindings/Java/Error.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/Error.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/Exception.java brltty-5.5/Bindings/Java/Exception.java --- brltty-5.4/Bindings/Java/Exception.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/Exception.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/Key.java brltty-5.5/Bindings/Java/Key.java --- brltty-5.4/Bindings/Java/Key.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/Key.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/Makefile.in brltty-5.5/Bindings/Java/Makefile.in --- brltty-5.4/Bindings/Java/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by +# Copyright (C) 2006-2017 by # Samuel Thibault # Sébastien Hinderer # @@ -75,7 +75,7 @@ doc.made: $(JAVA_SOURCES) $(INSTALL_DIRECTORY) doc - $(JAVADOC) -quiet -d doc -author -version -use $(JAVA_SOURCES) + $(JAVADOC) -quiet -d doc -author -notimestamp -version -use $(JAVA_SOURCES) touch $@ clean:: diff -Nru brltty-5.4/Bindings/Java/Native.java brltty-5.5/Bindings/Java/Native.java --- brltty-5.4/Bindings/Java/Native.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/Native.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/Test.java brltty-5.5/Bindings/Java/Test.java --- brltty-5.4/Bindings/Java/Test.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/Test.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Java/WriteArguments.java brltty-5.5/Bindings/Java/WriteArguments.java --- brltty-5.4/Bindings/Java/WriteArguments.java 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Java/WriteArguments.java 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by + * Copyright (C) 2006-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Bindings/Lisp/bindings.m4 brltty-5.5/Bindings/Lisp/bindings.m4 --- brltty-5.4/Bindings/Lisp/bindings.m4 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Lisp/bindings.m4 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Dave Mielke +# Copyright (C) 2006-2017 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bindings/Lisp/brlapi.asd brltty-5.5/Bindings/Lisp/brlapi.asd --- brltty-5.4/Bindings/Lisp/brlapi.asd 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Lisp/brlapi.asd 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; libbrlapi - A library providing access to braille terminals for applications. ; -; Copyright (C) 2006-2016 by Mario Lang +; Copyright (C) 2006-2017 by Mario Lang ; ; libbrlapi comes with ABSOLUTELY NO WARRANTY. ; diff -Nru brltty-5.4/Bindings/Lisp/brlapi.lisp.in brltty-5.5/Bindings/Lisp/brlapi.lisp.in --- brltty-5.4/Bindings/Lisp/brlapi.lisp.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Lisp/brlapi.lisp.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; libbrlapi - A library providing access to braille terminals for applications. ; -; Copyright (C) 2006-2016 by Mario Lang +; Copyright (C) 2006-2017 by Mario Lang ; ; libbrlapi comes with ABSOLUTELY NO WARRANTY. ; diff -Nru brltty-5.4/Bindings/Lisp/Makefile.in brltty-5.5/Bindings/Lisp/Makefile.in --- brltty-5.4/Bindings/Lisp/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Lisp/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Mario Lang +# Copyright (C) 2006-2017 by Mario Lang # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bindings/OCaml/brlapi_stubs.c brltty-5.5/Bindings/OCaml/brlapi_stubs.c --- brltty-5.4/Bindings/OCaml/brlapi_stubs.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/OCaml/brlapi_stubs.c 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2005-2016 by + * Copyright (C) 2005-2017 by * Sébastien Hinderer * Samuel Thibault * All rights reserved. @@ -145,12 +145,14 @@ static void raise_brlapi_error(void) { static value *exception = NULL; + CAMLparam0(); CAMLlocal1(res); if (exception==NULL) exception = caml_named_value("Brlapi_error"); res = caml_alloc(2,0); Store_field(res, 0, *exception); Store_field(res, 1, constrCamlError(&brlapi_error)); caml_raise(res); + CAMLreturn0; } /* Function : raise_brlapi_exception */ @@ -159,6 +161,7 @@ { static value *exception = NULL; int i; + CAMLparam0(); CAMLlocal2(str, res); str = caml_alloc_string(size); for (i=0; i * Samuel Thibault * All rights reserved. diff -Nru brltty-5.4/Bindings/OCaml/main.mli brltty-5.5/Bindings/OCaml/main.mli --- brltty-5.4/Bindings/OCaml/main.mli 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/OCaml/main.mli 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ (* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2016 by + * Copyright (C) 2002-2017 by * Sébastien Hinderer * Samuel Thibault * All rights reserved. diff -Nru brltty-5.4/Bindings/OCaml/Makefile.in brltty-5.5/Bindings/OCaml/Makefile.in --- brltty-5.4/Bindings/OCaml/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/OCaml/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bindings/Python/apitest.py brltty-5.5/Bindings/Python/apitest.py --- brltty-5.4/Bindings/Python/apitest.py 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/apitest.py 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bindings/Python/bindings.c brltty-5.5/Bindings/Python/bindings.c --- brltty-5.4/Bindings/Python/bindings.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/bindings.c 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2005-2016 by + * Copyright (C) 2005-2017 by * Alexis Robert * Samuel Thibault * diff -Nru brltty-5.4/Bindings/Python/bindings.h brltty-5.5/Bindings/Python/bindings.h --- brltty-5.4/Bindings/Python/bindings.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/bindings.h 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2005-2016 by + * Copyright (C) 2005-2017 by * Alexis Robert * Samuel Thibault * diff -Nru brltty-5.4/Bindings/Python/bindings.m4 brltty-5.5/Bindings/Python/bindings.m4 --- brltty-5.4/Bindings/Python/bindings.m4 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/bindings.m4 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2016 by +# Copyright (C) 2005-2017 by # Alexis Robert # Samuel Thibault # @@ -121,7 +121,7 @@ if test "${GCC}" = "yes" then - CYTHON_CFLAGS="-Wno-parentheses -Wno-unused -Wno-format -fno-strict-aliasing -U_POSIX_C_SOURCE -U_XOPEN_SOURCE" + CYTHON_CFLAGS="-Wno-parentheses -Wno-unused -fno-strict-aliasing -U_POSIX_C_SOURCE -U_XOPEN_SOURCE" else case "${host_os}" in diff -Nru brltty-5.4/Bindings/Python/brlapi.pyx brltty-5.5/Bindings/Python/brlapi.pyx --- brltty-5.4/Bindings/Python/brlapi.pyx 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/brlapi.pyx 2017-04-18 22:35:13.000000000 +0000 @@ -58,7 +58,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2016 by +# Copyright (C) 2005-2017 by # Alexis Robert # Samuel Thibault # @@ -93,6 +93,8 @@ self.gaierrno = c_brlapi.brlapi_error.gaierrno if (c_brlapi.brlapi_error.errfun): self.errfun = c_brlapi.brlapi_error.errfun + else: + self.errfun = b"" def __str__(self): cdef c_brlapi.brlapi_error_t error @@ -302,7 +304,7 @@ raise ConnectionError(self.settings.host, self.settings.auth) def __del__(self): - """Close the BrlAPI conection""" + """Close the BrlAPI connection""" c_brlapi.brlapi__closeConnection(self.h) c_brlapi.free(self.h) diff -Nru brltty-5.4/Bindings/Python/c_brlapi.pxd brltty-5.5/Bindings/Python/c_brlapi.pxd --- brltty-5.4/Bindings/Python/c_brlapi.pxd 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/c_brlapi.pxd 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2016 by +# Copyright (C) 2005-2017 by # Alexis Robert # Samuel Thibault # diff -Nru brltty-5.4/Bindings/Python/constants.awk brltty-5.5/Bindings/Python/constants.awk --- brltty-5.4/Bindings/Python/constants.awk 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/constants.awk 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2016 by +# Copyright (C) 2005-2017 by # Alexis Robert # Samuel Thibault # diff -Nru brltty-5.4/Bindings/Python/Makefile.in brltty-5.5/Bindings/Python/Makefile.in --- brltty-5.4/Bindings/Python/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2016 by +# Copyright (C) 2005-2017 by # Alexis Robert # Samuel Thibault # diff -Nru brltty-5.4/Bindings/Python/mkdoc.py brltty-5.5/Bindings/Python/mkdoc.py --- brltty-5.4/Bindings/Python/mkdoc.py 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/mkdoc.py 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2016 by +# Copyright (C) 2005-2017 by # Alexis Robert # Samuel Thibault # diff -Nru brltty-5.4/Bindings/Python/setup.py.in brltty-5.5/Bindings/Python/setup.py.in --- brltty-5.4/Bindings/Python/setup.py.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Python/setup.py.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2016 by +# Copyright (C) 2005-2017 by # Alexis Robert # Samuel Thibault # diff -Nru brltty-5.4/Bindings/Tcl/apitest brltty-5.5/Bindings/Tcl/apitest --- brltty-5.4/Bindings/Tcl/apitest 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Tcl/apitest 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Dave Mielke +# Copyright (C) 2006-2017 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bindings/Tcl/apitest.tcl brltty-5.5/Bindings/Tcl/apitest.tcl --- brltty-5.4/Bindings/Tcl/apitest.tcl 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Tcl/apitest.tcl 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Dave Mielke +# Copyright (C) 2006-2017 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bindings/Tcl/bindings.c brltty-5.5/Bindings/Tcl/bindings.c --- brltty-5.4/Bindings/Tcl/bindings.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Tcl/bindings.c 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2006-2016 by Dave Mielke + * Copyright (C) 2006-2017 by Dave Mielke * * libbrlapi comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Bindings/Tcl/bindings.m4 brltty-5.5/Bindings/Tcl/bindings.m4 --- brltty-5.4/Bindings/Tcl/bindings.m4 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Tcl/bindings.m4 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Dave Mielke +# Copyright (C) 2006-2017 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bindings/Tcl/Makefile.in brltty-5.5/Bindings/Tcl/Makefile.in --- brltty-5.4/Bindings/Tcl/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Tcl/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Dave Mielke +# Copyright (C) 2006-2017 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bindings/Tcl/prologue.tcl brltty-5.5/Bindings/Tcl/prologue.tcl --- brltty-5.4/Bindings/Tcl/prologue.tcl 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bindings/Tcl/prologue.tcl 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Dave Mielke +# Copyright (C) 2006-2017 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/bindings.mk brltty-5.5/bindings.mk --- brltty-5.4/bindings.mk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/bindings.mk 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bootdisks/bp2cf brltty-5.5/Bootdisks/bp2cf --- brltty-5.4/Bootdisks/bp2cf 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bootdisks/bp2cf 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Bootdisks/rhmkiso brltty-5.5/Bootdisks/rhmkiso --- brltty-5.4/Bootdisks/rhmkiso 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Bootdisks/rhmkiso 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/braille.mk brltty-5.5/braille.mk --- brltty-5.4/braille.mk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/braille.mk 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/brltty.spec brltty-5.5/brltty.spec --- brltty-5.4/brltty.spec 2016-06-28 11:22:13.000000000 +0000 +++ brltty-5.5/brltty.spec 2017-04-18 22:38:53.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ ############################################################################### Name: brltty -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -32,8 +32,11 @@ %define _bindir /bin %define _sbindir /sbin %define _libdir /lib +%define _datadir /usr/share %define _sysconfdir /etc -%define _systemddir /usr/lib/systemd/system +%define _systemddir %{_libdir}/systemd/system +%define _udevlibdir %{_libdir}/udev +%define _udevrulesdir %{_udevlibdir}/rules.d Requires: libicu @@ -57,9 +60,11 @@ BuildRequires: doxygen AutoProv: no -Provides: brlapi-server AutoReq: yes +Provides: brlapi-server +Provides: config(%{name}) = %{version} + Summary: Braille display driver for Linux/Unix. %description BRLTTY is a background process (daemon) which provides access to @@ -72,7 +77,7 @@ %package -n brltty-braille-brlapi -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -90,7 +95,7 @@ %package -n brltty-braille-xwindow -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -116,7 +121,7 @@ %package -n brltty-speech-espeak -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -138,7 +143,7 @@ %package -n brltty-speech-festival -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -158,7 +163,7 @@ %package -n brltty-speech-flite -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -180,7 +185,7 @@ %package -n brltty-speech-speechd -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -202,7 +207,7 @@ %package -n brltty-screen-atspi -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -225,7 +230,7 @@ %package -n brltty-screen-atspi2 -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -248,7 +253,7 @@ %package -n brltty-screen-screen -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL @@ -267,7 +272,7 @@ %package -n brltty-utils -Version: 5.4 +Version: 5.5 Release: 1 Group: Development/Tools License: GPL @@ -283,7 +288,7 @@ %package -n brltty-devel -Version: 5.4 +Version: 5.5 Release: 1 Group: Development/Tools License: GPL @@ -303,23 +308,41 @@ %package -n brltty-systemd -Version: 5.4 +Version: 5.5 Release: 1 Group: System Environment/Daemons License: GPL +BuildArch: noarch AutoProv: no AutoReq: yes Summary: Systemd units and wrappers for BRLTTY. %description -n brltty-systemd -This package provides the units and wrappers for managing BRLTTY via Systemd. +This package provides the units and wrapper for managing BRLTTY via Systemd. Install this package if you'd like to manage BRLTTY processes via Systemd. +%package -n brltty-udev +Version: 5.5 +Release: 1 +Group: System Environment/Daemons +License: GPL +BuildArch: noarch + +AutoProv: no +AutoReq: yes + +Summary: Udev rules for BRLTTY. +%description -n brltty-udev +This package provides the rules and wrapper for managing BRLTTY via Udev. + +Install this package if you'd like to manage BRLTTY processes via Udev. + + %package -n brlapi -Version: 0.6.5 +Version: 0.6.6 Release: 1 Group: System Environment/Libraries License: LGPL @@ -337,7 +360,7 @@ %package -n brlapi-devel -Version: 0.6.5 +Version: 0.6.6 Release: 1 Group: Development/Libraries License: LGPL @@ -359,8 +382,8 @@ which directly accesses a refreshable braille display. -%package -n brlapi-java -Version: 0.6.5 +%package -n java-brlapi +Version: 0.6.6 Release: 1 Group: System Environment/Libraries License: LGPL @@ -371,7 +394,7 @@ AutoReq: yes Summary: Java bindings for BrlAPI. -%description -n brlapi-java +%description -n java-brlapi This package provides the Java bindings for BrlAPI, which is the Application Programming Interface to BRLTTY. @@ -379,8 +402,8 @@ which directly accesses a refreshable braille display. -%package -n brlapi-ocaml -Version: 0.6.5 +%package -n ocaml-brlapi +Version: 0.6.6 Release: 1 Group: System Environment/Libraries License: LGPL @@ -392,7 +415,7 @@ AutoReq: yes Summary: OCaml bindings for BrlAPI. -%description -n brlapi-ocaml +%description -n ocaml-brlapi This package provides the OCaml bindings for BrlAPI, which is the Application Programming Interface to BRLTTY. @@ -400,8 +423,8 @@ which directly accesses a refreshable braille display. -%package -n brlapi-python -Version: 0.6.5 +%package -n python-brlapi +Version: 0.6.6 Release: 1 Group: System Environment/Libraries License: LGPL @@ -414,7 +437,7 @@ AutoReq: yes Summary: Python bindings for BrlAPI. -%description -n brlapi-python +%description -n python-brlapi This package provides the Python bindings for BrlAPI, which is the Application Programming Interface to BRLTTY. @@ -422,8 +445,8 @@ which directly accesses a refreshable braille display. -%package -n brlapi-tcl -Version: 0.6.5 +%package -n tcl-brlapi +Version: 0.6.6 Release: 1 Group: System Environment/Libraries License: LGPL @@ -435,7 +458,7 @@ AutoReq: yes Summary: Tcl bindings for BrlAPI. -%description -n brlapi-tcl +%description -n tcl-brlapi This package provides the Tcl bindings for BrlAPI, which is the Application Programming Interface to BRLTTY. @@ -444,7 +467,7 @@ %package -n brlapi-utils -Version: 0.6.5 +Version: 0.6.6 Release: 1 Group: Applications/System License: LGPL @@ -463,17 +486,16 @@ %prep # %setup -n %{name}-%{version} -%setup -n brltty-5.4 +%setup -n brltty-5.5 %build %configure --disable-relocatable-install --with-install-root="${RPM_BUILD_ROOT}" --disable-gpm --without-mikropuhe --without-swift --without-theta --without-viavoice --without-libbraille --with-braille-driver=-tt,-vr make %install -make install install-documents install-messages install-systemd +make install install-documents install-messages +make install-systemd install-udev install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" -install -d "${RPM_BUILD_ROOT}%{_systemddir}" -install -m 644 Autostart/Systemd/brltty.service "${RPM_BUILD_ROOT}%{_systemddir}/brltty.service" %find_lang %{name} %clean @@ -494,6 +516,7 @@ %exclude %{_libdir}/brltty/libbrlttyxa2.so %exclude %{_libdir}/brltty/libbrlttyxsc.so %{_sysconfdir}/brltty +%{_datadir}/metainfo/org.a11y.brltty.metainfo.xml %doc %{_mandir}/man1/brltty.1.gz %doc %{_docdir}/*/LICENSE* %doc %{_docdir}/*/README* @@ -504,7 +527,6 @@ %doc %{_docdir}/*/KeyTables %doc %{_docdir}/*/Manual-BRLTTY %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty.conf -%{_systemddir}/brltty.service %files -n brltty-braille-brlapi %{_libdir}/brltty/libbrlttybba.so @@ -540,28 +562,32 @@ %{_includedir}/brltty %files -n brltty-systemd -/usr/lib/systemd/system/brltty.* -/usr/lib/systemd/system/brltty@.* +%{_systemddir}/* %{_sbindir}/brltty-systemd-* +%files -n brltty-udev +%{_udevlibdir}/* +%{_udevrulesdir}/* + %files -n brlapi %defattr(-,root,root) %{_libdir}/libbrlapi.so.* +%{_datadir}/polkit-1/actions/org.a11y.brlapi.policy %doc %{_docdir}/*/Manual-BrlAPI -%files -n brlapi-java +%files -n java-brlapi /usr/share/java/* /usr/lib/java/* -%files -n brlapi-ocaml +%files -n ocaml-brlapi /usr/lib64/ocaml/brlapi -%files -n brlapi-python +%files -n python-brlapi /usr/lib64/python2.7/site-packages/[bB]rlapi[-.]* -%files -n brlapi-tcl -/usr/lib64/tcl8.5/brlapi-0.6.5/libbrlapi_tcl.so -/usr/lib64/tcl8.5/brlapi-0.6.5/pkgIndex.tcl +%files -n tcl-brlapi +/usr/lib64/tcl8.5/brlapi-0.6.6/libbrlapi_tcl.so +/usr/lib64/tcl8.5/brlapi-0.6.6/pkgIndex.tcl %files -n brlapi-devel %defattr(-,root,root) @@ -579,49 +605,77 @@ %doc %{_mandir}/man1/xbrlapi.1.gz %doc %{_mandir}/man1/eutp.1.gz %doc %{_mandir}/man1/vstp.1.gz -/usr/share/gdm/greeter/autostart/xbrlapi.desktop +%{_sysconfdir}/X11/Xsession.d/60xbrlapi +%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop %changelog -* Tue Jun 28 2016 Dave Mielke 5.4 -Core changes: - The Delayed Cursor Tracking feature (and preference) has been added. - Stuck keys are now automatically released after a specifiable timeout. - Touch events no longer interfere with Learn Mode. - Support for the Polkit authorization manager has been added. - A couple of memory corruption issues have been resolved. -USB fixes: - Device disconnect detection has been improved. - Excessive CPU consumption for some older serial adapters has been resolved. +* Tue Apr 18 2017 Dave Mielke 5.5 +General changes: + The braille and speech banners no longer include the revision identifier. + The -o (--override-preference=) option has been added. + quiet-if-no-braille can be specified via the configuration file. + Cursor routing hangs have been resolved. + The Log Messages submenu (for warnings and errors) has been added. + Support for panning within a long alert message has been added. + Alert beeps work on a Linux serial console. + The Greek text table has been improved. +Braille device changes: + The default is to check both USB and Bluetooth (not just USB). + Specifying the Bluetooth address is no longer mandatory. + A prefix of a Bluetooth device's name can be specified. + A generic USB serial adapter is probed only if it's been customized. Baum braille driver changes: - More bindings have been defined for models that have the B11 key. - False reporting of input timeouts has been resolved. - Handling of unknown packet types has been improved. + Support for the Vario Ultra has been improved. + Support for the Orbit 20 has been added. +EuroBraille braille driver changes: + More Esytime bindings have been added. + Support has been added for the EsysLight 80 and the Esytime Evolution. HandyTech braille driver changes: - Model detection on Windows has been fixed. - Output errors now restart the driver. + Support has been added for the Actilino. + The rocker keys can be used for efficient navigation of the menu. + B4+B5 has been bound to Command Learn Mode. + The (now redundant) keypad binding for Command Learn Mode has been removed. + The Bluetooth names of the Active Star and the Braillino are recognized. HIMS braille driver changes: - Support for the Smart Beetle has been added. - Newer firmware resolution of qwerty key code conflicts is supported. + Function key bindings have been added for models with four scroll keys. +TTY braille driver changes: + The braille cells are shown (in addition to the text). HumanWare braille driver changes: - Several USB connection problems have been resolved. - The newer HID-based USB protocol is supported. - The Brailliant B 80's Bluetooth device name is recognized. -Papenmeier braille driver changes: - Clipboard bindings have been added that work on EL-C models. - Bar bindings for the menu now work on EL models that don't have switches. - Bindings may now be defined that use a routing key and an EL key. -XWindow braille driver changes: - Fixed-size font restrictions have been removed. + The Braille Note is autodetected when using USB. + Support has been added for the Braille Note Touch. +Polkit changes: + The policy file is installed. + The policy has been renamed to org.a11y.brlapi (from org.brltty). + Initialization doesn't delay BRLTTY startup. +Systemd changes: + The default instance is now brltty.target (not brltty.service). + Multiple instances can be managed (via brltty@.target instances). + A make file has been added to simplify unit and wrapper installation. + BRLTTY isn't started until Udev has finished initializing. + BRLTTY isn't automatically restarted if it terminates cleanly. +Udev changes: + A make file has been added to simplify rules and wrapper installation. +BrlAPI changes: + The version is now 0.6.6 (it was 0.6.5). + The server isn't started until the braille driver has started. + Several small fixes. xbrlapi changes: - Brltty restarts are handled. - Logs written to .xsession have been improved. -brltty-trtxt changes: - The -b [--no-base-characters] option has been added. -Systemd/Udev changes: - Multiple USB braille devices are handled - each starts its own brltty. - Disconnecting a USB braille device stops the associated brltty. -Updated Tables: - The en_CA (English Canada) text table. - The zh_tw (Chinese, Taiwan) contraction table. + The X11 and gdm autostart files are installed. + Constantly trying to connect when BRLTTY isn't available has been fixed. + Reconnection on every window change has been fixed. +Key table changes: + Common chords for all of the sticky modifier keys have been added. + Listings combine dot keys, e.g. Dots12 instead of Dot1+Dot2. +Android changes: + The cursor no longer jumps back to the start while spaces are being typed. + Customization files can be in internal storage and/or on the SD card. +Windows changes: + Interaction with NVDA has been revived. + LibUSB can be used on a 64-bit system. + Builds can be done on MinGW64. +Build changes: + AppStream metainfo is maintained and installed. + The new Speech Dispatcher installation layout is supported. + Fixes to support building on Solaris 10 and 11 with C99. diff -Nru brltty-5.4/brltty.spec.in brltty-5.5/brltty.spec.in --- brltty-5.4/brltty.spec.in 2016-06-28 10:36:45.000000000 +0000 +++ brltty-5.5/brltty.spec.in 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -32,8 +32,11 @@ %define _bindir /bin %define _sbindir /sbin %define _libdir /lib +%define _datadir /usr/share %define _sysconfdir /etc -%define _systemddir /usr/lib/systemd/system +%define _systemddir %{_libdir}/systemd/system +%define _udevlibdir %{_libdir}/udev +%define _udevrulesdir %{_udevlibdir}/rules.d Requires: libicu @@ -57,9 +60,11 @@ BuildRequires: doxygen AutoProv: no -Provides: brlapi-server AutoReq: yes +Provides: brlapi-server +Provides: config(%{name}) = %{version} + Summary: Braille display driver for Linux/Unix. %description BRLTTY is a background process (daemon) which provides access to @@ -307,17 +312,35 @@ Release: 1 Group: System Environment/Daemons License: GPL +BuildArch: noarch AutoProv: no AutoReq: yes Summary: Systemd units and wrappers for BRLTTY. %description -n brltty-systemd -This package provides the units and wrappers for managing BRLTTY via Systemd. +This package provides the units and wrapper for managing BRLTTY via Systemd. Install this package if you'd like to manage BRLTTY processes via Systemd. +%package -n brltty-udev +Version: @PACKAGE_VERSION@ +Release: 1 +Group: System Environment/Daemons +License: GPL +BuildArch: noarch + +AutoProv: no +AutoReq: yes + +Summary: Udev rules for BRLTTY. +%description -n brltty-udev +This package provides the rules and wrapper for managing BRLTTY via Udev. + +Install this package if you'd like to manage BRLTTY processes via Udev. + + %package -n brlapi Version: @api_release@ Release: 1 @@ -359,7 +382,7 @@ which directly accesses a refreshable braille display. -%package -n brlapi-java +%package -n java-brlapi Version: @api_release@ Release: 1 Group: System Environment/Libraries @@ -371,7 +394,7 @@ AutoReq: yes Summary: Java bindings for BrlAPI. -%description -n brlapi-java +%description -n java-brlapi This package provides the Java bindings for BrlAPI, which is the Application Programming Interface to BRLTTY. @@ -379,7 +402,7 @@ which directly accesses a refreshable braille display. -%package -n brlapi-ocaml +%package -n ocaml-brlapi Version: @api_release@ Release: 1 Group: System Environment/Libraries @@ -392,7 +415,7 @@ AutoReq: yes Summary: OCaml bindings for BrlAPI. -%description -n brlapi-ocaml +%description -n ocaml-brlapi This package provides the OCaml bindings for BrlAPI, which is the Application Programming Interface to BRLTTY. @@ -400,7 +423,7 @@ which directly accesses a refreshable braille display. -%package -n brlapi-python +%package -n python-brlapi Version: @api_release@ Release: 1 Group: System Environment/Libraries @@ -414,7 +437,7 @@ AutoReq: yes Summary: Python bindings for BrlAPI. -%description -n brlapi-python +%description -n python-brlapi This package provides the Python bindings for BrlAPI, which is the Application Programming Interface to BRLTTY. @@ -422,7 +445,7 @@ which directly accesses a refreshable braille display. -%package -n brlapi-tcl +%package -n tcl-brlapi Version: @api_release@ Release: 1 Group: System Environment/Libraries @@ -435,7 +458,7 @@ AutoReq: yes Summary: Tcl bindings for BrlAPI. -%description -n brlapi-tcl +%description -n tcl-brlapi This package provides the Tcl bindings for BrlAPI, which is the Application Programming Interface to BRLTTY. @@ -470,10 +493,9 @@ make %install -make install install-documents install-messages install-systemd +make install install-documents install-messages +make install-systemd install-udev install -m 644 Documents/brltty.conf "${RPM_BUILD_ROOT}%{_sysconfdir}" -install -d "${RPM_BUILD_ROOT}%{_systemddir}" -install -m 644 Autostart/Systemd/brltty.service "${RPM_BUILD_ROOT}%{_systemddir}/brltty.service" %find_lang %{name} %clean @@ -494,6 +516,7 @@ %exclude %{_libdir}/brltty/libbrlttyxa2.so %exclude %{_libdir}/brltty/libbrlttyxsc.so %{_sysconfdir}/brltty +%{_datadir}/metainfo/org.a11y.brltty.metainfo.xml %doc %{_mandir}/man1/brltty.1.gz %doc %{_docdir}/*/LICENSE* %doc %{_docdir}/*/README* @@ -504,7 +527,6 @@ %doc %{_docdir}/*/KeyTables %doc %{_docdir}/*/Manual-BRLTTY %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/brltty.conf -%{_systemddir}/brltty.service %files -n brltty-braille-brlapi %{_libdir}/brltty/libbrlttybba.so @@ -540,26 +562,30 @@ %{_includedir}/brltty %files -n brltty-systemd -/usr/lib/systemd/system/brltty.* -/usr/lib/systemd/system/brltty@.* +%{_systemddir}/* %{_sbindir}/brltty-systemd-* +%files -n brltty-udev +%{_udevlibdir}/* +%{_udevrulesdir}/* + %files -n brlapi %defattr(-,root,root) %{_libdir}/libbrlapi.so.* +%{_datadir}/polkit-1/actions/org.a11y.brlapi.policy %doc %{_docdir}/*/Manual-BrlAPI -%files -n brlapi-java +%files -n java-brlapi @JAVA_JAR_DIR@/* @JAVA_JNI_DIR@/* -%files -n brlapi-ocaml +%files -n ocaml-brlapi @OCAMLLIB@/brlapi -%files -n brlapi-python +%files -n python-brlapi @PYTHON_SITE_PKG@/[bB]rlapi[-.]* -%files -n brlapi-tcl +%files -n tcl-brlapi @TCL_DIR@/brlapi-@api_release@/libbrlapi_tcl.so @TCL_DIR@/brlapi-@api_release@/pkgIndex.tcl @@ -579,49 +605,77 @@ %doc %{_mandir}/man1/xbrlapi.1.gz %doc %{_mandir}/man1/eutp.1.gz %doc %{_mandir}/man1/vstp.1.gz -/usr/share/gdm/greeter/autostart/xbrlapi.desktop +%{_sysconfdir}/X11/Xsession.d/60xbrlapi +%{_datadir}/gdm/greeter/autostart/xbrlapi.desktop %changelog -* Tue Jun 28 2016 Dave Mielke 5.4 -Core changes: - The Delayed Cursor Tracking feature (and preference) has been added. - Stuck keys are now automatically released after a specifiable timeout. - Touch events no longer interfere with Learn Mode. - Support for the Polkit authorization manager has been added. - A couple of memory corruption issues have been resolved. -USB fixes: - Device disconnect detection has been improved. - Excessive CPU consumption for some older serial adapters has been resolved. +* Tue Apr 18 2017 Dave Mielke 5.5 +General changes: + The braille and speech banners no longer include the revision identifier. + The -o (--override-preference=) option has been added. + quiet-if-no-braille can be specified via the configuration file. + Cursor routing hangs have been resolved. + The Log Messages submenu (for warnings and errors) has been added. + Support for panning within a long alert message has been added. + Alert beeps work on a Linux serial console. + The Greek text table has been improved. +Braille device changes: + The default is to check both USB and Bluetooth (not just USB). + Specifying the Bluetooth address is no longer mandatory. + A prefix of a Bluetooth device's name can be specified. + A generic USB serial adapter is probed only if it's been customized. Baum braille driver changes: - More bindings have been defined for models that have the B11 key. - False reporting of input timeouts has been resolved. - Handling of unknown packet types has been improved. + Support for the Vario Ultra has been improved. + Support for the Orbit 20 has been added. +EuroBraille braille driver changes: + More Esytime bindings have been added. + Support has been added for the EsysLight 80 and the Esytime Evolution. HandyTech braille driver changes: - Model detection on Windows has been fixed. - Output errors now restart the driver. + Support has been added for the Actilino. + The rocker keys can be used for efficient navigation of the menu. + B4+B5 has been bound to Command Learn Mode. + The (now redundant) keypad binding for Command Learn Mode has been removed. + The Bluetooth names of the Active Star and the Braillino are recognized. HIMS braille driver changes: - Support for the Smart Beetle has been added. - Newer firmware resolution of qwerty key code conflicts is supported. + Function key bindings have been added for models with four scroll keys. +TTY braille driver changes: + The braille cells are shown (in addition to the text). HumanWare braille driver changes: - Several USB connection problems have been resolved. - The newer HID-based USB protocol is supported. - The Brailliant B 80's Bluetooth device name is recognized. -Papenmeier braille driver changes: - Clipboard bindings have been added that work on EL-C models. - Bar bindings for the menu now work on EL models that don't have switches. - Bindings may now be defined that use a routing key and an EL key. -XWindow braille driver changes: - Fixed-size font restrictions have been removed. + The Braille Note is autodetected when using USB. + Support has been added for the Braille Note Touch. +Polkit changes: + The policy file is installed. + The policy has been renamed to org.a11y.brlapi (from org.brltty). + Initialization doesn't delay BRLTTY startup. +Systemd changes: + The default instance is now brltty.target (not brltty.service). + Multiple instances can be managed (via brltty@.target instances). + A make file has been added to simplify unit and wrapper installation. + BRLTTY isn't started until Udev has finished initializing. + BRLTTY isn't automatically restarted if it terminates cleanly. +Udev changes: + A make file has been added to simplify rules and wrapper installation. +BrlAPI changes: + The version is now 0.6.6 (it was 0.6.5). + The server isn't started until the braille driver has started. + Several small fixes. xbrlapi changes: - Brltty restarts are handled. - Logs written to .xsession have been improved. -brltty-trtxt changes: - The -b [--no-base-characters] option has been added. -Systemd/Udev changes: - Multiple USB braille devices are handled - each starts its own brltty. - Disconnecting a USB braille device stops the associated brltty. -Updated Tables: - The en_CA (English Canada) text table. - The zh_tw (Chinese, Taiwan) contraction table. + The X11 and gdm autostart files are installed. + Constantly trying to connect when BRLTTY isn't available has been fixed. + Reconnection on every window change has been fixed. +Key table changes: + Common chords for all of the sticky modifier keys have been added. + Listings combine dot keys, e.g. Dots12 instead of Dot1+Dot2. +Android changes: + The cursor no longer jumps back to the start while spaces are being typed. + Customization files can be in internal storage and/or on the SD card. +Windows changes: + Interaction with NVDA has been revived. + LibUSB can be used on a 64-bit system. + Builds can be done on MinGW64. +Build changes: + AppStream metainfo is maintained and installed. + The new Speech Dispatcher installation layout is supported. + Fixes to support building on Solaris 10 and 11 with C99. diff -Nru brltty-5.4/cfg-android brltty-5.5/cfg-android --- brltty-5.4/cfg-android 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/cfg-android 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/cfg-darwin brltty-5.5/cfg-darwin --- brltty-5.4/cfg-darwin 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/cfg-darwin 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/cfg-dos brltty-5.5/cfg-dos --- brltty-5.4/cfg-dos 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/cfg-dos 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/cfg-grub brltty-5.5/cfg-grub --- brltty-5.4/cfg-grub 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/cfg-grub 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/cfg-iris brltty-5.5/cfg-iris --- brltty-5.4/cfg-iris 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/cfg-iris 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/chkhdrs brltty-5.5/chkhdrs --- brltty-5.4/chkhdrs 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/chkhdrs 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/common.mk brltty-5.5/common.mk --- brltty-5.4/common.mk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/common.mk 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -111,6 +111,10 @@ install-include-directory: $(INSTALL_DIRECTORY) $(INSTALL_INCLUDE_DIRECTORY) +INSTALL_METAINFO_DIRECTORY = $(INSTALL_ROOT)$(datadir)/metainfo +install-metainfo-directory: + $(INSTALL_DIRECTORY) $(INSTALL_METAINFO_DIRECTORY) + INSTALL_APILIB_DIRECTORY = $(INSTALL_ROOT)$(libdir) install-apilib-directory: $(INSTALL_DIRECTORY) $(INSTALL_APILIB_DIRECTORY) @@ -123,7 +127,15 @@ install-apisoc-directory: -$(INSTALL_DIRECTORY) -m 1777 $(INSTALL_APISOC_DIRECTORY) -INSTALL_GDM_AUTOSTART_DIRECTORY = $(INSTALL_ROOT)$(GDM_AUTOSTART_DIRECTORY) +INSTALL_APIPOL_DIRECTORY = $(INSTALL_ROOT)$(datadir)/polkit-1/actions +install-apipol-directory: + -$(INSTALL_DIRECTORY) $(INSTALL_APIPOL_DIRECTORY) + +INSTALL_X11_AUTOSTART_DIRECTORY = $(INSTALL_ROOT)$(sysconfdir)/X11/Xsession.d +install-x11-autostart-directory: + -$(INSTALL_DIRECTORY) $(INSTALL_X11_AUTOSTART_DIRECTORY) + +INSTALL_GDM_AUTOSTART_DIRECTORY = $(INSTALL_ROOT)$(datadir)/gdm/greeter/autostart install-gdm-autostart-directory: $(INSTALL_DIRECTORY) $(INSTALL_GDM_AUTOSTART_DIRECTORY) diff -Nru brltty-5.4/config.h.in brltty-5.5/config.h.in --- brltty-5.4/config.h.in 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/config.h.in 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -119,6 +119,9 @@ /* Define this if the function localtime_r is declared. */ #undef HAVE_DECL_LOCALTIME_R +/* Define this if the package dbus is available. */ +#undef HAVE_PKG_DBUS + #ifndef __MINGW32__ /* Define this if the header file sys/poll.h exists. */ #undef HAVE_SYS_POLL_H @@ -478,7 +481,7 @@ /* Define this to include contraction table support. */ #undef ENABLE_CONTRACTED_BRAILLE -/* Define this to include speech synthesizer support. */ +/* Define this to include speech synthesizer and text-to-speech engine support. */ #undef ENABLE_SPEECH_SUPPORT /* Define this to be a string containing the path to the root of the FestivalLite package. */ @@ -487,9 +490,6 @@ /* Define this to be a string containing the path to the root of the Mikropuhe package. */ #undef MIKROPUHE_ROOT -/* Define this to be a string containing the path to the root of the SpeechDispatcher package. */ -#undef SPEECHD_ROOT - /* Define this to be a string containing the path to the root of the Swift package. */ #undef SWIFT_ROOT diff -Nru brltty-5.4/config.mk.in brltty-5.5/config.mk.in --- brltty-5.4/config.mk.in 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/config.mk.in 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -62,9 +62,9 @@ INSTALL_ROOT = @install_root@ EXECUTE_ROOT = @execute_root@ -XSV_PACKAGE = @xsv_package@ -XSV_INCLUDES = @xsv_includes@ -XSV_LIBS = @xsv_libs@ +X11_PACKAGE = @x11_package@ +X11_INCLUDES = @x11_includes@ +X11_LIBS = @x11_libs@ XEXT_PACKAGE = @xext_package@ XEXT_INCLUDES = @xext_includes@ @@ -233,9 +233,9 @@ IO_OBJECTS = io_misc.$O gio.$O gio_null.$O $(SERIAL_OBJECTS) $(USB_OBJECTS) $(BLUETOOTH_OBJECTS) $(MOUNT_OBJECTS) TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $(FM_OBJECTS) ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O -BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS) +BASE_OBJECTS = log.$O log_history.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS) OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS) -PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS) +PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS) CC = @CC@ CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@ @@ -372,7 +372,8 @@ FLITE_LEXICON = @flite_lexicon@ FLITE_VOICE = @flite_voice@ MIKROPUHE_ROOT = @mikropuhe_root@ -SPEECHD_ROOT = @speechd_root@ +SPEECHD_INCLUDES = @speechd_includes@ +SPEECHD_LIBS = @speechd_libs@ SWIFT_ROOT = @swift_root@ THETA_ROOT = @theta_root@ VIAVOICE_ROOT = @viavoice_root@ diff -Nru brltty-5.4/config.sh.in brltty-5.5/config.sh.in --- brltty-5.4/config.sh.in 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/config.sh.in 2017-04-18 22:35:14.000000000 +0000 @@ -4,7 +4,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/configure brltty-5.5/configure --- brltty-5.4/configure 2016-06-28 11:21:56.000000000 +0000 +++ brltty-5.5/configure 2017-04-18 22:38:39.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for BRLTTY 5.4. +# Generated by GNU Autoconf 2.69 for BRLTTY 5.5. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='BRLTTY' PACKAGE_TARNAME='brltty' -PACKAGE_VERSION='5.4' -PACKAGE_STRING='BRLTTY 5.4' +PACKAGE_VERSION='5.5' +PACKAGE_STRING='BRLTTY 5.5' PACKAGE_BUGREPORT='brltty@mielke.cc' PACKAGE_URL='http://brltty.com/' @@ -626,6 +626,7 @@ ac_subst_vars='LTLIBOBJS LIBOBJS install_drivers +api_socket_directory UPDATABLE_DIRECTORY CONFIGURATION_DIRECTORY DRIVERS_DIRECTORY @@ -644,9 +645,6 @@ brltty_external_codes_screen brltty_item_names_screen brltty_item_codes_screen -dbus_libs -dbus_includes -dbus_package screen_libraries_a2 atspi2_libs atspi2_includes @@ -687,6 +685,9 @@ swift_root speech_libraries_sd speechd_root +speechd_libs +speechd_includes +speechd_package speech_libraries_mp mikropuhe_root speech_libraries_gs @@ -763,6 +764,9 @@ bluetooth_libs bluetooth_includes bluetooth_package +dbus_libs +dbus_includes +dbus_package usb_libs usb_includes usb_package @@ -832,9 +836,9 @@ all_xbrlapi xtk_libs xkb_libs -xsv_libs -xsv_includes -xsv_package +x11_libs +x11_includes +x11_package xt_libs xt_includes xt_package @@ -949,7 +953,6 @@ CFLAGS CC SET_MAKE -gdm_autostart_directory include_directory manpage_directory LANGUAGE_PROFILE_EXTENSION @@ -1044,7 +1047,6 @@ with_tables_directory with_manpage_directory with_include_directory -with_gdm_autostart_directory with_init_path with_stderr_path enable_standalone_programs @@ -1662,7 +1664,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures BRLTTY 5.4 to adapt to many kinds of systems. +\`configure' configures BRLTTY 5.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1728,7 +1730,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of BRLTTY 5.4:";; + short | recursive ) echo "Configuration of BRLTTY 5.5:";; esac cat <<\_ACEOF @@ -1750,7 +1752,8 @@ --disable-x support for X11 --disable-contracted-braille in-line contracted braille --disable-gpm mouse tracking via GPM - --disable-speech-support support for speech synthesizers + --disable-speech-support support for speech synthesizers and + text-to-speech engines --enable-relocatable-install installation using paths relative to the program directory --disable-stripping stripping of executables and shared objects @@ -1776,8 +1779,6 @@ path to directory containing manual pages --with-include-directory=DIRECTORY path to directory containing header files - --with-gdm-autostart-directory=DIRECTORY - path to gdm autostart directory --with-init-path=FILE path to real init program --with-stderr-path=FILE path to standard error log file --with-api-parameters=DRIVER:PARAMETER=SETTING... (comma-separated) @@ -2087,7 +2088,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -BRLTTY configure 5.4 +BRLTTY configure 5.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2806,7 +2807,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by BRLTTY $as_me 5.4, which was +It was created by BRLTTY $as_me 5.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3160,7 +3161,7 @@ api_minor=6 -api_revision=5 +api_revision=6 api_version=${api_major}.${api_minor} @@ -3684,26 +3685,6 @@ brltty_summary_lines="${brltty_summary_lines} include-directory: ${include_directory}" - -# Check whether --with-gdm-autostart-directory was given. -if test "${with_gdm_autostart_directory+set}" = set; then : - withval=$with_gdm_autostart_directory; gdm_autostart_directory="${withval}" -else - gdm_autostart_directory="yes" -fi - -if test "${gdm_autostart_directory}" = "no" -then - as_fn_error $? "gdm-autostart-directory not specified" "$LINENO" 5 -elif test "${gdm_autostart_directory}" = "yes" -then - gdm_autostart_directory="${datadir}/gdm/greeter/autostart" - -fi - -brltty_summary_lines="${brltty_summary_lines} - gdm-autostart-directory: ${gdm_autostart_directory}" - brltty_default_init_path=/sbin/init_real # Check whether --with-init-path was given. @@ -4969,6 +4950,9 @@ linux*|gnu*|kfreebsd*) brltty_prog_cc_sysflags="-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE" ;; + solaris2.1?*) # Solaris 10 & 11 require _XOPEN_SOURCE=600 if using C99 + brltty_prog_cc_sysflags="-D_XOPEN_SOURCE=600 -D__EXTENSIONS__" + ;; solaris*) brltty_prog_cc_sysflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__" ;; @@ -6941,9 +6925,21 @@ for package_specification in icu-uc do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_ICU 1" >>confdefs.h + + icu_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: icu package: ${icu_package}" >&5 +$as_echo "$as_me: icu package: ${icu_package}" >&6;} + icu_includes=`${PKG_CONFIG} --cflags-only-I "${icu_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: icu includes: ${icu_includes}" >&5 +$as_echo "$as_me: icu includes: ${icu_includes}" >&6;} + icu_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${icu_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: icu libs: ${icu_libs}" >&5 +$as_echo "$as_me: icu libs: ${icu_libs}" >&6;} + cat >>confdefs.h <<_ACEOF #define HAVE_ICU 1 @@ -6959,6 +6955,11 @@ } done +test -n "${icu_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: icu support not available" >&5 +$as_echo "$as_me: WARNING: icu support not available" >&2;} +} + @@ -7087,16 +7088,34 @@ for package_specification in polkit-gobject-1 do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_POLKIT 1" >>confdefs.h + + polkit_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: polkit package: ${polkit_package}" >&5 +$as_echo "$as_me: polkit package: ${polkit_package}" >&6;} + polkit_includes=`${PKG_CONFIG} --cflags-only-I "${polkit_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: polkit includes: ${polkit_includes}" >&5 +$as_echo "$as_me: polkit includes: ${polkit_includes}" >&6;} + polkit_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${polkit_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: polkit libs: ${polkit_libs}" >&5 +$as_echo "$as_me: polkit libs: ${polkit_libs}" >&6;} + $as_echo "#define USE_POLKIT 1" >>confdefs.h + break } done +test -n "${polkit_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: polkit support not available" >&5 +$as_echo "$as_me: WARNING: polkit support not available" >&2;} +} + @@ -7423,7 +7442,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by +# Copyright (C) 2006-2017 by # Samuel Thibault # Sébastien Hinderer # @@ -7963,7 +7982,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Dave Mielke +# Copyright (C) 2006-2017 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # @@ -8461,7 +8480,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2005-2016 by +# Copyright (C) 2005-2017 by # Alexis Robert # Samuel Thibault # @@ -8673,7 +8692,7 @@ if test "${GCC}" = "yes" then - CYTHON_CFLAGS="-Wno-parentheses -Wno-unused -Wno-format -fno-strict-aliasing -U_POSIX_C_SOURCE -U_XOPEN_SOURCE" + CYTHON_CFLAGS="-Wno-parentheses -Wno-unused -fno-strict-aliasing -U_POSIX_C_SOURCE -U_XOPEN_SOURCE" else case "${host_os}" in @@ -8728,7 +8747,7 @@ ############################################################################### # libbrlapi - A library providing access to braille terminals for applications. # -# Copyright (C) 2006-2016 by Dave Mielke +# Copyright (C) 2006-2017 by Dave Mielke # # libbrlapi comes with ABSOLUTELY NO WARRANTY. # @@ -9159,16 +9178,28 @@ if "${brltty_ok}" then - xsv_package="" -xsv_includes="" -xsv_libs="" + x11_package="" +x11_includes="" +x11_libs="" for package_specification in x11 do ${PKG_CONFIG} --exists "${package_specification}" && { - xsv_package="${package_specification%% *}" - xsv_includes=`${PKG_CONFIG} --cflags-only-I "${xsv_package}"` - xsv_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${xsv_package}"` + $as_echo "#define HAVE_PKG_X11 1" >>confdefs.h + + + x11_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: x11 package: ${x11_package}" >&5 +$as_echo "$as_me: x11 package: ${x11_package}" >&6;} + + x11_includes=`${PKG_CONFIG} --cflags-only-I "${x11_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: x11 includes: ${x11_includes}" >&5 +$as_echo "$as_me: x11 includes: ${x11_includes}" >&6;} + + x11_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${x11_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: x11 libs: ${x11_libs}" >&5 +$as_echo "$as_me: x11 libs: ${x11_libs}" >&6;} + all_xbrlapi="all-xbrlapi" install_xbrlapi="install-xbrlapi" @@ -9192,9 +9223,21 @@ for package_specification in xext do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_XEXT 1" >>confdefs.h + + xext_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: xext package: ${xext_package}" >&5 +$as_echo "$as_me: xext package: ${xext_package}" >&6;} + xext_includes=`${PKG_CONFIG} --cflags-only-I "${xext_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: xext includes: ${xext_includes}" >&5 +$as_echo "$as_me: xext includes: ${xext_includes}" >&6;} + xext_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${xext_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: xext libs: ${xext_libs}" >&5 +$as_echo "$as_me: xext libs: ${xext_libs}" >&6;} + xkb_libs="${xext_libs} ${xkb_libs}" xtst_package="" @@ -9204,9 +9247,21 @@ for package_specification in xtst do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_XTST 1" >>confdefs.h + + xtst_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: xtst package: ${xtst_package}" >&5 +$as_echo "$as_me: xtst package: ${xtst_package}" >&6;} + xtst_includes=`${PKG_CONFIG} --cflags-only-I "${xtst_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: xtst includes: ${xtst_includes}" >&5 +$as_echo "$as_me: xtst includes: ${xtst_includes}" >&6;} + xtst_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${xtst_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: xtst libs: ${xtst_libs}" >&5 +$as_echo "$as_me: xtst libs: ${xtst_libs}" >&6;} + xkb_libs="${xtst_libs} ${xkb_libs}" for ac_header in X11/extensions/XTest.h @@ -9238,6 +9293,11 @@ } done +test -n "${xtst_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xtst support not available" >&5 +$as_echo "$as_me: WARNING: xtst support not available" >&2;} +} + @@ -9247,6 +9307,11 @@ } done +test -n "${xext_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xext support not available" >&5 +$as_echo "$as_me: WARNING: xext support not available" >&2;} +} + @@ -9259,16 +9324,28 @@ for package_specification in xt do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_XT 1" >>confdefs.h + + xt_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: xt package: ${xt_package}" >&5 +$as_echo "$as_me: xt package: ${xt_package}" >&6;} + xt_includes=`${PKG_CONFIG} --cflags-only-I "${xt_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: xt includes: ${xt_includes}" >&5 +$as_echo "$as_me: xt includes: ${xt_includes}" >&6;} + xt_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${xt_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: xt libs: ${xt_libs}" >&5 +$as_echo "$as_me: xt libs: ${xt_libs}" >&6;} + xtk_libs="${xt_libs} ${xtk_libs}" brltty_cppflags_save="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${xsv_includes}" + CPPFLAGS="${CPPFLAGS} ${x11_includes}" brltty_libs_save="${LIBS}" - LIBS="${xtk_libs} ${xsv_libs} ${LIBS}" + LIBS="${xtk_libs} ${x11_libs} ${LIBS}" # Check whether --with-gui-toolkit was given. @@ -9452,7 +9529,7 @@ gui-toolkit-package: ${gui_toolkit_package}" } - xtk_libs="${LIBS%${xsv_libs} ${brltty_libs_save}}" + xtk_libs="${LIBS%${x11_libs} ${brltty_libs_save}}" CPPFLAGS="${brltty_cppflags_save}" LIBS="${brltty_libs_save}" @@ -9461,6 +9538,11 @@ } done +test -n "${xt_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xt support not available" >&5 +$as_echo "$as_me: WARNING: xt support not available" >&2;} +} + @@ -9470,6 +9552,11 @@ } done +test -n "${x11_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: x11 support not available" >&5 +$as_echo "$as_me: WARNING: x11 support not available" >&2;} +} + @@ -10967,22 +11054,37 @@ system_includes="" system_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_SYSTEM 1" >>confdefs.h + + system_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: system package: ${system_package}" >&5 +$as_echo "$as_me: system package: ${system_package}" >&6;} + system_includes=`${PKG_CONFIG} --cflags-only-I "${system_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: system includes: ${system_includes}" >&5 +$as_echo "$as_me: system includes: ${system_includes}" >&6;} + system_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${system_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: system libs: ${system_libs}" >&5 +$as_echo "$as_me: system libs: ${system_libs}" >&6;} break + break } done +test -n "${system_package}" || { + : +} + - test -n "${system_package}" && break @@ -11247,22 +11349,37 @@ pgmpath_includes="" pgmpath_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_PGMPATH 1" >>confdefs.h + + pgmpath_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: pgmpath package: ${pgmpath_package}" >&5 +$as_echo "$as_me: pgmpath package: ${pgmpath_package}" >&6;} + pgmpath_includes=`${PKG_CONFIG} --cflags-only-I "${pgmpath_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: pgmpath includes: ${pgmpath_includes}" >&5 +$as_echo "$as_me: pgmpath includes: ${pgmpath_includes}" >&6;} + pgmpath_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${pgmpath_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: pgmpath libs: ${pgmpath_libs}" >&5 +$as_echo "$as_me: pgmpath libs: ${pgmpath_libs}" >&6;} break + break } done +test -n "${pgmpath_package}" || { + : +} + - test -n "${pgmpath_package}" && break @@ -11335,22 +11452,37 @@ service_includes="" service_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_SERVICE 1" >>confdefs.h + + service_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: service package: ${service_package}" >&5 +$as_echo "$as_me: service package: ${service_package}" >&6;} + service_includes=`${PKG_CONFIG} --cflags-only-I "${service_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: service includes: ${service_includes}" >&5 +$as_echo "$as_me: service includes: ${service_includes}" >&6;} + service_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${service_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: service libs: ${service_libs}" >&5 +$as_echo "$as_me: service libs: ${service_libs}" >&6;} break + break } done +test -n "${service_package}" || { + : +} + - test -n "${service_package}" && break @@ -11436,22 +11568,37 @@ params_includes="" params_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_PARAMS 1" >>confdefs.h + + params_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: params package: ${params_package}" >&5 +$as_echo "$as_me: params package: ${params_package}" >&6;} + params_includes=`${PKG_CONFIG} --cflags-only-I "${params_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: params includes: ${params_includes}" >&5 +$as_echo "$as_me: params includes: ${params_includes}" >&6;} + params_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${params_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: params libs: ${params_libs}" >&5 +$as_echo "$as_me: params libs: ${params_libs}" >&6;} break + break } done +test -n "${params_package}" || { + : +} + - test -n "${params_package}" && break @@ -11530,22 +11677,37 @@ dynld_includes="" dynld_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_DYNLD 1" >>confdefs.h + + dynld_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: dynld package: ${dynld_package}" >&5 +$as_echo "$as_me: dynld package: ${dynld_package}" >&6;} + dynld_includes=`${PKG_CONFIG} --cflags-only-I "${dynld_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: dynld includes: ${dynld_includes}" >&5 +$as_echo "$as_me: dynld includes: ${dynld_includes}" >&6;} + dynld_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${dynld_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: dynld libs: ${dynld_libs}" >&5 +$as_echo "$as_me: dynld libs: ${dynld_libs}" >&6;} break + break } done +test -n "${dynld_package}" || { + : +} + - test -n "${dynld_package}" && break case "${package}" in @@ -11719,22 +11881,37 @@ charset_includes="" charset_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_CHARSET 1" >>confdefs.h + + charset_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: charset package: ${charset_package}" >&5 +$as_echo "$as_me: charset package: ${charset_package}" >&6;} + charset_includes=`${PKG_CONFIG} --cflags-only-I "${charset_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: charset includes: ${charset_includes}" >&5 +$as_echo "$as_me: charset includes: ${charset_includes}" >&6;} + charset_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${charset_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: charset libs: ${charset_libs}" >&5 +$as_echo "$as_me: charset libs: ${charset_libs}" >&6;} break + break } done +test -n "${charset_package}" || { + : +} + - test -n "${charset_package}" && break case "${package}" in @@ -11826,22 +12003,37 @@ hostcmd_includes="" hostcmd_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_HOSTCMD 1" >>confdefs.h + + hostcmd_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: hostcmd package: ${hostcmd_package}" >&5 +$as_echo "$as_me: hostcmd package: ${hostcmd_package}" >&6;} + hostcmd_includes=`${PKG_CONFIG} --cflags-only-I "${hostcmd_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: hostcmd includes: ${hostcmd_includes}" >&5 +$as_echo "$as_me: hostcmd includes: ${hostcmd_includes}" >&6;} + hostcmd_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${hostcmd_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: hostcmd libs: ${hostcmd_libs}" >&5 +$as_echo "$as_me: hostcmd libs: ${hostcmd_libs}" >&6;} break + break } done +test -n "${hostcmd_package}" || { + : +} + - test -n "${hostcmd_package}" && break case "${package}" in @@ -11939,22 +12131,37 @@ mntpt_includes="" mntpt_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_MNTPT 1" >>confdefs.h + + mntpt_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: mntpt package: ${mntpt_package}" >&5 +$as_echo "$as_me: mntpt package: ${mntpt_package}" >&6;} + mntpt_includes=`${PKG_CONFIG} --cflags-only-I "${mntpt_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: mntpt includes: ${mntpt_includes}" >&5 +$as_echo "$as_me: mntpt includes: ${mntpt_includes}" >&6;} + mntpt_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${mntpt_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: mntpt libs: ${mntpt_libs}" >&5 +$as_echo "$as_me: mntpt libs: ${mntpt_libs}" >&6;} break + break } done +test -n "${mntpt_package}" || { + : +} + - test -n "${mntpt_package}" && break case "${package}" in @@ -12068,22 +12275,37 @@ mntfs_includes="" mntfs_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_MNTFS 1" >>confdefs.h + + mntfs_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: mntfs package: ${mntfs_package}" >&5 +$as_echo "$as_me: mntfs package: ${mntfs_package}" >&6;} + mntfs_includes=`${PKG_CONFIG} --cflags-only-I "${mntfs_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: mntfs includes: ${mntfs_includes}" >&5 +$as_echo "$as_me: mntfs includes: ${mntfs_includes}" >&6;} + mntfs_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${mntfs_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: mntfs libs: ${mntfs_libs}" >&5 +$as_echo "$as_me: mntfs libs: ${mntfs_libs}" >&6;} break + break } done +test -n "${mntfs_package}" || { + : +} + - test -n "${mntfs_package}" && break @@ -12155,22 +12377,37 @@ kbd_includes="" kbd_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_KBD 1" >>confdefs.h + + kbd_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: kbd package: ${kbd_package}" >&5 +$as_echo "$as_me: kbd package: ${kbd_package}" >&6;} + kbd_includes=`${PKG_CONFIG} --cflags-only-I "${kbd_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: kbd includes: ${kbd_includes}" >&5 +$as_echo "$as_me: kbd includes: ${kbd_includes}" >&6;} + kbd_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${kbd_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: kbd libs: ${kbd_libs}" >&5 +$as_echo "$as_me: kbd libs: ${kbd_libs}" >&6;} break + break } done +test -n "${kbd_package}" || { + : +} + - test -n "${kbd_package}" && break @@ -12243,22 +12480,37 @@ bell_includes="" bell_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_BELL 1" >>confdefs.h + + bell_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: bell package: ${bell_package}" >&5 +$as_echo "$as_me: bell package: ${bell_package}" >&6;} + bell_includes=`${PKG_CONFIG} --cflags-only-I "${bell_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: bell includes: ${bell_includes}" >&5 +$as_echo "$as_me: bell includes: ${bell_includes}" >&6;} + bell_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${bell_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: bell libs: ${bell_libs}" >&5 +$as_echo "$as_me: bell libs: ${bell_libs}" >&6;} break + break } done +test -n "${bell_package}" || { + : +} + - test -n "${bell_package}" && break @@ -12331,22 +12583,37 @@ leds_includes="" leds_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_LEDS 1" >>confdefs.h + + leds_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: leds package: ${leds_package}" >&5 +$as_echo "$as_me: leds package: ${leds_package}" >&6;} + leds_includes=`${PKG_CONFIG} --cflags-only-I "${leds_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: leds includes: ${leds_includes}" >&5 +$as_echo "$as_me: leds includes: ${leds_includes}" >&6;} + leds_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${leds_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: leds libs: ${leds_libs}" >&5 +$as_echo "$as_me: leds libs: ${leds_libs}" >&6;} break + break } done +test -n "${leds_package}" || { + : +} + - test -n "${leds_package}" && break @@ -12446,22 +12713,37 @@ beep_includes="" beep_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_BEEP 1" >>confdefs.h + + beep_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: beep package: ${beep_package}" >&5 +$as_echo "$as_me: beep package: ${beep_package}" >&6;} + beep_includes=`${PKG_CONFIG} --cflags-only-I "${beep_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: beep includes: ${beep_includes}" >&5 +$as_echo "$as_me: beep includes: ${beep_includes}" >&6;} + beep_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${beep_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: beep libs: ${beep_libs}" >&5 +$as_echo "$as_me: beep libs: ${beep_libs}" >&6;} break + break } done +test -n "${beep_package}" || { + : +} + - test -n "${beep_package}" && break @@ -12555,22 +12837,37 @@ pcm_includes="" pcm_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_PCM 1" >>confdefs.h + + pcm_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: pcm package: ${pcm_package}" >&5 +$as_echo "$as_me: pcm package: ${pcm_package}" >&6;} + pcm_includes=`${PKG_CONFIG} --cflags-only-I "${pcm_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: pcm includes: ${pcm_includes}" >&5 +$as_echo "$as_me: pcm includes: ${pcm_includes}" >&6;} + pcm_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${pcm_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: pcm libs: ${pcm_libs}" >&5 +$as_echo "$as_me: pcm libs: ${pcm_libs}" >&6;} break + break } done +test -n "${pcm_package}" || { + : +} + - test -n "${pcm_package}" && break case "${package}" in @@ -12666,22 +12963,37 @@ midi_includes="" midi_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_MIDI 1" >>confdefs.h + + midi_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: midi package: ${midi_package}" >&5 +$as_echo "$as_me: midi package: ${midi_package}" >&6;} + midi_includes=`${PKG_CONFIG} --cflags-only-I "${midi_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: midi includes: ${midi_includes}" >&5 +$as_echo "$as_me: midi includes: ${midi_includes}" >&6;} + midi_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${midi_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: midi libs: ${midi_libs}" >&5 +$as_echo "$as_me: midi libs: ${midi_libs}" >&6;} break + break } done +test -n "${midi_package}" || { + : +} + - test -n "${midi_package}" && break case "${package}" in @@ -12767,22 +13079,37 @@ fm_includes="" fm_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_FM 1" >>confdefs.h + + fm_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: fm package: ${fm_package}" >&5 +$as_echo "$as_me: fm package: ${fm_package}" >&6;} + fm_includes=`${PKG_CONFIG} --cflags-only-I "${fm_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: fm includes: ${fm_includes}" >&5 +$as_echo "$as_me: fm includes: ${fm_includes}" >&6;} + fm_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${fm_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: fm libs: ${fm_libs}" >&5 +$as_echo "$as_me: fm libs: ${fm_libs}" >&6;} break + break } done +test -n "${fm_package}" || { + : +} + - test -n "${fm_package}" && break case "${package}" in @@ -12871,22 +13198,37 @@ serial_includes="" serial_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_SERIAL 1" >>confdefs.h + + serial_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: serial package: ${serial_package}" >&5 +$as_echo "$as_me: serial package: ${serial_package}" >&6;} + serial_includes=`${PKG_CONFIG} --cflags-only-I "${serial_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: serial includes: ${serial_includes}" >&5 +$as_echo "$as_me: serial includes: ${serial_includes}" >&6;} + serial_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${serial_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: serial libs: ${serial_libs}" >&5 +$as_echo "$as_me: serial libs: ${serial_libs}" >&6;} break + break } done +test -n "${serial_package}" || { + : +} + - test -n "${serial_package}" && break case "${package}" in @@ -13103,22 +13445,37 @@ usb_includes="" usb_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_USB 1" >>confdefs.h + + usb_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: usb package: ${usb_package}" >&5 +$as_echo "$as_me: usb package: ${usb_package}" >&6;} + usb_includes=`${PKG_CONFIG} --cflags-only-I "${usb_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: usb includes: ${usb_includes}" >&5 +$as_echo "$as_me: usb includes: ${usb_includes}" >&6;} + usb_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${usb_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: usb libs: ${usb_libs}" >&5 +$as_echo "$as_me: usb libs: ${usb_libs}" >&6;} break + break } done +test -n "${usb_package}" || { + : +} + - test -n "${usb_package}" && break case "${package}" in @@ -13253,6 +13610,45 @@ ac_cv_lib_bluetooth=ac_cv_lib_bluetooth_main + dbus_package="" +dbus_includes="" +dbus_libs="" + +for package_specification in "dbus-1 >= 1.0" +do + ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_DBUS 1" >>confdefs.h + + + dbus_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: dbus package: ${dbus_package}" >&5 +$as_echo "$as_me: dbus package: ${dbus_package}" >&6;} + + dbus_includes=`${PKG_CONFIG} --cflags-only-I "${dbus_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: dbus includes: ${dbus_includes}" >&5 +$as_echo "$as_me: dbus includes: ${dbus_includes}" >&6;} + + dbus_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${dbus_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: dbus libs: ${dbus_libs}" >&5 +$as_echo "$as_me: dbus libs: ${dbus_libs}" >&6;} + + bluetooth_includes="${dbus_includes}" + bluetooth_libs="${dbus_libs}" + + break + } +done + +test -n "${dbus_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dbus support not available" >&5 +$as_echo "$as_me: WARNING: dbus support not available" >&2;} +} + + + + + + fi @@ -13273,22 +13669,37 @@ bluetooth_includes="" bluetooth_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_BLUETOOTH 1" >>confdefs.h + + bluetooth_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: bluetooth package: ${bluetooth_package}" >&5 +$as_echo "$as_me: bluetooth package: ${bluetooth_package}" >&6;} + bluetooth_includes=`${PKG_CONFIG} --cflags-only-I "${bluetooth_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: bluetooth includes: ${bluetooth_includes}" >&5 +$as_echo "$as_me: bluetooth includes: ${bluetooth_includes}" >&6;} + bluetooth_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${bluetooth_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: bluetooth libs: ${bluetooth_libs}" >&5 +$as_echo "$as_me: bluetooth libs: ${bluetooth_libs}" >&6;} break + break } done +test -n "${bluetooth_package}" || { + : +} + - test -n "${bluetooth_package}" && break @@ -13379,22 +13790,37 @@ ports_includes="" ports_libs="" -for package_specification in "${package}" +for package_specification in ${package} do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_PORTS 1" >>confdefs.h + + ports_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: ports package: ${ports_package}" >&5 +$as_echo "$as_me: ports package: ${ports_package}" >&6;} + ports_includes=`${PKG_CONFIG} --cflags-only-I "${ports_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: ports includes: ${ports_includes}" >&5 +$as_echo "$as_me: ports includes: ${ports_includes}" >&6;} + ports_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${ports_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: ports libs: ${ports_libs}" >&5 +$as_echo "$as_me: ports libs: ${ports_libs}" >&6;} break + break } done +test -n "${ports_package}" || { + : +} + - test -n "${ports_package}" && break @@ -13527,44 +13953,59 @@ fi + +libbraille_found=false + + + if test "${libbraille_root}" = "no" then libbraille_root="" elif test "${libbraille_root}" = "yes" then - libbraille_root="" - roots="/usr /usr/local /usr/local/Libbraille /usr/local/libbraille /opt/Libbraille /opt/libbraille /mingw /mingw/Libbraille /mingw/libbraille" - for root in ${roots} - do - if test -f "${root}/include/braille.h" - then - libbraille_root="${root}" - break - fi - done - if test -z "${libbraille_root}" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libbraille package not found: ${roots}" >&5 + "${libbraille_found}" || { + libbraille_root="" + roots="/usr /usr/local /usr/local/Libbraille /usr/local/libbraille /opt/Libbraille /opt/libbraille /mingw /mingw/Libbraille /mingw/libbraille" + + for root in ${roots} + do + test -f "${root}/include/braille.h" && { + libbraille_root="${root}" + { $as_echo "$as_me:${as_lineno-$LINENO}: Libbraille root: ${libbraille_root}" >&5 +$as_echo "$as_me: Libbraille root: ${libbraille_root}" >&6;} + break + } + done + + if test -z "${libbraille_root}" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libbraille package not found: ${roots}" >&5 $as_echo "$as_me: WARNING: Libbraille package not found: ${roots}" >&2;} - fi + fi + } fi + brltty_summary_lines="${brltty_summary_lines} libbraille-root: ${libbraille_root}" -if test -n "${libbraille_root}" -then + +test -n "${libbraille_root}" && { cat >>confdefs.h <<_ACEOF #define LIBBRAILLE_ROOT "${libbraille_root}" _ACEOF + + + brltty_item_entries_braille="${brltty_item_entries_braille} lb-Libbraille" brltty_item_codes_braille="${brltty_item_codes_braille} lb" brltty_item_names_braille="${brltty_item_names_braille} Libbraille" braille_libraries_lb='-L$(LIBBRAILLE_ROOT)/lib -lbraille' -fi +} + brltty_item_entries_braille="${brltty_item_entries_braille} lt-LogText" brltty_item_codes_braille="${brltty_item_codes_braille} lt" brltty_item_names_braille="${brltty_item_names_braille} LogText" @@ -13654,7 +14095,7 @@ brltty_item_entries_braille="${brltty_item_entries_braille} xw-XWindow" brltty_item_codes_braille="${brltty_item_codes_braille} xw" brltty_item_names_braille="${brltty_item_names_braille} XWindow" -braille_libraries_xw='$(XTK_LIBS) $(XSV_LIBS)' +braille_libraries_xw='$(XTK_LIBS) $(X11_LIBS)' } case "${host_os}" @@ -14050,9 +14491,13 @@ braille_device="" elif test "${braille_device}" = "yes" then - if test "${usb_package}" != "none" + braille_device="" + test "${usb_package}" != "none" && braille_device="${braille_device},usb:" + test "${bluetooth_package}" != "none" && braille_device="${braille_device},bluetooth:" + + if test -n "${braille_device}" then - braille_device="usb:" + braille_device="${braille_device#,}" else braille_device="serial:${serial_first_device}" fi @@ -14260,6 +14705,7 @@ speech_libraries_cb='' + # Check whether --with-espeak was given. if test "${with_espeak+set}" = set; then : withval=$with_espeak; espeak_root="${withval}" @@ -14268,43 +14714,60 @@ fi + +espeak_found=false + + + if test "${espeak_root}" = "no" then espeak_root="" elif test "${espeak_root}" = "yes" then - espeak_root="" - roots="/usr /usr/local /usr/local/eSpeak /usr/local/espeak /opt/eSpeak /opt/espeak /mingw /mingw/eSpeak /mingw/espeak" - for root in ${roots} - do - if test -f "${root}/include/espeak/speak_lib.h" + "${espeak_found}" || { + espeak_root="" + roots="/usr /usr/local /usr/local/eSpeak /usr/local/espeak /opt/eSpeak /opt/espeak /mingw /mingw/eSpeak /mingw/espeak" + + for root in ${roots} + do + test -f "${root}/include/espeak/speak_lib.h" && { + espeak_root="${root}" + { $as_echo "$as_me:${as_lineno-$LINENO}: eSpeak root: ${espeak_root}" >&5 +$as_echo "$as_me: eSpeak root: ${espeak_root}" >&6;} + break + } + done + + if test -z "${espeak_root}" then - espeak_root="${root}" - break - fi - done - if test -z "${espeak_root}" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: eSpeak package not found: ${roots}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: eSpeak package not found: ${roots}" >&5 $as_echo "$as_me: WARNING: eSpeak package not found: ${roots}" >&2;} - fi + fi + } fi + brltty_summary_lines="${brltty_summary_lines} espeak-root: ${espeak_root}" -if test -n "${espeak_root}" -then + +test -n "${espeak_root}" && { cat >>confdefs.h <<_ACEOF #define ESPEAK_ROOT "${espeak_root}" _ACEOF - brltty_item_entries_speech="${brltty_item_entries_speech} es-eSpeak" + + + + brltty_item_entries_speech="${brltty_item_entries_speech} es-eSpeak" brltty_item_codes_speech="${brltty_item_codes_speech} es" brltty_item_names_speech="${brltty_item_names_speech} eSpeak" speech_libraries_es='-L$(ESPEAK_ROOT)/lib -lespeak' -fi + +} + + # Check whether --with-flite was given. if test "${with_flite+set}" = set; then : @@ -14314,38 +14777,52 @@ fi + +flite_found=false + + + if test "${flite_root}" = "no" then flite_root="" elif test "${flite_root}" = "yes" then - flite_root="" - roots="/usr /usr/local /usr/local/FestivalLite /usr/local/flite /opt/FestivalLite /opt/flite /mingw /mingw/FestivalLite /mingw/flite" - for root in ${roots} - do - if test -f "${root}/include/flite/flite.h" + "${flite_found}" || { + flite_root="" + roots="/usr /usr/local /usr/local/FestivalLite /usr/local/flite /opt/FestivalLite /opt/flite /mingw /mingw/FestivalLite /mingw/flite" + + for root in ${roots} + do + test -f "${root}/include/flite/flite.h" && { + flite_root="${root}" + { $as_echo "$as_me:${as_lineno-$LINENO}: FestivalLite root: ${flite_root}" >&5 +$as_echo "$as_me: FestivalLite root: ${flite_root}" >&6;} + break + } + done + + if test -z "${flite_root}" then - flite_root="${root}" - break - fi - done - if test -z "${flite_root}" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FestivalLite package not found: ${roots}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: FestivalLite package not found: ${roots}" >&5 $as_echo "$as_me: WARNING: FestivalLite package not found: ${roots}" >&2;} - fi + fi + } fi + brltty_summary_lines="${brltty_summary_lines} flite-root: ${flite_root}" -if test -n "${flite_root}" -then + +test -n "${flite_root}" && { cat >>confdefs.h <<_ACEOF #define FLITE_ROOT "${flite_root}" _ACEOF + + + # Check whether --with-flite-language was given. if test "${with_flite_language+set}" = set; then : withval=$with_flite_language; flite_language="${withval}" @@ -14411,7 +14888,9 @@ speech_libraries_fl='-L$(FLITE_ROOT)/lib -lflite_$(FLITE_VOICE) -lflite_$(FLITE_LEXICON) -lflite_$(FLITE_LANGUAGE) -lflite -lm' -fi +} + + brltty_item_entries_speech="${brltty_item_entries_speech} fv-Festival" brltty_item_codes_speech="${brltty_item_codes_speech} fv" brltty_item_names_speech="${brltty_item_names_speech} Festival" @@ -14423,6 +14902,7 @@ speech_libraries_gs='' + # Check whether --with-mikropuhe was given. if test "${with_mikropuhe+set}" = set; then : withval=$with_mikropuhe; mikropuhe_root="${withval}" @@ -14431,46 +14911,64 @@ fi + +mikropuhe_found=false + + + if test "${mikropuhe_root}" = "no" then mikropuhe_root="" elif test "${mikropuhe_root}" = "yes" then - mikropuhe_root="" - roots="/usr /usr/local /usr/local/Mikropuhe /usr/local/mikropuhe /opt/Mikropuhe /opt/mikropuhe /mingw /mingw/Mikropuhe /mingw/mikropuhe" - for root in ${roots} - do - if test -f "${root}/mpwrfile.h" + "${mikropuhe_found}" || { + mikropuhe_root="" + roots="/usr /usr/local /usr/local/Mikropuhe /usr/local/mikropuhe /opt/Mikropuhe /opt/mikropuhe /mingw /mingw/Mikropuhe /mingw/mikropuhe" + + for root in ${roots} + do + test -f "${root}/mpwrfile.h" && { + mikropuhe_root="${root}" + { $as_echo "$as_me:${as_lineno-$LINENO}: Mikropuhe root: ${mikropuhe_root}" >&5 +$as_echo "$as_me: Mikropuhe root: ${mikropuhe_root}" >&6;} + break + } + done + + if test -z "${mikropuhe_root}" then - mikropuhe_root="${root}" - break - fi - done - if test -z "${mikropuhe_root}" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Mikropuhe package not found: ${roots}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Mikropuhe package not found: ${roots}" >&5 $as_echo "$as_me: WARNING: Mikropuhe package not found: ${roots}" >&2;} - fi + fi + } fi + brltty_summary_lines="${brltty_summary_lines} mikropuhe-root: ${mikropuhe_root}" -if test -n "${mikropuhe_root}" -then + +test -n "${mikropuhe_root}" && { cat >>confdefs.h <<_ACEOF #define MIKROPUHE_ROOT "${mikropuhe_root}" _ACEOF + + + test "${brltty_cv_have_pthreads}" = "yes" && { - brltty_item_entries_speech="${brltty_item_entries_speech} mp-Mikropuhe" + brltty_item_entries_speech="${brltty_item_entries_speech} mp-Mikropuhe" brltty_item_codes_speech="${brltty_item_codes_speech} mp" brltty_item_names_speech="${brltty_item_names_speech} Mikropuhe" speech_libraries_mp='-L$(MPLINUX_ROOT) -lmplinux' + +} + } -fi + + # Check whether --with-speechd was given. if test "${with_speechd+set}" = set; then : @@ -14480,43 +14978,98 @@ fi + +speechd_found=false + +speechd_package="" +speechd_includes="" +speechd_libs="" + +for package_specification in speech-dispatcher +do + ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_SPEECHD 1" >>confdefs.h + + + speechd_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: speechd package: ${speechd_package}" >&5 +$as_echo "$as_me: speechd package: ${speechd_package}" >&6;} + + speechd_includes=`${PKG_CONFIG} --cflags-only-I "${speechd_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: speechd includes: ${speechd_includes}" >&5 +$as_echo "$as_me: speechd includes: ${speechd_includes}" >&6;} + + speechd_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${speechd_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: speechd libs: ${speechd_libs}" >&5 +$as_echo "$as_me: speechd libs: ${speechd_libs}" >&6;} + + speechd_found=true + break + } +done + +test -n "${speechd_package}" || { + : +} + + + + + + if test "${speechd_root}" = "no" then speechd_root="" elif test "${speechd_root}" = "yes" then - speechd_root="" - roots="/usr /usr/local /usr/local/speech-dispatcher /usr/local/speechd /opt/speech-dispatcher /opt/speechd /mingw /mingw/speech-dispatcher /mingw/speechd" - for root in ${roots} - do - if test -f "${root}/include/libspeechd.h" + "${speechd_found}" || { + speechd_root="" + roots="/usr /usr/local /usr/local/speech-dispatcher /usr/local/speechd /opt/speech-dispatcher /opt/speechd /mingw /mingw/speech-dispatcher /mingw/speechd" + + for root in ${roots} + do + test -f "${root}/include/libspeechd.h" && { + speechd_root="${root}" + { $as_echo "$as_me:${as_lineno-$LINENO}: speech-dispatcher root: ${speechd_root}" >&5 +$as_echo "$as_me: speech-dispatcher root: ${speechd_root}" >&6;} + break + } + done + + if test -z "${speechd_root}" then - speechd_root="${root}" - break - fi - done - if test -z "${speechd_root}" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: speech-dispatcher package not found: ${roots}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: speech-dispatcher package not found: ${roots}" >&5 $as_echo "$as_me: WARNING: speech-dispatcher package not found: ${roots}" >&2;} - fi + fi + } fi + brltty_summary_lines="${brltty_summary_lines} speechd-root: ${speechd_root}" -if test -n "${speechd_root}" -then + +test -n "${speechd_root}" && { cat >>confdefs.h <<_ACEOF #define SPEECHD_ROOT "${speechd_root}" _ACEOF - brltty_item_entries_speech="${brltty_item_entries_speech} sd-SpeechDispatcher" + + test "${speechd_root}" = "yes" || { + speechd_includes="-I${speechd_root}/include" + speechd_libs="-L${speechd_root}/lib -lspeechd" + } + + + brltty_item_entries_speech="${brltty_item_entries_speech} sd-SpeechDispatcher" brltty_item_codes_speech="${brltty_item_codes_speech} sd" brltty_item_names_speech="${brltty_item_names_speech} SpeechDispatcher" -speech_libraries_sd='-L$(SPEECHD_ROOT)/lib -lspeechd' +speech_libraries_sd='' + + +} + -fi # Check whether --with-swift was given. if test "${with_swift+set}" = set; then : @@ -14526,43 +15079,60 @@ fi + +swift_found=false + + + if test "${swift_root}" = "no" then swift_root="" elif test "${swift_root}" = "yes" then - swift_root="" - roots="/usr /usr/local /usr/local/Swift /usr/local/swift /opt/Swift /opt/swift /mingw /mingw/Swift /mingw/swift" - for root in ${roots} - do - if test -f "${root}/include/swift.h" + "${swift_found}" || { + swift_root="" + roots="/usr /usr/local /usr/local/Swift /usr/local/swift /opt/Swift /opt/swift /mingw /mingw/Swift /mingw/swift" + + for root in ${roots} + do + test -f "${root}/include/swift.h" && { + swift_root="${root}" + { $as_echo "$as_me:${as_lineno-$LINENO}: Swift root: ${swift_root}" >&5 +$as_echo "$as_me: Swift root: ${swift_root}" >&6;} + break + } + done + + if test -z "${swift_root}" then - swift_root="${root}" - break - fi - done - if test -z "${swift_root}" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Swift package not found: ${roots}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Swift package not found: ${roots}" >&5 $as_echo "$as_me: WARNING: Swift package not found: ${roots}" >&2;} - fi + fi + } fi + brltty_summary_lines="${brltty_summary_lines} swift-root: ${swift_root}" -if test -n "${swift_root}" -then + +test -n "${swift_root}" && { cat >>confdefs.h <<_ACEOF #define SWIFT_ROOT "${swift_root}" _ACEOF - brltty_item_entries_speech="${brltty_item_entries_speech} sw-Swift" + + + + brltty_item_entries_speech="${brltty_item_entries_speech} sw-Swift" brltty_item_codes_speech="${brltty_item_codes_speech} sw" brltty_item_names_speech="${brltty_item_names_speech} Swift" speech_libraries_sw='-L$(SWIFT_ROOT)/lib -lswift -lm' -fi + +} + + # Check whether --with-theta was given. if test "${with_theta+set}" = set; then : @@ -14572,43 +15142,60 @@ fi + +theta_found=false + + + if test "${theta_root}" = "no" then theta_root="" elif test "${theta_root}" = "yes" then - theta_root="" - roots="/usr /usr/local /usr/local/Theta /usr/local/theta /opt/Theta /opt/theta /mingw /mingw/Theta /mingw/theta" - for root in ${roots} - do - if test -f "${root}/include/theta.h" + "${theta_found}" || { + theta_root="" + roots="/usr /usr/local /usr/local/Theta /usr/local/theta /opt/Theta /opt/theta /mingw /mingw/Theta /mingw/theta" + + for root in ${roots} + do + test -f "${root}/include/theta.h" && { + theta_root="${root}" + { $as_echo "$as_me:${as_lineno-$LINENO}: Theta root: ${theta_root}" >&5 +$as_echo "$as_me: Theta root: ${theta_root}" >&6;} + break + } + done + + if test -z "${theta_root}" then - theta_root="${root}" - break - fi - done - if test -z "${theta_root}" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Theta package not found: ${roots}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Theta package not found: ${roots}" >&5 $as_echo "$as_me: WARNING: Theta package not found: ${roots}" >&2;} - fi + fi + } fi + brltty_summary_lines="${brltty_summary_lines} theta-root: ${theta_root}" -if test -n "${theta_root}" -then + +test -n "${theta_root}" && { cat >>confdefs.h <<_ACEOF #define THETA_ROOT "${theta_root}" _ACEOF - brltty_item_entries_speech="${brltty_item_entries_speech} th-Theta" + + + + brltty_item_entries_speech="${brltty_item_entries_speech} th-Theta" brltty_item_codes_speech="${brltty_item_codes_speech} th" brltty_item_names_speech="${brltty_item_names_speech} Theta" speech_libraries_th='-L$(THETA_ROOT)/lib -ltheta' -fi + +} + + # Check whether --with-viavoice was given. if test "${with_viavoice+set}" = set; then : @@ -14618,48 +15205,66 @@ fi + +viavoice_found=false + + + if test "${viavoice_root}" = "no" then viavoice_root="" elif test "${viavoice_root}" = "yes" then - viavoice_root="" - roots="/usr /usr/local /usr/local/ViaVoice /usr/local/viavoice /opt/ViaVoice /opt/viavoice /mingw /mingw/ViaVoice /mingw/viavoice" - for root in ${roots} - do - if test -f "${root}/include/eci.h" + "${viavoice_found}" || { + viavoice_root="" + roots="/usr /usr/local /usr/local/ViaVoice /usr/local/viavoice /opt/ViaVoice /opt/viavoice /mingw /mingw/ViaVoice /mingw/viavoice" + + for root in ${roots} + do + test -f "${root}/include/eci.h" && { + viavoice_root="${root}" + { $as_echo "$as_me:${as_lineno-$LINENO}: ViaVoice root: ${viavoice_root}" >&5 +$as_echo "$as_me: ViaVoice root: ${viavoice_root}" >&6;} + break + } + done + + if test -z "${viavoice_root}" then - viavoice_root="${root}" - break - fi - done - if test -z "${viavoice_root}" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ViaVoice package not found: ${roots}" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ViaVoice package not found: ${roots}" >&5 $as_echo "$as_me: WARNING: ViaVoice package not found: ${roots}" >&2;} - fi + fi + } fi + brltty_summary_lines="${brltty_summary_lines} viavoice-root: ${viavoice_root}" -if test -n "${viavoice_root}" -then + +test -n "${viavoice_root}" && { cat >>confdefs.h <<_ACEOF #define VIAVOICE_ROOT "${viavoice_root}" _ACEOF - brltty_item_entries_speech="${brltty_item_entries_speech} vv-ViaVoice" + + + + brltty_item_entries_speech="${brltty_item_entries_speech} vv-ViaVoice" brltty_item_codes_speech="${brltty_item_codes_speech} vv" brltty_item_names_speech="${brltty_item_names_speech} ViaVoice" speech_libraries_vv='-L$(VIAVOICE_ROOT)/lib -libmeci50' -fi + +} + + brltty_item_entries_speech="${brltty_item_entries_speech} xs-ExternalSpeech" brltty_item_codes_speech="${brltty_item_codes_speech} xs" brltty_item_names_speech="${brltty_item_names_speech} ExternalSpeech" speech_libraries_xs='' + case "${host_os}" in *android*) @@ -15028,9 +15633,21 @@ for package_specification in cspi-1.0 do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_CSPI 1" >>confdefs.h + + cspi_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: cspi package: ${cspi_package}" >&5 +$as_echo "$as_me: cspi package: ${cspi_package}" >&6;} + cspi_includes=`${PKG_CONFIG} --cflags-only-I "${cspi_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: cspi includes: ${cspi_includes}" >&5 +$as_echo "$as_me: cspi includes: ${cspi_includes}" >&6;} + cspi_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${cspi_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: cspi libs: ${cspi_libs}" >&5 +$as_echo "$as_me: cspi libs: ${cspi_libs}" >&6;} + ac_fn_c_check_header_mongrel "$LINENO" "X11/keysym.h" "ac_cv_header_X11_keysym_h" "$ac_includes_default" if test "x$ac_cv_header_X11_keysym_h" = xyes; then : ac_fn_c_check_header_mongrel "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" "$ac_includes_default" @@ -15038,7 +15655,7 @@ brltty_item_entries_screen="${brltty_item_entries_screen} as-AtSpi" brltty_item_codes_screen="${brltty_item_codes_screen} as" brltty_item_names_screen="${brltty_item_names_screen} AtSpi" -screen_libraries_as='$(XSV_LIBS) $(CSPI_LIBS)' +screen_libraries_as='$(X11_LIBS) $(CSPI_LIBS)' fi @@ -15053,6 +15670,11 @@ } done +test -n "${cspi_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cspi support not available" >&5 +$as_echo "$as_me: WARNING: cspi support not available" >&2;} +} + @@ -15066,9 +15688,21 @@ for package_specification in "dbus-1 >= 1.0" do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_DBUS 1" >>confdefs.h + + dbus_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: dbus package: ${dbus_package}" >&5 +$as_echo "$as_me: dbus package: ${dbus_package}" >&6;} + dbus_includes=`${PKG_CONFIG} --cflags-only-I "${dbus_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: dbus includes: ${dbus_includes}" >&5 +$as_echo "$as_me: dbus includes: ${dbus_includes}" >&6;} + dbus_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${dbus_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: dbus libs: ${dbus_libs}" >&5 +$as_echo "$as_me: dbus libs: ${dbus_libs}" >&6;} + ac_fn_c_check_header_mongrel "$LINENO" "X11/keysym.h" "ac_cv_header_X11_keysym_h" "$ac_includes_default" if test "x$ac_cv_header_X11_keysym_h" = xyes; then : atspi2_package="" @@ -15078,9 +15712,21 @@ for package_specification in atspi-2 do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_ATSPI2 1" >>confdefs.h + + atspi2_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: atspi2 package: ${atspi2_package}" >&5 +$as_echo "$as_me: atspi2 package: ${atspi2_package}" >&6;} + atspi2_includes=`${PKG_CONFIG} --cflags-only-I "${atspi2_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: atspi2 includes: ${atspi2_includes}" >&5 +$as_echo "$as_me: atspi2 includes: ${atspi2_includes}" >&6;} + atspi2_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${atspi2_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: atspi2 libs: ${atspi2_libs}" >&5 +$as_echo "$as_me: atspi2 libs: ${atspi2_libs}" >&6;} + brltty_cppflags_save="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${atspi2_cflags}" @@ -15109,14 +15755,31 @@ for package_specification in glib-2.0 do ${PKG_CONFIG} --exists "${package_specification}" && { + $as_echo "#define HAVE_PKG_GLIB2 1" >>confdefs.h + + glib2_package="${package_specification%% *}" + { $as_echo "$as_me:${as_lineno-$LINENO}: glib2 package: ${glib2_package}" >&5 +$as_echo "$as_me: glib2 package: ${glib2_package}" >&6;} + glib2_includes=`${PKG_CONFIG} --cflags-only-I "${glib2_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: glib2 includes: ${glib2_includes}" >&5 +$as_echo "$as_me: glib2 includes: ${glib2_includes}" >&6;} + glib2_libs=`${PKG_CONFIG} ${pkgconfig_flags_libs} "${glib2_package}"` + { $as_echo "$as_me:${as_lineno-$LINENO}: glib2 libs: ${glib2_libs}" >&5 +$as_echo "$as_me: glib2 libs: ${glib2_libs}" >&6;} + break } done +test -n "${glib2_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: glib2 support not available" >&5 +$as_echo "$as_me: WARNING: glib2 support not available" >&2;} +} + @@ -15126,6 +15789,11 @@ } done +test -n "${atspi2_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: atspi2 support not available" >&5 +$as_echo "$as_me: WARNING: atspi2 support not available" >&2;} +} + @@ -15145,6 +15813,11 @@ } done +test -n "${dbus_package}" || { + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: dbus support not available" >&5 +$as_echo "$as_me: WARNING: dbus support not available" >&2;} +} + @@ -15623,6 +16296,9 @@ #define BRLAPI_SOCKETPATH "${brltty_expanded}" _ACEOF +eval 'brltty_expanded="'""${api_socket_path}""'"' +api_socket_directory="${brltty_expanded}" + prefix="${original_prefix}" exec_prefix="${original_exec_prefix}" @@ -16146,7 +16822,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by BRLTTY $as_me 5.4, which was +This file was extended by BRLTTY $as_me 5.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16213,7 +16889,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -BRLTTY config.status 5.4 +BRLTTY config.status 5.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru brltty-5.4/configure.ac brltty-5.5/configure.ac --- brltty-5.4/configure.ac 2016-06-28 11:07:57.000000000 +0000 +++ brltty-5.5/configure.ac 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,12 +18,12 @@ ############################################################################### AC_PREREQ([2.64]) -AC_INIT([BRLTTY], [5.4], [brltty@mielke.cc], [brltty], [http://brltty.com/]) +AC_INIT([BRLTTY], [5.5], [brltty@mielke.cc], [brltty], [http://brltty.com/]) AC_CONFIG_SRCDIR([Programs/brltty.c]) AC_SUBST([api_major], [0]) AC_SUBST([api_minor], [6]) -AC_SUBST([api_revision], [5]) +AC_SUBST([api_revision], [6]) AC_SUBST([api_version], [${api_major}.${api_minor}]) AC_SUBST([api_release], [${api_version}.${api_revision}]) @@ -184,12 +184,6 @@ [include_directory], ["${includedir}/${PACKAGE_TARNAME}"] ) -BRLTTY_ARG_REQUIRED( - [gdm-autostart-directory], [DIRECTORY], - [path to gdm autostart directory], - [gdm_autostart_directory], ["${datadir}/gdm/greeter/autostart"] -) - brltty_default_init_path=/sbin/init_real BRLTTY_ARG_WITH( [init-path], [FILE], @@ -287,6 +281,9 @@ linux*|gnu*|kfreebsd*) brltty_prog_cc_sysflags="-D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=2 -D_BSD_SOURCE -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_GNU_SOURCE" ;; + solaris2.1?*) # Solaris 10 & 11 require _XOPEN_SOURCE=600 if using C99 + brltty_prog_cc_sysflags="-D_XOPEN_SOURCE=600 -D__EXTENSIONS__" + ;; solaris*) brltty_prog_cc_sysflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__" ;; @@ -635,8 +632,9 @@ [support for the Polkit authorization manager], [], [dnl - BRLTTY_HAVE_PACKAGE([polkit], [polkit-gobject-1], - AC_DEFINE(USE_POLKIT, 1, [if the Polkit authorization manager should be used])) + BRLTTY_HAVE_PACKAGE([polkit], [polkit-gobject-1], [dnl + AC_DEFINE(USE_POLKIT, 1, [if the Polkit authorization manager should be used]) + ]) ]) BRLTTY_ARG_DISABLE( @@ -736,7 +734,7 @@ [support for X11], [], [dnl - BRLTTY_HAVE_PACKAGE([xsv], [x11], [dnl + BRLTTY_HAVE_PACKAGE([x11], [x11], [dnl all_xbrlapi="all-xbrlapi" install_xbrlapi="install-xbrlapi" @@ -757,10 +755,10 @@ xtk_libs="${xt_libs} ${xtk_libs}" brltty_cppflags_save="${CPPFLAGS}" - CPPFLAGS="${CPPFLAGS} ${xsv_includes}" + CPPFLAGS="${CPPFLAGS} ${x11_includes}" brltty_libs_save="${LIBS}" - LIBS="${xtk_libs} ${xsv_libs} ${LIBS}" + LIBS="${xtk_libs} ${x11_libs} ${LIBS}" BRLTTY_PACKAGE_CHOOSE([gui_toolkit], [Xaw X11/Xaw/Form.h X11/Xaw/Paned.h X11/Xaw/Label.h X11/Xaw/Command.h X11/Xaw/Repeater.h], @@ -769,7 +767,7 @@ [XawPlus X11/XawPlus/Form.h X11/XawPlus/Paned.h X11/XawPlus/Label.h X11/XawPlus/Command.h X11/XawPlus/Repeater.h], [Xm Xm/Xm.h Xm/Form.h Xm/PanedW.h Xm/Label.h Xm/PushB.h]) - xtk_libs="${LIBS%${xsv_libs} ${brltty_libs_save}}" + xtk_libs="${LIBS%${x11_libs} ${brltty_libs_save}}" CPPFLAGS="${brltty_cppflags_save}" LIBS="${brltty_libs_save}" @@ -1425,6 +1423,11 @@ AC_CHECK_HEADER([bluetooth/bluetooth.h], [dnl bluetooth_package="linux" AC_HAVE_LIBRARY([bluetooth]) + + BRLTTY_HAVE_PACKAGE([dbus], ["dbus-1 >= 1.0"], [dnl + bluetooth_includes="${dbus_includes}" + bluetooth_libs="${dbus_libs}" + ]) ]) ;; ]) @@ -1494,7 +1497,7 @@ BRLTTY_BRAILLE_DRIVER([vr], [Virtual]) BRLTTY_BRAILLE_DRIVER([vs], [VisioBraille]) test -n "${gui_toolkit_package}" && { - BRLTTY_BRAILLE_DRIVER([xw], [XWindow], [$(XTK_LIBS) $(XSV_LIBS)]) + BRLTTY_BRAILLE_DRIVER([xw], [XWindow], [$(XTK_LIBS) $(X11_LIBS)]) } case "${host_os}" in @@ -1582,9 +1585,13 @@ braille_device="" elif test "${braille_device}" = "yes" then - if test "${usb_package}" != "none" + braille_device="" + test "${usb_package}" != "none" && braille_device="${braille_device},usb:" + test "${bluetooth_package}" != "none" && braille_device="${braille_device},bluetooth:" + + if test -n "${braille_device}" then - braille_device="usb:" + braille_device="${braille_device#,}" else braille_device="serial:${serial_first_device}" fi @@ -1690,17 +1697,21 @@ BRLTTY_ARG_DISABLE( [speech-support], - [support for speech synthesizers], + [support for speech synthesizers and text-to-speech engines], [], [dnl AC_DEFINE([ENABLE_SPEECH_SUPPORT], [1], - [Define this to include speech synthesizer support.]) + [Define this to include speech synthesizer and text-to-speech engine support.]) speech_support_object='spk.$O' BRLTTY_SPEECH_DRIVER([al], [Alva]) BRLTTY_SPEECH_DRIVER([bl], [BrailleLite]) BRLTTY_SPEECH_DRIVER([cb], [CombiBraille]) - BRLTTY_IF_PACKAGE([eSpeak], [espeak], [include/espeak/speak_lib.h], [BRLTTY_SPEECH_DRIVER([es], [eSpeak], [-L$(ESPEAK_ROOT)/lib -lespeak])]) + + BRLTTY_IF_PACKAGE([eSpeak], [espeak], [include/espeak/speak_lib.h], [dnl + BRLTTY_SPEECH_DRIVER([es], [eSpeak], [-L$(ESPEAK_ROOT)/lib -lespeak]) + ]) + BRLTTY_IF_PACKAGE([FestivalLite], [flite], [include/flite/flite.h], [dnl BRLTTY_ARG_REQUIRED( [flite-language], [LANGUAGE], @@ -1722,14 +1733,34 @@ BRLTTY_SPEECH_DRIVER([fl], [FestivalLite], [-L$(FLITE_ROOT)/lib -lflite_$(FLITE_VOICE) -lflite_$(FLITE_LEXICON) -lflite_$(FLITE_LANGUAGE) -lflite -lm]) ]) + BRLTTY_SPEECH_DRIVER([fv], [Festival]) BRLTTY_SPEECH_DRIVER([gs], [GenericSay]) - BRLTTY_IF_PACKAGE([Mikropuhe], [mikropuhe], [mpwrfile.h], [BRLTTY_IF_PTHREADS([BRLTTY_SPEECH_DRIVER([mp], [Mikropuhe], [-L$(MPLINUX_ROOT) -lmplinux])])]) - BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/libspeechd.h], [BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher], [-L$(SPEECHD_ROOT)/lib -lspeechd])]) - BRLTTY_IF_PACKAGE([Swift], [swift], [include/swift.h], [BRLTTY_SPEECH_DRIVER([sw], [Swift], [-L$(SWIFT_ROOT)/lib -lswift -lm])]) - BRLTTY_IF_PACKAGE([Theta], [theta], [include/theta.h], [BRLTTY_SPEECH_DRIVER([th], [Theta], [-L$(THETA_ROOT)/lib -ltheta])]) - BRLTTY_IF_PACKAGE([ViaVoice], [viavoice], [include/eci.h], [BRLTTY_SPEECH_DRIVER([vv], [ViaVoice], [-L$(VIAVOICE_ROOT)/lib -libmeci50])]) + + BRLTTY_IF_PACKAGE([Mikropuhe], [mikropuhe], [mpwrfile.h], [dnl + BRLTTY_IF_PTHREADS([dnl + BRLTTY_SPEECH_DRIVER([mp], [Mikropuhe], [-L$(MPLINUX_ROOT) -lmplinux]) + ]) + ]) + + BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/libspeechd.h], [dnl + BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher]) + ], [include], [lib], [speechd]) + + BRLTTY_IF_PACKAGE([Swift], [swift], [include/swift.h], [dnl + BRLTTY_SPEECH_DRIVER([sw], [Swift], [-L$(SWIFT_ROOT)/lib -lswift -lm]) + ]) + + BRLTTY_IF_PACKAGE([Theta], [theta], [include/theta.h], [dnl + BRLTTY_SPEECH_DRIVER([th], [Theta], [-L$(THETA_ROOT)/lib -ltheta]) + ]) + + BRLTTY_IF_PACKAGE([ViaVoice], [viavoice], [include/eci.h], [dnl + BRLTTY_SPEECH_DRIVER([vv], [ViaVoice], [-L$(VIAVOICE_ROOT)/lib -libmeci50]) + ]) + BRLTTY_SPEECH_DRIVER([xs], [ExternalSpeech]) + case "${host_os}" in *android*) @@ -1776,7 +1807,7 @@ BRLTTY_HAVE_PACKAGE([cspi], [cspi-1.0], [dnl AC_CHECK_HEADER([X11/keysym.h], [dnl AC_CHECK_HEADER([X11/Xlib.h], [dnl - BRLTTY_SCREEN_DRIVER([as], [AtSpi], [$(XSV_LIBS) $(CSPI_LIBS)]) + BRLTTY_SCREEN_DRIVER([as], [AtSpi], [$(X11_LIBS) $(CSPI_LIBS)]) ]) ]) ]) @@ -1861,6 +1892,7 @@ [Define this to be a string containing the path to the directory where the authorization key and driver-dependent key names are found.]) BRLTTY_DEFINE_EXPANDED([BRLAPI_SOCKETPATH], ["${api_socket_path}"], [Define this to be a string containing the path to the local sockets.]) +BRLTTY_SUBST_EXPANDED([api_socket_directory], ["${api_socket_path}"]) prefix="${original_prefix}" exec_prefix="${original_exec_prefix}" diff -Nru brltty-5.4/debian/60xbrlapi brltty-5.5/debian/60xbrlapi --- brltty-5.4/debian/60xbrlapi 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/60xbrlapi 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -if [ -x /usr/bin/xbrlapi ]; then /usr/bin/xbrlapi -q 2> /dev/null & fi diff -Nru brltty-5.4/debian/brltty.dirs brltty-5.5/debian/brltty.dirs --- brltty-5.4/debian/brltty.dirs 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty.dirs 2018-01-19 14:27:32.000000000 +0000 @@ -1,7 +1,6 @@ etc/brltty lib/brltty lib/udev/rules.d -sbin usr/lib/ubiquity/target-config usr/share/brltty/initramfs usr/share/initramfs-tools/hooks diff -Nru brltty-5.4/debian/brltty.examples brltty-5.5/debian/brltty.examples --- brltty-5.4/debian/brltty.examples 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty.examples 2017-12-03 22:14:44.000000000 +0000 @@ -1,2 +1,3 @@ -Autostart/Udev/udev.rules +Autostart/Udev/rules +Autostart/Udev/brltty-wrapper Autostart/Upstart/brltty.conf diff -Nru brltty-5.4/debian/brltty.init brltty-5.5/debian/brltty.init --- brltty-5.4/debian/brltty.init 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty.init 2017-12-03 22:14:44.000000000 +0000 @@ -13,7 +13,7 @@ set -e -DAEMON=/sbin/brltty +DAEMON=/bin/brltty NAME=brltty DESC='Braille terminal driver' diff -Nru brltty-5.4/debian/brltty.install brltty-5.5/debian/brltty.install --- brltty-5.4/debian/brltty.install 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty.install 2018-01-19 14:28:37.000000000 +0000 @@ -1,16 +1,16 @@ debian/tmp/etc/brltty etc -debian/tmp/sbin/brltty sbin -debian/tmp/sbin/eutp usr/bin -debian/tmp/sbin/vstp usr/bin -debian/tmp/sbin/brltty-ctb usr/bin -debian/tmp/sbin/brltty-ttb usr/bin -debian/tmp/sbin/brltty-trtxt usr/bin +debian/tmp/bin/brltty bin +debian/tmp/bin/eutp usr/bin +debian/tmp/bin/vstp usr/bin +debian/tmp/bin/brltty-ctb usr/bin +debian/tmp/bin/brltty-ttb usr/bin +debian/tmp/bin/brltty-trtxt usr/bin debian/tmp/lib/brltty lib debian/tmp/usr/share/locale debian/initramfs/hooks/brltty usr/share/initramfs-tools/hooks debian/initramfs/scripts/init-premount/brltty usr/share/initramfs-tools/scripts/init-premount -Authorization/Polkit/org.brltty.policy /usr/share/polkit-1/actions -debian/org.a11y.brltty.metainfo.xml /usr/share/metainfo +debian/tmp/usr/share/polkit-1/actions +debian/tmp/usr/share/metainfo debian/initramfs/scripts/init-top/brltty usr/share/initramfs-tools/scripts/init-top debian/initramfs/brltty.sh usr/share/brltty/initramfs debian/brltty-setup sbin diff -Nru brltty-5.4/debian/brltty.links brltty-5.5/debian/brltty.links --- brltty-5.4/debian/brltty.links 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/debian/brltty.links 2017-12-03 17:35:29.000000000 +0000 @@ -0,0 +1 @@ +/bin/brltty /sbin/brltty diff -Nru brltty-5.4/debian/brltty.service brltty-5.5/debian/brltty.service --- brltty-5.4/debian/brltty.service 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty.service 2017-12-03 22:14:43.000000000 +0000 @@ -18,7 +18,7 @@ [Service] Type=notify -ExecStart=/sbin/brltty --no-daemon +ExecStart=/bin/brltty --no-daemon TimeoutStartSec=5 TimeoutStopSec=10 diff -Nru brltty-5.4/debian/brltty.sh brltty-5.5/debian/brltty.sh --- brltty-5.4/debian/brltty.sh 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty.sh 2018-01-19 14:32:11.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh pid=/var/run/brltty [ -r $pid ] && kill -0 `cat $pid` && exit 0 -exec /sbin/brltty -P $pid "$@" +exec /bin/brltty -P $pid "$@" diff -Nru brltty-5.4/debian/brltty-udeb.dirs brltty-5.5/debian/brltty-udeb.dirs --- brltty-5.4/debian/brltty-udeb.dirs 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty-udeb.dirs 2018-01-19 14:32:11.000000000 +0000 @@ -4,5 +4,5 @@ lib/debian-installer.d lib/debian-installer-startup.d lib/udev -sbin +sbin/ usr/lib/finish-install.d diff -Nru brltty-5.4/debian/brltty-udeb.sh brltty-5.5/debian/brltty-udeb.sh --- brltty-5.4/debian/brltty-udeb.sh 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty-udeb.sh 2017-12-03 22:14:44.000000000 +0000 @@ -28,4 +28,4 @@ ) & fi -exec /sbin/brltty -P $pid "$@" +exec /bin/brltty -P $pid "$@" diff -Nru brltty-5.4/debian/brltty-udeb.udev.rules brltty-5.5/debian/brltty-udeb.udev.rules --- brltty-5.4/debian/brltty-udeb.udev.rules 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/brltty-udeb.udev.rules 2017-12-03 22:14:43.000000000 +0000 @@ -107,6 +107,7 @@ ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0044", RUN+="/lib/udev/brltty.sh -b ht -d usb:" ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0054", RUN+="/lib/udev/brltty.sh -b ht -d usb:" ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0055", RUN+="/lib/udev/brltty.sh -b ht -d usb:" +ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0061", RUN+="/lib/udev/brltty.sh -b ht -d usb:" ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0064", RUN+="/lib/udev/brltty.sh -b ht -d usb:" ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0074", RUN+="/lib/udev/brltty.sh -b ht -d usb:" ATTRS{idVendor}=="1fe4", ATTRS{idProduct}=="0081", RUN+="/lib/udev/brltty.sh -b ht -d usb:" @@ -125,6 +126,7 @@ # HumanWare ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c005", RUN+="/lib/udev/brltty.sh -b hw -d usb:" ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c006", RUN+="/lib/udev/brltty.sh -b hw -d usb:" +ATTRS{idVendor}=="1c71", ATTRS{idProduct}=="c00a", RUN+="/lib/udev/brltty.sh -b hw -d usb:" # BrailleMemo ATTRS{idVendor}=="1148", ATTRS{idProduct}=="0301", RUN+="/lib/udev/brltty.sh -b mm -d usb:" diff -Nru brltty-5.4/debian/changelog brltty-5.5/debian/changelog --- brltty-5.4/debian/changelog 2017-11-07 08:52:21.000000000 +0000 +++ brltty-5.5/debian/changelog 2018-01-19 14:32:11.000000000 +0000 @@ -1,3 +1,78 @@ +brltty (5.5-4ubuntu1) bionic; urgency=low + + * Merge from Debian unstable (LP: #1741070). Remaining changes: + - Add brltty-setup, installed in both the udeb and the normal system. + - Add initramfs integration to run brltty-setup if necessary before + plymouth starts. + - Add ubiquity integration to propagate any brltty configuration to the + target system. + - Add udev rules file that uses brltty-udev.service to activate via systemd + - Disable brltty.service by default, but enable it if the user configures + Braille at install time for a non-USB display + - Don't install /etc/brltty.conf in the package + - Enable brltty at startup on the target system if the alternate installer + is used. + - Add gbp.conf file for git buildpackage + * debian/brltty.sh: Update path /sbin/brltty to /bin/brltty + + -- Julian Andres Klode Fri, 19 Jan 2018 15:32:11 +0100 + +brltty (5.5-4) unstable; urgency=medium + + * initramfs/hooks/brltty.in, initramfs/scripts/init-premount/brltty: Update + /sbin/brltty paths. + * control: Replace dh-systemd build-depends with debhelper (>= 9.20160709) + * rules: Set DEB_HOST_ARCH only if not defined already. + + [ Mario Lang ] + * git-ba42441d03c6145fe6859c90fb01b1fa16221a2f: New patch to prevent scancodes + from generating spurious log messages. + + -- Samuel Thibault Sun, 03 Dec 2017 18:37:26 +0100 + +brltty (5.5-3) experimental; urgency=medium + + * rules: Let brltty get installed into /bin, so it can be run e.g. in X for + accessing terminals. + * brltty.links: Add compatibility symlink in /sbin/brltty. + * brltty-udeb.dirs, brltty-udeb.sh, brltty.dirs, brltty.init, + brltty.install, brltty.service, xbrlapi.install, 20-sbin.patch: Update + accordingly. + + -- Samuel Thibault Sun, 01 Oct 2017 22:19:06 +0200 + +brltty (5.5-2) unstable; urgency=medium + + * Upload to unstable (Closes: #871155) + * patches/git-07ecca2240c680373e9c2e5e38241edde9d1a677: Apply upstream patch + to fix finnish table (Closes: Bug#864670). + * control: Update maintainer mailing list. + * libbrlapi-dev.install: Also install device-specific brldefs headers + (Closes: Bug#869972). + * patches/brldefs-install: Fix installing device-specific brldefs headers. + * control: Migrate priority to optional. + * control: Bump Standards-Version to 4.1.1 + + -- Samuel Thibault Sun, 01 Oct 2017 22:09:51 +0200 + +brltty (5.5-1) experimental; urgency=medium + + * git-reproducible.patch: Make the build reproducible, thanks Chris West for + the patch (Closes: Bug#859959). + * New upstream release (Closes: #871155) + - patches/defauth-keyfile.patch, defauth-polkit, git-braillenote.patch, + git-lsystemd.patch, git-manufacturer.patch, git-reproducible.patch, + git-speech-crash.patch, git-vario-ultra-restart.patch, wait-polkit, + xbrlapi-nospam.patch, xbrlapi-setfocus.patch, xbrlapi.patch: Remove + patches, merged upstream. + - patches/20-sbin.patch: update patch. + - org.a11y.brltty.metainfo.xml, 60xbrlapi, xbrlapi.desktop: Remove files, + merged upstream. + * patches/api_startup.patch: Fix race between socket setup and select(). + * brltty-udeb.udev.rules: Update. + + -- Samuel Thibault Mon, 22 May 2017 01:43:35 +0200 + brltty (5.4-7ubuntu6) bionic; urgency=medium * No-change rebuild for icu soname change. diff -Nru brltty-5.4/debian/control brltty-5.5/debian/control --- brltty-5.4/debian/control 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/control 2018-01-19 14:26:33.000000000 +0000 @@ -1,13 +1,13 @@ Source: brltty Section: admin -Priority: extra +Priority: optional Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Accessibility Team +XSBC-Original-Maintainer: Debian Accessibility Team Uploaders: Samuel Thibault Vcs-Browser: https://anonscm.debian.org/git/pkg-a11y/brltty.git Vcs-Git: https://anonscm.debian.org/git/pkg-a11y/brltty.git Homepage: https://brltty.com -Build-Depends: debhelper (>= 9.20150628), dh-lisp, dh-systemd (>= 1.5), dh-strip-nondeterminism, +Build-Depends: debhelper (>= 9.20160709), dh-lisp, dh-python, dh-strip-nondeterminism, autotools-dev, autoconf, pkg-config, tcl (>= 8.5~), libasound2-dev [linux-any], python-all-dev (>= 2.7~0), @@ -25,7 +25,7 @@ libspeechd-dev, libespeak-ng-libespeak-dev Build-Conflicts: libatspi-dev -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 X-Python-Version: >= 2.7 X-Python3-Version: >= 3.2 diff -Nru brltty-5.4/debian/initramfs/hooks/brltty.in brltty-5.5/debian/initramfs/hooks/brltty.in --- brltty-5.4/debian/initramfs/hooks/brltty.in 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/initramfs/hooks/brltty.in 2017-12-03 22:14:44.000000000 +0000 @@ -16,7 +16,7 @@ [ -r /etc/default/brltty ] && . /etc/default/brltty -[ -x /sbin/brltty ] || exit 0 +[ -x /bin/brltty ] || exit 0 if [ "$START_IN_INITRAMFS" = "true" -o "$START_IN_INITRAMFS" = "yes" ]; then echo -n "Installing BRLTTY into initramfs..." @@ -30,7 +30,7 @@ cp -a /usr/lib/@DEB_HOST_MULTIARCH@/gconv \ $DESTDIR/usr/lib/@DEB_HOST_MULTIARCH@ - copy_exec /sbin/brltty /sbin/ + copy_exec /bin/brltty $DESTDIR/bin/ manual_add_modules pcspkr manual_add_modules uinput diff -Nru brltty-5.4/debian/initramfs/scripts/init-premount/brltty brltty-5.5/debian/initramfs/scripts/init-premount/brltty --- brltty-5.4/debian/initramfs/scripts/init-premount/brltty 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/initramfs/scripts/init-premount/brltty 2017-12-03 22:14:44.000000000 +0000 @@ -14,9 +14,9 @@ ;; esac -[ -x /sbin/brltty ] || exit 0 +[ -x /bin/brltty ] || exit 0 # Start BRLTTY if [ -r /etc/brltty.conf ]; then - /sbin/brltty -eqN 2>/dev/tty2 + /bin/brltty -eqN 2>/dev/tty2 fi diff -Nru brltty-5.4/debian/libbrlapi-dev.install brltty-5.5/debian/libbrlapi-dev.install --- brltty-5.4/debian/libbrlapi-dev.install 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/libbrlapi-dev.install 2017-12-03 22:14:44.000000000 +0000 @@ -1,4 +1,4 @@ debian/tmp/usr/lib/*/libbrlapi*.a debian/tmp/usr/include/brlapi* debian/tmp/usr/include/brltty/api.h -debian/tmp/usr/include/brltty/brldefs.h +debian/tmp/usr/include/brltty/brldefs* diff -Nru brltty-5.4/debian/org.a11y.brltty.metainfo.xml brltty-5.5/debian/org.a11y.brltty.metainfo.xml --- brltty-5.4/debian/org.a11y.brltty.metainfo.xml 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/org.a11y.brltty.metainfo.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,452 +0,0 @@ - - - - - - - - org.a11y.brltty - BRLTTY - Support for braille devices - - - A background process providing access to the console screen (when in - text mode) for a blind person using a refreshable braille display. - - - The BRLTTY Developers - http://brltty.com/ - - FSFAP - GPL-2.0 - - - - - - - - - - - - - - - - - - usb:v0403pDE58* - - - - usb:v0403pDE59* - - - - usb:v0403pF208* - - - - usb:v0403pFE70* - - - - usb:v0403pFE71* - - - - usb:v0403pFE72* - - - - usb:v0403pFE73* - - - - usb:v0403pFE74* - - - - usb:v0403pFE75* - - - - usb:v0403pFE76* - - - - usb:v0403pFE77* - - - - usb:v0452p0100* - - - - - - usb:v045Ep930A* - - - - usb:v045Ep930B* - - - - usb:v06B0p0001* - - - - usb:v0798p0001* - - - - usb:v0798p0600* - - - - usb:v0798p0624* - - - - usb:v0798p0640* - - - - usb:v0798p0680* - - - - usb:v0904p2000* - - - - usb:v0904p2001* - - - - usb:v0904p2002* - - - - usb:v0904p2007* - - - - usb:v0904p2008* - - - - usb:v0904p2009* - - - - usb:v0904p2010* - - - - usb:v0904p2011* - - - - usb:v0904p2014* - - - - usb:v0904p2015* - - - - usb:v0904p2016* - - - - usb:v0904p3000* - - - - usb:v0904p3001* - - - - usb:v0904p4004* - - - - usb:v0904p4005* - - - - usb:v0904p4007* - - - - usb:v0904p4008* - - - - usb:v0904p6001* - - - - usb:v0904p6002* - - - - usb:v0904p6003* - - - - usb:v0904p6004* - - - - usb:v0904p6005* - - - - usb:v0904p6006* - - - - usb:v0904p6007* - - - - usb:v0904p6008* - - - - usb:v0904p6009* - - - - usb:v0904p600A* - - - - usb:v0904p6011* - - - - usb:v0904p6012* - - - - usb:v0904p6013* - - - - usb:v0904p6101* - - - - usb:v0904p6102* - - - - usb:v0904p6103* - - - - usb:v0921p1200* - - - - usb:v0F4Ep0100* - - - - usb:v0F4Ep0111* - - - - usb:v0F4Ep0112* - - - - usb:v0F4Ep0114* - - - - - - - - - - - - - - - - - - - usb:v1148p0301* - - - - usb:v1C71pC004* - - - - usb:v1C71pC005* - - - - usb:v1C71pC006* - - - - usb:v1FE4p0003* - - - - usb:v1FE4p0044* - - - - usb:v1FE4p0054* - - - - usb:v1FE4p0055* - - - - usb:v1FE4p0061* - - - - usb:v1FE4p0064* - - - - usb:v1FE4p0074* - - - - usb:v1FE4p0081* - - - - usb:v1FE4p0082* - - - - usb:v1FE4p0083* - - - - usb:v1FE4p0084* - - - - usb:v1FE4p0086* - - - - usb:v1FE4p0087* - - - - usb:v1FE4p008A* - - - - usb:v1FE4p008B* - - - - usb:v4242p0001* - - - - usb:vC251p1122* - - - - usb:vC251p1123* - - - - usb:vC251p1124* - - - - usb:vC251p1125* - - - - usb:vC251p1126* - - - - usb:vC251p1127* - - - - usb:vC251p1128* - - - - usb:vC251p1129* - - - - usb:vC251p112A* - - - - usb:vC251p112B* - - - - usb:vC251p112C* - - - - usb:vC251p112D* - - - - usb:vC251p112E* - - - - usb:vC251p112F* - - - - - usb:vC251p1130* - - - - usb:vC251p1131* - - - - usb:vC251p1132* - - - - diff -Nru brltty-5.4/debian/patches/20-sbin.patch brltty-5.5/debian/patches/20-sbin.patch --- brltty-5.4/debian/patches/20-sbin.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/20-sbin.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Description: adust paths in startup scripts - Since BRLTTY on Debian is installed in /sbin, the upstart configuration and the - udev rule have to be patched to run /sbin/brltty instead of /bin/brltty. ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -diff --git a/Autostart/Udev/udev.rules b/Autostart/Udev/udev.rules -index 006d034..6516ece 100644 ---- a/Autostart/Udev/udev.rules -+++ b/Autostart/Udev/udev.rules -@@ -447,7 +447,7 @@ GOTO="brltty_end" - LABEL="brltty_add" - SYMLINK+="brltty/$env{BRLTTY_BRAILLE_DEVICE}" - TEST=="/sys/fs/cgroup/systemd", GOTO="brltty_add_systemd" --RUN+="/bin/brltty -E -+RUN+="/sbin/brltty -E" - GOTO="brltty_end" - - LABEL="brltty_add_systemd" -diff --git a/Autostart/Upstart/brltty.conf b/Autostart/Upstart/brltty.conf -index 5837b12..ac22f16 100644 ---- a/Autostart/Upstart/brltty.conf -+++ b/Autostart/Upstart/brltty.conf -@@ -13,4 +13,4 @@ - start on startup - console output - respawn --exec /bin/brltty -n -+exec /sbin/brltty -n diff -Nru brltty-5.4/debian/patches/60-java6.patch brltty-5.5/debian/patches/60-java6.patch --- brltty-5.4/debian/patches/60-java6.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/60-java6.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: brltty/Bindings/Java/Makefile.in -=================================================================== ---- brltty.orig/Bindings/Java/Makefile.in 2012-09-10 10:29:35.489499297 +1000 -+++ brltty/Bindings/Java/Makefile.in 2012-09-14 10:24:25.204467683 +1000 -@@ -65,7 +65,7 @@ - - classes.made: $(JAVA_SOURCES) - $(INSTALL_DIRECTORY) classes -- $(JAVAC) -d classes -classpath . $(JAVA_SOURCES) -+ $(JAVAC) -d classes -classpath . -target 6 $(JAVA_SOURCES) - touch $@ - - Constants.java: $(CONSTANTS_SCRIPTS) $(CONSTANTS_SOURCES) diff -Nru brltty-5.4/debian/patches/api_startup.patch brltty-5.5/debian/patches/api_startup.patch --- brltty-5.4/debian/patches/api_startup.patch 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/debian/patches/api_startup.patch 2017-12-03 17:35:29.000000000 +0000 @@ -0,0 +1,48 @@ +Fix race between socket creation and select preparation + +It can happen that between iterating over socketInfo[i].fd and testing +serverSocketsPending, the sockets get established, and thus no server fd +was recorded in sockset, but serverSocketsPending is found to be 0, and +thus we are passing a NULL timeout to select() without any FD to look +at, thus hanging. + +--- + Programs/brlapi_server.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/Programs/brlapi_server.c ++++ b/Programs/brlapi_server.c +@@ -2338,16 +2338,6 @@ THREAD_FUNCTION(runServer) { + FD_ZERO(&sockset); + fdmax=0; + +- for (i=0;i=0) { +- FD_SET(socketInfo[i].fd, &sockset); +- +- if (socketInfo[i].fd>fdmax) { +- fdmax = socketInfo[i].fd; +- } +- } +- } +- + lockMutex(&apiConnectionsMutex); + addTtyFds(&sockset, &fdmax, ¬ty); + addTtyFds(&sockset, &fdmax, &ttys); +@@ -2357,6 +2347,16 @@ THREAD_FUNCTION(runServer) { + struct timeval tv, *timeout; + + lockMutex(&serverSocketsMutex); ++ for (i=0;i=0) { ++ FD_SET(socketInfo[i].fd, &sockset); ++ ++ if (socketInfo[i].fd>fdmax) { ++ fdmax = socketInfo[i].fd; ++ } ++ } ++ } ++ + if (unauthConnections || serverSocketsPending) { + memset(&tv, 0, sizeof(tv)); + tv.tv_sec = SERVER_SELECT_TIMEOUT; diff -Nru brltty-5.4/debian/patches/brldefs-install.patch brltty-5.5/debian/patches/brldefs-install.patch --- brltty-5.4/debian/patches/brldefs-install.patch 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/debian/patches/brldefs-install.patch 2017-12-03 17:35:29.000000000 +0000 @@ -0,0 +1,15 @@ +--- + braille.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/braille.mk ++++ b/braille.mk +@@ -32,7 +32,7 @@ braille-driver: $(BRL_MOD_FILE) + + install-api:: + $(INSTALL_DIRECTORY) $(INSTALL_ROOT)$(INCLUDE_DIRECTORY) +- for file in *-$(DRIVER_CODE).h; do test -f $$file && $(INSTALL_DATA) $$file $(INSTALL_ROOT)$(INCLUDE_DIRECTORY); done || : ++ for file in $(SRC_DIR)/*-$(DRIVER_CODE).h; do test -f $$file && $(INSTALL_DATA) $$file $(INSTALL_ROOT)$(INCLUDE_DIRECTORY); done || : + + install:: $(INSTALL_API) + diff -Nru brltty-5.4/debian/patches/defauth-keyfile.patch brltty-5.5/debian/patches/defauth-keyfile.patch --- brltty-5.4/debian/patches/defauth-keyfile.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/defauth-keyfile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -commit 41f5c64ceb06d3cef1af1b3f474f56db1e3d2dd8 -Author: Dave Mielke -Date: Sat Oct 8 22:12:29 2016 -0400 - - Fix polkit/keyfile authentication. (st) - - Some parts of the code were assuming that auth had to always be a keyfile, - thus preventing the use of polkit+keyfile:/etc/brlapi.key as auth. - -diff --git a/Programs/brlapi_client.c b/Programs/brlapi_client.c -index 0e20ec1..7a54980 100644 ---- a/Programs/brlapi_client.c -+++ b/Programs/brlapi_client.c -@@ -724,7 +724,12 @@ brlapi_fileDescriptor BRLAPI_STDCALL brlapi__openConnection(brlapi_handle_t *han - case BRLAPI_AUTH_KEY: { - size_t authKeyLength; - int res; -- if (brlapi_loadAuthKey(settings.auth, &authKeyLength, (void *) &auth->key) < 0) -+ char *keyfile = brlapi_getKeyFile(settings.auth); -+ if (!keyfile) -+ continue; -+ res = brlapi_loadAuthKey(keyfile, &authKeyLength, (void *) &auth->key); -+ free(keyfile); -+ if (res < 0) - continue; - res = brlapi_writePacket(handle->fileDescriptor, BRLAPI_PACKET_AUTH, auth, - sizeof(auth->type)+authKeyLength); -diff --git a/Programs/brlapi_common.h b/Programs/brlapi_common.h -index 98fed09..090ce84 100644 ---- a/Programs/brlapi_common.h -+++ b/Programs/brlapi_common.h -@@ -415,3 +415,23 @@ BRLAPI(getKeyrangeMask) (brlapi_rangeType_t r, brlapi_keyCode_t code, brlapi_key - brlapi_errno = BRLAPI_ERROR_INVALID_PARAMETER; - return -1; - } -+ -+static char * -+BRLAPI(getKeyFile)(const char *auth) -+{ -+ const char *path; -+ char *ret, *delim; -+ if (!strncmp(auth,"keyfile:",8)) -+ path=auth+8; -+ else { -+ path=strstr(auth,"+keyfile:"); -+ if (path) path+=9; -+ else path=auth; -+ } -+ ret=strdup(path); -+ delim=strchr(ret,'+'); -+ if (delim) -+ *delim = 0; -+ return ret; -+} -+ -diff --git a/Programs/brlapi_server.c b/Programs/brlapi_server.c -index 3fadda2..c3b3c6e 100644 ---- a/Programs/brlapi_server.c -+++ b/Programs/brlapi_server.c -@@ -1225,6 +1225,18 @@ static void handleNewConnection(Connection *c) - brlapiserver_writePacket(c->fd,BRLAPI_PACKET_VERSION,&versionPacket.data,sizeof(versionPacket.version)); - } - -+static int -+hasKeyFile(const char *auth) -+{ -+ if (isAbsolutePath(auth)) -+ return 1; -+ if (!strncmp(auth,"keyfile:", 8)) -+ return 1; -+ if (strstr(auth,"+keyfile:")) -+ return 1; -+ return 0; -+} -+ - /* Function : handleUnauthorizedConnection */ - /* Returns 1 if connection has to be removed */ - static int handleUnauthorizedConnection(Connection *c, brlapi_packetType_t type, brlapi_packet_t *packet, size_t size) -@@ -1252,7 +1264,7 @@ static int handleUnauthorizedConnection(Connection *c, brlapi_packetType_t type, - unauthConnections--; - c->auth = 1; - } else { -- if (isAbsolutePath(auth)) -+ if (hasKeyFile(auth)) - authPacket->type[nbmethods++] = htonl(BRLAPI_AUTH_KEY); - c->auth = 0; - } -@@ -1288,15 +1300,18 @@ static int handleUnauthorizedConnection(Connection *c, brlapi_packetType_t type, - if (authDescriptor) authCorrect = authPerform(authDescriptor, c->fd); - break; - case BRLAPI_AUTH_KEY: -- if (isAbsolutePath(auth)) { -- if (brlapiserver_loadAuthKey(auth,&authKeyLength,&authKey)==-1) { -- logMessage(LOG_WARNING,"Unable to load API authorization key from %s: %s in %s. You may use parameter auth=none if you don't want any authorization (dangerous)", auth, strerror(brlapi_libcerrno), brlapi_errfun); -+ if (hasKeyFile(auth)) { -+ char *path = brlapiserver_getKeyFile(auth); -+ int ret = brlapiserver_loadAuthKey(path,&authKeyLength,&authKey); -+ free(path); -+ if (ret==-1) { -+ logMessage(LOG_WARNING,"Unable to load API authorization key from %s: %s in %s. You may use parameter auth=none if you don't want any authorization (dangerous)", path, strerror(brlapi_libcerrno), brlapi_errfun); - break; - } - logMessage(LOG_CATEGORY(SERVER_EVENTS), "authorization key loaded"); - authCorrect = (remaining==authKeyLength) && (!memcmp(&authPacket->key, &authKey, authKeyLength)); - memset(&authKey, 0, authKeyLength); -- memset(&authPacket->key, 0, authKeyLength); -+ memset(&authPacket->key, 0, remaining); - } - break; - default: diff -Nru brltty-5.4/debian/patches/defauth-polkit brltty-5.5/debian/patches/defauth-polkit --- brltty-5.4/debian/patches/defauth-polkit 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/defauth-polkit 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- a/Programs/brlapi.h.in -+++ b/Programs/brlapi.h.in -@@ -138,7 +138,7 @@ size_t BRLAPI_STDCALL brlapi_getHandleSi - /* No authentication by default on Windows */ - #define BRLAPI_DEFAUTH "none" - #else --#define BRLAPI_DEFAUTH BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE -+#define BRLAPI_DEFAUTH "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE - #endif /* BRLAPI_WIN32 */ - - #ifdef __MINGW32__ diff -Nru brltty-5.4/debian/patches/fix-gcc7-ftbfs.patch brltty-5.5/debian/patches/fix-gcc7-ftbfs.patch --- brltty-5.4/debian/patches/fix-gcc7-ftbfs.patch 2017-08-07 07:16:15.000000000 +0000 +++ brltty-5.5/debian/patches/fix-gcc7-ftbfs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From dce5afa224ad35260065b4e65cfe576f84273c86 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Fri, 17 Mar 2017 10:34:19 -0400 -Subject: [PATCH] Drop -Wno-format from Python bindings - -This causes a build error on GCC7: -cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security] - -It is also no longer necessary, as the bindings do not have format -security issues. ---- - Bindings/Python/bindings.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Bindings/Python/bindings.m4 b/Bindings/Python/bindings.m4 -index a8c0fd6bb..58f02163a 100644 ---- a/Bindings/Python/bindings.m4 -+++ b/Bindings/Python/bindings.m4 -@@ -121,7 +121,7 @@ fi - - if test "${GCC}" = "yes" - then -- CYTHON_CFLAGS="-Wno-parentheses -Wno-unused -Wno-format -fno-strict-aliasing -U_POSIX_C_SOURCE -U_XOPEN_SOURCE" -+ CYTHON_CFLAGS="-Wno-parentheses -Wno-unused -fno-strict-aliasing -U_POSIX_C_SOURCE -U_XOPEN_SOURCE" - else - case "${host_os}" - in diff -Nru brltty-5.4/debian/patches/git-07ecca2240c680373e9c2e5e38241edde9d1a677 brltty-5.5/debian/patches/git-07ecca2240c680373e9c2e5e38241edde9d1a677 --- brltty-5.4/debian/patches/git-07ecca2240c680373e9c2e5e38241edde9d1a677 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/debian/patches/git-07ecca2240c680373e9c2e5e38241edde9d1a677 2017-12-03 17:35:29.000000000 +0000 @@ -0,0 +1,50 @@ +commit 07ecca2240c680373e9c2e5e38241edde9d1a677 +Author: Dave Mielke +Date: Tue Jun 20 00:17:49 2017 -0400 + + Remove characters \x7F-\X9F from the Finnish text table (fi). (dm) + +diff --git a/Tables/Text/fi.ttb b/Tables/Text/fi.ttb +index 835db2fd5..c7932a2f3 100644 +--- a/Tables/Text/fi.ttb ++++ b/Tables/Text/fi.ttb +@@ -73,39 +73,6 @@ char \x7B (12 4 6 ) # 7B ⠫ { [LEFT CURLY BRACKET] + char \x7C ( 456 ) # 7C ⠸ | [VERTICAL LINE] + char \x7D (12 456 ) # 7D ⠻ } [RIGHT CURLY BRACKET] + char \x7E ( 45 ) # 7E ⠘ ~ [TILDE] +-char \x7F (1234 8) # 7F ⢏ [DELETE] +-char \x80 ( 23 67 ) # 80 ⡦ [] +-char \x81 (12 56 ) # 81 ⠳ [] +-char \x82 (123456 ) # 82 ⠿ [BREAK PERMITTED HERE] +-char \x83 ( 23 678) # 83 ⣦ [NO BREAK HERE] +-char \x84 ( 345 ) # 84 ⠜ [] +-char \x85 ( 2345 8) # 85 ⢞ [NEXT LINE (NEL)] +-char \x86 (1 6 ) # 86 ⠡ [START OF SELECTED AREA] +-char \x87 (1234567 ) # 87 ⡿ [END OF SELECTED AREA] +-char \x88 (12345678) # 88 ⣿ [CHARACTER TABULATION SET] +-char \x89 ( 678) # 89 ⣠ [CHARACTER TABULATION WITH JUSTIFICATION] +-char \x8A (12345 8) # 8A ⢟ [LINE TABULATION SET] +-char \x8B ( 3 56 8) # 8B ⢴ [PARTIAL LINE FORWARD] +-char \x8C ( 45 8) # 8C ⢘ [PARTIAL LINE BACKWARD] +-char \x8D ( 4567 ) # 8D ⡸ [REVERSE LINE FEED] +-char \x8E ( 345 7 ) # 8E ⡜ [SINGLE SHIFT TWO] +-char \x8F (1 67 ) # 8F ⡡ [SINGLE SHIFT THREE] +-char \x90 (1234567 ) # 90 ⡿ [DEVICE CONTROL STRING] +-char \x91 (1 34 8) # 91 ⢍ [PRIVATE USE ONE] +-char \x92 (12 56 8) # 92 ⢳ [PRIVATE USE TWO] +-char \x93 ( 3 567 ) # 93 ⡴ [SET TRANSMIT STATE] +-char \x94 ( 2 4 6 ) # 94 ⠪ [CANCEL CHARACTER] +-char \x95 ( 67 ) # 95 ⡠ [MESSAGE WAITING] +-char \x96 (123456 8) # 96 ⢿ [START OF GUARDED AREA] +-char \x97 ( 3 6 8) # 97 ⢤ [END OF GUARDED AREA] +-char \x98 ( 2 456 8) # 98 ⢺ [START OF STRING] +-char \x99 ( 2 4 67 ) # 99 ⡪ [] +-char \x9A (12 567 ) # 9A ⡳ [SINGLE CHARACTER INTRODUCER] +-char \x9B ( 4 7 ) # 9B ⡈ [CONTROL SEQUENCE INTRODUCER] +-char \x9C ( 7 ) # 9C ⡀ [STRING TERMINATOR] +-char \x9D ( 45 7 ) # 9D ⡘ [OPERATING SYSTEM COMMAND] +-char \x9E (1 34 6 8) # 9E ⢭ [PRIVACY MESSAGE] +-char \x9F (1 345 8) # 9F ⢝ [APPLICATION PROGRAM COMMAND] + char \xA1 ( 23 5 8) # A1 ⢖ ¡ [INVERTED EXCLAMATION MARK] + char \xA2 (1 3 56 8) # A2 ⢵ ¢ [CENT SIGN] + char \xA3 (123 8) # A3 ⢇ £ [POUND SIGN] diff -Nru brltty-5.4/debian/patches/git-ba42441d03c6145fe6859c90fb01b1fa16221a2f brltty-5.5/debian/patches/git-ba42441d03c6145fe6859c90fb01b1fa16221a2f --- brltty-5.4/debian/patches/git-ba42441d03c6145fe6859c90fb01b1fa16221a2f 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/debian/patches/git-ba42441d03c6145fe6859c90fb01b1fa16221a2f 2017-12-03 17:35:35.000000000 +0000 @@ -0,0 +1,19 @@ +commit ba42441d03c6145fe6859c90fb01b1fa16221a2f +Author: Mario Lang +Date: Thu Nov 30 13:14:47 2017 +0100 + + Prevent scancodes from generating spurious log messages. (ml) + +diff --git a/Drivers/Braille/HandyTech/braille.c b/Drivers/Braille/HandyTech/braille.c +index 53fb4a16e..4c4a9289c 100644 +--- a/Drivers/Braille/HandyTech/braille.c ++++ b/Drivers/Braille/HandyTech/braille.c +@@ -1560,7 +1560,7 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) { + case HT_EXTPKT_Scancode: { + while (length--) + enqueueCommand(BRL_CMD_BLK(PASSAT) | BRL_ARG_PUT(*bytes++)); +- break; ++ continue; + } + + case HT_EXTPKT_GetRTC: { diff -Nru brltty-5.4/debian/patches/git-braillenote.patch brltty-5.5/debian/patches/git-braillenote.patch --- brltty-5.4/debian/patches/git-braillenote.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/git-braillenote.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -commit 71e8623c494d1936e27f12270f460312beb383bf -Author: Dave Mielke -Date: Wed Nov 9 14:49:00 2016 -0500 - - The BrailleNote wasn't being autodetected when using USB. (dm) - -diff --git a/Programs/config.c b/Programs/config.c -index 295d269..6554461 100644 ---- a/Programs/config.c -+++ b/Programs/config.c -@@ -1487,7 +1487,7 @@ activateBrailleDriver (int verify) { - autodetectableDrivers = serialDrivers; - } else if (isUsbDevice(&dev)) { - static const char *const usbDrivers[] = { -- "al", "bm", "eu", "fs", "hd", "hm", "ht", "hw", "mt", "pg", "pm", "sk", "vo", -+ "al", "bm", "bn", "eu", "fs", "hd", "hm", "ht", "hw", "mt", "pg", "pm", "sk", "vo", - NULL - }; - autodetectableDrivers = usbDrivers; diff -Nru brltty-5.4/debian/patches/git-lsystemd.patch brltty-5.5/debian/patches/git-lsystemd.patch --- brltty-5.4/debian/patches/git-lsystemd.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/git-lsystemd.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -commit 00506f796c79f05e18a1959998fd4b0932155019 -Author: Dave Mielke -Date: Mon Oct 3 07:13:19 2016 -0400 - - The service package libraries should be in the link list instead of in the compile list. (st) - -diff --git a/config.mk.in b/config.mk.in -index 4e405c1..de096c9 100644 ---- a/config.mk.in -+++ b/config.mk.in -@@ -235,7 +235,7 @@ TUNE_OBJECTS = tune.$O notes.$O $(BEEP_OBJECTS) $(PCM_OBJECTS) $(MIDI_OBJECTS) $ - ASYNC_OBJECTS = async_handle.$O async_data.$O async_wait.$O async_alarm.$O async_task.$O async_io.$O async_event.$O async_signal.$O thread.$O - BASE_OBJECTS = log.$O addresses.$O file.$O device.$O parse.$O variables.$O datafile.$O unicode.$O $(CHARSET_OBJECTS) timing.$O $(ASYNC_OBJECTS) queue.$O lock.$O $(DYNLD_OBJECTS) $(PORTS_OBJECTS) $(SYSTEM_OBJECTS) - OPTIONS_OBJECTS = options.$O $(PARAMS_OBJECTS) --PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) $(SERVICE_LIBS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS) -+PROGRAM_OBJECTS = program.$O $(PGMPATH_OBJECTS) $(SERVICE_OBJECTS) pid.$O $(OPTIONS_OBJECTS) $(BASE_OBJECTS) - - CC = @CC@ - CPPFLAGS = -I$(BLD_DIR) -I$(SRC_DIR) -I$(BLD_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(PGM_DIR) -I$(SRC_TOP:/=)/$(HDR_DIR) -I$(BLD_TOP:/=) -I$(SRC_TOP:/=) @CPPFLAGS@ @DEFS@ -@@ -248,7 +248,7 @@ LIBCXXFLAGS = $(CXXFLAGS) @LIBCXXFLAGS@ - - LD = @LD@ - LDFLAGS = @LDFLAGS@ --LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@ -+LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SERVICE_LIBS) $(SYSTEM_LIBS) @LIBS@ - - MKOBJ = @MKOBJ@ - MKMOD = @MKMOD@ diff -Nru brltty-5.4/debian/patches/git-manufacturer.patch brltty-5.5/debian/patches/git-manufacturer.patch --- brltty-5.4/debian/patches/git-manufacturer.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/git-manufacturer.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,180 +0,0 @@ ---- a/Drivers/Braille/Albatross/braille.c -+++ b/Drivers/Braille/Albatross/braille.c -@@ -173,9 +173,14 @@ static UsbChannel *usbChannel = NULL; - - static int - openUsbPort (const char *device) { -+ BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001) -+ "Tivomatic Oy", -+ END_USB_STRING_LIST -+ - BEGIN_USB_CHANNEL_DEFINITIONS - { /* all models */ - .vendor=0X0403, .product=0X6001, -+ .manufacturers = usbManufacturers_0403_6001, - .configuration=1, .interface=0, .alternative=0, - .inputEndpoint=1, .outputEndpoint=2 - }, ---- a/Drivers/Braille/BrailleMemo/braille.c -+++ b/Drivers/Braille/BrailleMemo/braille.c -@@ -286,9 +286,14 @@ connectResource (BrailleDisplay *brl, co - .baud = 9600 - }; - -+ BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA60) -+ "Silicon Labs", -+ END_USB_STRING_LIST -+ - BEGIN_USB_CHANNEL_DEFINITIONS - { /* Pocket */ - .vendor=0X10C4, .product=0XEA60, -+ .manufacturers = usbManufacturers_10C4_EA60, - .configuration=1, .interface=0, .alternative=0, - .inputEndpoint=1, .outputEndpoint=1, - .serial=&serialParameters ---- a/Drivers/Braille/HIMS/braille.c -+++ b/Drivers/Braille/HIMS/braille.c -@@ -556,6 +556,10 @@ connectResource (BrailleDisplay *brl, co - .baud = 115200 - }; - -+ BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001) -+ "FTDI", -+ END_USB_STRING_LIST -+ - BEGIN_USB_CHANNEL_DEFINITIONS - { /* Braille Sense (USB 1.1) */ - .version = UsbSpecificationVersion_1_1, -@@ -588,6 +592,7 @@ connectResource (BrailleDisplay *brl, co - - { /* Sync Braille */ - .vendor=0X0403, .product=0X6001, -+ .manufacturers = usbManufacturers_0403_6001, - .configuration=1, .interface=0, .alternative=0, - .inputEndpoint=1, .outputEndpoint=2, - .data=&syncBrailleProtocol ---- a/Drivers/Braille/HandyTech/braille.c -+++ b/Drivers/Braille/HandyTech/braille.c -@@ -1107,6 +1107,10 @@ connectResource (BrailleDisplay *brl, co - .parity = SERIAL_PARITY_ODD - }; - -+ BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001) -+ "FTDI", -+ END_USB_STRING_LIST -+ - BEGIN_USB_CHANNEL_DEFINITIONS - { /* GoHubs chip */ - .vendor=0X0921, .product=0X1200, -@@ -1117,6 +1121,7 @@ connectResource (BrailleDisplay *brl, co - - { /* FTDI chip */ - .vendor=0X0403, .product=0X6001, -+ .manufacturers = usbManufacturers_0403_6001, - .configuration=1, .interface=0, .alternative=0, - .inputEndpoint=1, .outputEndpoint=2, - .serial = &serialParameters ---- a/Drivers/Braille/Seika/braille.c -+++ b/Drivers/Braille/Seika/braille.c -@@ -676,9 +676,18 @@ connectResource (BrailleDisplay *brl, co - .baud = 9600 - }; - -+ BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA60) -+ "Silicon Labs", -+ END_USB_STRING_LIST -+ -+ BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA80) -+ "Silicon Laboratories", -+ END_USB_STRING_LIST -+ - BEGIN_USB_CHANNEL_DEFINITIONS - { /* Braille Display */ - .vendor=0X10C4, .product=0XEA60, -+ .manufacturers = usbManufacturers_10C4_EA60, - .configuration=1, .interface=0, .alternative=0, - .inputEndpoint=1, .outputEndpoint=1, - .serial=&serialParameters -@@ -686,6 +695,7 @@ connectResource (BrailleDisplay *brl, co - - { /* Note Taker */ - .vendor=0X10C4, .product=0XEA80, -+ .manufacturers = usbManufacturers_10C4_EA80, - .configuration=1, .interface=0, .alternative=0, - .inputEndpoint=1, - .serial=&serialParameters ---- a/Headers/usb_types.h -+++ b/Headers/usb_types.h -@@ -300,7 +300,15 @@ typedef enum { - #define USB_HID_ITEM_LENGTH(item) ((item) & ~UsbHidItemType_Mask) - #define USB_HID_ITEM_BIT(type) (UINT64_C(1) << ((type) >> 2)) - -+#define BEGIN_USB_STRING_LIST(name) static const char *const name[] = { -+#define END_USB_STRING_LIST NULL}; -+ - typedef struct { -+ const void *data; -+ const SerialParameters *serial; -+ const char *const *manufacturers; -+ const char *const *products; -+ - uint16_t vendor; - uint16_t product; - uint16_t version; -@@ -314,9 +322,6 @@ typedef struct { - unsigned disableAutosuspend:1; - unsigned disableEndpointReset:1; - unsigned verifyInterface:1; -- -- const SerialParameters *serial; -- const void *data; - } UsbChannelDefinition; - - #define BEGIN_USB_CHANNEL_DEFINITIONS static const UsbChannelDefinition usbChannelDefinitions[] = { ---- a/Programs/usb.c -+++ b/Programs/usb.c -@@ -370,6 +370,34 @@ usbVerifyProductIdentifier (const UsbDev - return identifier == getLittleEndian16(descriptor->idProduct); - } - -+static int -+usbVerifyStrings ( -+ UsbDevice *device, -+ const char *const *strings, -+ unsigned char number -+) { -+ if (!strings) return 1; -+ if (!number) return 0; -+ -+ char *string = usbGetString(device, number, 1000); -+ int matched = 0; -+ -+ if (string) { -+ while (*strings) { -+ if (strcmp(*strings, string) == 0) { -+ matched = 1; -+ break; -+ } -+ -+ strings += 1; -+ } -+ -+ free(string); -+ } -+ -+ return matched; -+} -+ - const UsbDeviceDescriptor * - usbDeviceDescriptor (UsbDevice *device) { - return &device->descriptor; -@@ -1445,6 +1473,9 @@ usbChooseChannel (UsbDevice *device, Usb - if (!usbVerifyProductIdentifier(descriptor, data->productIdentifier)) goto nextDefinition; - if (!usbVerifySerialNumber(device, data->serialNumber)) goto nextDefinition; - -+ if (!usbVerifyStrings(device, definition->manufacturers, descriptor->iManufacturer)) goto nextDefinition; -+ if (!usbVerifyStrings(device, definition->products, descriptor->iProduct)) goto nextDefinition; -+ - if (definition->verifyInterface) { - if (!usbConfigureDevice(device, definition->configuration)) goto nextDefinition; - if (!usbInterfaceDescriptor(device, definition->interface, definition->alternative)) goto nextDefinition; diff -Nru brltty-5.4/debian/patches/git-speech-crash.patch brltty-5.5/debian/patches/git-speech-crash.patch --- brltty-5.4/debian/patches/git-speech-crash.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/git-speech-crash.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -commit 5ddde1f78a35ad698df2bfb06f180a43d3d7ed7f -Author: Dave Mielke -Date: Mon Sep 26 20:09:03 2016 -0400 - - Fix a possible crash during speech thread construction. (dm) - -diff --git a/Programs/spk_thread.c b/Programs/spk_thread.c -index 288518c..3d33ded 100644 ---- a/Programs/spk_thread.c -+++ b/Programs/spk_thread.c -@@ -80,7 +80,6 @@ typedef enum { - - struct SpeechDriverThreadStruct { - ThreadState threadState; -- unsigned stopping:1; - Queue *requestQueue; - - volatile SpeechSynthesizer *speechSynthesizer; -@@ -253,7 +252,7 @@ testThreadValidity (volatile SpeechDriverThread *sdt) { - - if (spk) { - if (sdt == spk->driver.thread) { -- if (!sdt->stopping) { -+ if (sdt->threadState == THD_READY) { - return 1; - } - } -@@ -874,7 +873,6 @@ constructSpeechDriverThread ( - - if ((sdt = malloc(sizeof(*sdt)))) { - memset((void *)sdt, 0, sizeof(*sdt)); -- sdt->stopping = 0; - setThreadState(sdt, THD_CONSTRUCTING); - setResponsePending(sdt); - diff -Nru brltty-5.4/debian/patches/git-vario-ultra-restart.patch brltty-5.5/debian/patches/git-vario-ultra-restart.patch --- brltty-5.4/debian/patches/git-vario-ultra-restart.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/git-vario-ultra-restart.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -commit 587004a914d572e6481d0a810e1b3af8cf8afaf2 -Author: Dave Mielke -Date: Sat Mar 11 21:03:18 2017 -0500 - - USB write timeouts should be ignored for the Vario Ultra. (dm) - -diff --git a/Drivers/Braille/Baum/braille.c b/Drivers/Braille/Baum/braille.c -index a571d319d..f137bdbe3 100644 ---- a/Drivers/Braille/Baum/braille.c -+++ b/Drivers/Braille/Baum/braille.c -@@ -3104,6 +3104,7 @@ connectResource (BrailleDisplay *brl, const char *identifier) { - descriptor.serial.options.applicationData = &baumEscapeOperations; - - descriptor.usb.channelDefinitions = usbChannelDefinitions; -+ descriptor.usb.options.ignoreWriteTimeouts = 1; - - descriptor.bluetooth.channelNumber = 1; - descriptor.bluetooth.discoverChannel = 1; -diff --git a/Headers/gio_types.h b/Headers/gio_types.h -index 481bb0fd0..11110d5c9 100644 ---- a/Headers/gio_types.h -+++ b/Headers/gio_types.h -@@ -32,6 +32,7 @@ typedef struct { - int inputTimeout; - int outputTimeout; - int requestTimeout; -+ unsigned ignoreWriteTimeouts:1; - } GioOptions; - - typedef ssize_t GioUsbWriteDataMethod ( -diff --git a/Programs/gio.c b/Programs/gio.c -index 123f188a2..f370c3f34 100644 ---- a/Programs/gio.c -+++ b/Programs/gio.c -@@ -228,8 +228,18 @@ gioWriteData (GioEndpoint *endpoint, const void *data, size_t size) { - return -1; - } - -- return method(endpoint->handle, data, size, -- endpoint->options.outputTimeout); -+ ssize_t result = method(endpoint->handle, data, size, -+ endpoint->options.outputTimeout); -+ -+ if (endpoint->options.ignoreWriteTimeouts) { -+ if (result == -1) { -+ if (errno == ETIMEDOUT) { -+ result = size; -+ } -+ } -+ } -+ -+ return result; - } - - int diff -Nru brltty-5.4/debian/patches/series brltty-5.5/debian/patches/series --- brltty-5.4/debian/patches/series 2017-08-07 07:16:15.000000000 +0000 +++ brltty-5.5/debian/patches/series 2018-01-19 14:30:02.000000000 +0000 @@ -1,18 +1,9 @@ 10-python.patch -20-sbin.patch 40-no-update-pot.patch 41-java-bytecode-compat.patch 50-constants.patch -git-speech-crash.patch -git-lsystemd.patch -defauth-polkit -xbrlapi.patch -defauth-keyfile.patch -wait-polkit -xbrlapi-setfocus.patch -git-braillenote.patch -git-manufacturer.patch -xbrlapi-nospam.patch -git-vario-ultra-restart.patch disable-synth-callback.patch -fix-gcc7-ftbfs.patch +api_startup.patch +git-07ecca2240c680373e9c2e5e38241edde9d1a677 +brldefs-install.patch +git-ba42441d03c6145fe6859c90fb01b1fa16221a2f diff -Nru brltty-5.4/debian/patches/wait-polkit brltty-5.5/debian/patches/wait-polkit --- brltty-5.4/debian/patches/wait-polkit 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/wait-polkit 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -commit 7c26200d24b73fd4b3eec5e00f8593cf7ba507ff -Author: Dave Mielke -Date: Sat Oct 8 22:27:03 2016 -0400 - - Waiting for Polkit initialization shouldn't delay BRLTTY startup. (st) - - When BRLTTY is started very early, policykit is not running yet. - BrlAPI would then be disabled. - This makes the policykit initialization detect the case - when policykit it not started yet (G_IO_ERROR_NOT_FOUND), and - moves the initialization of authentication to inside the BrlAPI thread. - -diff --git a/Programs/auth.c b/Programs/auth.c -index f93afad..9b8bf3b 100644 ---- a/Programs/auth.c -+++ b/Programs/auth.c -@@ -54,6 +54,7 @@ typedef unsigned int gid_t; - #include "strfmt.h" - #include "parse.h" - #include "auth.h" -+#include "async_wait.h" - - /* peer credentials */ - #undef CAN_CHECK_CREDENTIALS -@@ -452,15 +453,28 @@ authPolkit_initialize (const char *parameter) { - if ((polkit = malloc(sizeof(*polkit)))) { - memset(polkit, 0, sizeof(*polkit)); - -- GError *error_local = NULL; -- polkit->authority = polkit_authority_get_sync(NULL, &error_local); -+ while(1) { -+ GError *error_local = NULL; -+ polkit->authority = polkit_authority_get_sync(NULL, &error_local); - -- if (polkit->authority) { -- return polkit; -- } else { -- g_error_free(error_local); -- g_free(polkit); -+ if (polkit->authority) { -+ return polkit; -+ } else { -+ GQuark domain = error_local->domain; -+ gint code = error_local->code; -+ -+ logMessage(LOG_WARNING, "Unable to connect to polkit: %s (%d) %s (%d)", g_quark_to_string(domain), (int) domain, error_local->message, code); -+ g_error_free(error_local); -+ -+ if ((domain != G_IO_ERROR) && (code != G_IO_ERROR_NOT_FOUND)) { -+ break; -+ } -+ } -+ -+ asyncWait(1000); - } -+ -+ g_free(polkit); - } else { - logMallocError(); - } -diff --git a/Programs/brlapi_server.c b/Programs/brlapi_server.c -index c3b3c6e..295f169 100644 ---- a/Programs/brlapi_server.c -+++ b/Programs/brlapi_server.c -@@ -2183,6 +2183,12 @@ THREAD_FUNCTION(runServer) { - logMessage(LOG_CATEGORY(SERVER_EVENTS), "server thread started"); - if (!prepareThread()) goto finished; - -+ if (auth && !isAbsolutePath(auth)) -+ if (!(authDescriptor = authBeginServer(auth))) { -+ logMessage(LOG_WARNING, "Unable to start auth server"); -+ goto finished; -+ } -+ - socketHosts = splitString(hosts,'+',&numSockets); - if (numSockets>MAXSOCKETS) { - logMessage(LOG_ERR,"too many hosts specified (%d, max %d)",numSockets,MAXSOCKETS); -@@ -3086,10 +3092,6 @@ int api_start(BrailleDisplay *brl, char **parameters) - if (*operand) auth = operand; - } - -- if (auth && !isAbsolutePath(auth)) -- if (!(authDescriptor = authBeginServer(auth))) -- return 0; -- - pthread_attr_t attr; - pthread_mutexattr_t mattr; - diff -Nru brltty-5.4/debian/patches/xbrlapi-nospam.patch brltty-5.5/debian/patches/xbrlapi-nospam.patch --- brltty-5.4/debian/patches/xbrlapi-nospam.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/xbrlapi-nospam.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -commit 0a5341121ba8f4de24407ce2a4d5369dadf5d099 -Author: Dave Mielke -Date: Tue Jan 17 11:01:39 2017 -0500 - - Prevent xbrlapi from retrying to connect to brltty when it fails at startup. (st) - - This is typical for a system that doesn't actually have an attached braille display, - thus allowing xbrlapi to be started by default on a standard system. - -diff --git a/Programs/xbrlapi.c b/Programs/xbrlapi.c -index 4796b8db8..d6b83f363 100644 ---- a/Programs/xbrlapi.c -+++ b/Programs/xbrlapi.c -@@ -173,20 +173,25 @@ static int tobrltty_init(char *auth, char *host) { - unsigned int x,y; - settings.host=host; - settings.auth=auth; -+ static int had_succeeded; - - if ((brlapi_fd = brlapi_openConnection(&settings,&settings))<0) - { -- static int tried; -- if (!tried) -+ if (!had_succeeded) - { -- /* Only produce an error message the first time we try to connect, to -- * provide feedback to users running xbrlapi by hand, but not fill logs -- * with reconnection attempts. */ -- tried = 1; -+ /* This is the first attempt to connect to BRLTTY, and it failed. -+ * Return the error immediately to the user, to provide feedback to users -+ * running xbrlapi by hand, but not fill logs, eat battery, spam -+ * 127.0.0.1 with reconnection attempts. -+ */ - fatal_brlapi_errno("openConnection",gettext("cannot connect to braille devices daemon brltty at %s\n"),settings.host); -+ exit(PROG_EXIT_FATAL); - } - return 0; - } -+ /* We achieved connecting to BRLTTY. If BRLTTY dies later on, we will -+ * silently try to reconnect to it. */ -+ had_succeeded = 1; - - if (brlapi_getDisplaySize(&x,&y)<0) - { diff -Nru brltty-5.4/debian/patches/xbrlapi.patch brltty-5.5/debian/patches/xbrlapi.patch --- brltty-5.4/debian/patches/xbrlapi.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/xbrlapi.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -commit 7545cade829b461a3edc7c717a1ac270a24aba1d -Author: Dave Mielke -Date: Sat Oct 8 22:03:15 2016 -0400 - - xbrlapi spuriously reconnects on every window change. (st) - - A bogus if: tobrltty_init should be called only when brlapi_fd<0, and not as - soon as !FD_ISSET(brlapi_fd,&readfds) - -diff --git a/Programs/xbrlapi.c b/Programs/xbrlapi.c -index 489d73f..1520f81 100644 ---- a/Programs/xbrlapi.c -+++ b/Programs/xbrlapi.c -@@ -733,9 +733,9 @@ static void toX_f(const char *display) { - default: fprintf(stderr,gettext("xbrlapi: unhandled event type: %d\n"),ev.type); break; - } - } -- if (brlapi_fd>=0 && FD_ISSET(brlapi_fd,&readfds)) { -+ if (brlapi_fd>=0) { - #ifdef CAN_SIMULATE_KEY_PRESSES -- if (haveXTest) { -+ if (haveXTest && FD_ISSET(brlapi_fd,&readfds)) { - while (((res = brlapi_readKey(0, &code))==1)) { - switch (code & BRLAPI_KEY_TYPE_MASK) { - case BRLAPI_KEY_TYPE_CMD: diff -Nru brltty-5.4/debian/patches/xbrlapi-setfocus.patch brltty-5.5/debian/patches/xbrlapi-setfocus.patch --- brltty-5.4/debian/patches/xbrlapi-setfocus.patch 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/patches/xbrlapi-setfocus.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -commit a4029b60dff75d0352453f87274a1f243a78fed1 -Author: Dave Mielke -Date: Sat Oct 8 22:35:32 2016 -0400 - - Fix BrlAPI refresh on xbrlapi setfocus notification. (st) - - Braille rendering was not flushed when xbrlapi notifies brltty of the - focus change. Also, we need to make sure to flush rendering when the - displayed connection changes - so far we were just lucky that the cursor - position was different and thus triggered a flush. - -diff --git a/Programs/brlapi_server.c b/Programs/brlapi_server.c -index 295f169..613f52d 100644 ---- a/Programs/brlapi_server.c -+++ b/Programs/brlapi_server.c -@@ -924,6 +924,7 @@ static int handleSetFocus(Connection *c, brlapi_packetType_t type, brlapi_packet - CHECKEXC(c->tty,BRLAPI_ERROR_ILLEGAL_INSTRUCTION,"not allowed out of tty mode"); - c->tty->focus = ntohl(ints[0]); - logMessage(LOG_CATEGORY(SERVER_EVENTS), "focus on window %#010x",c->tty->focus); -+ asyncSignalEvent(flushEvent, NULL); - return 0; - } - -@@ -2851,6 +2852,7 @@ out: - */ - int api_flush(BrailleDisplay *brl) { - Connection *c; -+ static Connection *displayed_last; - int ok = 1; - int drain = 0; - int update = 0; -@@ -2884,7 +2886,7 @@ int api_flush(BrailleDisplay *brl) { - } - } - -- if (c->brlbufstate==TODISPLAY || update) { -+ if (c != displayed_last || c->brlbufstate==TODISPLAY || update) { - unsigned char *oldbuf = disp->buffer, buf[displaySize]; - disp->buffer = buf; - getDots(&c->brailleWindow, buf); -@@ -2892,6 +2894,7 @@ int api_flush(BrailleDisplay *brl) { - ok = trueBraille->writeWindow(brl, c->brailleWindow.text); - drain = 1; - disp->buffer = oldbuf; -+ displayed_last = c; - } - unlockMutex(&apiDriverMutex); - unlockMutex(&c->brailleWindowMutex); diff -Nru brltty-5.4/debian/rules brltty-5.5/debian/rules --- brltty-5.4/debian/rules 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/rules 2017-12-03 22:14:44.000000000 +0000 @@ -7,7 +7,7 @@ VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) BRLAPI_VERSION=0.6 CL_DATE=$(shell dpkg-parsechangelog | grep Date: | sed s/Date:\ //) -DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH?=$(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_MULTIARCH?=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) # java is not supported by m68k (200712) ifeq ($(DEB_HOST_ARCH),m68k) @@ -21,7 +21,7 @@ HARDENING = CPPFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CPPFLAGS)" CFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CFLAGS)" CXXFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get CXXFLAGS)" LDFLAGS="$$(DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags --get LDFLAGS)" -CONFIGURE_OPTIONS = --bindir=/sbin --mandir=/usr/share/man \ +CONFIGURE_OPTIONS = --mandir=/usr/share/man \ --without-viavoice --without-theta --without-swift DEB_CONFIGURE_OPTIONS = --with-curses=ncursesw --disable-stripping @@ -237,7 +237,7 @@ cp debian/brltty-udeb.prebaseconfig debian/brltty-udeb/usr/lib/finish-install.d/07brltty chmod 0755 debian/brltty-udeb/usr/lib/finish-install.d/07brltty cp debian/brltty-udeb.start debian/brltty-udeb/lib/debian-installer.d/S19brltty - rm -f debian/brltty-udeb/sbin/brltty-* + rm -f debian/brltty-udeb/bin/brltty-* rm -Rf debian/brltty-udeb/usr/share # Strip comments and whitespaces from translation tables cd debian/brltty-udeb/etc/brltty && \ diff -Nru brltty-5.4/debian/xbrlapi.desktop brltty-5.5/debian/xbrlapi.desktop --- brltty-5.4/debian/xbrlapi.desktop 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/xbrlapi.desktop 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=xbrlapi -Exec=xbrlapi -q -NoDisplay=true -X-GNOME-AutoRestart=true diff -Nru brltty-5.4/debian/xbrlapi.install brltty-5.5/debian/xbrlapi.install --- brltty-5.4/debian/xbrlapi.install 2017-03-15 22:12:54.000000000 +0000 +++ brltty-5.5/debian/xbrlapi.install 2017-12-03 22:14:44.000000000 +0000 @@ -1,3 +1,3 @@ -debian/tmp/sbin/xbrlapi usr/bin -debian/60xbrlapi /etc/X11/Xsession.d -debian/xbrlapi.desktop usr/share/gdm/greeter/autostart +debian/tmp/bin/xbrlapi usr/bin +debian/tmp/etc/X11/Xsession.d +debian/tmp/usr/share/gdm/greeter/autostart diff -Nru brltty-5.4/document.mk brltty-5.5/document.mk --- brltty-5.4/document.mk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/document.mk 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -19,6 +19,7 @@ LOCALE = C SETLOCALE = LC_ALL=$(LOCALE) +all: all-yes all-yes: txt html all-no: @echo linuxdoc is not installed - document will not be made @@ -27,7 +28,7 @@ html: html.made $(DOCUMENT_NAME).txt: $(SRC_DIR)/$(DOCUMENT_NAME).sgml - $(SETLOCALE) linuxdoc -B txt -l $(DOCUMENT_LANGUAGE) -c latin $< + $(SETLOCALE) linuxdoc -B txt -f -l $(DOCUMENT_LANGUAGE) -c latin $< sed -e 's/\x1B\[[0-9][0-9]*m//g' -i $@ html.made: $(SRC_DIR)/$(DOCUMENT_NAME).sgml diff -Nru brltty-5.4/Documents/BrlAPIref/html/annotated.html brltty-5.5/Documents/BrlAPIref/html/annotated.html --- brltty-5.4/Documents/BrlAPIref/html/annotated.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/annotated.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/brlapi_8h.html brltty-5.5/Documents/BrlAPIref/html/brlapi_8h.html --- brltty-5.4/Documents/BrlAPIref/html/brlapi_8h.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/brlapi_8h.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
@@ -90,13 +90,13 @@ - + - + @@ -110,7 +110,7 @@ - + diff -Nru brltty-5.4/Documents/BrlAPIref/html/brlapi_8h_source.html brltty-5.5/Documents/BrlAPIref/html/brlapi_8h_source.html --- brltty-5.4/Documents/BrlAPIref/html/brlapi_8h_source.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/brlapi_8h_source.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ @@ -55,7 +55,7 @@
2 /*
3  * libbrlapi - A library providing access to braille terminals for applications.
4  *
-
5  * Copyright (C) 2002-2016 by
+
5  * Copyright (C) 2002-2017 by
6  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
7  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
8  *
@@ -80,13 +80,13 @@
31 
32 /* #undef BRLAPI_WIN32 */
33 
-
38 #define BRLAPI_RELEASE "0.6.5"
+
38 #define BRLAPI_RELEASE "0.6.6"
39 
41 #define BRLAPI_MAJOR 0
42 
44 #define BRLAPI_MINOR 6
45 
-
47 #define BRLAPI_REVISION 5
+
47 #define BRLAPI_REVISION 6
48 
51 /* Types are defined there */
52 #include <sys/types.h>
@@ -134,7 +134,7 @@
139 /* No authentication by default on Windows */
140 #define BRLAPI_DEFAUTH "none"
141 #else
-
142 #define BRLAPI_DEFAUTH BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
+
142 #define BRLAPI_DEFAUTH "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
143 #endif /* BRLAPI_WIN32 */
144 
145 #ifdef __MINGW32__
diff -Nru brltty-5.4/Documents/BrlAPIref/html/brlapi__constants_8h.html brltty-5.5/Documents/BrlAPIref/html/brlapi__constants_8h.html --- brltty-5.4/Documents/BrlAPIref/html/brlapi__constants_8h.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/brlapi__constants_8h.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/brlapi__constants_8h_source.html brltty-5.5/Documents/BrlAPIref/html/brlapi__constants_8h_source.html --- brltty-5.4/Documents/BrlAPIref/html/brlapi__constants_8h_source.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/brlapi__constants_8h_source.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ @@ -54,7 +54,7 @@ Go to the documentation of this file.
1 /*
2  * libbrlapi - A library providing access to braille terminals for applications.
3  *
-
4  * Copyright (C) 2002-2016 by
+
4  * Copyright (C) 2002-2017 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
diff -Nru brltty-5.4/Documents/BrlAPIref/html/brlapi__keycodes_8h.html brltty-5.5/Documents/BrlAPIref/html/brlapi__keycodes_8h.html --- brltty-5.4/Documents/BrlAPIref/html/brlapi__keycodes_8h.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/brlapi__keycodes_8h.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
diff -Nru brltty-5.4/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html brltty-5.5/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html --- brltty-5.4/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/brlapi__keycodes_8h_source.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ @@ -54,7 +54,7 @@ Go to the documentation of this file.
1 /*
2  * libbrlapi - A library providing access to braille terminals for applications.
3  *
-
4  * Copyright (C) 2002-2016 by
+
4  * Copyright (C) 2002-2017 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
diff -Nru brltty-5.4/Documents/BrlAPIref/html/brlapi__protocol_8h.html brltty-5.5/Documents/BrlAPIref/html/brlapi__protocol_8h.html --- brltty-5.4/Documents/BrlAPIref/html/brlapi__protocol_8h.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/brlapi__protocol_8h.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
diff -Nru brltty-5.4/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html brltty-5.5/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html --- brltty-5.4/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/brlapi__protocol_8h_source.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ @@ -54,7 +54,7 @@ Go to the documentation of this file.
1 /*
2  * libbrlapi - A library providing access to braille terminals for applications.
3  *
-
4  * Copyright (C) 2002-2016 by
+
4  * Copyright (C) 2002-2017 by
5  * Samuel Thibault <Samuel.Thibault@ens-lyon.org>
6  * Sébastien Hinderer <Sebastien.Hinderer@ens-lyon.org>
7  *
diff -Nru brltty-5.4/Documents/BrlAPIref/html/classes.html brltty-5.5/Documents/BrlAPIref/html/classes.html --- brltty-5.4/Documents/BrlAPIref/html/classes.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/classes.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
diff -Nru brltty-5.4/Documents/BrlAPIref/html/dir_4b8fc02e1ceb0b761fea04ca89149256.html brltty-5.5/Documents/BrlAPIref/html/dir_4b8fc02e1ceb0b761fea04ca89149256.html --- brltty-5.4/Documents/BrlAPIref/html/dir_4b8fc02e1ceb0b761fea04ca89149256.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/dir_4b8fc02e1ceb0b761fea04ca89149256.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/files.html brltty-5.5/Documents/BrlAPIref/html/files.html --- brltty-5.4/Documents/BrlAPIref/html/files.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/files.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/functions.html brltty-5.5/Documents/BrlAPIref/html/functions.html --- brltty-5.4/Documents/BrlAPIref/html/functions.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/functions.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/functions_vars.html brltty-5.5/Documents/BrlAPIref/html/functions_vars.html --- brltty-5.4/Documents/BrlAPIref/html/functions_vars.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/functions_vars.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals_0x75.html brltty-5.5/Documents/BrlAPIref/html/globals_0x75.html --- brltty-5.4/Documents/BrlAPIref/html/globals_0x75.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals_0x75.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals_defs_0x75.html brltty-5.5/Documents/BrlAPIref/html/globals_defs_0x75.html --- brltty-5.4/Documents/BrlAPIref/html/globals_defs_0x75.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals_defs_0x75.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals_defs.html brltty-5.5/Documents/BrlAPIref/html/globals_defs.html --- brltty-5.4/Documents/BrlAPIref/html/globals_defs.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals_defs.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals_enum.html brltty-5.5/Documents/BrlAPIref/html/globals_enum.html --- brltty-5.4/Documents/BrlAPIref/html/globals_enum.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals_enum.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals_eval.html brltty-5.5/Documents/BrlAPIref/html/globals_eval.html --- brltty-5.4/Documents/BrlAPIref/html/globals_eval.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals_eval.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals_func.html brltty-5.5/Documents/BrlAPIref/html/globals_func.html --- brltty-5.4/Documents/BrlAPIref/html/globals_func.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals_func.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals.html brltty-5.5/Documents/BrlAPIref/html/globals.html --- brltty-5.4/Documents/BrlAPIref/html/globals.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals_type.html brltty-5.5/Documents/BrlAPIref/html/globals_type.html --- brltty-5.4/Documents/BrlAPIref/html/globals_type.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals_type.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/globals_vars.html brltty-5.5/Documents/BrlAPIref/html/globals_vars.html --- brltty-5.4/Documents/BrlAPIref/html/globals_vars.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/globals_vars.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__connection.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__connection.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__connection.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__connection.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@ @@ -65,7 +65,7 @@ - + @@ -110,7 +110,7 @@

Macros

#define BRLAPI_RELEASE   "0.6.5"
#define BRLAPI_RELEASE   "0.6.6"
 
#define BRLAPI_MAJOR   0
 
#define BRLAPI_MINOR   6
 
#define BRLAPI_REVISION   5
#define BRLAPI_REVISION   6
 
#define BRLAPI_STDCALL
 
 
#define BRLAPI_AUTHKEYFILE   "brlapi.key"
 
#define BRLAPI_DEFAUTH   BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
#define BRLAPI_DEFAUTH   "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
 
#define BRLAPI_SETTINGS_INITIALIZER   { NULL, NULL }
 
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
BrlAPI -  1.0 +  0.6
 
#define BRLAPI_AUTHKEYFILE   "brlapi.key"
 
#define BRLAPI_DEFAUTH   BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
#define BRLAPI_DEFAUTH   "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
 
#define BRLAPI_SETTINGS_INITIALIZER   { NULL, NULL }
 
- +
#define BRLAPI_DEFAUTH   BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE#define BRLAPI_DEFAUTH   "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__deprecated.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__deprecated.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__deprecated.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__deprecated.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__driverspecific.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__driverspecific.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__driverspecific.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__driverspecific.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__error.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__error.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__error.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__error.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__handles.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__handles.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__handles.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__handles.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__info.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__info.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__info.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__info.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__keycodes.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__keycodes.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__keycodes.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__keycodes.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__keys.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__keys.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__keys.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__keys.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__protocol.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__protocol.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__protocol.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__protocol.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__tty.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__tty.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__tty.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__tty.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__version.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__version.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__version.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__version.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
@@ -46,13 +46,13 @@ - + - +

Macros

#define BRLAPI_RELEASE   "0.6.5"
#define BRLAPI_RELEASE   "0.6.6"
 
#define BRLAPI_MAJOR   0
 
#define BRLAPI_MINOR   6
 
#define BRLAPI_REVISION   5
#define BRLAPI_REVISION   6
 

Detailed Description

@@ -88,7 +88,7 @@
- +
#define BRLAPI_RELEASE   "0.6.5"#define BRLAPI_RELEASE   "0.6.6"
@@ -101,7 +101,7 @@
- +
#define BRLAPI_REVISION   5#define BRLAPI_REVISION   6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/group__brlapi__write.html brltty-5.5/Documents/BrlAPIref/html/group__brlapi__write.html --- brltty-5.4/Documents/BrlAPIref/html/group__brlapi__write.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/group__brlapi__write.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/index.html brltty-5.5/Documents/BrlAPIref/html/index.html --- brltty-5.4/Documents/BrlAPIref/html/index.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/index.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/modules.html brltty-5.5/Documents/BrlAPIref/html/modules.html --- brltty-5.4/Documents/BrlAPIref/html/modules.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/modules.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__authClientPacket__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__authClientPacket__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__authClientPacket__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__authClientPacket__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__authServerPacket__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__authServerPacket__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__authServerPacket__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__authServerPacket__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__connectionSettings__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__connectionSettings__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__connectionSettings__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__connectionSettings__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__describedKeyCode__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__describedKeyCode__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__describedKeyCode__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__describedKeyCode__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__errorPacket__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__errorPacket__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__errorPacket__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__errorPacket__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__error__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__error__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__error__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__error__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__expandedKeyCode__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__expandedKeyCode__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__expandedKeyCode__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__expandedKeyCode__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__getDriverSpecificModePacket__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__getDriverSpecificModePacket__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__getDriverSpecificModePacket__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__getDriverSpecificModePacket__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__header__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__header__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__header__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__header__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__range__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__range__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__range__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__range__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__versionPacket__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__versionPacket__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__versionPacket__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__versionPacket__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__writeArgumentsPacket__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__writeArgumentsPacket__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__writeArgumentsPacket__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__writeArgumentsPacket__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__writeArguments__t.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__writeArguments__t.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__writeArguments__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__writeArguments__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/structbrlapi__writeStruct.html brltty-5.5/Documents/BrlAPIref/html/structbrlapi__writeStruct.html --- brltty-5.4/Documents/BrlAPIref/html/structbrlapi__writeStruct.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/structbrlapi__writeStruct.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/html/unionbrlapi__packet__t.html brltty-5.5/Documents/BrlAPIref/html/unionbrlapi__packet__t.html --- brltty-5.4/Documents/BrlAPIref/html/unionbrlapi__packet__t.html 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/html/unionbrlapi__packet__t.html 2017-04-18 22:38:56.000000000 +0000 @@ -18,7 +18,7 @@
BrlAPI -  1.0 +  0.6
diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_authClientPacket_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_authClientPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_authClientPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_authServerPacket_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_authServerPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_authServerPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_connection.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_connection.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_connection.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_connection.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Connecting to BrlAPI" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Connecting to BrlAPI" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -30,7 +30,7 @@ .RI "#define \fBBRLAPI_AUTHKEYFILE\fP 'brlapi\&.key'" .br .ti -1c -.RI "#define \fBBRLAPI_DEFAUTH\fP \fBBRLAPI_ETCDIR\fP '/' \fBBRLAPI_AUTHKEYFILE\fP" +.RI "#define \fBBRLAPI_DEFAUTH\fP 'polkit+keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" .br .ti -1c .RI "#define \fBBRLAPI_SETTINGS_INITIALIZER\fP { NULL, NULL }" @@ -72,7 +72,7 @@ Default name of the file containing \fIBrlAPI\fP 's authorization key .PP This name is relative to BRLAPI_ETCDIR -.SS "#define BRLAPI_DEFAUTH \fBBRLAPI_ETCDIR\fP '/' \fBBRLAPI_AUTHKEYFILE\fP" +.SS "#define BRLAPI_DEFAUTH 'polkit+keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" Default authorization setting .SS "#define BRLAPI_ETCDIR '/etc'" \fIbrltty\fP 's settings directory diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_connectionSettings_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_connectionSettings_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_connectionSettings_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_constants.h.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_constants.h" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_constants.h" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_deprecated.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Deprecated names" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Deprecated names" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_describedKeyCode_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_describedKeyCode_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_describedKeyCode_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_driverspecific.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Driver-Specific modes" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Driver-Specific modes" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_error.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_error.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_error.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_error.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Error handling" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Error handling" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_errorPacket_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_errorPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_errorPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_error_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_error_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_error_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_error_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_error_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_error_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_expandedKeyCode_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_expandedKeyCode_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_expandedKeyCode_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_getDriverSpecificModePacket_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_getDriverSpecificModePacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_getDriverSpecificModePacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi.h.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi.h.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi.h.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi.h.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi.h" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi.h" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -52,7 +52,7 @@ .in +1c .ti -1c -.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.5'" +.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.6'" .br .ti -1c .RI "#define \fBBRLAPI_MAJOR\fP 0" @@ -61,7 +61,7 @@ .RI "#define \fBBRLAPI_MINOR\fP 6" .br .ti -1c -.RI "#define \fBBRLAPI_REVISION\fP 5" +.RI "#define \fBBRLAPI_REVISION\fP 6" .br .ti -1c .RI "#define \fBBRLAPI_STDCALL\fP" @@ -82,7 +82,7 @@ .RI "#define \fBBRLAPI_AUTHKEYFILE\fP 'brlapi\&.key'" .br .ti -1c -.RI "#define \fBBRLAPI_DEFAUTH\fP \fBBRLAPI_ETCDIR\fP '/' \fBBRLAPI_AUTHKEYFILE\fP" +.RI "#define \fBBRLAPI_DEFAUTH\fP 'polkit+keyfile:' BRLAPI_ETCDIR '/' \fBBRLAPI_AUTHKEYFILE\fP" .br .ti -1c .RI "#define \fBBRLAPI_SETTINGS_INITIALIZER\fP { NULL, NULL }" diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_handles.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_handles.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_handles.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_handles.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "BrlAPI handles" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "BrlAPI handles" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_header_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_header_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_header_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_header_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_header_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_header_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_info.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_info.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_info.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_info.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Getting Terminal information" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Getting Terminal information" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_keycodes.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Types and Defines fore BrlAPI Key Codes" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Types and Defines fore BrlAPI Key Codes" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_keycodes.h.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_keycodes.h" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_keycodes.h" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_keys.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_keys.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_keys.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_keys.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Reading key presses" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Reading key presses" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_packet_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_packet_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_packet_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_protocol.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_protocol.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_protocol.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_protocol.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "BrlAPI's protocol" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "BrlAPI's protocol" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_protocol.h.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_protocol.h" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_protocol.h" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_range_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_range_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_range_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_range_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_range_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_range_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_tty.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_tty.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_tty.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_tty.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Entering & leaving tty mode" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Entering & leaving tty mode" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_version.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_version.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_version.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_version.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Version of the BrlAPI library" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Version of the BrlAPI library" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME @@ -7,7 +7,7 @@ .in +1c .ti -1c -.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.5'" +.RI "#define \fBBRLAPI_RELEASE\fP '0\&.6\&.6'" .br .ti -1c .RI "#define \fBBRLAPI_MAJOR\fP 0" @@ -16,7 +16,7 @@ .RI "#define \fBBRLAPI_MINOR\fP 6" .br .ti -1c -.RI "#define \fBBRLAPI_REVISION\fP 5" +.RI "#define \fBBRLAPI_REVISION\fP 6" .br .in -1c .SH "Detailed Description" @@ -28,9 +28,9 @@ Library major version\&. .SS "#define BRLAPI_MINOR 6" Library minor version\&. -.SS "#define BRLAPI_RELEASE '0\&.6\&.5'" +.SS "#define BRLAPI_RELEASE '0\&.6\&.6'" Library version\&. -.SS "#define BRLAPI_REVISION 5" +.SS "#define BRLAPI_REVISION 6" Library revision\&. .SH "Author" .PP diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_versionPacket_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_versionPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_versionPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_write.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_write.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_write.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_write.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "Writing on the braille display" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "Writing on the braille display" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_writeArgumentsPacket_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_writeArgumentsPacket_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeArgumentsPacket_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_writeArguments_t.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_writeArguments_t" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeArguments_t" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/brlapi_writeStruct.3 2017-04-18 22:38:56.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "brlapi_writeStruct" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- +.TH "brlapi_writeStruct" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- .ad l .nh .SH NAME diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/_tmp_mktar.1qJHCE_brltty-5.5_Programs_.3 brltty-5.5/Documents/BrlAPIref/man/man3/_tmp_mktar.1qJHCE_brltty-5.5_Programs_.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/_tmp_mktar.1qJHCE_brltty-5.5_Programs_.3 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/_tmp_mktar.1qJHCE_brltty-5.5_Programs_.3 2017-04-18 22:38:56.000000000 +0000 @@ -0,0 +1,26 @@ +.TH "Programs Directory Reference" 3 "Tue Apr 18 2017" "Version 0.6" "BrlAPI" \" -*- nroff -*- +.ad l +.nh +.SH NAME +Programs Directory Reference \- +.SH SYNOPSIS +.br +.PP +.SS "Files" + +.in +1c +.ti -1c +.RI "file \fBbrlapi\&.h\fP" +.br +.RI "\fITypes, defines and functions prototypes for \fIBrlAPI's\fP library\&. \fP" +.ti -1c +.RI "file \fBbrlapi_constants\&.h\fP" +.br +.ti -1c +.RI "file \fBbrlapi_keycodes\&.h\fP" +.br +.ti -1c +.RI "file \fBbrlapi_protocol\&.h\fP" +.br +.RI "\fItypes and constants for \fIBrlAPI's\fP protocol \fP" +.in -1c diff -Nru brltty-5.4/Documents/BrlAPIref/man/man3/_tmp_mktar.Qanb3i_brltty-5.4_Programs_.3 brltty-5.5/Documents/BrlAPIref/man/man3/_tmp_mktar.Qanb3i_brltty-5.4_Programs_.3 --- brltty-5.4/Documents/BrlAPIref/man/man3/_tmp_mktar.Qanb3i_brltty-5.4_Programs_.3 2016-06-28 11:22:18.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref/man/man3/_tmp_mktar.Qanb3i_brltty-5.4_Programs_.3 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -.TH "Programs Directory Reference" 3 "Tue Jun 28 2016" "Version 1.0" "BrlAPI" \" -*- nroff -*- -.ad l -.nh -.SH NAME -Programs Directory Reference \- -.SH SYNOPSIS -.br -.PP -.SS "Files" - -.in +1c -.ti -1c -.RI "file \fBbrlapi\&.h\fP" -.br -.RI "\fITypes, defines and functions prototypes for \fIBrlAPI's\fP library\&. \fP" -.ti -1c -.RI "file \fBbrlapi_constants\&.h\fP" -.br -.ti -1c -.RI "file \fBbrlapi_keycodes\&.h\fP" -.br -.ti -1c -.RI "file \fBbrlapi_protocol\&.h\fP" -.br -.RI "\fItypes and constants for \fIBrlAPI's\fP protocol \fP" -.in -1c diff -Nru brltty-5.4/Documents/BrlAPIref.doxy.in brltty-5.5/Documents/BrlAPIref.doxy.in --- brltty-5.4/Documents/BrlAPIref.doxy.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/BrlAPIref.doxy.in 2017-04-18 22:35:13.000000000 +0000 @@ -24,7 +24,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.0 +PROJECT_NUMBER = @api_version@ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff -Nru brltty-5.4/Documents/brltty.1.in brltty-5.5/Documents/brltty.1.in --- brltty-5.4/Documents/brltty.1.in 2016-06-28 11:09:34.000000000 +0000 +++ brltty-5.5/Documents/brltty.1.in 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ .\" BRLTTY - A background process providing access to the console screen (when in .\" text mode) for a blind person using a refreshable braille display. .\" -.\" Copyright (C) 1995-2016 by The BRLTTY Developers. +.\" Copyright (C) 1995-2017 by The BRLTTY Developers. .\" .\" BRLTTY comes with ABSOLUTELY NO WARRANTY. .\" @@ -16,7 +16,7 @@ .\" .\" This software is maintained by Dave Mielke . .\" -.TH "BRLTTY" "1" "2016-06-28" "brltty 5.4" "BRLTTY User's Manual" +.TH "BRLTTY" "1" "2017-04-18" "brltty 5.5" "BRLTTY User's Manual" .SH NAME brltty \- refreshable braille display driver for Linux/Unix .SH SYNOPSIS @@ -93,12 +93,12 @@ The following device types are supported: .TP .B Bluetooth -For a bluetooth device, specify \fBbluez:\fIaddress\fR. +For a bluetooth device, specify \fBbluetooth:\fIaddress\fR. The address must be six two-digit hexadecimal numbers separated by colons, e.g. .BR "01:23:45:67:89:AB" "." .TP .B Serial -For a serial device, specify \fBserial:\fI/path/to/device\fR. +For a serial device, specify \fBserial:\fIdevice\fR. The .B serial: qualifier is optional (for backward compatibility). @@ -106,11 +106,11 @@ .B /dev/ (the usual location where devices are defined on a Unix-like system). The following device specifications all refer -to the primary serial device: -.BR "serial:/dev/@serial_first_device@" "," +to the primary serial device on Linux: .BR "serial:@serial_first_device@" "," -.BR "/dev/@serial_first_device@" "," -.BR "@serial_first_device@" "." +.BR "serial:/dev/@serial_first_device@" "," +.BR "@serial_first_device@" "," +.BR "/dev/@serial_first_device@" "." .TP .B USB For a USB device, specify \fBusb:\fR. diff -Nru brltty-5.4/Documents/brltty.conf.in brltty-5.5/Documents/brltty.conf.in --- brltty-5.4/Documents/brltty.conf.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/brltty.conf.in 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -351,6 +351,11 @@ #speech-driver vv # ViaVoice (text to speech engine) #speech-driver xs # ExternalSpeech (executes /usr/local/bin/externalspeech) +# The quiet-if-no-braille directive fully disables the autospeak feature. +# Screen content won't be automatically spoken when braille isn't being used. +# (can be overridden with the -Q [--quiet-if-no-braille=] option) +#quiet-if-no-braille off # [off,on] + # The speech-input directive specifies the name of the file system object # (FIFO, named pipe, named socket, etc) which can be used by external # applications for text-to-speech conversion via BRLTTY's speech driver. @@ -467,28 +472,9 @@ #midi-device client:port # ALSA (may use number or case-sensitive substring of name) -########################## -# Miscellaneous Settings # -########################## - -# The preferences-file directive specifies the file in which to save the user's -# preferences. Relative paths are anchored at "@UPDATABLE_DIRECTORY@". If not -# specified, "@PREFERENCES_FILE@" will be used. -# (can be overridden with the -F [--preferences-file=] option) -#preferences-file @PREFERENCES_FILE@ - -# The log-level directive specifies the severity threshold for diagnostics -# written to the system log. Less severe diagnostics will not be logged. If not -# specified, "notice" will be used. -# (can be overridden with the -l [--log-level=] option) -#log-level emergency -#log-level alert -#log-level critical -#log-level error -#log-level warning -#log-level notice -#log-level information -#log-level debug +################### +# Logging Options # +################### # The log-file directive specifies the file to which diagnostics are written. # Relative paths are anchored at the current working directory. If not @@ -496,6 +482,74 @@ # (can be overridden with the -L [--log-file=] option) #log-file /tmp/brltty.log +# The log-level directive specifies which event categories are to be +# logged as well as the severity threshold for uncategorized events. +# The category names and severity threshold are separated by commas. +# (can be overridden with the -l [--log-level=] option) +#log-level notice + +# Only one severity threshold may be specified. Less severe uncategorized +# events will not be logged. If not specified, "notice" will be assumed. +# The severity thresholds are: +# emergency +# alert +# critical +# error +# warning +# notice +# information +# debug + +# Any number of event categories may be enabled. Prefixing a category name +# with a minus sign [-] disables it (particularly useful if "all" is used). +# The categories are: +# all enable all of the categories +# ingio generic input +# inpkts input packets +# outpkts output packets +# brlkeys braille device key events +# kbdkeys keyboard key events +# csrtrk cursor tracking +# csrrtg cursor routing +# update update events +# speech speech events +# async asynchronous event scheduling +# server BrlAPI server events +# serial serial I/O +# usb USB I/O +# bluetooth Bluetooth I/O +# brldrv braille driver events +# spkdrv speech driver events +# scrdrv screen driver events + + +####################### +# Preference Settings # +####################### + +# The preferences-file directive specifies the file in which to save the user's +# preferences. Relative paths are usually anchored at "@UPDATABLE_DIRECTORY@" +# (can be changed via the updatable-directory directive). +# If not specified, "@PREFERENCES_FILE@" will be used. +# (can be overridden with the -F [--preferences-file=] option) +#preferences-file @PREFERENCES_FILE@ + +# The override-preference directive can be used to explicitly specify the +# initial setting of any preference. More than one preference may be overridden +# by separating them by commas and/or by using this directive multiple times. +# (can be overridden with the -o [--override-preference=] option) +#override-preference preference=setting,... + + +########################## +# Miscellaneous Settings # +########################## + +# The pid-file directive specifies the absolute path to a file that will +# contain BRLTTY's process identifier. It is removed when BRLTTY terminates. +# (can be overridden with the -P [--pid-file=] option) +#pid-file /run/brltty.pid + # The updatable-directory directive specifies the absolute path to a directory # which contains files that can be updated (preferences, saved clipboard, etc). # If not specified, "@UPDATABLE_DIRECTORY@" will be used. diff -Nru brltty-5.4/Documents/ChangeLog brltty-5.5/Documents/ChangeLog --- brltty-5.4/Documents/ChangeLog 2016-06-28 10:38:45.000000000 +0000 +++ brltty-5.5/Documents/ChangeLog 2017-04-18 22:35:13.000000000 +0000 @@ -1,6 +1,76 @@ Note: this file is in reversed chronological order (bottom to top). +April 18, 2017: + - BRLTTY 5.5 released: + General changes: + The braille and speech banners no longer include the revision identifier. + The -o (--override-preference=) option has been added. + quiet-if-no-braille can be specified via the configuration file. + Cursor routing hangs have been resolved. + The Log Messages submenu (for warnings and errors) has been added. + Support for panning within a long alert message has been added. + Alert beeps work on a Linux serial console. + The Greek text table has been improved. + Braille device changes: + The default is to check both USB and Bluetooth (not just USB). + Specifying the Bluetooth address is no longer mandatory. + A prefix of a Bluetooth device's name can be specified. + A generic USB serial adapter is probed only if it's been customized. + Baum braille driver changes: + Support for the Vario Ultra has been improved. + Support for the Orbit 20 has been added. + EuroBraille braille driver changes: + More Esytime bindings have been added. + Support has been added for the EsysLight 80 and the Esytime Evolution. + HandyTech braille driver changes: + Support has been added for the Actilino. + The rocker keys can be used for efficient navigation of the menu. + B4+B5 has been bound to Command Learn Mode. + The (now redundant) keypad binding for Command Learn Mode has been removed. + The Bluetooth names of the Active Star and the Braillino are recognized. + HIMS braille driver changes: + Function key bindings have been added for models with four scroll keys. + TTY braille driver changes: + The braille cells are shown (in addition to the text). + HumanWare braille driver changes: + The Braille Note is autodetected when using USB. + Support has been added for the Braille Note Touch. + Polkit changes: + The policy file is installed. + The policy has been renamed to org.a11y.brlapi (from org.brltty). + Initialization doesn't delay BRLTTY startup. + Systemd changes: + The default instance is now brltty.target (not brltty.service). + Multiple instances can be managed (via brltty@.target instances). + A make file has been added to simplify unit and wrapper installation. + BRLTTY isn't started until Udev has finished initializing. + BRLTTY isn't automatically restarted if it terminates cleanly. + Udev changes: + A make file has been added to simplify rules and wrapper installation. + BrlAPI changes: + The version is now 0.6.6 (it was 0.6.5). + The server isn't started until the braille driver has started. + Several small fixes. + xbrlapi changes: + The X11 and gdm autostart files are installed. + Constantly trying to connect when BRLTTY isn't available has been fixed. + Reconnection on every window change has been fixed. + Key table changes: + Common chords for all of the sticky modifier keys have been added. + Listings combine dot keys, e.g. Dots12 instead of Dot1+Dot2. + Android changes: + The cursor no longer jumps back to the start while spaces are being typed. + Customization files can be in internal storage and/or on the SD card. + Windows changes: + Interaction with NVDA has been revived. + LibUSB can be used on a 64-bit system. + Builds can be done on MinGW64. + Build changes: + AppStream metainfo is maintained and installed. + The new Speech Dispatcher installation layout is supported. + Fixes to support building on Solaris 10 and 11 with C99. + June 28, 2016: - BRLTTY 5.4 released: Core changes: diff -Nru brltty-5.4/Documents/CONTRIBUTORS brltty-5.5/Documents/CONTRIBUTORS --- brltty-5.4/Documents/CONTRIBUTORS 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/CONTRIBUTORS 2017-04-18 22:35:13.000000000 +0000 @@ -1,3 +1,4 @@ +Alan Coopersmith Adi Dascal Adi Kushnir Alex Bernier @@ -8,11 +9,14 @@ Boris Daix Cheryl Homiak Christian Comaschi +Christoph-Simon Senjak Coscell Kao Daniel Dalton Dave Mielke David Sauer +Didier Poitou Dietmar Segbert +Dominic Mazzoni Emilio Pozuelo Monfort Hans Schou Helge Havnegjerde @@ -26,11 +30,13 @@ John J. Boyer Jozko Gregorc Kazunori Minatani <99112004@gakushuin.ac.jp> +Keith Wessel Lars Bjørndal Lee Maschmeyer Luke Yelavich Mario Lang Mark Mielke +Marko Lalic Matthew Miller Michael Curran Michel Such @@ -67,6 +73,7 @@ Tomoyuki Kudou Tony Hernandez Ulf Beckmann +Victor Montalvao Willi Lutzenberger William Hubbs Wolfgang Astleitner diff -Nru brltty-5.4/Documents/Makefile.in brltty-5.5/Documents/Makefile.in --- brltty-5.4/Documents/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Documents/Manual-BrlAPI/English/BrlAPI.txt brltty-5.5/Documents/Manual-BrlAPI/English/BrlAPI.txt --- brltty-5.4/Documents/Manual-BrlAPI/English/BrlAPI.txt 2016-06-28 11:22:21.000000000 +0000 +++ brltty-5.5/Documents/Manual-BrlAPI/English/BrlAPI.txt 2017-04-18 22:38:59.000000000 +0000 @@ -92,58 +92,58 @@ ______________________________________________________________________ - 11.. IInnttrroodduuccttiioonn + 1. Introduction - _B_r_l_A_P_I is a service provided by the _b_r_l_t_t_y daemon. + BrlAPI is a service provided by the brltty daemon. Its purpose is to allow programmers to write applications that take advantage of a braille terminal in order to deliver a blind user suitable information for his/her specific needs. While an application communicates with the braille terminal, - everything _b_r_l_t_t_y sends to the braille terminal in the application's + everything brltty sends to the braille terminal in the application's console is ignored, whereas each piece of data coming from the braille - terminal is sent to the application, rather than to _b_r_l_t_t_y. + terminal is sent to the application, rather than to brltty. - 11..11.. CCoonncceeppttss + 1.1. Concepts All throughout this manual, a few terms will be used which are either - specific to braille terminals, or introduced because of _B_r_l_A_P_I. They + specific to braille terminals, or introduced because of BrlAPI. They are defined below. Taking a few minutes to go through this glossary will save a lot of time and questions later. - AAuutthhoorriizzaattiioonn kkeeyy + Authorization key A file containing arbitrary data, that has to be sent to the server by the client, to prove it is allowed to establish a connection and then control the braille terminal. - BBrraaiillllee ddiissppllaayy + Braille display The small screen on the braille terminal that is able to display braille text. - BBrraaiillllee kkeeyybbooaarrdd + Braille keyboard The keyboard of the braille terminal. - BBrraaiillllee tteerrmmiinnaall + Braille terminal A computer designed to display text in braille. In this case, the text is supposed to come from another computer running Linux or any other Unix system. - BBrrllttttyy + Brltty The background process that gives a blind person access to the console screen thanks to a braille terminal or speech synthetizer. - CClliieenntt + Client An application designed to handle a braille terminal thanks to - _B_r_l_A_P_I. + BrlAPI. - CCoommmmaanndd + Command A code returned by the driver, indicating an action to do, for instance "go to previous line", "go to next line", etc. - DDrriivveerr + Driver A library that has functions to communicate with a braille terminal. Basically, a driver has functions to open communication with the braille terminal, close the @@ -151,115 +151,115 @@ from the braille keyboard, plus some special functions that will be described in detail in this manual. - KKeeyy + Key A code that is returned by the driver when a key is pressed. This is different from a command, because the command concept is driver-independent (all drivers use the same command codes - - those defined by _b_r_l_t_t_y), whereas codes used for returning + those defined by brltty), whereas codes used for returning keypresses may vary between drivers. - BBrrllAAPPII''ss LLiibbrraarryy - This library helps clients to connect and use _B_r_l_A_P_I's server + BrlAPI's Library + This library helps clients to connect and use BrlAPI's server thanks to a series of brlapi_-prefixed functions. - PPaacckkeett + Packet A sequence of bytes making up the atomic unit in communications, either between braille drivers and braille terminals or between the server and clients. - RRaaww mmooddee + Raw mode Mode in which the client application exchanges packets with the driver. Normal operations like sending text for display or reading keypresses are not available in this mode. It lets applications take advantage of advanced functionalities of the driver's communication protocol. - SSeerrvveerr - The part of _b_r_l_t_t_y that controls incoming connections and + Server + The part of brltty that controls incoming connections and communication between clients and braille drivers. - SSuussppeenndd mmooddee + Suspend mode Mode in which the server keeps the device driver closed, so that the client can connect directly to the device. - TTttyy + Tty Synonym for console, terminal, ... Linux' console consist of several Virtual Ttys (VTs). The screen program's windows also are Ttys. X-window system's xterms emulate Ttys as well. - 11..22.. HHooww ttoo rreeaadd tthhiiss mmaannuuaall + 1.2. How to read this manual This manual is split in five parts. - ````GGeenneerraall ddeessccrriippttiioonn'''' - Describes more precisely what _B_r_l_A_P_I is and how it works in - collaboration with _b_r_l_t_t_y's core, the braille driver and + ``General description'' + Describes more precisely what BrlAPI is and how it works in + collaboration with brltty's core, the braille driver and clients. In this part, a "connection-use-disconnection" scenario will be described step by step, explaining for each step what - _B_r_l_A_P_I does in reaction to client instructions. These + BrlAPI does in reaction to client instructions. These explanations will take place at a user level. - ````CCoonnccuurrrreennccyy mmaannaaggeemmeenntt'''' - This part explains how concurrency between _B_r_l_A_P_I clients is + ``Concurrency management'' + This part explains how concurrency between BrlAPI clients is handled thanks to focus tellers. - ````IInnssttaallllaattiioonn aanndd ccoonnffiigguurraattiioonn'''' + ``Installation and configuration'' This part explains in detail how to install and configure the - API. For instructions on how to install and configure _b_r_l_t_t_y, - please report to the _b_r_l_t_t_y documentation. + API. For instructions on how to install and configure brltty, + please report to the brltty documentation. - ````LLiibbrraarryy ddeessccrriippttiioonn'''' + ``Library description'' This part describes how client applications can communicate with - the server using the _B_r_l_A_P_I library that comes with _b_r_l_t_t_y. Each + the server using the BrlAPI library that comes with brltty. Each function will be briefly described, classified by categories. More exhaustive descriptions of every function are available in the corresponding online manual pages. - ````WWrriittiinngg bbrraaiillllee ddrriivveerrss'''' - This part describes how the braille drivers included in _b_r_l_t_t_y - should be written in order to take advantage of _B_r_l_A_P_I's + ``Writing braille drivers'' + This part describes how the braille drivers included in brltty + should be written in order to take advantage of BrlAPI's services. - ````PPrroottooccooll rreeffeerreennccee'''' + ``Protocol reference'' This part describes in detail the communication protocol that is used to communicate between server and clients. What should be read probably depends on what should be done by - applications with _B_r_l_A_P_I. + applications with BrlAPI. Reading chapters ``General description'', ``Concurrency management'' and ``Installation and configuration'' is recommended, since they provide useful information and (hopefully) lead to a good - understanding of _B_r_l_A_P_I, for an efficient use. + understanding of BrlAPI, for an efficient use. Chapter ``Library description'' concerns writing applications that take advantage of braille terminals so as to bring specific (and more useful) information to blind people. Chapter ``Drivers'' is for braille driver implementation: either - adding a braille driver to _b_r_l_t_t_y or modifying an existing one so that - it can benefit from _B_r_l_A_P_I's features, this chapter will be of + adding a braille driver to brltty or modifying an existing one so that + it can benefit from BrlAPI's features, this chapter will be of interest, since it describes exactly what is needed to write a driver - for _b_r_l_t_t_y: the core of drivers interface for instance. + for brltty: the core of drivers interface for instance. - Finally, chapter ``Protocol reference'' is for _n_o_t _u_s_i_n_g the library, - but using the _B_r_l_A_P_I server directly, when the library might not be + Finally, chapter ``Protocol reference'' is for not using the library, + but using the BrlAPI server directly, when the library might not be sufficient: it describes the underlying protocol that will have to be used to do so. - 22.. GGeenneerraall ddeessccrriippttiioonn ooff BBrrllAAPPII + 2. General description of BrlAPI - Here is explained what _B_r_l_A_P_I is, and what it precisely does. These + Here is explained what BrlAPI is, and what it precisely does. These explanations should be simple enough to be accessible to every user. - For a more technical review of _B_r_l_A_P_I's functionalities, please see + For a more technical review of BrlAPI's functionalities, please see chapter ``Libary description''. - 22..11.. HHiissttoorriiccaall nnootteess.. + 2.1. Historical notes. - Originally, _b_r_l_t_t_y was designed to give access to the Linux console to + Originally, brltty was designed to give access to the Linux console to visually impaired people, through a braille terminal or a speech synthetizer. At that time, applications running in the console were not taking care of the presence of a braille terminal (most @@ -272,48 +272,48 @@ However, it appeared that applications specially designed to take advantage of a braille terminal could be wanted, to provide the - suitable information to blind users, for instance. The idea of _B_r_l_A_P_I + suitable information to blind users, for instance. The idea of BrlAPI is to propose an efficient communication mechanism, to control the braille display, read keys from the braille keyboard, or to exchange data with the braille terminal at a lower level (e.g. to write file transfer protocols between braille terminals and Linux systems). - 22..22.. WWhhyy BBrrllAAPPII iiss ppaarrtt ooff bbrrllttttyy .. + 2.2. Why BrlAPI is part of brltty . Instead of rewriting a whole communication program from scratch, we - chose to add communication mechanisms to _b_r_l_t_t_y. This choice has two + chose to add communication mechanisms to brltty. This choice has two main justifications. - On the one hand, integration to _b_r_l_t_t_y allows us to use the increasing - number of drivers written for _b_r_l_t_t_y, thus handling a large number of + On the one hand, integration to brltty allows us to use the increasing + number of drivers written for brltty, thus handling a large number of braille terminals without having to rewrite any piece of existing code. On the other hand, if an application chooses to send its own information to the braille display, and to process braille keys, - _b_r_l_t_t_y has to be warned, so that it won't try to communicate with the + brltty has to be warned, so that it won't try to communicate with the braille terminal while the application already does. To make this - synchronzation between _b_r_l_t_t_y and client applications possible, it - seemed easier to add the communication mechanisms to _b_r_l_t_t_y's core, + synchronzation between brltty and client applications possible, it + seemed easier to add the communication mechanisms to brltty's core, instead of writing an external program providing them. - 22..33.. HHooww iitt wwoorrkkss.. + 2.3. How it works. We are now going to describe the steps an application should go through to get control of the braille terminal, and what happens on - _b_r_l_t_t_y's side at each step. This step-by-step description will let us + brltty's side at each step. This step-by-step description will let us introduce more precisely some concepts that are useful for every - _B_r_l_A_P_I user. + BrlAPI user. - 22..33..11.. CCoonnnneeccttiioonn.. + 2.3.1. Connection. The first thing any client application has to do is to connect (in the - Unix sense of the word) to _B_r_l_A_P_I which is an mere application server. + Unix sense of the word) to BrlAPI which is an mere application server. If this is not clear, the only thing to be remembered is that this step allows the client application to let the server know about its - presence. At this stage, nothing special is done on _b_r_l_t_t_y's side. + presence. At this stage, nothing special is done on brltty's side. - 22..33..22.. AAuutthhoorriizzaattiioonn.. + 2.3.2. Authorization. Since Unix is designed to allow many users to work on the same machine, it's quite possible that there are more than one user @@ -322,9 +322,9 @@ terminal (just imagine what would happen if, while somebody was working with the braille terminal, another user connected to the system began to communicate with it, preventing the first one from - doing his job...). That's why _B_r_l_A_P_I has to provide a way to determine + doing his job...). That's why BrlAPI has to provide a way to determine whether a user who established a connection is really allowed to - communicate with the braille terminal. To achieve this, _B_r_l_A_P_I + communicate with the braille terminal. To achieve this, BrlAPI requires that each application that wants to control a braille terminal sends an authorization key before doing anything else. The control of the braille terminal will only be possible for the client @@ -334,15 +334,15 @@ read permissions on this file to users that are allowed to communicate with the braille terminal, and only to them. This way, only authorized users will have access to the authorization key and then be able to - send it to _B_r_l_A_P_I. To see how to do that, please see chapter + send it to BrlAPI. To see how to do that, please see chapter ``Installation and configuration''. At the end of this step, the user is authorized to take control of the - braille terminal. On _b_r_l_t_t_y's side, some data structures are allocated + braille terminal. On brltty's side, some data structures are allocated to store information on the client, but this has no user-level side- effect. - 22..33..33.. RReeaall uussee ooff tthhee bbrraaiillllee tteerrmmiinnaall.. + 2.3.3. Real use of the braille terminal. Once the client is properly connected and authorized, there are two possible types of communication with the braille terminal. The chosen @@ -353,50 +353,50 @@ terminal (e.g. for file transfer), it will enter what is called "raw mode". - 22..33..33..11.. BBrraaiillllee ddiissppllaayy aanndd bbrraaiillllee kkeeyy pprreesssseess pprroocceessssiinngg.. + 2.3.3.1. Braille display and braille key presses processing. If the client wants to display something on the braille display or to - process braille keys itself, rather than letting _b_r_l_t_t_y process them, + process braille keys itself, rather than letting brltty process them, it has to take control of the Linux terminal it is running on. - Once a client has obtained the control of his tty, _B_r_l_A_P_I will - completely discard _b_r_l_t_t_y's display on this tty (and only this one), + Once a client has obtained the control of his tty, BrlAPI will + completely discard brltty's display on this tty (and only this one), leaving the braille display free for the client. - At the same time, if a key is pressed on the braille keyboard, _B_r_l_A_P_I + At the same time, if a key is pressed on the braille keyboard, BrlAPI checks whether the client application is interested in this key or not. If it is, the key is passed to it, either as a key code or as a - _b_r_l_t_t_y command. If it is not, the key code is converted into a _b_r_l_t_t_y - command and returned to _b_r_l_t_t_y. + brltty command. If it is not, the key code is converted into a brltty + command and returned to brltty. Once the client is not interested in displaying text or reading - braille keys any more, it has to leave the tty, so that either _b_r_l_t_t_y + braille keys any more, it has to leave the tty, so that either brltty can continue its job, or another client can take control of it. - 22..33..33..22.. RRaaww mmooddee.. + 2.3.3.2. Raw mode. Only one client can be in raw mode at the same time. In this mode, data coming from the braille terminal are checked by the driver (to ensure they are valid), but instead of being processed, they are delivered "as-is" to the client that is in raw mode. - In the other direction, packets sent to _B_r_l_A_P_I by the client that is + In the other direction, packets sent to BrlAPI by the client that is in raw mode are passed to the driver which is expected to deliver them to the braille terminal without any modification. - 22..33..33..33.. SSuussppeenndd MMooddee.. + 2.3.3.3. Suspend Mode. Only one client can be in suspend mode at the same time. This mode is also exclusive with raw mode. In this mode, the server keeps the device driver closed, and thus the client can open the device directly by itself. - TThhiiss mmooddee iiss nnoott rreeccoommmmeennddeedd, since the client will then have to + This mode is not recommended, since the client will then have to reimplement device access. Raw mode should really be preferred, since it lets the client take advantage of server's ability to talk with the device (USB/bluetooth support for instance). - 22..33..33..44.. RReemmaarrkkss.. + 2.3.3.4. Remarks. The operations described in the three previous subsections are not @@ -414,9 +414,9 @@ Operations previously described can be repeated. You can, for instance, use raw mode to transfer data onto your braille terminal, display text in braille, return to raw mode..., all that without - having to reconnect to _B_r_l_A_P_I before each operation. + having to reconnect to BrlAPI before each operation. - 22..33..44.. DDiissccoonnnneeccttiioonn.. + 2.3.4. Disconnection. Once the client has finished using the braille terminal, it has to disconnect from the API, so that the memory structures allocated for @@ -424,155 +424,155 @@ This step is transparent for the user, in the sense that it involves no change on the braille display. - 33.. CCoonnccuurrrreennccyy mmaannaaggeemmeenntt bbeettwweeeenn BBrrllAAPPII cclliieennttss + 3. Concurrency management between BrlAPI clients - An essential purpose of _B_r_l_A_P_I is to manage concurrent access to the - braille display between the _b_r_l_t_t_y daemon and applications. This + An essential purpose of BrlAPI is to manage concurrent access to the + braille display between the brltty daemon and applications. This concurrency is managed "per Tty". We first describe this with a flat view, and then consider Tty hierarchy. - 33..11.. VVTT sswwiittcchhiinngg + 3.1. VT switching Let's first describe how things work with the simple case of a single series of Virtual Ttys (VTs), the linux console for instance. As described in ``General Description'', before being able to write - output, a _B_r_l_A_P_I client has to "get" a tty, i.e. it sends to the - _B_r_l_A_P_I server the number of the linux' Virtual Tty on which it is - running. The _B_r_l_A_P_I server uses this information so as to know which + output, a BrlAPI client has to "get" a tty, i.e. it sends to the + BrlAPI server the number of the linux' Virtual Tty on which it is + running. The BrlAPI server uses this information so as to know which client's output should be shown on the braille display, according to the focus teller's information. - Let's say some client _A is running on VT 2. It "got" VT 2 and wrote - some output on its _B_r_l_A_P_I connection. The focus teller is _b_r_l_t_t_y here: - it always tells to the _B_r_l_A_P_I server which VT is currently shown on + Let's say some client A is running on VT 2. It "got" VT 2 and wrote + some output on its BrlAPI connection. The focus teller is brltty here: + it always tells to the BrlAPI server which VT is currently shown on the screen and gets usual keyboard presses (it is "active"). - Let's say VT 1 is active, then the _B_r_l_A_P_I server shows _b_r_l_t_t_y's output - on the braille display. I.e. the usual _b_r_l_t_t_y screen reading appears. - Moreover, when braille keys are pressed, they are passed to _b_r_l_t_t_y, so + Let's say VT 1 is active, then the BrlAPI server shows brltty's output + on the braille display. I.e. the usual brltty screen reading appears. + Moreover, when braille keys are pressed, they are passed to brltty, so that usual screen reading can be performed. When the user switches to - VT 2, _b_r_l_t_t_y (as focus teller) tells it to the _B_r_l_A_P_I server, which - then remembers that client _A has got it and has produced some output. + VT 2, brltty (as focus teller) tells it to the BrlAPI server, which + then remembers that client A has got it and has produced some output. The server then displays this output on the braille display. Note that - _A doesn't need to re-submit its output: the server had recorded it so + A doesn't need to re-submit its output: the server had recorded it so as to be able to show it as soon as the focus switches to VT 2. - Whenever some key of the braille device is pressed, _B_r_l_A_P_I looks - whether it is in the list of keys that client _A said to be of his - interest. If it is, it is passed to _A (and not to _b_r_l_t_t_y). If it - isn't, it is passed to _b_r_l_t_t_y (and not to _A). + Whenever some key of the braille device is pressed, BrlAPI looks + whether it is in the list of keys that client A said to be of his + interest. If it is, it is passed to A (and not to brltty). If it + isn't, it is passed to brltty (and not to A). As a consequence, whenever clients get and release Ttys and the user - switches between Ttys, either the _b_r_l_t_t_y screen reading or the + switches between Ttys, either the brltty screen reading or the client's output is automatically shown according to rather natural rules. - 33..22.. AA ppiillee ooff ""ppaappeerr sshheeeettss"" + 3.2. A pile of "paper sheets" Let's look at VT 2 by itself. What is shown on the braille display can - be seen as the result of a pile of two paper sheets. _b_r_l_t_t_y is + be seen as the result of a pile of two paper sheets. brltty is represented by the bottom sheet on which its screen reading is - written, and client _A by the top sheet on which its output is written. - _A's sheet hence "covers" _b_r_l_t_t_y's sheet: _A's output "mask" _b_r_l_t_t_y's + written, and client A by the top sheet on which its output is written. + A's sheet hence "covers" brltty's sheet: A's output "mask" brltty's screen reading. - _A may yet want to temporarily let _b_r_l_t_t_y's screen reading appear on VT + A may yet want to temporarily let brltty's screen reading appear on VT 2, while still receiving some key presses, for instance. For this, it sends a "void" write. The server then clears the recorded output for this connection (in the sheet representation, the sheet becomes - "transparent"). As a consequence, _b_r_l_t_t_y's output is automatically - shown (by transparency in the sheet representation), just like if _A + "transparent"). As a consequence, brltty's output is automatically + shown (by transparency in the sheet representation), just like if A had released the Tty. - Keypresses are handled in a similar way: _A's desire to get key presses - is satisfied first before _b_r_l_t_t_y. + Keypresses are handled in a similar way: A's desire to get key presses + is satisfied first before brltty. - Let's say some other client _B (probably launched by _A) also gets VT 2 - and outputs some text on its _B_r_l_A_P_I connection. This adds a third - sheet, on top of the two previous ones. It means that the _B_r_l_A_P_I - server will show _B's output on the braille device. If _A then outputs - some text, the server will record it (on _A's sheet which hence becomes + Let's say some other client B (probably launched by A) also gets VT 2 + and outputs some text on its BrlAPI connection. This adds a third + sheet, on top of the two previous ones. It means that the BrlAPI + server will show B's output on the braille device. If A then outputs + some text, the server will record it (on A's sheet which hence becomes opaque again), but it won't be displayed on the braille device, since - _B's sheet is still at the top and opaque (i.e. with some text on it). - But if _B issues a void write, the server clears its ouput buffer (i.e. - _B's sheet becomes transparent), and as a result _A's output appear on - the braille display (by transparency through _B's sheet). + B's sheet is still at the top and opaque (i.e. with some text on it). + But if B issues a void write, the server clears its ouput buffer (i.e. + B's sheet becomes transparent), and as a result A's output appear on + the braille display (by transparency through B's sheet). The sheet order is determined by the Tty "get"ting order. Some mecanism will be added in near future for clients to precise "at which level its sheet should be inserted" so as to avoid race conditions on the "get"ting order. - 33..33.. HHiieerraarrcchhyy + 3.3. Hierarchy - Now, what happens when running some _s_c_r_e_e_n program on, say, VT 3? It + Now, what happens when running some screen program on, say, VT 3? It emulates a series of Ttys, whose output actually appear on the same VT 3. That's where a hierarchy level appears: the focus information is - not only the VT number but also, in the case of VT 3, which _s_c_r_e_e_n - window is active. This hence forms a _t_r_e_e of Ttys: the "root" being - the vga driver's output, whose sons are VTs, and VT 3 has the _s_c_r_e_e_n - windows as sons. _B_r_l_t_t_y is a focus teller for the root, _s_c_r_e_e_n will - have to be a focus teller for VT 3. _S_c_r_e_e_n should then get VT 3, not - display anything (so that the usual _b_r_l_t_t_y screen reading will be - shown by transparency), and tell the _B_r_l_A_P_I server which _s_c_r_e_e_n window + not only the VT number but also, in the case of VT 3, which screen + window is active. This hence forms a tree of Ttys: the "root" being + the vga driver's output, whose sons are VTs, and VT 3 has the screen + windows as sons. Brltty is a focus teller for the root, screen will + have to be a focus teller for VT 3. Screen should then get VT 3, not + display anything (so that the usual brltty screen reading will be + shown by transparency), and tell the BrlAPI server which screen window is active (at startup and at each window switch). This is not - implemented directly in _s_c_r_e_e_n yet, but this may be achieved via a - second _b_r_l_t_t_y daemon running the Screen driver (but it isn't yet able - to get the current window number though) and the _B_r_l_A_P_I driver. + implemented directly in screen yet, but this may be achieved via a + second brltty daemon running the Screen driver (but it isn't yet able + to get the current window number though) and the BrlAPI driver. - A _B_r_l_A_P_I client _C running in some _s_c_r_e_e_n window number 1 would then + A BrlAPI client C running in some screen window number 1 would then have to get the Tty path "VT 3 then window 1", which is merely expressed as "3 1". The window number is available in the WINDOW - environment variable, set by _s_c_r_e_e_n. The VT number, which actually + environment variable, set by screen. The VT number, which actually represents the "path to screen's output" should be available in the - WINDOWPATH environment variable, also set by _s_c_r_e_e_n. The client can + WINDOWPATH environment variable, also set by screen. The client can thus merely concatenate the content of WINDOWPATH (which could hold many levels of window numbers) and of WINDOW and give the result as - tty path to the _B_r_l_A_P_I server, which then knows precisely where the + tty path to the BrlAPI server, which then knows precisely where the client's usual output resides. In practice, applications just need to - call brlapi_enterTtyMode(BRLAPI_TTY_DEFAULT), and the the _B_r_l_A_P_I + call brlapi_enterTtyMode(BRLAPI_TTY_DEFAULT), and the the BrlAPI client library will automatically perform all that. - Whenever the user switches to VT 3, the _B_r_l_A_P_I server remembers the - window that _s_c_r_e_e_n told to be active. If it was window 1, it then - displays _C's output (if any). Else _b_r_l_t_t_y's usual screen reading is + Whenever the user switches to VT 3, the BrlAPI server remembers the + window that screen told to be active. If it was window 1, it then + displays C's output (if any). Else brltty's usual screen reading is shown. Of course, several clients may be run in window 1 as well, and - the "sheet pile" mecanism applies: _b_r_l_t_t_y's sheet first (at the root - of the Ttys tree), then _s_c_r_e_e_n's sheet (which is transparent, on VT - 3), then _C's sheet (on window 1 of VT 3), then other clients' sheets + the "sheet pile" mecanism applies: brltty's sheet first (at the root + of the Ttys tree), then screen's sheet (which is transparent, on VT + 3), then C's sheet (on window 1 of VT 3), then other clients' sheets (on the same window). Ttys are hence organized in a tree, each client adding its sheet at some tty in the tree. - 33..44.. TThhee XX--wwiinnddooww ccaassee + 3.4. The X-window case Let's say some X server is running on VT 7 of a Linux system. Xorg's - _x_i_n_i_t and _x_d_m commands automatically set the X session's WINDOWPATH - environment variable to "7", so that X11 _B_r_l_A_P_I clients started from - the session just need to call _b_r_l_a_p_i___e_n_t_e_r_T_t_y_M_o_d_e_(_x_i_d_) where _x_i_d is - the X-window ID of the window of the client. The _B_r_l_A_P_I library will + xinit and xdm commands automatically set the X session's WINDOWPATH + environment variable to "7", so that X11 BrlAPI clients started from + the session just need to call brlapi_enterTtyMode(xid) where xid is + the X-window ID of the window of the client. The BrlAPI library will automatically prepend the content of WINDOWPATH to it. - For text-based _B_r_l_A_P_I clients running in an xterm (which should just + For text-based BrlAPI clients running in an xterm (which should just call brlapi_enterTtyMode(BRLAPI_TTY_DEFAULT) as explained in the - previous section), _B_r_l_A_P_I detects the window id thanks to the WINDOWID + previous section), BrlAPI detects the window id thanks to the WINDOWID variable set by xterm. Screen readers are not bound to a particular window, so they should - call _b_r_l_a_p_i___e_n_t_e_r_T_t_y_M_o_d_e_W_i_t_h_P_a_t_h_(_N_U_L_L_, _0_) to let the _B_r_l_A_P_I library + call brlapi_enterTtyModeWithPath(NULL, 0) to let the BrlAPI library only send the content of WINDOWPATH, expressing that screen readers - take the whole tty. The user should notably launch _x_b_r_l_a_p_i, which is a - focus teller for X-window as well as a keyboard simulator (_b_r_l_t_t_y + take the whole tty. The user should notably launch xbrlapi, which is a + focus teller for X-window as well as a keyboard simulator (brltty can't reliably simulate them at the kernel level in such situation). For accessing AT-SPI contents (like gnome or kde applications), Orca should also be launched. For accessing AT-SPI terminals (like gnome- - terminal) in the same way as in the console, a second _b_r_l_t_t_y daemon - running the at-spi screen driver and the _B_r_l_A_P_I driver can also be + terminal) in the same way as in the console, a second brltty daemon + running the at-spi screen driver and the BrlAPI driver can also be launched. All three would get the VT of the X session, in that order - (for now): _x_b_r_l_a_p_i first, then _o_r_c_a and _b_r_l_t_t_y at last. When the X - focus is on an AT-SPI terminal, _b_r_l_t_t_y will hence be able to grab the - braille display and key presses. Else _o_r_c_a would get them. And _x_b_r_l_a_p_i + (for now): xbrlapi first, then orca and brltty at last. When the X + focus is on an AT-SPI terminal, brltty will hence be able to grab the + braille display and key presses. Else orca would get them. And xbrlapi would finally get remaining key presses and simulate them. Note: old versions of xinit, xdm, kdm or gdm do not automatically set @@ -583,16 +583,16 @@ case WINDOWPATH is empty or not even set. Everything explained above still work fine. - 33..55.. DDeettaacchhiinngg + 3.5. Detaching - Several programs allow detaching: _s_c_r_e_e_n and _V_N_C for instance. In such - situation, an intermediate _B_r_l_A_P_I server should be run for each such + Several programs allow detaching: screen and VNC for instance. In such + situation, an intermediate BrlAPI server should be run for each such session. Clients would connect to it, and it would prepend the "current tty" path on the fly while forwarding things to the root - _B_r_l_A_P_I server. This intermediate server is yet to be written (but it + BrlAPI server. This intermediate server is yet to be written (but it is actually relatively close to be). - 44.. IInnssttaallllaattiioonn aanndd ccoonnffiigguurraattiioonn ooff BBrrllAAPPII + 4. Installation and configuration of BrlAPI make install will install libbrlapi.so in /lib, and include files in /usr/include/brltty. An authorization key will also typically be set @@ -615,15 +615,15 @@ - 55.. LLiibbrraarryy ddeessccrriippttiioonn + 5. Library description Let's now see how one can write dedicated applications. Basic notions will be seen, along with a very simple client. Greater details are given as online manual pages. - The historical test program for _B_r_l_A_P_I was something like: + The historical test program for BrlAPI was something like: - connect to _B_r_l_A_P_I + connect to BrlAPI get driver id @@ -641,13 +641,13 @@ leave tty control - disconnect from _B_r_l_A_P_I + disconnect from BrlAPI It is here rewritten, its working briefly explained. - 55..11.. CCoonnnneeccttiinngg ttoo BBrrllAAPPII + 5.1. Connecting to BrlAPI - Connection to _B_r_l_A_P_I is needed first, thanks to the + Connection to BrlAPI is needed first, thanks to the brlapi_openConnection call. For this, a brlapi_connectionSettings_t variable must be filled which will hold the settings the library needs to connect to the server. Just giving NULL will work for local use. @@ -668,7 +668,7 @@ The connection might fail, so testing is needed. - 55..22.. GGeettttiinngg ddrriivveerr nnaammee + 5.2. Getting driver name Knowing the type of the braille device might be useful: @@ -688,7 +688,7 @@ transfers for instance, just to check that the device is really the one expected. - 55..33.. GGeettttiinngg ddiissppllaayy ssiizzee + 5.3. Getting display size Before writing on the braille display, the size should be always first checked to be sure everything will hold on it: @@ -705,7 +705,7 @@ - 55..44.. EEnntteerriinngg rraaww mmooddee,, iimmmmeeddiiaatteellyy lleeaavviinngg rraaww mmooddee.. + 5.4. Entering raw mode, immediately leaving raw mode. Entering raw mode is very simple: @@ -729,7 +729,7 @@ send and get data directly to and from the device. It should be used with care, improper use might completely thrash the device! - 55..55.. GGeettttiinngg ttttyy ccoonnttrrooll + 5.5. Getting tty control Let's now display something on the device. control of the tty must be get first: @@ -749,7 +749,7 @@ control of. Setting BRLAPI_TTY_DEFAULT lets the library determine it for us. - The server is asked to send _b_r_l_t_t_y commands, which are device- + The server is asked to send brltty commands, which are device- independent. Getting control might fail if, for instance, another application @@ -757,7 +757,7 @@ From now on, the braille display is detached from the screen. - 55..66.. WWrriittiinngg ssoommeetthhiinngg oonn tthhee ddiissppllaayy + 5.6. Writing something on the display The application can now write things on the braille display without altering the screen display: @@ -773,12 +773,12 @@ - The cursor is also asked _n_o_t to be shown: its position is set to 0. + The cursor is also asked not to be shown: its position is set to 0. "Writing to braille display... Ok" is now displayed on the screen, and "Press a braille key to continue..." on the braille display. - 55..77.. WWaaiittiinngg ffoorr aa kkeeyy pprreessss + 5.7. Waiting for a key press To have a break for the user to be able to read these messages, a key press (a command here, which is driver-independent) may be waited for: @@ -794,14 +794,14 @@ The command is returned, as described in and - . It is not transmitted to _b_r_l_t_t_y: it is up to the + . It is not transmitted to brltty: it is up to the application to define the behavior, here cleanly exitting, as described below. The first parameter tells the lib to block until a key press is indeed read. - 55..88.. UUnnddeerrssttaannddiinngg ccoommmmaannddss + 5.8. Understanding commands There are two kinds of commands: braille commands (line up/down, top/bottom, etc.) and X Keysyms (i.e. regular keyboard keys). One way @@ -860,7 +860,7 @@ - 55..99.. LLeeaavviinngg ttttyy ccoonnttrrooll + 5.9. Leaving tty control Let's now leave the tty: @@ -877,9 +877,9 @@ But control of another tty can still be get for instance, by calling brlapi_enterTtyMode() again... - 55..1100.. DDiissccoonnnneeccttiinngg ffrroomm BBrrllAAPPII + 5.10. Disconnecting from BrlAPI - Let's disconnect from _B_r_l_A_P_I: + Let's disconnect from BrlAPI: @@ -893,7 +893,7 @@ another computer for instance, by calling brlapi_openConnection() again... - 55..1111.. PPuuttttiinngg eevveerryytthhiinngg ttooggeetthheerr...... + 5.11. Putting everything together... @@ -991,22 +991,22 @@ This should compile well thanks to gcc apiclient.c -o apiclient -lbrlapi - 66.. WWrriittiinngg (( BBrrllAAPPII --ccoommpplliiaanntt)) ddrriivveerrss ffoorr bbrrllttttyy + 6. Writing ( BrlAPI -compliant) drivers for brltty In this chapter, we will describe in details how to write a driver for - _b_r_l_t_t_y. We begin with a general description of the structure the + brltty. We begin with a general description of the structure the driver should have, before explaining more precisely what each function is supposed to do. - 66..11.. OOvveerrvviieeww ooff tthhee ddrriivveerr''ss ssttrruuccttuurree + 6.1. Overview of the driver's structure A braille driver is in fact a library that is either dynamically - loaded by _b_r_l_t_t_y at startup, or statically linked to it during the + loaded by brltty at startup, or statically linked to it during the compilation, depending on the options given to the ./configure script. This library has to provide every function needed by the core, plus some additional functions, that are not mandatory, but which improve - communication with _B_r_l_A_P_I and the service level provided to client + communication with BrlAPI and the service level provided to client applications. Basically, a driver library needs to provide a function to open the @@ -1019,9 +1019,9 @@ some macros asserting that it has these functionalities, and by defining associated functions. - 66..22.. BBaassiicc ddrriivveerr ssttrruuccttuurree + 6.2. Basic driver structure - _E_v_e_r_y _b_r_l_t_t_y driver _m_u_s_t consist in at least a file called braille.c, + Every brltty driver must consist in at least a file called braille.c, located in an appropriate subdirectory of the BrailleDrivers subdirectory. This braille.c file must have the following layout @@ -1122,25 +1122,25 @@ The brl_readCommand() function takes two arguments, and returns an integer. Its purpose is to read commands from the braille keyboard and - to pass them to _b_r_l_t_t_y's core, which in turn will process them. The + to pass them to brltty's core, which in turn will process them. The first argument, of type BrailleDisplay, is for future use, and can safely be ignored for the moment. The second argument indicates in - which context (state) _b_r_l_t_t_y is. For instance, it specifies if _b_r_l_t_t_y + which context (state) brltty is. For instance, it specifies if brltty is in a menu, displays a help screen, etc. This information can indeed be of some interest when translating a key into a command, especially if the keys can have different meanings, depending on the context. So, this function has to read keypresses from the braille keyboard, and to convert them into commands, according to the given context, these - commands then being returned to _b_r_l_t_t_y. For a complete list of + commands then being returned to brltty. For a complete list of available command codes, please have a look at brl.h in the Programs subdirectory. Two codes have special meanings: - eeooff + eof specifies that no command is available now, and that no key is waiting to be converted into command in a near future. - CCMMDD__NNOOOOPP + CMD_NOOP specifies that no command is available, but that one will be, soon. As a consequence, brl_readCommand will be called again immediately. Returning CMD_NOOP is appropriate for instance when @@ -1150,17 +1150,17 @@ a good idea. - 66..33.. EEnnhhaanncceemmeennttss ffoorr BBrrllAAPPII + 6.3. Enhancements for BrlAPI To improve the level of service provided to client applications - communicating with braille drivers through _B_r_l_A_P_I, the drivers should + communicating with braille drivers through BrlAPI, the drivers should declare some additional functions that will then be called by the API when needed. For each additional feature that has to be implemented in a driver, a specific macro must be defined, in addition to the functions implementing that feature. For the moment, two features are supported - by _B_r_l_A_P_I: + by BrlAPI: reading braille terminal specific key codes, @@ -1173,12 +1173,12 @@ description of concepts used here, please refer to chapters ``Introduction'' and ``General description''. - 66..33..11.. RReeaaddiinngg bbrraaiillllee kkeeyy ccooddeess + 6.3.1. Reading braille key codes When a client takes control of a tty and asks for getting raw key codes, it has, like in command mode, the possibility to mask some - keys. The masked keys will then be passed to _b_r_l_t_t_y. This assumes the - existence of a conversion mechanism from key codes to _b_r_l_t_t_y commands. + keys. The masked keys will then be passed to brltty. This assumes the + existence of a conversion mechanism from key codes to brltty commands. This conversion mechanism can only be implemented by the braille driver, since it is the only piece of code that knows about braille terminal specific key codes. So, to make it possible for client @@ -1203,18 +1203,18 @@ it. The brl_keyToCommand() function's purpose is to convert a key code as - delivered by brl_readKey() into a _b_r_l_t_t_y command. As explained above, + delivered by brl_readKey() into a brltty command. As explained above, this function is called by brlapi when a key is pressed on the braille keyboard that is ignored by the client application. The corresponding - command is then returned to _b_r_l_t_t_y. + command is then returned to brltty. - 66..33..11..11.. RReemmaarrkkss + 6.3.1.1. Remarks When these two functions are present, the only thing brl_readCommand() has to do is to call brl_readKey() and then call brl_keyToCommand() with the value returned by the first function as argument. - 66..33..22.. EExxcchhaannggiinngg rraaww ddaattaa ppaacckkeettss + 6.3.2. Exchanging raw data packets Under some circumstances, an application running on the PC can be interested in a raw level communication with the braille terminal. For @@ -1253,12 +1253,12 @@ at the specified address. The read must not block. I.e., if no packet is available, the function should return immediately, returning 0. - brl_rescue() is called by _B_r_l_A_P_I when a client application terminates + brl_rescue() is called by BrlAPI when a client application terminates without properly leaving the raw mode. This function should restore the terminal's state, so that it is able to display text in braille again. - 66..33..22..11.. RReemmaarrkkss.. + 6.3.2.1. Remarks. If the driver provides such functions, every other functions should @@ -1273,26 +1273,26 @@ For the moment, the argument of type BrailleDisplay can safely be ignored by the functions described here. - 77.. PPrroottooccooll rreeffeerreennccee + 7. Protocol reference Under some circumstances, it may be preferable to communicate directly - with _B_r_l_A_P_I's server rather than using _B_r_l_A_P_I's library. Here are the + with BrlAPI's server rather than using BrlAPI's library. Here are the needed details to be able to do this. This chapter is also of interest if a precise understanding of how the communication stuff works is desired, to be sure to understand how to write multithreaded clients, for instance. - In all the following, _i_n_t_e_g_e_r will mean an unsigned 32 bits integer in + In all the following, integer will mean an unsigned 32 bits integer in network byte order (ie most significant bytes first). - 77..11.. RReelliiaabbllee ppaacckkeett ttrraannssmmiissssiioonn cchhaannnneell + 7.1. Reliable packet transmission channel - The protocol between _B_r_l_A_P_I's server and clients is based on exchanges + The protocol between BrlAPI's server and clients is based on exchanges of packets. So as to avoid locks due to packet loss, these exchanges - are supposed reliable, and ordering must be preserved, thus _B_r_l_A_P_I + are supposed reliable, and ordering must be preserved, thus BrlAPI needs a reliable packet transmission channel. - To achieve this, _B_r_l_A_P_I uses a TCP-based connection, on which packets + To achieve this, BrlAPI uses a TCP-based connection, on which packets are transmitted this way: @@ -1307,14 +1307,14 @@ packet can be either of BRLAPI_PACKET_* constants defined in api_protocol.h. Each type of packet will be further discussed below. - _B_r_l_A_P_I's library ships two functions to achieve packets sending and + BrlAPI's library ships two functions to achieve packets sending and receiving using this protocol: brlapi_writePacket and brlapi_readPacket. It is a good idea to use these functions rather than rewriting them, since this protocol might change one day in favor of a real reliable packet transmission protocol such as the experimental RDP. - 77..22.. RReessppoonnsseess ffrroomm tthhee sseerrvveerr + 7.2. Responses from the server As described below, many packets are `acknowledged'. It means that upon reception, the server sends either: @@ -1339,7 +1339,7 @@ server, and BRLAPI_PACKET_EXCEPTION is returned, holding the guilty packet for further analysis. - 77..33.. OOppeerraattiinngg mmooddeess + 7.3. Operating modes The connection between the client and the server can be in either of the four following modes: @@ -1372,7 +1372,7 @@ - tty handling mode: the client holds the control of a tty: _b_r_l_t_t_y + tty handling mode: the client holds the control of a tty: brltty has no power on it any more, masked keys excepted. It's up to the client to manage display and keypresses. For this, it can send either of these types of packet: @@ -1417,23 +1417,23 @@ mode by simply closing its side of the socket. The server will then close the connection. - 77..44.. DDeettaaiillss ffoorr eeaacchh ttyyppee ooff ppaacckkeett + 7.4. Details for each type of packet Here is described the semantics of each type of packet. Most of them - are directly linked to some of _B_r_l_A_P_I's library's functions. Reading + are directly linked to some of BrlAPI's library's functions. Reading their online manual page as well will hence be of good help for understanding. - 77..44..11.. BBRRLLAAPPII__PPAACCKKEETT__VVEERRSSIIOONN TThhiiss mmuusstt bbee tthhee ffiirrsstt ppaacckkeett eevveerr - ttrraannssmmiitttteedd ffrroomm tthhee sseerrvveerr ttoo tthhee cclliieenntt aanndd ffrroomm tthhee cclliieenntt ttoo tthhee - sseerrvveerr.. TThhee sseerrvveerr sseennddss oonnee ffiirrsstt ffoorr lleettttiinngg tthhee cclliieenntt kknnooww iittss - pprroottooccooll vveerrssiioonn.. DDaattaa iiss aann iinntteeggeerr iinnddiiccaattiinngg tthhee pprroottooccooll vveerrssiioonn.. - TThheenn cclliieenntt mmuusstt tthheenn rreessppoonndd tthhee ssaammee wwaayy ffoorr ggiivviinngg iittss vveerrssiioonn.. IIff - tthhee pprroottooccooll vveerrssiioonn ccaann''tt bbee hhaannddlleedd bbyy tthhee sseerrvveerr,, aa - BBRRLLAAPPII__EERRRROORR__PPRROOTTOOCCOOLL__VVEERRSSIIOONN eerrrroorr ppaacckkeett iiss rreettuurrnneedd aanndd tthhee ccoonnnneecc-- - ttiioonn iiss cclloosseedd.. + 7.4.1. BRLAPI_PACKET_VERSION This must be the first packet ever + transmitted from the server to the client and from the client to the + server. The server sends one first for letting the client know its + protocol version. Data is an integer indicating the protocol version. + Then client must then respond the same way for giving its version. If + the protocol version can't be handled by the server, a + BRLAPI_ERROR_PROTOCOL_VERSION error packet is returned and the connec- + tion is closed. - 77..44..22.. BBRRLLAAPPII__PPAACCKKEETT__AAUUTTHH + 7.4.2. BRLAPI_PACKET_AUTH This must be the second packet ever transmitted from the server to the client and from the client to the server. The server sends one first @@ -1468,24 +1468,24 @@ Note: when the Operating system permits it, the server may use implicit credential check, and then advertise the none method. - 77..44..33.. BBRRLLAAPPII__PPAACCKKEETT__GGEETTDDRRIIVVEERRIIDD ((sseeee bbrrllaappii__ggeettDDrriivveerrIIdd(()) )) + 7.4.3. BRLAPI_PACKET_GETDRIVERID (see brlapi_getDriverId() ) This should be sent by the client when it needs the 2-char identifier of the current brltty driver. The returned string is \0 terminated. - 77..44..44.. BBRRLLAAPPII__PPAACCKKEETT__GGEETTDDRRIIVVEERRNNAAMMEE ((sseeee bbrrllaappii__ggeettDDrriivveerrNNaammee(()) )) + 7.4.4. BRLAPI_PACKET_GETDRIVERNAME (see brlapi_getDriverName() ) This should be sent by the client when it needs the full name of the current brltty driver. The returned string is \0 terminated. - 77..44..55.. BBRRLLAAPPII__PPAACCKKEETT__GGEETTDDIISSPPLLAAYYSSIIZZEE ((sseeee bbrrllaappii__ggeettDDiissppllaayySSiizzee(()) )) + 7.4.5. BRLAPI_PACKET_GETDISPLAYSIZE (see brlapi_getDisplaySize() ) This should be sent by the client when it needs to know the braille display size. The returned data are two integers: width and then height. - 77..44..66.. BBRRLLAAPPII__PPAACCKKEETT__EENNTTEERRTTTTYYMMOODDEE ((sseeee bbrrllaappii__eenntteerrTTttyyMMooddee(()) aanndd - bbrrllaappii__eenntteerrTTttyyMMooddeeWWiitthhPPaatthh(()) )) + 7.4.6. BRLAPI_PACKET_ENTERTTYMODE (see brlapi_enterTtyMode() and + brlapi_enterTtyModeWithPath() ) This should be sent by the client to get control of a tty. Sent data are first a series of integers: the first one gives the number of @@ -1497,7 +1497,7 @@ the number of caracters in the driver name (0 in the case of ""), as an unsigned byte. This packet is then acknowledged by the server. - 77..44..77.. BBRRLLAAPPII__PPAACCKKEETT__KKEEYY ((sseeee bbrrllaappii__rreeaaddKKeeyy(()) )) + 7.4.7. BRLAPI_PACKET_KEY (see brlapi_readKey() ) As soon as the client gets a tty, it must be prepared to handle BRLAPI_PACKET_KEY incoming packets at any time (as soon as the key was @@ -1506,7 +1506,7 @@ depending on what has been request in the BRLAPI_PACKET_ENTERTTYMODE packet. - 77..44..88.. BBRRLLAAPPII__PPAACCKKEETT__SSEETTFFOOCCUUSS ((sseeee bbrrllaappii__sseettFFooccuuss(()) )) + 7.4.8. BRLAPI_PACKET_SETFOCUS (see brlapi_setFocus() ) For the server to know which tty is active, one particular client is responsible for sending BRLAPI_PACKET_SETFOCUS packets. They hold a @@ -1516,13 +1516,13 @@ focus changes, allowing display and keypresses switching between xterms. - 77..44..99.. BBRRLLAAPPII__PPAACCKKEETT__LLEEAAVVEETTTTYYMMOODDEE ((sseeee bbrrllaappii__lleeaavveeTTttyyMMooddee(()) )) + 7.4.9. BRLAPI_PACKET_LEAVETTYMODE (see brlapi_leaveTtyMode() ) This should be sent to free the tty and masked keys lists. This is acknowledged by the server. - 77..44..1100.. BBRRLLAAPPII__PPAACCKKEETT__IIGGNNOORREEKKEEYYRRAANNGGEE aanndd BBRRLLAAPPII__PPAACCKKEETT__AACCCCEEPPTTKKEEYYRRAANNGGEE - ((sseeee bbrrllaappii__iiggnnoorreeKKeeyyRRaannggee(()) aanndd bbrrllaappii__aacccceeppttKKeeyyRRaannggee(()) )) + 7.4.10. BRLAPI_PACKET_IGNOREKEYRANGE and BRLAPI_PACKET_ACCEPTKEYRANGE + (see brlapi_ignoreKeyRange() and brlapi_acceptKeyRange() ) If the client doesn't want every key press to be signaled to it, but some of them to be given to brltty for normal processing, it can send @@ -1536,7 +1536,7 @@ for instance. For Sets, Data simply consists of pairs of integers, one per key in the set. - 77..44..1111.. BBRRLLAAPPII__PPAACCKKEETT__WWRRIITTEE ((sseeee bbrrllaappii__wwrriittee(()) )) + 7.4.11. BRLAPI_PACKET_WRITE (see brlapi_write() ) To display text on the braille terminal and set the position of the cursor, the client can send a BRLAPI_PACKET_WRITE packet. The packet @@ -1563,7 +1563,7 @@ representation of the above text will be AND-ed with this field, hence allowing to erase some unwanted parts of characters. Dots are coded as described in ISO/TR 11548-1: dot 1 is set iff bit 0 is - set, dot 2 is set iff bit 1 is set, ... dot _i_+_1 is set if bit _i is + set, dot 2 is set iff bit 1 is set, ... dot i+1 is set if bit i is set. This also corresponds to the low-order byte of the coding of unicode's braille row U+2800. @@ -1582,14 +1582,14 @@ characters. If the charset is not specified, an 8-bit charset is assumed, and it is assumed to be the same as the server's. Multibyte charsets may be used, AND and OR fields' bytes will - correspond to each text's wide _c_h_a_r_a_c_t_e_r, be it a combining or a + correspond to each text's wide character, be it a combining or a double-width character. A BRLAPI_PACKET_WRITE packet without any flag (and hence no data) means a "void" WRITE: the server clears the output buffer for this connection. - 77..44..1122.. BBRRLLAAPPII__PPAACCKKEETT__EENNTTEERRRRAAWWMMOODDEE ((sseeee bbrrllaappii__eenntteerrRRaawwMMooddee(()) )) + 7.4.12. BRLAPI_PACKET_ENTERRAWMODE (see brlapi_enterRawMode() ) To enter raw mode, the client must send a BRLAPI_PACKET_ENTERRAWMODE packet, which is acknowledged. Once in raw mode, no other packet than @@ -1598,13 +1598,13 @@ then the name of the driver (one byte for the length, then the name) to avoid erroneous raw mode activating. - 77..44..1133.. BBRRLLAAPPII__PPAACCKKEETT__LLEEAAVVEERRAAWWMMOODDEE ((sseeee bbrrllaappii__lleeaavveeRRaawwMMooddee(()) )) + 7.4.13. BRLAPI_PACKET_LEAVERAWMODE (see brlapi_leaveRawMode() ) To leave raw mode, the client must send a BRLAPI_PACKET_LEAVERAWMODE packet, which is acknowledged. - 77..44..1144.. BBRRLLAAPPII__PPAACCKKEETT__PPAACCKKEETT ((sseeee bbrrllaappii__sseennddRRaaww(()) aanndd - bbrrllaappii__rreeccvvRRaaww(()) )) + 7.4.14. BRLAPI_PACKET_PACKET (see brlapi_sendRaw() and + brlapi_recvRaw() ) While in raw mode, only BRLAPI_PACKET_PACKET packets can be exchanged between the client and the server: to send a packet to the braille @@ -1614,7 +1614,7 @@ packet exchanges between the terminal and the server are exactly reproduced between the server and the client. - 77..44..1155.. BBRRLLAAPPII__PPAACCKKEETT__SSUUSSPPEENNDDDDRRIIVVEERR ((sseeee bbrrllaappii__ssuussppeennddDDrriivveerr(()) )) + 7.4.15. BRLAPI_PACKET_SUSPENDDRIVER (see brlapi_suspendDriver() ) To enter suspend mode, the client must send a BRLAPI_PACKET_SUSPEND packet, which is acknowledge. Once in suspend mode, no other packet diff -Nru brltty-5.4/Documents/Manual-BrlAPI/English/Makefile.in brltty-5.5/Documents/Manual-BrlAPI/English/Makefile.in --- brltty-5.4/Documents/Manual-BrlAPI/English/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Manual-BrlAPI/English/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Documents/Manual-BRLTTY/English/braille-drivers.sgml brltty-5.5/Documents/Manual-BRLTTY/English/braille-drivers.sgml --- brltty-5.4/Documents/Manual-BRLTTY/English/braille-drivers.sgml 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/English/braille-drivers.sgml 2017-04-18 22:35:13.000000000 +0000 @@ -15,6 +15,7 @@ |DM80 Plus@ |EcoVario 24/32/40/64/80@ |Inka@ + |Orbit 20@ |PocketVario 24@ |Pronto! V3 18/40@ |Pronto! V4 18/40@ @@ -39,7 +40,6 @@ |Apex@ Braudi@ BrlAPI@ -B2G@ Cebra |20/40/60/80/100/120/140@ CombiBraille @@ -64,6 +64,7 @@ |Modular Connect 88@ |Active Braille@ |Active Star 40@ + |Actilino@ |Basic Braille 16/20/32/40/48/64/80@ |Braillino@ |Braille Wave@ diff -Nru brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY-12.html brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY-12.html --- brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY-12.html 2016-06-28 11:22:19.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY-12.html 2017-04-18 22:38:57.000000000 +0000 @@ -45,8 +45,7 @@

The following device types are supported:

Bluetooth
-

For a bluetooth device, specify bluetooth:address -(bt: and bluez: may also be used). +

For a bluetooth device, specify bluetooth:address. The address must be six two-digit hexadecimal numbers separated by colons, e.g. 01:23:45:67:89:AB.

Serial
diff -Nru brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY-3.html brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY-3.html --- brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY-3.html 2016-06-28 11:22:19.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY-3.html 2017-04-18 22:38:57.000000000 +0000 @@ -311,10 +311,13 @@

Specify the default device to which the braille display is connected (see section Braille Device Specification). -If this option isn't specified, -then usb: is assumed if USB support is available, -and an operating system appropriate path -for the primary (first) serial port (device) is assumed if not. +If this option isn't specified then +usb: is assumed if USB support is available, +bluetooth: is assumed if Bluetooth support is available, +and usb:,bluetooth: is assumed if both are available. +If neither USB nor Bluetooth support is available then +an operating system appropriate path +for the primary (first) serial port (device) is assumed. See the braille-device configuration file directive and the diff -Nru brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY-4.html brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY-4.html --- brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY-4.html 2016-06-28 11:22:19.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY-4.html 2017-04-18 22:38:57.000000000 +0000 @@ -700,7 +700,7 @@ although it may be overridden with the -f command line option. It doesn't need to exist. -A template for it can be found within the DOCS subdirectory.

+A template for it can be found within the Documents subdirectory.

Blank lines are ignored. A comment begin with a number sign (#), and continues to the end of the line. diff -Nru brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY-8.html brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY-8.html --- brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY-8.html 2016-06-28 11:22:19.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY-8.html 2017-04-18 22:38:57.000000000 +0000 @@ -32,6 +32,7 @@ DM80 Plus EcoVario 24/32/40/64/80 Inka +Orbit 20 PocketVario 24 Pronto! V3 18/40 Pronto! V4 18/40 @@ -52,7 +53,6 @@ Apex Braudi BrlAPI -B2G Cebra20/40/60/80/100/120/140 CombiBraille25/45/85 EcoBraille20/40/80 @@ -71,6 +71,7 @@ Modular Connect 88 Active Braille Active Star 40 +Actilino Basic Braille 16/20/32/40/48/64/80 Braillino Braille Wave diff -Nru brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY.html brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY.html --- brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY.html 2016-06-28 11:22:19.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY.html 2017-04-18 22:38:58.000000000 +0000 @@ -28,10 +28,10 @@

Dave Mielke <dave@mielke.cc> -

Version 5.4, Jun 2016 + Version 5.5, April 2017
- Copyright © 1995-2016 by The BRLTTY Developers. + Copyright © 1995-2017 by The BRLTTY Developers. BRLTTY is free software, and comes with ABSOLUTELY NO WARRANTY. It is placed under the terms of version 2 or later of diff -Nru brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY.sgml brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY.sgml --- brltty-5.4/Documents/Manual-BRLTTY/English/BRLTTY.sgml 2016-06-28 11:11:51.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/English/BRLTTY.sgml 2017-04-18 22:35:13.000000000 +0000 @@ -20,9 +20,9 @@ Stphane Doyon Dave Mielke - Version 5.4, Jun 2016 + Version 5.5, April 2017 - Copyright © 1995-2016 by The BRLTTY Developers. + Copyright © 1995-2017 by The BRLTTY Developers. BRLTTY is free software, and comes with ABSOLUTELY NO WARRANTY. It is placed under the terms of version 2 or later of @@ -518,10 +518,13 @@ Specify the default device to which the braille display is connected (see section ). - If this option isn't specified, - then configuration file directive and the command line option for run-time selection. @@ -2433,7 +2436,7 @@ although it may be overridden with the command line option. It doesn't need to exist. -A template for it can be found within the - Version 5.4, Jun 2016 + Version 5.5, April 2017 - Copyright 1995-2016 by The BRLTTY Developers. BRLTTY is free soft- + Copyright 1995-2017 by The BRLTTY Developers. BRLTTY is free soft- ware, and comes with ABSOLUTELY NO WARRANTY. It is placed under the - terms of version 2 or later of TThhee GGNNUU GGeenneerraall PPuubblliicc LLiicceennssee as pub- - lished by TThhee FFrreeee SSooffttwwaarree FFoouunnddaattiioonn. + terms of version 2 or later of The GNU General Public License as pub- + lished by The Free Software Foundation. ______________________________________________________________________ @@ -140,9 +140,9 @@ ______________________________________________________________________ - 11.. FFoorrmmaalliittiieess + 1. Formalities - 11..11.. LLiicceennssee + 1.1. License This program is free software. You may redistribute it and/or modify it under the terms of The GNU General Public License as published by @@ -154,14 +154,14 @@ directory. If not, write to the Free Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - 11..22.. DDiissccllaaiimmeerr + 1.2. Disclaimer This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY - not even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GGNNUU - GGeenneerraall PPuubblliicc LLiicceennssee for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - 11..33.. CCoonnttaacctt IInnffoorrmmaattiioonn + 1.3. Contact Information BRLTTY represents the work of a team. For up-to-date information, see BRLTTY's web page at [http://brltty.com/]. As of this writing, the @@ -169,47 +169,47 @@ Dave Mielke (maintainer, active) - WWeebb + Web http://mielke.cc/ - EE--MMaaiill + E-Mail Samuel Thibault (active) - WWeebb + Web http://dept-info.labri.fr/~thibault/ - EE--MMaaiill + E-Mail Mario Lang (active) - WWeebb + Web http://delysid.org/ - EE--MMaaiill + E-Mail Nicolas Pitre - WWeebb + Web http://www.fluxnic.net/ - EE--MMaaiill + E-Mail Stphane Doyon - WWeebb + Web http://pages.infinit.net/sdoyon/ - EE--MMaaiill + E-Mail Nikhil Nair (author) - EE--MMaaiill + E-Mail Questions, comments, suggestions, criticisms, and contributions are @@ -221,7 +221,7 @@ etc, go to the list's information page at http://mielke.cc/mailman/listinfo/brltty. - 22.. IInnttrroodduuccttiioonn + 2. Introduction BRLTTY gives a braille user access to the text consoles of a Linux/Unix system. It runs as a background process (daemon) which @@ -237,7 +237,7 @@ screen, to enable and disable various viewing options, and to perform special functions. - 22..11.. FFeeaattuurree SSuummmmaarryy + 2.1. Feature Summary BRLTTY provides the following capabilities: @@ -280,14 +280,14 @@ An Application Programming Interface. - 22..22.. SSyysstteemm RReeqquuiirreemmeennttss + 2.2. System Requirements To date, BRLTTY runs under Linux, Solaris, OpenBSD, FreeBSD, NetBSD, and Windows. While ports to other Unix-like operating systems aren't currently planned, we do welcome any interest in such projects. - LLiinnuuxx + Linux This software has been tested on a variety of Linux systems: Desktops, laptops, and some PDAs. @@ -301,29 +301,29 @@ Many kernels, including 1.2.13, 2.0, 2.2, and 2.4. - SSoollaarriiss + Solaris This software has been tested on the following Solaris systems: The Sparc architecture (releases 7, 8, and 9). The Intel architecture (release 9). - OOppeennBBSSDD + OpenBSD This software has been tested on the following OpenBSD systems: The Intel architecture (release 3.4). - FFrreeeeBBSSDD + FreeBSD This software has been tested on the following FreeBSD systems: The Intel architecture (release 5.1). - NNeettBBSSDD + NetBSD This software has been tested on the following NetBSD systems: The Intel architecture (release 1.6). - WWiinnddoowwss + Windows This software has been tested on Windows 95, 98, and XP. On Linux, BRLTTY can inspect the content of the screen completely @@ -367,7 +367,7 @@ with standard Unix distributions should suffice. If you have problems, then contact us and we'll compile a binary for you. - 33.. TThhee BBuuiilldd PPrroocceedduurree + 3. The Build Procedure BRLTTY can be downloaded from its web site (see section ``Contact Information'' for its location). All releases are provided as @@ -379,39 +379,39 @@ first become familiar with the files which will ultimately be installed. - 33..11.. IInnssttaalllleedd FFiillee HHiieerraarrcchhyy + 3.1. Installed File Hierarchy The build procedure should result in the installation of the following files: - //bbiinn// + /bin/ - bbrrllttttyy + brltty The BRLTTY program. - ````bbrrllttttyy--iinnssttaallll'''' + ``brltty-install'' A utility for copying BRLTTY's ``installed file hierarchy'' from one location to another. - ````bbrrllttttyy--ccoonnffiigg'''' + ``brltty-config'' A utility which sets a number of environment variables to values which reflect the current installation of BRLTTY. - //lliibb// + /lib/ - lliibbbbrrllaappii..aa + libbrlapi.a Static archive of the Application Programming Interface. - lliibbbbrrllaappii..ssoo + libbrlapi.so Dynamically loadable object for the Application Programming Interface. - //lliibb//bbrrllttttyy// + /lib/brltty/ Your installation of BRLTTY may not have all of the following types of files. They're only created as needed based on the build options you select (see ``Build Options''). - bbrrllttttyy--bbrrll..llsstt + brltty-brl.lst A list of the braille display drivers which have been built as dynamically loadable shared objects, and, therefore, which can be selected at run-time. Each line consists of the two- @@ -419,11 +419,11 @@ a description of the braille display which that driver is for. - lliibbbbrrllttttyybb_d_r_i_v_e_r..ssoo..11 + libbrlttybdriver.so.1 The dynamically loadable driver for a braille display, where - _d_r_i_v_e_r is the two-letter ``driver identification code''. + driver is the two-letter ``driver identification code''. - bbrrllttttyy--ssppkk..llsstt + brltty-spk.lst A list of the speech synthesizer drivers which have been built as dynamically loadable shared objects, and, therefore, which can be selected at run-time. Each line consists of the @@ -431,138 +431,138 @@ and a description of the speech synthesizer which that driver is for. - lliibbbbrrllttttyyss_d_r_i_v_e_r..ssoo..11 + libbrlttysdriver.so.1 The dynamically loadable driver for a speech synthesizer, - where _d_r_i_v_e_r is the two-letter ``driver identification + where driver is the two-letter ``driver identification code''. - //lliibb//bbrrllttttyy//rrww// + /lib/brltty/rw/ Files created at run-time, e.g. needed but missing system resources. - //eettcc// + /etc/ - bbrrllttttyy..ccoonnff + brltty.conf System defaults for BRLTTY. - bbrrllaappii..kkeeyy + brlapi.key The access key for BrlAPI. - //eettcc//bbrrllttttyy// + /etc/brltty/ Your installation of BRLTTY may not have all of the following types of files. They're only created as needed based on the build options you select (see ``Build Options''). - **..ccoonnff + *.conf Driver-specific configuration data. Their names look more or - less like brltty-_d_r_i_v_e_r.conf, where _d_r_i_v_e_r is the two-letter + less like brltty-driver.conf, where driver is the two-letter ``driver identification code''. - **..aattbb + *.atb Attributes tables (see section ``Attributes Tables'' for - details). Their names look like _n_a_m_e.atb. + details). Their names look like name.atb. - **..aattii + *.ati Include files for attributes tables. - **..ccttbb + *.ctb Contraction tables (see section ``Contraction Tables'' for - details). Their names look like _l_a_n_g_u_a_g_e-_c_o_u_n_t_r_y-_l_e_v_e_l.ctb. + details). Their names look like language-country-level.ctb. - **..ccttii + *.cti Include files for contraction tables. - **..kkttbb + *.ktb Key tables (see section ``Key Tables'' for details). Their - names look like _n_a_m_e.ktb. + names look like name.ktb. - **..kkttii + *.kti Include files for key tables. - **..ttttbb + *.ttb Text tables (see section ``Text Tables'' for details). Their - names look like _l_a_n_g_u_a_g_e.ttb. + names look like language.ttb. - **..ttttii + *.tti Include files for text tables. - **..hhllpp + *.hlp Driver-specific help pages. Their names look more or less - like brltty-_d_r_i_v_e_r.hlp, where _d_r_i_v_e_r is the two-letter + like brltty-driver.hlp, where driver is the two-letter ``driver identification code''. - //vvaarr//lliibb//BBrrllAAPPII// + /var/lib/BrlAPI/ Local sockets for connecting to the Application Programming Interface. - //iinncclluuddee// + /include/ C header files for the Application Programming Interface. Their - names look like brlapi-_f_u_n_c_t_i_o_n.h. The main header is brlapi.h. + names look like brlapi-function.h. The main header is brlapi.h. - //iinncclluuddee//bbrrllttttyy// + /include/brltty/ C header files for accessing braille hardware. Their names look - like brldefs-_d_r_i_v_e_r.h (where _d_r_i_v_e_r is the two-letter ``driver + like brldefs-driver.h (where driver is the two-letter ``driver identification code''). The headers brldefs.h and api.h are provided for backward compatibility and shouldn't be used. - //mmaann// + /man/ Man pages. - mmaann11//_n_a_m_e..11 + man1/name.1 Man pages for BRLTTY-related user commands. - mmaann33//_n_a_m_e..33 + man3/name.3 Man pages for Application Programming Interface library routines. Some optional files which you should be aware of, although they aren't part of the installed file hierarchy, are: - //eettcc//bbrrllttttyy..ccoonnff + /etc/brltty.conf The system defaults configuration file. It's created by the system administrator. See ``The Configuration File'' for details. - //eettcc//bbrrllttttyy--_d_r_i_v_e_r..pprreeffss - The saved preferences settings file (_d_r_i_v_e_r is a two-letter + /etc/brltty-driver.prefs + The saved preferences settings file (driver is a two-letter ``driver identification code''). It's created by the ``PREFSAVE'' command. See ``Preferences Settings'' for details. - 33..22.. IInnssttaalllliinngg ffrroomm aa TTAARR BBaallll + 3.2. Installing from a TAR Ball Here's what to do if you just want to install BRLTTY as quickly as possible, trusting that all of our defaults are correct. - 1. Download the source. It'll be a file named brltty-_r_e_l_e_a_s_e.tar.gz, + 1. Download the source. It'll be a file named brltty-release.tar.gz, e.g. brltty-3.0.tar.gz. 2. Unpack the source into its native hierarchical structure. - tar xzf brltty-_r_e_l_e_a_s_e.tar.gz + tar xzf brltty-release.tar.gz - This should create the directory brltty-_r_e_l_e_a_s_e. + This should create the directory brltty-release. 3. Change to the source directory, configure, compile, and install BRLTTY. - cd brltty-_r_e_l_e_a_s_e + cd brltty-release ./configure make install - This should be done as rroooott. + This should be done as root. To uninstall BRLTTY, do: - cd brltty-_r_e_l_e_a_s_e + cd brltty-release make uninstall That's all there's to it. Now, for those who really want to know what's going on, here are the details. - 33..22..11.. BBuuiilldd OOppttiioonnss + 3.2.1. Build Options The first step in building BRLTTY is to configure it for your system and/or for your personal needs. This is done by running the configure @@ -585,10 +585,10 @@ ing the driver for your braille display for any additional display- specific instructions. - 33..22..11..11.. SSyysstteemm DDeeffaauullttss + 3.2.1.1. System Defaults - --with-braille-driver=_d_r_i_v_e_r + --with-braille-driver=driver Specify the braille display drivers which are to be linked into the BRLTTY binary. Those drivers which aren't listed via this option are built as dynamically loadable shared objects and can @@ -600,21 +600,21 @@ driver is excluded from the build. Any of the following words can also be used as the operand of this option: - aallll + all Link all of the drivers into the binary. Don't build any of them as dynamically loadable shared objects. This word may also be specified as the final element of a driver list. This is how to specify the default driver when all the drivers are to be linked in. - --aallll + -all Only build those drivers which have been explicitly included via this option. - nnoo Don't build any drivers at all. This is equivalent to + no Don't build any drivers at all. This is equivalent to specifying --without-braille-driver. - yyeess + yes Build all of the drivers as dynamically loadable shared objects. Don't link any of them into the binary. This is equivalent to specifying --with-braille-driver. @@ -622,7 +622,7 @@ See the ``braille-driver'' configuration file directive and the ``-b'' command line option for run-time selection. - --with-braille-parameters=[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + --with-braille-parameters=[driver:]name=value,... Specify the default parameter settings for the braille display drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a parameter name is @@ -634,31 +634,34 @@ configuration file directive and the ``-B'' command line option for run-time selection. - --with-braille-device=_d_e_v_i_c_e,... + --with-braille-device=device,... Specify the default device to which the braille display is connected (see section ``Braille Device Specification''). If - this option isn't specified, then usb: is assumed if USB support - is available, and an operating system appropriate path for the - primary (first) serial port (device) is assumed if not. See the - ``braille-device'' configuration file directive and the ``-d'' - command line option for run-time selection. + this option isn't specified then usb: is assumed if USB support + is available, bluetooth: is assumed if Bluetooth support is + available, and usb:,bluetooth: is assumed if both are available. + If neither USB nor Bluetooth support is available then an + operating system appropriate path for the primary (first) serial + port (device) is assumed. See the ``braille-device'' + configuration file directive and the ``-d'' command line option + for run-time selection. - --with-libbraille=_d_i_r_e_c_t_o_r_y + --with-libbraille=directory Specify the installed location of the Libbraille package, and build the Libbraille braille display driver (see ``Build Restrictions''). Any of the following words can also be used as the operand of this option: - nnoo Don't build the driver. This is equivalent to specifying + no Don't build the driver. This is equivalent to specifying --without-libbraille. - yyeess + yes Build the driver if the package can be found in /usr, /usr/local, /usr/local/Libbraille, /usr/local/libbraille, /opt/Libbraille, or /opt/libbraille. This is equivalent to specifying --with-libbraille. - --with-text-table=_f_i_l_e + --with-text-table=file Specify the built-in (fallback) text table (see section ``Text Tables'' for details). The specified table is linked into the BRLTTY binary, and is used either if locale-based autoselection @@ -671,7 +674,7 @@ ``-t'' command line option for run-time selection. This setting can be changed with the ``Text Table'' preference. - --with-attributes-table=_f_i_l_e + --with-attributes-table=file Specify the built-in (fallback) attributes table (see section ``Attributes Translation'' for details). The specified table is linked into the BRLTTY binary, and is used if the requested @@ -683,7 +686,7 @@ the ``-a'' command line option for run-time selection. This setting can be changed with the ``Attributes Table'' preference. - --with-speech-driver=_d_r_i_v_e_r + --with-speech-driver=driver Specify the speech synthesizer drivers which are to be linked into the BRLTTY binary. Those drivers which aren't listed via this option are built as dynamically loadable shared objects and @@ -695,21 +698,21 @@ then that driver is excluded from the build. Any of the following words can also be used as the operand of this option: - aallll + all Link all of the drivers into the binary. Don't build any of them as dynamically loadable shared objects. This word may also be specified as the final element of a driver list. This is how to specify the default driver when all the drivers are to be linked in. - --aallll + -all Only build those drivers which have been explicitly included via this option. - nnoo Don't build any drivers at all. This is equivalent to + no Don't build any drivers at all. This is equivalent to specifying --without-speech-driver. - yyeess + yes Build all of the drivers as dynamically loadable shared objects. Don't link any of them into the binary. This is equivalent to specifying --with-speech-driver. @@ -717,7 +720,7 @@ See the ``speech-driver'' configuration file directive and the ``-s'' command line option for run-time selection. - --with-speech-parameters=[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + --with-speech-parameters=[driver:]name=value,... Specify the default parameter settings for the speech synthesizer drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a @@ -729,109 +732,109 @@ parameters'' configuration file directive and the ``-S'' command line option for run-time selection. - --with-flite=_d_i_r_e_c_t_o_r_y + --with-flite=directory Specify the installed location of the FestivalLite text-to- speech package, and build the FestivalLite speech synthesizer driver (see ``Build Restrictions''). Any of the following words can also be used as the operand of this option: - nnoo Don't build the driver. This is equivalent to specifying + no Don't build the driver. This is equivalent to specifying --without-flite. - yyeess + yes Build the driver if the package can be found in /usr, /usr/local, /usr/local/FestivalLite, /usr/local/flite, /opt/FestivalLite, or /opt/flite. This is equivalent to specifying --with-flite. - --with-flite-language=_l_a_n_g_u_a_g_e + --with-flite-language=language Specify the language which the FestivalLite text to speech engine is to use. The default language is usenglish. - --with-flite-lexicon=_l_e_x_i_c_o_n + --with-flite-lexicon=lexicon Specify the lexicon which the FestivalLite text to speech engine is to use. The default lexicon is cmulex. - --with-flite-voice=_v_o_i_c_e + --with-flite-voice=voice Specify the voice which the FestivalLite text to speech engine is to use. The default voice is cmu_us_kal16. - --with-mikropuhe=_d_i_r_e_c_t_o_r_y + --with-mikropuhe=directory Specify the installed location of the Mikropuhe text-to-speech package, and build the Mikropuhe speech synthesizer driver (see ``Build Restrictions''). Any of the following words can also be used as the operand of this option: - nnoo Don't build the driver. This is equivalent to specifying + no Don't build the driver. This is equivalent to specifying --without-mikropuhe. - yyeess + yes Build the driver if the package can be found in /usr, /usr/local, /usr/local/Mikropuhe, /usr/local/mikropuhe, /opt/Mikropuhe, or /opt/mikropuhe. This is equivalent to specifying --with-mikropuhe. - --with-speechd=_d_i_r_e_c_t_o_r_y + --with-speechd=directory Specify the installed location of the speech-dispatcher text-to- speech package, and build the speech-dispatcher speech synthesizer driver. Any of the following words can also be used as the operand of this option: - nnoo Don't build the driver. This is equivalent to specifying + no Don't build the driver. This is equivalent to specifying --without-speechd. - yyeess + yes Build the driver if the package can be found in /usr, /usr/local, /usr/local/speech-dispatcher, /usr/local/speechd, /opt/speech-dispatcher, or /opt/speechd. This is equivalent to specifying --with-speechd. - --with-swift=_d_i_r_e_c_t_o_r_y + --with-swift=directory Specify the installed location of the Swift text-to-speech package, and build the Swift speech synthesizer driver. Any of the following words can also be used as the operand of this option: - nnoo Don't build the driver. This is equivalent to specifying + no Don't build the driver. This is equivalent to specifying --without-swift. - yyeess + yes Build the driver if the package can be found in /usr, /usr/local, /usr/local/Swift, /usr/local/swift, /opt/Swift, or /opt/swift. This is equivalent to specifying --with- swift. - --with-theta=_d_i_r_e_c_t_o_r_y + --with-theta=directory Specify the installed location of the Theta text-to-speech package, and build the Theta speech synthesizer driver (see ``Build Restrictions''). Any of the following words can also be used as the operand of this option: - nnoo Don't build the driver. This is equivalent to specifying + no Don't build the driver. This is equivalent to specifying --without-theta. - yyeess + yes Build the driver if the package can be found in /usr, /usr/local, /usr/local/Theta, /usr/local/theta, /opt/Theta, or /opt/theta. This is equivalent to specifying --with- theta. - --with-viavoice=_d_i_r_e_c_t_o_r_y + --with-viavoice=directory Specify the installed location of the ViaVoice text-to-speech package, and build the ViaVoice speech synthesizer driver (see ``Build Restrictions''). Any of the following words can also be used as the operand of this option: - nnoo Don't build the driver. This is equivalent to specifying + no Don't build the driver. This is equivalent to specifying --without-viavoice. - yyeess + yes Build the driver if the package can be found in /usr, /usr/local, /usr/local/ViaVoice, /usr/local/viavoice, /opt/ViaVoice, or /opt/viavoice. This is equivalent to specifying --with-viavoice. - --with-screen-driver=_d_r_i_v_e_r + --with-screen-driver=driver Specify the screen drivers which are to be linked into the BRLTTY binary. Those drivers which aren't listed via this option are built as dynamically loadable shared objects and can @@ -844,21 +847,21 @@ build. Any of the following words can also be used as the operand of this option: - aallll + all Link all of the drivers into the binary. Don't build any of them as dynamically loadable shared objects. This word may also be specified as the final element of a driver list. This is how to specify the default driver when all the drivers are to be linked in. - --aallll + -all Only build those drivers which have been explicitly included via this option. - nnoo Don't build any drivers at all. This is equivalent to + no Don't build any drivers at all. This is equivalent to specifying --without-screen-driver. - yyeess + yes Build all of the drivers as dynamically loadable shared objects. Don't link any of them into the binary. This is equivalent to specifying --with-screen-driver. @@ -871,7 +874,7 @@ selected. See the ``screen-driver'' configuration file direc- tive and the ``-x'' command line option for run-time selection. - --with-screen-parameters=[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + --with-screen-parameters=[driver:]name=value,... Specify the default parameter settings for the screen drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a parameter name is qualified @@ -882,7 +885,7 @@ See the ``screen-parameters'' configuration file directive and the ``-X'' command line option for run-time selection. - --with-usb-package=_p_a_c_k_a_g_e,... + --with-usb-package=package,... Specify the package which is to be used for USB I/O. The package names must be separated from one another by a single comma, and are processed from left to right. The first one @@ -896,16 +899,16 @@ Any of the following words can also be used as the operand of this option: - nnoo Don't support USB I/O. This is equivalent to specifying + no Don't support USB I/O. This is equivalent to specifying --without-usb-package. - yyeess + yes Use native support for USB I/O. If native support isn't available for the current platform then use the first available supported package (as per the order specified above). This is equivalent to specifying --with-usb-package. - --with-bluetooth-package=_p_a_c_k_a_g_e,... + --with-bluetooth-package=package,... Specify the package which is to be used for Bluetooth I/O. The package names must be separated from one another by a single comma, and are processed from left to right. The first one @@ -917,20 +920,20 @@ Any of the following words can also be used as the operand of this option: - nnoo Don't support Bluetooth I/O. This is equivalent to + no Don't support Bluetooth I/O. This is equivalent to specifying --without-bluetooth-package. - yyeess + yes Use native support for Bluetooth I/O. If native support isn't available for the current platform then use the first available supported package (as per the order specified above). This is equivalent to specifying --with-bluetooth- package. - 33..22..11..22.. DDiirreeccttoorryy SSppeecciiffiiccaattiioonn + 3.2.1.2. Directory Specification - --with-execute-root=_d_i_r_e_c_t_o_r_y + --with-execute-root=directory Specify the directory at which the ``installed file hierarchy'' is to be rooted at run-time. The absolute path should be supplied. If this option isn't specified, then the system's @@ -941,7 +944,7 @@ section ``Installing Multiple Versions'' for an example of how to do this). - --with-install-root=_d_i_r_e_c_t_o_r_y + --with-install-root=directory Specify the directory beneath which the ``installed file hierarchy'' is to be installed. The absolute path should be supplied. If this option isn't specified, then the run-time @@ -953,7 +956,7 @@ example, if you're building BRLTTY on one system for use on another. - --prefix=_d_i_r_e_c_t_o_r_y + --prefix=directory Specify the directory within the ``installed file hierarchy'' where the default directories for the architecture-independent files are to be rooted. These directories include: @@ -973,7 +976,7 @@ directory is rooted at the directory specified by the ``--with- execute-root'' build option. - --exec-prefix=_d_i_r_e_c_t_o_r_y + --exec-prefix=directory Specify the directory within the ``installed file hierarchy'' where the default directories for the architecture-dependent files are to be rooted. These directories include: @@ -989,7 +992,7 @@ build option is assumed. This directory is rooted at the direc- tory specified by the ``--with-execute-root'' build option. - --libdir=_d_i_r_e_c_t_o_r_y + --libdir=directory Specify the directory within the ``installed file hierarchy'' where the static archive and the dynamically loadable object for the Application Programming Interface are to be installed. The @@ -999,7 +1002,7 @@ directory specified by the ``--exec-prefix'' build option) is assumed. The directory is created if it doesn't exist. - --sysconfdir=_d_i_r_e_c_t_o_r_y + --sysconfdir=directory Specify the directory within the ``installed file hierarchy'' where the configuration files are to be installed. The absolute path should be supplied. If this option isn't specified, then @@ -1008,7 +1011,7 @@ specified by the ``--prefix'' build option) is assumed. The directory is created if it doesn't exist. - --with-program-directory=_d_i_r_e_c_t_o_r_y + --with-program-directory=directory Specify the directory within the ``installed file hierarchy'' where the runnable programs (binaries, executables) are to be installed. The absolute path should be supplied. If this @@ -1018,7 +1021,7 @@ option) is assumed. The directory is created if it doesn't exist. - --with-library-directory=_d_i_r_e_c_t_o_r_y + --with-library-directory=directory Specify the directory within the ``installed file hierarchy'' where the drivers and other architecture-dependent files are to be installed. The absolute path should be supplied. If this @@ -1028,16 +1031,16 @@ ``--exec-prefix'' build option) is assumed. The directory is created if it doesn't exist. - --with-writable-directory=_d_i_r_e_c_t_o_r_y + --with-writable-directory=directory Specify the directory within the ``installed file hierarchy'' which may be written to. The absolute path should be supplied. Any of the following words can also be used as the operand of this option: - nnoo Don't define a writable directory. This is equivalent to + no Don't define a writable directory. This is equivalent to specifying --without-writable-directory. - yyeess + yes Use the default location. This is equivalent to specifying --with-writable-directory. @@ -1046,7 +1049,7 @@ option is assumed. The directory is created if it doesn't exist. - --with-data-directory=_d_i_r_e_c_t_o_r_y + --with-data-directory=directory Specify the directory within the ``installed file hierarchy'' where the tables, help pages, and other architecture-independent files are to be installed. The absolute path should be @@ -1056,7 +1059,7 @@ the directory specified by the ``--prefix'' build option) is assumed. The directory is created if it doesn't exist. - --with-manpage-directory=_d_i_r_e_c_t_o_r_y + --with-manpage-directory=directory Specify the directory within the ``installed file hierarchy'' where the man pages are to be installed. The absolute path should be supplied. If this option isn't specified, then the @@ -1065,7 +1068,7 @@ ``--prefix'' build option) is assumed. The directory is created if it doesn't exist. - --with-include-directory=_d_i_r_e_c_t_o_r_y + --with-include-directory=directory Specify the directory within the ``installed file hierarchy'' where the C header files for the Application Programming Interface are to be installed. The absolute path should be @@ -1075,7 +1078,7 @@ at the directory specified by the ``--prefix'' build option) is assumed. The directory is created if it doesn't exist. - 33..22..11..33.. BBuuiilldd FFeeaattuurreess + 3.2.1.3. Build Features These options are primarily useful when building BRLTTY for use on a boot disk. @@ -1130,7 +1133,7 @@ Reduce program size by excluding support for the digital audio interface on the sound card. - --enable-pcm-support=_i_n_t_e_r_f_a_c_e + --enable-pcm-support=interface If a platform provides more than one digital audio interface then the one which is to be used may be specified. @@ -1144,7 +1147,7 @@ Reduce program size by excluding support for the Musical Instrument Digital Interface of the sound card. - --enable-midi-support=_i_n_t_e_r_f_a_c_e + --enable-midi-support=interface If a platform provides more than one Musical Instrument Digital Interface then the one which is to be used may be specified. @@ -1172,12 +1175,12 @@ Reduce program size by excluding the Application Programming Interface. - --with-api-parameters=_n_a_m_e=_v_a_l_u_e,... + --with-api-parameters=name=value,... Specify the default parameter settings for the Application Programming Interface. If the same parameter is specified more than once, then its rightmost assignment is used. For a description of the parameters accepted by the interface, please - see the BBrrllAAPPII reference manual. See the ``api-parameters'' + see the BrlAPI reference manual. See the ``api-parameters'' configuration file directive and the ``-A'' command line option for run-time selection. @@ -1201,24 +1204,24 @@ Don't build the Tcl bindings for the Application Programming Interface. - --with-tcl-config=_p_a_t_h + --with-tcl-config=path Specify the location of the Tcl configuration script (tclConfig.sh). Either the path to the script itself or to the directory containing it may be supplied. Any of the following words can also be used as the operand of this option: - nnoo Use other means to guess if Tcl is available, and, if so, + no Use other means to guess if Tcl is available, and, if so, where it has been installed. This is equivalent to specifying --without-tcl-config. - yyeess + yes Search for the script in a few commonly used directories. This is equivalent to specifying --with-tcl-config. - 33..22..11..44.. MMiisscceellllaanneeoouuss OOppttiioonnss + 3.2.1.4. Miscellaneous Options - --with-init-path=_p_a_t_h + --with-init-path=path Specify the path to the real init program for the system. The absolute path should be supplied. If this option is specified, then: @@ -1238,14 +1241,14 @@ vated. This option is primarily intended for building a brail- lified installer image. - --with-stderr-path=_p_a_t_h + --with-stderr-path=path Specify the path to the file or device where standard erorr output is to be written. The absolute path should be supplied. If this option isn't specified, then this feature isn't activated. This option is primarily intended for building a braillified installer image. - 33..22..22.. MMaakkee FFiillee TTaarrggeettss + 3.2.2. Make File Targets Once BRLTTY has been configured, the next steps are to compile and to install it. These are done by applying the system's make command to @@ -1253,23 +1256,23 @@ BRLTTY's make file supports most of the common application maintenance targets. They include: - mmaakkee + make A shortcut for make all. - mmaakkee aallll + make all Compile and link the BRLTTY executable, its drivers and their help pages, its test programs, and a few other small utilities. - mmaakkee iinnssttaallll + make install Complete the compile and link phase (see ``make all''), and then install the BRLTTY executable, its data files, drivers, and help pages, in the correct places and with the correct permissions. - mmaakkee uunniinnssttaallll + make uninstall Remove the BRLTTY executable, its data files, drivers, and help pages, from the system. - mmaakkee cclleeaann + make clean Ensure that the next compile and link (see ``make all'') will be done from scratch by removing the results of compiling, linking, and testing from the source directory structure. This includes @@ -1277,7 +1280,7 @@ shared objects, driver lists, help pages, temporary header files, and core files. - mmaakkee ddiissttcclleeaann + make distclean In addition to removing the results of compiling and linking (see ``make clean''): @@ -1291,17 +1294,17 @@ results, rejected patch hunks, and copies of original source files. - 33..33.. TTeessttiinngg BBRRLLTTTTYY + 3.3. Testing BRLTTY After compiling, linking, and installing BRLTTY, it's a good idea to give it a quick test before activating it permanently. To do so, invoke it with the command: - brltty -b_d_r_i_v_e_r -d_d_e_v_i_c_e + brltty -bdriver -ddevice - For _d_r_i_v_e_r, specify the two-letter ``driver identification code'' cor- - responding to your braille display. For _d_e_v_i_c_e, specify the full path + For driver, specify the two-letter ``driver identification code'' cor- + responding to your braille display. For device, specify the full path for the device to which your braille display is connected. If you don't want to explicitly identify the driver and device each @@ -1335,7 +1338,7 @@ ``-e'' to direct diagnostic messages to standard error rather than to the system log. - 33..44.. SSttaarrttiinngg BBRRLLTTTTYY + 3.4. Starting BRLTTY BRLTTY, when properly installed, is invoked with the single command brltty. A configuration file (see section ``The Configuration File'' @@ -1361,7 +1364,7 @@ script is distribution-dependent. Here are the ones we know about so far: - RReedd HHaatt + Red Hat /etc/rc.d/rc.local Starting BRLTTY from this script is a good approach (especially for @@ -1393,7 +1396,7 @@ where it's best to do this is distribution-dependent. Here are the places we know about so far: - DDeebbiiaann + Debian /etc/init.d/boot (for older releases) /etc/init.d/ (for newer releases) A brltty package is provided (see @@ -1404,7 +1407,7 @@ change the contents between quotes on the directive ARGUMENTS in the /etc/default/brltty file. - RReeddHHaatt + RedHat /etc/rc.d/rc.sysinit Beware that later releases, in order to support a more user- oriented system initialization procedure, have this script @@ -1425,10 +1428,10 @@ problems. If your version of this script has this feature, then make sure you start BRLTTY after the lines which implement it. - SSllaacckkwwaarree + Slackware /etc/rc.d/rc.S - SSuuSSEE + SuSE /sbin/init.d/boot An alternative is to start BRLTTY from /etc/inittab. You have two @@ -1449,7 +1452,7 @@ The ``-n'' (--nodaemon) option is very important when running BRLTTY - with iinniitt's respawn facility. You'll end up with hundreds of BRLTTY + with init's respawn facility. You'll end up with hundreds of BRLTTY processes all running at the same time if you forget to specify it. Check that the identifier (brl in these examples) isn't already being @@ -1468,7 +1471,7 @@ command). Better yet, turn off the serial port probing. Here's what we know so far about how to do this: - RReedd HHaatt + Red Hat The probing is done by a service named kudzu. Use the command chkconfig --list kudzu @@ -1487,7 +1490,7 @@ ``--with-writable-directory'', and ``--with-data-directory'' build options. - 33..55.. SSeeccuurriittyy CCoonnssiiddeerraattiioonnss + 3.5. Security Considerations BRLTTY needs to run with root privileges because it needs read and write access for the port to which the braille display is connected, @@ -1506,15 +1509,15 @@ cut&paste, beeps, and all that, you can run BRLTTY without root priviledge. - 33..66.. BBuuiilldd aanndd RRuunn--TTiimmee RReessttrriiccttiioonnss + 3.6. Build and Run-Time Restrictions - AAlleerrtt TTuunneess + Alert Tunes Some platforms don't support all of the tune devices. See the ``Tune Device'' preference for details. - FFeessttiivvaallLLiittee SSppeeeecchh SSyynntthheessiizzeerr DDrriivveerr + FestivalLite Speech Synthesizer Driver The driver for the FestivalLite text to speech engine is only built if that package has been installed. @@ -1525,12 +1528,12 @@ build option) because their run-time libraries contain conflicting symbols. - LLiibbbbrraaiillllee BBrraaiillllee DDiissppllaayy DDrriivveerr + Libbraille Braille Display Driver The driver for the Libbraille package is only built if that package has been installed. - MMiikkrrooppuuhhee SSppeeeecchh SSyynntthheessiizzeerr DDrriivveerr + Mikropuhe Speech Synthesizer Driver The driver for the Mikropuhe text to speech engine is only built if that package has been installed. @@ -1540,7 +1543,7 @@ build option) because a static archive isn't included with the package. - TThheettaa SSppeeeecchh SSyynntthheessiizzeerr DDrriivveerr + Theta Speech Synthesizer Driver The driver for the Theta text to speech engine is only built if that package has been installed. @@ -1557,7 +1560,7 @@ objects within the package don't contain run-time search paths for their dependencies. - VViiaaVVooiiccee SSppeeeecchh SSyynntthheessiizzeerr DDrriivveerr + ViaVoice Speech Synthesizer Driver The driver for the ViaVoice text to speech engine is only built if that package has been installed. @@ -1567,26 +1570,26 @@ build option) because a static archive isn't included with the package. - VViiddeeooBBrraaiillllee BBrraaiillllee DDiissppllaayy DDrriivveerr + VideoBraille Braille Display Driver The driver for the VideoBraille braille display is built on all systems, but only works on Linux. - 33..77.. IInnssttaalllliinngg ffrroomm aann RRPPMM FFiillee + 3.7. Installing from an RPM File To install BRLTTY from an RPM (RedHat Package Manager) file, do the following: 1. Download the binary package which corresponds to your hardware. - It'll be a file named brltty-_r_e_l_e_a_s_e-_v_e_r_s_i_o_n._a_r_c_h_i_t_e_c_t_u_r_e.rpm, e.g. + It'll be a file named brltty-release-version.architecture.rpm, e.g. brltty-3.0-1.i386.rpm. 2. Install the package. - rpm -Uvh brltty-_r_e_l_e_a_s_e-_v_e_r_s_i_o_n._a_r_c_h_i_t_e_c_t_u_r_e.rpm + rpm -Uvh brltty-release-version.architecture.rpm - This should be done as rroooott. Strictly speaking, the -U (update) + This should be done as root. Strictly speaking, the -U (update) option is the only one which is necessary. The -v (verbose) option displays the name of the package as it's being installed. The -h (hashes) option displays a progress meter (using hash signs). @@ -1599,110 +1602,110 @@ rpm -e brltty - 33..88.. OOtthheerr UUttiilliittiieess + 3.8. Other Utilities Building BRLTTY also results in the building of a few small helper and diagnostic utilities. - 33..88..11.. bbrrllttttyy--ccoonnffiigg + 3.8.1. brltty-config This utility sets a number of environment variables to values which reflect the current installation of BRLTTY (see ``Build Options''). It should be executed within an existing shell environment, i.e. not as a command in its own right, and can only be used by scripts which - support BBoouurrnnee SShheellll syntax. + support Bourne Shell syntax. . brltty-config The following environment variables are set: - BBRRLLTTTTYY__VVEERRSSIIOONN + BRLTTY_VERSION The version number of the BRLTTY package. - BBRRLLTTTTYY__EEXXEECCUUTTEE__RROOOOTT + BRLTTY_EXECUTE_ROOT Run-time root for the installed package. Configured via the ``--with-execute-root'' build option. - BBRRLLTTTTYY__PPRROOGGRRAAMM__DDIIRREECCTTOORRYY + BRLTTY_PROGRAM_DIRECTORY Directory for runnable programs (binaries, executables). Configured via the ``--with-program-directory'' build option. - BBRRLLTTTTYY__LLIIBBRRAARRYY__DDIIRREECCTTOORRYY + BRLTTY_LIBRARY_DIRECTORY Directory for drivers. Configured via the ``--with-library- directory'' build option. - BBRRLLTTTTYY__WWRRIITTAABBLLEE__DDIIRREECCTTOORRYY + BRLTTY_WRITABLE_DIRECTORY Directory which can be written to. Configured via the ``--with- writable-directory'' build option. - BBRRLLTTTTYY__DDAATTAA__DDIIRREECCTTOORRYY + BRLTTY_DATA_DIRECTORY Directory for tables and help pages. Configured via the ``--with-data-directory'' build option. - BBRRLLTTTTYY__MMAANNPPAAGGEE__DDIIRREECCTTOORRYY + BRLTTY_MANPAGE_DIRECTORY Directory for manual pages. Configured via the ``--with- manpage-directory'' build option. - BBRRLLTTTTYY__IINNCCLLUUDDEE__DDIIRREECCTTOORRYY + BRLTTY_INCLUDE_DIRECTORY Directory for BrlAPI's C header files. Configured via the ``--with-include-directory'' build option. - BBRRLLAAPPII__VVEERRSSIIOONN + BRLAPI_VERSION The version number of BrlAPI (BRLTTY's Application Programming Interface). - BBRRLLAAPPII__RREELLEEAASSEE + BRLAPI_RELEASE The full release number of BrlAPI. - BBRRLLAAPPII__AAUUTTHH + BRLAPI_AUTH The name of BrlAPI's key file. - In addition, the following standard aauuttooccoonnff environment variables are + In addition, the following standard autoconf environment variables are also set: - pprreeffiixx + prefix Subroot for architecture-independent files. Configured via the ``--prefix'' build option. - eexxeecc__pprreeffiixx + exec_prefix Subroot for architecture-dependent files. Configured via the ``--exec-prefix'' build option. - bbiinnddiirr + bindir Default location for ``program directory''. Configured via the --bindir build option. - lliibbddiirr + libdir Directory for BrlAPI's static archive and dynamically loadable object. Default anchor for ``library directory''. Configured via the ``--libdir'' build option. - ssyyssccoonnffddiirr + sysconfdir Directory for configuration files. Default anchor for ``data directory''. Configured via the ``--sysconfdir'' build option. - mmaannddiirr + mandir Default location for ``manual pages directory''. Configured via the --mandir build option. - iinncclluuddeeddiirr + includedir Default anchor for ``header files directory''. Configured via the --includedir build option. - 33..88..22.. bbrrllttttyy--iinnssttaallll + 3.8.2. brltty-install This utility copies BRLTTY's ``installed file hierarchy'' from one location to another. - brltty-install _t_o [_f_r_o_m] + brltty-install to [from] - _t_o The location to which the ``installed file hierarchy'' is to be + to The location to which the ``installed file hierarchy'' is to be copied. It must be an existing directory. - _f_r_o_m + from The location from which the ``installed file hierarchy'' is to be taken. If it's specified, then it must be an existing directory. If it's not specified, then the location used for @@ -1722,44 +1725,44 @@ systems with different versions of the shared C library. This is worth investigating if you have difficulties. - 33..88..33.. bbrrlltteesstt + 3.8.3. brltest This utility tests a braille display driver, and also provides an interactive way to learn what the keys on the braille display do. It should be run as root. - brltest -_o_p_t_i_o_n ... [_d_r_i_v_e_r [_n_a_m_e=_v_a_l_u_e ...]] + brltest -option ... [driver [name=value ...]] - _d_r_i_v_e_r + driver The driver for the braille display. It must be a two-letter ``driver identification code''. If it's not specified, then the first driver configured via the ``--with-braille-driver'' build option is assumed. - _n_a_m_e=_v_a_l_u_e + name=value Set a braille display driver parameter. For a description of the parameters accepted by a specific driver, please see the documentation for that driver. - -d_d_e_v_i_c_e --device=_d_e_v_i_c_e + -ddevice --device=device The absolute path for the device to which the braille display is connected. If it's not specified, then the device configured via the ``--with-braille-device'' build option is assumed. - -D_d_i_r_e_c_t_o_r_y --data-directory=_d_i_r_e_c_t_o_r_y + -Ddirectory --data-directory=directory The absolute path for the directory wherein the driver data files reside. If it's not specified, then the directory configured via the ``--with-data-directory'' build option is assumed. - -L_d_i_r_e_c_t_o_r_y --library-directory=_d_i_r_e_c_t_o_r_y + -Ldirectory --library-directory=directory The absolute path for the directory wherein the drivers reside. If it's not specified, then the directory configured via the ``--libdir'' build option is assumed. - -W_d_i_r_e_c_t_o_r_y --writable-directory=_d_i_r_e_c_t_o_r_y + -Wdirectory --writable-directory=directory The absolute path for a directory which can be written to. If it's not specified, then the directory configured via the ``--with-writable-directory'' build option is assumed. @@ -1771,37 +1774,37 @@ timeout (after which this utility exits) is 10 seconds. The message hold time (used for non-final segments of long messages) is 4 seconds. - 33..88..44.. ssppkktteesstt + 3.8.4. spktest This utility tests a speech synthesizer driver. It may need to be run as root. - spktest -_o_p_t_i_o_n ... [_d_r_i_v_e_r [_n_a_m_e=_v_a_l_u_e ...]] + spktest -option ... [driver [name=value ...]] - _d_r_i_v_e_r + driver The driver for the speech synthesizer. It must be a two-letter ``driver identification code''. If it's not specified, then the first driver configured via the ``--with-speech-driver'' build option is assumed. - _n_a_m_e=_v_a_l_u_e + name=value Set a speech synthesizer driver parameter. For a description of the parameters accepted by a specific driver, please see the documentation for that driver. - -t_s_t_r_i_n_g --text-string=_s_t_r_i_n_g + -tstring --text-string=string The text to be spoken. If it's not specified, then standard input is read. - -D_d_i_r_e_c_t_o_r_y --data-directory=_d_i_r_e_c_t_o_r_y + -Ddirectory --data-directory=directory The absolute path for the directory wherein the driver data files reside. If it's not specified, then the directory configured via the ``--with-data-directory'' build option is assumed. - -L_d_i_r_e_c_t_o_r_y --library-directory=_d_i_r_e_c_t_o_r_y + -Ldirectory --library-directory=directory The absolute path for the directory wherein the drivers reside. If it's not specified, then the directory configured via the ``--libdir'' build option is assumed. @@ -1809,38 +1812,38 @@ -h --help Display a summary of the command line options, and then exit. - 33..88..55.. ssccrrtteesstt + 3.8.5. scrtest This utility tests the screen driver. It must be run as root. - scrtest -_o_p_t_i_o_n ... [_n_a_m_e=_v_a_l_u_e ...] + scrtest -option ... [name=value ...] - _n_a_m_e=_v_a_l_u_e + name=value Set a screen driver parameter. For a description of the parameters accepted by a specific driver, please see the documentation for that driver. - -l_c_o_l_u_m_n --left=_c_o_l_u_m_n + -lcolumn --left=column Specify the starting (left) column (zero-origin) of the region. If this value isn't supplied, then a default value, based on the specified width, is selected such that the region is horizontally centred. - -c_c_o_u_n_t --columns=_c_o_u_n_t + -ccount --columns=count Specify the width of the region (in columns). If this value isn't supplied, then a default value, based on the specified starting column, is selected such that the region is horizontally centred. - -t_r_o_w --top=_r_o_w + -trow --top=row Specify the starting (top) row (zero-origin) of the region. If this value isn't supplied, then a default value, based on the specified height, is selected such that the region is vertically centred. - -r_c_o_u_n_t --rows=_c_o_u_n_t + -rcount --rows=count Specify the height of the region (in rows). If this value isn't supplied, then a default value, based on the specified starting row, is selected such that the region is vertically centred. @@ -1860,52 +1863,52 @@ 1. A line detailing the dimensions of the screen. - Screen: _w_i_d_t_hx_h_e_i_g_h_t + Screen: widthxheight 2. A line detailing the position (zero-origin) of the cursor. - Cursor: [_c_o_l_u_m_n,_r_o_w] + Cursor: [column,row] 3. A line detailing the size of the selected screen region, and the position (zero-origin) of its top-left corner. - Region: _w_i_d_t_hx_h_e_i_g_h_t@[_c_o_l_u_m_n,_r_o_w] + Region: widthxheight@[column,row] 4. The contents of the selected screen region. Unprintable characters are written as blanks. - 33..88..66.. ttttbbtteesstt + 3.8.6. ttbtest This utility tests a text table (see section ``Text Tables''). - ttbtest -_o_p_t_i_o_n ... _i_n_p_u_t_-_t_a_b_l_e _o_u_t_p_u_t_-_t_a_b_l_e + ttbtest -option ... input-table output-table - _i_n_p_u_t_-_t_a_b_l_e + input-table The file system path to the input text table. If it's relative then it's anchored at the directory configured via the ``--with- data-directory'' build option. - _o_u_t_p_u_t_-_t_a_b_l_e + output-table The file system path to the output text table. If it's relative then it's anchored at the current working directory. If this parameter isn't supplied then no output table is written. - -i_f_o_r_m_a_t --input-format=_f_o_r_m_a_t + -iformat --input-format=format Specify the format of the input table. If this option isn't supplied then the format of the input table is deduced from the extension of the input table's file name. - -o_f_o_r_m_a_t --output-format=_f_o_r_m_a_t + -oformat --output-format=format Specify the format of the output table. If this option isn't supplied then the format of the output table is deduced from the extension of the output table's file name. - -c_c_h_a_r_s_e_t --charset=_c_h_a_r_s_e_t + -ccharset --charset=charset Specify the name of the 8-bit character set to use when interpreting the tables. If this option isn't supplied then the host's character set is used. @@ -1924,41 +1927,41 @@ The following table formats are supported: - ttttbb + ttb BRLTTY - ssbbll + sbl SuSE Blinux - aa22bb + a2b Gnopernicus - ggnnbb + gnb Gnome Braille - 33..88..77.. ccttbbtteesstt + 3.8.7. ctbtest This utility tests a contraction table (see section ``Contraction Tables''). The text read from the input files (or standard input) is rewritten to standard output as contracted braille. - ctbtest -_o_p_t_i_o_n ... _i_n_p_u_t_-_f_i_l_e ... + ctbtest -option ... input-file ... - _i_n_p_u_t_-_f_i_l_e + input-file The list of files to be processed. Any number of files may be specified. They're processed from left to right. The special file name - is interpreted to mean standard input. If no files are specified then standard input is processed. - -c_f_i_l_e --contraction-table=_f_i_l_e + -cfile --contraction-table=file The file system path to the contraction table. If it's relative then it's anchored at the directory configured via the ``--with- data-directory'' build option. The .ctb extension is optional. If this option isn't supplied then en-us-g2 is assumed. - -t_f_i_l_e|auto --text-table=_f_i_l_e|auto + -tfile|auto --text-table=file|auto Specify the text table (see section ``Text Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' and the ``--with- @@ -1967,7 +1970,7 @@ file directive for the default run-time setting. This setting can be changed with the ``Text Table'' preference. - -w_c_o_l_u_m_n_s --output-width=_c_o_l_u_m_n_s + -wcolumns --output-width=columns The maximum length of an output line. Each contracted input line is wrapped into as many output lines as necessary. If this option isn't specified then there's no limit, and there's a one- @@ -1992,16 +1995,16 @@ distributed braille documents. This table effectively allows this utility to be used as a text to braille translator. - 33..88..88.. ttuunneetteesstt + 3.8.8. tunetest This utility tests the alert tunes facility, and also provides an easy way to compose new tunes. It may need to be run as root. - tunetest -_o_p_t_i_o_n ... {_n_o_t_e _d_u_r_a_t_i_o_n} ... + tunetest -option ... {note duration} ... - _n_o_t_e + note A standard MIDI note number. It must be an integer from 1 through 127, with 60 representing Middle C. Each value represents a standard chromatic semi-tone, with the next lower @@ -2010,45 +2013,45 @@ below Middle C, and the highest value (127) represents the sixth G above Middle C. - _d_u_r_a_t_i_o_n + duration The duration of the note in milliseconds. It must be an integer from 1 through 255. - -d_d_e_v_i_c_e --device=_d_e_v_i_c_e + -ddevice --device=device The device on which to play the tune. - bbeeeeppeerr + beeper The internal beeper (console tone generator). - ppccmm + pcm The digital audio interface on the sound card. - mmiiddii + midi The Musical Instrument Digital Interface on the sound card. - ffmm The FM synthesizer on an AdLib, OPL3, Sound Blaster, or + fm The FM synthesizer on an AdLib, OPL3, Sound Blaster, or equivalent sound card. The device name may be abbreviated. See the ``Tune Device'' preference for details regarding the default device and platform restrictions. - -v_l_o_u_d_n_e_s_s --volume=_l_o_u_d_n_e_s_s + -vloudness --volume=loudness Specify the output volume (loudness) as a percentage of the maximum. The default output volume is 50. - -p_d_e_v_i_c_e --pcm-device=_d_e_v_i_c_e + -pdevice --pcm-device=device Specify the device to use for digital audio (see section ``PCM Device Specification''). This option isn't available if the ``--disable-pcm-support'' build option was specified. - -m_d_e_v_i_c_e --midi-device=_d_e_v_i_c_e + -mdevice --midi-device=device Specify the device to use for the Musical Instrument Digital Interface (see section ``MIDI Device Specification''). This option isn't available if the ``--disable-midi-support'' build option was specified. - -i_i_n_s_t_r_u_m_e_n_t --instrument=_i_n_s_t_r_u_m_e_n_t + -iinstrument --instrument=instrument The instrument to use if the selected device is midi. For the complete list of instruments, see the ``MIDI Instrument Table''. The default instrument is an acoustic grand piano. The words @@ -2060,7 +2063,7 @@ -h --help Display a summary of the command line options, and then exit. - 44.. UUssiinngg BBRRLLTTTTYY + 4. Using BRLTTY Before starting BRLTTY, you need to set up your braille display. In most cases this is done simply by connecting it to an available serial @@ -2086,19 +2089,19 @@ Any screen activity will be reflected on the braille display. The display will also follow the progress of the cursor on the screen. - This feature is known as ccuurrssoorr ttrraacckkiinngg. + This feature is known as cursor tracking. Just typing on the keyboard and reading the display, however, isn't enough. Try entering a command which will cause an error, and - pressing eenntteerr. The error appears on the screen, but, unless you have + pressing enter. The error appears on the screen, but, unless you have a multi-line display, the chances are that it isn't visible on the braille display. All you see thereon is another shell prompt. What's - needed, then, is some way to move the braille _w_i_n_d_o_w around the + needed, then, is some way to move the braille window around the screen. The keys on the braille display itself can be used to send commands to BRLTTY which, in addition to a lot of other things, can also do exactly that. - 44..11.. CCoommmmaannddss + 4.1. Commands Unfortunately, the various braille displays don't offer a standard set of controls. Some have the six standard dot keys, some have eight, @@ -2117,46 +2120,46 @@ ``HELP'' command. Use the regular motion keys (as described below) to navigate the help page, and press the help key again to quit. - 44..11..11.. VVeerrttiiccaall MMoottiioonn + 4.1.1. Vertical Motion See also the ``PRINDENT/NXINDENT'', and the ``PRDIFCHAR/NXDIFCHAR'' routing key commands. - LLNNUUPP//LLNNDDNN + LNUP/LNDN Go up/down one line. If identical line skipping has been activated (see the ``SKPIDLNS'' command), then these commands, rather than moving exactly one line, are aliases for the ``PRDIFLN/NXDIFLN'' commands. - WWIINNUUPP//WWIINNDDNN + WINUP/WINDN Go up/down one window. If the window is only 1 line high then move 5 lines. - PPRRDDIIFFLLNN//NNXXDDIIFFLLNN + PRDIFLN/NXDIFLN Go up/down to the nearest line with different content. If identical line skipping has been activated (see the ``SKPIDLNS'' command), then these commands, rather than skipping identical lines, are aliases for the ``LNUP/LNDN'' commands. - AATTTTRRUUPP//AATTTTRRDDNN + ATTRUP/ATTRDN Go up/down to the nearest line with different attributes (character highlighting). - TTOOPP//BBOOTT + TOP/BOT Go to the top/bottom line. - TTOOPP__LLEEFFTT//BBOOTT__LLEEFFTT + TOP_LEFT/BOT_LEFT Go to the top-left/bottom-left corner. - PPRRPPGGRRPPHH//NNXXPPGGRRPPHH + PRPGRPH/NXPGRPH Go to the nearest line of the previous/next paragraph (the first non-blank line beyond the nearest blank line). The current line is included when searching for the inter-paragraph space. - PPRRPPRROOMMPPTT//NNXXPPRROOMMPPTT + PRPROMPT/NXPROMPT Go to the previous/next command prompt. - PPRRSSEEAARRCCHH//NNXXSSEEAARRCCHH + PRSEARCH/NXSEARCH Search backward/forward for the nearest occurrence of the character string within the cut buffer (see ``Cut and Paste'') which isn't within the braille window. The search proceeds to @@ -2164,43 +2167,43 @@ left/right of the window, and wrapping at the edge of the screen. The search isn't case sensitive. - 44..11..22.. HHoorriizzoonnttaall MMoottiioonn + 4.1.2. Horizontal Motion See also the ``SETLEFT'' routing key command. - CCHHRRLLTT//CCHHRRRRTT + CHRLT/CHRRT Go left/right one character. - HHWWIINNLLTT//HHWWIINNRRTT + HWINLT/HWINRT Go left/right half a window. - FFWWIINNLLTT//FFWWIINNRRTT + FWINLT/FWINRT Go left/right one window. These commands are particularly useful because they automatically wrap when they reach the edge of the screen. Other features, like their ability to skip blank windows (see the ``SKPBLNKWINS'' command), further enhance their usefulness. - FFWWIINNLLTTSSKKIIPP//FFWWIINNRRTTSSKKIIPP + FWINLTSKIP/FWINRTSKIP Go left/right to the nearest non-blank window. - LLNNBBEEGG//LLNNEENNDD + LNBEG/LNEND Go to the beginning/end of the line. - 44..11..33.. IImmpplliicciitt MMoottiioonn + 4.1.3. Implicit Motion See also the ``GOTOMARK'' routing key command. - HHOOMMEE + HOME Go to where the cursor is. - BBAACCKK + BACK Go back to where the most recent motion command put the braille window. This is an easy way to get right back to where you were reading after an unexpected event (like cursor tracking) moves the braille window at an inopportune moment. - RREETTUURRNN + RETURN If the most recent motion of the braille window was automatic, e.g. as a result of cursor tracking, then go back @@ -2210,16 +2213,16 @@ If the cursor isn't within the braille window then go to where the cursor is (see the ``HOME'' command). - 44..11..44.. FFeeaattuurree AAccttiivvaattiioonn + 4.1.4. Feature Activation - Each of these commands has three forms: aaccttiivvaattee (turn the feature - on), ddeeaaccttiivvaattee (turn the feature off), and ttooggggllee (if it's off then + Each of these commands has three forms: activate (turn the feature + on), deactivate (turn the feature off), and toggle (if it's off then turn it on, and if it's on then turn it off). Unless specifically - noted, each of these features is initially ooffff, and, when oonn, affects + noted, each of these features is initially off, and, when on, affects BRLTTY's operation as a whole. The initial setting of some of these features can be changed via the ``preferences menu''. - FFRREEEEZZEE + FREEZE Freeze the screen image. BRLTTY makes a copy of the screen (content and attributes) as of the moment when the screen image is frozen, and then ignores all updating of the screen until @@ -2227,7 +2230,7 @@ sample the output of an application which writes too much too quickly. - DDIISSPPMMDD + DISPMD Show the highlighting (the attributes) of each character within the braille window, rather than the characters themselves (the content). This feature is useful, for example, when you need to @@ -2240,7 +2243,7 @@ ``--with-attributes-table'' build option). This feature only affects the current virtual terminal. - SSIIXXDDOOTTSS + SIXDOTS Show characters using 6-dot, rather than 8-dot, braille. Dots 7 and 8 are still used by other features like cursor representation and highlighted character underlining. If a @@ -2249,17 +2252,17 @@ directive), then it is used. This setting can also be changed with the ``Text Style'' preference. - SSLLIIDDEEWWIINN - If cursor tracking (see the ``CSRTRK'' command) is oonn, then, + SLIDEWIN + If cursor tracking (see the ``CSRTRK'' command) is on, then, whenever the cursor moves too close to (or beyond) either end of the braille window, horizontally reposition the window such that the cursor, while remaining on that side, is nearer the centre. - If this feature is ooffff, then the braille window is always + If this feature is off, then the braille window is always positioned such that its left end is a multiple of its width from the left edge of the screen. This setting can also be changed with the ``Sliding Window'' preference. - SSKKPPIIDDLLNNSS + SKPIDLNS Rather than explicitly moving exactly one line either up or down, skip past lines which have the same content as the current line. This feature affects the ``LNUP/LNDN'' commands, as well @@ -2267,24 +2270,24 @@ ``FWINLTSKIP/FWINRTSKIP'' commands. This setting can also be changed with the ``Skip Identical Lines'' preference. - SSKKPPBBLLNNKKWWIINNSS + SKPBLNKWINS Skip past blank windows when reading either forward or backward. This feature affects the ``FWINLT/FWINRT'' commands. This setting can also be changed with the ``Skip Blank Windows'' preference. - CCSSRRVVIISS + CSRVIS Show the cursor by superimposing a dot pattern (see the ``CSRSIZE'' command) on top of the character where it is. This - feature is initially oonn. This setting can also be changed with + feature is initially on. This setting can also be changed with the ``Show Cursor'' preference. - CCSSRRHHIIDDEE + CSRHIDE Hide the cursor (see the ``CSRVIS'' command) in order to accurately read the character beneath it. This feature only affects the current virtual terminal. - CCSSRRTTRRKK + CSRTRK Track (follow) the cursor. If the cursor moves to a location which isn't within the braille window, then automatically move the braille window to the cursor's new location. You'll usually @@ -2295,63 +2298,63 @@ use the ``BACK'' command to get back to where you were reading. You may need to turn this feature off when using an application which continually updates the screen while maintaining a fixed - data layout. This feature is initially oonn. This feature only + data layout. This feature is initially on. This feature only affects the current virtual terminal. - CCSSRRSSIIZZEE + CSRSIZE Represent the cursor with all eight dots (a solid block), rather than with just dots 7 and 8 (an underline). This setting can also be changed with the ``Cursor Style'' preference. - CCSSRRBBLLIINNKK + CSRBLINK Blink (turn on and off according to a predefined interval) the symbol representing the cursor (see the ``CSRVIS'' command). This setting can also be changed with the ``Blinking Cursor'' preference. - AATTTTRRVVIISS + ATTRVIS Underline (with combinations of dots 7 and 8) highlighted characters. - nnoo uunnddeerrlliinnee + no underline White on black (normal), gray on black, white on blue, black on cyan. - ddoottss 77 aanndd 88 + dots 7 and 8 Black on white (reverse video). - ddoott 88 + dot 8 Everything else. This setting can also be changed with the ``Show Attributes'' preference. - AATTTTRRBBLLIINNKK + ATTRBLINK Blink (turn on and off according to a predefined interval) the attribute underline (see the ``ATTRVIS'' command). This feature - is initially oonn. This setting can also be changed with the + is initially on. This setting can also be changed with the ``Blinking Attributes'' preference. - CCAAPPBBLLIINNKK + CAPBLINK Blink (turn on and off according to a predefined interval) capital (uppercase) letters. This setting can also be changed with the ``Blinking Capitals'' preference. - TTUUNNEESS + TUNES Play a short predefined tune (see ``Alert Tunes'') whenever a - significant event occurs. This feature is initially oonn. This + significant event occurs. This feature is initially on. This setting can also be changed with the ``Alert Tunes'' preference. - AAUUTTOORREEPPEEAATT + AUTOREPEAT Automatically repeat a command at a regular interval after an initial delay while its key (combination) remains pressed. Only some drivers support this functionality, the primary limitation being that many braille displays don't signal key presses and key releases as distinctly separate events. This feature is - initially oonn. This setting can also be changed with the + initially on. This setting can also be changed with the ``Autorepeat'' preference. - AAUUTTOOSSPPEEAAKK + AUTOSPEAK Automatically speak: the new line when the braille window is moved vertically. @@ -2360,13 +2363,13 @@ the character to which the cursor is moved. - This feature is initially ooffff. This setting can also be changed + This feature is initially off. This setting can also be changed with the ``Autospeak'' preference. - 44..11..55.. MMooddee SSeelleeccttiioonn + 4.1.5. Mode Selection - HHEELLPP + HELP Switch to the braille display driver's help page. This is where you can find an on-line summary of things like what your braille display's keys do, and how to interpret its status cells. Use @@ -2374,96 +2377,96 @@ navigate the help page. Invoke the help command again to return to the screen. - IINNFFOO + INFO Switch to the status display (see section ``The Status Display'' for full details). It presents a summary including the position of the cursor, the position of the braille window, and the states of a number of BRLTTY's features. Invoke this command again to return to the screen. - LLEEAARRNN + LEARN Switch to command learn mode (see section ``Command Learn Mode'' for full details). This is how you can interactively learn what your braille display's keys do. Invoke this command again to return to the screen. This command isn't available if the ``--disable-learn-mode'' build option was specified. - 44..11..66.. PPrreeffeerreennccee MMaaiinntteennaannccee + 4.1.6. Preference Maintenance - PPRREEFFMMEENNUU + PREFMENU Switch to the preferences menu (see ``The Preferences Menu'' for full details). Invoke this command again to return to normal operation. - PPRREEFFSSAAVVEE + PREFSAVE Save the current preferences settings (see ``Preferences'' for full details). - PPRREEFFLLOOAADD + PREFLOAD Restore the most recently saved preferences settings (see ``Preferences'' for full details). - 44..11..77.. MMeennuu NNaavviiggaattiioonn + 4.1.7. Menu Navigation - MMEENNUU__FFIIRRSSTT__IITTEEMM//MMEENNUU__LLAASSTT__IITTEEMM + MENU_FIRST_ITEM/MENU_LAST_ITEM Go to the first/last item in the menu. - MMEENNUU__PPRREEVV__IITTEEMMMMEENNUU__NNEEXXTT__IITTEEMM// + MENU_PREV_ITEMMENU_NEXT_ITEM/ Go to the previous/next item in the menu. - MMEENNUU__PPRREEVV__SSEETTTTIINNGG//MMEENNUU__NNEEXXTT__SSEETTTTIINNGG + MENU_PREV_SETTING/MENU_NEXT_SETTING Decrement/increment the current menu item's setting. - 44..11..88.. SSppeeeecchh CCoonnttrroollss + 4.1.8. Speech Controls - SSAAYY__LLIINNEE + SAY_LINE Speak the current line. The ``Say-Line Mode'' preference determines if pending speech is discarded first. - SSAAYY__AABBOOVVEE + SAY_ABOVE Speak the top portion of the screen (ending with the current line). - SSAAYY__BBEELLOOWW + SAY_BELOW Speak the bottom portion of the screen (starting with the current line). - MMUUTTEE + MUTE Stop speaking immediately. - SSPPKKHHOOMMEE + SPKHOME Go to where the speech cursor is. - SSAAYY__SSLLOOWWEERR//SSAAYY__FFAASSTTEERR + SAY_SLOWER/SAY_FASTER Decrease/increase the speech rate (see also the ``Speech Rate'' preference). This command is only available if a driver which supports it is being used. - SSAAYY__SSOOFFTTEERR//SSAAYY__LLOOUUDDEERR + SAY_SOFTER/SAY_LOUDER Decrease/increase the speech volume (see also the ``Speech Volume'' preference). This command is only available if a driver which supports it is being used. - 44..11..99.. SSppeeeecchh NNaavviiggaattiioonn + 4.1.9. Speech Navigation - SSPPEEAAKK__CCUURRRR__CCHHAARR + SPEAK_CURR_CHAR a - 44..11..1100.. VViirrttuuaall TTeerrmmiinnaall SSwwiittcchhiinngg + 4.1.10. Virtual Terminal Switching See also the ``SWITCHVT'' routing key command. - SSWWIITTCCHHVVTT__PPRREEVV//SSWWIITTCCHHVVTT__NNEEXXTT + SWITCHVT_PREV/SWITCHVT_NEXT Switch to the previous/next virtual terminal. - 44..11..1111.. OOtthheerr CCoommmmaannddss + 4.1.11. Other Commands - CCSSRRJJMMPP__VVEERRTT + CSRJMP_VERT Route (bring) the cursor to anywhere on the top line of the braille window (see ``Cursor Routing'' for full details). The cursor is moved by simulating vertical arrow-key presses. This @@ -2473,20 +2476,20 @@ other cursor routing commands, though, because it makes no attempt to simulate the left- and right-arrows. - PPAASSTTEE + PASTE Insert the characters within the cut buffer at the current cursor location (see ``Cut and Paste'' for full details). - RREESSTTAARRTTBBRRLL + RESTARTBRL Stop, and then restart the braille display driver. - RREESSTTAARRTTSSPPEEEECCHH + RESTARTSPEECH Stop, and then restart the speech synthesizer driver. - 44..11..1122.. CChhaarraacctteerr CCoommmmaannddss + 4.1.12. Character Commands - RROOUUTTEE + ROUTE Route (bring) the cursor to the character associated with the routing key (see ``Cursor Routing'' for full details). The cursor is moved by simulating arrow-key presses. This command @@ -2494,39 +2497,39 @@ cursor somewhat unpredictably or use the arrow keys for purposes other than cursor motion. - CCUUTTBBEEGGIINN + CUTBEGIN Anchor the start of the cut block at the character associated with the routing key (see ``Cut and Paste'' for full details). This command clears the cut buffer. - CCUUTTAAPPPPEENNDD + CUTAPPEND Anchor the start of the cut block at the character associated with the routing key (see ``Cut and Paste'' for full details). This command doesn't clear the cut buffer. - CCUUTTRREECCTT + CUTRECT Anchor the end of the cut block at the character associated with the routing key, and append the rectangular region to the cut buffer (see ``Cut and Paste'' for full details). - CCUUTTLLIINNEE + CUTLINE Anchor the end of the cut block at the character associated with the routing key, and append the linear region to the cut buffer (see ``Cut and Paste'' for full details). - CCOOPPYYCCHHAARRSS + COPYCHARS Copy the character block anchored by the two routing keys to the cut buffer (see ``Cut and Paste'' for full details). - AAPPNNDDCCHHAARRSS + APNDCHARS Append the character block anchored by the two routing keys to the cut buffer (see ``Cut and Paste'' for full details). - PPRRIINNDDEENNTT//NNXXIINNDDEENNTT + PRINDENT/NXINDENT Go up/down to the nearest line which isn't indented more than the column associated with the routing key. - DDEESSCCCCHHAARR + DESCCHAR Momentarily (see the ``-M'' command line option) display a message describing the character associated with the routing key. It reveals the decimal and hexadecimal values of the @@ -2537,7 +2540,7 @@ char 65 (0x41): white on black bright blink - SSEETTLLEEFFTT + SETLEFT Horizontally reposition the braille window so that its left edge is at the column associated with the routing key. This feature makes it very easy to put the window exactly where it's needed, @@ -2545,53 +2548,53 @@ eliminates the need for a lot of elementary window motion (like the ``CHRLT/CHRRT'' and ``HWINLT/HWINRT'' commands). - PPRRDDIIFFCCHHAARR//NNXXDDIIFFCCHHAARR + PRDIFCHAR/NXDIFCHAR Go up/down to the nearest line which has a different character in the column associated with the routing key. - 44..11..1133.. BBaassee CCoommmmaannddss + 4.1.13. Base Commands - SSWWIITTCCHHVVTT + SWITCHVT Switch to the virtual terminal whose number (counting from 1) matches that of the routing key. See also the ``SWITCHVT_PREV/SWITCHVT_NEXT'' virtual terminal switching commands. - SSEETTMMAARRKK + SETMARK Mark (remember) the current position of the braille window in a register associated with the routing key. See the ``GOTOMARK'' command. This feature only affects the current virtual terminal. - GGOOTTOOMMAARRKK + GOTOMARK Move the braille window to the position formerly marked (see the ``SETMARK'' command) with the same routing key. This feature only affects the current virtual terminal. - 44..22.. TThhee CCoonnffiigguurraattiioonn FFiillee + 4.2. The Configuration File System defaults for many settings may be established within a configuration file. The default name for this file is /etc/brltty.conf, although it may be overridden with the ``-f'' command line option. It doesn't need to exist. A template for it can - be found within the DOCS subdirectory. + be found within the Documents subdirectory. Blank lines are ignored. A comment begin with a number sign (#), and continues to the end of the line. The following directives are recognized: - api-parameters _n_a_m_e=_v_a_l_u_e,... + api-parameters name=value,... Specify parameters for the Application Programming Interface. If the same parameter is specified more than once, then its rightmost assignment is used. For a description of the - parameters accepted by the interface, please see the BBrrllAAPPII + parameters accepted by the interface, please see the BrlAPI reference manual. See the ``--with-api-parameters'' build option for the defaults established during the build procedure. This directive can be overridden with the ``-A'' command line option. - attributes-table _f_i_l_e + attributes-table file Specify the attributes table (see section ``Attributes Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' and @@ -2601,20 +2604,20 @@ option). This directive can be overridden with the ``-a'' command line option. - braille-device _d_e_v_i_c_e,... + braille-device device,... Specify the device to which the braille display is connected (see section ``Braille Device Specification''). See the ``--with-braille-device'' build option for the default established during the build procedure. This directive can be overridden with the ``-d'' command line option. - braille-driver _d_r_i_v_e_r,...|auto + braille-driver driver,...|auto Specify the braille display driver (see section ``Driver Specification''). The default is to perform autodetection. This directive can be overridden with the ``-b'' command line option. - braille-parameters [_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + braille-parameters [driver:]name=value,... Specify parameters for the braille display drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a parameter name is qualified by a @@ -2626,7 +2629,7 @@ defaults established during the build procedure. This directive can be overridden with the ``-B'' command line option. - contraction-table _f_i_l_e + contraction-table file Specify the contraction table (see section ``Contraction Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' @@ -2639,7 +2642,7 @@ available if the ``--disable-contracted-braille'' build option was specified. - keyboard-table _f_i_l_e|auto + keyboard-table file|auto Specify the keyboard table (see section ``Key Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' and the ``--with- @@ -2648,7 +2651,7 @@ table. This directive can be overridden with the ``-k'' command line option. - keyboard-properties _n_a_m_e=_v_a_l_u_e,... + keyboard-properties name=value,... Specify the properties of the keyboard(s) to be monitored. If the same property is specified more than once, then its rightmost assignment is used. See section ``Keyboard @@ -2656,47 +2659,47 @@ specified. The default is to monitor all keyboards. This directive can be overridden with the ``-K'' command line option. - midi-device _d_e_v_i_c_e + midi-device device Specify the device to use for the Musical Instrument Digital Interface (see section ``MIDI Device Specification''). This directive can be overridden with the ``-m'' command line option. It isn't available if the ``--disable-midi-support'' build option was specified. - pcm-device _d_e_v_i_c_e + pcm-device device Specify the device to use for digital audio (see section ``PCM Device Specification''). This directive can be overridden with the ``-p'' command line option. It isn't available if the ``--disable-pcm-support'' build option was specified. - preferences-file _f_i_l_e + preferences-file file Specify the location of the file which is to be used for the saving and loading of user preferences. If a relative path is supplied, then it's anchored at /var/lib/brltty. The default is to use brltty.prefs. This directive can be overridden with the ``-F'' command line option. - release-device _b_o_o_l_e_a_n + release-device boolean Whether or not to release the device to which the braille display is connected when the current screen or window can't be read. - oonn Release the device. + on Release the device. - ooffff + off Don't release the device. The default setting is on on Windows platforms and off on all other platforms. This directive can be overridden with the ``-r'' command line option. - screen-driver _d_r_i_v_e_r + screen-driver driver Specify the screen driver (see section ``Supported Screen Drivers''). See the ``--with-screen-driver'' build option for the default established during the build procedure. This directive can be overridden with the ``-x'' command line option. - screen-parameters [_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + screen-parameters [driver:]name=value,... Specify parameters for the screen drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a parameter name is qualified by a @@ -2708,14 +2711,14 @@ defaults established during the build procedure. This directive can be overridden with the ``-X'' command line option. - speech-driver _d_r_i_v_e_r,...|auto + speech-driver driver,...|auto Specify the speech synthesizer driver (see section ``Driver Specification''). The default is to perform autodetection. This directive can be overridden with the ``-s'' command line option. It isn't available if the ``--disable-speech-support'' build option was specified. - speech-input _n_a_m_e + speech-input name Specify the name of the file system object (FIFO, named pipe, named socket, etc) which can be used by other applications for text-to-speech conversion via BRLTTY's speech driver. This @@ -2723,7 +2726,7 @@ It isn't available if the ``--disable-speech-support'' build option was specified. - speech-parameters [_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + speech-parameters [driver:]name=value,... Specify parameters for the speech synthesizer drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a parameter name is qualified by a @@ -2735,7 +2738,7 @@ defaults established during the build procedure. This directive can be overridden with the ``-S'' command line option. - text-table _f_i_l_e|auto + text-table file|auto Specify the text table (see section ``Text Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' and the ``--with- @@ -2745,12 +2748,12 @@ ``--with-text-table'' build option). This directive can be overridden with the ``-t'' command line option. - 44..33.. CCoommmmaanndd LLiinnee OOppttiioonnss + 4.3. Command Line Options Many settings can be explicitly specified when invoking BRLTTY. The brltty command accepts the following options: - -a_f_i_l_e --attributes-table=_f_i_l_e + -afile --attributes-table=file Specify the attributes table (see section ``Attributes Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' and @@ -2760,12 +2763,12 @@ This setting can be changed with the ``Attributes Table'' preference. - -b_d_r_i_v_e_r,...|auto --braille-driver=_d_r_i_v_e_r,...|auto + -bdriver,...|auto --braille-driver=driver,...|auto Specify the braille display driver (see section ``Driver Specification''). See the ``braille-driver'' configuration file directive for the default run-time setting. - -c_f_i_l_e --contraction-table=_f_i_l_e + -cfile --contraction-table=file Specify the contraction table (see section ``Contraction Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' @@ -2779,7 +2782,7 @@ if the ``--disable-contracted-braille'' build option was specified. - -d_d_e_v_i_c_e,... --braille-device=_d_e_v_i_c_e,... + -ddevice,... --braille-device=device,... Specify the device to which the braille display is connected (see section ``Braille Device Specification''). See the ``braille-device'' configuration file directive for the default @@ -2789,7 +2792,7 @@ Write diagnostic messages to standard error. The default is to record them via syslog. - -f_f_i_l_e --configuration-file=_f_i_l_e + -ffile --configuration-file=file Specify the location of the ``configuration file'' which is to be used for the establishing of default run-time settings. @@ -2797,7 +2800,7 @@ Display a summary of the command line options accepted by BRLTTY, and then exit. - -i_n_a_m_e --speech-input=_n_a_m_e + -iname --speech-input=name Specify the name of the file system object (FIFO, named pipe, named socket, etc) which can be used by other applications for text-to-speech conversion via BRLTTY's speech driver. If not @@ -2806,7 +2809,7 @@ run-time setting. This option isn't available if the ``--disable-speech-support'' build option was specified. - -k_f_i_l_e --keyboard-table=_f_i_l_e + -kfile --keyboard-table=file Specify the keyboard table (see section ``Key Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' and the ``--with- @@ -2816,31 +2819,31 @@ This setting can be changed with the ``Keyboard Table'' preference. - -l_l_e_v_e_l --log-level=_l_e_v_e_l + -llevel --log-level=level Specify the severity threshold for diagnostic message generation. The following levels are recognized. - 00 emergency + 0 emergency - 11 alert + 1 alert - 22 critical + 2 critical - 33 error + 3 error - 44 warning + 4 warning - 55 notice + 5 notice - 66 information + 6 information - 77 debug + 7 debug Either the number or the name may be supplied, and the name may be abbreviated. If not specified, then information is assumed (see the ``-q'' option for more details). - -m_d_e_v_i_c_e --midi-device=_d_e_v_i_c_e + -mdevice --midi-device=device Specify the device to use for the Musical Instrument Digital Interface (see section ``MIDI Device Specification''). See the ``midi-device'' configuration file directive for the default @@ -2853,7 +2856,7 @@ after initializing itself but before starting any of the selected drivers. - -p_d_e_v_i_c_e --pcm-device=_d_e_v_i_c_e + -pdevice --pcm-device=device Specify the device to use for digital audio (see section ``PCM Device Specification''). See the ``pcm-device'' configuration file directive for the default run-time setting. This option @@ -2871,14 +2874,14 @@ ``release-device'' configuration file directive for the default run-time setting. - -s_d_r_i_v_e_r,...|auto --speech-driver=_d_r_i_v_e_r,...|auto + -sdriver,...|auto --speech-driver=driver,...|auto Specify the speech synthesizer driver (see section ``Driver Specification''). See the ``speech-driver'' configuration file directive for the default run-time setting. This option isn't available if the ``--disable-speech-support'' build option was specified. - -t_f_i_l_e --text-table=_f_i_l_e + -tfile --text-table=file Specify the text table (see section ``Text Tables'' for details). If a relative path is supplied, then it's anchored at /etc/brltty (see the ``--with-data-directory'' and the ``--with- @@ -2900,21 +2903,21 @@ command line option) has been specified then speech synthesizer autodetection is performed. - -x_d_r_i_v_e_r --screen-driver=_d_r_i_v_e_r + -xdriver --screen-driver=driver Specify the screen driver (see section ``Supported Screen Drivers''). See the ``screen-driver'' configuration file directive for the default run-time setting. - -A_n_a_m_e=_v_a_l_u_e,... --api-parameters=_n_a_m_e=_v_a_l_u_e,... + -Aname=value,... --api-parameters=name=value,... Specify parameters for the Application Programming Interface. If the same parameter is specified more than once, then its rightmost assignment is used. For a description of the - parameters accepted by the interface, please see the BBrrllAAPPII + parameters accepted by the interface, please see the BrlAPI reference manual. See the ``api-parameters'' configuration file directive for the default run-time settings. - -B[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... --braille-parame- - ters=[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + -B[driver:]name=value,... --braille-parame- + ters=[driver:]name=value,... Specify parameters for the braille display drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a parameter name is qualified by a @@ -3013,7 +3016,7 @@ BRLTTY_TEXT_TABLE The text table (see the ``-t'' command line option). - -F_f_i_l_e --preferences-file=_f_i_l_e + -Ffile --preferences-file=file Specify the location of the file which is to be used for the saving and loading of user preferences. If a relative path is supplied, then it's anchored at /var/lib/brltty. See the @@ -3030,7 +3033,7 @@ This option is only supported on the Windows platform. - -K_n_a_m_e=_v_a_l_u_e,... --keyboard-properties=_n_a_m_e=_v_a_l_u_e,... + -Kname=value,... --keyboard-properties=name=value,... Specify the properties of the keyboard(s) to be monitored. If the same property is specified more than once, then its rightmost assignment is used. See section ``Keyboard @@ -3038,7 +3041,7 @@ specified. See the ``keyboard-properties'' configuration file directive for the default run-time settings. - -M_c_s_e_c_s --message-timeout=_c_s_e_c_s + -Mcsecs --message-timeout=csecs Specify the amount of time (in hundredths of a second) that BRLTTY keeps its own internally generated messages on the braille display. If not specified, then 400 (4 seconds) is @@ -3047,7 +3050,7 @@ -N --no-api Disable the application programming interface. - -P_f_i_l_e --pid-file=_f_i_l_e + -Pfile --pid-file=file Specify the file wherein BRLTTY is to write its process identifier (pid). If not specified, BRLTTY doesn't write its process identifier anywhere. @@ -3062,8 +3065,8 @@ This option is only supported on the Windows platform. - -S[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... --speech-parame- - ters=[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + -S[driver:]name=value,... --speech-parame- + ters=[driver:]name=value,... Specify parameters for the speech synthesizer drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a parameter name is qualified by a @@ -3081,8 +3084,8 @@ If the ``-q'' option isn't specified, then also display copyright information. - -X[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... --screen-parame- - ters=[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + -X[driver:]name=value,... --screen-parame- + ters=[driver:]name=value,... Specify parameters for the screen drivers. If the same parameter is specified more than once, then its rightmost assignment is used. If a parameter name is qualified by a @@ -3093,9 +3096,9 @@ See the ``screen-parameters'' configuration file directive for the default run-time settings. - 55.. FFeeaattuurree DDeessccrriippttiioonnss + 5. Feature Descriptions - 55..11.. CCuurrssoorr RRoouuttiinngg + 5.1. Cursor Routing When moving the braille window around the screen while examining the text, say, in an editor, you often need to bring the cursor to a @@ -3156,7 +3159,7 @@ with applications (like lynx) wherein horizontal cursor motion must never be attempted. - 55..22.. CCuutt aanndd PPaassttee + 5.2. Cut and Paste This feature enables you to grab some text which is already on the screen and re-enter it at the current cursor position. Using it saves @@ -3208,7 +3211,7 @@ The cut buffer is also used by the ``PRSEARCH/NXSEARCH'' commands. - 55..33.. PPooiinntteerr ((MMoouussee)) SSuuppppoorrtt vviiaa GGPPMM + 5.3. Pointer (Mouse) Support via GPM If BRLTTY is configured with the ``--enable-gpm'' build option on a system where the gpm application has been installed, then it'll @@ -3259,7 +3262,7 @@ Append to the cut buffer by using the right button of a three- button mouse. - 55..44.. AAlleerrtt TTuunneess + 5.4. Alert Tunes BRLTTY alerts you to the occurrence of significant events by playing short predefined tunes. This feature can be activated and deactivated @@ -3270,20 +3273,20 @@ Each significant event is associated, from highest to lowest priority, with one or more of the following: - aa ttuunnee + a tune If a tune has been associated with the event, if the ``Alert Tunes'' preference (see also the ``TUNES'' command) is active, and if the selected tune device (see the ``Tune Device'' preference) can be opened, then the tune is played. - aa ddoott ppaatttteerrnn + a dot pattern If a dot pattern has been associated with the event, and if the ``Alert Dots'' preference is active, then the dot pattern is briefly displayed on every braille cell. Some braille displays don't respond quickly enough for this mechanism to work effectively. - aa mmeessssaaggee + a message If a message has been associated with the event, and if the ``Alert Messages'' preference is active, then it is displayed for a few seconds (see the ``-M'' command line option). @@ -3315,7 +3318,7 @@ When cursor routing starts, finishes, or fails. - 55..55.. PPrreeffeerreenncceess SSeettttiinnggss + 5.5. Preferences Settings When BRLTTY starts, it loads a file which contains your preferences settings. The file doesn't need to exist, and is created the first @@ -3323,10 +3326,10 @@ recently saved settings can be restored at any time with the ``PREFLOAD'' command. - The name for this file is /etc/brltty-_d_r_i_v_e_r.prefs. where _d_r_i_v_e_r is + The name for this file is /etc/brltty-driver.prefs. where driver is the two-letter ``driver identification code''. - 55..55..11.. TThhee PPrreeffeerreenncceess MMeennuu + 5.5.1. The Preferences Menu The preferences settings are saved as binary data which, therefore, can't be edited by hand. BRLTTY, however, has a simple menu from @@ -3336,7 +3339,7 @@ display briefly (see the ``-M'' command line option) shows the menu title, and then presents the current item and its current setting. - 55..55..11..11.. NNaavviiggaattiinngg tthhee MMeennuu + 5.5.1.1. Navigating the Menu See ``Menu Navigation Commands'' for the full list of commands which enable you to select items and change settings within the menu. For @@ -3372,27 +3375,27 @@ are written to the preferences settings file. Any command not recognized by the menu system also does these same things. - 55..55..11..22.. TThhee MMeennuu IItteemmss + 5.5.1.2. The Menu Items - SSaavvee oonn EExxiitt + Save on Exit When exiting the preferences menu: - NNoo Don't automatically save the preferences settings. + No Don't automatically save the preferences settings. - YYeess + Yes Automatically save the preferences settings. The initial setting is No. - TTeexxtt SSttyyllee + Text Style When displaying screen content (see the ``DISPMD'' command), show characters: - 88--ddoott + 8-dot With all eight dots. - 66--ddoott + 6-dot With only dots 1 through 6. If a contraction table has been selected (see the ``-c'' command line option and the ``contraction-table'' configuration file directive), then it @@ -3400,85 +3403,85 @@ This setting can also be changed with the ``SIXDOTS'' command. - SSkkiipp IIddeennttiiccaall LLiinneess + Skip Identical Lines When moving either up or down exactly one line with the ``LNUP/LNDN'' commands, as well as the line wrapping feature of the ``FWINLT/FWINRT'' and ``FWINLTSKIP/FWINRTSKIP'' commands: - NNoo Don't skip past lines which have the same content as the + No Don't skip past lines which have the same content as the current line. - YYeess + Yes Skip past lines which have the same content as the current line. This setting can also be changed with the ``SKPIDLNS'' command. - SSkkiipp BBllaannkk WWiinnddoowwss + Skip Blank Windows When moving either left or right with the ``FWINLT/FWINRT'' commands: - NNoo Don't skip past blank windows. + No Don't skip past blank windows. - YYeess + Yes Skip past blank windows. This setting can also be changed with the ``SKPBLNKWINS'' com- mand. - WWhhiicchh BBllaannkk WWiinnddoowwss + Which Blank Windows If blank windows are to be skipped: - AAllll + All Skip all of them. - EEnndd ooff LLiinnee + End of Line Only skip those which are at the end (on the right side) of a line. - RReesstt ooff LLiinnee + Rest of Line Only skip those which are at the end (on the right side) of a line when reading forward, and at the beginning (on the left side) of a line when reading backward. - SSlliiddiinngg WWiinnddooww + Sliding Window If the cursor is being tracked (see the ``CSRTRK'' command), and the cursor moves too close to (or beyond) either end of the braille window: - NNoo Horizontally reposition the window such that its left end is + No Horizontally reposition the window such that its left end is a multiple of its width from the left edge of the screen. - YYeess + Yes Horizontally reposition the window such that the cursor, while remaining on that side of the window, is nearer the centre. This setting can also be changed with the ``SLIDEWIN'' command. - EEaaggeerr SSlliiddiinngg WWiinnddooww + Eager Sliding Window If the braille window is to slide: - NNoo Reposition it whenever the cursor moves beyond either end. + No Reposition it whenever the cursor moves beyond either end. - YYeess + Yes Reposition it whenever the cursor moves too close to either end. The initial setting is No. - WWiinnddooww OOvveerrllaapp + Window Overlap When moving either left or right with the ``FWINLT/FWINRT'' commands, this setting specifies how many characters horizontally adjacent braille windows should overlap each other by. The initial setting is 0. - AAuuttoorreeppeeaatt + Autorepeat While the key (combination) for a command remains pressed: - NNoo Don't automatically repeat the command. + No Don't automatically repeat the command. - YYeess + Yes Automatically repeat the command at a regular interval after an initial delay. @@ -3509,129 +3512,129 @@ setting can also be changed with the ``AUTOREPEAT'' command. The initial setting is Yes. - AAuuttoorreeppeeaatt PPaannnniinngg + Autorepeat Panning When the ``Autorepeat'' preference is enabled: - NNoo Don't autorepeat braille window panning operations. + No Don't autorepeat braille window panning operations. - YYeess + Yes Autorepeat braille window panning operations. This preference affects the ``FWINLT/FWINRT'' commands. The initial setting is No. - AAuuttoorreeppeeaatt DDeellaayy + Autorepeat Delay When a character is to be autorepeated, this setting specifies the amount of time (see the note on ``time settings'' below) which must pass before autorepeating begins. The initial setting is 50. - AAuuttoorreeppeeaatt IInntteerrvvaall + Autorepeat Interval When a character is being autorepeated, this setting specifies the amount of time (see the note on ``time settings'' below) between each reexecution. The initial setting is 10. - SShhooww CCuurrssoorr + Show Cursor When displaying screen content (see the ``DISPMD'' command): - NNoo Don't show the cursor. + No Don't show the cursor. - YYeess + Yes Show the cursor. This setting can also be changed with the ``CSRVIS'' command. The initial setting is Yes. - CCuurrssoorr SSttyyllee + Cursor Style When showing the cursor, represent it: - UUnnddeerrlliinnee + Underline With dots 7 and 8. - BBlloocckk + Block With all eight dots. This setting can also be changed with the ``CSRSIZE'' command. - BBlliinnkkiinngg CCuurrssoorr + Blinking Cursor When the cursor is to be shown: - NNoo Leave it visible all the time. + No Leave it visible all the time. - YYeess + Yes Make it alternately visible and invisible according to a predefined interval. This setting can also be changed with the ``CSRBLINK'' command. - CCuurrssoorr VViissiibbllee TTiimmee + Cursor Visible Time When the cursor is to be blinked, this setting specifies the length of time (see the note on ``time settings'' below) during each cycle that it is to be visible. The initial setting is 40. - CCuurrssoorr IInnvviissiibbllee TTiimmee + Cursor Invisible Time When the cursor is to be blinked, this setting specifies the length of time (see the note on ``time settings'' below) during each cycle that it is to be invisible. The initial setting is 40. - SShhooww AAttttrriibbuutteess + Show Attributes When displaying screen content (see the ``DISPMD'' command): - NNoo Don't underline highlighted characters. + No Don't underline highlighted characters. - YYeess + Yes Underline highlighted characters. This setting can also be changed with the ``ATTRVIS'' command. - BBlliinnkkiinngg AAttttrriibbuutteess + Blinking Attributes When highlighted characters are to be underlined: - NNoo Leave the indicator visible all the time. + No Leave the indicator visible all the time. - YYeess + Yes Make the indicator alternately visible and invisible according to a predefined interval. This setting can also be changed with the ``ATTRBLINK'' command. - AAttttrriibbuutteess VViissiibbllee TTiimmee + Attributes Visible Time When the highlighted character underline is to be blinked, this setting specifies the length of time (see the note on ``time settings'' below) during each cycle that it is to be visible. The initial setting is 20. - AAttttrriibbuutteess IInnvviissiibbllee TTiimmee + Attributes Invisible Time When the highlighted character underline is to be blinked, this setting specifies the length of time (see the note on ``time settings'' below) during each cycle that it is to be invisible. The initial setting is 60. - BBlliinnkkiinngg CCaappiittaallss + Blinking Capitals When displaying screen content (see the ``DISPMD'' command): - NNoo Leave capital letters visible all the time. + No Leave capital letters visible all the time. - YYeess + Yes Make capital letters alternately visible and invisible according to a predefined interval. This setting can also be changed with the ``CAPBLINK'' command. - CCaappiittaallss VViissiibbllee TTiimmee + Capitals Visible Time When capital letters are to be blinked, this setting specifies the length of time (see the note on ``time settings'' below) during each cycle that they're to be visible. The initial setting is 60. - CCaappiittaallss IInnvviissiibbllee TTiimmee + Capitals Invisible Time When capital letters are to be blinked, this setting specifies the length of time (see the note on ``time settings'' below) during each cycle that they're to be invisible. The initial setting is 20. - BBrraaiillllee FFiirrmmnneessss + Braille Firmness Adjust the firmness (or stiffness) of the braille dots. It can be set to: @@ -3648,7 +3651,7 @@ This preference is only available if a driver which supports it is being used. The initial setting is Medium. - BBrraaiillllee SSeennssiittiivviittyy + Braille Sensitivity Adjust the sensitivity of the braille dots to touch. It can be set to: @@ -3665,23 +3668,23 @@ This preference is only available if a driver which supports it is being used. The initial setting is Medium. - WWiinnddooww FFoolllloowwss PPooiinntteerr + Window Follows Pointer When moving the pointer device (mouse): - NNoo Don't drag the braille window. + No Don't drag the braille window. - YYeess + Yes Drag the braille window. This preference is only presented if the ``--enable-gpm'' build option was specified. - HHiigghhlliigghhtt WWiinnddooww + Highlight Window When moving the braille window: - NNoo Don't highlight the new screen area. + No Don't highlight the new screen area. - YYeess + Yes Highlight the new screen area. This feature enables a sighted observer to see where the braille @@ -3695,29 +3698,29 @@ responding to the upper-left corner of the braille window is highlighted. - AAlleerrtt TTuunneess + Alert Tunes Whenever a significant event with an associated tune occurs (see ``Alert Tunes''): - NNoo Don't play the tune. + No Don't play the tune. - YYeess + Yes Play the tune. This setting can also be changed with the ``TUNES'' command. The initial setting is Yes. - TTuunnee DDeevviiccee + Tune Device Play alert tunes via: - BBeeeeppeerr + Beeper The internal beeper (console tone generator). This setting is supported on Linux, on OpenBSD, on FreeBSD, and on NetBSD. It's always safe to use, although it may be somewhat soft. This device isn't available if the ``--disable-beeper- support'' build option was specified. - PPCCMM + PCM The digital audio interface on the sound card. This setting is supported on Linux (via /dev/dsp), on Solaris (via /dev/audio), on OpenBSD (via /dev/audio0), on FreeBSD (via @@ -3726,14 +3729,14 @@ application. This device isn't available if the ``--disable- pcm-support'' build option was specified. - MMIIDDII + MIDI The Musical Instrument Digital Interface on the sound card This setting is supported on Linux (via /dev/sequencer). It doesn't work when this device is already being used by another application. This device isn't available if the ``--disable-midi-support'' build option was specified. - FFMM The FM synthesizer on an AdLib, OPL3, Sound Blaster, or + FM The FM synthesizer on an AdLib, OPL3, Sound Blaster, or equivalent sound card. This setting is supported on Linux. It works even if the FM synthesizer is already being used by another application. The results are unpredictable, and @@ -3745,38 +3748,38 @@ The initial setting is Beeper on those platforms which support it, and PCM on those platforms which don't. - PPCCMM VVoolluummee + PCM Volume If the digital audio interface of the sound card is being used to play the alert tunes, this setting specifies the loudness (as a percentage of the maximum) at which they are to be played. The initial setting is 70. - MMIIDDII VVoolluummee + MIDI Volume If the Musical Instrument Digital Interface (MIDI) of the sound card is being used to play the alert tunes, this setting specifies the loudness (as a percentage of the maximum) at which they are to be played. The initial setting is 70. - MMIIDDII IInnssttrruummeenntt + MIDI Instrument If the Musical Instrument Digital Interface (MIDI) of the sound card is being used to play the alert tunes, this setting specifies which instrument is to be used (see the ``MIDI Instrument Table''). The initial setting is Acoustic Grand Piano. - FFMM VVoolluummee + FM Volume If the FM synthesizer of the sound card is being used to play the alert tunes, this setting specifies the loudness (as a percentage of the maximum) at which they are to be played. The initial setting is 70. - AAlleerrtt DDoottss + Alert Dots Whenever a significant event with an associated dot pattern occurs (see ``Alert Tunes''): - NNoo Don't display the dot pattern. + No Don't display the dot pattern. - YYeess + Yes Briefly display the dot pattern. If alert tunes are to be played (see the ``TUNES'' command and @@ -3785,13 +3788,13 @@ then, regardless of the setting of this preference, the dot pat- tern isn't displayed. - AAlleerrtt MMeessssaaggeess + Alert Messages Whenever a significant event with an associated message occurs (see ``Alert Tunes''): - NNoo Don't display the message. + No Don't display the message. - YYeess + Yes Display the message. If alert tunes are to be played (see the ``TUNES'' command and @@ -3802,22 +3805,22 @@ the event, then, regardless of the setting of this preference, the message isn't displayed. - SSaayy--LLiinnee MMooddee + Say-Line Mode When using the ``SAY_LINE'' command: - IImmmmeeddiiaattee + Immediate Discard pending speech. - EEnnqquueeuuee + Enqueue Don't discard pending speech. The initial setting is Immediate. - AAuuttoossppeeaakk + Autospeak - NNoo Only speak when explicitly requested to do so. + No Only speak when explicitly requested to do so. - YYeess + Yes Automatically speak: the new line when the braille window is moved vertically. @@ -3829,24 +3832,24 @@ This setting can also be changed with the ``AUTOSPEAK'' command. The initial setting is No. - SSppeeeecchh RRaattee + Speech Rate Adjust the speech rate (0 is the slowest, 20 is the fastest). This preference is only available if a driver which supports it is being used. This setting can also be changed with the ``SAY_SLOWER/SAY_FASTER'' commands. The initial setting is 10. - SSppeeeecchh VVoolluummee + Speech Volume Adjust the speech volume (0 is the softest, 20 is the loudest). This preference is only available if a driver which supports it is being used. This setting can also be changed with the ``SAY_SOFTER/SAY_LOUDER'' commands. The initial setting is 10. - SSppeeeecchh PPiittcchh + Speech Pitch Adjust the speech pitch (0 is the lowest, 20 is the highest). This preference is only available if a driver which supports it is being used. The initial setting is 10. - SSppeeeecchh PPuunnccttuuaattiioonn + Speech Punctuation Adjust the amount of punctuation which is spoken. It can be set to: @@ -3859,37 +3862,37 @@ This preference is only available if a driver which supports it is being used. The initial setting is Some. - SSttaattuuss SSttyyllee + Status Style This setting specifies the way that the status cells are to be used. You shouldn't normally need to play with it. It enables BRLTTY's developers to test status cell configurations for braille displays which they don't actually have. - NNoonnee + None Don't use the status cells. This setting is always safe, but it's also quite useless. - AAllvvaa + Alva The status cells contain: - 11 The location of the cursor (see below). + 1 The location of the cursor (see below). - 22 The location of the top-left corner of the braille window + 2 The location of the top-left corner of the braille window (see below). - 33 A letter indicating BRLTTY's state. In order of + 3 A letter indicating BRLTTY's state. In order of precedence: - aa Screen attributes are being shown (see the ``DISPMD'' + a Screen attributes are being shown (see the ``DISPMD'' command). - ff The screen image is frozen (see the ``FREEZE'' + f The screen image is frozen (see the ``FREEZE'' command). - ff The cursor is being tracked (see the ``CSRTRK'' + f The cursor is being tracked (see the ``CSRTRK'' command). - _b_l_a_n_k + blank Nothing special. The locations of the cursor and the braille window are pre- @@ -3898,98 +3901,98 @@ Dots 7 and 8 (the extra two at the bottom) represent the hor- izontal braille window number as follows: - NNoo DDoottss + No Dots The first (leftmost) window. - DDoott 77 + Dot 7 The second window. - DDoott 88 + Dot 8 The third window. - DDoottss 77 aanndd 88 + Dots 7 and 8 The fourth window. In both cases, the indicators wrap: line 26 is represented by the letter a, and the fifth horizontal braille window is rep- resented by no dots at the bottom. - TTiieemmaann + Tieman The status cells contain: - 11--22 + 1-2 The columns (counting from 1) of the cursor (shown in the top half of the cells) and the top-left corner of the braille window (shown in the bottom half of the cells). - 33--44 + 3-4 The rows (counting from 1) of the cursor (shown in the top half of the cells) and the top-left corner of the braille window (shown in the bottom half of the cells). - 55 Each dot indicates if a feature is turned on as follows: + 5 Each dot indicates if a feature is turned on as follows: - DDoott 11 + Dot 1 The screen image is frozen (see the ``FREEZE'' command). - DDoott 22 + Dot 2 Screen attributes are being displayed (see the ``DISPMD'' command). - DDoott 33 + Dot 3 Alert tunes are being played (see the ``TUNES'' command). - DDoott 44 + Dot 4 The cursor is being shown (see the ``CSRVIS'' command). - DDoott 55 + Dot 5 The cursor is a solid block (see the ``CSRSIZE'' command). - DDoott 66 + Dot 6 The cursor is blinking (see the ``CSRBLINK'' command). - DDoott 77 + Dot 7 The cursor is being tracked (see the ``CSRTRK'' command). - DDoott 88 + Dot 8 The braille window will slide (see the ``SLIDEWIN'' command). - PPoowweerrBBrraaiillllee 8800 + PowerBraille 80 The status cells contain: - 11 The row (counting from 1) corresponding to the top of the + 1 The row (counting from 1) corresponding to the top of the braille window. The tens digit is shown in the top half of the cell, and the units digit is shown in the bottom half of the cell. - GGeenneerriicc + Generic This setting passes a lot of information to the braille driver, and the driver itself decides how to present it. - MMDDVV + MDV The status cells contain: - 11--22 + 1-2 The location of the top-left corner of the braille window. The row (counting from 1) is shown in the top half of the cells, and the column (counting from 1) is shown in the bottom half of the cells. - VVooyyaaggeerr + Voyager The status cells contain: - 11 The row (counting from 1) corresponding to the top of the + 1 The row (counting from 1) corresponding to the top of the braille window (see below). - 22 The row (counting from 1) whereon the cursor is (see + 2 The row (counting from 1) whereon the cursor is (see below). - 33 If the screen is frozen (see the ``FREEZE'' command), then + 3 If the screen is frozen (see the ``FREEZE'' command), then the letter F. If it isn't, then the column (counting from 1) wherein the cursor is (see below). @@ -4000,22 +4003,22 @@ The initial setting is braille display driver dependent. - TTeexxtt TTaabbllee + Text Table Select the text table. See section ``Text Tables'' for details. See the ``-t'' command line option for the initial setting. This preference isn't saved. - AAttttrriibbuutteess TTaabbllee + Attributes Table Select the attributes table. See section ``Attributes Tables'' for details. See the ``-a'' command line option for the initial setting. This preference isn't saved. - CCoonnttrraaccttiioonn TTaabbllee + Contraction Table Select the contraction table. See section ``Contraction Tables'' for details. See the ``-c'' command line option for the initial setting. This preference isn't saved. - KKeeyybbooaarrdd TTaabbllee + Keyboard Table Select the keyboard table. See section ``Key Tables'' for details. See the ``-k'' command line option for the initial setting. This preference isn't saved. @@ -4025,7 +4028,7 @@ All time settings are in hundredths of a second. They are multiples of 4 within the range 1 through 100. - 55..66.. TThhee SSttaattuuss DDiissppllaayy + 5.6. The Status Display The status display is a summary of BRLTTY's current state which fits completely within the braille window. Some braille displays have a @@ -4038,37 +4041,37 @@ again to return to the screen. The layout of the information contained therein is dependent on the size of the braille window. - 55..66..11.. DDiissppllaayyss wwiitthh 2211 CCeellllss oorr MMoorree + 5.6.1. Displays with 21 Cells or More Short pneumonics have been used, even though they're rather cryptic, in order to show the precise column layout. - _w_x:_w_y _c_x:_c_y _v_t _t_c_m_f_d_u + wx:wy cx:cy vt tcmfdu - _w_x:_w_y + wx:wy The column and row (counting from 1) on the screen corresponding to the top-left corner of the braille window. - _c_x:_c_y + cx:cy The column and row (counting from 1) on the screen corresponding to the position of the cursor. - _v_t The number (counting from 1) of the current virtual terminal. + vt The number (counting from 1) of the current virtual terminal. - _t The state of the cursor tracking feature (see the ``CSRTRK'' + t The state of the cursor tracking feature (see the ``CSRTRK'' command). - bbllaannkk + blank Cursor tracking is off. t Cursor tracking is on. - _c The state of the cursor visibility features (see the ``CSRVIS'' + c The state of the cursor visibility features (see the ``CSRVIS'' and ``CSRBLINK'' commands). - bbllaannkk + blank The cursor isn't visible, and won't blink when made visible. b The cursor isn't visible, and will blink when made visible. @@ -4077,95 +4080,95 @@ B The cursor is visible, and is blinking. - _m The current display mode (see the ``DISPMD'' command). + m The current display mode (see the ``DISPMD'' command). t Screen content (text) is being displayed. a Screen highlighting (attributes) is being displayed. - _f The state of the frozen screen feature (see the ``FREEZE'' + f The state of the frozen screen feature (see the ``FREEZE'' command). - bbllaannkk + blank The screen isn't frozen. f The screen is frozen. - _d The number of braille dots being used to display each character + d The number of braille dots being used to display each character (see the ``SIXDOTS'' command). 8 All eight dots are being used. 6 Only dots 1 through 6 are being used. - _u The state of the uppercase (capital letter) display features + u The state of the uppercase (capital letter) display features (see the ``CAPBLINK'' command). - bbllaannkk + blank Uppercase letters don't blink. B Uppercase letters blink. - 55..66..22.. DDiissppllaayyss wwiitthh 2200 CCeellllss oorr LLeessss + 5.6.2. Displays with 20 Cells or Less Short pneumonics have been used, even though they're rather cryptic, in order to show the precise column layout. - _x_x_y_y_s _v_t _t_c_m_f_d_u + xxyys vt tcmfdu - _x_x The columns (counting from 1) on the screen corresponding to the + xx The columns (counting from 1) on the screen corresponding to the position of the cursor (shown in the top half of the cells) and to the top-left corner of the braille window (shown in the bottom half of the cells). - _y_y The rows (counting from 1) on the screen corresponding to the + yy The rows (counting from 1) on the screen corresponding to the position of the cursor (shown in the top half of the cells) and to the top-left corner of the braille window (shown in the bottom half of the cells). - _s The settings of some of BRLTTY's features. A feature is turned + s The settings of some of BRLTTY's features. A feature is turned on if its corresponding dot is raised. - DDoott 11 + Dot 1 Frozen screen image (see the ``FREEZE'' command). - DDoott 22 + Dot 2 Display attributes (see the ``DISPMD'' command). - DDoott 33 + Dot 3 Alert tunes (see the ``TUNES'' command). - DDoott 44 + Dot 4 Visible cursor (see the ``CSRVIS'' command). - DDoott 55 + Dot 5 Block cursor (see the ``CSRSIZE'' command). - DDoott 66 + Dot 6 Blinking cursor (see the ``CSRBLINK'' command). - DDoott 77 + Dot 7 Cursor tracking (see the ``CSRTRK'' command). - DDoott 88 + Dot 8 Sliding window (see the ``SLIDEWIN'' command). - _v_t The number (counting from 1) of the current virtual terminal. + vt The number (counting from 1) of the current virtual terminal. - _t The state of the cursor tracking feature (see the ``CSRTRK'' + t The state of the cursor tracking feature (see the ``CSRTRK'' command). - bbllaannkk + blank Cursor tracking is off. t Cursor tracking is on. - _c The state of the cursor visibility features (see the ``CSRVIS'' + c The state of the cursor visibility features (see the ``CSRVIS'' and ``CSRBLINK'' commands). - bbllaannkk + blank The cursor isn't visible, and won't blink when made visible. b The cursor isn't visible, and will blink when made visible. @@ -4174,36 +4177,36 @@ B The cursor is visible, and is blinking. - _m The current display mode (see the ``DISPMD'' command). + m The current display mode (see the ``DISPMD'' command). t Screen content (text) is being displayed. a Screen highlighting (attributes) is being displayed. - _f The state of the frozen screen feature (see the ``FREEZE'' + f The state of the frozen screen feature (see the ``FREEZE'' command). - bbllaannkk + blank The screen isn't frozen. f The screen is frozen. - _d The number of braille dots being used to display each character + d The number of braille dots being used to display each character (see the ``SIXDOTS'' command). 8 All eight dots are being used. 6 Only dots 1 through 6 are being used. - _u The state of the uppercase (capital letter) display features + u The state of the uppercase (capital letter) display features (see the ``CAPBLINK'' command). - bbllaannkk + blank Uppercase letters don't blink. B Uppercase letters blink. - 55..77.. CCoommmmaanndd LLeeaarrnn MMooddee + 5.7. Command Learn Mode Command learn mode is an interactive way to learn what the keys on the braille display do. It can be accessed either by the ``LEARN'' @@ -4227,9 +4230,9 @@ display either for a few seconds (see the ``-M'' command line option) or until any key on the display is pressed. - 66.. TTaabblleess + 6. Tables - 66..11.. TTeexxtt TTaabblleess + 6.1. Text Tables Files with names of the form *.ttb are text tables, and with names of the form *.tti are text subtables. They are used by BRLTTY to @@ -4335,7 +4338,7 @@ file directive, and the ``--with-text-table'' build option for details regarding how to use an alternate text table. - 66..11..11.. TTeexxtt TTaabbllee FFoorrmmaatt + 6.1.1. Text Table Format A text table consists of a sequence of directives, one per line, which define how each character is to be represented in braille. UTF-8 @@ -4345,11 +4348,11 @@ If the first non-white-space character of a line is "#" then that line is a comment and is ignored. - 66..11..22.. TTeexxtt TTaabbllee DDiirreeccttiivveess + 6.1.2. Text Table Directives The following directives are provided: - char _c_h_a_r_a_c_t_e_r _d_o_t_s # _c_o_m_m_e_n_t + char character dots # comment Use the char directive to specify how a Unicode character is to be represented in braille. Characters defined with this directive can also be entered from a braille keyboard. If @@ -4362,7 +4365,7 @@ is selected. - _c_h_a_r_a_c_t_e_r + character The Unicode character being defined. It may be: Any single character other than a backslash or a white- @@ -4372,47 +4375,47 @@ - - \\bb The backspace character. - + \b The backspace character. - - \\ff The formfeed character. - + \f The formfeed character. - - \\nn The newline character. - + \n The newline character. - - \\oo###### + \o### The three-digit octal representation of a character. - - \\rr The carriage return character. - + \r The carriage return character. - - \\ss The space character. - + \s The space character. - - \\tt The horizontal tab character. - + \t The horizontal tab character. - - \\uu######## + \u#### The four-digit hexadecimal representation of a character. - - \\UU################ + \U######## The eight-digit hexadecimal representation of a character. - - \\vv The vertical tab character. - + \v The vertical tab character. - - \\xx#### + \x## The two-digit hexadecimal representation of a character. - - \\XX#### + \X## ... (the case of the X and of the digits isn't significant) - - \\## A literal number sign. - + \# A literal number sign. - - \\<> + \ The Unicode name of a character (use _ for space). - - \\\\ A literal backslash. + \\ A literal backslash. - _d_o_t_s + dots The braille representation of the Unicode character. It is a sequence of one to eight dot numbers. If the dot number sequence is enclosed within parentheses then the dot numbers @@ -4439,7 +4442,7 @@ char \ 145 - glyph _c_h_a_r_a_c_t_e_r _d_o_t_s # _c_o_m_m_e_n_t + glyph character dots # comment Use the glyph directive to specify how a Unicode character is to be represented in braille. Characters defined with this directive are output-only. They cannot be entered from a @@ -4447,7 +4450,7 @@ See the char directive for syntax details and for examples. - byte _b_y_t_e _d_o_t_s # _c_o_m_m_e_n_t + byte byte dots # comment Use the byte directive to specify how a character in the local character set is to be represented in braille. It has been retained for backward compatibility but should not be used. @@ -4456,30 +4459,30 @@ character set is. - _b_y_t_e + byte The local character being defined. It may be specified in - the same ways as the _c_h_a_r_a_c_t_e_r operand of the char directive + the same ways as the character operand of the char directive except that the Unicode-specific forms (\u, \U, \<) may not be used. - _d_o_t_s + dots The braille representation of the local character. It may be - specified in the same ways as the _d_o_t_s operand of the char + specified in the same ways as the dots operand of the char directive. - include _f_i_l_e # _c_o_m_m_e_n_t + include file # comment Use the include directive to include the content of a text subtable. It is recursive, which means that any text subtable can itself include yet another text subtable. Care must be taken to ensure that an "include loop" is not created. - _f_i_l_e + file The file to be included. It may be either a relative or an absolute path. If relative, it is anchored at the directory containing the including file. - 66..22.. AAttttrriibbuutteess TTaabblleess + 6.2. Attributes Tables Files with names of the form *.atb are attributes tables, and with names of the form *.ati are attributes subtables. They are used when @@ -4489,33 +4492,33 @@ The following attributes tables are provided: - lleefftt__rriigghhtt + left_right The lefthand column represents the foreground colours: - DDoott 11 + Dot 1 Blue - DDoott 22 + Dot 2 Green - DDoott 33 + Dot 3 Red - DDoott 77 + Dot 7 Bright The righthand column represents the background colours: - DDoott 44 + Dot 4 Blue - DDoott 55 + Dot 5 Green - DDoott 66 + Dot 6 Red - DDoott 88 + Dot 8 Blink A dot is raised when its corresponding attribute bit is on. @@ -4524,33 +4527,33 @@ discern the difference between normal (white on black) and reverse (black on white) video. - iinnvvlleefftt__rriigghhtt + invleft_right The lefthand column represents the foreground colours: - DDoott 11 + Dot 1 Blue - DDoott 22 + Dot 2 Green - DDoott 33 + Dot 3 Red - DDoott 77 + Dot 7 Bright The righthand column represents the background colours: - DDoott 44 + Dot 4 Blue - DDoott 55 + Dot 5 Green - DDoott 66 + Dot 6 Red - DDoott 88 + Dot 8 Blink A background bit being on triggers its corresponding dot, @@ -4558,33 +4561,33 @@ dot. This unintuitive logic actually makes it easier to read the most commonly used attribute combinations. - uuppppeerr__lloowweerr + upper_lower The upper square represents the foreground colours: - DDoott 11 + Dot 1 Red - DDoott 44 + Dot 4 Green - DDoott 22 + Dot 2 Blue - DDoott 55 + Dot 5 Bright The lower square represents the background colours: - DDoott 33 + Dot 3 Red - DDoott 66 + Dot 6 Green - DDoott 77 + Dot 7 Blue - DDoott 88 + Dot 8 Blink A dot is raised when its corresponding attribute bit is on. @@ -4593,7 +4596,7 @@ ration file directive, and the ``--with-attributes-table'' build option for details regarding how to use an alternate attributes table. - 66..22..11.. AAttttrriibbuutteess TTaabbllee FFoorrmmaatt + 6.2.1. Attributes Table Format An attributes table consists of a sequence of directives, one per line, which define how combinations of VGA attributes are to be @@ -4603,52 +4606,52 @@ containing only white-space are ignored. If the first non-white-space character of a line is "#" then that line is a comment and is ignored. - 66..22..22.. AAttttrriibbuutteess TTaabbllee DDiirreeccttiivveess + 6.2.2. Attributes Table Directives The following directives are provided: - dot _d_o_t _s_t_a_t_e # _c_o_m_m_e_n_t + dot dot state # comment Use the dot directive to specify what a specific dot represents. - _d_o_t + dot The dot being defined. It is a single digit within the range 1-8 as defined by the ``Standard Braille Dot Numbering Convention''. - _s_t_a_t_e + state What the dot represents. It may be: - =_a_t_t_r_i_b_u_t_e + =attribute The dot is raised if the named attribute is on. - ~_a_t_t_r_i_b_u_t_e + ~attribute The dot is raised if the named attribute is off. The names of the attribute bits are: - 00XX0011 + 0X01 fg-blue - 00XX0022 + 0X02 fg-green - 00XX0044 + 0X04 fg-red - 00XX0088 + 0X08 fg-bright - 00XX1100 + 0X10 bg-blue - 00XX2200 + 0X20 bg-green - 00XX4400 + 0X40 bg-red - 00XX8800 + 0X80 blink Examples: @@ -4657,7 +4660,7 @@ dot 2 ~bg-blue - include _f_i_l_e # _c_o_m_m_e_n_t + include file # comment Use the include directive to include the content of an attributes subtable. It is recursive, which means that any attributes subtable can itself include yet another attributes @@ -4665,12 +4668,12 @@ is not created. - _f_i_l_e + file The file to be included. It may be either a relative or an absolute path. If relative, it is anchored at the directory containing the including file. - 66..33.. CCoonnttrraaccttiioonn TTaabblleess + 6.3. Contraction Tables Files with names of the form *.ctb are contraction tables, and with names of the form *.cti are contraction subtables. They are used by @@ -4726,7 +4729,7 @@ configuration file directive for details regarding how to use a contraction table. - 66..33..11.. CCoonnttrraaccttiioonn TTaabbllee FFoorrmmaatt + 6.3.1. Contraction Table Format A contraction table consists of a sequence of entries, one per line, which define how character sequences are to be represented in braille. @@ -4738,7 +4741,7 @@ The format of a contraction table entry is: - _d_i_r_e_c_t_i_v_e _o_p_e_r_a_n_d ... [_c_o_m_m_e_n_t] + directive operand ... [comment] Each directive has a specific number of operands. Any text beyond the @@ -4753,10 +4756,10 @@ original table ordering is maintained. Thus, the same sequence may be translated differently under different circumstances. - 66..33..22.. CCoonnttrraaccttiioonn TTaabbllee OOppeerraannddss + 6.3.2. Contraction Table Operands - _c_h_a_r_a_c_t_e_r_s + characters The first operand of a character sequence matching directive is the character sequence to be matched. Each character within the sequence may be: @@ -4768,47 +4771,47 @@ - - \\bb The backspace character. - + \b The backspace character. - - \\ff The formfeed character. - + \f The formfeed character. - - \\nn The newline character. - + \n The newline character. - - \\oo###### + \o### The three-digit octal representation of a character. - - \\rr The carriage return character. - + \r The carriage return character. - - \\ss The space character. - + \s The space character. - - \\tt The horizontal tab character. - + \t The horizontal tab character. - - \\uu######## + \u#### The four-digit hexadecimal representation of a character. - - \\UU################ + \U######## The eight-digit hexadecimal representation of a character. - - \\vv The vertical tab character. - + \v The vertical tab character. - - \\xx#### + \x## The two-digit hexadecimal representation of a character. - - \\XX#### + \X## ... (the case of the X and of the digits isn't significant) - - \\## A literal number sign. - + \# A literal number sign. - - \\<> + \ The Unicode name of a character (use _ for space). - - \\\\ A literal backslash. + \\ A literal backslash. - _r_e_p_r_e_s_e_n_t_a_t_i_o_n + representation The second operand of those character sequence matching directives which have one is the braille representation of the sequence. Each braille cell is specified as a sequence of one @@ -4817,61 +4820,61 @@ Convention''. The special dot number 0, which may not be used in conjunction with any other dot number, means no dots. - 66..33..33.. OOppccooddeess + 6.3.3. Opcodes An opcode is a keyword which tells the translator how to interpret the operands. The opcodes are grouped here by function. - 66..33..33..11.. TTaabbllee AAddmmiinniissttrraattiioonn + 6.3.3.1. Table Administration These opcodes make it easier to write contraction tables. They have no direct effect on the character translation. - include _p_a_t_h + include path Include the contents of another file. Nesting can be to any depth. Relative paths are anchored at the directory of the including file. - locale _l_o_c_a_l_e + locale locale Define the locale for character interpretation (lowercase, uppercase, numeric, etc.). The locale may be specified as: - _l_a_n_g_u_a_g_e[[__c_o_u_n_t_r_y][._c_h_a_r_s_e_t][@_m_o_d_i_f_i_e_r] - The _l_a_n_g_u_a_g_e component is required and should be a two-letter - ISO-639 language code. The _c_o_u_n_t_r_y component is optional and - should be a two-letter ISO-3166 country code. The _c_h_a_r_s_e_t + language[_country][.charset][@modifier] + The language component is required and should be a two-letter + ISO-639 language code. The country component is optional and + should be a two-letter ISO-3166 country code. The charset component is optional and should be a character set name, e.g. ISO-8859-1. - CC 7-bit ASCII. + C 7-bit ASCII. - -- No locale. + - No locale. The last locale specification applies to the entire table. If this opcode isn't used then the C locale is assumed. - 66..33..33..22.. SSppeecciiaall SSyymmbbooll DDeeffiinniittiioonn + 6.3.3.2. Special Symbol Definition These opcodes define special symbols which must be inserted into the braille text in order to clarify it. - capsign _d_o_t_s + capsign dots The symbol which capitalizes a single letter. - begcaps _d_o_t_s + begcaps dots The symbol which begins a block of capital letters within a word. - endcaps _d_o_t_s + endcaps dots The symbol which ends a block of capital letters within a word. - letsign _d_o_t_s + letsign dots The symbol which marks a letter which isn't part of a word. - numsign _d_o_t_s + numsign dots The symbol which marks the beginning of a number. - 66..33..33..33.. CChhaarraacctteerr TTrraannssllaattiioonn + 6.3.3.3. Character Translation These opcodes define the braille representations for character sequences. Each of them defines an entry within the contraction @@ -4879,8 +4882,8 @@ below, when they define alternate representations for the same character sequence. - Each of these opcodes has a _c_h_a_r_a_c_t_e_r_s operand (which must be - specified as a _s_t_r_i_n_g), and a built-in condition governing its + Each of these opcodes has a characters operand (which must be + specified as a string), and a built-in condition governing its eligibility for use. The text is processed strictly from left to right, character by character, with the most eligible entry for each position being used. If there's more than one eligible entry for a @@ -4889,8 +4892,8 @@ string, then the one defined nearest to the beginning of the table is used (this is the only order dependency). - Many of these opcodes have a _d_o_t_s operand which defines the braille - representation for its _c_h_a_r_a_c_t_e_r_s operand. It may also be specified + Many of these opcodes have a dots operand which defines the braille + representation for its characters operand. It may also be specified as an equals sign (=), in which case it means one of two things. If the entry is for a single character, then it means that the currently selected computer braille representation (see the ``-t'' command line @@ -4901,98 +4904,98 @@ Some special terms are used within the descriptions of these opcodes. - wwoorrdd + word A maximal sequence of one or more consecutive letters. Now, finally, here are the opcode descriptions themselves: - literal _c_h_a_r_a_c_t_e_r_s + literal characters Translate the entire white-space-bounded containing character sequence into computer braille (see the ``-t'' command line option and the ``text-table'' configuration file directive). - replace _c_h_a_r_a_c_t_e_r_s _c_h_a_r_a_c_t_e_r_s + replace characters characters Replace the first set of characters, no matter where they appear, with the second. The replaced characters aren't reprocessed. - always _c_h_a_r_a_c_t_e_r_s _d_o_t_s + always characters dots Translate the characters no matter where they appear. If there's only one character, then, in addition, define the default representation for that character. - repeatable _c_h_a_r_a_c_t_e_r_s _d_o_t_s + repeatable characters dots Translate the characters no matter where they appear. Ignore any consecutive repetitions of the same sequence. - largesign _c_h_a_r_a_c_t_e_r_s _d_o_t_s + largesign characters dots Translate the characters no matter where they appear. Remove white-space between consecutive words matched by this opcode. - lastlargesign _c_h_a_r_a_c_t_e_r_s _d_o_t_s + lastlargesign characters dots Translate the characters no matter where they appear. Remove preceding white-space if the previous word was matched by the ``largesign'' opcode. - word _c_h_a_r_a_c_t_e_r_s _d_o_t_s + word characters dots Translate the characters if they're a word. - joinword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + joinword characters dots Translate the characters if they're a word. Remove the following white-space if the first character after it is a letter. - lowword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + lowword characters dots Translate the characters if they're a white-space-bounded word. - contraction _c_h_a_r_a_c_t_e_r_s + contraction characters Prefix the characters with a letter sign (see ``letsign'') if they're a word. - sufword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + sufword characters dots Translate the characters if they're either a word or at the beginning of a word. - prfword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + prfword characters dots Translate the characters if they're either a word or at the end of a word. - begword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + begword characters dots Translate the characters if they're at the beginning of a word. - begmidword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + begmidword characters dots Translate the characters if they're either at the beginning or in the middle of a word. - midword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + midword characters dots Translate the characters if they're in the middle of a word. - midendword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + midendword characters dots Translate the characters if they're either in the middle or at the end of a word. - endword _c_h_a_r_a_c_t_e_r_s _d_o_t_s + endword characters dots Translate the characters if they're at the end of a word. - prepunc _c_h_a_r_a_c_t_e_r_s _d_o_t_s + prepunc characters dots Translate the characters if they're part of punctuation at the beginning of a word. - postpunc _c_h_a_r_a_c_t_e_r_s _d_o_t_s + postpunc characters dots Translate the characters if they're part of punctuation at the end of a word. - begnum _c_h_a_r_a_c_t_e_r_s _d_o_t_s + begnum characters dots Translate the characters if they're at the beginning of a number. - midnum _c_h_a_r_a_c_t_e_r_s _d_o_t_s + midnum characters dots Translate the characters if they're in the middle of a number. - endnum _c_h_a_r_a_c_t_e_r_s _d_o_t_s + endnum characters dots Translate the characters if they're at the end of a number. - 66..33..33..44.. CChhaarraacctteerr CCllaasssseess + 6.3.3.4. Character Classes These opcodes define and use character classes. A character class associates a set of characters with a name. The name then refers to @@ -5002,58 +5005,58 @@ The following character classes are automatically predefined based on the selected locale: - ddiiggiitt + digit Numeric characters. - lleetttteerr + letter Both uppercase and lowercase alphabetic characters. Some locales have additional letters which are neither uppercase nor lowercase. - lloowweerrccaassee + lowercase Lowercase alphabetic characters. - ppuunnccttuuaattiioonn + punctuation Printable characters which are neither white-space nor alphanumeric. - ssppaaccee + space White-space characters. In the default locale these are: space, horizontal tab, vertical tab, carriage return, new line, form feed. - uuppppeerrccaassee + uppercase Uppercase alphabetic characters. The opcodes which define and use character classes are: - class _n_a_m_e _c_h_a_r_a_c_t_e_r_s - Define a new character class. The _c_h_a_r_a_c_t_e_r_s operand must be - specified as a _s_t_r_i_n_g. A character class may not be used until + class name characters + Define a new character class. The characters operand must be + specified as a string. A character class may not be used until it's been defined. - after _c_l_a_s_s _o_p_c_o_d_e ... + after class opcode ... The specified opcode is further constrained in that the matched character sequence must be immediately preceded by a character belonging to the specified class. If this opcode is used more than once on the same line then the union of the characters in all the classes is used. - before _c_l_a_s_s _o_p_c_o_d_e ... + before class opcode ... The specified opcode is further constrained in that the matched character sequence must be immediately followed by a character belonging to the specified class. If this opcode is used more than once on the same line then the union of the characters in all the classes is used. - 66..44.. KKeeyy TTaabblleess + 6.4. Key Tables Files with names of the form *.ktb are key tables, and with names of the form *.kti are key subtables. They are used by BRLTTY to bind braille display and keyboard key combinations to BRLTTY commands. - The names of braille display key table files begin with brl-_x_x-", - where _x_x is the two-letter ``driver identification code''. The rest + The names of braille display key table files begin with brl-xx-", + where xx is the two-letter ``driver identification code''. The rest of the name identifies the model(s) for which the key table is used. The names of keyboard table files begin with kbd-. The rest of the @@ -5062,26 +5065,26 @@ The following keyboard tables are provided: - bbrraaiillllee + braille bindings for braille keyboards - ddeesskkttoopp + desktop bindings for full keyboards - kkeeyyppaadd + keypad bindings for keypad-based navigation - llaappttoopp + laptop bindings for keyboards without a keypad - ssuunn__ttyyppee66 + sun_type6 bindings for Sun Type 6 keyboards See the ``-k'' command line option, and the ``keyboard-table'' config- uration file directive for details regarding how to select a keyboard table. - 66..44..11.. KKeeyy TTaabbllee DDiirreeccttiivveess + 6.4.1. Key Table Directives A key table consists of a sequence of directives, one per line, which define how keys and key combinations are to be interpreted. UTF-8 @@ -5108,19 +5111,19 @@ The following directives are provided: - 66..44..11..11.. TThhee AAssssiiggnn DDiirreeccttiivvee + 6.4.1.1. The Assign Directive Create or update a variable associated with the current include level. The variable is visible to the current and to lower include levels, but not to higher include levels. - assign _v_a_r_i_a_b_l_e [_v_a_l_u_e] + assign variable [value] - _v_a_r_i_a_b_l_e + variable The name of the variable. If the variable doesn't already exist at the current include level then it is created. - _v_a_l_u_e + value The value which is to be assigned to the variable. If it's not supplied then a zero-length (null) value is assigned. @@ -5136,15 +5139,15 @@ bind \{ReturnKey} RETURN - 66..44..11..22.. TThhee BBiinndd DDiirreeccttiivvee + 6.4.1.2. The Bind Directive Define which BRLTTY command is executed when a particular combination of one or more keys is pressed. The binding is defined within the current context. - bind _k_e_y_s _c_o_m_m_a_n_d + bind keys command - _k_e_y_s + keys The key combination which is to be bound. It's a sequence of one or more key names separated by plus (+) signs. The final (or only) key name may be optionally prefixed with an @@ -5155,7 +5158,7 @@ soon as that key is pressed. If not used, the command is executed as soon as any of the keys is released. - _c_o_m_m_a_n_d + command The name of a BRLTTY command. One or more modifiers may be optionally appended to the command name by using a plus (+) sign as the separator. @@ -5190,7 +5193,7 @@ For commands which require an offset: - The modifier +_o_f_f_s_e_t, where _o_f_f_s_e_t is a non-negative + The modifier +offset, where offset is a non-negative integer, may be specified. If it isn't supplied then +0 is assumed. @@ -5210,28 +5213,28 @@ bind Key6 CONTEXT+1 - 66..44..11..33.. TThhee CCoonntteexxtt DDiirreeccttiivvee + 6.4.1.3. The Context Directive Define alternate ways to interpret certain key events and/or combinations. A context contains definitions created by the ``bind'', ``hotkey'', ``ignore'', ``map'', and ``superimpose'' directives. - context _n_a_m_e [_t_i_t_l_e] + context name [title] - _n_a_m_e + name Which context subsequent definitions are to be created within. These special contexts are predefined: - ddeeffaauulltt + default The default context. If a key combination hasn't been defined within the current context then its definition within the default context is used. This only applies to definitions created by the ``bind'' directive. - mmeennuu + menu This context is used when within BRLTTY's preferences menu. - _t_i_t_l_e + title A person-readable description of the context. It may contain spaces, and standard capitalization conventions should be used. This operand is optional. If supplied when selecting a context @@ -5266,20 +5269,20 @@ context DESCCHAR - 66..44..11..44.. TThhee HHiiddee DDiirreeccttiivvee + 6.4.1.4. The Hide Directive Specify whether or not certain definitions (see the ``bind'', ``hotkey'', ``map'', and ``superimpose'' directives) and notes (see the ``note'' directive) are included within the key table's help text. - hide _s_t_a_t_e + hide state - _s_t_a_t_e + state One of these keywords: - oonn They're excluded. + on They're excluded. - ooffff + off They're included. The specified state applies to all subsequent definitions and notes @@ -5294,25 +5297,25 @@ hide on - 66..44..11..55.. TThhee HHoottkkeeyy DDiirreeccttiivvee + 6.4.1.5. The Hotkey Directive Bind the press and release events of a specific key to two separate BRLTTY commands. The bindings are defined within the current context. - hotkey _k_e_y _p_r_e_s_s _r_e_l_e_a_s_e + hotkey key press release - _k_e_y + key The name of the key which is to be bound. - _p_r_e_s_s + press The name of the BRLTTY command which is to be executed whenever the key is pressed. - _r_e_l_e_a_s_e + release The name of the BRLTTY command which is to be executed whenever the key is released. - Modifiers may be appended to the command names. See the _c_o_m_m_a_n_d + Modifiers may be appended to the command names. See the command operand of the ``bind'' directive for details. Specify NOOP if no command is to be executed. Specifying NOOP for @@ -5324,33 +5327,33 @@ hotkey Key2 NOOP NOOP - 66..44..11..66.. TThhee IIffKKeeyy DDiirreeccttiivvee + 6.4.1.6. The IfKey Directive Conditionally process a key table directive only if the device has a particular key. - ifkey _k_e_y _d_i_r_e_c_t_i_v_e + ifkey key directive - _k_e_y + key The name of the key whose availability is to be tested. - _d_i_r_e_c_t_i_v_e + directive The key table directive which is to be conditionally processed. Examples: ifkey Key1 ifkey Key2 bind Key1+Key2 HOME - 66..44..11..77.. TThhee IInncclluuddee DDiirreeccttiivvee + 6.4.1.7. The Include Directive Process the directives within a key subtable. It's recursive, which means that any key subtable can itself include yet another key subtable. Care must be taken to ensure that an "include loop" is not created. - include _f_i_l_e + include file - _f_i_l_e + file The key subtable which is to be included. It may be either a relative or an absolute path. If relative, it's anchored at the directory containing the including key table or subtable. @@ -5361,72 +5364,72 @@ include /path/to/my/keys.kti - 66..44..11..88.. TThhee IIggnnoorree DDiirreeccttiivvee + 6.4.1.8. The Ignore Directive Ignore a specific key while within the current context. - ignore _k_e_y + ignore key - _k_e_y + key The name of the key which is to be ignored. Examples: ignore Key1 - 66..44..11..99.. TThhee MMaapp DDiirreeccttiivvee + 6.4.1.9. The Map Directive Map a key to a braille keyboard function. The mapping is defined within the current context. - map _k_e_y _f_u_n_c_t_i_o_n + map key function - _k_e_y + key The name of the key which is to be mapped. More than one key may be mapped to the same braille keyboard function. - _f_u_n_c_t_i_o_n + function The name of the braille keyboard function. It may be one of the following keywords: - DDOOTT11 + DOT1 The upper-left standard braille dot. - DDOOTT22 + DOT2 The middle-left standard braille dot. - DDOOTT33 + DOT3 The lower-left standard braille dot. - DDOOTT44 + DOT4 The upper-right standard braille dot. - DDOOTT55 + DOT5 The middle-right standard braille dot. - DDOOTT66 + DOT6 The lower-right standard braille dot. - DDOOTT77 + DOT7 The lower-left computer braille dot. - DDOOTT88 + DOT8 The lower-right computer braille dot. - SSPPAACCEE + SPACE The space bar. - SSHHIIFFTT + SHIFT The shift key. - UUPPPPEERR + UPPER If a lowercase letter is being entered then translate it to its uppercase equivalent. - CCOONNTTRROOLL + CONTROL The control key. - MMEETTAA + META The left alt key. If a key combination consists only of keys which have been mapped to @@ -5442,15 +5445,15 @@ map Key1 DOT1 - 66..44..11..1100.. TThhee NNoottee DDiirreeccttiivvee + 6.4.1.10. The Note Directive Add a person-readable explanation to the key table's help text. Notes are commonly used, for example, to describe the placement, sizes, and shapes of the keys on the device. - note _t_e_x_t + note text - _t_e_x_t + text The explanation which is to be added. It may contain spaces, and should be grammatically correct. @@ -5465,30 +5468,30 @@ note Key1 is the round key at the far left on the front surface. - 66..44..11..1111.. TThhee SSuuppeerriimmppoossee DDiirreeccttiivvee + 6.4.1.11. The Superimpose Directive Implicitly include a braille keyboard function whenever a braille keyboard command consisting of at least one dot is executed. The implicit inclusion is defined within the current context. Any number of them may be specified. - superimpose _f_u_n_c_t_i_o_n + superimpose function - _f_u_n_c_t_i_o_n - The name of the braille keyboard function. See the _f_u_n_c_t_i_o_n + function + The name of the braille keyboard function. See the function operand of the ``map'' directive for details. Examples: superimpose DOT7 - 66..44..11..1122.. TThhee TTiittllee DDiirreeccttiivvee + 6.4.1.12. The Title Directive Provide a person-readable summary of the key table's purpose. - title _t_e_x_t + title text - _t_e_x_t + text A one-line summary of what the key table is used for. It may contain spaces, and standard capitalization conventions should be used. @@ -5499,21 +5502,21 @@ title Bindings for Keypad-based Navigation - 66..44..22.. KKeeyybbooaarrdd PPrrooppeerrttiieess + 6.4.2. Keyboard Properties The default is that all keyboards are monitored. A subset of the keyboards may be selected by specifying one or more of the following properties (see the ``-K'' command line option, and the ``keyboard- properties'' configuration file directive): - ttyyppee + type The bus type, specified as one of the following keywords: any, ps2, usb, bluetooth. - vveennddoorr + vendor The vendor identifier, specified as a 16-bit unsigned integer. - pprroodduucctt + product The product identifier, specified as a 16-bit unsigned integer. The vendor and product identifiers may be specified in decimal (no @@ -5521,9 +5524,9 @@ Specifying 0 means match any value (as if the property weren't specified). - 77.. AAddvvaanncceedd TTooppiiccss + 7. Advanced Topics - 77..11.. IInnssttaalllliinngg MMuullttiippllee VVeerrssiioonnss + 7.1. Installing Multiple Versions It's easy to have more than one version of BRLTTY installed on the same system at the same time. This capability allows you to test a @@ -5590,7 +5593,7 @@ ln -s /brltty-3.1 /brltty - 77..22.. IInnssttaallllaattiioonn//RReessccuuee RRoooott DDiisskkss ffoorr LLiinnuuxx + 7.2. Installation/Rescue Root Disks for Linux BRLTTY can run as a stand-alone executable. Everything it needs to know can be explicitly configured at build-time (see ``Build @@ -5639,22 +5642,22 @@ strip brltty - 77..33.. FFuuttuurree EEnnhhaanncceemmeennttss + 7.3. Future Enhancements Apart from fixing bugs and supporting more types of braille displays, we hope, time permitting, to work on the following: - BBeetttteerr AAttttrriibbuuttee HHaannddlliinngg + Better Attribute Handling Attribute tracking. Mixed text and attribute mode. - SSccrroollll TTrraacckkiinngg + Scroll Tracking Locking the braille window to one line as it scrolls on the screen. - BBeetttteerr SSppeeeecchh SSuuppppoorrtt + Better Speech Support Mixed braille and speech for faster reading of text. @@ -5662,13 +5665,13 @@ More speech synthesizers. - SSccrreeeenn SSuubbrreeggiioonnss + Screen Subregions Ignore cursor motion outside the region, and set soft navigational boundaries at the edges of the region. See the file TODO for a more complete list. - 77..44.. KKnnoowwnn BBuuggss + 7.4. Known Bugs At the time of writing (December 2001), the following problems are known: @@ -5681,7 +5684,7 @@ to a remote host. - AA.. SSuuppppoorrtteedd BBrraaiillllee DDiissppllaayyss + A. Supported Braille Displays BRLTTY supports the following braille displays: @@ -5701,6 +5704,7 @@ DM80 Plus EcoVario 24/32/40/64/80 Inka + Orbit 20 PocketVario 24 Pronto! V3 18/40 Pronto! V4 18/40 @@ -5721,7 +5725,6 @@ Apex Braudi BrlAPI - B2G Cebra 20/40/60/80/100/120/140 CombiBraille 25/45/85 EcoBraille 20/40/80 @@ -5740,6 +5743,7 @@ Modular Connect 88 Active Braille Active Star 40 + Actilino Basic Braille 16/20/32/40/48/64/80 Braillino Braille Wave @@ -5799,7 +5803,7 @@ Windows - BB.. SSuuppppoorrtteedd SSppeeeecchh SSyynntthheessiizzeerrss + B. Supported Speech Synthesizers BRLTTY supports the following speech synthesizers: @@ -5820,7 +5824,7 @@ ViaVoice text to speech engine - CC.. DDrriivveerr IIddeennttiiffiiccaattiioonn CCooddeess + C. Driver Identification Codes Code Name @@ -5876,19 +5880,19 @@ xw XWindow - DD.. SSuuppppoorrtteedd SSccrreeeenn DDrriivveerrss + D. Supported Screen Drivers BRLTTY supports the following screen drivers: - aass AT-SPI + as AT-SPI - hhdd This driver provides direct access to the Hurd console screen. + hd This driver provides direct access to the Hurd console screen. It's only selectable, and is the default, on Hurd systems. - llxx This driver provides direct access to the Linux console screen. + lx This driver provides direct access to the Linux console screen. It's only selectable, and is the default, on Linux systems. - sscc This driver provides access to the screen program. It's + sc This driver provides access to the screen program. It's selectable on all systems, and is the default if no native screen driver is available. The patch for screen which we provide (see the Patches subdirectory) must be applied. Use of @@ -5896,13 +5900,13 @@ running, makes BRLTTY effectively useful only after the user has logged in. - wwnn This driver provides direct access to the Windows console + wn This driver provides direct access to the Windows console screen. It's only selectable, and is the default, on Windows/Cygwin systems. - EE.. OOppeerraanndd SSyynnttaaxx + E. Operand Syntax - EE..11.. DDrriivveerr SSppeecciiffiiccaattiioonn + E.1. Driver Specification A braille display or speech synthesizer driver must be specified via its two-letter ``driver identification code''. @@ -5916,23 +5920,23 @@ using only those drivers which are known to be reliable for this purpose. - EE..22.. BBrraaiillllee DDeevviiccee SSppeecciiffiiccaattiioonn + E.2. Braille Device Specification The general form of a braille device specification (see the ``-d'' command line option, the ``braille-device'' configuration file directive, and the ``--with-braille-device'' build option) is - qualifier:_d_a_t_a. For backward compatibility with earlier releases, if + qualifier:data. For backward compatibility with earlier releases, if the qualifier is omitted then serial: is assumed. The following device types are supported: - BBlluueettooootthh - For a bluetooth device, specify bluetooth:_a_d_d_r_e_s_s (bt: and - bluez: may also be used). The address must be six two-digit - hexadecimal numbers separated by colons, e.g. 01:23:45:67:89:AB. + Bluetooth + For a bluetooth device, specify bluetooth:address. The address + must be six two-digit hexadecimal numbers separated by colons, + e.g. 01:23:45:67:89:AB. - SSeerriiaall - For a serial device, specify serial:_/_p_a_t_h_/_t_o_/_d_e_v_i_c_e. The + Serial + For a serial device, specify serial:/path/to/device. The serial: qualifier is optional (for backward compatibility). If a relative path is given then it's anchored at /dev (the usual location where devices are defined on a Unix-like system). The @@ -5947,7 +5951,7 @@ ttyS0 - UUSSBB + USB For a USB device, specify usb:. BRLTTY will search for the first USB device which matches the braille display driver being used. If this is inadequate, e.g. if you have more than one USB @@ -5966,14 +5970,14 @@ e.g. usb:,serial:/dev/ttyS0, since the former tends to autodetect more reliably than the latter. - EE..33.. PPCCMM DDeevviiccee SSppeecciiffiiccaattiioonn + E.3. PCM Device Specification In most cases the PCM device is the full path to an appropriate system device. Exceptions are: - AALLSSAA + ALSA The name of and arguments for the physical or logical device, - i.e. _n_a_m_e[:_a_r_g_u_m_e_n_t,...]. + i.e. name[:argument,...]. The default PCM device is: @@ -5988,13 +5992,13 @@ Solaris /dev/audio - EE..44.. MMIIDDII DDeevviiccee SSppeecciiffiiccaattiioonn + E.4. MIDI Device Specification In most cases the MIDI device is the full path to an appropriate system device. Exceptions are: - AALLSSAA - The client and port separated by a colon, i.e. _c_l_i_e_n_t:_p_o_r_t. + ALSA + The client and port separated by a colon, i.e. client:port. Each may be specified either as a number or as a case-sensitive substring of its name. @@ -6006,29 +6010,29 @@ Linux/OSS /dev/sequencer - FF.. SSttaannddaarrdd BBrraaiillllee DDoott NNuummbbeerriinngg CCoonnvveennttiioonn + F. Standard Braille Dot Numbering Convention A standard braille cell consists of six dots arranged in three rows and two columns. Each dot can be specifically identified by its number as follows: - 11 Top-left (row 1, column 1). + 1 Top-left (row 1, column 1). - 22 Middle-left (row 2, column 1). + 2 Middle-left (row 2, column 1). - 33 Bottom-left (row 3, column 1). + 3 Bottom-left (row 3, column 1). - 44 Top-right (row 1, column 2). + 4 Top-right (row 1, column 2). - 55 Middle-right (row 2, column 2). + 5 Middle-right (row 2, column 2). - 66 Bottom-right (row 3, column 2). + 6 Bottom-right (row 3, column 2). Computer braille has introduced a fourth row at the bottom. - 77 Below-left (row 4, column 1). + 7 Below-left (row 4, column 1). - 88 Below-right (row 4, column 2). + 8 Below-right (row 4, column 2). Perhaps a picture will make this numbering convention easier to understand. @@ -6041,7 +6045,7 @@ - GG.. NNoorrtthh AAmmeerriiccaann BBrraaiillllee CCoommppuutteerr CCooddee + G. North American Braille Computer Code @@ -6307,7 +6311,7 @@ - HH.. MMIIDDII IInnssttrruummeenntt TTaabbllee + H. MIDI Instrument Table _____________________________________________________________ diff -Nru brltty-5.4/Documents/Manual-BRLTTY/English/Makefile.in brltty-5.5/Documents/Manual-BRLTTY/English/Makefile.in --- brltty-5.4/Documents/Manual-BRLTTY/English/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/English/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/braille-drivers.sgml brltty-5.5/Documents/Manual-BRLTTY/French/braille-drivers.sgml --- brltty-5.4/Documents/Manual-BRLTTY/French/braille-drivers.sgml 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/braille-drivers.sgml 2017-04-18 22:35:13.000000000 +0000 @@ -6,6 +6,7 @@ |Satellite (5nn)@ |Braille System 40@ |Braille Controller 640/680@ + |Easy Link 12@ B2G@ Baum |BrailleConnect 12/24/32/40/64/80@ @@ -14,6 +15,7 @@ |DM80 Plus@ |EcoVario 24/32/40/64/80@ |Inka@ + |Orbit 20@ |PocketVario 24@ |Pronto! V3 18/40@ |Pronto! V4 18/40@ @@ -28,6 +30,11 @@ |III@ BrailleLite |18/40/M20/M40@ +BrailleMemo + |Pocket (16)@ + |Smart (16)@ + |32@ + |40@ BrailleNote |18/32@ |Apex@ @@ -57,12 +64,14 @@ |Modular Connect 88@ |Active Braille@ |Active Star 40@ + |Actilino@ + |Basic Braille 16/20/32/40/48/64/80@ + |Braillino@ |Braille Wave@ |Easy Braille@ |Braille Star 40/80@ |Connect Braille 40@ |Bookworm@ - |Braillino@ Hedo |ProfiLine@ |MobilLine@ @@ -122,12 +131,12 @@ VideoBraille |40@ Virtual - |TCP/Unix, client/serveur@ + |TCP/Unix, client/server@ VisioBraille |20/40@ Voyager |44/70@ - |Part232 (adaptateur srie)@ + |Part232 (serial adapter)@ |BraillePen/EasyLink@ XWindow |X11@ diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY-12.html brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY-12.html --- brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY-12.html 2016-06-28 11:22:21.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY-12.html 2017-04-18 22:38:59.000000000 +0000 @@ -45,8 +45,7 @@

Les types de priphrique suivants sont supports:

Bluetooth
-

Pour un priphrique bluetooth, spcifiez bluetooth:addresse -?vous pouvez aussi utiliser bt: et bluez: ). +

Pour un priphrique bluetooth, spcifiez bluetooth:addresse. L'adresse doit se composer de six nombres hexadcimaux deux chiffres spars par des "deux-points", par exemple 01:23:45:67:89:AB.

Srie
diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY-3.html brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY-3.html --- brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY-3.html 2016-06-28 11:22:21.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY-3.html 2017-04-18 22:38:59.000000000 +0000 @@ -322,9 +322,12 @@

Spcifie le port par dfaut auquel l'afficheur braille est reli (voir la section Spcification du port braille). Si vous ne spcifiez pas -cette option, usb: est assum si le support USB est disponible, et un -chemin appropri pour le port srie Com1 correspondant au systme -d'exploitation est assum. Voir la ligne +cette option, usb: est suppos si le support USB est disponible, +bluetooth: est suppos si le support Bluetooth est disponible, et +usb:,bluetooth: est suppos si les deux sont disponibles. Si ni le support +USB ni le support Bluetooth ne sont disponibles, un +chemin appropri pour le priphrique du port srie primaire correspondant au systme +d'exploitation est suppos. Voir la ligne braille-device du fichier de configuration et l'option -d de la ligne de commande @@ -1831,7 +1834,7 @@ est ancr au rpertoire configur par l'option de compilation --with-data-directory. L'extension .ctb est facultative. Si vous ne fournissez pas cette option, -en-us-g2 est assum.

+en-us-g2 est suppos.

-tfile|auto --text-table=file|auto

Spcifie la table de texte (voir la section diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY-4.html brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY-4.html --- brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY-4.html 2016-06-28 11:22:21.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY-4.html 2017-04-18 22:38:59.000000000 +0000 @@ -667,7 +667,7 @@ -f. Son existence n'est pas indispensable. Vous pouvez trouver un fichier type dans le sous-rpertoire -DOCS

+Documents

Les lignes vides sont ignores. Un commentaire commence par un signe nombre (#), et continue jusqu' la fin de la ligne. diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY-8.html brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY-8.html --- brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY-8.html 2016-06-28 11:22:21.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY-8.html 2017-04-18 22:38:59.000000000 +0000 @@ -24,6 +24,7 @@ Satellite (5nn) Braille System 40 Braille Controller 640/680 +Easy Link 12 B2G BaumBrailleConnect 12/24/32/40/64/80 Brailliant 24/32/40/64/80 @@ -31,6 +32,7 @@ DM80 Plus EcoVario 24/32/40/64/80 Inka +Orbit 20 PocketVario 24 Pronto! V3 18/40 Pronto! V4 18/40 @@ -43,6 +45,10 @@ VarioUltra 20/32/40 BrailCommIII BrailleLite18/40/M20/M40 +BrailleMemoPocket (16) +Smart (16) +32 +40 BrailleNote18/32 Apex Braudi @@ -65,12 +71,14 @@ Modular Connect 88 Active Braille Active Star 40 +Actilino +Basic Braille 16/20/32/40/48/64/80 +Braillino Braille Wave Easy Braille Braille Star 40/80 Connect Braille 40 Bookworm -Braillino HedoProfiLine MobilLine HIMSBraille Sense @@ -114,10 +122,10 @@ PowerBraille 40/65/80 TTYterminfo VideoBraille40 -VirtualTCP/Unix, client/serveur +VirtualTCP/Unix, client/server VisioBraille20/40 Voyager44/70 -Part232 (adaptateur srie) +Part232 (serial adapter) BraillePen/EasyLink XWindowX11 Windows diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY.html brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY.html --- brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY.html 2016-06-28 11:22:21.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY.html 2017-04-18 22:38:59.000000000 +0000 @@ -37,10 +37,10 @@ pour Traduc.org - Version 5.4, Jui 2016 + Version 5.5, Avril 2017

- Copyright © 1995-2016 by Les Dveloppeurs de BRLTTY. + Copyright © 1995-2017 by Les Dveloppeurs de BRLTTY. BRLTTY est un logiciel libre, et n'est fourni avec AUCUNE GARANTIE. Il est plac sous les termes de la version 2 ou ultrieure de la GNU General Public License publie par diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY.sgml brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY.sgml --- brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY.sgml 2016-06-28 11:12:28.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY.sgml 2017-04-18 22:35:13.000000000 +0000 @@ -44,9 +44,9 @@ pour - Version 5.4, Jui 2016 + Version 5.5, Avril 2017 - Copyright © 1995-2016 by Les Dveloppeurs de BRLTTY. + Copyright © 1995-2017 by Les Dveloppeurs de BRLTTY. BRLTTY est un logiciel libre, et n'est fourni avec AUCUNE GARANTIE. Il est plac sous les termes de la version 2 ou ultrieure de la GNU General Public License publie par diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY.txt brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY.txt --- brltty-5.4/Documents/Manual-BRLTTY/French/BRLTTY.txt 2016-06-28 11:22:20.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/BRLTTY.txt 2017-04-18 22:38:58.000000000 +0000 @@ -14,12 +14,12 @@ Jean-Philippe Mengual pour Traduc.org - Version 5.4, Jui 2016 + Version 5.5, Avril 2017 - Copyright 1995-2016 by Les Dveloppeurs de BRLTTY. BRLTTY est un + Copyright 1995-2017 by Les Dveloppeurs de BRLTTY. BRLTTY est un logiciel libre, et n'est fourni avec AUCUNE GARANTIE. Il est plac - sous les termes de la version 2 ou ultrieure de la GGNNUU GGeenneerraall PPuubblliicc - LLiicceennssee publie par TThhee FFrreeee SSooffttwwaarree FFoouunnddaattiioonn. + sous les termes de la version 2 ou ultrieure de la GNU General Public + License publie par The Free Software Foundation. ______________________________________________________________________ @@ -145,9 +145,9 @@ ______________________________________________________________________ - 11.. PPrraammbbuullee + 1. Prambule - 11..11.. LLiicceennccee + 1.1. Licence Ce programme est un logiciel libre. Vous pouvez le redistribuer et/ou le modifier sous les termes de la GNU General Public License stipule @@ -159,14 +159,14 @@ Si ce n'est pas le cas, crivez la Free Software Foundation Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - 11..22.. MMiissee eenn ggaarrddee + 1.2. Mise en garde Ce programme est distribu avec l'espoir d'tre utile, mais SANS AUCUNE GARANTIE, mme pas celle d'tre COMMERCIALISABLE ou de CONVENIR - UNE FINALIT EN PARTICULIER. Voir la GGNNUU GGeenneerraall PPuubblliicc LLiicceennssee pour + UNE FINALIT EN PARTICULIER. Voir la GNU General Public License pour plus de dtails. - 11..33.. CCoonnttaaccttss + 1.3. Contacts BRLTTY est le travail d'une quipe. Pour des informations actualises, voyez la page Web de BRLTTY sur [http://brltty.com/]. Ont particip @@ -175,47 +175,47 @@ Dave Mielke (responsable, actif) - WWeebb + Web http://mielke.cc/ - EE--MMaaiill + E-Mail Samuel Thibault (actif) - WWeebb + Web http://dept-info.labri.fr/~thibault/ - EE--MMaaiill + E-Mail Mario Lang (actif) - WWeebb + Web http://delysid.org/ - EE--MMaaiill + E-Mail Nicolas Pitre - WWeebb + Web http://www.fluxnic.net/ - EE--MMaaiill + E-Mail Stphane Doyon - WWeebb + Web http://pages.infinit.net/sdoyon/ - EE--MMaaiill + E-Mail Nikhil Nair (auteur) - EE--MMaaiill + E-Mail @@ -229,7 +229,7 @@ archives, etc, rendez-vous sur la page d'information de la liste, sur http://mielke.cc/mailman/listinfo/brltty. - 22.. IInnttrroodduuccttiioonn + 2. Introduction BRLTTY donne un utilisateur brailliste un accs aux consoles texte d'un systme Linux/Unix. Il excute un processus en arrire-plan @@ -247,7 +247,7 @@ fentre sur l'cran, pour activer et dsactiver des options de revue varies, et pour excuter des fonctions spciales. - 22..11.. RRssuumm ddeess ppoossssiibbiilliittss + 2.1. Rsum des possibilits BRLTTY donne les possibilits suivantes: @@ -295,7 +295,7 @@ Une Interface de programmation de l'Application. - 22..22.. SSyyssttmmee rreeqquuiiss + 2.2. Systme requis Actuellement, BRLTTY fonctionne sur Linux, Solaris, OpenBSD, FreeBSD, NetBSD et Windows. Les portages sur d'autres systmes d'exploitation @@ -303,7 +303,7 @@ vraiment tout intrt pour de tels projets. - LLiinnuuxx + Linux Ce logiciel a t test sur un grand nombre de systmes Linux: Ordinateurs de bureau, portables, et quelques PDAs. @@ -317,29 +317,29 @@ La plupart des noyaux, dont les 1.2.13, 2.0, 2.2, et 2.4. - SSoollaarriiss + Solaris Ce logiciel a t test sur les systmes Solaris suivants: L'architecture Sparc (versions 7, 8, et 9). L'architecture Intel (version 9). - OOppeennBBSSDD + OpenBSD Ce logiciel a t test sur les systmes OpenBSD suivants: L'architecture Intel (version 3.4). - FFrreeeeBBSSDD + FreeBSD Ce logiciel a t test sur les systmes FreeBSD suivants: L'architecture Intel (version 5.1). - NNeettBBSSDD + NetBSD Ce logiciel a t test sur les systmes NetBSD suivants: L'architecture Intel (version 1.6). - WWiinnddoowwss + Windows Ce logiciel a t test sur Windows 95, 98 et XP. @@ -389,7 +389,7 @@ suffire. Si vous rencontrez des problmes, contactez-nous et nous vous compilerons un excutable. - 33.. LLaa pprrooccdduurree ddee ccoommppiillaattiioonn + 3. La procdure de compilation On peut tlcharger BRLTTY depuis son site Web (voir la section ``Contacts'' pour son adresse). Toutes les versions sont fournies en @@ -401,117 +401,117 @@ familiariser d'abord avec les fichiers qui seront finalement installs. - 33..11.. HHiirraarrcchhiiee ddeess ffiicchhiieerrss iinnssttaallllss + 3.1. Hirarchie des fichiers installs La procdure de compilation devrait aboutir l'installation des fichiers suivants: - //bbiinn// + /bin/ - bbrrllttttyy + brltty Le programme BRLTTY. - ````bbrrllttttyy--iinnssttaallll'''' + ``brltty-install'' Un outil pour la copie de la ``hirarchie des fichiers installs'' de BRLTTY d'un emplacement un autre... - ````bbrrllttttyy--ccoonnffiigg'''' + ``brltty-config'' Un outil qui assigne un certain nombre de variables d'environnement des valeurs refltant l'installation courante de BRLTTY. - //lliibb//bbrrllttttyy//rrww// + /lib/brltty/rw/ Fichiers crs lors de l'excution, comme ceux ncessaires mais absents du systme. - //eettcc// + /etc/ - bbrrllttttyy..ccoonnff + brltty.conf Paramtres systme par dfaut pour BRLTTY. - bbrrllaappii..kkeeyy + brlapi.key Cls d'accs pour BrlAPI. - //eettcc//bbrrllttttyy// + /etc/brltty/ Il se peut que votre installation de BRLTTY n'ait pas tous les types de fichiers suivants. Ils ne sont crs qu'en fonction des besoins dduits des options de compilation que vous slectionnez (voir ``Options de compilation''). - **..ccoonnff + *.conf Base de configuration spcifique au pilote. Leur nom - ressemble plus ou moins brltty-_p_i_l_o_t_e.conf, o _p_i_l_o_t_e + ressemble plus ou moins brltty-pilote.conf, o pilote correspond aux deux lettres du ``code d'identification du pilote''. - **..aattbb + *.atb Tables d'attributs (voir la section ``Tables d'attributs'' - pour plus de dtails). Leur nom ressemble _n_a_m_e.atb. + pour plus de dtails). Leur nom ressemble name.atb. - **..aattii + *.ati Fichiers include pour les tables d'attributs. - **..ccttbb + *.ctb Tables de braille abrg (voir ``Tables de braille abrg'' pour plus de dtails). Leur nom ressemble plus ou moins - _l_a_n_g_u_e-_p_a_y_s-_n_i_v_e_a_u.ctb. + langue-pays-niveau.ctb. - **..ccttii + *.cti Fichiers include pour les tables de traduction. - **..kkttbb + *.ktb Tables de touches (voir la section ``Tables de touches'' pour - plus de dtails). Leurs noms ressemble _n_a_m_e.ktb. + plus de dtails). Leurs noms ressemble name.ktb. - **..kkttii + *.kti Fichiers Include pour les tables de touches. - **..ttttbb + *.ttb Tables de texte (voir la section ``Tables de texte'' pour - plus de dtails). Leurs noms ressemble _l_a_n_g_u_a_g_e.ttb. + plus de dtails). Leurs noms ressemble language.ttb. - **..ttttii + *.tti Fichiers Include pour les tables de texte. - **..hhllpp + *.hlp Pages d'aide spcifiques chaque pilote. Leur nom ressemble - plus ou moins brltty-_p_i_l_o_t_e.hlp, o _p_i_l_o_t_e correspond aux + plus ou moins brltty-pilote.hlp, o pilote correspond aux deux lettres du ``code d'identification du pilote''. - //vvaarr//lliibb// + /var/lib/ Sockets locaux pour la connexion l'interface de programmation de l'application. - //iinncclluuddee// + /include/ Les fichiers d'en-tte C pour l'interface de programmation de - l'application. Leurs noms ressemblent _b_r_l_a_p_i_-_f_o_n_c_t_i_o_n.h. + l'application. Leurs noms ressemblent brlapi-fonction.h. L'en-tte principale est brlapi.h. - //iinncclluuddee//bbrrllttttyy// + /include/brltty/ Les fichiers d'en-tte C pour l'interface de programmation de - l'application. Leurs noms ressemblent _b_r_l_d_e_f_s_-_p_i_l_o_t_e.h o - _p_i_l_o_t_e-_p_i_l_o_t_e.h (o _p_i_l_o_t_e correspond aux deux lettres du ``Code + l'application. Leurs noms ressemblent brldefs-pilote.h o + pilote-pilote.h (o pilote correspond aux deux lettres du ``Code d'identification du pilote''). Les en-ttes brldefs.h et api.h sont fournies pour une compatibilit avec des version prcdentes et ne devraient pas tre utilises. - //lliibb// + /lib/ - lliibbbbrrllaappii..aa + libbrlapi.a bibliothque statique de l'interface de programmation de l'application (Application Programming Interface). - lliibbbbrrllaappii..ssoo + libbrlapi.so bibliothque dynamique pour l'interface de programmation de l'application. - //lliibb//bbrrllttttyy// + /lib/brltty/ Il se peut que votre installation de BRLTTY n'ait pas tous les types de fichiers suivants. Ils ne sont crs qu'en fonction des besoins dduits des options de compilation que vous slectionnez (voir ``Options de compilation''). - bbrrllttttyy--bbrrll..llsstt + brltty-brl.lst Une liste des pilotes des afficheurs braille qui ont t compils en tant qu'objets dynamiques et, ainsi, qui peuvent tre utiliss. Chaque ligne contient les deux lettres du code @@ -519,12 +519,12 @@ description de l'afficheur braille pour lequel ce pilote existe. - lliibbbbrrllttttyybb_p_i_l_o_t_e..ssoo..11 - Le pilote dynamique pour un afficheur braille, o _p_i_l_o_t_e + libbrlttybpilote.so.1 + Le pilote dynamique pour un afficheur braille, o pilote correspond aux deux lettres du ``code d'identification du pilote''. - bbrrllttttyy--ssppkk..llsstt + brltty-spk.lst Une liste des pilotes de synthse vocale qui ont t compils en tant qu'objets dynamiques, et, ainsi, qui peuvent tre utiliss. Chaque ligne contient les deux lettres du code @@ -532,73 +532,73 @@ description de la synthse vocale pour laquelle ce pilote existe. - lliibbbbrrllttttyyss_p_i_l_o_t_e..ssoo..11 - Le pilote dynamique pour une synthse vocale, o _p_i_l_o_t_e + libbrlttyspilote.so.1 + Le pilote dynamique pour une synthse vocale, o pilote correspond aux deux lettres du ``Code d'identification du pilote''. - //mmaann// + /man/ Pages de manuel. - mmaann11//_n_o_m..11 + man1/nom.1 Pages de manuel pour les commandes utilisateur lies BRLTTY. - mmaann33//_n_o_m..33 + man3/nom.3 Pages de manuel pour la bibliothque de l'interface de programmation de l'application. D'autres fichiers optionnels que vous devriez connatre, bien qu'ils ne fassent pas partie de la hirarchie des fichiers installs, sont : - //eettcc//bbrrllttttyy..ccoonnff + /etc/brltty.conf Le fichier des paramtres systme par dfaut. Il est cr par l'administrateur systme. Voir ``Le fichier de configuration'' pour plus de dtails. - //eettcc//bbrrllttttyy--_p_i_l_o_t_e..pprreeffss - Le fichier de sauvegarde des paramtres de prfrence (_p_i_l_o_t_e + /etc/brltty-pilote.prefs + Le fichier de sauvegarde des paramtres de prfrence (pilote correspond aux deux lettres du ``code d'identification de pilote''). Il est cr par la commande ``PREFSAVE''. Voir ``Paramtres de Prfrences'' pour plus de dtails. - 33..22.. IInnssttaallllaattiioonn  ppaarrttiirr dd''uunn TTAARR BBaallll + 3.2. Installation partir d'un TAR Ball Voici ce que vous avez faire si vous voulez seulement installer BRLTTY toute vitesse, en esprant que tous nos paramtres par dfaut soient corrects. 1. Tlchargez les sources. Il s'agira d'un fichier nomm brltty- - _v_e_r_s_i_o_n.tar.gz, par exemple brltty-3.0.tar.gz. + version.tar.gz, par exemple brltty-3.0.tar.gz. 2. Dcompressez les sources dans une structure hirarchique native. - tar xzf brltty-_v_e_r_s_i_o_n.tar.gz + tar xzf brltty-version.tar.gz - Cela devrait crer le rpertoire brltty-_v_e_r_s_i_o_n. + Cela devrait crer le rpertoire brltty-version. 3. Allez dans le rpertoire des sources, configurez, compilez et installez BRLTTY. - cd brltty-_v_e_r_s_i_o_n + cd brltty-version ./configure make make install - Vous devez effectuer cette dernire commande en tant que rroooott. + Vous devez effectuer cette dernire commande en tant que root. Pour dsinstaller BRLTTY, faites : - cd brltty-_v_e_r_s_i_o_n + cd brltty-version make uninstall C'est tout ce que vous avez faire. Pour ceux qui veulent vraiment savoir ce qui se passe, voici maintenant les dtails. - 33..22..11.. OOppttiioonnss ddee ccoommppiillaattiioonn + 3.2.1. Options de compilation La premire tape dans la compilation de BRLTTY est de le configurer en fonction de votre systme et/ou de vos besoins personnels. Cela se @@ -623,10 +623,10 @@ contenant le pilote pour votre afficheur braille pour toutes les instructions supplmentaires spcifiques. - 33..22..11..11.. PPaarraammttrreess ssyyssttmmee ppaarr ddffaauutt + 3.2.1.1. Paramtres systme par dfaut - --with-braille-driver=_p_i_l_o_t_e + --with-braille-driver=pilote Spcifie les pilotes des terminaux braille que vous voulez lier l'excutable de BRLTTY. Les pilotes qui ne figureront pas dans la liste de cette option seront compils en tant qu'objets @@ -644,21 +644,21 @@ (-), - aallll + all Lie tous les pilotes l'excutable. Ne les compile pas en tant qu'objets dynamiques. Vous pouvez spcifier ce mot comme lment terminant une liste de pilotes. C'est une faon de spcifier un pilote par dfaut quand tous les pilotes seront compils. - --aallll + -all Ne compile que les pilotes qui ont t explicitement inclus par cette option. - nnoo Ne compile aucun pilote. Cela revient spcifier --without- + no Ne compile aucun pilote. Cela revient spcifier --without- braille-driver. - yyeess + yes Compile tous les pilotes en tant qu'objets dynamiques. Ne les lie pas l'excutable. Cela revient spcifier --with- braille-driver. @@ -667,7 +667,7 @@ l'option ``-b'' de la ligne de commande pour une slection l'excution. - --with-braille-parameters=[_p_i_l_o_t_e:]_n_o_m=_v_a_l_e_u_r,... + --with-braille-parameters=[pilote:]nom=valeur,... Spcifie les paramtres par dfaut pour les pilotes des afficheurs braille. Si un mme paramtre est spcifi plus d'une fois, sa valeur la plus droite est prise en compte. Si le nom @@ -680,31 +680,35 @@ configuration et l'option ``-B'' de la ligne de commande pour la slection l'excution. - --with-braille-device=_p_i_l_o_t_e,... + --with-braille-device=pilote,... Spcifie le port par dfaut auquel l'afficheur braille est reli (voir la section ``Spcification du port braille''). Si vous ne - spcifiez pas cette option, usb: est assum si le support USB - est disponible, et un chemin appropri pour le port srie Com1 - correspondant au systme d'exploitation est assum. Voir la - ligne ``braille-device'' du fichier de configuration et l'option - ``-d'' de la ligne de commande pour la slection l'excution. + spcifiez pas cette option, usb: est suppos si le support USB + est disponible, bluetooth: est suppos si le support Bluetooth + est disponible, et usb:,bluetooth: est suppos si les deux sont + disponibles. Si ni le support USB ni le support Bluetooth ne + sont disponibles, un chemin appropri pour le priphrique du + port srie primaire correspondant au systme d'exploitation est + suppos. Voir la ligne ``braille-device'' du fichier de + configuration et l'option ``-d'' de la ligne de commande pour la + slection l'excution. - --with-libbraille=_r__p_e_r_t_o_i_r_e + --with-libbraille=rpertoire Spcifie l'endroit o se trouve le paquet libbraille, et compile le pilote pour l'afficheur braille libbraille (voir ``Restrictions dans la compilation''). Un des mots suivants peut tre aussi utilis comme oprateur pour l'option:" (-), - nnoo Ne compile pas le pilote. Cela revient spcifier --without- + no Ne compile pas le pilote. Cela revient spcifier --without- libbraille. - yyeess + yes Compile le pilote si le paquet est prsent dans /usr, /usr/local, /usr/local/Libbraille, /usr/local/libbraille, /opt/Libbraille, ou /opt/libbraille. Cela revient spcifier --with-libbraille. - --with-text-table=_f_i_c_h_i_e_r + --with-text-table=fichier Spcifie la table de traduction de texte compile en dur (celle par dfaut) (voir la section ``Tables de texte'' pour plus de dtails). La table spcifie est lie au binaire BRLTTY et elle @@ -720,7 +724,7 @@ ligne de commande pour la slection l'excution. Ce paramtre peut tre modifi par la prfrence ``Text Table''. - --with-attributes-table=_f_i_c_h_i_e_r + --with-attributes-table=fichier Spcifie la table des attributs compile en dur (celle par dfaut) (voir la section ``Tables d'attributs'' pour plus de dtails). La table spcifie est lie au binaire BRLTTY et elle @@ -735,7 +739,7 @@ l'excution. Ce paramtre peut tre modifi par la prfrence ``Attributes Table''. - --with-speech-driver=_p_i_l_o_t_e + --with-speech-driver=pilote Spcifie les pilotes de synthse vocale que vous voulez lier l'excutable de BRLTTY. Les pilotes qui ne figureront pas dans la liste de cette option seront compils en tant qu'objets @@ -748,21 +752,21 @@ est alors exclu de la compilation. Un des mots suivants peut aussi tre utilis comme oprateur pour l'option: - aallll + all Lie tous les pilotes l'excutable. Ne les compile pas en tant qu'objets dynamiques. Vous pouvez spcifier ce mot comme lment terminant une liste de pilotes. C'est une faon de spcifier un pilote par dfaut quand tous les pilotes seront compils. - --aallll + -all Ne compile que les pilotes qui ont t explicitement inclus par cette option. - nnoo Ne compile aucun pilote. Cela revient spcifier --without- + no Ne compile aucun pilote. Cela revient spcifier --without- speech-driver. - yyeess + yes Compile tous les pilotes en tant qu'objets dynamiques. Ne les lie pas l'excutable. Cela revient spcifier --with- speech-driver. @@ -771,7 +775,7 @@ l'option ``-s'' de la ligne de commande pour une slection l'excution. - --with-speech-parameters=[_p_i_l_o_t_e:]_n_o_m=_v_a_l_e_u_r,... + --with-speech-parameters=[pilote:]nom=valeur,... Spcifie les paramtres par dfaut pour les pilotes de synthse vocale. Si un mme paramtre est spcifi plus d'une fois, sa valeur la plus droite est prise en compte. Si le nom d'un @@ -783,108 +787,108 @@ ``speech-parameters'' du fichier de configuration et l'option ``-S'' de la ligne de commande pour la slection l'excution. - --with-flite=_d_i_r_e_c_t_o_r_y + --with-flite=directory Spcifie l'emplacement d'installation de FestivalLite et compile le pilote pour cette synthse vocale (voir ``Restrictions dans la compilation'' L'un des mots suivants peut aussi tre utilis comme oprateur de cette option: - nnoo Ne compile pas le pilote. Cela revient spcifier + no Ne compile pas le pilote. Cela revient spcifier --without-flite. - yyeess + yes Compile le pilote si le paquet existe dans /usr, /usr/local, /usr/local/FestivalLite, /usr/local/flite, /opt/FestivalLite ou /opt/flite. Cela revient spcifier--with-flite. - --with-flite-language=_l_a_n_g_u_a_g_e + --with-flite-language=language Spcifie la langue qu'utilisera le moteur de FestivalLite. La langue utilise par dfaut est l'anglais. - --with-flite-lexicon=_l_e_x_i_c_o_n + --with-flite-lexicon=lexicon Spcifie le dictionnaire que le moteur de FestivalLite utilisera. Le dictionnaire par dfaut est cmulex. - --with-flite-voice=_v_o_i_c_e + --with-flite-voice=voice Spcifie la personne que le moteur de FestivalLite doit utiliser. La voix par dfaut est cmu_us_kal16. - --with-mikropuhe=_d_i_r_e_c_t_o_r_y + --with-mikropuhe=directory Spcifie l'emplacement d'installation du paquet Mickropuhe et compile le pilote pour la synthse vocale Mikropuhe (voir ``Restrictions dans la compilation''). L'un des mots suivants peut aussi tre utilis comme oprateur de cette option: - nnoo Ne compile pas le pilote. Cela revient spcifier + no Ne compile pas le pilote. Cela revient spcifier --without-mikropuhe. - yyeess + yes Compile le pilote si le paquet existe dans /usr, /usr/local, /usr/local, /usr/local/Mikropuhe, /usr/local/mikropuhe, /opt/Mikropuhe ou /opt/mikropuhe. Cela revient spcifier --with-mikropuhe. - --with-speechd=_r_e_p_e_r_t_o_i_r_e + --with-speechd=repertoire Spcifie l'endroit o est install le paquet de la synthse vocale speech-dispatcher (multiplexeur de synthse vocale) et compile le pilote pour speech-dispatcher. L'un des mots suivants peut aussi tre utilis comme oprateur de cette option: - nnoo Ne compile pas le pilote. Cela revient spcifier + no Ne compile pas le pilote. Cela revient spcifier --without-speechd. - yyeess + yes Compile le pilote si le paquet existe dans /usr, /usr/local, /usr/local/speech-dispatcher, /usr/local/speechd, /opt/speech-dispatcher, ou /opt/speechd. Cela revient spcifier --with-speechd. - --with-swift=_r_e_p_e_r_t_o_i_r_e + --with-swift=repertoire Spcifie l'endroit o est install le paquet de la synthse vocale, et compile le pilote pour la synthse vocale Swift. L'un des mots suivants peut aussi tre utilis comme oprateur de cette option: - nnoo Ne compile pas le pilote. Cela revient spcifier + no Ne compile pas le pilote. Cela revient spcifier --without-swift. - yyeess + yes Compile le pilote si le paquet existe dans /usr, /usr/local, /usr/local/Swift, /usr/local/swift, /opt/Swift, ou /opt/swift. Cela revient spcifier --with-swift. - --with-theta=_r_e_p_e_r_t_o_i_r_e + --with-theta=repertoire Spcifie l'emplacement d'installation du paquet Theta et compile le pilote pour la synthse vocale Theta (voir ``Restrictions dans la compilation''). L'un des mots suivants peut aussi tre utilis comme oprateur de cette option: - nnoo Ne compile pas le pilote. Cela revient spcifier + no Ne compile pas le pilote. Cela revient spcifier --without-theta. - yyeess + yes Compile le pilote si le paquet existe dans /usr, /usr/local, /usr/local/Theta, /usr/local/theta, /opt/Theta, ou /opt/theta. Cela revient spcifier --with-theta. - --with-viavoice=_r_e_p_e_r_t_o_i_r_e + --with-viavoice=repertoire Spcifie l'emplacement d'installation du paquet Viavoice et compile le pilote pour la synthse vocale Viavoice (voir ``Restrictions dans la compilation''). L'un des mots suivants peut aussi tre utilis comme oprateur de cette option: - nnoo Ne compile pas le pilote. Cela revient spcifier + no Ne compile pas le pilote. Cela revient spcifier --without-viavoice. - yyeess + yes Compile le pilote si le paquet existe dans /usr, /usr/local, /usr/local/ViaVoice, /usr/local/viavoice, /opt/ViaVoice, ou /opt/viavoice. Cela revient spcifier --with-viavoice. - --with-screen-driver=_p_i_l_o_t_e + --with-screen-driver=pilote Spcifie les pilotes pour l'cran qui seront lis l'excutable BRLTTY. Ceux qui ne sont pas mentionns dans cette option sont compils en tant qu'objets dynamiques et peuvent tre choisis @@ -898,21 +902,21 @@ (-), - aallll + all Lie tous les pilotes l'excutable. Ne les compile pas en tant qu'objets dynamiques. Vous pouvez spcifier ce mot comme lment terminant une liste de pilotes. C'est la faon de spcifier un pilote par dfaut quand tous les pilotes seront compils. - --aallll + -all Ne compile que les pilotes qui ont t explicitement inclus par cette option. - nnoo Ne compile aucun pilote. Cela revient spcifier --without- + no Ne compile aucun pilote. Cela revient spcifier --without- screen-driver. - yyeess + yes Compile tous les pilotes en tant qu'objets dynamiques. Ne les lie pas l'excutable. Cela revient spcifier --with- braille-driver. @@ -927,7 +931,7 @@ l'option ``-x'' de la ligne de commande pour une slection l'excution. - --with-screen-parameters=_n_a_m_e=_v_a_l_e_u_r,... + --with-screen-parameters=name=valeur,... Spcifie les paramtres par dfaut pour le pilote d'cran. Si le mme paramtre est spcifi plus d'une fois, c'est sa valeur la plus droite qui est retenue. Si le nom d'un paramtre est @@ -939,7 +943,7 @@ du fichier de configuration et l'option ``-X'' en ligne de commande pour la slection l'excution. - --with-usb-paquet=_p_a_q_u_e_t,... + --with-usb-paquet=paquet,... Spcifie le paquet qui sera utilis pour l'E/S USB. Vous devez sparer les noms de paquets les uns des autres par une virgule, ils sont traits de la gauche vers la droite. Le premier @@ -953,17 +957,17 @@ Un des mots suivants peut tre aussi utilis comme oprande pour cette option: - nnoo Ne supporte pas l'E/S USB. Cela revient spcifier + no Ne supporte pas l'E/S USB. Cela revient spcifier --without-usb-paquet. - yyeess + yes Utiliser le support natif pour l'E/S USB. Si un support natif n'est pas disponible pour la plateforme actuelle, utiliser alors le premier paquet support disponible (comme pour l'ordre spcifi ci-dessus). Cela revient spcifier --with-usb-paquet. - --with-bluetooth-paquet=_p_a_q_u_e_t,... + --with-bluetooth-paquet=paquet,... Spcifie le paquet qui sera utilis pour l'E/S Bluetooth. Vous devez sparer les noms de paquets les uns des autres par une virgule, ils sont traits de la gauche vers la droite. Le @@ -975,10 +979,10 @@ Un des mots suivants peut tre aussi utilis comme oprande pour cette option: - nnoo Ne supporte pas l'E/S Bluetooth. Cela revient spcifier + no Ne supporte pas l'E/S Bluetooth. Cela revient spcifier --without-bluetooth-paquet. - yyeess + yes Utiliser le support natif pour l'E/S Bluetooth. Si un support natif n'est pas disponible pour la plateforme actuelle, utiliser alors le premier paquet support @@ -986,10 +990,10 @@ revient spcifier --with-bluetooth-paquet. - 33..22..11..22.. SSppcciiffiiccaattiioonn dduu rrppeerrttooiirree + 3.2.1.2. Spcification du rpertoire - --with-execute-root=_r_e_p_e_r_t_o_i_r_e + --with-execute-root=repertoire Spcifie le rpertoire dans lequel la ``hirarchie des fichiers installs'' aura sa racine lors de l'excution. Vous devriez fournir un chemin absolu. Si cette option n'est pas spcifie, @@ -1000,7 +1004,7 @@ BRLTTY installes en mme temps (voir la section ``Installiation de plusieurs versions'' pour un exemple de cette opration). - --with-install-root=_r_e_p_e_r_t_o_i_r_e + --with-install-root=repertoire Spcifie le rpertoire o la ``hirarchie des fichiers installs'' sera installe. Vous devriez fournir un chemin absolu. Si cette option n'est pas spcifie, la racine @@ -1013,7 +1017,7 @@ vous compilez BRLTTY sur un systme pour l'utiliser sur un autre. - --prefix=_r_e_p_e_r_t_o_i_r_e + --prefix=repertoire Indique le rpertoire dans lequel la ``hirarchie des fichiers installs'' constitue le rpertoire par dfaut, indpendant de l'architecture, et qui sera utilis comme rpertoire racine. Ces @@ -1034,7 +1038,7 @@ utilis. Ce rpertoire est li celui prcis par l'option de compilation ``--with-execute-root''. - --with-writable-directory=_r__p_e_r_t_o_i_r_e + --with-writable-directory=rpertoire Spcifie le rpertoire dans lequel la ``hirarchie des fichiers installs'' pourra tre crite. Vous devriez fournir un chemin absolu. Un des mots suivants peut tre utilis comme oprateur @@ -1042,10 +1046,10 @@ (-), - nnoo Ne dfinit pas de rpertoire inscriptible (writable). Cela + no Ne dfinit pas de rpertoire inscriptible (writable). Cela revient spcifier --without-writable-directory. - yyeess + yes Utilise l'endroit par dfaut. Cela revient spcifier --with-writable-directory. @@ -1054,7 +1058,7 @@ l'option --with-library-directory est suppos. Le rpertoire est cr s'il n'existe pas. - --exec-prefix=_r__p_e_r_t_o_i_r_e + --exec-prefix=rpertoire Spcifie le rpertoire de la ``hirarchie des fichiers installs'' o les rpertoires par dfaut pour les fichiers dpendant de l'architecture doivent tre placs. Ces @@ -1072,7 +1076,7 @@ celui spcifi par l'option de compilation ``--with-execute- root''. - --libdir=_r_e_p_e_r_t_o_i_r_e + --libdir=repertoire Spcifie le rpertoire situ dans la ``hirarchie des fichiers installs'' o les modules statiques et les objets chargeables dynamiquement pour l'Interface Programmatique de l'Application @@ -1082,7 +1086,7 @@ spcifi par l'option de construction ``--exec-prefix'') est utilis. Le rpertoire est cr s'il n'existe pas. - --sysconfdir=_d_i_r_e_c_t_o_r_y + --sysconfdir=directory Spcifie le rpertoire situ dans la ``hirarchie des fichiers installs'' o les fichiers de configuration sont installer. Vous devez fournir un chemin absolu. Si vous ne spcifiez pas @@ -1092,7 +1096,7 @@ ``--prefix'') qui est utilis. Le rpertoire est cr s'il n'existe pas. - --with-program-directory=_d_i_r_e_c_t_o_r_y + --with-program-directory=directory Spcifie le rpertoire situ dans la ``hirarchie des fichiers installs'' o les excutables (binaires, excutables), doivent tre installs. Vous devez fournir un chemin absolu. Si cette @@ -1102,7 +1106,7 @@ ``--exec-prefix'') qui est utilis. Le rpertoire est cr s'il n'existe pas. - --with-library-directory=_d_i_r_e_c_t_o_r_y + --with-library-directory=directory Spcifie le rpertoire situ dans la ``hirarchie des fichiers installs'' o les pilotes et d'autres fichiers indpendants de l'architecture doivent tre installs. Vous devez fournir un @@ -1113,7 +1117,7 @@ prefix'') qui est utilis. Le rpertoire est cr s'il n'existe pas. - --with-data-directory=_d_i_r_e_c_t_o_r_y + --with-data-directory=directory Spcifie le rpertoire situ dans la ``hirarchie des fichiers installs'' o les tables, les pages d'aide et d'autres fichiers indpendants de l'architecture doivent tre installs. Vous @@ -1124,7 +1128,7 @@ l'option de compilation ``--prefix'') qui est utilis. Le rpertoire est cr s'il n'existe pas. - --with-manpage-directory=_d_i_r_e_c_t_o_r_y + --with-manpage-directory=directory Spcifie le rpertoire situ dans la ``hirarchie des fichiers installs'' o les tables et les pages de manuel doivent tre installes. Vous devez fournir un chemin absolu. Si cette option @@ -1134,7 +1138,7 @@ l'option de compilation ``--prefix'') qui est utilis. Le rpertoire est cr s'il n'existe pas. - --with-include-directory=_d_i_r_e_c_t_o_r_y + --with-include-directory=directory Spcifie le rpertoire situ dans la ``hirarchie des fichiers installs'' o les fichiers d'en-tte C pour l'Interface Programmatique de l'Application doivent tre installs. Vous @@ -1145,7 +1149,7 @@ l'option de compilation ``--prefix'' qui est utilis. Le rpertoire est cr s'il n'existe pas. - 33..22..11..33.. CCaarraaccttrriissttiiqquueess ddee llaa ccoommppiillaattiioonn + 3.2.1.3. Caractristiques de la compilation Ces options sont surtout utiles quand vous compilez BRLTTY pour une disquette de dmarrage. Elles visent rduire la taille des @@ -1208,7 +1212,7 @@ Rduit la taille du programme en excluant le support pour l'interface Digital Audio sur la carte son. - --enable-pcm-support=_i_n_t_e_r_f_a_c_e + --enable-pcm-support=interface Si une plateforme propose plus d'une interface Digital Audio, celle qui sera utilise peut tre spcifie. @@ -1222,7 +1226,7 @@ Rduit la taille du programme en excluant le support pour l'interface numrique d'instruments de musique sur la carte son. - --enable-midi-support=_i_n_t_e_r_f_a_c_e + --enable-midi-support=interface Si une plateforme propose plus d'une interface numrique d'instrument de musique, vous pouvez spcifier celle qui sera utilise. @@ -1254,55 +1258,55 @@ Rduit la taille du programme en excluant l'interface de programmation de l'application. - --with-api-parameters=_n_a_m_e=_v_a_l_e_u_r,... + --with-api-parameters=name=valeur,... Spcifie les paramtres par dfaut pour l'interface de programmation de l'application. Si le mme paramtre est spcifi plus d'une fois, sa valeur la plus droite est utilise. Pour une description des paramtres accepts par - l'interface, voir le manuel de rfrence de BBrrllAAPPII. Voir la + l'interface, voir le manuel de rfrence de BrlAPI. Voir la ligne ``api-parameters'' du fichier de configuration et l'option ``-A'' en ligne de commande pour la slection l'excution. - --disable-caml-bindings=_n_o_m=_v_a_l_e_u_r,... + --disable-caml-bindings=nom=valeur,... Ne compile pas les bindings Caml (interfaces de programmation) pour l'interface de programmation de l'application. - --disable-java-bindings=_n_o_m=_v_a_l_e_u_r,... + --disable-java-bindings=nom=valeur,... Ne compile pas les bindings Java (interfaces de programmation) pour l'interface de programmation de l'application. - --disable-lisp-bindings=_n_o_m=_v_a_l_e_u_r,... + --disable-lisp-bindings=nom=valeur,... Ne compile pas les bindings Lisp (interfaces de programmation) pour l'interface de programmation de l'application. - --disable-python-bindings=_n_o_m=_v_a_l_e_u_r,... + --disable-python-bindings=nom=valeur,... Ne compile pas les bindings Python (interfaces de programmation) pour l'interface de programmation de l'application. - --disable-tcl-bindings=_n_o_m=_v_a_l_e_u_r,... + --disable-tcl-bindings=nom=valeur,... Ne compile pas les bindings Tcl (interfaces de programmation) pour l'interface de programmation de l'application. - --with-tcl-config=_c_h_e_m_i_n + --with-tcl-config=chemin Spcifie l'endroit o se trouve le script de configuration Tcl (tclConfig.sh). Vous pouvez fournir le chemin, soit vers le script lui-mme, soit vers le rpertoire o il se trouve. Un des mots suivants peut tre aussi utilis comme oprateur pour l'option:" (-), - nnoo Utilise d'autres moyens pour savoir si Tcl est disponible et, + no Utilise d'autres moyens pour savoir si Tcl est disponible et, s'il l'est, o il a t install. Cela revient spcifier --without-tcl-config.. - yyeess + yes Cherche le script dans quelques rpertoires couramment utiliss. Cela revient spcifier --with-tcl-config. - 33..22..11..44.. OOppttiioonnss ddiivveerrsseess + 3.2.1.4. Options diverses - --with-init-path=_p_a_t_h + --with-init-path=path Spcifie le chemin du programme rel de dmarrage pour le systme. Vous devriez fournir le chemin absolu. Si vous ne spcifiez pas cette option: @@ -1324,14 +1328,14 @@ pas active. Elle vise tout particulirement la compilation d'une image pour un installeur en braille. - --with-stderr-path==_c_h_e_m_i_n + --with-stderr-path==chemin Spcifie le chemin du fichier ou du priphrique o la sortie standard des erreurs sera crite. Vous devriez fournir un chemin absolu. Si vous ne spcifiez pas cette option, cette possibilit n'est pas active. Cette option vise tout particulirement la compilation d'une image pour un installeur en braille. - 33..22..22.. PPrrppaarreerr lleess cciibblleess ddee ffiicchhiieerr + 3.2.2. Prparer les cibles de fichier Une fois que BRLTTY a t configur, les tapes suivantes consistent en la compilation et l'installation de ce dernier. Elles sont @@ -1340,25 +1344,25 @@ fichier make de BRLTTY supporte la plupart des cibles de maintenance d'application courants. Ils incluent: - mmaakkee + make Un raccourci pour tout prparer. - mmaakkee aallll + make all Compile et fait l'dition de liens pour l'excutable BRLTTY, ses pilotes et leurs pages de manuel, ses programmes de texte, et quelques autres petits outils. - mmaakkee iinnssttaallll + make install Complte la compilation et la phase d'dition de liens (voir ``make all''), et installe alors l'excutable BRLTTY, ses fichiers de donnes (data), pilotes et pages d'aide, aux emplacements corrects et avec les bonnes permissions. - mmaakkee uunniinnssttaallll + make uninstall Enlve du systme l'excutable BRLTTY, ses fichiers de donnes, pilotes et pages de manuel. - mmaakkee cclleeaann + make clean Garantit que la compilation venir et l'dition de liens (voir see ``make all'') se feront vide en enlevant les rsultats de la compilation prcdente, en liant et en testant depuis la @@ -1367,7 +1371,7 @@ listes de pilote, des pages de manuel, des fichiers d'en-tte temporaires, et des fichiers lis. - mmaakkee ddiissttcclleeaann + make distclean Au-del de la suppression des rsultats de la compilation prcdente et de l'edition de liens (voir ``make clean''): @@ -1382,18 +1386,18 @@ diteur de sauvegarde (backup), rsultats de test, les reliquats du patch, et copies de fichiers source originaux. - 33..33.. TTeesstteerr BBRRLLTTTTYY + 3.3. Tester BRLTTY Aprs la compilation, l'dition de liens, et l'installation de BRLTTY, c'est peut-tre une bonne ide de faire un petit test avant de l'activer en permanence. Pour cela, appelez-le avec: - brltty -b_p_i_l_o_t_e -d_p__r_i_p_h__r_i_q_u_e + brltty -bpilote -dpriphrique - Pour _p_i_l_o_t_e, spcifiez les deux lettres du ``code d'identification de - pilote'' correspondant votre afficheur braille. Pour _p__r_i_p_h__r_i_q_u_e, + Pour pilote, spcifiez les deux lettres du ``code d'identification de + pilote'' correspondant votre afficheur braille. Pour priphrique, spcifiez le chemin complet du priphrique auquel votre afficheur braille est connect. @@ -1433,7 +1437,7 @@ ``-e'' pour diriger les messages de diagnostique vers l'erreur standard et non dans le journal systme. - 33..44.. DDmmaarrrreerr BBRRLLTTTTYY + 3.4. Dmarrer BRLTTY Quand BRLTTY est correctement install, on l'appelle par la simple commande brltty. Vous pouvez crer un fichier de configuration (voir @@ -1462,7 +1466,7 @@ la squence de boot. Le nom de ce script dpend de votre distribution. Voici celles que nous connaissons: - RReedd HHaatt + Red Hat /etc/rc.d/rc.local C'est une bonne ide que de dmarrer BRLTTY depuis ce script (surtout @@ -1498,7 +1502,7 @@ dpend de la distribution. Voici les emplacements que nous connaissons: - DDeebbiiaann + Debian /etc/init.d/boot (pour les vieilles versions) /etc/init.d/ (pour les versions rcentes) Un paquet brltty est fourni (voir @@ -1512,7 +1516,7 @@ commande, vous pouvez modifier le contenu entre guillemets de la ligne ARGUMENTS du fichier /etc/default/brltty. - RReeddHHaatt + RedHat /etc/rc.d/rc.sysinit Sachez que les versions rcentes, afin de supporter une procdure d'initialisation du systme plus oriente vers les @@ -1533,10 +1537,10 @@ version de ce script a cette caractristique, assurez-vous de dmarrer BRLTTY aprs les lignes qui le mettent en action. - SSllaacckkwwaarree + Slackware /etc/rc.d/rc.S - SSuuSSEE + SuSE /sbin/init.d/boot Une autre solution est de dmarrer BRLTTY depuis /etc/inittab. Si vous @@ -1586,7 +1590,7 @@ ``RESTARTBRL''). Ou mieux, dsactiver le test du port srie. Voici ce que nous savons sur la manire de raliser cela: - RReedd HHaatt + Red Hat Le test se fait par un service appel kudzu. Utilisez la commande @@ -1608,7 +1612,7 @@ directory"> et ref id="build-execute-root" name="--with-data- directory'' build">. - 33..55.. CCoonnssiiddrraattiioonnss ssuurr llaa ssccuurriitt + 3.5. Considrations sur la scurit L'excution de BRLTTY ncessite les privilges root parce que le programme a besoin, lorsqu'il s'excute, des droits d'accs de lecture @@ -1631,15 +1635,15 @@ Copier/Coller les beep et tout cela, vous pouvez excuter BRLTTY sans les privilges root. - 33..66.. RReessttrriiccttiioonnss aapppplliiccaabblleess  llaa ccoommppiillaattiioonn eett  ll''eexxccuuttiioonn + 3.6. Restrictions applicables la compilation et l'excution - lleess bbeeeeppss dd''AAlleerrttee + les beeps d'Alerte Certaines plateformes ne supportent pas tous les priphriques sonores. Voir ``Priphrique pour le son'' pour plus de dtails. - PPiilloottee ppoouurr llaa ssyynntthhssee FFeessttiivvaallLLiittee + Pilote pour la synthse FestivalLite Le pilote pour le moteur FestivalLite n'est compil que si ce paquet a t install. @@ -1650,12 +1654,12 @@ speech-driver'') car les bibliothques ncessaires leur excution contiennent des lments conflictuels. - PPiilloottee ppoouurr ll''aaffffiicchheeuurr bbrraaiillllee LLiibbbbrraaiillllee + Pilote pour l'afficheur braille Libbraille Le pilote pour le paquet libbraille n'est compil que si le paquet a t install. - PPiilloottee ppoouurr llaa ssyynntthhssee MMiikkrrooppuuhhee + Pilote pour la synthse Mikropuhe Le pilote pour le moteur Mikropuhe n'est compil que si ce paquet a t install. @@ -1665,7 +1669,7 @@ standalone-programs'') car le paquet n'inclut pas de bibliothque statique. - LLee ppiilloottee ppoouurr llaa ssyynntthhssee TThheettaa + Le pilote pour la synthse Theta Le pilote pour le moteur Theta n'est compil que si ce paquet a t install. @@ -1682,7 +1686,7 @@ l'intrieur du paquet ne contiennent pas les chemins de recherche pour l'excution et leurs dpendances. - VViiaaVVooiiccee SSppeeeecchh SSyynntthheessiizzeerr DDrriivveerr + ViaVoice Speech Synthesizer Driver Le pilote pour le moteur ViaVoice n'est compil que si ce paquet a t install. @@ -1692,26 +1696,26 @@ standalone-programs'') car le paquet n'inclut pas de bibliothque statique. - PPiilloottee ppoouurr ll''aaffffiicchheeuurr bbrraaiillllee VViiddeeooBBrraaiillllee + Pilote pour l'afficheur braille VideoBraille Le pilote pour l'afficheur braille VideoBraille est compil sur tous les systmes, mais ne fonctionne que sur Linux. - 33..77.. IInnssttaallllaattiioonn  ppaarrttiirr dd''uunn ffiicchhiieerr RRPPMM + 3.7. Installation partir d'un fichier RPM Pour installer BRLTTY partir d'un fichier RPM (RedHat paquet Manager), procder comme suit: 1. Tlchargez le paquet excutable correspondant votre matriel. Ce - sera un fichier nomm brltty-_v_e_r_s_i_o_n-_v_e_r_s_i_o_n._a_r_c_h_i_t_e_c_t_u_r_e.rpm, par + sera un fichier nomm brltty-version-version.architecture.rpm, par exemple, brltty-3.0-1.i386.rpm. 2. Installez le paquet. - rpm -Uvh brltty-_v_e_r_s_i_o_n-_v_e_r_s_i_o_n._a_r_c_h_i_t_e_c_t_u_r_e.rpm + rpm -Uvh brltty-version-version.architecture.rpm - Vous devez faire cela en tant que rroooott. + Vous devez faire cela en tant que root. A proprement parler, l'option -U (Update) est la seule ncessaire. L'option -v (verbose) affiche le nom du paquet lorsqu'il va tre @@ -1726,12 +1730,12 @@ rpm -e brltty - 33..88.. AAuuttrreess oouuttiillss + 3.8. Autres outils La compilation de BRLTTY donne aussi celle de quelques petits outils d'aide et de diagnostic. - 33..88..11.. bbrrllttttyy--ccoonnffiigg + 3.8.1. brltty-config Cet outil affecte un certain nombre de variables d'environnement des valeurs refltant l'installation courante de BRLTTY (voir les @@ -1745,97 +1749,97 @@ Les variables d'environnement suivantes sont affectes: - BBRRLLTTTTYY__VVEERRSSIIOONN + BRLTTY_VERSION Le numro de version du paquet BRLTTY. - BBRRLLTTTTYY__EEXXEECCUUTTEE__RROOOOTT + BRLTTY_EXECUTE_ROOT La racine de l'excution du paquet install. Configure par l'option de compilation ``--with-execute-root''. - BBRRLLTTTTYY__PPRROOGGRRAAMM__DDIIRREECCTTOORRYY + BRLTTY_PROGRAM_DIRECTORY Rpertoire des programmes excutables (binaires excutables). Configur par l'option de compilation ``--with-program- directory''. - BBRRLLTTTTYY__LLIIBBRRAARRYY__DDIIRREECCTTOORRYY + BRLTTY_LIBRARY_DIRECTORY Rpertoire des pilotes. Configur par l'option de compilation ``--with-library-directory''. - BBRRLLTTTTYY__WWRRIITTAABBLLEE__DDIIRREECCTTOORRYY + BRLTTY_WRITABLE_DIRECTORY Rpertoire dans lequel il est possible d'crire. Configur par l'option de compilation ``--with-writable-directory''. - BBRRLLTTTTYY__DDAATTAA__DDIIRREECCTTOORRYY + BRLTTY_DATA_DIRECTORY Rpertoire des tables et des pages de manuel. Configur par l'option de compilation ``--with-data-directory''. - BBRRLLTTTTYY__MMAANNPPAAGGEE__DDIIRREECCTTOORRYY + BRLTTY_MANPAGE_DIRECTORY Rpertoire des pages de manuel. Configur par l'option de compilation ``--with-manpage-directory''. - BBRRLLTTTTYY__IINNCCLLUUDDEE__DDIIRREECCTTOORRYY + BRLTTY_INCLUDE_DIRECTORY Rpertoire pour les fichiers d'en-tte C de BrlAPI. Configur par l'option de compilation ``--with-include-directory''. - BBRRLLAAPPII__VVEERRSSIIOONN + BRLAPI_VERSION Le numro de version de BrlAPI (BRLTTY's Application Programming Interface). - BBRRLLAAPPII__RREELLEEAASSEE + BRLAPI_RELEASE Le numro de version complet de BrlAPI. - BBRRLLAAPPII__AAUUTTHH + BRLAPI_AUTH Le nom du fichier de cls de BrlAPI. En plus, les variables d'environnement standard autoconf suivantes sont aussi assignes: - pprreeffiixx + prefix Sous-rpertoire pour les fichiers indpendants de l'architecture. Configur par l'option de compilation ``--prefix''. - eexxeecc__pprreeffiixx + exec_prefix Sous-rpertoire pour les fichiers dpendants de l'architecture. Configur par l'option de compilation ``--exec-prefix''. - bbiinnddiirr + bindir Emplacement par dfaut du ``rpertoire du programme''. Configur par l'option de compilation --bindir. - lliibbddiirr + libdir Rpertoire pour les objets dynamiques et statiques de BrlAPI, la localisation par dfaut pour le ``rpertoire des bibliothques''. Configur par l'option de compilation ``--libdir''. - ssyyssccoonnffddiirr + sysconfdir Rpertoire des fichiers de configuration, emplacement par dfaut du ``rpertoire de donnes''. Configur par l'option de compilation ``--sysconfdir''. - mmaannddiirr + mandir Emplacement par dfaut pour le ``rpertoire des pages de manuel''. Configur par l'option de compilation --mandir. - iinncclluuddeeddiirr + includedir Emplacement par dfaut du ``rpertoire des fichiers d'en-tte''. Configur par l'option de compilation --includedir. - 33..88..22.. bbrrllttttyy--iinnssttaallll + 3.8.2. brltty-install Cet outil copie la ``hirarchie des fichiers installs'' de BRLTTY d'un emplacement un autre. - brltty-install _d_e_s_t_i_n_a_t_i_o_n [_o_r_i_g_i_n_e] + brltty-install destination [origine] - _d_e_s_t_i_n_a_t_i_o_n + destination L'emplacement o la ``hirarchie des fichiers installs'' sera copie. Cela doit tre un rpertoire existant. - _f_r_o_m + from L'emplacement partir duquel la ``hirarchie des fichiers installs'' sera copie. S'il est spcifi, le rpertoire doit exister. S'il n'est pas spcifi, l'emplacement utilis pour la @@ -1855,45 +1859,45 @@ systmes avec diffrentes versions de la bibliothque C. Si vous avez des difficults, cela vaut la peine d'enquter. - 33..88..33.. bbrrlltteesstt + 3.8.3. brltest Cet outil teste un pilote d'afficheur braille, et fournit presque une faon interactive d'apprendre ce que font les touches de l'afficheur braille. Vous devriez l'excuter en tant que root. - brltest -_o_p_t_i_o_n ... [_p_i_l_o_t_e [_n_o_m=_v_a_l_e_u_r ...]] + brltest -option ... [pilote [nom=valeur ...]] - _p_i_l_o_t_e + pilote Le pilote de l'afficheur braille. Doit tre les deux lettres du ``code d'identification du pilote''. S'il n'est pas spcifi, le premier pilote configur par l'option de compilation ``--with- braille-driver'' est utilis. - _n_o_m=_v_a_l_e_u_r + nom=valeur Affecte un paramtre d'afficheur braille. Pour une description des paramtres accepts par un pilote spcifique, voir la documentation de ce pilote. - -d_d_e_v_i_c_e --device=_p__r_i_p_h__r_i_q_u_e + -ddevice --device=priphrique Le chemin absolu pour le priphrique auquel l'afficheur braille est connect. S'il n'est pas spcifi, c'est le priphrique configur par l'option de compilation ``--with-braille-device'' qui est utilis. - -D_d_i_r_e_c_t_o_r_y --data-directory=_r__p_e_r_t_o_i_r_e + -Ddirectory --data-directory=rpertoire Vous devriez fournir un chemin absolu pour le rpertoire o les fichiers de donnes des pilotes sont placs. S'il n'est pas spcifi, c'est le rpertoire configur par l'option de compilation ``--with-data-directory'' qui est utilis. - -L_d_i_r_e_c_t_o_r_y --library-directory=_r_e_p_e_r_t_o_i_r_e + -Ldirectory --library-directory=repertoire Le chemin absolu pour le rpertoire dans lequel sont situs les pilotes. S'il n'est pas spcifi, c'est le rpertoire configur par l'option de compilation ``--libdir'' qui est utilis. - -W_r__p_e_r_t_o_i_r_e --writable-directory=_r_e_p_e_r_t_o_i_r_e + -Wrpertoire --writable-directory=repertoire Le chemin absolu vers un rpertoire o il est possible d'crire. S'il n'est pas spcifi, le rpertoire configur avec l'option >e compilation --with-writable-directory est utilis. @@ -1907,37 +1911,37 @@ 10 secondes. Le temps d'affichage du message (utilis pour les segments non-finaux de longs messages) est de 4 secondes. - 33..88..44.. ssppkktteesstt + 3.8.4. spktest Cet outil teste un pilote de synthse vocale. Il se peut qu'il doive tre excut en tant que root. - spktest -_o_p_t_i_o_n ... [_p_i_l_o_t_e [_n_o_m=_v_a_l_u_e ...]] + spktest -option ... [pilote [nom=value ...]] - _p_i_l_o_t_e + pilote Le pilote pour la synthse vocale. Doit tre les deux lettres du ``code d'identification de pilote''. S'il n'est pas spcifi, c'est le premier pilote spcifi par l'option de compilation ``--with-speech-driver'' qui est utilis. - _n_o_m=_v_a_l_e_u_r + nom=valeur Rgle le paramtre du pilote de la synthse vocale. Pour une description des paramtres accepts par un pilote spcifique, voir la documentation de ce pilote. - -t_s_t_r_i_n_g --text-string=_s_t_r_i_n_g + -tstring --text-string=string Le texte qui sera dit. S'il n'est pas spcifi, c'est l'entre standard (stdin) qui est lue. - -D_r_e_p_e_r_t_o_i_r_e --data-directory=_r_e_p_e_r_t_o_i_r_e + -Drepertoire --data-directory=repertoire Le chemin absolu pour le rpertoire dans lequel se situent les fichiers de donnes du pilote. S'il n'est pas spcifi, c'est le rpertoire configur par l'option de compilation ``--with-data- directory'' qui est utilis. - -L_r_e_p_e_r_t_o_i_r_e --library-directory=_r_e_p_e_r_t_o_i_r_e + -Lrepertoire --library-directory=repertoire Le chemin absolu du rpertoire o se situe les pilotes. S'il n'est pas spcifi, c'est le rpertoire configur par l'option de compilation ``--libdir'' qui est utilis. @@ -1946,40 +1950,40 @@ Affiche un rsum des options de la ligne de commande, puis quitte. - 33..88..55.. ssccrrtteesstt + 3.8.5. scrtest Cet outil teste le pilote d'cran. Il doit tre excut en tant que root. - scrtest -_o_p_t_i_o_n ... [_n_o_m=_v_a_l_e_u_r ...] + scrtest -option ... [nom=valeur ...] - _n_o_m=_v_a_l_e_u_r + nom=valeur Rgle le paramtre du pilote de l'cran. Pour une description des paramtres accepts par un pilote spcifique voir la documentation de ce pilote. - -l_c_o_l_o_n_n_e --left=_c_o_l_o_n_n_e + -lcolonne --left=colonne Spcifie la colonne du dbut ( gauche) de l'cran (origine zro). Si vous ne fournissez pas cette valeur, une valeur par dfaut, base sur la largeur spcifie, est slectionne, de telle sorte que la fentre soit centre l'horizontal, est utilise. - -c_c_o_o_m_p_t_e --columns=_c_o_m_p_t_e + -ccoompte --columns=compte Spcifie la largeur de la fentre (en colonnes). Si vous ne fournissez pas cette valeur, une valeur par dfaut, base sur la colonne de dbut, est slectionne, de telle sorte que la fentre soit centre l'horrizontal. - -t_l_i_g_n_e --top=_l_i_g_n_e + -tligne --top=ligne Spcifie la ligne de dbut (en haut) de l'cran (origine zro). Si vous ne fournissez pas cette valeur, une valeur par dfaut, base sur la hauteur spcifie, est slectionne, de telle sorte que la fentre soit centre la verticale. - -r_c_o_m_p_t_e --rows=_c_o_m_p_t_e + -rcompte --rows=compte Spcifie la hauteur de la fentre (en lignes). Si vous ne fournissez pas cette valeur, une valeur par dfaut, base sur la range de dbut spcifie, est slectionne, de telle sorte que @@ -2003,54 +2007,54 @@ 1. Une ligne dtaillant les dimensions de l'cran. - Screen: _l_a_r_g_e_u_rx_h_a_u_t_e_u_r + Screen: largeurxhauteur 2. Une ligne dtaillant la position ( l'origine zro) du curseur. - Cursor: [_c_o_l_o_n_n_e,_l_i_g_n_e] + Cursor: [colonne,ligne] 3. Une ligne dtaillant les dimensions de la zone d'cran slectionne, et la position ( l'origine zro) de son coin en haut gauche. - Region: _l_a_r_g_e_u_rx_h_a_u_t_e_u_r@[_c_o_l_o_n_n_e,_l_i_g_n_e] + Region: largeurxhauteur@[colonne,ligne] 4. Le contenu de la rgion d'cran slectionne. Les caractres non- imprimables sont reprsents par des espaces. - 33..88..66.. ttttbbtteesstt + 3.8.6. ttbtest Cet outil teste une table de texte (section ``Tables de texte''). - ttbtest -_o_p_t_i_o_n ... _i_n_p_u_t_-_t_a_b_l_e _o_u_t_p_u_t_-_t_a_b_l_e + ttbtest -option ... input-table output-table - _t_a_b_l_e_-_e_n_-_e_n_t_r__e + table-en-entre Le chemin du fichier vers la table de texte en entre du test. S'il est relatif, il est ancr au rpertoire configur avec l'option de compilation --with-data-directory. - _t_a_b_l_e_-_e_n_-_s_o_r_t_i_e + table-en-sortie Le chemin du fichier vers la table de texte en sortie du test. S'il est relatif, il est ancr au rpertoire de travail courant. Si vous ne fournissez pas ce paramtre, aucune table en sortie ne sera crite. - -i --input-format=_f_o_r_m_a_t + -i --input-format=format Spcifie le format de la table d'entre. S'il vous ne fournissez pas cette option, le format de la table en entre est dduit de l'extension de son fichier. - -o --output-format=_f_o_r_m_a_t + -o --output-format=format Spcifie le format de la table en sortie. S'il vous ne fournissez pas cette option, le format de la table en entre est dduit de l'extension de son fichier. - -c_c_h_a_r_s_e_t --charset=_c_h_a_r_s_e_t + -ccharset --charset=charset Spcifie le nom de l'encodage 8-bit utiliser lors de l'interprtation des tables. Si vous ne fournissez pas cette option, le codage de l'hte est utilis. @@ -2068,43 +2072,43 @@ vrifie. Si vous la spcifiez, la table d'entre est convertie. Les formats de table suivants sont supports: - ttttbb + ttb BRLTTY - ssbbll + sbl SuSE Blinux - aa22bb + a2b Gnopernicus - ggnnbb + gnb Braille Gnome - 33..88..77.. ccttbbtteesstt + 3.8.7. ctbtest Cet outil teste une table de braille abrg (section ``Tables de braille abrg''). Le texte lu partir de l'entre standard (stdin) est rcrit sur la sortie standard (stdout) en braille abrg. - ctbtest -_f_i_c_h_i_e_r_-_e_n_-_e_n_t_r__e + ctbtest -fichier-en-entre - _f_i_c_h_i_e_r_-_e_n_-_e_n_t_r__e + fichier-en-entre La liste des fichiers traiter. Vous pouvez spcifier n'importe quel nombre de fichiers. Ils sont traits de la gauche vers la droite. Le nom de fichier spcial - est interprt comme l'entre standard (stdin). Si vous ne spcifiez aucun fichier, l'entre standard est traite. - -c_f_i_c_h_i_e_r --contraction-table=_f_i_c_h_i_e_r + -cfichier --contraction-table=fichier Le chemin vers le fichier de la table de braille abrg. S'il est relatif, il est ancr au rpertoire configur par l'option de compilation ``--with-data-directory''. L'extension .ctb est facultative. Si vous ne fournissez pas cette option, en-us-g2 - est assum. + est suppos. - -t_f_i_l_e|auto --text-table=_f_i_l_e|auto + -tfile|auto --text-table=file|auto Spcifie la table de texte (voir la section ``Tables de texte'' pour les dtails). Si vous fournissez un chemin relatif, il est ancr /etc/brltty (voir les options de compilation ``--with- @@ -2114,7 +2118,7 @@ par dfaut au moment de l'excution. Vous pouvez modifier ce paramtre avec la prfrence ``Text Table''. - -w_c_o_l_o_n_n_e_s --output-width==_c_o_l_o_n_n_e_s + -wcolonnes --output-width==colonnes La longueur maximale d'une ligne en sortie. Chaque ligne d'entre en braille abrg est dveloppe sur autant de lignes que ncessaire. Si vous ne spcifiez pas cette option, il n'y a @@ -2141,17 +2145,17 @@ table permet cet outil d'tre rellement utilis en tant que traducteur de braille en texte. - 33..88..88.. ttuunneetteesstt + 3.8.8. tunetest Cet outil teste la facilit des sons d'avertissement, et fournit aussi un moyen facile de crer de nouveaux sons. Il se peut que vous soyez obligs de l'excuter en tant que root. - tunetest -_o_p_t_i_o_n ... {_n_o_t_e _d_u_r__e} ... + tunetest -option ... {note dure} ... - _n_o_t_e + note Un numro de note MIDI standard. Il doit tre un entier de 1 127, avec 60 reprsentant la valeur moyenne. Chaque valeur reprsente un demi-ton chromatique standard, donc des notes les @@ -2160,42 +2164,42 @@ haute (127) reprsente le sixime G au-dessus de Middle C (notation anglosaxonne). - _d_u_r__e + dure La dure de la note est en millisecondes. Elle doit tre un entier de 1 255.. - -d_p__r_i_p_h__r_i_q_u_e --device=_p__r_i_p_h__r_i_q_u_e + -dpriphrique --device=priphrique Le priphrique sur lequel jouer le son. - bbeeeeppeerr + beeper Le beeper interne (gnrateur de sons en console). - ppccmm + pcm L'interface digital audio sur la carte son. - mmiiddii + midi L'interface numrique d'instrument de musique sur la carte son. - ffmm Le synthtiseur FM sur une carte son AdLib, OPL3, Sound + fm Le synthtiseur FM sur une carte son AdLib, OPL3, Sound Blaster, ou quivalente. Vous pouvez abrger le nom du priphrique. Voir la prfrence ``Tune Device'' pour plus de dtails concernant le priphrique par dfaut et les restrictions de la plateforme. - -v_v_o_l_u_m_e --volume=_v_o_l_u_m_e + -vvolume --volume=volume Spcifie le volume la sortie (intensit) sous la forme d'un pourcentage du maximum. Le volume de sortie par dfaut est de 50. - -p_d_e_v_i_c_e --pcm-device=_d_e_v_i_c_e + -pdevice --pcm-device=device Spcifie le priphrique utiliser pour le son (voir la section ``spcification du priphrique PCM''). Cette option ne fonctionne pas si vous avez spcifi l'option de compilation ``--disable-pcm-support''. - preferences-file _f_i_l_e + preferences-file file Spcifie l'emplacement du fichier qui doit tre utilis pour sauvegarder et charger les prfrences de l'utilisateur. Si vous fournissez un chemin relatif, il est ancr sur /var/lib/brltty. @@ -2203,14 +2207,14 @@ pouvez outre-passer cette ligne avec l'option ``-F'' en ligne de commande. - -m_p_e_r_i_p_h_e_r_i_q_u_e --midi-device=_p_e_r_i_p_h_e_r_i_q_u_e + -mperipherique --midi-device=peripherique Spcifie le priphrique utiliser pour l'interface numrique d'instrument de musique (voir la section ``spcification du priphrique MIDI''). Cette option ne fonctionne pas si vous avez spcifi l'option de compilation ``--disable-midi- support''. - -i_i_n_s_t_r_u_m_e_n_t --instrument=_i_n_s_t_r_u_m_e_n_t + -iinstrument --instrument=instrument L'instrument utiliser si le priphrique slectionn est midi. Pour la liste complte des instruments, voir la ``Table des instrument MIDI''. L'instrument par dfaut est un piano grand @@ -2221,7 +2225,7 @@ -h --help Affiche un rsum des options de la ligne de commande. - 44.. UUttiilliissaattiioonn ddee BBRRLLTTTTYY + 4. Utilisation de BRLTTY Avant de dmarrer BRLTTY, vous avez besoin d'installer votre afficheur braille. Dans la plupart des cas, cela se fait simplement en le @@ -2248,7 +2252,7 @@ Toute activit de l'cran sera affiche sur l'afficheur braille. L'afficheur suivra aussi la progression du curseur sur l'cran. Cette - caractristique est connue en tant que ppoouurrssuuiittee dduu ccuurrsseeuurr. + caractristique est connue en tant que poursuite du curseur. Toutefois, le fait de simplement taper sur le clavier et lire l'afficheur ne suffit pas. Essayez d'entrer une commande qui @@ -2261,7 +2265,7 @@ pour envoyer les commandes BRLTTY qui, entre autres choses, peut s'en charger. - 44..11.. CCoommmmaannddeess + 4.1. Commandes Malheureusement, les diffrents afficheurs braille n'offrent pas des touches de contrle standard. Certains ont des touches standard six @@ -2283,48 +2287,48 @@ habituelles (comme dcrit ci-dessous) pour naviguer dans la page d'aide, puis pressez de nouveau la touche d'aide pour quitter. - 44..11..11.. DDppllaacceemmeenntt vveerrttiiccaall + 4.1.1. Dplacement vertical Voir aussi les commandes de routines ``PRINDENT/NXINDENT'' et ``PRDIFCHAR/NXDIFCHAR''. - LLNNUUPP//LLNNDDNN + LNUP/LNDN Monte/descend d'une ligne. Si le saut des lignes identiques a t activ (voir la commande ``SKPIDLNS''), ces commandes, au lieu de se dplacer exactement d'une ligne l'autre, sont des alias pour les commandes ``PRDIFLN/NXDIFLN''. - WWIINNUUPP//WWIINNDDNN + WINUP/WINDN Monte/descend d'un cran. Si l'cran n'est pas plus haut qu'une ligne, elle dplace alors de 5 lignes. - PPRRDDIIFFLLNN//NNXXDDIIFFLLNN + PRDIFLN/NXDIFLN Monte/descend la ligne la plus proche ayant un contenu diffrent. Si le saut de lignes identiques a t activ (voir les commandes ``SKPIDLNS''), ces commandes, plutt que de sauter des lignes identiques, sont des alias pour les commandes ``LNUP/LNDN'' commands. - AATTTTRRUUPP//AATTTTRRDDNN + ATTRUP/ATTRDN Monte/descend la ligne la plus proche avec des attributs diffrents (mise en valeur de caractre). - TTOOPP//BBOOTT + TOP/BOT Va au dbut ou la fin de la ligne. - TTOOPP__LLEEFFTT//BBOOTT__LLEEFFTT + TOP_LEFT/BOT_LEFT Va au coin en haut gauche ou en bas gauche. - PPRRPPGGRRPPHH//NNXXPPGGRRPPHH + PRPGRPH/NXPGRPH Va la ligne la plus proche du paragraphe prcdent/suivant (la premire ligne non vide aprs la ligne vide la plus proche). La ligne courante est incluse dans la recherche de l'espace entre les paragraphes. - PPRRPPRROOMMPPTT//NNXXPPRROOMMPPTT + PRPROMPT/NXPROMPT Va l'invite de commande suivant/prcdent. - PPRRSSEEAARRCCHH//NNXXSSEEAARRCCHH + PRSEARCH/NXSEARCH Recherche avant/arrire de l'occurrence la plus proche de la chane de caractres du presse-papier coll (voir ``Copier- coller'') qui n'est pas dans la plage braille. La recherche se @@ -2332,17 +2336,17 @@ gauche/droite de la plage, et en englobant le bord de l'cran. La recherche ne tient pas compte de la casse. - 44..11..22.. DDppllaacceemmeenntt hhoorriizzoonnttaall + 4.1.2. Dplacement horizontal Voir aussi la commande de la routine ``SETLEFT''. - CCHHRRLLTT//CCHHRRRRTT + CHRLT/CHRRT Va gauche/droite d'un caractre. - HHWWIINNLLTT//HHWWIINNRRTT + HWINLT/HWINRT Va d'une demi-fentre gauche/droite. - FFWWIINNLLTT//FFWWIINNRRTT + FWINLT/FWINRT Va d'une fentre gauche/droite. Ces commandes sont particulirement utiles parce qu'elles dbordent automatiquement quand elles atteignent le bord de l'cran. Les autres @@ -2350,27 +2354,27 @@ (voir la commande ``SKPBLNKWINS''), accroissent leur maniabilit. - FFWWIINNLLTTSSKKIIPP//FFWWIINNRRTTSSKKIIPP + FWINLTSKIP/FWINRTSKIP Va la fentre non-vide la plus proche gauche/droite. - LLNNBBEEGG//LLNNEENNDD + LNBEG/LNEND Va au dbut/fin de la ligne. - 44..11..33.. DDppllaacceemmeenntt iimmpplliicciittee + 4.1.3. Dplacement implicite Voir aussi la commande de routine ``GOTOMARK''. - HHOOMMEE + HOME Va l'endroit o se trouve le curseur d'cran. - BBAACCKK + BACK Revient l o la commande de dplacement la plus rcente a mis la plage braille. C'est une faon facile de retourner droite de l o vous lisiez, aprs un vnement imprvu (comme une poursuite du curseur) qui dplace la plage braille un moment inappropri. - RREETTUURRNN + RETURN Si le dplacement le plus rcent de la plage braille tait automatique, comme le rsultat d'une poursuite du curseur, @@ -2380,17 +2384,17 @@ Si le curseur n'est pas dans la plage braille, va o se trouve le curseur (voir la commande ``HOME''). - 44..11..44.. AAccttiivvaattiioonn ddee ffoonnccttiioonnnnaalliittss + 4.1.4. Activation de fonctionnalits - Chacune de ces commandes a trois modes: aaccttiivvee (dclenche la - fonction), ddssaaccttiivvee (annule la fonction), et  bbaassccuullee (si la + Chacune de ces commandes a trois modes: active (dclenche la + fonction), dsactive (annule la fonction), et bascule (si la fonction est inhibe, la dclenche, et vis versa). Sauf si cela est explicitement dit, chacune de ces fonctions est initialement - inactif, et, quand elle est aaccttiivvee, cela agit sur l'excution de + inactif, et, quand elle est active, cela agit sur l'excution de BRLTTY tout entier. Le paramtre initial de certaines des fonctionnalits peut tre change par le ``menu des prfrences''. - FFRREEEEZZEE + FREEZE Gle l'image de l'cran. BRLTTY fait une copie de l'cran (contenu et attributs) au moment o l'image de l'cran est raffrachie, et ignore ds lors toute mise jour de l'cran @@ -2398,7 +2402,7 @@ fonctionnalit facilite la lecture de la sortie d'une application qui crit beaucoup trop rapidement. - DDIISSPPMMDD + DISPMD Montre les mises en relief (attributs) de chaque caractre dans la plage braille, plutt que les caractres eux-mmes (le contenu). Par exemple, cette fonctionnalit est utile si vous @@ -2412,7 +2416,7 @@ l'option de compilation ``--with-attributes-table''). Cette fonctionnalit ne s'applique qu'au terminal virtuel courant. - SSIIXXDDOOTTSS + SIXDOTS Montre les caractres brailles sous la forme 6-points et non 8-points. Les points 7 et 8 sont encore utiliss par d'autres fonctionnalits telles que la reprsentation du curseur et le @@ -2422,20 +2426,20 @@ configuration), elle est utilise. Vous pouvez aussi changer ce paramtre avec la prfrence ``Apparence du texte''. - SSLLIIDDEEWWIINN - Si la poursuite du curseur (voir la commande ``CSRTRK'') est oonn, + SLIDEWIN + Si la poursuite du curseur (voir la commande ``CSRTRK'') est on, chaque fois que le curseur se dplace de faon trop limite (ou pas assez) au-del de la fin de la plage braille, elle repositionne horizontalement la plage braille, de sorte que le curseur, tant qu'il reste de ce ct, soit plus proche du - centre. Si cette caractristique est iinnaaccttiivvee, la plage braille + centre. Si cette caractristique est inactive, la plage braille est toujours positionne de faon ce que sont ct gauche soit un multiple de sa largeur depuis le bord gauche de l'cran. Vous pouvez aussi modifier ce paramtre avec la prfrence ``Faire dfiler la fentre''. - SSKKPPIIDDLLNNSS + SKPIDLNS Au lieu de dplacer exactement d'une ligne en haut ou en bas, saute les lignes dj lues qui ont le mme contenu que la ligne courante. Cette caractristiques influence les commandes @@ -2444,24 +2448,24 @@ Vous pouvez aussi changer ce paramtre avec la prfrence ``Sauter les lignes identiques''. - SSKKPPBBLLNNKKWWIINNSS + SKPBLNKWINS Saute les fentres vides dj passes lors d'une lecture en avant ou en arrire. Cette caractristique influence les commandes ``FWINLT/FWINRT''. Vous pouvez aussi changer ce paramtre avec la prfrence ``Sauter les fentres vierges''. - CCSSRRVVIISS + CSRVIS Montre le curseur en superposant un modle de point (voir la commande ``CSRSIZE'') au-dessus du caractre o il se trouve. A - l'origine, cette caractristique est aaccttiivvee. Vous pouvez aussi + l'origine, cette caractristique est active. Vous pouvez aussi changer ce paramtre avec la prfrence ``Afficher le curseur''. - CCSSRRHHIIDDEE + CSRHIDE Rend le curseur invisible (voir la commande ``CSRVIS'' ) de faon lire prcisment le caractre sous lui. Cette caractristique n'affecte que la console virtuelle courante. - CCSSRRTTRRKK + CSRTRK Poursuite du curseur. Si le curseur se dplace un endroit qui n'est pas l'intrieur de la plage braille, il dplace automatiquement la plage braille vers la nouvelle position du @@ -2475,68 +2479,68 @@ deviez dsactiver cette option lorsque vous utilisez une application qui raffrachit en permanence l'cran tout en maintenant une prsentation fixe des donnes. A l'origine, cette - caractristique est aaccttiivvee. + caractristique est active. - CCSSRRSSIIZZEE + CSRSIZE Reprsente le curseur avec les huit points (un bloc complet), au lieu de n'afficher que les points 7 et 8 (un soulignement). Vous pouvez aussi changer ce paramtre avec la prfrence ``Apparence du curseur''. - CCSSRRBBLLIINNKK + CSRBLINK Cache (active et dsactive en fonction d'un intervalle prdfini) le symbole reprsentant le curseur (voir la commande ``CSRVIS''). Vous pouvez changer ce paramtre avec la prfrence ``Curseur clignotant''. - AATTTTRRVVIISS + ATTRVIS Souligne (avec la combinaison des points 7 et 8) les caractres mettre en vidence. - NNoonn ssoouulliiggnn + Non soulign Blanc sur noir (normal), Gris sur noir, Blanc sur bleu, Noir sur cyan. - ppooiinnttss 77 eett 88 + points 7 et 8 Noir sur blanc (vido inverse). - ppooiinntt 88 + point 8 Tout le reste. Vous pouvez aussi changer ce paramtre avec la prfrence ``Afficher les attributes''. - AATTTTRRBBLLIINNKK + ATTRBLINK Masque (active ou dsactive selon un intervalle prdfini) l'attribut soulign (voir la commande ``ATTRVIS'' command). A - l'origine, cette caractristique est aaccttiivvee. Vous pouvez aussi + l'origine, cette caractristique est active. Vous pouvez aussi changer ce paramtre avec la prfrence ``Attributs clignotants''. - CCAAPPBBLLIINNKK + CAPBLINK Masque (active ou dsactive selon un intervalle prdfini) les lettres en majuscule. Vous pouvez aussi changer ce paramtre avec la prfrence ``Majuscules clignotantes''. - TTUUNNEESS + TUNES Joue un son court prdfini (voir ``Sons d'avertissement'') chaque fois qu'un vnement significatif se produit. A - l'origine, cette caractristique est aaccttiivvee. Vous pouvez aussi + l'origine, cette caractristique est active. Vous pouvez aussi changer ce paramtre avec la prfrence ``Sons d'avertissement''. - AAUUTTOORREEPPEEAATT + AUTOREPEAT Rpte automatiquement une commande un intervalle rgulier aprs un dlai initial tant que sa touche (combinaison) reste appuye. Seuls certains pilotes supportent cette fonctionnalit, la principale limite tant que la plupart des afficheurs brailles ne signale pas en mme temps les touches presses et les touches excutes comme des vnements distinctement - spars. A l'origine, cette caractristique est aaccttiivvee. Vous + spars. A l'origine, cette caractristique est active. Vous pouvez aussi changer ce paramtre avec la prfrence ``Rptition automatique''. - AAUUTTOOSSPPEEAAKK + AUTOSPEAK Dit automatiquement: la nouvelle ligne quand la plage braille est dplace @@ -2546,14 +2550,14 @@ le caractre vers lequel vous dplacez le curseur. - A l'origine, cette caractristique est iinnaaccttiivvee. Vous pouvez + A l'origine, cette caractristique est inactive. Vous pouvez aussi changer ce paramtre avec la prfrence ``Parole automatique''. - 44..11..55.. SSlleeccttiioonn ddee mmooddee + 4.1.5. Slection de mode - HHEELLPP + HELP Se dplace la page d'aide du pilote d'un afficheur braille. C'est l que vous pouvez trouver un rsum en ligne de choses telles que ce que font les touches de votre afficheur braille, @@ -2562,7 +2566,7 @@ page d'aide. Appelez la commande help de nouveau pour revenir l'cran. - IINNFFOO + INFO Va l'affichage des tats (voir la section ``Affichage de l'tat'' pour des dtails complets). Cela prsente un rsum comprenant la position du curseur, la position de la plage @@ -2570,7 +2574,7 @@ BRLTTY. Appelez de nouveau cette commande pour revenir l'cran. - LLEEAARRNN + LEARN Entre dans le mode d'apprentissage de commande (voir la section ``Mode Apprentissage des commandes'' pour des dtails complets). C'est ainsi que vous pouvez apprendre de faon interactive ce @@ -2579,82 +2583,82 @@ disponible si l'option de compilation ``--disable-learn-mode'' a t spcifie. - 44..11..66.. MMaaiinntteennaannccee ddeess pprrffrreenncceess + 4.1.6. Maintenance des prfrences - PPRREEFFMMEENNUU + PREFMENU Accs au menu des prfrences (voir ``Le Menu des prfrences'' pour des dtails complets). Rappelez cette commande pour revenir l'cran. - PPRREEFFSSAAVVEE + PREFSAVE Enregistre les paramtres de prfrence courants (voir ``Preferences'' pour des dtails complets). - PPRREEFFLLOOAADD + PREFLOAD Recharge les derniers paramtres de prfrence sauvegards (voir ``Preferences'' pour des dtails complets). - 44..11..77.. NNaavviiggaattiioonn ddaannss llee mmeennuu + 4.1.7. Navigation dans le menu - MMEENNUU__FFIIRRSSTT__IITTEEMM//MMEENNUU__LLAASSTT__IITTEEMM + MENU_FIRST_ITEM/MENU_LAST_ITEM Va au premier/dernier lment du menu. - MMEENNUU__PPRREEVV__IITTEEMMMMEENNUU__NNEEXXTT__IITTEEMM// + MENU_PREV_ITEMMENU_NEXT_ITEM/ Va l'lment prcdent/suivant du menu. - MMEENNUU__PPRREEVV__SSEETTTTIINNGG//MMEENNUU__NNEEXXTT__SSEETTTTIINNGG + MENU_PREV_SETTING/MENU_NEXT_SETTING Remonte/descend le paramtre des lments du menu courant. - 44..11..88.. CCoonnttrrlleess ddee llaa vveerrbboossiitt + 4.1.8. Contrles de la verbosit - SSAAYY__LLIINNEE + SAY_LINE Dit la ligne courante. La prfrence ``Mode Dire la ligne'' dtermine si le message en attente est propos en premier. - SSAAYY__AABBOOVVEE + SAY_ABOVE Dit la portion suprieure de l'cran (qui s'arrte la ligne actuelle). - SSAAYY__BBEELLOOWW + SAY_BELOW Dit la portion infrieure de l'cran (qui commence la ligne courante). - MMUUTTEE + MUTE Arrte immdiatement la parole. - SSPPKKHHOOMMEE + SPKHOME Va o se trouve le curseur parlant. - SSAAYY__SSLLOOWWEERR//SSAAYY__FFAASSTTEERR + SAY_SLOWER/SAY_FASTER Diminue/acclre le dbit de parole (voir aussi la prfrence ``Vitesse de la synthse''). Cette commande n'est disponible que si un pilote qui la supporte est utilis. - SSAAYY__SSOOFFTTEERR//SSAAYY__LLOOUUDDEERR + SAY_SOFTER/SAY_LOUDER Diminue/augmente le volume de la parole (voir aussi la prfrence ``Volume de la synthse''). Cette commande n'est disponible que si un pilote qui la supporte est utilis. - 44..11..99.. VVeerrbboossiigg ddaannss llaa nnaavviiggaattiioonn + 4.1.9. Verbosig dans la navigation - SSPPEEAAKK__CCUURRRR__CCHHAARR + SPEAK_CURR_CHAR a - 44..11..1100.. AAlllleerr  uunn tteerrmmiinnaall vviirrttuueell + 4.1.10. Aller un terminal virtuel Voir aussi la commande de touche de chemin ``SWITCHVT''. - SSWWIITTCCHHVVTT__PPRREEVV//SSWWIITTCCHHVVTT__NNEEXXTT + SWITCHVT_PREV/SWITCHVT_NEXT Va la console prcdente/suivante. - 44..11..1111.. AAuuttrreess CCoommmmaannddeess + 4.1.11. Autres Commandes - CCSSRRJJMMPP__VVEERRTT + CSRJMP_VERT Amne le curseur n'importe o sur la premire ligne de la plage braille (voir ``Dplacement du Curseur'' pour des dtails complets). Le curseur se dplace grce la simulation de @@ -2666,20 +2670,20 @@ commandes de dplacement du curseur car cette commande ne tente pas de simuler les flches gauche et droite. - PPAASSTTEE + PASTE Insre les caractres du presse-papier l'emplacement actuel du curseur. (voir ``Copier-coller'' pour des dtails complets). - RREESSTTAARRTTBBRRLL + RESTARTBRL Arrte puis relance le pilote de l'afficheur braille. - RREESSTTAARRTTSSPPEEEECCHH + RESTARTSPEECH Arrte puis relance le pilote de la synthse vocale. - 44..11..1122.. CCoommmmaannddeess ddee ccaarraaccttrreess + 4.1.12. Commandes de caractres - RROOUUTTEE + ROUTE Dplace le curseur au caractre associ la routine (voir ``Dplacement du Curseur'' pour des dtails complets). Le curseur se dplace grce la simulation de l'appui sur les @@ -2688,41 +2692,41 @@ curseur sans vraiment avertir, soit utilisent les flches de direction d'autres fins que le dplacement du curseur. - CCUUTTBBEEGGIINN + CUTBEGIN Positionne le dbut du bloc copier au caractre associ la routine-curseur. (voir ``Copier-coller'' pour des dtails complets). Cette commande vide le presse-papier. - CCUUTTAAPPPPEENNDD + CUTAPPEND Positionne le dbut du bloc copier au caractre associ la routine (voir ``Copier-coller'' pour des dtails complets). Cette commande ne vide pas le presse-papier. - CCUUTTRREECCTT + CUTRECT Fixe la fin du bloc copier au caractre associ la touche de direction, et met la fentre rectangulaire dans le presse-papier (voir ``Copier/Coller'' pour des dtails complets). - CCUUTTLLIINNEE + CUTLINE Fixe la fin du bloc copier au caractre associ la touche de direction, et met la fentre linaire dans le presse-papier (voir ``Cut and Paste'' pour des dtails complets). - CCOOPPYYCCHHAARRSS + COPYCHARS Copie le bloc de caractres marqu par les deux touches de routine dans le presse-papier (voir ``Copier et coller'' pour tous les dtails). - AAPPNNDDCCHHAARRSS + APNDCHARS Insre le bloc de caractres marqus par les deux touches de routine dans le presse-papier (voir ``Copier et coller'' pour tous les dtails). - PPRRIINNDDEENNTT//NNXXIINNDDEENNTT + PRINDENT/NXINDENT Monte/descend la ligne la plus proche qui n'est pas indente plus que la colonne associe la routine. - DDEESSCCCCHHAARR + DESCCHAR Affiche momentanment (voir l'option ``-M'' en ligne de commande) un message dcrivant le caractre associ la routine. Cela montre les valeurs dcimales et hexadcimales du @@ -2733,7 +2737,7 @@ char 65 (0x41): white on black bright blink - SSEETTLLEEFFTT + SETLEFT Replace horrizontalement la plage braille de faon ce que son ct gauche soit la colonne associe la touche de dplacement. Cette caractristique rend trs facile l'action de @@ -2742,53 +2746,53 @@ ncessit pour beaucoup de dplacements lmentaires de la plage (comme les commandes ``CHRLT/CHRRT'' et ``HWINLT/HWINRT''). - PPRRDDIIFFCCHHAARR//NNXXDDIIFFCCHHAARR + PRDIFCHAR/NXDIFCHAR Monte/descend la ligne la plus proche contenant un caractre diffrent sur la colonne associe la routine curseur. - 44..11..1133.. CCoommmmaannddeess ddee bbaassee + 4.1.13. Commandes de base - SSWWIITTCCHHVVTT + SWITCHVT Bascule vers le terminal virtuel dont le numro (en commenant 1) correspond la routine curseur. Voir aussi les commandes de basculement entre terminaux virtuels ``SWITCHVT_PREV/SWITCHVT_NEXT''. - SSEETTMMAARRKK + SETMARK Marque la position courante de la plage braille dans une mmoire associe la routine. Voir la commande ``GOTOMARK''. Cette caractristique n'affecte que le terminal virtuel courant. - GGOOTTOOMMAARRKK + GOTOMARK Dplace la plage braille la position prcdemment marque (voir la commande ``SETMARK'') avec la mme routine. Cette fonction n'affecte que le terminal virtuel courant. - 44..22.. LLee ffiicchhiieerr ddee ccoonnffiigguurraattiioonn + 4.2. Le fichier de configuration Des valeurs systme par dfaut pour certains paramtres peuvent tre tablies dans un fichier de configuration. Le nom par dfaut de ce fichier est /etc/brltty.conf, mme s'il peut tre contourn par l'option en ligne de commande ``-f''. Son existence n'est pas indispensable. Vous pouvez trouver un fichier type dans le sous- - rpertoire DOCS + rpertoire Documents Les lignes vides sont ignores. Un commentaire commence par un signe nombre (#), et continue jusqu' la fin de la ligne. Les lignes de commande suivantes sont reconnues: - api-parameters _n_a_m_e=_v_a_l_e_u_r,... + api-parameters name=valeur,... Spcifie les paramtres pour l'API. Si vous spcifiez le mme paramtre plus d'une fois, sa valeur situe le plus droite est utilise. Pour une description des paramtres accepts par - l'interface, voyez le manuel de rfrence BBrrllAAPPII. Voir l'option + l'interface, voyez le manuel de rfrence BrlAPI. Voir l'option de compilation ``--with-api-parameters'' pour les paramtres par dfaut tablis lors de la procdure de compilation. Cette ligne de commande peut tre vite avec l'option en ligne de commande ``-A''. - attributes-table _f_i_l_e + attributes-table file Spcifie la table d'attributs (voir la section ``Tables d'attributs'' pour des dtails). Si vous fournissez un chemin relatif, il est dtermin par rapport /etc/brltty (voir les @@ -2799,7 +2803,7 @@ attributes-table''). Vous pouvez vous passer de cette ligne de commande avec l'option en ligne de commande ``-a''. - braille-device _d_e_v_i_c_e,... + braille-device device,... Spcifie le priphrique auquel l'afficheur braille est connect (voir la section ``Spcification du priphrique braille''). Voir l'option de compilation ``--with-braille-device'' pour les @@ -2807,13 +2811,13 @@ compilation. Vous pouvez vous passer de cette ligne de commande avec l'option ``-d''. - braille-driver _p_i_l_o_t_e,...|auto + braille-driver pilote,...|auto Spcifie le pilote de l'afficheur braille (voir la section ``Spcification du pilote''). Par dfaut, c'est une autodtection qui est effectue. Vous pouvez viter cette ligne avec l'option en ligne de commande ``-b''. - braille-parameters [_p_i_l_o_t_e:]_n_o_m=_v_a_l_e_u_r,... + braille-parameters [pilote:]nom=valeur,... Spcifie les paramtres pour les pilotes de l'afficheur braille. Si vous spcifiez le mme paramtre plus d'une fois, c'est sa valeur place le plus droite qui est utilise. Si le nom d'un @@ -2828,7 +2832,7 @@ pouvez viter cette ligne avec l'option en ligne de commande ``-B''. - contraction-table _f_i_c_h_i_e_r + contraction-table fichier Spcifie la table de braille abrg (voir la section ``Braille abrg'' pour des dtails). Si vous fournissez un chemin relatif, il est dtermin par rapport /etc/brltty (voir les @@ -2842,7 +2846,7 @@ ``-c''. Elle n'est pas disponible si l'option de compilation ``--disable-contracted-braille'' a t spcifie. - key-table _f_i_l_e|auto + key-table file|auto Spcifie la table de touches (voir la section ``Tables de touches'' pour plus de dtails). Si vous fournissez un chemin relatif, il est ancr sur /etc/brltty (voir les options de @@ -2852,7 +2856,7 @@ cette instruction peut tre annul par l'option en ligne de commande ``-k''. - keyboard-properties _n_a_m_e=_v_a_l_u_e,... + keyboard-properties name=value,... Spcifie les proprits du/des claviers(s) qui vont tre surveills (monitored). Si vous spcifiez plus d'une fois la mme proprit, sa valeur la plus droite est utilise. Voir @@ -2861,21 +2865,21 @@ les claviers. Vous pouvez annuler l'effet de cette instruction avec l'option en ligne de commande ``-K''. - midi-device _d_e_v_i_c_e + midi-device device Spcifie le priphrique utiliser pour l'interface MIDI (voir la section ``Spcification du priphrique MIDI''). Vous pouvez viter cette ligne avec l'option en ligne de commande ``-m''. Elle n'est pas disponible si vous avez spcifi l'option de compilation ``--disable-midi-support''. - pcm-device _d_e_v_i_c_e + pcm-device device Spcifie le priphrique utiliser pour le son (voir la section ``Spcification du priphrique PCM''). Vous pouvez viter cette ligne avec l'option en ligne de commande ``-p''. Elle n'est pas disponible si vous avez spcifi l'option de compilation ``--disable-pcm-support''. - screen-parameters _n_a_m_e=_v_a_l_u_e,... + screen-parameters name=value,... Spcifie les paramtres pour le pilote d'cran. Si le mme paramtre est spcifi plus d'une fois, sa valeur la plus droite est utilise. Pour une description des paramtres @@ -2885,26 +2889,26 @@ procdure de compilation. Vous pouvez viter cette ligne avec l'option en ligne de commande ``-X''. - release-device _b_o_o_l_e_a_n + release-device boolean Cre ou non le priphrique auquel l'afficheur braille est connect lorsque l'cran ou la fentre courant ne peuvent pas tre lus. - oonn Crer le priphrique. + on Crer le priphrique. - ooffff + off Ne pas crer le priphrique. Par dfaut, le rglage est on sur les plateformes Windows et off on sur les autres plateformes. Vous pouvez annuler l'effet de cette instruction avec l'option en ligne de commande ``-r''. - screen-driver _d_r_i_v_e_r + screen-driver driver Voir l'option de compilation ``--with-screen-driver''. Vous pouvez viter cette ligne avec l'option en ligne de commande ``-x''. - screen-parameters _p_i_l_o_t_e_n_o_m=_v_a_l_e_u_r,... + screen-parameters pilotenom=valeur,... Spcifie les paramtres pour les pilotes d'cran. Si le mme paramtre est spcii plus d'une fois, sa valeur la plus droite est utilise. Si un nom de paramtre est affect un @@ -2917,7 +2921,7 @@ pouvez viter cette ligne avec l'option en ligne de commande ``-X''. - speech-driver _d_r_i_v_e_r,...|auto + speech-driver driver,...|auto Spcifie le pilote de synthse vocales (voir la section ``Spcification du pilote de synthse''). Par dfaut, une autodtection est effectue. Vous pouvez viter cette ligne @@ -2925,7 +2929,7 @@ disponible si vous avez spcifi l'option de compilation ``--disable-speech-support''. - speech-input _f_i_l_e + speech-input file Spcifie le nom de l'objet du systme de fichiers (FIFO, tuyau (pipe) nomm, socket nomme, etc) que d'autres applications peuvent utiliser pour convertir du texte en parole avec le @@ -2933,7 +2937,7 @@ avec l'option en ligne de commande ``-F''. Elle n'est pas disponible si vous avez spcifi ``--disable-speech-support''. - speech-parameters [_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... + speech-parameters [driver:]name=value,... Spcifie les paramtres pour les pilotes de synthse vocale. Si vous spcifiez plus d'une fois le paramtre, c'est sa valeur le plus droite qui est utilise. Si le nom d'un paramtre est @@ -2947,7 +2951,7 @@ pouvez viter cette ligne avec l'option en ligne de commande ``-S''. - text-table _f_i_l_e|auto + text-table file|auto Spcifie la table de texte (voir la section ``Tables de texte'' pour les dtails). Si vous fournissez un chemin relatif, il est dtermin par rapport /etc/brltty (voir les options de @@ -2960,13 +2964,13 @@ table''). L'effet de cette instruction peut tre annul avec l'option en ligne de commande ``-t''. - 44..33.. OOppttiioonnss eenn lliiggnnee ddee ccoommmmaannddee + 4.3. Options en ligne de commande Un grand nombre de paramtres peuvent tre spcifis explicitement lorsque vous appelez BRLTTY. La commande brltty accepte les options suivantes: - -a_f_i_l_e --attributes-table=_f_i_l_e + -afile --attributes-table=file Spcifie la table d'attributs (voir la section ``Tables d'attributs'' pour les dtails). Si vous fournissez un chemin relatif, il est dtermin par rapport /etc/brltty (voir les @@ -2979,13 +2983,13 @@ paramtres par dfaut lors de l'excution. Vous pouvez changer ce paramtre avec la prfrence ``Table d'attributs''. - -b_d_r_i_v_e_r,...|auto --braille-driver=_d_r_i_v_e_r,...|auto + -bdriver,...|auto --braille-driver=driver,...|auto Spcifie le pilote de l'afficheur braille (voir la section ``Spcification du pilote''). Voir la ligne ``braille-driver'' du fichier de configuration pour les paramtres par dfaut l'excution. - -c_f_i_c_h_i_e_r --contraction-table=_f_i_c_h_i_e_r + -cfichier --contraction-table=fichier Spcifie la table de braille abrg (voir la section ``Braille abrg'' pour les dtails). Si vous fournissez un chemin relatif, il est rattach /etc/brltty. (voir les options de @@ -3000,7 +3004,7 @@ option n'est pas disponible si l'option de compilation ``--disable-contracted-braille'' a t spcifie. - -d_p_e_r_i_p_h_e_r_i_q_u_e,... --braille-device=_d_e_v_i_c_e,... + -dperipherique,... --braille-device=device,... Spcifie le priphrique auquel l'afficheur braille est connect (voir la section ``Spcification du priphrique braille''). Voir la ligne ``braille-device'' du fichier de configuration @@ -3010,7 +3014,7 @@ Ecrit les messages de diagnostic sur la console d'erreur standard (stderr). Par dfaut, ils s'enregistrent dans syslog. - -f_f_i_c_h_i_e_r --configuration-file=_f_i_l_e + -ffichier --configuration-file=file Spcifie l'emplacement du ``fichier de configuration'' qui doit tre utilis pour l'tablissement des paramtres par dfaut l'excution. @@ -3019,7 +3023,7 @@ Affiche un rsum des options en ligne de commande acceptes par BRLTTY, puis quitte. - -i_n_o_m --speech-input=_n_o_m + -inom --speech-input=nom Spcifie le nom de l'objet du systme de fichiers (FIFO, tuyau (pipe) nomm, socket nomme, etc) que les applications peuvent utiliser pour convertir du texte en parole avec le pilote de @@ -3030,7 +3034,7 @@ vous avez spcifi l'option de compilation ``--disable-speech- support''. - -k_f_i_l_e --key-table=_f_i_l_e + -kfile --key-table=file Spcifie la table de touches (voir la section ``Key Tables'' pour plus de dtails). Si vous fournissez un chemin relatif, il est ancr /etc/brltty (voir les options de compilation @@ -3040,32 +3044,32 @@ paramtre d'excution par dfaut. Vous pouvez modifier ce paramtre avec la prfrence ``Table de touches''. - -l_n_i_v_e_a_u --log-level=_l_e_v_e_l + -lniveau --log-level=level Spcifie le niveau de scurit pour l'mission des messages de diagnostique. Les niveaux suivants sont reconnus. - 00 emergency (urgence) + 0 emergency (urgence) - 11 alert (avertissement) + 1 alert (avertissement) - 22 critical (critique) + 2 critical (critique) - 33 error (erreur) + 3 error (erreur) - 44 warning (attention) + 4 warning (attention) - 55 notice (note) + 5 notice (note) - 66 information + 6 information - 77 debug (dbogage) + 7 debug (dbogage) Vous pouvez fournir soit le numro soit le nom, et vous pouvez abrger le nom. Si vous ne spcifiez pas cela, c'est information qui est utilis (voir l'option ``-q'' pour plus de dtails). - -m_p__r_i_p_h__r_i_q_u_e --midi-device=_d_e_v_i_c_e + -mpriphrique --midi-device=device Spcifie le pilote utiliser pour l'interface MIDI. (voir la section ``Spcification du priphrique MIDI''). Voir la ligne ``midi-device'' du fichier de configuration pour les paramtres @@ -3079,7 +3083,7 @@ de fond (dmon) aprs s'tre initialis mais avant de dmarrer tous les pilotes slectionns. - -p_p__r_i_p_h__r_i_q_u_e --pcm-device=_d_e_v_i_c_e + -ppriphrique --pcm-device=device Spcifie le priphrique utiliser pour le son (voir la section (``Spcification du priphrique PCM''). Voir la ligne ``pcm- device'' du fichier de configuration pour les paramtres par @@ -3097,14 +3101,14 @@ tre lus. Voir la ligne ``release-device'' du fichier de configuration pour les paramtres par dfaut l'excution. - -s_p__r_i_p_h__r_i_q_u_e,...|auto --speech-driver=_p_i_l_o_t_e,...|auto + -spriphrique,...|auto --speech-driver=pilote,...|auto Spcifie le pilote de la synthse vocale (voir la section ``Spcification de pilote''). Voir la ligne ``speech-driver'' du fichier de configuration pour les paramtres par dfaut l'excution. Cette option n'est pas disponible si vous avez spcifi l'option de compilation ``--disable-speech-support''. - -t_f_i_l_e --text-table=_f_i_l_e + -tfile --text-table=file Spcifie la table de texte (voir la section ``Tables de texte'' pour les dtails). Si vous fournissez un chemin relatif, il est rattach /etc/brltty (voir les options de compilation @@ -3128,21 +3132,21 @@ (voir l'option en ligne de commande ``-s''), une autodtection de la synthse vocale est entreprise. - -x_p_i_l_o_t_e --screen-driver=_p_i_l_o_t_e... + -xpilote --screen-driver=pilote... Spcifie le pilote d'cran (voir la section Pilotes d'cran supports). Voir la ligne ``screen-driver'' du fichier de configuration pour les paramtres par dfaut l'excution. - -A_n_o_m=_v_a_l_e_u_r,... --api-parameters=_n_a_m_e=_v_a_l_u_e,... + -Anom=valeur,... --api-parameters=name=value,... Spcifie les paramtres pour l'API. Si vous spcifiez le mme paramtre plus d'une fois, c'est sa valeur la plus droite qui est utilise. Pour une description des paramtres accepts par - l'interface, reportez-vous au manuel de rfrence BBrrllAAPPII. Voir + l'interface, reportez-vous au manuel de rfrence BrlAPI. Voir la ligne ``api-parameters'' du fichier de configuration pour les paramtres par dfaut l'excution. - -B[_p_i_l_o_t_e:]_n_o_m=_v_a_l_e_u_r... --braille- - parameters=[_p_i_l_o_t_e:]_n_o_m=_v_a_l_e_u_r,... + -B[pilote:]nom=valeur... --braille- + parameters=[pilote:]nom=valeur,... Spcifie les paramtres pour les pilotes des afficheurs braille. Si vous spcifiez le mme paramtre plus d'une fois, c'est sa valeur le plus droite qui est utilise. Si vous qualifiez le @@ -3253,7 +3257,7 @@ La table de texte (voir l'option ``-a'' en ligne de commande). - -F_f_i_l_e --preferences-file=_f_i_l_e + -Ffile --preferences-file=file Spcifie l'emplacement du fichier qui doit tre utilis pour sauvegarder et charger les les prfrences de l'utilisateur. Si vous spcifiez un chemin relatif, il est encr sur @@ -3277,7 +3281,7 @@ Cette option n'est supporte que sur la plateforme Windows. - -K_n_a_m_e=_v_a_l_u_e,... --keyboard-properties=_n_a_m_e=_v_a_l_u_e,... + -Kname=value,... --keyboard-properties=name=value,... Spcifie les proprits du/des clavier(s) prendre en charge. Si vous spcifiez la mme proprit plus d'une fois, la valeur la plus droite est utilise. Voir la section ``Proprits du @@ -3286,7 +3290,7 @@ fichier de configuration pour les paramtres d'excution par dfaut. - -M_c_s_e_c_s --message-timeout=_c_s_e_c_s + -Mcsecs --message-timeout=csecs Spcifie le temps (en centimes de seconde) que prend BRLTTY pour afficher ses propres messages internes sur l'afficheur braille. Si ce n'est pas spcifi, c'est 400 (4 secondes) qui @@ -3295,7 +3299,7 @@ -N --no-api Dsactive l'interface de programmation de l'application. - -P_f_i_l_e --pid-file=_f_i_l_e + -Pfile --pid-file=file Spcifie le fichier l'intrieur duquel BRLTTY doit crire ses identifiants de processus (pid). Si cela n'est pas spcifi, BRLTTY crit ses identifiants de processus nulle part. @@ -3311,8 +3315,8 @@ Cette option n'est supporte que sur la plateforme Windows. - -S[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,... - --speech-parameters=[_d_r_i_v_e_r:]_n_a_m_e=_v_a_l_u_e,..." Spcifie les + -S[driver:]name=value,... + --speech-parameters=[driver:]name=value,..." Spcifie les paramtres pour les pilotes de synthse vocale. Si vous spcifiez plus d'une fois le mme paramtre, c'est sa valeur la plus droite qui est utilise. Si un nom de paramtre est @@ -3330,7 +3334,7 @@ binaire, puis quitte. Si vous ne spcifiez pas l'option ``-q'', affiche aussi les informations lgales. - -X_n_o_m=_v_a_l_e_u_r,...--screen-parameters=_p_i_l_o_t_e=_n_o_mvaleur... + -Xnom=valeur,...--screen-parameters=pilote=nomvaleur... Spcifie les paramtres pour les pilotes d'cran. Si vous spcifiez plus d'une fois le mme paramtre, c'est sa valeur la plus droite qui est utilise. Si un paramtre est rserv un @@ -3341,9 +3345,9 @@ ligne ``screen-parameters'' du fichier de configuration pour la slection des paramtres par dfaut l'excution. - 55.. DDeessccrriippttiioonn ddeess ppoossssiibbiilliittss + 5. Description des possibilits - 55..11.. RRoouuttiinnee ccuurrsseeuurr + 5.1. Routine curseur Lorsque vous dplacez la plage braille sur l'cran en examinant le texte dans un diteur, vous avez souvent besoin d'amener le curseur @@ -3413,7 +3417,7 @@ lesquelles le dplacement du curseur l'horizontal ne doit jamais tre tent. - 55..22.. CCooppiieerr--ccoolllleerr + 5.2. Copier-coller Cette possibilit vous permet d'extraire un texte qui est dj sur l'cran et de le rentrer la position courante du curseur. Son @@ -3470,7 +3474,7 @@ Le tampon copi est utilis aussi par les commandes ``PRSEARCH/NXSEARCH''. - 55..33.. SSuuppppoorrtt dduu ppooiinntteeuurr ((ssoouurriiss)) vviiaa GGPPMM + 5.3. Support du pointeur (souris) via GPM Si BRLTTY est configur avec l'option de compilation ``--enable-gpm'' sur un systme o l'application gpm a t installe, il ragira au @@ -3536,7 +3540,7 @@ Marquez le presse-papier en utilisant le bouton droit d'une souris trois boutons. - 55..44.. SSoonnss dd''aavveerrttiisssseemmeenntt + 5.4. Sons d'avertissement BRLTTY vous avertit de l'excution d'vnements significatifs en jouant un son bref prdfini. Cette fonctionalit peut tre active et @@ -3548,21 +3552,21 @@ Chaque vnement significatif est associ, de la priorit la plus haute la plus faible, un ou plusieurs des lments suivants: - uunn ssoonn + un son Si vous avez associ un nom l'vnement, si la prfrence ``Sons d'avertissement'' (voir aussi la commande ``TUNES'') est active, et si le priphrique de son slectionn (voir la prfrence ``Priphrique de son'') peut tre ouvert, le son est jou. - uunn sscchhmmaa ddee ppooiinnttss + un schma de points Si un type de signe a t associ un vnement, et si la prfrence ``Points d'avertissement'' est active, le signe est brivement affich sur chaque cellule braille. Certains afficheurs braille ne ragissent pas assez vite pour que ce systme fonctionne efficacement. - uunn mmeessssaaggee + un message Si un message a t associ l'vnement, et si la prfrence ``Messages d'avertissement'' est active, il est affich pendant quelques secondes (voir l'option ``-M'' en ligne de commande. @@ -3595,7 +3599,7 @@ Le moment o la routine-curseur commence, s'achve ou choue. - 55..55.. PPaarraammttrreess ddee pprrffrreennccee + 5.5. Paramtres de prfrence Quand BRLTTY dmarre, il charge un fichier qui contient vos paramtres de prfrence. Il n'est pas indispensable que le fichier existe, et il @@ -3603,10 +3607,10 @@ commande ``PREFSAVE''. Les paramtres sauvegards le plus rcemment peuvent tre restaurs n'importe quand par la commande ``PREFLOAD''. - Le nom de ce fichier est /etc/brltty-_p_i_l_o_t_e.prefs. o _p_i_l_o_t_e + Le nom de ce fichier est /etc/brltty-pilote.prefs. o pilote correspond aux deux lettres du ``code d'identification de pilote''. - 55..55..11.. LLee mmeennuu pprrffrreenncceess + 5.5.1. Le menu prfrences Les paramtres de prfrence sont sauvegards sous forme de donnes binaires que vous ne pouvez donc pas diter la main. Cependant, @@ -3617,7 +3621,7 @@ affiche brivement (voir l'option ``-M'' en ligne de commande) le titre du menu, puis prsente l'item du paramtre actuel. - 55..55..11..11.. NNaavviiggaattiioonn ddaannss llee mmeennuu + 5.5.1.1. Navigation dans le menu Voir ``Commandes de navigation dans le menu'' pour la liste des commandes qui vous permettent de slectionner l'lment, et de changer @@ -3657,29 +3661,29 @@ prfrences. Toute commande non reconnue par le systme du menu fait la mme chose. - 55..55..11..22.. LLeess llmmeennttss dduu mmeennuu + 5.5.1.2. Les lments du menu - EEnnrreeggiissttrreerr eenn qquuiittttaanntt + Enregistrer en quittant Lors de la sortie du menu de prfrences: - NNoonn + Non Ne sauvegarde pas automatiquement les paramtres de prfrence. - OOuuii + Oui Sauvegarde automatiquement les paramtres de prfrence. Le paramtre par dfaut est Non. - AAppppaarreennccee dduu tteexxttee + Apparence du texte Lors de l'affichage du contenu de l'cran (voir la commande ``DISPMD''), montre les caractres: - 88 ppooiinnttss + 8 points Avec les huit points. - 66 ppooiinnttss + 6 points Avec 6 points seulement. Si vous avez slectionn une table de braille abrg (voir l'option ``-c'' en ligne de commande et la ligne ``contraction-table'' du fichier de @@ -3688,62 +3692,62 @@ Vous pouvez aussi changer ce paramtre par la commande ``SIXDOTS''. - PPaasssseerr lleess lliiggnneess iiddeennttiiqquueess + Passer les lignes identiques Quand vous vous dplacez de ligne en ligne en haut ou en bas avec les commandes ``LNUP/LNDN'', et lors de la fonction de dfilement de lignes des commandes ``FWINLT/FWINRT'' et ``FWINLTSKIP/FWINRTSKIP'': - NNoonn + Non Ne passe pas les lignes qui ont le mme contenu que la ligne actuelle. - OOuuii + Oui Passe les lignes dj vues qui ont le mme contenu que la ligne actuelle. Vous pouvez aussi changer ce paramtre avec la commande ``SKPIDLNS''. - PPaasssseerr lleess lliiggnneess vviieerrggeess + Passer les lignes vierges Lors d'un dplacement gauche ou droite avec les commandes ``FWINLT/FWINRT'': - NNoonn + Non Ne passe pas les fentres vides dj lues. - OOuuii + Oui Passe les fentres vides. Vous pouvez aussi changer ce paramtre avec la commande ``SKPBLNKWINS''. - QQuueelllleess ffeennttrreess vviieerrggeess + Quelles fentres vierges Si les fentres vides doivent tre sautes: - TToouutteess + Toutes Les passe toutes. - FFiinn ddee lliiggnnee + Fin de ligne Ne passe que celles qui sont la fin (sur le ct droit) de l'cran. - RReessttee ddee llaa lliiggnnee + Reste de la ligne Ne passe que celles qui sont la fin (sur le ct droit) d'une ligne lors d'une lecture vers l'avant, et au dbut (sur le ct gauche) d'une ligne lors d'une lecture reculons. - FFaaiirree ddffiilleerr llaa ffeennttrree + Faire dfiler la fentre Si le curseur est poursuivi (voir la commande ``CSRTRK'') et que le curseur est trop enferm (ou trop l'extrieur) la fin d'une plage braille: - NNoonn + Non Repositionne la plage horizontalement de sorte que son bord gauche soit un multiple de sa largeur partir du bord gauche de l'cran. - OOuuii + Oui Repositionne la plage horizontalement de faon ce que le curseur, tout en restant sur ce ct de la plage, soit plus proche du centre. @@ -3751,33 +3755,33 @@ Vous pouvez aussi changer ce paramtre avec la commande ``SLIDEWIN''. - EEaaggeerr SSlliiddiinngg WWiinnddooww + Eager Sliding Window Si la plage braille doit glisser: - NNoonn + Non La repositionne chaque fois que le curseur va au-del de la fin. - OOuuii + Oui La repositionne chaque fois que le curseur va trop l'intrieur prs de la fin. Le paramtre initial est non. - CChheevvaauucchheemmeenntt ddee ffeennttrree + Chevauchement de fentre Lors d'un dplacement gauche ou droite avec les commandes ``FWINLT/FWINRT'', ce paramtre spcifie de combien de caractres adjacents horizontalement doit se couvrir la plage braille. Le paramtre initial est 0. - RRppttiittiioonn aauuttoommaattiiqquuee + Rptition automatique Tandis que la touche (la combinaison) d'une commande reste appuye: - NNoonn + Non Ne rpte pas automatiquement la commande. - OOuuii + Oui Rpte automatiquement la commande selon un intervalle rgulier aprs un dlai initial. @@ -3810,151 +3814,151 @@ aussi changer ce paramtre avec la commande ``AUTOREPEAT''. Le paramtre initial est oui. - RRppttiittiioonn aauuttoommaattiiqquuee dduu ddffiilleemmeenntt + Rptition automatique du dfilement Quand la prfrence "Rptition automatique" est active: - NNoonn + Non Ne rpte pas automatiquement les oprations de dfilement de la plage braille. - OOuuii + Oui Rpte automatiquement les oprations de dfilement de la plage braille. Ce paramtre modifie le comportement des commandes "FWINLT/FWINRT". Le paramtre initial est non. - DDllaaii ddee llaa rrppttiittiioonn aauuttoommaattiiqquuee + Dlai de la rptition automatique Lorsqu'un caractre doit tre rpt automatiquement, ce paramtre spcifie la valeur de le dlai (voir la remarque sur ``paramtres de temps'' ci-dessous) qui doit s'couler avant de commencer la rptition automatique. Le paramtre initial est 50. - IInntteerrvvaallllee ddee llaa rrppttiittiioonn aauuttoommaattiiqquuee + Intervalle de la rptition automatique Lorsqu'un caractre doit tre rpt automatiquement, ce paramtre spcifie la valeur de temps (voir la remarque propos de ``paramtres de temps'' ci-dessous) entre chaque rexcution. La valeur initiale est 10. - AAffffiicchheerr llee ccuurrsseeuurr + Afficher le curseur Lors de l'affichage du contenu de l'cran (voir la commande ``DISPMD''): - NNoonn + Non N'affiche pas le curseur. - OOuuii + Oui Affiche le curseur. Vous pouvez aussi changer ce paramtre avec la commande ``CSRVIS''. La valeur initiale est Oui. - AAppppaarreennccee dduu ccuurrsseeuurr + Apparence du curseur Lorsque le curseur est affich, il faut le reprsenter: - SSoouulliiggnn + Soulign (soulign) Avec les points 7 et 8. - PPaavv + Pav (un pav) Avec les huit points. Vous pouvez aussi changer ce paramtre avec la commande ``CSRSIZE''. - CClliiggnnootteemmeenntt dduu ccuurrsseeuurr + Clignotement du curseur Lorsque le curseur doit tre affich: - NNoonn + Non Le rend visible tout le temps. - YYOOuuii + YOui Le rend alternativement visible et invisible selon un intervalle prdfini. Vous pouvez aussi changer ce paramtre avec la commande ``CSRBLINK''. - DDuurree ddee vviissiibbiilliitt dduu ccuurrsseeuurr + Dure de visibilit du curseur Quand le curseur doit clignoter, ce paramtre spcifie la dure (voir la remarque propos des ``paramtres de temps'' ci- dessous) pendant laquelle il est visibile pendant chaque cycle. La valeur par dfaut est 40. - DDuurree dd''iinnvviissiibbiilliitt dduu ccuurrsseeuurr + Dure d'invisibilit du curseur Lorsque le curseur doit clignoter, ce paramtre spcifie la dure (voir la remarque propos des ``paramtres de temps'' ci- dessous) pendant laquelle il est invisibile pendant chaque cycle. La valeur initiale est 40. - AAffffiicchheerr lleess aattttrriibbuuttss + Afficher les attributs Lors de l'affichage du contenu de l'cran (voir la commande ``DISPMD''): - NNoonn + Non Ne souligne pas les caractres en surbrillance. - OOuuii + Oui Souligne les caractres en surbrillance. Vous pouvez aussi changer ce paramtre avec la commande ``ATTRVIS''. - CClliiggnnootttteemmeenntt ddeess aattttrriibbuuttss + Clignottement des attributs Lorsque les caractres en surbrillance doivent clignoter: - NNoonn + Non Laisse l'indicateur visible tout le temps. - OOuuii + Oui Rend l'indicateur alternativement visible et invisible selon un intervalle prdfini. Vous pouvez aussi changer ce paramtre avec la commande ``ATTRBLINK''. - DDuurree ddee vviissiibbiilliitt ddeess aattttrriibbuuttss + Dure de visibilit des attributs Quand le soulignement des caractres en surbrillance doit clignoter, ce paramtre spcifie la dure (voir la remarque propos des ``paramtres de temps'' ci-dessous) pendant laquelle il est visibile pendant chaque cycle. La valeur initiale est 20. - DDuurree dd''iinnvviissiibbiilliitt ddeess aattttrriibbuuttss + Dure d'invisibilit des attributs Quand le soulignement des caractres en surbrillance doit clignoter, ce paramtre spcifie la dure (voir la remarque propos des ``paramtres de temps'' ci-dessous) pendant laquelle il est invisibile pendant chaque cycle. La valeur initiale est 60. - CClliiggnnootttteemmeenntt ddeess mmaajjuussccuulleess + Clignottement des majuscules Lors de l'affichage du contenu de l'cran (voir la commande ``DISPMD''): - NNoonn + Non Laisse les lettres en majuscule visibles tout le temps. - OOuuii + Oui Rend les lettres en majuscule alternativement visibles et invisibles selon un intervalle prdfini. Vous pouvez aussi changer ce paramtre avec la commande ``CAPBLINK''. - DDuurree ddee vviissiibbiilliitt ddeess mmaajjuussccuulleess + Dure de visibilit des majuscules Lorsque les lettres en majuscule doivent clignoter, ce paramtre spcifie la dure (voir la remarque propos des ``paramtres de temps'' ci-dessous) pendant laquelle elles sont visibile pendant chaque cycle. La valeur par dfaut est 60. - DDuurree dd''iinnvviissiibbiilliitt ddeess mmaajjuussccuulleess + Dure d'invisibilit des majuscules Lorsque les lettres en majuscule doivent clignoter, ce paramtre spcifie la dure (voir la remarque propos des ``paramtres de temps'' ci-dessous) pendant laquelle elles sont invisibiles pendant chaque cycle. La valeur par dfaut est 20. - RRuuggoossiitt dduu bbrraaiillllee + Rugosit du braille Rgle la rugosit (ou la rigidit) des points braille. Elle peut tre rgle : @@ -3971,7 +3975,7 @@ Cette prfrence n'est disponible que si vous utilisez un pilote qui la supporte. La valeur initiale est Moyenne. - SSeennssiibbiilliitt dduu bbrraaiillllee + Sensibilit du braille Rgle la sensibilit des points braille au teucher. Elle peut tre rgle : @@ -3988,25 +3992,25 @@ Cette prfrence n'est disponible que si vous utilisez un pilote qui la supporte. La valeur initiale est Moyenne. - LLaa ffeennttrree ssuuiitt llee ppooiinntteeuurr + La fentre suit le pointeur Lors du dplacement du pointeur (souris): - NNoonn + Non N'emmne pas la plage braille. - OOuuii + Oui Emmne la plage braille. Cette prfrence n'est prsente que si l'option de compilation ``--enable-gpm'' a t spcifie. - SSuurrlliiggnneemmeenntt ddee llaa ffeennttrree + Surlignement de la fentre Lors du dplacement de la plage braille: - NNoonn + Non Ne met pas en surbrillance la nouvelle zone de l'cran. - OOuuii + Oui Cette option active un marqueur visible montrant o se situe la plage braille, et, par consquent, permettant de savoir ce que l'utilisateur brailliste est en train de lire. Tout @@ -4022,23 +4026,23 @@ Cette prfrence n'est prsente que si l'option de compilation ``--enable-gpm'' a t spcifie. - SSoonnss dd''aavveerrttiisssseemmeenntt + Sons d'avertissement Chaque fois qu'un vnement significatif avec un son associ se produit, (voir ``Sons d'avertissement''): - NNoonn + Non Ne joue pas le son. - OOuuii + Oui Joue le son. Vous pouvez aussi changer ce paramtre avec la commande ``TUNES''. La valeur initiale est oui. - PPrriipphhrriiqquuee ddee ssoonn + Priphrique de son Joue les son d'avertissement via: - BBeeeeppeerr + Beeper Le beeper interne (gnrateur de sons de la console). Cette valeur est supporte sur Linux, OpenBSD, FreeBSD, et NetBSD. Elle est toujours sre dans son utilisation, bien qu'elle @@ -4046,7 +4050,7 @@ pas disponible si vous avez spcifi l'option de compilation ``--disable-beeper-support''. - PPCCMM + PCM L'interface audio de la carte son. Cette valeur est supporte sous Linux (via /dev/dsp), Solaris (via /dev/audio), OpenBSD (via /dev/audio0), FreeBSD (via @@ -4056,14 +4060,14 @@ avez spcifi l'option de compilation ``--disable-pcm- support''. - MMIIDDII + MIDI L'interface MIDI de la carte son. Cette valeur est supporte sous Linux (via /dev/sequencer). Ne fonctionne pas quand ce priphrique est dj utilis par une autre application. Ce priphrique n'est pas disponible si vous avez spcifi l'option de compilation ``--disable-midi-support''. - FFMM La synthse FM sur une carte son AdLib, OPL3, Sound Blaster, + FM La synthse FM sur une carte son AdLib, OPL3, Sound Blaster, ou quivalente. Cette valeur est supporte sous Linux. Elle fonctionne mme si une synthse FM est dj utilise par une autre application. Les rsultats sont imprvisibles, et @@ -4075,39 +4079,39 @@ La valeur initiale est Beeper sur les plateformes supportant cela, et PCM sur les autres. - VVoolluummee PPCCMM + Volume PCM Si vous utilisez l'interface audio numrique de votre carte son pour jouer les sons d'avertissement, ce paramtre spcifie le volume (sous la forme d'un pourcentage du maximum) auquel ils sont jous. - VVoolluummee MMIIDDII + Volume MIDI Si vous utilisez la Musical Instrument Digital Interface (MIDI, interface numrique d'instruments de musique) de votre carte son pour jouer les sons d'avertissement, ce paramtre spcifie le volume (sous la forme d'un pourcentage du maximum) auquel ils sont jous. Le paramtre initial est 70. - IInnssttrruummeenntt MMIIDDII + Instrument MIDI Si l'interface MIDI de la carte son est utilise pour jouer les sons d'avertissement, ce paramtre spcifie l'instrument qui doit tre utilis (voir ``Table d'instruments MIDI''). La valeur initiale est Grand piano acoustique. - VVoolluummee FFMM + Volume FM Si vous utilisez le synthtiseur FM de votre carte son pour jouer les sons d'avertissement, ce paramtre spcifie le volume (sous la forme d'un pourcentage du maximum) auquel ils sont jous. - PPooiinnttss dd''aavveerrttiisssseemmeenntt + Points d'avertissement Chaque fois qu'un vnement avec un type de point associ se produit (voir ``Sons d'avertissement''): - NNoonn + Non N'affiche pas les points. - OOuuii + Oui Affiche brivement les points. Si les sons d'avertissement doivent tre jous (voir la commande @@ -4116,14 +4120,14 @@ slectionn peut tre ouvert, alors sans s'occuper de la valeur de cette prfrence, les points ne sont pas affichs. - MMeessssaaggeess dd''aavveerrttiisssseemmeenntt + Messages d'avertissement Chaque fois qu'un vnement significatif avec un message associ se produit (voir ``Sons d'avertissement''): - NNoonn + Non N'affiche pas le message. - OOuuii + Oui Affiche le message. Si des sons d'avertissement doivent tre jous (voir la commande @@ -4135,23 +4139,23 @@ l'vnement, sans se soucier de la valeur de cette prfrence, le message n'est pas affich. - MMooddee DDiirree llaa lliiggnnee + Mode Dire la ligne Lors de l'utilisation de la commande ``SAY_LINE'': - IImmmmddiiaatt + Immdiat Suspend la parole. - EEnn ffiillee + En file Ne suspend pas la parole. La valeur initiale est Immdiat. - PPaarroollee aauuttoommaattiiqquuee + Parole automatique - IInnaaccttiiff + Inactif Ne parle que quand vous le demandez explicitement. - AAccttiiff + Actif Dit automatiquement: la nouvelle ligne lorsque vous dplacez la plage braille @@ -4164,26 +4168,26 @@ Vous pouvez aussi changer ce paramtre avec la commande ``AUTOSPEAK''. La valeur initiale est inactif. - VViitteessssee ddee llaa ssyynntthhssee + Vitesse de la synthse Ajuste le dbit de parole (0 est le plus lent, 20 est le plus rapide). Cette prfrence n'est disponible que si vous utilisez un pilote qui la supporte. Vous pouvez aussi changer ce paramtre avec la commande ``SAY_SLOWER/SAY_FASTER''. La valeur initiale est 10. - VVoolluummee ddee llaa ssyynntthhssee + Volume de la synthse Ajuste le volume de la synthse (0 est le plus bas, 20 le plus fort). Cette prfrence n'est disponible que si vous utilisez un pilote qui la supporte. Vous pouvez aussi changer ce paramtre avec la commande ``SAY_SOFTER/SAY_LOUDER''. La valeur initiale est 10. - TToonn ddee llaa vvooiixx + Ton de la voix Ajuste le volume de la synthse ((0 est le plus bas, 20 est le plus lev). Cette prfrence n'est disponible que si vous utilisez un pilote qui la supporte. Le rglage initial est 10. - PPoonnccttuuaattiioonn ppoouurr llaa ssyynntthhssee + Ponctuation pour la synthse Ajuste la quantit de ponctuation parle. Elle peut tre initialise : @@ -4196,37 +4200,37 @@ Cette prfrence n'est disponible que si vous utilisez un pilote qui la supporte. Le rglage initial est Quelques. - AAppppaarreennccee ddee ll''ttaatt + Apparence de l'tat Ce paramtre spcifie la faon dont les cellules d'tat doivent tre utilises. Normalement, vous ne devriez pas avoir besoin de jouer avec a. Cela permet aux dveloppeurs de BRLTTY de tester les configurations des cellules d'tat pour les afficheurs braille qu'ils n'ont pas avec eux. - AAuuccuunnee + Aucune N'utilise pas les cellules de statut. Cette valeur est toujours sre, mais elle est aussi totalement inutile. - AAllvvaa + Alva Les cellules d'tat contiennent: - 11 La place du curseur (voir ci-dessous). + 1 La place du curseur (voir ci-dessous). - 22 La place du coin en haut gauche de la plage braille + 2 La place du coin en haut gauche de la plage braille (voir ci-dessous). - 33 Une lettre indiquant l'tat de BRLTTY. Dans l'ordre de + 3 Une lettre indiquant l'tat de BRLTTY. Dans l'ordre de rangement: - aa Les attributs de l'cran sont affichs (voir la + a Les attributs de l'cran sont affichs (voir la commande ``DISPMD''). - ff L'image de l'cran est gele (voir la commande + f L'image de l'cran est gele (voir la commande ``FREEZE''). - ff Le curseur est poursuivi (voir la commande ``CSRTRK''). + f Le curseur est poursuivi (voir la commande ``CSRTRK''). - _v_i_e_r_g_e + vierge Rien de spcial. Les emplacements du curseur et de la plage braille sont @@ -4236,99 +4240,99 @@ supplmentaires tout en bas) reprsentent le numro de la plage braille horrizontale comme suit: - AAuuccuunn ppooiinnttss + Aucun points La premire fentre (la plus gauche). - PPooiinntt 77 + Point 7 La seconde fentre. - PPooiinntt 88 + Point 8 La troisime fentre. - PPooiinnttss 77 eett 88 + Points 7 et 8 La quatrime fentre. Dans les deux cas, les indicateurs incluent: la ligne 26 est reprsente par la lettre a, et la cinquime plage braille horizontale est reprsente avec aucun point tout en bas. - TTiieemmaann + Tieman Les cellules d'tat contiennent: - 11--22 + 1-2 Les colonnes (en partant de un) du curseur (montres dans la moiti suprieure des cellules et du coin haut gauche de la plage braille (affich dans la partie en bas des cellules). - 33--44 + 3-4 Les lignes (en partant de un) du curseur affiches dans la moiti suprieure des cellules et du coin haut gauche de la plage braille (affich dans la partie basse des cellules). - 55 Chaque point indique si une caractristique est active + 5 Chaque point indique si une caractristique est active comme suit: - ppooiinntt 11 + point 1 L'image de l'cran est gele (voir la commande ``FREEZE''). - PPooiinntt 22 + Point 2 Les attributs de l'cran sont affichs (voir la commande ``DISPMD''). - PPooiinntt 33 + Point 3 Les sons d'avertissement sont jous (voir la commande ``TUNES''). - PPooiinntt 44 + Point 4 Le curseur est affich (voir la commande ``CSRVIS''). - PPooiinntt 55 + Point 5 Le curseur est un pav (voir la commande ``CSRSIZE''). - PPooiinntt 66 + Point 6 Le curseur est masqu (voir la commande ``CSRBLINK''). - PPooiinntt 77 + Point 7 Le curseur est poursuivi (voir la commande ``CSRTRK''). - PPooiinntt 88 + Point 8 La plage braille dfilera (voir la commande ``SLIDEWIN''). - PPoowweerrBBrraaiillllee 8800 + PowerBraille 80 Les cellules d'tat contiennent: - 11 La ligne (en partant de 1) correspondant au haut de la + 1 La ligne (en partant de 1) correspondant au haut de la plage braille. La partie des dizaines est montre dans la moiti suprieure de la cellule, et celle des units est montre dans la moiti infrieure de la cellule. - GGnnrriiqquuee + Gnrique Ce paramtre transmet beaucoup d'informations au pilote braille, et le pilote lui-mme dcide comment les prsenter. - MMDDVV + MDV Les cellules de statut contiennent: - 11--22 + 1-2 L'emplacement du coin en haut gauche de la plage braille. La ligne (en partant de 1) est affiche dans la moiti suprieure des cellules, et la colonne (en partant de 1) est montre dans la moiti infrieure des cellules. - VVooyyaaggeerr + Voyager Les cellules d'tat contiennent: - 11 La ligne (en partant de 0) correspondant au haut de la + 1 La ligne (en partant de 0) correspondant au haut de la plage braille (voir ci-dessous). - 22 La ligne (en partant de 1) sur laquelle se trouve le + 2 La ligne (en partant de 1) sur laquelle se trouve le curseur (voir ci-dessous). - 33 Si l'cran est gel (voir la commande ``FREEZE''), la + 3 Si l'cran est gel (voir la commande ``FREEZE''), la lettre F. Sinon, la colonne (en partant de 1) dans laquelle se trouve le curseur (voir ci-dessous). @@ -4339,25 +4343,25 @@ La valeur initiale dpend du pilote de l'afficheur braille. - TTaabbllee ddee tteexxttee + Table de texte Slectionne la table de texte. Voir la section ``Table de texte'' pour des dtails. Voir l'option ``-t'' en ligne de commande pour la valeur initiale. Cette prfrence n'est pas sauvegarde. - TTaabbllee dd''aattttrriibbuuttss + Table d'attributs Slectionne la table d'attributs. Voir la section ``Tables d'attributs'' pour des dtails. Voir l'option ``-a'' en ligne de commande pour la valeur initiale. Cette prfrence n'est pas sauvegarde. - TTaabbllee ddee bbrraaiillllee aabbrrgg + Table de braille abrg Slectionne la table de braille abrg. Voir la section ``Tables d'abrg'' pour des dtails. Voir l'option ``-c'' en ligne de commande pour la valeur initiale. Cette prfrence n'est pas sauvegarde. - TTaabbee ddee ttoouucchheess + Tabe de touches Slection de la table de touches. Voir la section ``Tables de touches'' pour plus de dtails. Voir l'option ``-k'' en ligne de commande pour le rglage initial. Cette prfrence n'est pas @@ -4368,7 +4372,7 @@ Tous les paramtres de temps sont en centimes de seconde. Ce sont des multiples de 4 compris entre 1 et 100. - 55..66.. LL''aaffffiicchhaaggee ddeess ttaattss + 5.6. L'affichage des tats L'affichage des tats est un rsum de l'tat courant de BRLTTY qui s'adapte totalement l'intrieur de la plage braille. Certains @@ -4383,38 +4387,38 @@ utilisez-la de nouveau pour revenir l'cran. La prsentation des informations qu'il contient dpend de la taille de la plage braille. - 55..66..11.. AAffffiicchheeuurrss ddee 2211 cceelllluulleess oouu pplluuss + 5.6.1. Afficheurs de 21 cellules ou plus De courtes symboliques ont t utilises, bien qu'elles s'apparentent un code chiffr, de faon afficher la prsentation en colonne prcise. - _w_x:_w_y _c_x:_c_y _v_t _t_c_m_f_d_u + wx:wy cx:cy vt tcmfdu - _w_x:_w_y + wx:wy La colonne et la ligne (en partant de 1) sur l'cran correspondant au coin en haut gauche de la plage braille. - _c_x:_c_y + cx:cy La colonne et la ligne (en partant de 1) sur l'cran correspondant la position du curseur. - _v_t Le numro (en partant de 1) de la console virtuelle courante. + vt Le numro (en partant de 1) de la console virtuelle courante. - _t L'tat de la fonction de poursuite du curseur (voir la commande + t L'tat de la fonction de poursuite du curseur (voir la commande ``CSRTRK'' command). - vviiddee + vide Le suivi du curseur est inactif. t Le suivi du curseur est actif. - _c L'tat des caractristiques de visibilit du curseur (voir les + c L'tat des caractristiques de visibilit du curseur (voir les commandes ``CSRVIS'' et ``CSRBLINK''). - vviiddee + vide Le curseur n'est pas visible et ne clignotera pas quand il sera visible. @@ -4425,96 +4429,96 @@ B Le curseur est visible et clignotant. - _m Le mode d'affichage actuel (voir la commande ``DISPMD''). + m Le mode d'affichage actuel (voir la commande ``DISPMD''). t Le contenu de l'cran (texte) est affich. a La surbrillance l'cran (les attributs) est affiche. - _f L'tat de la fonction de gel de l'cran (voir la commande + f L'tat de la fonction de gel de l'cran (voir la commande ``FREEZE''). - vviiddee + vide L'cran n'est pas gel. f L'cran est gel. - _d Le nombre de points braille utiliss pour afficher chaque + d Le nombre de points braille utiliss pour afficher chaque caractre (voir la commande ``SIXDOTS''). 8 Les huit points sont utiliss. 6 Seuls 6 points sont utiliss. - _u L'tat des fonctions d'affichage des lettres majuscules (voir la + u L'tat des fonctions d'affichage des lettres majuscules (voir la commande ``CAPBLINK''). - vviiddee + vide Les lettres en majuscule ne clignotent pas. B Les lettres en majuscule clignotent. - 55..66..22.. AAffffiicchheeuurrss  2200 cceelllluulleess oouu mmooiinnss + 5.6.2. Afficheurs 20 cellules ou moins De courtes symboliques ont t utilises, bien qu'elles s'apparentent un code chiffr, de faon montrer la prsentation en colonne prcise. - _x_x_y_y_s _v_t _t_c_m_f_d_u + xxyys vt tcmfdu - _x_x Les colonnes (en partant de 1) sur l'cran correspondant la + xx Les colonnes (en partant de 1) sur l'cran correspondant la position du curseur (affich dans la moiti suprieure des cellules) et au coin en haut gauche de l'afficheur braille (affich dans la moiti infrieure des cellules). - _y_y Les lignes (en partant de 1) sur l'cran correspondant la + yy Les lignes (en partant de 1) sur l'cran correspondant la position du curseur (affiche dans la moiti suprieure des cellules) et au coin en haut gauche de l'afficheur braille (montr dans la moiti infrieure des cellules). - _s Les valeurs de certaines fonctions de BRLTTY. Une fonctionalit + s Les valeurs de certaines fonctions de BRLTTY. Une fonctionalit est active si le point lui correspondant est lev. - PPooiinntt 11 + Point 1 L'image de l'cran gele (voir la commande ``FREEZE''). - PPooiinntt 22 + Point 2 Affichage des attributs (voir la commande ``DISPMD''). - PPooiinntt 33 + Point 3 Les sons d'avertissement (voir la commande ``TUNES''). - PPooiinntt 44 + Point 4 Curseur visible (voir la commande ``CSRVIS''). - PPooiinntt 55 + Point 5 Curseur en pav (voir la commande ``CSRSIZE''). - PPooiinntt 66 + Point 6 Clignotement du curseur (voir la commande ``CSRBLINK''). - PPooiinntt 77 + Point 7 Poursuite du curseur (voir la commande ``CSRTRK''). - PPooiinntt 88 + Point 8 Glissement de la plage (voir la commande ``SLIDEWIN''). - _v_t Le numro (en partant de 1) de la console virtuelle actuelle. + vt Le numro (en partant de 1) de la console virtuelle actuelle. - _t L'tat de la fonction de poursuite du curseur (voir la commande + t L'tat de la fonction de poursuite du curseur (voir la commande ``CSRTRK'' command). - vviiddee + vide Le suivi du curseur est inactif. t Le suivi du curseur est actif. - _c L'tat des fonctions de visibilit du curseur (voir les + c L'tat des fonctions de visibilit du curseur (voir les commandes ``CSRVIS'' et ``CSRBLINK''). - vviiddee + vide Le curseur n'est pas visible et ne cligontera pas quand il sera visible. @@ -4525,36 +4529,36 @@ B Le curseur est visible et clignotant. - _m Le mode d'affichage actuel (voir la commande ``DISPMD''). + m Le mode d'affichage actuel (voir la commande ``DISPMD''). t Le contenu de l'cran (texte) est affich. a La surbrillance l'cran (les attributs) est affiche. - _f L'tat de la fonction de gel de l'cran (voir la commande + f L'tat de la fonction de gel de l'cran (voir la commande ``FREEZE''). - vviiddee + vide L'cran n'est pas gel. f L'cran est gel. - _d Le nombre de points braille utiliss pour afficher chaque + d Le nombre de points braille utiliss pour afficher chaque caractre (voir la commande ``SIXDOTS''). 8 Les huit points sont utiliss. 6 Seuls 6 points sont utiliss. - _u L'tat des fonctions d'affichage des lettres majuscules (voir la + u L'tat des fonctions d'affichage des lettres majuscules (voir la commande ``CAPBLINK''). - vviiddee + vide Les lettres en majuscule ne clignotent pas. B Les lettres en majuscule clignotent. - 55..77.. MMooddee AApppprreennttiissssaaggee ddeess ccoommmmaannddeess + 5.7. Mode Apprentissage des commandes Le Mode Apprentissage des commandes est une faon interactive d'apprendre ce que les touches de l'afficheur braille font. Vous @@ -4582,9 +4586,9 @@ ``-M'' en ligne de commande) soit jusqu' ce qu'une touche de l'afficheur soit presse. - 66.. TTaabblleess + 6. Tables - 66..11.. TTaabblleess ddee tteexxttee + 6.1. Tables de texte Les fichiers ayant un nom sous la forme *.ttb sont des tables de texte, et ceux avec des noms de la forme *.tti sont des sous-tables de @@ -4693,7 +4697,7 @@ table'' pour des dtails concernant la faon d'utiliser et de changer de table de texte. - 66..11..11.. FFoorrmmaatt ddeess ttaabblleess ddee tteexxttee + 6.1.1. Format des tables de texte Une table de texte consiste en une squence d'instructions, une par ligne, qui dfinit comment chaque caractre doit tre reprsent en @@ -4705,11 +4709,11 @@ caractre non blanc d'une ligne est "#", cette ligne est un commentaire et est ignore. - 66..11..22.. IInnssttrruuccttiioonnss ddeess ttaabblleess ddee tteexxttee + 6.1.2. Instructions des tables de texte Les instructions suivantes sont fournies: - char _c_a_r_a_c_t__r_e _p_o_i_n_t_s # _c_o_m_m_e_n_t_a_i_r_e + char caractre points # commentaire Utilise l'instruction char pour spcifier la faon dont un caractre Unicode sera reprsent en braille. Les caractres dfinis par cette instruction peuvent galement tre saisies au @@ -4722,7 +4726,7 @@ rtrocompatibilit), c'est la premire qui est slectionne. - _c_a_r_a_c_t__r_e + caractre Le caractre Unicode qui sera dfini. Cela peut tre: Tout caractre diffrent d'un antislash ou d'un caractre @@ -4732,49 +4736,49 @@ - - \\bb Le caractre Effacement - + \b Le caractre Effacement - - \\ff Le caractre formfeed - + \f Le caractre formfeed - - \\nn Le caractre Nouvelle ligne. - + \n Le caractre Nouvelle ligne. - - \\oo###### + \o### La reprsentation octale 3 chiffres d'un caractre. - - \\rr Le caractre retour chariot - + \r Le caractre retour chariot - - \\ss Le caractre Espace - + \s Le caractre Espace - - \\tt Le caractre Tab horizontal - + \t Le caractre Tab horizontal - - \\uu######## + \u#### La reprsentation hexadcimale quatre chiffres d'un caractre. - - \\UU################ + \U######## La reprsentation hexadcimale huit chiffres d'un caractre. - - \\vv Le caractre tab vertical - + \v Le caractre tab vertical - - \\xx#### + \x## La reprsentation hexadcimale deux chiffres d'un caractre. - - \\XX#### + \X## ... (la casse du X et des chiffres n'a pas de signification) - - \\## Signe d'un nombre littral. - + \# Signe d'un nombre littral. - - \\<> + \ Le nom Unicode d'un caractre (utilisez _ pour l'espace). - - \\\\ Un antislash littral. + \\ Un antislash littral. - _d_o_t_s + dots La reprsentation braille du caractre Unicode. C'est une squence d'un huit nombres de points. Si la squence du nombre de points est entoure de parenthses, vous pouvez @@ -4803,14 +4807,14 @@ char \ 145 - glyph _c_a_r_a_c_t__r_e _d_o_t_s # _c_o_m_m_e_n_t + glyph caractre dots # comment Utilisez l'instruction glyph pour spcifier la faon dont doit tre reprsent en braille un caractre Unicode. Les caractres dfinis avec cette instruction peuvent uniquement tre affichs. On ne peut pas les saisir au clavier braille. Voir la ligne char pour les dtails sur la syntaxe et pour des exemples. - byte _b_y_t_e _p_o_i_n_t_s # _c_o_m_m_e_n_t_a_i_r_e + byte byte points # commentaire Utilisez l'instruction byte pour spcifier comment un caractre en encodage local doit tre reprsent en braille. Il a t retenu pour des raisons de compatibilit mais ne devrait pas @@ -4821,18 +4825,18 @@ rapport l'encodage local. - _b_y_t_e + byte Le caractre local dfini. Il peut tre spcifi de la mme - manire que l'oprateur _c_a_r_a_c_t__r_e de l'instruction char sauf + manire que l'oprateur caractre de l'instruction char sauf que les formes spcifiques l'Unicode (\u, \U, \<) ne peuvent pas tre utilises. - _p_o_i_n_t_s + points La reprsentation braille du caractre local. Il peut tre - spcifi de la mme manire que l'oprateur _p_o_i_n_t_s de + spcifi de la mme manire que l'oprateur points de l'instruction char. - include _f_i_c_h_i_e_r # _c_o_m_m_e_n_t_a_i_r_e + include fichier # commentaire Utilisez l'instruction include pour inclure le contenu d'une sous-table de texte. Elle est rcursive, ce qui signifie que toute sous-table de texte peut inclure elle-mme une autre sous- @@ -4840,12 +4844,12 @@ "inclusion en boucle". - _f_i_c_h_i_e_r + fichier Le fichier inclure. Cela peut tre un chemin relatif ou absolu. Si c'est relatif, il est ancr au rpertoire contenant le fichier qui inclut. - 66..22.. TTaabblleess dd''aattttrriibbuuttss + 6.2. Tables d'attributs Les fichiers aux noms sous la forme *.atb sont des tables d'attributs et ceux aux noms sous la forme *.ati sont des sous-tables d'attributs. @@ -4854,33 +4858,33 @@ huit points braille reprsente l'un des huit bits d'attributs VGA. Les tables d'attributs suivantes sont fournies: - lleefftt__rriigghhtt + left_right La colonne gauche reprsente les couleurs de premier plan: - PPooiinntt 11 + Point 1 Bleu - PPooiinntt 22 + Point 2 Vert - PPooiinntt 33 + Point 3 Rouge - PPooiinntt 77 + Point 7 Brillant La colonne droite reprsente les couleurs de fond: - PPooiinntt 44 + Point 4 Bleu - PPooiinntt 55 + Point 5 Vert - PPooiinntt 66 + Point 6 Rouge - PPooiinntt 88 + Point 8 Clignotant Un point est affich quand son bit d'attribut correspondant est @@ -4889,33 +4893,33 @@ difficile de distinguer la diffrence entre la vido normale (noir sur blanc) et inverse (blanc sur noir). - iinnvvlleefftt__rriigghhtt + invleft_right La colonne gauche reprsente les couleurs de premier plan: - PPooiinntt 11 + Point 1 Bleu - PPooiinntt 22 + Point 2 Vert - PPooiinntt 33 + Point 3 Rouge - PPooiinntt 77 + Point 7 Brillant La colonne droite reprsente les couleurs de fond: - PPooiinntt 44 + Point 4 Bleu - PPooiinntt 55 + Point 5 Vert - PPooiinntt 66 + Point 6 Rouge - PPooiinntt 88 + Point 8 Clignotant Un bit de fond est actif pour gnrer ses points correspondant, @@ -4924,33 +4928,33 @@ fait la lecture de la plupart des combinaisons d'attributs communment utilises. - uuppppeerr__lloowweerr + upper_lower Le carr suprieur reprsente les couleurs de premier plan: - PPooiinntt 11 + Point 1 Rouge - PPooiinntt 44 + Point 4 Vert - PPooiinntt 22 + Point 2 Bleu - PPooiinntt 55 + Point 5 Brillant Le carr infrieur reprsente les couleurs d'arrire-plan: - PPooiinntt 33 + Point 3 Rouge - PPooiinntt 66 + Point 6 Vert - PPooiinntt 77 + Point 7 Bleu - PPooiinntt 88 + Point 8 Clignotant Un point s'affiche quand le bit de l'attribut qui y correspond @@ -4961,7 +4965,7 @@ ``--with-attributes-table'' pour des dtails concernant l'utilisation et le changement de table d'attributs. - 66..22..11.. FFoorrmmaatt ddeess ttaabblleess dd''aattttrriibbuuttss + 6.2.1. Format des tables d'attributs Une table d'attributs est une squence de lignes de commande, avec une commande par ligne, qui dfinit comment doit tre reprsent en @@ -4972,21 +4976,21 @@ des espaces sont ignores. Si le premier caractre non-blanc d'une ligne est "#" cette ligne est un commentaire et est ignore. - 66..22..22.. LLiiggnneess ddee ccoommmmaannddee ddeess ttaabblleess dd''aattttrriibbuuttss + 6.2.2. Lignes de commande des tables d'attributs Les lignes de commande suivantes sont fournies: - dot _p_o_i_n_t _e_t_a_t # _c_o_m_m_e_n_t_a_i_r_e + dot point etat # commentaire Utilisez l'instruction dot pour spcifier ce que reprsente un point particulier. - _p_o_i_n_t + point Le point qui est dfini. C'est une seule case allant de 1 8 comme dfini par la ``Convention standard du nombre de points brailles''. - __t_a_t + tat Ce que reprsente le point. Il peut s'agir: on D'un point lev si l'attribut nomm est actif. @@ -4996,28 +5000,28 @@ Les noms des bits des attributs sont: - 00XX0011 + 0X01 bleu premier plan - 00XX0022 + 0X02 vert premier plan/ - 00XX0044 + 0X04 rouge premier plan/ - 00XX0088 + 0X08 brillant premier plan/ - 00XX1100 + 0X10 fond bleu - 00XX2200 + 0X20 fond vert - 00XX4400 + 0X40 fond rouge - 00XX8800 + 0X80 fond clignotant Exemples: @@ -5026,7 +5030,7 @@ dot 2 ~bg-blue - include _f_i_c_h_i_e_r # _c_o_m_m_e_n_t_a_i_r_e + include fichier # commentaire Utilisez la ligne include pour inclure le contenu d'une sous- table d'attributs. Il est rcursif, ce qui signifie que toute sous-table d'attributs peut inclure elle-mme une autre sous- @@ -5034,12 +5038,12 @@ une "inclusion en boucle". - _f_i_c_h_i_e_r + fichier Le fichier inclure. Cela peut tre un chemin relatif ou absolu. Si c'est relatif, il est ancr au rpertoire contenant le fichier qui inclut. - 66..33.. TTaabblleess ddee bbrraaiillllee aabbrrgg + 6.3. Tables de braille abrg Les fichiers aux noms sous la forme *.ctb sont des tables de braille abrg et ceux aux noms sous la forme *.cti sont des sous-tables de @@ -5097,7 +5101,7 @@ table'' du fichier de configuration pour des dtails sur la faon d'utiliser une table d'abrg. - 66..33..11.. FFoorrmmaatt ddeess ttaabblleess ddee bbrraaiillllee aabbrrgg + 6.3.1. Format des tables de braille abrg Une table de braille abrg est une squence de lignes de commande, avec une commande par ligne, qui dfinit comment les squences de @@ -5112,7 +5116,7 @@ Le format d'une entre de table de braille abrg est: - _d_i_r_e_c_t_i_v_e _o_p__r_a_t_e_u_r ... [_c_o_m_m_e_n_t_a_i_r_e] + directive oprateur ... [commentaire] Chaque ligne a un nombre d'oprateurs spcifique. Tout texte au-del @@ -5130,10 +5134,10 @@ squence peut tre traduite diffremment dans des circonstances diffrentes. - 66..33..22.. OOpprraatteeuurrss ddeess ttaabblleess ddee bbrraaiillllee aabbrrgg + 6.3.2. Oprateurs des tables de braille abrg - _c_h_a_r_a_c_t_e_r_s + characters Le premier oprateur d'une squence de caractres correspondant une ligne est la squence de caractres laquelle elle doit correspondre. Chaque caractre dans la squence peut tre: @@ -5146,48 +5150,48 @@ - - \\bb Le caractre Effacement - + \b Le caractre Effacement - - \\ff Le caractre formfeed - + \f Le caractre formfeed - - \\nn Le caractre Nouvelle ligne. - + \n Le caractre Nouvelle ligne. - - \\oo###### + \o### La reprsentation octale 3 chiffres d'un caractre. - - \\rr Le caractre retour chariot - + \r Le caractre retour chariot - - \\ss Le caractre Espace - + \s Le caractre Espace - - \\tt Le caractre Tab horizontale - + \t Le caractre Tab horizontale - - \\uu######## + \u#### La reprsentation hexadcimale quatre chiffres d'un caractre. - - \\UU################ + \U######## La reprsentation hexadcimale huit chiffres d'un caractre. - - \\vv Le caractre tab verticale - + \v Le caractre tab verticale - - \\xx#### + \x## La reprsentation hexadcimale deux chiffres d'un caractre. - - \\XX#### + \X## ... (la casse du X et des chiffres n'a pas de signification) - - \\## Signe d'un nombre littral. - + \# Signe d'un nombre littral. - - \\<> + \ Le nom Unicode d'un caractre (utilisez _ pour l'espace). - - \\\\ Un antislash littral. + \\ Un antislash littral. - _r_e_p_r_e_s_e_n_t_a_t_i_o_n + representation Le second oprateur de ces lignes correspondant la squence de caractres qui en a une est la reprsentation braille de la squence. Chaque cellule braille est spcifie comme une @@ -5199,68 +5203,68 @@ signifie aucun point; il ne peut pas tre utilis paralllement un autre numro de point. - 66..33..33.. OOppccooddeess + 6.3.3. Opcodes Un opcode est un mot-cl qui dit au traducteur comment interprter les oprateurs. Les opcodes sont groups ici par leur fonction. - 66..33..33..11.. AAddmmiinniissttrraattiioonn ddee llaa ttaabbllee + 6.3.3.1. Administration de la table Ces oprateurs facilitent l'criture des tables de braille abrg. Ils n'ont pas d'effet direct sur la traduction de caractre. - include _c_h_e_m_i_n + include chemin Inclut le contenu d'un autre fichier. L'inclusion peut se faire n'importe quel niveau. Les chemins relatifs sont dtermins par rapport au rpertoire du fichier inclu. - locale _l_o_c_a_l_e + locale locale Dfinit la locale pour l'interprtation d'un caractre (minuscule, majuscule, numrique, etc). La locale peut tre dfinie comme: - _l_a_n_g_u_e[[__p_a_y_s][._c_h_a_r_s_e_t][@_m_o_d_i_f_i_e_r] - La composante _l_a_n_g_u_e est requise et devrait tre un code de - langue deux lettres ISO-639. La composante _p_a_y_s est + langue[_pays][.charset][@modifier] + La composante langue est requise et devrait tre un code de + langue deux lettres ISO-639. La composante pays est facultative et devrait tre un code de pays deux lettres - ISO-3166. La composante _c_h_a_r_s_e_t est optionnelle et devrait + ISO-3166. La composante charset est optionnelle et devrait tre le nom d'une table de caractres, comme ISO-8859-1. - CC 7-bit ASCII. + C 7-bit ASCII. - -- Aucune locale. + - Aucune locale. La dernire spcification de locale s'applique toute la table. Si vous n'utilisez pas cet opcode, la locale C est utilise. - 66..33..33..22.. DDffiinniittiioonn dd''uunn ssyymmbboollee ssppcciiaall + 6.3.3.2. Dfinition d'un symbole spcial Ces opcodes dfinissent les caractres spciaux qui doivent tre insrs dans le texte braille afin de le rendre plus clair. - capsign _p_o_i_n_t_s + capsign points Le symbole qui met en majuscule une seule lettre. - begcaps _p_o_i_n_t_s + begcaps points Le symbole qui commence un bloc de lettres en majuscule l'intrieur d'un mot. - endcaps _p_o_i_n_t_s + endcaps points Le symbole qui termine un bloc de lettres en majuscules l'intrieur d'un mot. - letsign _p_o_i_n_t_s + letsign points Le symbole qui dsigne une lettre ne faisant pas partie du mot. - numsign _p_o_i_n_t_s + numsign points Le symbole marquant le dbut d'un nombre. - lastlargesign _p_o_i_n_t_s + lastlargesign points Traduit les caractres quel que soit l'endroit o ils apparaissent. Supprime les espaces qui les prcde si le mot prcdent a t marqu par le code "largesign". - 66..33..33..33.. TTrraadduuccttiioonn ddee ccaarraaccttrree + 6.3.3.3. Traduction de caractre Ces opcodes dfinissent les reprsentations braille des squences de caractres. Chacun d'eux dfinit une entre l'intrieur de la table @@ -5268,8 +5272,8 @@ quel ordre, sauf, comme remarqu ci-dessous, lorsqu'elles dfinissent des reprsentations alternatives de la mme squence de caractres. - Chacun de ces opcodes a un oprateurs _c_a_r_a_c_t__r_e_s (qui doit tre - spcifi comme une _c_h_a__n_e), et une condition de configuration + Chacun de ces opcodes a un oprateurs caractres (qui doit tre + spcifi comme une chane), et une condition de configuration dirigeant son utilisation. Le texte est traduit strictement de la gauche vers la droite, caractre par caractre, avec l'entre la plus acceptable pour chaque position utilise. S'il y a plus d'une entre @@ -5278,8 +5282,8 @@ acceptable pour la mme chane de caractres, celle dfinie le plus au dbut de la table est utilise (c'est la seule dpendance de l'ordre). - Beaucoup de ces opcodes ont un oprateur _p_o_i_n_t_s qui dfinit la - reprsentation braille de son oprateur _c_a_r_a_c_t__r_e_s. Il peut tre aussi + Beaucoup de ces opcodes ont un oprateur points qui dfinit la + reprsentation braille de son oprateur caractres. Il peut tre aussi spcifi comme un signe gal (=), au quel cas il signifie l'une des deux choses. Si l'entre est pour un seul caractre, cela signifie que la reprsentation du braille informatique slectionne (voir l'option @@ -5291,94 +5295,94 @@ Certains termes spciaux sont utiliss l'intrieur des descriptions de ces opcodes. - wwoorrdd + word Une squence maximale d'une ou plusieurs lettres la suite. Enfin, voici maintenant la description des opcodes eux-mmes: - literal _c_a_r_a_c_t__r_e_s + literal caractres Traduit ce qui est li l'espace et qui contient une squence de caractres en braille informatique (voir l'option ``-t'' en ligne de commande et la ligne ``text-table'' du fichier de configuration). - replace _c_a_r_a_c_t__r_e_s _c_a_r_a_c_t__r_e_s + replace caractres caractres Remplace la premire valeur des caractres, quel que soit l'endroit o ils apparaissent, par la seconde. Les caractres remplacs ne sont pas rinsrs. - always _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + always caractres points Traduit les caractres quel que soit l'endroit o ils apparaissent. S'il n'y a qu'un caractre, alors, en plus, dfinit la reprsentation par dfaut de ce caractre. - repeatable _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + repeatable caractres points Traduit les caractres quel que soit l'endroit o ils apparaissent. Ignore toute rptition immdiate de la mme squence. - largesign _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + largesign caractres points Traduit les caractres quel que soit l'endroit o ils apparaissent. Supprime les espaces entre les mots qui se suivent et qui sont grs par cet opcode. - word _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + word caractres points Traduit les caractres s'ils forment un mot. - joinword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + joinword caractres points Traduit les caractres s'ils forment un mot. Supprime l'espace suivant si le premier caractre qui le suit est une lettre. - lowword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + lowword caractres points Traduit les caractres s'ils forment un mot li un espace. - contraction _c_a_r_a_c_t__r_e_s + contraction caractres Fait prcder les caractres d'un signe-lettre (voir ``letsign'') s'ils forment un mot. - sufword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + sufword caractres points Traduit les caractres s'ils forment soit un mot, soit s'ils sont au dbut d'un mot. - prfword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + prfword caractres points Traduit les caractres s'ils forment soit un mot, soit s'ils sont la fin d'un mot. - begword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + begword caractres points Traduit les caractres s'ils sont au dbut d'un mot. - begmidword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + begmidword caractres points Traduit les caractres s'ils sont au dbut ou au milieu d'un mot. - midword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + midword caractres points Traduit les caractres s'ils sont au milieu d'un mot. - midendword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + midendword caractres points Traduit les caractres s'ils sont au milieu ou la fin d'un mot. - endword _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + endword caractres points Traduit les caractres s'ils sont la fin d'un mot. - prepunc _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + prepunc caractres points Traduit les caractres s'ils font partie de la ponctuation au dbut d'un mot. - postpunc _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + postpunc caractres points Traduit les caractres s'ils font partie de la ponctuation la fin d'un mot. - begnum _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + begnum caractres points Traduit les caractres s'ils sont au dbut d'un nombre. - midnum _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + midnum caractres points Traduit les caractres s'ils sont au milieu d'un nombre. - endnum _c_a_r_a_c_t__r_e_s _p_o_i_n_t_s + endnum caractres points Traduit les caractres s'ils sont la fin d'un nombre. - 66..33..33..44.. CCllaasssseess ddee ccaarraaccttrree + 6.3.3.4. Classes de caractre Ces opcodes dfinissent et utilisent des classes de caractres. Une classe de caractres associe un type de caractre un nom. Le nom se @@ -5388,52 +5392,52 @@ Les classes de caractre suivantes sont automatiquement prdfinies, bases sur la locale slectionne. - ddiiggiitt + digit Caractres numriques. - lleetttteerr + letter Les caractres alphabtiques majuscule ou minuscule. Certaines locales ont des lettres supplmentaires qui ne sont ni en majuscule ni en minuscule. - lloowweerrccaassee + lowercase Les caractres alphabtiques minuscules. - ppuunnccttuuaattiioonn + punctuation Caractres imprimables qui ne sont ni des espaces ni alphanumriques. - ssppaaccee + space Caractres d'espacement. Dans la locale par dfaut, il s'agit de: espace, tabulation horizontale, tabulation verticale, retour chariot, nouvelle ligne, saut de page. - uuppppeerrccaassee + uppercase Caractres alphabtiques en majuscules. Les opcodes qui dfinissent et utilisent des classes de caractres sont: - class _n_o_m _c_a_r_a_c_t__r_e_s - Dfinit une nouvelle classe de caractre. L'oprateur _c_a_r_a_c_t__r_e_s - doit tre spcifi comme une _c_h_a__n_e. Une classe de caractre ne + class nom caractres + Dfinit une nouvelle classe de caractre. L'oprateur caractres + doit tre spcifi comme une chane. Une classe de caractre ne peut pas tre utilise tant qu'elle n'est pas dfinie. - after _c_l_a_s_s _o_p_c_o_d_e ... + after class opcode ... L'opcode spcifi est assez contraint dans le sens o la squence de caractres adquat doit tre immdiatement prcde par un caractre appartenant la classe spcifie. Si vous utilisez plus d'une fois cet opcode sur la mme ligne, l'union des caractres de toute la classe est utilise. - before _c_l_a_s_s _o_p_c_o_d_e ... + before class opcode ... L'opcode spcifi est assez contraint dans le sens o la squence de caractres adquat doit tre immdiatement suivie par un caractre appartenant la classe spcifie. Si vous utilisez plus d'une fois cet opcode sur la mme ligne, l'union des caractres de toute la classe est utilise. - 66..44.. TTaabblleess ddee ttoouucchheess + 6.4. Tables de touches Les fichiers aux noms ayant la forme *.ktb sont des tables de touches, et ceux aux noms ayant la forme *.kti sont des sous-tables de touches. @@ -5441,7 +5445,7 @@ de l'afficheur braille et du clavier des commandes BRLTTY. Les noms de fichier de table de touches de l'afficheur braille - commencent par brl-_x_x-", o _x_x reprsente le ``code d'identification + commencent par brl-xx-", o xx reprsente le ``code d'identification de pilote'' deux lettres. Le reste du nom identifie le(s) modle(s) pour le(s)quel(s) la table de touches est utilise. @@ -5451,26 +5455,26 @@ Les tables de touches suivantes sont fournies: - bbrraaiillllee + braille associations pour les claviers braille - ddeesskkttoopp + desktop associations pour les claviers complets - kkeeyyppaadd + keypad associations pour la navigation partir du pav numrique - llaappttoopp + laptop associations pour les claviers sans pav numrique - ssuunn__ttyyppee66 + sun_type6 associations pour les claviers Sun Type 6 Voir l'option ``-k'' en ligne de commande et la ligne ``key-table'' du fichier de configuration pour plus de dtails concernant la manire de slectionner une table de touches de clavier. - 66..44..11.. FFoorrmmaatt ddeess ttaabblleess ddee ttoouucchheess + 6.4.1. Format des tables de touches Une table de touches consiste en une squence d'instructions, une par ligne, qui dfinit comment les touches et les combinaisons de touches @@ -5499,19 +5503,19 @@ Les lignes suivantes sont fournies: - 66..44..11..11.. LLaa lliiggnnee AAssssiiggnn + 6.4.1.1. La ligne Assign Cre ou met jour une variable associe au niveau include actuel. La variable est visible aux niveaux include actuel et infrieur, mais pas aux niveaux include suprieurs. - assign _v_a_r_i_a_b_l_e [_v_a_l_e_u_r] + assign variable [valeur] - _v_a_r_i_a_b_l_e + variable Le nom de la variable. Si la variable n'existe pas dj au niveau include actuel, elle sera cre. - _v_a_l_e_u_r + valeur La valeur qui sera associe la variable. Si on ne la fournit pas, une valeur zro (null) est affecte. @@ -5527,15 +5531,15 @@ bind \{ReturnKey} RETURN - 66..44..11..22.. LLaa lliiggnnee BBiinndd + 6.4.1.2. La ligne Bind Dfinit la commande qui est BRLTTY est excute quand on appuie sur une ou plusieurs combinaisons de touches particulires. L'association est dfinie dans le contexte actuel. - bind _t_o_u_c_h_e_s _c_o_m_m_a_n_d_e + bind touches commande - _t_o_u_c_h_e_s + touches La combinaison de touches associer. C'est une squence d'un ou plusieurs noms de touches spars par des signes plus (+). Le nom de touche la fin (ou seulement) peut tre ventuellement @@ -5547,7 +5551,7 @@ appuie sur cette touche. S'il n'est pas utilis, la commande est excute ds qu'on effectue une des touches. - _c_o_m_m_a_n_d_e + commande Le nom d'une commande BRLTTY. Un ou plusieurs modificateurs peuvent ventuellement tre associ au nom de la commande en utilisant un signe plus (+) comme sparateur. @@ -5587,7 +5591,7 @@ Pour les commandes qui demandent un complment (offset): - Vous pouvez spcifier le modificateur +_o_f_f_s_e_t, o _o_f_f_s_e_t + Vous pouvez spcifier le modificateur +offset, o offset est un entier non ngatif. Si vous ne le fournissez pas, +0 est suppos. @@ -5607,30 +5611,30 @@ bind Key6 CONTEXT+1 - 66..44..11..33.. LLaa lliiggnnee CCoonntteexxtt + 6.4.1.3. La ligne Context Dfinit des faons alternatives d'interprter certains vnements et/ou combinaisons de touches. Un contexte contient des dfinitions cres avec les lignes ``bind'', ``hotkey'', ``map'', et ``superimpose''. - context _i_d_e_n_t_i_f_i_c_a_t_e_u_r [_t_i_t_r_e] + context identificateur [titre] - _i_d_e_n_t_i_f_i_c_a_t_e_u_r + identificateur l'intrieur du contexte sous-jacent dans lequel doivent tre cres les dfinitions. Cela peut tre: Un de ces noms spciaux: - ddeeffaauulltt + default Le contexte par dfaut. Si une combinaison de touches n'a pas t dfinie dans le contexte actuel, c'est alors sa dfinition dans le contexte par dfaut qui sera utilise. Cela ne s'applique qu'aux dfinitions cres par la ligne ``bind''. - mmeennuu + menu Ce contexte est utilis quand on est l'intrieur du menu des prfrences de BRLTTY. @@ -5641,7 +5645,7 @@ signalement, si, par exemple, on ajoute davantage de contextes nomms. - _t_i_t_r_e + titre Une description lisible par un humain du contexte. Il peut contenir des espaces et vous devriez utiliser les conventions de mise en majuscules standards. Cet oprande est facultatif. Si @@ -5668,7 +5672,7 @@ sous-table. Si un contexte a un titre (tous les contextes nomms et les contextes - numriques pour lesquels on a fourni l'oprande _t_i_t_l_e), il demeure en + numriques pour lesquels on a fourni l'oprande title), il demeure en place. Quand un vnement de touches entrane l'activation d'un contexte @@ -5677,7 +5681,7 @@ diffrent. Si un contexte n'a pas de titre (les contextes numriques pour - lesquels on n'a pas fourni l'oprande _t_i_t_l_e), il est temporaire. + lesquels on n'a pas fourni l'oprande title), il est temporaire. Quand un vnement de touche provoque l'activation d'un contexte temporaire, ce contexte n'est utilis que pour interprter le tout @@ -5691,20 +5695,20 @@ context 2 - 66..44..11..44.. LLaa lliiggnnee HHiiddee + 6.4.1.4. La ligne Hide Spcifie si des dfinitions (voir les lignes ``bind'', ``hotkey'', ``map'', et ``superimpose'') et les remarques (voir la ligne ``note'') sont incluses ou pas dans le texte d'aide de la table de touches. - hide _s_t_a_t_e + hide state - _s_t_a_t_e + state Un de ces mots-cls: - oonn Elles sont exclues. + on Elles sont exclues. - ooffff + off Elles sont incluses. L'tat spcifi s'applique toutes les dfinitions et les notes qui @@ -5721,29 +5725,29 @@ hide on - 66..44..11..55.. LLaa lliiggnnee HHoottkkeeyy + 6.4.1.5. La ligne Hotkey Associe l'appui ou la survenance d'un vnement d'une touche spcifique deux commandes BRLTTY distinctes. Les associations sont dfinies dans le contexte actuel. - hotkey _t_o_u_c_h_e _a_p_p_u_i _e_f_f_e_c_t_u_e_r + hotkey touche appui effectuer - _t_o_u_c_h_e + touche Le nom de la touche qui sera associe. - _a_p_p_u_i + appui Le nom de la commande BRLTTY qui sera excute chaque fois qu'on appuiera sur la touche. - _E_f_f_e_c_t_u_e_r + Effectuer Le nom de la commande BRLTTY qui sera excute chaque fois qu'on effectuera la touche. On peut coller des modificateurs aux noms de commande. - Voir l'oprande _c_o_m_m_a_n_d de la ligne ``bind'' pour des dtails. + Voir l'oprande command de la ligne ``bind'' pour des dtails. Spcifiez NOOP si aucune commande ne sera excute. Spcifier NOOP pour deux commandes dsactive la touche dans les faits. @@ -5754,17 +5758,17 @@ hotkey Key2 NOOP NOOP - 66..44..11..66.. LLaa lliiggnnee IIffKKeeyy + 6.4.1.6. La ligne IfKey Applique une ligne de la table de touches la condition que le priphrique ait une touche particulire. - ifkey _t_o_u_c_h_e _l_i_g_n_e + ifkey touche ligne - _t_o_u_c_h_e + touche Le nom de la touche dont la disponibilit doit tre teste. - _l_i_g_n_e + ligne La ligne de la table de touches qui doit tre applique sous condition. @@ -5772,7 +5776,7 @@ ifkey Key1 ifkey Key2 bind Key1+Key2 HOME - 66..44..11..77.. LLaa lliiggnnee IInncclluuddee + 6.4.1.7. La ligne Include Excute les lignes l'intrieur d'une sous-table de touches. @@ -5782,9 +5786,9 @@ Il faut faire attention bien s'assurer qu'une "boucle d'inclusion" ne soit pas cre. - include _f_i_c_h_i_e_r + include fichier - _f_i_l_e + file La sous-table de touche qui doit tre incluse. Il peut s'agir d'un chemin soit relatif soit absolu. S'il est relatif, il est ancr au rpertoire contenant la table de touches qui inclut ou @@ -5796,59 +5800,59 @@ include /chemin/vers/mes/touches.kti - 66..44..11..88.. LLaa lliiggnnee MMaapp + 6.4.1.8. La ligne Map Fait correspondre une touche une fonction de clavier braille. La correspondance est dfinie l'intrieur du contexte actuel. - map _t_o_u_c_h_e _f_o_n_c_t_i_o_n + map touche fonction - _t_o_u_c_h_e + touche Le nom de la touche qui doit tre associe. Vous pouvez associer plus d'une touche la mme fonction de clavier braille. - _f_o_n_c_t_i_o_n + fonction Le nom de la fonction de clavier braille. Cela peut tre un des mots-cls suivants: - DDOOTT11 + DOT1 Le point braille standard en haut gauche. - DDOOTT22 + DOT2 Le point braille standard au milieu gauche - DDOOTT33 + DOT3 Le point braille standard en bas gauche. - DDOOTT44 + DOT4 Le point braille standard en haut droite. - DDOOTT55 + DOT5 Le point braille standard au milieu droite. - DDOOTT66 + DOT6 Le point braille standard en bas droite. - DDOOTT77 + DOT7 Le point braille informatique en bas gauche. - DDOOTT88 + DOT8 Le point braille informatique en bas droite. - SSPPAACCEE + SPACE La barre d'espace. - SSHHIIFFTT + SHIFT La touche shift. - UUPPPPEERRCCAASSEE + UPPERCASE Si on doit entrer une lettre minuscule, la traduit alors dans son quivalent en majuscule. - CCOONNTTRROOLL + CONTROL La touche contrle. - MMEETTAA + META La touche alt gauche. Si une combinaison de touches ne consiste qu'en des touches qui ont @@ -5865,7 +5869,7 @@ map Key1 DOT1 - 66..44..11..99.. LLaa lliiggnnee NNoottee + 6.4.1.9. La ligne Note Ajoute une explication lisible par un humain au texte d'aide de la table de touches. @@ -5873,9 +5877,9 @@ Les remarques sont utilises en gnral, par exemple, pour dcrire la place, les tailles et les formes des touches d'un priphrique. - note _t_e_x_t_e + note texte - _t_e_x_t_e + texte L'explication qui doit tre ajoute. Elle peut contenir des espaces et devrait tre grammaticalement correcte. @@ -5890,7 +5894,7 @@ note Key1 est la touche ronde tout gauche de la partie frontale. - 66..44..11..1100.. LLaa lliiggnnee SSuuppeerriimmppoossee + 6.4.1.10. La ligne Superimpose Inclut implicitement une fonction de clavier braille chaque fois qu'une commande de clavier braille d'au moins un point esst excute. @@ -5899,24 +5903,24 @@ Vous pouvez spcifier n'importe quel numro parmi elles. - superimpose _f_o_n_c_t_i_o_n + superimpose fonction - _f_o_n_c_t_i_o_n + fonction Le nom de la fonction de clavier braille. Voir l'oprande - _f_u_n_c_t_i_o_n de la ligne ``map'' pour des dtails. + function de la ligne ``map'' pour des dtails. Exemples: superimpose DOT7 - 66..44..11..1111.. LLaa lliiggnnee TTiittllee + 6.4.1.11. La ligne Title Fournit un rsum lisible par un humain de l'objectif de la table de touches. - title _t_e_x_t_e + title texte - _t_e_x_t_e + texte Un rsum d'une ligne de la raison pour laquelle est utilise la table de touches. Il peut contenir des espaces et vous devriez utiliser les conventions de mise en majuscules standards. @@ -5928,22 +5932,22 @@ title Bindings for Keypad-based Navigation - 66..44..22.. PPrroopprriittss dduu ccllaavviieerr + 6.4.2. Proprits du clavier Par dfaut, tous les claviers sont pris en charge. Un sous-paramtre des claviers peut tre slectionn en spcifiant une ou plusieurs des proprits suivantes (voir l'option ``-K'' en ligne de commande et la ligne ``keyboard-properties'' du fichier de configuration): - ttyyppee + type Le type de bus, spcifi en tant que mots-cls parmi ceux suivants: any, ps2, usb, bluetooth. - vveennddoorr + vendor L'identificateur du vendeur, spcifi comme une entier non-sign 16-bit. - pprroodduucctt + product L'identificateur du produit, spcifi comme une entier non sign 16 bits. @@ -5952,9 +5956,9 @@ (prfix par 0x). La spcification de 0 signifie que cela correspond toute valeur (comme si la proprit n'tait pas spcifie). - 77.. SSuujjeettss aavvaannccss + 7. Sujets avancs - 77..11.. IInnssttaallllaattiioonn ddee pplluussiieeuurrss vveerrssiioonnss + 7.1. Installation de plusieurs versions Il est facile d'avoir plus d'une version de BRLTTY installe sur le mme systme en mme temps. Cette possibilit vous permet de tester @@ -6024,7 +6028,7 @@ ln -s /brltty-3.1 /brltty - 77..22.. DDiissqquueess rraacciinneess dd''IInnssttaallllaattiioonn//SSeeccoouurrss ppoouurr LLiinnuuxx + 7.2. Disques racines d'Installation/Secours pour Linux BRLTTY peut s'excuter comme un seul excutable. Tout ce qu'il a besoin de savoir peut tre configur explicitement lors de la @@ -6078,23 +6082,23 @@ strip brltty - 77..33.. AAvvaanncceess ffuuttuurreess + 7.3. Avances futures Outre la rparation de bugs et le support de plus de types d'afficheurs brailles, nous esprons, si le temps nous le permet, travailler sur: - MMeeiilllleeuurree pprriissee eenn cchhaarrggee ddeess aattttrriibbuuttss + Meilleure prise en charge des attributs Poursuite des attributs. Mode mixte texte et attributs. - PPoouurrssuuiittee dduu ddffiilleemmeenntt + Poursuite du dfilement Alignement de la plage braille sur une ligne alors qu'elle dfile l'cran. - MMeeiilllleeuurr ssuuppppoorrtt ddee vvooiixx + Meilleur support de voix Braille et voix mlangs pour une lecture plus rapide du texte. @@ -6103,13 +6107,13 @@ Plus de synthses vocales. - SSoouuss--rrggiioonnss ssuurr ll''ccrraann + Sous-rgions sur l'cran Ignorer le dplacement du curseur hors de la rgion, et rendre fluide les limites de navigation aux bords de la rgion. Voir le fichier TODO pour une liste plus complte. - 77..44.. BBoogguueess ccoonnnnuuss + 7.4. Bogues connus A l'heure o nous crivons (dcembre 2001), les problmes suivants sont connus. @@ -6122,118 +6126,126 @@ charg normalement, mais trs mal dans d'autres situations, par exemple sur une liaison srie lente vers un nom de machine supprim. - 88.. AAffffiicchheeuurrss bbrraaiillllee ssuuppppoorrttss + 8. Afficheurs braille supports BRLTTY supporte les afficheurs braille suivants: - Nom Modles - _____________________________________________________________ - Albatross 46/80 - Alva ABT (3nn) - Delphi (4nn) - Satellite (5nn) - Braille System 40 - Braille Controller 640/680 - B2G - Baum BrailleConnect 12/24/32/40/64/80 - Brailliant 24/32/40/64/80 - Conny 12 - DM80 Plus - EcoVario 24/32/40/64/80 - Inka - PocketVario 24 - Pronto! V3 18/40 - Pronto! V4 18/40 - RBT 40/80 - Refreshabraille 18 - SuperVario 32/40/64/80 - Vario 40/80 - VarioConnect 12/24/32/40/64/80 - VarioPro 40/64/80 - VarioUltra 20/32/40 - BrailComm III - BrailleLite 18/40/M20/M40 - BrailleNote 18/32 - Apex - Braudi - BrlAPI - Cebra 20/40/60/80/100/120/140 - CombiBraille 25/45/85 - EcoBraille 20/40/80 - EuroBraille AzerBraille - Clio - Esys - Iris - NoteBraille - Scriba - FreedomScientific Focus 1 44/70/84 - Focus 2 40/80 - Focus Blue 14/40 - PAC Mate 20/40 - HandyTech Modular 20/40/80 - Modular Evolution 64/88 - Modular Connect 88 - Active Braille - Active Star 40 - Braille Wave - Easy Braille - Braille Star 40/80 - Connect Braille 40 - Bookworm - Braillino - Hedo ProfiLine - MobilLine - HIMS Braille Sense - SyncBraille - Braille Edge - Smart Beetle - HumanWare Brailliant 32/40/80 bi - Iris - Libbraille - LogText 32 - MDV MB208 - MB248 - MB408L - MB408L+ - Lilli Blu - Metec BD-40 - MiniBraille 20 - MultiBraille MB125CR/MB145CR/MB185CR - NinePoint 8 - Papenmeier Compact 486 - Compact/Tiny - IB 80 CR Soft - 2D Lite (plus) - 2D Screen Soft - EL 80 - EL 2D 40/66/80 - EL 40/66/70/80 S - EL 40/60/80 C - EL 2D 80 S - EL 40 P - EL 80 II - Elba 20/32 - Trio 40/Elba20/Elba32 - Live 20/40 - Pegasus 20/27/40/80 - Seika 3/4/5 (40) - 80 - Mini (16) - TechniBraille - TSI Navigator 20/40/80 - PowerBraille 40/65/80 - TTY terminfo - VideoBraille 40 - Virtual TCP/Unix, client/serveur - VisioBraille 20/40 - Voyager 44/70 - Part232 (adaptateur srie) - BraillePen/EasyLink - XWindow X11 - Windows + Nom Modles + ______________________________________________________________ + Albatross 46/80 + Alva ABT (3nn) + Delphi (4nn) + Satellite (5nn) + Braille System 40 + Braille Controller 640/680 + Easy Link 12 + B2G + Baum BrailleConnect 12/24/32/40/64/80 + Brailliant 24/32/40/64/80 + Conny 12 + DM80 Plus + EcoVario 24/32/40/64/80 + Inka + Orbit 20 + PocketVario 24 + Pronto! V3 18/40 + Pronto! V4 18/40 + RBT 40/80 + Refreshabraille 18 + SuperVario 32/40/64/80 + Vario 40/80 + VarioConnect 12/24/32/40/64/80 + VarioPro 40/64/80 + VarioUltra 20/32/40 + BrailComm III + BrailleLite 18/40/M20/M40 + BrailleMemo Pocket (16) + Smart (16) + 32 + 40 + BrailleNote 18/32 + Apex + Braudi + BrlAPI + Cebra 20/40/60/80/100/120/140 + CombiBraille 25/45/85 + EcoBraille 20/40/80 + EuroBraille AzerBraille + Clio + Esys + Iris + NoteBraille + Scriba + FreedomScientific Focus 1 44/70/84 + Focus 2 40/80 + Focus Blue 14/40 + PAC Mate 20/40 + HandyTech Modular 20/40/80 + Modular Evolution 64/88 + Modular Connect 88 + Active Braille + Active Star 40 + Actilino + Basic Braille 16/20/32/40/48/64/80 + Braillino + Braille Wave + Easy Braille + Braille Star 40/80 + Connect Braille 40 + Bookworm + Hedo ProfiLine + MobilLine + HIMS Braille Sense + SyncBraille + Braille Edge + Smart Beetle + HumanWare Brailliant 32/40/80 bi + Iris + Libbraille + LogText 32 + MDV MB208 + MB248 + MB408L + MB408L+ + Lilli Blu + Metec BD-40 + MiniBraille 20 + MultiBraille MB125CR/MB145CR/MB185CR + NinePoint 8 + Papenmeier Compact 486 + Compact/Tiny + IB 80 CR Soft + 2D Lite (plus) + 2D Screen Soft + EL 80 + EL 2D 40/66/80 + EL 40/66/70/80 S + EL 40/60/80 C + EL 2D 80 S + EL 40 P + EL 80 II + Elba 20/32 + Trio 40/Elba20/Elba32 + Live 20/40 + Pegasus 20/27/40/80 + Seika 3/4/5 (40) + 80 + Mini (16) + TechniBraille + TSI Navigator 20/40/80 + PowerBraille 40/65/80 + TTY terminfo + VideoBraille 40 + Virtual TCP/Unix, client/server + VisioBraille 20/40 + Voyager 44/70 + Part232 (serial adapter) + BraillePen/EasyLink + XWindow X11 + Windows - 99.. SSyynntthhsseess vvooccaalleess ssuuppppoorrtteess + 9. Synthses vocales supportes BRLTTY supporte les synthses vocales suivantes: @@ -6253,7 +6265,7 @@ ViaVoice text to speech engine - 1100.. CCooddeess dd''iiddeennttiiffiiccaattiioonn ddee ppiilloottee + 10. Codes d'identification de pilote Code Name @@ -6307,21 +6319,21 @@ xw XWindow - 1111.. PPiillootteess dd''ccrraann ssuuppppoorrttss + 11. Pilotes d'cran supports BRLTTY supporte les pilotes d'cran suivants: - aass AT-SPI + as AT-SPI - hhdd Ce pilote fournit un accs direct l'cran d'une console Hurd. + hd Ce pilote fournit un accs direct l'cran d'une console Hurd. Il n'est slectionnable et par dfaut oque sur les systmes Hurd. - llxx Ce pilote fournit un accs direct l'cran d'une console Linux + lx Ce pilote fournit un accs direct l'cran d'une console Linux Il n'est slectionnable et par dfaut oque sur les systmes Linux. - sscc Ce pilote fournit un accs direct au programme screen. Vous + sc Ce pilote fournit un accs direct au programme screen. Vous pouvez le slectionner sur tous les systmes, et il l'est par dfaut si aucun pilote d'cran d'origine n'est disponible. Vous devez appliquer le correctif de screen que nous fournissons @@ -6329,13 +6341,13 @@ excut simultanment, l'utilisation de ce pilote rend BRLTTY oprationnel uniquement aprs que l'utilisateur s'est identifi. - wwnn Ce pilote fournit un accs direct l'cran d'une console + wn Ce pilote fournit un accs direct l'cran d'une console Windows. Il n'est slectionnable et par dfaut que sur les systmes Windows/Cygwin. - 1122.. SSyynnttaaxxee ddeess oopprraatteeuurrss + 12. Syntaxe des oprateurs - 1122..11.. SSppcciiffiiccaattiioonn ddee ppiilloottee + 12.1. Spcification de pilote Vous devez spcifier un pilote pour un afficheur braille ou une synthse vocale via les deux lettres de son ``Code d'identification de @@ -6352,26 +6364,26 @@ s'effectue en n'utilisant que les pilotes connus pour leur fiabilit dans le but recherch. - 1122..22.. SSppcciiffiiccaattiioonn dduu pprriipphhrriiqquuee bbrraaiillllee + 12.2. Spcification du priphrique braille La forme gnrale de la spcification d'un priphrique braille (voir l'option ``-d'' en ligne de commande, la ligne ``braille-device'' du fichier de configuration, et l'option de compilation ``--with-braille- - device'') est qualificateur:_d_o_n_n__e. Par compatibilit entre + device'') est qualificateur:donne. Par compatibilit entre d'anciennes versions et les plus rcentes, si vous ommettez le qualificateur c'est serial: qui est utilis. Les types de priphrique suivants sont supports: - BBlluueettooootthh - Pour un priphrique bluetooth, spcifiez bluetooth:_a_d_d_r_e_s_s_e - ?vous pouvez aussi utiliser bt: et bluez: ). L'adresse doit se - composer de six nombres hexadcimaux deux chiffres spars par - des "deux-points", par exemple 01:23:45:67:89:AB. + Bluetooth + Pour un priphrique bluetooth, spcifiez bluetooth:addresse. + L'adresse doit se composer de six nombres hexadcimaux deux + chiffres spars par des "deux-points", par exemple + 01:23:45:67:89:AB. - SSrriiee + Srie Pour un priphrique en port srie, spcifiez - serial:_/_c_h_e_m_i_n_/_v_e_r_s_/_p_e_r_i_p_h_e_r_i_q_u_e. Le qualificateur serial: est + serial:/chemin/vers/peripherique. Le qualificateur serial: est facultatif (pour compatibilit). Si vous donnez un chemin relatif, il est dtermin par rapport /dev (l'emplacement habituel o les priphriques sont dfinis sur un systme de @@ -6386,7 +6398,7 @@ ttyS0 - UUSSBB + USB Pour un priphrique USB, spcifiez usb:. BRLTTY cherchera le premier priphrique USB qui entrane l'utilisation du pilote d'afficheur braille. Par exemple, si vous avez plus d'un @@ -6407,14 +6419,14 @@ usb:,serial:/dev/ttyS0, tant donn que l'ancien a tendance tre mieux dtect que le plus rcent. - 1122..33.. SSppcciiffiiccaattiioonn dd''uunn pprriipphhrriiqquuee PPCCMM + 12.3. Spcification d'un priphrique PCM Dans la plupart des cas, le priphriqve PCM est le chemin complet vers un priphrique du systme appropri. Les exceptions sont: - AALLSSAA + ALSA Le nom et ses arguments pour le priphrique logique ou - physique, comme _n_o_m[:_a_r_g_u_m_e_n_t,...]. + physique, comme nom[:argument,...]. Le priphrique PCM par dfaut est: @@ -6429,14 +6441,14 @@ Solaris /dev/audio - 1122..44.. SSppcciiffiiccaattiioonn ddee pprriipphhrriiqquuee MMIIDDII + 12.4. Spcification de priphrique MIDI Dans la plupart des cas, le priphrique MIDI est le chemin complet vers un priphrique du systme appropri. Les exceptions sont: - AALLSSAA + ALSA Le client et le port spars par "deux-points" tel que - _c_l_i_e_n_t:_p_o_r_t. Vous pouvez spcifier chacun soit comme un nombre + client:port. Vous pouvez spcifier chacun soit comme un nombre soit comme une sous-chane sensible la casse de son nom. Le priphrique MIDI par dfaut est: @@ -6447,29 +6459,29 @@ Linux/OSS /dev/sequencer - 1133.. CCoonnvveennttiioonn ssttaannddaarrdd dduu nnoommbbrree ddee ppooiinnttss bbrraaiilllleess + 13. Convention standard du nombre de points brailles Une cellule braille standard consiste en six points rpartis en trois lignes et deux colonnes. Chaque point peut tre identifi par son numro, comme suit: - 11 En haut gauche (ligne 1, colonne 1). + 1 En haut gauche (ligne 1, colonne 1). - 22 Milieu gauche (ligne 2, colonne 1). + 2 Milieu gauche (ligne 2, colonne 1). - 33 Bas gauche (ligne 3, colonne 1). + 3 Bas gauche (ligne 3, colonne 1). - 44 En haut droite (ligne 1, colonne 2). + 4 En haut droite (ligne 1, colonne 2). - 55 Milieu droite (ligne 2, colonne 2). + 5 Milieu droite (ligne 2, colonne 2). - 66 Bas droite (ligne 3, colonne 2). + 6 Bas droite (ligne 3, colonne 2). Le braille informatique a introduit une quatrime range en bas. - 77 Dessous gauche (ligne 4, colonne 1). + 7 Dessous gauche (ligne 4, colonne 1). - 88 Dessous droite (ligne 4, colonne 2). + 8 Dessous droite (ligne 4, colonne 2). Peut-tre qu'une image rendra cette convention numrique plus facile comprendre. @@ -6482,7 +6494,7 @@ - 1144.. CCooddee iinnffoorrmmaattiiqquuee bbrraaiillllee NNoorrdd AAmmrriiccaaiinn + 14. Code informatique braille Nord Amricain @@ -6748,7 +6760,7 @@ - 1155.. TTaabbllee ffrraannaaiissee uunniiffiiee + 15. Table franaise unifie @@ -7009,7 +7021,7 @@ - 1166.. TTaabbllee dd''iinnssttrruummeennttss MMIIDDII + 16. Table d'instruments MIDI _________________________________________________________________ diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/Compilation.sgml brltty-5.5/Documents/Manual-BRLTTY/French/Compilation.sgml --- brltty-5.4/Documents/Manual-BRLTTY/French/Compilation.sgml 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/Compilation.sgml 2017-04-18 22:35:13.000000000 +0000 @@ -275,9 +275,12 @@ Spcifie le port par dfaut auquel l'afficheur braille est reli (voir la section ). Si vous ne spcifiez pas - cette option, usb: est assum si le support USB est disponible, et un - chemin appropri pour le port srie Com1 correspondant au systme - d'exploitation est assum. Voir la ligne + cette option, usb: est suppos si le support USB est disponible, + bluetooth: est suppos si le support Bluetooth est disponible, et + usb:,bluetooth: est suppos si les deux sont disponibles. Si ni le support + USB ni le support Bluetooth ne sont disponibles, un + chemin appropri pour le priphrique du port srie primaire correspondant au systme + d'exploitation est suppos. Voir la ligne du fichier de configuration et l'option de la ligne de commande @@ -1555,7 +1558,7 @@ est ancr au rpertoire configur par l'option de compilation . L'extension .ctb est facultative. Si vous ne fournissez pas cette option, - en-us-g2 est assum. + en-us-g2 est suppos. Spcifie la table de texte (voir la section pour les dtails). diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/Makefile.in brltty-5.5/Documents/Manual-BRLTTY/French/Makefile.in --- brltty-5.4/Documents/Manual-BRLTTY/French/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/Syntax.sgml brltty-5.5/Documents/Manual-BRLTTY/French/Syntax.sgml --- brltty-5.4/Documents/Manual-BRLTTY/French/Syntax.sgml 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/Syntax.sgml 2017-04-18 22:35:13.000000000 +0000 @@ -28,8 +28,7 @@ Les types de priphrique suivants sont supports: Bluetooth - Pour un priphrique bluetooth, spcifiez bluetooth:addresse - ?vous pouvez aussi utiliser bt: et bluez: ). + Pour un priphrique bluetooth, spcifiez bluetooth:addresse. L'adresse doit se composer de six nombres hexadcimaux deux chiffres spars par des "deux-points", par exemple 01:23:45:67:89:AB. Srie diff -Nru brltty-5.4/Documents/Manual-BRLTTY/French/Utilisation.sgml brltty-5.5/Documents/Manual-BRLTTY/French/Utilisation.sgml --- brltty-5.4/Documents/Manual-BRLTTY/French/Utilisation.sgml 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/Manual-BRLTTY/French/Utilisation.sgml 2017-04-18 22:35:13.000000000 +0000 @@ -496,7 +496,7 @@ par l'option en ligne de commande . Son existence n'est pas indispensable. Vous pouvez trouver un fichier type dans le sous-rpertoire -DOCS +Documents Les lignes vides sont ignores. Un commentaire commence par un signe nombre (#), et continue jusqu' diff -Nru brltty-5.4/Documents/mkcsvs brltty-5.5/Documents/mkcsvs --- brltty-5.4/Documents/mkcsvs 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/mkcsvs 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Documents/README.Android brltty-5.5/Documents/README.Android --- brltty-5.4/Documents/README.Android 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/README.Android 2017-04-18 22:35:13.000000000 +0000 @@ -41,6 +41,10 @@ This permission is required so that BRLTTY can listen on a TCP/IP port for BrlAPI client connection requests. +``READ_EXTERNAL_STORAGE`` + This permission is required so that BRLTTY can read customized data files + from your SD card. + Quick Start ----------- diff -Nru brltty-5.4/Documents/README.Bluetooth brltty-5.5/Documents/README.Bluetooth --- brltty-5.4/Documents/README.Bluetooth 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/README.Bluetooth 2017-04-18 22:35:13.000000000 +0000 @@ -21,54 +21,6 @@ How to do it depends on the version of the Bluetooth software stack that you're using. -For Bluetooth Version 4 -~~~~~~~~~~~~~~~~~~~~~~~ - -You need to find out your host's Bluetooth Device Address (referred to later in -this document as *host-address*). To do this, run the command:: - - hciconfig hci0 - -Look for the (indented) line which begins with ``BD Address:``. The very next -"word" on that line is your host's Bluetooth Device Address. It'll be six -two-digit hexadecimal numbers separated by colons (``:``). Examples in this -document use the value ``01:23:45:67:89:AB``. - -You need to find out your device's Bluetooth Device Address (referred to later -in this document as *device-address*). To do this, run the command:: - - hcitool scan - -This command can take a while to complete as it gives devices a fair bit of -time to respond. Each device which responds creates one two-column output line. -The first column is its Bluetooth Device Address (examples in this document use -the value ``12:34:56:78:9A:BC``), and the second column is its -current name. Manufacturers usually set a device's initial name to its product -name and model number so that it's easy to spot within the scan output. If your -device allows you to change its name, it's okay to do so even after you've -paired it. - -A device needs to be "visible" in order for the scan to find it. Most devices -are "invisible" by default, but have a way to be made temporarily visible. You -should check your device's manual to find out how to do this. In many cases, -there's either a button which needs to be pressed or a menu item which needs to -be selected. Since both the device's temporary visibility and the host's scan -time out, make your device visible just before you initiate the scan. - -You need to know what PIN (password) your device is expecting. Your device's -documentation should contain this information. Many devices allow you to set -the PIN, in which case they'll have a menu which allows you to do this. -Examples in this document use the value ``1234``. - -Go into the directory ``/var/lib/bluetooth/``. In there (create -if necessary) is the file ``pincodes``. Each line in this file associates a -device with its PIN. It has two fields separated by space. The first field is -the device's Bluetooth Device Address and the second field is its PIN. The -Bluetooth Device Address must be in uppercase. For example:: - - cat /var/lib/bluetooth/01:23:45:67:89:AB/pincodes - 12:34:56:78:9A:BC 1234 - For Bluetooth Version 5 ~~~~~~~~~~~~~~~~~~~~~~~ @@ -127,14 +79,12 @@ [CHG] Controller 01:23:45:67:89:AB Discovering: no To be able to receive PIN code requests directly on the console, you need to -enable the *agent*, and to select the *default-agent*: +enable the *agent*: .. code-block:: console [bluetooth]# agent on Agent registered - [bluetooth]# default-agent - Default agent request successful Now you are finally ready to initiate the pairing: @@ -151,6 +101,54 @@ Pairing successful [CHG] Device 12:34:56:78:9A:BC Connected: no +For Bluetooth Version 4 +~~~~~~~~~~~~~~~~~~~~~~~ + +You need to find out your host's Bluetooth Device Address (referred to later in +this document as *host-address*). To do this, run the command:: + + hciconfig hci0 + +Look for the (indented) line which begins with ``BD Address:``. The very next +"word" on that line is your host's Bluetooth Device Address. It'll be six +two-digit hexadecimal numbers separated by colons (``:``). Examples in this +document use the value ``01:23:45:67:89:AB``. + +You need to find out your device's Bluetooth Device Address (referred to later +in this document as *device-address*). To do this, run the command:: + + hcitool scan + +This command can take a while to complete as it gives devices a fair bit of +time to respond. Each device which responds creates one two-column output line. +The first column is its Bluetooth Device Address (examples in this document use +the value ``12:34:56:78:9A:BC``), and the second column is its +current name. Manufacturers usually set a device's initial name to its product +name and model number so that it's easy to spot within the scan output. If your +device allows you to change its name, it's okay to do so even after you've +paired it. + +A device needs to be "visible" in order for the scan to find it. Most devices +are "invisible" by default, but have a way to be made temporarily visible. You +should check your device's manual to find out how to do this. In many cases, +there's either a button which needs to be pressed or a menu item which needs to +be selected. Since both the device's temporary visibility and the host's scan +time out, make your device visible just before you initiate the scan. + +You need to know what PIN (password) your device is expecting. Your device's +documentation should contain this information. Many devices allow you to set +the PIN, in which case they'll have a menu which allows you to do this. +Examples in this document use the value ``1234``. + +Go into the directory ``/var/lib/bluetooth/``. In there (create +if necessary) is the file ``pincodes``. Each line in this file associates a +device with its PIN. It has two fields separated by space. The first field is +the device's Bluetooth Device Address and the second field is its PIN. The +Bluetooth Device Address must be in uppercase. For example:: + + cat /var/lib/bluetooth/01:23:45:67:89:AB/pincodes + 12:34:56:78:9A:BC 1234 + Using a Bluetooth Device with BRLTTY ==================================== @@ -174,3 +172,36 @@ cat /etc/brltty.conf braille-device bluetooth:12:34:56:78:9A:BC +On some platforms, +BRLTTY supports the detection of a Bluetooth device based on its name. +These platforms include: + +* Android +* Linux (if the Bluetooth version is at least 5) +* Windows + +The address of the device needn't be specified on these platforms - +specifying just ``bluetooth:`` is sufficient. +BRLTTY will find the braille device based on its name. +It'll only consider devices that have already been paired with the host. + +If two (or more) braille devices are paired with your host, +and if both of them are near by, turned on, and configured for Bluetooth access, +then, of course, BRLTTY might choose the wrong one. +As long as both of them don't have the same Bluetooth name, +you can still specify the intended device without knowing its address. +You can limit the devices that BRLTTY will consider +by specifying the beginning of its Bluetooth name:: + + bluetooth:name=prefix + +If you need to specify a space within the prefix, then: + +* On the command line, use quotes:: + + -d "bluetooth:name=braille device" + +* In ``/etc/brltty.conf``, use \\s:: + + braille-device bluetooth:name=braille\sdevice + diff -Nru brltty-5.4/Documents/README.Devices brltty-5.5/Documents/README.Devices --- brltty-5.4/Documents/README.Devices 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Documents/README.Devices 2017-04-18 22:35:13.000000000 +0000 @@ -120,7 +120,7 @@ ====================== =================================================== Name Value ---------------------- --------------------------------------------------- - ``serialNumber=`` an arbitrary sequence of characters (exept ``=``) + ``serialNumber=`` an arbitrary sequence of characters (except ``=``) ``vendorIdentifier=`` an integer within the range 1-65535 (0X0001-0XFFFF) ``productIdentifier=`` an integer within the range 1-65535 (0X0001-0XFFFF) ``genericDevices=`` ``yes``, ``no`` @@ -157,25 +157,37 @@ Bluetooth device identifiers support the following parameters: ============= ============================================================= + Name Value ------------- ------------------------------------------------------------- ``address=`` six two-digit hexadecimal numbers separated by ``:`` or ``-`` - ``timeout=`` an integer within the range ``1``-``59`` + ``name=`` one or more arbitrary characters ``channel=`` an integer within the range ``1``-``30`` ``discover=`` ``yes``, ``no`` + ``timeout=`` an integer within the range ``1``-``59`` ============= ============================================================= -The ``address=`` parameter is required. All of the others are optional, and it -shouldn't normally be necessary to supply any of them. +All of the parameters are optional except that +the ``address=`` parameter is required on platforms where +BRLTTY can't yet detect a Bluetooth device based on its name. +It shouldn't normally be necessary to supply any of the others. + +BRLTTY can detect a Bluetooth device by name on the following platforms: + +* Android +* Linux (if the Bluetooth version is at least 5) +* Windows ``address=`` Specify the Bluetooth address of the device. It must be six two-digit hexadecimal numbers (the "letter" digits may be in either case) separated from one another by either a colon (``:``) or a minus (``-``) sign. -``timeout=`` - Specify the number of seconds to wait for a connection to the device to be - acquired. It must be an integer within the range ``1``-``59``. If this - parameter isn't supplied then a reasonable default is assumed. +``name=`` + Specify the Bluetooth name of the device. It must be one or more + arbitrary characters. They need only match the beginning (so not + necessarily all) of the name. Case is significant. + Only the names of paired devices are considered. + This parameter is ignored if the ``address=`` parameter has been specified. ``channel=`` Specify the RFCOMM channel to use. It must be an integer within the range @@ -195,3 +207,8 @@ 3) If the driver has specified a default channel number, then **no**. 4) Otherwise, **yes**. +``timeout=`` + Specify the number of seconds to wait for a connection to the device to be + acquired. It must be an integer within the range ``1``-``59``. If this + parameter isn't supplied then a reasonable default is assumed. + diff -Nru brltty-5.4/Documents/README.Systemd brltty-5.5/Documents/README.Systemd --- brltty-5.4/Documents/README.Systemd 2016-06-28 11:02:04.000000000 +0000 +++ brltty-5.5/Documents/README.Systemd 2017-04-18 22:35:13.000000000 +0000 @@ -4,69 +4,77 @@ .. include:: prologue.rst -.. |default user configuration directory| replace:: /etc -.. |default system unit directory| replace:: |default user configuration directory|/systemd/system -.. |service unit| replace:: brltty.service -.. |service instance unit| replace:: brltty@.service +.. |configuration directory| replace:: /usr/lib +.. |unit directory| replace:: |configuration directory|/systemd/system .. |wrapper directory| replace:: /sbin -.. |wrapper script| replace:: brltty-systemd-wrapper +.. |build subdirectory| replace:: Autostart/Systemd -Installing the Service Units -============================ +Initial Setup +============= -You need to copy both the service unit and the service instance unit -into Systemd's system unit directory. -You can find out where this directory is on your system with this command:: +A set of Systemd service and target units needs to be installed +into the |unit directory| directory, +and a wrapper script needs to be installed +into the |wrapper directory| directory. +A make file has been provided in order to make this easy to do. +It can be found within the |build subdirectory| subdirectory +of BRLTTY's build tree. +To install all of these files, change to this subdirectory +and run the command:: + + make install - pkg-config systemd --variable=systemdsystemunitpath +You then need to tell Systemd that the files have been installed. +To do this, run the command:: -The output from this command is a colon-delimited list of directories. -Look for the one that starts with |default user configuration directory|. -Assuming that Systemd's system unit directory is |default system unit directory| -(please ensure to use whatever it really is on your system): + systemctl daemon-reload -1) Define the service instance unit for BRLTTY as follows: - - .. parsed-literal:: cp |service instance unit| |default system unit directory|/|service instance unit| - -2) Define the service unit for BRLTTY as follows: - - .. parsed-literal:: cp |service unit| |default system unit directory|/|service unit| - -3) Tell Systemd that these units have been defined as follows:: - - systemctl daemon-reload - -You also need to install a wrapper script that's used by the service units: - - .. parsed-literal:: cp |wrapper script| |wrapper directory|/|wrapper script| - .. parsed-literal:: chmod 755 |wrapper directory|/|wrapper script| +That's all you need to do. +Your system is now able to manage BRLTTY instances via Systemd. Managing the BRLTTY Service =========================== -Once the unit file is in the right place, you'll be able to use standard -Systemd commands to manage the ``brltty`` service. The most common ones are: - -systemctl start brltty - Explicitly start the ``brltty`` service. - -systemctl stop brltty - Explicitly stop the ``brltty`` service. - -systemctl enable brltty - Automatically start the ``brltty`` service on system boot. +Systemd manages BRLTTY instances on your system in a number of ways. -systemctl disable brltty - Don't automatically start the ``brltty`` service on system boot. +USB Braille Devices +------------------- -systemctl status brltty - Show the current status of the ``brltty`` service. +If BRLTTY's Udev rules have also been installed +then a BRLTTY instance will be automatically started +when a USB braille device is connected, +and automatically stopped when it's disconnected. +Several braille devices can be managed in this way at the same time. +They can be connected and disconnected at any time and in any order. + +The Default Instance +-------------------- + +The default BRLTTY instance is the one that's configured +via the file ``/etc/brltty.conf``. +It's managed by applying standard Systemd commands to BRLTTY's target unit. +For example:: + + systemctl enable brltty.target + systemctl start brltty.target + systemctl stop brltty.target + systemctl disable brltty.target + +Additional Instances +-------------------- + +Additional BRLTTY instances can be managed via target instance references. +Each of them has its own configuration file. + +If, for example, the name of an instance is ``iname``, then +its Systemd target name would be ``brltty@iname``, +its configuration file would be ``/etc/brltty_iname.conf``, +and it'd be managed via Systemd commands like these:: + + systemctl enable brltty@iname.target + systemctl start brltty@iname.target + systemctl stop brltty@iname.target + systemctl disable brltty@iname.target -journalctl -u brltty - Show system log messages pertaining to the ``brltty`` service. +Any number of instances may be managed in this way. -Nothing is implicit. If you'd like to start the ``brltty`` service right away -then use the ``start`` function. If you'd like the ``brltty`` service to be -automatically started when the system is booted then use the ``enable`` -function. diff -Nru brltty-5.4/Documents/xbrlapi.1 brltty-5.5/Documents/xbrlapi.1 --- brltty-5.4/Documents/xbrlapi.1 2016-06-28 11:10:25.000000000 +0000 +++ brltty-5.5/Documents/xbrlapi.1 2017-04-18 22:35:13.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "XBRLAPI" "1" "2016-06-28" "BrlAPI 0.6.5" "BrlAPI User's Manual" +.TH "XBRLAPI" "1" "2017-04-18" "BrlAPI 0.6.6" "BrlAPI User's Manual" .SH NAME xbrlapi \- X11 BrlAPI helper for Linux/Unix .SH SYNOPSIS diff -Nru brltty-5.4/DOS/mkdosarc brltty-5.5/DOS/mkdosarc --- brltty-5.4/DOS/mkdosarc 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/DOS/mkdosarc 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/DOS/mkdostools brltty-5.5/DOS/mkdostools --- brltty-5.4/DOS/mkdostools 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/DOS/mkdostools 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Albatross/braille.c brltty-5.5/Drivers/Braille/Albatross/braille.c --- brltty-5.4/Drivers/Braille/Albatross/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Albatross/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -173,9 +173,14 @@ static int openUsbPort (const char *device) { + BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001) + "Tivomatic Oy", + END_USB_STRING_LIST + BEGIN_USB_CHANNEL_DEFINITIONS { /* all models */ .vendor=0X0403, .product=0X6001, + .manufacturers = usbManufacturers_0403_6001, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=2 }, diff -Nru brltty-5.4/Drivers/Braille/Albatross/brldefs-at.h brltty-5.5/Drivers/Braille/Albatross/brldefs-at.h --- brltty-5.4/Drivers/Braille/Albatross/brldefs-at.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Albatross/brldefs-at.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Albatross/Makefile.in brltty-5.5/Drivers/Braille/Albatross/Makefile.in --- brltty-5.4/Drivers/Braille/Albatross/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Albatross/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Alva/braille.c brltty-5.5/Drivers/Braille/Alva/braille.c --- brltty-5.4/Drivers/Braille/Alva/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Alva/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Alva/braille.h brltty-5.5/Drivers/Braille/Alva/braille.h --- brltty-5.4/Drivers/Braille/Alva/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Alva/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Alva/brldefs-al.h brltty-5.5/Drivers/Braille/Alva/brldefs-al.h --- brltty-5.4/Drivers/Braille/Alva/brldefs-al.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Alva/brldefs-al.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Alva/Makefile.in brltty-5.5/Drivers/Braille/Alva/Makefile.in --- brltty-5.4/Drivers/Braille/Alva/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Alva/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/B2G/braille.c brltty-5.5/Drivers/Braille/B2G/braille.c --- brltty-5.4/Drivers/Braille/B2G/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/B2G/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/B2G/brldefs-bg.h brltty-5.5/Drivers/Braille/B2G/brldefs-bg.h --- brltty-5.4/Drivers/Braille/B2G/brldefs-bg.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/B2G/brldefs-bg.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/B2G/Makefile.in brltty-5.5/Drivers/Braille/B2G/Makefile.in --- brltty-5.4/Drivers/Braille/B2G/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/B2G/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Baum/braille.c brltty-5.5/Drivers/Braille/Baum/braille.c --- brltty-5.4/Drivers/Braille/Baum/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Baum/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -41,6 +41,7 @@ #include "brldefs-bm.h" BEGIN_KEY_NAME_TABLE(display) + KEY_NAME_ENTRY(BM_KEY_DISPLAY+7, "Display8"), KEY_NAME_ENTRY(BM_KEY_DISPLAY+6, "Display7"), KEY_NAME_ENTRY(BM_KEY_DISPLAY+5, "Display6"), KEY_NAME_ENTRY(BM_KEY_DISPLAY+4, "Display5"), @@ -94,7 +95,9 @@ KEY_NAME_ENTRY(BM_KEY_ENTRY+5, "F2"), KEY_NAME_ENTRY(BM_KEY_ENTRY+6, "F3"), KEY_NAME_ENTRY(BM_KEY_ENTRY+7, "F4"), +END_KEY_NAME_TABLE +BEGIN_KEY_NAME_TABLE(dots) KEY_NAME_ENTRY(BM_KEY_ENTRY+8, "Dot1"), KEY_NAME_ENTRY(BM_KEY_ENTRY+9, "Dot2"), KEY_NAME_ENTRY(BM_KEY_ENTRY+10, "Dot3"), @@ -113,6 +116,10 @@ KEY_NAME_ENTRY(BM_KEY_JOYSTICK+4, "Press"), END_KEY_NAME_TABLE +BEGIN_KEY_NAME_TABLE(orbit) + KEY_NAME_ENTRY(BM_KEY_ENTRY+0, "Space"), +END_KEY_NAME_TABLE + BEGIN_KEY_NAME_TABLE(wheels) KEY_NAME_ENTRY(BM_KEY_WHEEL_UP+0, "FirstWheelUp"), KEY_NAME_ENTRY(BM_KEY_WHEEL_DOWN+0, "FirstWheelDown"), @@ -161,6 +168,7 @@ BEGIN_KEY_NAME_TABLES(default) KEY_NAME_SUBTABLE(display,6), KEY_NAME_TABLE(entry), + KEY_NAME_TABLE(dots), KEY_NAME_TABLE(joystick), KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES @@ -168,6 +176,7 @@ BEGIN_KEY_NAME_TABLES(connect) KEY_NAME_SUBTABLE(display,6), KEY_NAME_TABLE(entry), + KEY_NAME_TABLE(dots), KEY_NAME_TABLE(joystick), KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES @@ -175,13 +184,22 @@ BEGIN_KEY_NAME_TABLES(conny) KEY_NAME_SUBTABLE(display,6), KEY_NAME_TABLE(entry), + KEY_NAME_TABLE(dots), KEY_NAME_TABLE(joystick), KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES +BEGIN_KEY_NAME_TABLES(orbit) + KEY_NAME_TABLE(orbit), + KEY_NAME_TABLE(dots), + KEY_NAME_TABLE(joystick), + KEY_NAME_SUBTABLE(display,8), +END_KEY_NAME_TABLES + BEGIN_KEY_NAME_TABLES(pronto) KEY_NAME_SUBTABLE(display,6), KEY_NAME_TABLE(entry), + KEY_NAME_TABLE(dots), KEY_NAME_TABLE(joystick), KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES @@ -189,6 +207,7 @@ BEGIN_KEY_NAME_TABLES(pv) KEY_NAME_SUBTABLE(display,6), KEY_NAME_TABLE(entry), + KEY_NAME_TABLE(dots), KEY_NAME_TABLE(joystick), KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES @@ -196,6 +215,7 @@ BEGIN_KEY_NAME_TABLES(rb) KEY_NAME_SUBTABLE(display,6), KEY_NAME_TABLE(entry), + KEY_NAME_TABLE(dots), KEY_NAME_TABLE(joystick), KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES @@ -208,6 +228,7 @@ BEGIN_KEY_NAME_TABLES(ultra) KEY_NAME_SUBTABLE(display,6), KEY_NAME_TABLE(entry), + KEY_NAME_TABLE(dots), KEY_NAME_TABLE(joystick), KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES @@ -251,6 +272,7 @@ DEFINE_KEY_TABLE(default) DEFINE_KEY_TABLE(connect) DEFINE_KEY_TABLE(conny) +DEFINE_KEY_TABLE(orbit) DEFINE_KEY_TABLE(pronto) DEFINE_KEY_TABLE(pv) DEFINE_KEY_TABLE(rb) @@ -267,6 +289,7 @@ &KEY_TABLE_DEFINITION(default), &KEY_TABLE_DEFINITION(connect), &KEY_TABLE_DEFINITION(conny), + &KEY_TABLE_DEFINITION(orbit), &KEY_TABLE_DEFINITION(pronto), &KEY_TABLE_DEFINITION(pv), &KEY_TABLE_DEFINITION(rb), @@ -803,6 +826,7 @@ typedef enum { BAUM_DEVICE_Default, BAUM_DEVICE_Conny, + BAUM_DEVICE_Orbit, BAUM_DEVICE_PocketVario, BAUM_DEVICE_Pronto, BAUM_DEVICE_Refreshabraille, @@ -835,6 +859,10 @@ .type = BAUM_DEVICE_Conny }, + { .string = "Orbit", + .type = BAUM_DEVICE_Orbit + }, + { .string = "PocketVario", .type = BAUM_DEVICE_PocketVario }, @@ -1384,6 +1412,11 @@ .writeAllCells = writeBaumCells_all }, + [BAUM_DEVICE_Orbit] = { + .keyTableDefinition = &KEY_TABLE_DEFINITION(orbit), + .writeAllCells = writeBaumCells_all + }, + [BAUM_DEVICE_PocketVario] = { .keyTableDefinition = &KEY_TABLE_DEFINITION(pv), .writeAllCells = writeBaumCells_all @@ -1609,6 +1642,22 @@ } static int +getIdentityCellCount (char* deviceIdentity, const int length) { + char buffer[length+1]; + memcpy(buffer, deviceIdentity, length); + buffer[length] = 0; + + char *digits = strpbrk(buffer, "123456789"); + + if (digits) { + int count = atoi(digits); + if (isAcceptableCellCount(count)) return count; + } + + return 0; +} + +static int probeBaumDevice (BrailleDisplay *brl) { int probes = 0; @@ -1683,26 +1732,14 @@ cellCount = getBaumModuleCellCount(); return 1; - case BAUM_RSP_DeviceIdentity: /* should contain fallback cell count */ + case BAUM_RSP_DeviceIdentity: { + /* should contain fallback cell count */ + int count = getIdentityCellCount(response.data.values.deviceIdentity, + sizeof(response.data.values.deviceIdentity)); + if (count) identityCellCount = count; handleBaumDeviceIdentity(&response, 1); - - { - const int length = sizeof(response.data.values.deviceIdentity); - char buffer[length+1]; - - memcpy(buffer, response.data.values.deviceIdentity, length); - buffer[length] = 0; - - { - char *digits = strpbrk(buffer, "123456789"); - - if (digits) { - int count = atoi(digits); - if (isAcceptableCellCount(count)) identityCellCount = count; - } - } - } continue; + } case BAUM_RSP_SerialNumber: logBaumSerialNumber(&response); @@ -1791,6 +1828,10 @@ count = 7; break; + case BAUM_DEVICE_Orbit: + count = 8; + /* fall through */ + default: keys = packet.data.values.displayKeys; break; @@ -2095,6 +2136,7 @@ if (writeBraillePacket(brl, NULL, packet, sizeof(packet))) { int haveCellCount = 0; int haveDeviceIdentity = 0; + int identityCellCount = 0; baumDeviceType = BAUM_DEVICE_Default; cellCount = 0; @@ -2118,10 +2160,14 @@ break; } - case BAUM_RSP_DeviceIdentity: + case BAUM_RSP_DeviceIdentity: { + int count = getIdentityCellCount(packet.fields.data.deviceIdentity, + sizeof(packet.fields.data.deviceIdentity)); + if (count) identityCellCount = count; handleHidDeviceIdentity(&packet, 1); haveDeviceIdentity = 1; break; + } case BAUM_RSP_SerialNumber: logHidSerialNumber(&packet); @@ -2134,6 +2180,14 @@ if (haveCellCount && haveDeviceIdentity) return 1; } + + if (!cellCount && identityCellCount) { + /* Older models don't provide the actual cell count + * so it must be derived from the identity string. + */ + cellCount = identityCellCount; + return 1; + } } return 0; @@ -2853,6 +2907,13 @@ .data=&baumEscapeOperations }, + { /* Orbit 20 (20 cells) */ + .vendor=0X0483, .product=0XA1D3, + .configuration=1, .interface=0, .alternative=0, + .inputEndpoint=1, .outputEndpoint=1, + .data=&baumHid1Operations, + }, + { /* VarioPro 40 (40 cells) */ .vendor=0X0904, .product=0X2000, .configuration=1, .interface=0, .alternative=0, @@ -2949,10 +3010,19 @@ .data=&baumEscapeOperations }, + { /* Orbit in Refreshabraille Emulation Mode (18 cells) */ + .vendor=0X0904, .product=0X3001, + .configuration=1, .interface=0, .alternative=0, + .inputEndpoint=1, .outputEndpoint=1, + .verifyInterface=1, + .data=&baumHid1Operations + }, + { /* Refreshabraille 18 (18 cells) */ .vendor=0X0904, .product=0X3001, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=2, + .verifyInterface=1, .data=&baumHid1Operations }, @@ -3104,6 +3174,7 @@ descriptor.serial.options.applicationData = &baumEscapeOperations; descriptor.usb.channelDefinitions = usbChannelDefinitions; + descriptor.usb.options.ignoreWriteTimeouts = 1; descriptor.bluetooth.channelNumber = 1; descriptor.bluetooth.discoverChannel = 1; diff -Nru brltty-5.4/Drivers/Braille/Baum/brldefs-bm.h brltty-5.5/Drivers/Braille/Baum/brldefs-bm.h --- brltty-5.4/Drivers/Braille/Baum/brldefs-bm.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Baum/brldefs-bm.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -19,7 +19,7 @@ #ifndef BRLTTY_INCLUDED_BM_BRLDEFS #define BRLTTY_INCLUDED_BM_BRLDEFS -#define BM_KEYS_DISPLAY 7 +#define BM_KEYS_DISPLAY 8 #define BM_KEYS_COMMAND 7 #define BM_KEYS_FRONT 10 #define BM_KEYS_ENTRY 16 @@ -28,7 +28,7 @@ #define BM_KEYS_STATUS 8 typedef enum { - BM_KEY_DISPLAY = 1, + BM_KEY_DISPLAY = 0, BM_KEY_COMMAND = BM_KEY_DISPLAY + BM_KEYS_DISPLAY, BM_KEY_FRONT = BM_KEY_COMMAND + BM_KEYS_COMMAND, BM_KEY_BACK = BM_KEY_FRONT + BM_KEYS_FRONT, diff -Nru brltty-5.4/Drivers/Braille/Baum/Makefile.in brltty-5.5/Drivers/Braille/Baum/Makefile.in --- brltty-5.4/Drivers/Braille/Baum/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Baum/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ DRIVER_CODE = bm DRIVER_NAME = Baum -DRIVER_COMMENT = BrailleConnect 12/24/32/40/64/80, Brailliant 24/32/40/64/80, Conny 12, DM80 Plus, EcoVario 24/32/40/64/80, Inka, PocketVario 24, Pronto! V3 18/40, Pronto! V4 18/40, RBT 40/80, Refreshabraille 18, SuperVario 32/40/64/80, Vario 40/80, VarioConnect 12/24/32/40/64/80, VarioPro 40/64/80, VarioUltra 20/32/40 +DRIVER_COMMENT = BrailleConnect 12/24/32/40/64/80, Brailliant 24/32/40/64/80, Conny 12, DM80 Plus, EcoVario 24/32/40/64/80, Inka, Orbit 20, PocketVario 24, Pronto! V3 18/40, Pronto! V4 18/40, RBT 40/80, Refreshabraille 18, SuperVario 32/40/64/80, Vario 40/80, VarioConnect 12/24/32/40/64/80, VarioPro 40/64/80, VarioUltra 20/32/40 DRIVER_VERSION = DRIVER_DEVELOPERS = Dave Mielke include $(SRC_TOP)braille.mk diff -Nru brltty-5.4/Drivers/Braille/BrailComm/braille.c brltty-5.5/Drivers/Braille/BrailComm/braille.c --- brltty-5.4/Drivers/Braille/BrailComm/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailComm/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrailComm/brl-out.h brltty-5.5/Drivers/Braille/BrailComm/brl-out.h --- brltty-5.4/Drivers/Braille/BrailComm/brl-out.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailComm/brl-out.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrailComm/Makefile.in brltty-5.5/Drivers/Braille/BrailComm/Makefile.in --- brltty-5.4/Drivers/Braille/BrailComm/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailComm/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/BrailleLite/bindings.h brltty-5.5/Drivers/Braille/BrailleLite/bindings.h --- brltty-5.4/Drivers/Braille/BrailleLite/bindings.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleLite/bindings.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrailleLite/braille.c brltty-5.5/Drivers/Braille/BrailleLite/braille.c --- brltty-5.4/Drivers/Braille/BrailleLite/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleLite/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrailleLite/braille.h brltty-5.5/Drivers/Braille/BrailleLite/braille.h --- brltty-5.4/Drivers/Braille/BrailleLite/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleLite/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrailleLite/Makefile.in brltty-5.5/Drivers/Braille/BrailleLite/Makefile.in --- brltty-5.4/Drivers/Braille/BrailleLite/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleLite/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/BrailleMemo/braille.c brltty-5.5/Drivers/Braille/BrailleMemo/braille.c --- brltty-5.4/Drivers/Braille/BrailleMemo/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleMemo/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -286,9 +286,14 @@ .baud = 9600 }; + BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA60) + "Silicon Labs", + END_USB_STRING_LIST + BEGIN_USB_CHANNEL_DEFINITIONS { /* Pocket */ .vendor=0X10C4, .product=0XEA60, + .manufacturers = usbManufacturers_10C4_EA60, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=1, .serial=&serialParameters diff -Nru brltty-5.4/Drivers/Braille/BrailleMemo/brldefs-mm.h brltty-5.5/Drivers/Braille/BrailleMemo/brldefs-mm.h --- brltty-5.4/Drivers/Braille/BrailleMemo/brldefs-mm.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleMemo/brldefs-mm.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrailleMemo/Makefile.in brltty-5.5/Drivers/Braille/BrailleMemo/Makefile.in --- brltty-5.4/Drivers/Braille/BrailleMemo/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleMemo/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/BrailleNote/braille.c brltty-5.5/Drivers/Braille/BrailleNote/braille.c --- brltty-5.4/Drivers/Braille/BrailleNote/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleNote/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrailleNote/brldefs-bn.h brltty-5.5/Drivers/Braille/BrailleNote/brldefs-bn.h --- brltty-5.4/Drivers/Braille/BrailleNote/brldefs-bn.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleNote/brldefs-bn.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrailleNote/Makefile.in brltty-5.5/Drivers/Braille/BrailleNote/Makefile.in --- brltty-5.4/Drivers/Braille/BrailleNote/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrailleNote/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Braudi/braille.c brltty-5.5/Drivers/Braille/Braudi/braille.c --- brltty-5.4/Drivers/Braille/Braudi/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Braudi/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Braudi/Makefile.in brltty-5.5/Drivers/Braille/Braudi/Makefile.in --- brltty-5.4/Drivers/Braille/Braudi/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Braudi/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/BrlAPI/braille.c brltty-5.5/Drivers/Braille/BrlAPI/braille.c --- brltty-5.4/Drivers/Braille/BrlAPI/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrlAPI/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/BrlAPI/Makefile.in brltty-5.5/Drivers/Braille/BrlAPI/Makefile.in --- brltty-5.4/Drivers/Braille/BrlAPI/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/BrlAPI/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Cebra/braille.c brltty-5.5/Drivers/Braille/Cebra/braille.c --- brltty-5.4/Drivers/Braille/Cebra/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Cebra/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Cebra/brldefs-ce.h brltty-5.5/Drivers/Braille/Cebra/brldefs-ce.h --- brltty-5.4/Drivers/Braille/Cebra/brldefs-ce.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Cebra/brldefs-ce.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Cebra/Makefile.in brltty-5.5/Drivers/Braille/Cebra/Makefile.in --- brltty-5.4/Drivers/Braille/Cebra/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Cebra/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/CombiBraille/braille.c brltty-5.5/Drivers/Braille/CombiBraille/braille.c --- brltty-5.4/Drivers/Braille/CombiBraille/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/CombiBraille/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/CombiBraille/braille.h brltty-5.5/Drivers/Braille/CombiBraille/braille.h --- brltty-5.4/Drivers/Braille/CombiBraille/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/CombiBraille/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/CombiBraille/brldefs-cb.h brltty-5.5/Drivers/Braille/CombiBraille/brldefs-cb.h --- brltty-5.4/Drivers/Braille/CombiBraille/brldefs-cb.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/CombiBraille/brldefs-cb.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/CombiBraille/Makefile.in brltty-5.5/Drivers/Braille/CombiBraille/Makefile.in --- brltty-5.4/Drivers/Braille/CombiBraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/CombiBraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/EcoBraille/braille.c brltty-5.5/Drivers/Braille/EcoBraille/braille.c --- brltty-5.4/Drivers/Braille/EcoBraille/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EcoBraille/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/EcoBraille/braille.h brltty-5.5/Drivers/Braille/EcoBraille/braille.h --- brltty-5.4/Drivers/Braille/EcoBraille/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EcoBraille/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/EcoBraille/Makefile.in brltty-5.5/Drivers/Braille/EcoBraille/Makefile.in --- brltty-5.4/Drivers/Braille/EcoBraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EcoBraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/EuroBraille/brldefs-eu.h brltty-5.5/Drivers/Braille/EuroBraille/brldefs-eu.h --- brltty-5.4/Drivers/Braille/EuroBraille/brldefs-eu.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EuroBraille/brldefs-eu.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -30,20 +30,23 @@ #define EU_LCD_CURSOR 0X02 typedef enum { - EU_IRIS_20 = 0X01, - EU_IRIS_40 = 0X02, - EU_IRIS_S20 = 0X03, - EU_IRIS_S32 = 0X04, - EU_IRIS_KB20 = 0X05, - EU_IRIS_KB40 = 0X06, - EU_ESYS_12 = 0X07, - EU_ESYS_40 = 0X08, - EU_ESYS_LIGHT_40 = 0X09, - EU_ESYS_24 = 0X0A, - EU_ESYS_64 = 0X0B, - EU_ESYS_80 = 0X0C, - EU_ESYTIME_32 = 0X0E, - EU_ESYTIME_32_STANDARD = 0X0F + EU_IRIS_20 = 0X01, + EU_IRIS_40 = 0X02, + EU_IRIS_S20 = 0X03, + EU_IRIS_S32 = 0X04, + EU_IRIS_KB20 = 0X05, + EU_IRIS_KB40 = 0X06, + EU_ESYS_12 = 0X07, + EU_ESYS_40 = 0X08, + EU_ESYS_LIGHT_40 = 0X09, + EU_ESYS_24 = 0X0A, + EU_ESYS_64 = 0X0B, + EU_ESYS_80 = 0X0C, + EU_ESYS_LIGHT_80 = 0x0D, + EU_ESYTIME_32 = 0X0E, + EU_ESYTIME_32_STANDARD = 0X0F, + EU_ESYTIME_EVO = 0x10, + EU_ESYTIME_EVO_STANDARD = 0x11 } EU_EsysirisModel; typedef enum { diff -Nru brltty-5.4/Drivers/Braille/EuroBraille/eu_braille.c brltty-5.5/Drivers/Braille/EuroBraille/eu_braille.c --- brltty-5.4/Drivers/Braille/EuroBraille/eu_braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EuroBraille/eu_braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -232,6 +232,15 @@ .vendor=0XC251, .product=0X1130, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=0, + .verifyInterface = 1, + .disableEndpointReset = 1 + }, + + { /* Esytime (firmware 1.03, 2014-03-31) */ + .vendor=0XC251, .product=0X1130, + .configuration=1, .interface=0, .alternative=0, + .inputEndpoint=7, .outputEndpoint=0, + .verifyInterface = 1, .disableEndpointReset = 1 }, diff -Nru brltty-5.4/Drivers/Braille/EuroBraille/eu_clio.c brltty-5.5/Drivers/Braille/EuroBraille/eu_clio.c --- brltty-5.4/Drivers/Braille/EuroBraille/eu_clio.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EuroBraille/eu_clio.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/EuroBraille/eu_esysiris.c brltty-5.5/Drivers/Braille/EuroBraille/eu_esysiris.c --- brltty-5.4/Drivers/Braille/EuroBraille/eu_esysiris.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EuroBraille/eu_esysiris.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -48,6 +48,11 @@ COMMAND_KEY_ENTRY(L8, "L8"), END_KEY_NAME_TABLE +BEGIN_KEY_NAME_TABLE(linear15) + COMMAND_KEY_ENTRY(L1, "L1"), + COMMAND_KEY_ENTRY(L5, "L5"), +END_KEY_NAME_TABLE + BEGIN_KEY_NAME_TABLE(arrow) COMMAND_KEY_ENTRY(Left, "Left"), COMMAND_KEY_ENTRY(Right, "Right"), @@ -55,17 +60,6 @@ COMMAND_KEY_ENTRY(Down, "Down"), END_KEY_NAME_TABLE -BEGIN_KEY_NAME_TABLE(function) - COMMAND_KEY_ENTRY(F1, "L1"), - COMMAND_KEY_ENTRY(F2, "L2"), - COMMAND_KEY_ENTRY(F3, "L3"), - COMMAND_KEY_ENTRY(F4, "L4"), - COMMAND_KEY_ENTRY(F5, "L5"), - COMMAND_KEY_ENTRY(F6, "L6"), - COMMAND_KEY_ENTRY(F7, "L7"), - COMMAND_KEY_ENTRY(F8, "L8"), -END_KEY_NAME_TABLE - BEGIN_KEY_NAME_TABLE(switch1) COMMAND_KEY_ENTRY(Switch1Left, "Switch1Left"), COMMAND_KEY_ENTRY(Switch1Right, "Switch1Right"), @@ -112,7 +106,7 @@ COMMAND_KEY_ENTRY(RightJoystickPress, "RightJoystickPress"), END_KEY_NAME_TABLE -BEGIN_KEY_NAME_TABLE(common) +BEGIN_KEY_NAME_TABLE(keyboard) BRAILLE_KEY_ENTRY(Dot1, "Dot1"), BRAILLE_KEY_ENTRY(Dot2, "Dot2"), BRAILLE_KEY_ENTRY(Dot3, "Dot3"), @@ -123,7 +117,9 @@ BRAILLE_KEY_ENTRY(Dot8, "Dot8"), BRAILLE_KEY_ENTRY(Backspace, "Backspace"), BRAILLE_KEY_ENTRY(Space, "Space"), +END_KEY_NAME_TABLE +BEGIN_KEY_NAME_TABLE(routing) KEY_GROUP_ENTRY(EU_GRP_RoutingKeys1, "RoutingKey1"), KEY_GROUP_ENTRY(EU_GRP_RoutingKeys2, "RoutingKey2"), END_KEY_NAME_TABLE @@ -131,7 +127,8 @@ BEGIN_KEY_NAME_TABLES(iris) KEY_NAME_TABLE(linear), KEY_NAME_TABLE(arrow), - KEY_NAME_TABLE(common), + KEY_NAME_TABLE(keyboard), + KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES BEGIN_KEY_NAME_TABLES(esys_small) @@ -139,7 +136,8 @@ KEY_NAME_TABLE(switch2), KEY_NAME_TABLE(joystick1), KEY_NAME_TABLE(joystick2), - KEY_NAME_TABLE(common), + KEY_NAME_TABLE(keyboard), + KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES BEGIN_KEY_NAME_TABLES(esys_medium) @@ -149,7 +147,8 @@ KEY_NAME_TABLE(switch4), KEY_NAME_TABLE(joystick1), KEY_NAME_TABLE(joystick2), - KEY_NAME_TABLE(common), + KEY_NAME_TABLE(keyboard), + KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES BEGIN_KEY_NAME_TABLES(esys_large) @@ -161,14 +160,15 @@ KEY_NAME_TABLE(switch6), KEY_NAME_TABLE(joystick1), KEY_NAME_TABLE(joystick2), - KEY_NAME_TABLE(common), + KEY_NAME_TABLE(keyboard), + KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES BEGIN_KEY_NAME_TABLES(esytime) - KEY_NAME_TABLE(function), KEY_NAME_TABLE(joystick1), KEY_NAME_TABLE(joystick2), - KEY_NAME_TABLE(common), + KEY_NAME_TABLE(linear15), + KEY_NAME_TABLE(routing), END_KEY_NAME_TABLES PUBLIC_KEY_TABLE(iris) @@ -289,6 +289,13 @@ .keyTable = &KEY_TABLE_DEFINITION(esys_large) }, + { .modelIdentifier = EU_ESYS_LIGHT_80, + .modelName = "Esys Light 80", + .cellCount = 80, + .isEsys = 1, + .keyTable = &KEY_TABLE_DEFINITION(esys_large) + }, + { .modelIdentifier = EU_ESYTIME_32, .modelName = "Esytime 32", .cellCount = 32, @@ -303,6 +310,23 @@ .cellCount = 32, .hasBrailleKeyboard = 1, .isEsytime = 1, + .keyTable = &KEY_TABLE_DEFINITION(esytime) + }, + + { .modelIdentifier = EU_ESYTIME_EVO, + .modelName = "Esytime Evolution", + .cellCount = 32, + .hasBrailleKeyboard = 1, + .hasOpticalBar = 1, + .isEsytime = 1, + .keyTable = &KEY_TABLE_DEFINITION(esytime) + }, + + { .modelIdentifier = EU_ESYTIME_EVO_STANDARD, + .modelName = "Esytime Evolution Standard", + .cellCount = 32, + .hasBrailleKeyboard = 1, + .isEsytime = 1, .keyTable = &KEY_TABLE_DEFINITION(esytime) }, diff -Nru brltty-5.4/Drivers/Braille/EuroBraille/eu_protocol.h brltty-5.5/Drivers/Braille/EuroBraille/eu_protocol.h --- brltty-5.4/Drivers/Braille/EuroBraille/eu_protocol.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EuroBraille/eu_protocol.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/EuroBraille/eutp_brl.c brltty-5.5/Drivers/Braille/EuroBraille/eutp_brl.c --- brltty-5.4/Drivers/Braille/EuroBraille/eutp_brl.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EuroBraille/eutp_brl.c 2017-04-18 22:35:13.000000000 +0000 @@ -5,7 +5,9 @@ ** Login */ +#ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 500 +#endif /* _XOPEN_SOURCE */ /* globals */ unsigned char extensions[] = {'K', 'L', 'B', 'T', 'A'}; diff -Nru brltty-5.4/Drivers/Braille/EuroBraille/eutp_transfer.c brltty-5.5/Drivers/Braille/EuroBraille/eutp_transfer.c --- brltty-5.4/Drivers/Braille/EuroBraille/eutp_transfer.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EuroBraille/eutp_transfer.c 2017-04-18 22:35:13.000000000 +0000 @@ -7,7 +7,11 @@ ** Started on Sun Mar 20 16:10:06 2005 Olivier BERT Last update Fri Jun 1 15:23:17 2007 Olivier BERT */ + +#ifndef _XOPEN_SOURCE #define _XOPEN_SOURCE 500 +#endif /* _XOPEN_SOURCE */ + #include #include #include diff -Nru brltty-5.4/Drivers/Braille/EuroBraille/Makefile.in brltty-5.5/Drivers/Braille/EuroBraille/Makefile.in --- brltty-5.4/Drivers/Braille/EuroBraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/EuroBraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/FreedomScientific/braille.c brltty-5.5/Drivers/Braille/FreedomScientific/braille.c --- brltty-5.4/Drivers/Braille/FreedomScientific/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/FreedomScientific/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/FreedomScientific/brldefs-fs.h brltty-5.5/Drivers/Braille/FreedomScientific/brldefs-fs.h --- brltty-5.4/Drivers/Braille/FreedomScientific/brldefs-fs.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/FreedomScientific/brldefs-fs.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/FreedomScientific/Makefile.in brltty-5.5/Drivers/Braille/FreedomScientific/Makefile.in --- brltty-5.4/Drivers/Braille/FreedomScientific/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/FreedomScientific/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/HandyTech/braille.c brltty-5.5/Drivers/Braille/HandyTech/braille.c --- brltty-5.4/Drivers/Braille/HandyTech/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HandyTech/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -87,6 +87,15 @@ KEY_NAME_ENTRY(HT_KEY_Down, "RightRockerBottom"), END_KEY_NAME_TABLE +BEGIN_KEY_NAME_TABLE(joystick) + KEY_NAME_ENTRY(HT_KEY_JoystickLeft, "Left"), + KEY_NAME_ENTRY(HT_KEY_JoystickRight, "Right"), + KEY_NAME_ENTRY(HT_KEY_JoystickUp, "Up"), + KEY_NAME_ENTRY(HT_KEY_JoystickDown, "Down"), + + KEY_NAME_ENTRY(HT_KEY_JoystickAction, "Action"), +END_KEY_NAME_TABLE + BEGIN_KEY_NAME_TABLE(modular) KEY_NAME_ENTRY(HT_KEY_Up, "Left"), KEY_NAME_ENTRY(HT_KEY_Down, "Right"), @@ -220,6 +229,14 @@ KEY_NAME_TABLE(basicBraille), END_KEY_NAME_TABLES +BEGIN_KEY_NAME_TABLES(alo) + KEY_NAME_TABLE(routing), + KEY_NAME_TABLE(dots), + KEY_NAME_TABLE(rockers), + KEY_NAME_TABLE(brailleStar), + KEY_NAME_TABLE(joystick), +END_KEY_NAME_TABLES + typedef enum { HT_BWK_Backward = 0X01, HT_BWK_Forward = 0X08, @@ -253,6 +270,7 @@ DEFINE_KEY_TABLE(wave) DEFINE_KEY_TABLE(easy) DEFINE_KEY_TABLE(bb) +DEFINE_KEY_TABLE(alo) DEFINE_KEY_TABLE(bkwm) BEGIN_KEY_TABLE_LIST @@ -269,6 +287,7 @@ &KEY_TABLE_DEFINITION(wave), &KEY_TABLE_DEFINITION(easy), &KEY_TABLE_DEFINITION(bb), + &KEY_TABLE_DEFINITION(alo), &KEY_TABLE_DEFINITION(bkwm), END_KEY_TABLE_LIST @@ -448,6 +467,19 @@ HT_BASIC_BRAILLE(160), #undef HT_BASIC_BRAILLE + { .identifier = HT_MODEL_Actilino, + .name = "Actilino", + .textCells = 16, + .statusCells = 0, + .keyTableDefinition = &KEY_TABLE_DEFINITION(alo), + .interpretByte = interpretByte_key, + .writeCells = writeCells_Evolution, + .setFirmness = setFirmness, + .setSensitivity = setSensitivity_ActiveBraille, + .hasATC = 1, + .hasTime = 1 + }, + { .identifier = HT_MODEL_ActiveStar40, .name = "Active Star 40", .textCells = 40, @@ -1107,6 +1139,10 @@ .parity = SERIAL_PARITY_ODD }; + BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001) + "FTDI", + END_USB_STRING_LIST + BEGIN_USB_CHANNEL_DEFINITIONS { /* GoHubs chip */ .vendor=0X0921, .product=0X1200, @@ -1117,6 +1153,7 @@ { /* FTDI chip */ .vendor=0X0403, .product=0X6001, + .manufacturers = usbManufacturers_0403_6001, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=2, .serial = &serialParameters @@ -1203,6 +1240,13 @@ .data=&usbOperations3 }, + { /* Actilino */ + .vendor=0X1FE4, .product=0X0061, + .configuration=1, .interface=0, .alternative=0, + .inputEndpoint=1, .outputEndpoint=1, + .data=&usbOperations3 + }, + { /* Active Star 40 */ .vendor=0X1FE4, .product=0X0064, .configuration=1, .interface=0, .alternative=0, @@ -1394,7 +1438,7 @@ return enqueueKeyEvent(brl, HT_GRP_NavigationKeys, byte, !release); } - if ((byte > 0) && (byte < 0X20)) { + if (byte > 0) { return enqueueKeyEvent(brl, HT_GRP_NavigationKeys, byte, !release); } diff -Nru brltty-5.4/Drivers/Braille/HandyTech/brldefs-ht.h brltty-5.5/Drivers/Braille/HandyTech/brldefs-ht.h --- brltty-5.4/Drivers/Braille/HandyTech/brldefs-ht.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HandyTech/brldefs-ht.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -30,6 +30,7 @@ HT_MODEL_EasyBraille = 0X44, HT_MODEL_ActiveBraille = 0X54, HT_MODEL_ConnectBraille40 = 0X55, + HT_MODEL_Actilino = 0X61, HT_MODEL_ActiveStar40 = 0X64, HT_MODEL_BasicBraille16 = 0X81, HT_MODEL_BasicBraille20 = 0X82, @@ -195,6 +196,13 @@ /* Braille star keys */ HT_KEY_SpaceRight = 0X18, + /* Actilino keys */ + HT_KEY_JoystickLeft = 0X74, + HT_KEY_JoystickRight = 0X75, + HT_KEY_JoystickUp = 0X76, + HT_KEY_JoystickDown = 0X77, + HT_KEY_JoystickAction = 0X78, + /* ranges and flags */ HT_KEY_ROUTING = 0X20, HT_KEY_STATUS = 0X70, diff -Nru brltty-5.4/Drivers/Braille/HandyTech/Makefile.in brltty-5.5/Drivers/Braille/HandyTech/Makefile.in --- brltty-5.4/Drivers/Braille/HandyTech/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HandyTech/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,7 +18,7 @@ DRIVER_CODE = ht DRIVER_NAME = HandyTech -DRIVER_COMMENT = Modular 20/40/80, Modular Evolution 64/88, Modular Connect 88, Active Braille, Active Star 40, Basic Braille 16/20/32/40/48/64/80, Braillino, Braille Wave, Easy Braille, Braille Star 40/80, Connect Braille 40, Bookworm +DRIVER_COMMENT = Modular 20/40/80, Modular Evolution 64/88, Modular Connect 88, Active Braille, Active Star 40, Actilino, Basic Braille 16/20/32/40/48/64/80, Braillino, Braille Wave, Easy Braille, Braille Star 40/80, Connect Braille 40, Bookworm DRIVER_VERSION = 0.6 DRIVER_DEVELOPERS = Andreas Gross , Dave Mielke , Mario Lang include $(SRC_TOP)braille.mk diff -Nru brltty-5.4/Drivers/Braille/HandyTech/README brltty-5.5/Drivers/Braille/HandyTech/README --- brltty-5.4/Drivers/Braille/HandyTech/README 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HandyTech/README 2017-04-18 22:35:13.000000000 +0000 @@ -1,9 +1,7 @@ This directory contains the BRLTTY driver for braille displays which are manufactured by Handy Tech Elektronik GmbH [http://www.handytech.com/] of Germany. As a component of BRLTTY, this driver is released under the terms of -the GNU Public License. It has been tested with the modular displays -[20/40/80], the Braille Wave, the Braille Star [40/80], the Bookworm, the -Easy Braille, the Active Braille, and the Braillino. +the GNU Public License. This driver was originally implemented by Andreas Gross . It has since been extended, and is being maintained, by Dave Mielke diff -Nru brltty-5.4/Drivers/Braille/Hedo/braille.c brltty-5.5/Drivers/Braille/Hedo/braille.c --- brltty-5.4/Drivers/Braille/Hedo/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Hedo/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Hedo/brldefs-hd.h brltty-5.5/Drivers/Braille/Hedo/brldefs-hd.h --- brltty-5.4/Drivers/Braille/Hedo/brldefs-hd.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Hedo/brldefs-hd.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Hedo/Makefile.in brltty-5.5/Drivers/Braille/Hedo/Makefile.in --- brltty-5.4/Drivers/Braille/Hedo/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Hedo/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/HIMS/braille.c brltty-5.5/Drivers/Braille/HIMS/braille.c --- brltty-5.4/Drivers/Braille/HIMS/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HIMS/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -556,6 +556,10 @@ .baud = 115200 }; + BEGIN_USB_STRING_LIST(usbManufacturers_0403_6001) + "FTDI", + END_USB_STRING_LIST + BEGIN_USB_CHANNEL_DEFINITIONS { /* Braille Sense (USB 1.1) */ .version = UsbSpecificationVersion_1_1, @@ -588,6 +592,7 @@ { /* Sync Braille */ .vendor=0X0403, .product=0X6001, + .manufacturers = usbManufacturers_0403_6001, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=2, .data=&syncBrailleProtocol diff -Nru brltty-5.4/Drivers/Braille/HIMS/brldefs-hm.h brltty-5.5/Drivers/Braille/HIMS/brldefs-hm.h --- brltty-5.4/Drivers/Braille/HIMS/brldefs-hm.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HIMS/brldefs-hm.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/HIMS/Makefile.in brltty-5.5/Drivers/Braille/HIMS/Makefile.in --- brltty-5.4/Drivers/Braille/HIMS/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HIMS/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/HumanWare/braille.c brltty-5.5/Drivers/Braille/HumanWare/braille.c --- brltty-5.4/Drivers/Braille/HumanWare/braille.c 2016-06-24 04:24:35.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HumanWare/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -22,6 +22,7 @@ #include #include "log.h" +#include "ktb.h" #include "ascii.h" #include "bitmask.h" #include "async_wait.h" @@ -158,6 +159,7 @@ static int hasBrailleKeyboard (BrailleDisplay *brl) { + if (brl->textColumns == 18) return 1; if (brl->textColumns == 32) return 1; if (brl->textColumns == 40) return 1; return 0; @@ -184,6 +186,25 @@ } static int +isCalibrationKey (BrailleDisplay *brl, unsigned char key) { + switch (key) { + default: + return 0; + + case HW_KEY_CAL_OK: + case HW_KEY_CAL_FAIL: + case HW_KEY_CAL_EMPTY: + case HW_KEY_CAL_RESET: + break; + } + + releaseAllKeys(brl->keyTable); + BITMASK_ZERO(brl->data->pressedKeys.mask); + brl->data->pressedKeys.count = 0; + return 1; +} + +static int handleKeyPress (BrailleDisplay *brl, unsigned char key) { if (BITMASK_TEST(brl->data->pressedKeys.mask, key)) return 0; @@ -222,6 +243,7 @@ BITMASK_SET(pressedMask, *key); pressedCount += 1; + if (isCalibrationKey(brl, *key)) return; handleKeyPress(brl, *key); } @@ -369,9 +391,13 @@ handlePressedKeysArray(brl, packet.fields.data.bytes, packet.fields.length); break; - case HW_MSG_KEY_DOWN: - handleKeyPress(brl, packet.fields.data.key.id); + case HW_MSG_KEY_DOWN: { + unsigned char key = packet.fields.data.key.id; + if (isCalibrationKey(brl, key)) break; + + handleKeyPress(brl, key); break; + } case HW_MSG_KEY_UP: handleKeyRelease(brl, packet.fields.data.key.id); @@ -575,7 +601,7 @@ memset(&report, 0, sizeof(report)); report.reportIdentifier = HW_REP_FTR_KeepAwake; - return writeHidReport(brl, &report, sizeof(report));; + return writeHidReport(brl, &report, sizeof(report)); } static const ProtocolEntry hidProtocol = { @@ -608,6 +634,13 @@ .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .data = &hidProtocol + }, + + { /* BrailleNote Touch (HID protocol) */ + .vendor=0X1C71, .product=0XC00A, + .configuration=1, .interface=0, .alternative=0, + .inputEndpoint=1, + .data = &hidProtocol }, END_USB_CHANNEL_DEFINITIONS diff -Nru brltty-5.4/Drivers/Braille/HumanWare/brldefs-hw.h brltty-5.5/Drivers/Braille/HumanWare/brldefs-hw.h --- brltty-5.4/Drivers/Braille/HumanWare/brldefs-hw.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HumanWare/brldefs-hw.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -130,31 +130,36 @@ } HW_PoweringOffReport; typedef enum { - HW_KEY_Reset = 1, + HW_KEY_Reset = 1, - HW_KEY_Dot1 = 2, - HW_KEY_Dot2 = 3, - HW_KEY_Dot3 = 4, - HW_KEY_Dot4 = 5, - HW_KEY_Dot5 = 6, - HW_KEY_Dot6 = 7, - HW_KEY_Dot7 = 8, - HW_KEY_Dot8 = 9, - HW_KEY_Space = 10, - - HW_KEY_Command1 = 11, - HW_KEY_Command2 = 12, - HW_KEY_Command3 = 13, - HW_KEY_Command4 = 14, - HW_KEY_Command5 = 15, - HW_KEY_Command6 = 16, - - HW_KEY_Thumb1 = 17, - HW_KEY_Thumb2 = 18, - HW_KEY_Thumb3 = 19, - HW_KEY_Thumb4 = 20, + HW_KEY_Dot1 = 2, + HW_KEY_Dot2 = 3, + HW_KEY_Dot3 = 4, + HW_KEY_Dot4 = 5, + HW_KEY_Dot5 = 6, + HW_KEY_Dot6 = 7, + HW_KEY_Dot7 = 8, + HW_KEY_Dot8 = 9, + HW_KEY_Space = 10, + + HW_KEY_Command1 = 11, + HW_KEY_Command2 = 12, + HW_KEY_Command3 = 13, + HW_KEY_Command4 = 14, + HW_KEY_Command5 = 15, + HW_KEY_Command6 = 16, + + HW_KEY_Thumb1 = 17, + HW_KEY_Thumb2 = 18, + HW_KEY_Thumb3 = 19, + HW_KEY_Thumb4 = 20, + + HW_KEY_CAL_OK = 30, + HW_KEY_CAL_FAIL = 31, + HW_KEY_CAL_EMPTY = 32, + HW_KEY_CAL_RESET = 34, - HW_KEY_ROUTING = 80 + HW_KEY_ROUTING = 80 } HW_NavigationKey; typedef enum { diff -Nru brltty-5.4/Drivers/Braille/HumanWare/Makefile.in brltty-5.5/Drivers/Braille/HumanWare/Makefile.in --- brltty-5.4/Drivers/Braille/HumanWare/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HumanWare/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/HumanWare/reldeps.mk brltty-5.5/Drivers/Braille/HumanWare/reldeps.mk --- brltty-5.4/Drivers/Braille/HumanWare/reldeps.mk 2016-06-28 11:21:49.000000000 +0000 +++ brltty-5.5/Drivers/Braille/HumanWare/reldeps.mk 2017-04-18 22:38:33.000000000 +0000 @@ -4,6 +4,8 @@ braille.$O: $(BLD_TOP)config.h braille.$O: $(BLD_TOP)forbuild.h braille.$O: $(SRC_TOP)Headers/log.h +braille.$O: $(SRC_TOP)Headers/ktb.h +braille.$O: $(SRC_TOP)Headers/ktb_types.h braille.$O: $(SRC_TOP)Headers/ascii.h braille.$O: $(SRC_TOP)Headers/bitmask.h braille.$O: $(SRC_TOP)Headers/async.h @@ -20,7 +22,6 @@ braille.$O: $(SRC_TOP)Headers/driver.h braille.$O: $(SRC_TOP)Headers/gio_types.h braille.$O: $(SRC_TOP)Headers/io_generic.h -braille.$O: $(SRC_TOP)Headers/ktb_types.h braille.$O: $(SRC_TOP)Headers/queue.h braille.$O: $(SRC_TOP)Headers/serial_types.h braille.$O: $(SRC_TOP)Headers/status_types.h diff -Nru brltty-5.4/Drivers/Braille/Iris/braille.c brltty-5.5/Drivers/Braille/Iris/braille.c --- brltty-5.4/Drivers/Braille/Iris/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Iris/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Iris/brldefs-ir.h brltty-5.5/Drivers/Braille/Iris/brldefs-ir.h --- brltty-5.4/Drivers/Braille/Iris/brldefs-ir.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Iris/brldefs-ir.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Iris/Makefile.in brltty-5.5/Drivers/Braille/Iris/Makefile.in --- brltty-5.4/Drivers/Braille/Iris/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Iris/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Libbraille/braille.c brltty-5.5/Drivers/Braille/Libbraille/braille.c --- brltty-5.4/Drivers/Braille/Libbraille/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Libbraille/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Libbraille/Makefile.in brltty-5.5/Drivers/Braille/Libbraille/Makefile.in --- brltty-5.4/Drivers/Braille/Libbraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Libbraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/LogText/braille.c brltty-5.5/Drivers/Braille/LogText/braille.c --- brltty-5.4/Drivers/Braille/LogText/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/LogText/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/LogText/braille.h brltty-5.5/Drivers/Braille/LogText/braille.h --- brltty-5.4/Drivers/Braille/LogText/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/LogText/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/LogText/brl-out.h brltty-5.5/Drivers/Braille/LogText/brl-out.h --- brltty-5.4/Drivers/Braille/LogText/brl-out.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/LogText/brl-out.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/LogText/Makefile.in brltty-5.5/Drivers/Braille/LogText/Makefile.in --- brltty-5.4/Drivers/Braille/LogText/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/LogText/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/MDV/braille.c brltty-5.5/Drivers/Braille/MDV/braille.c --- brltty-5.4/Drivers/Braille/MDV/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MDV/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/MDV/brldefs-md.h brltty-5.5/Drivers/Braille/MDV/brldefs-md.h --- brltty-5.4/Drivers/Braille/MDV/brldefs-md.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MDV/brldefs-md.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/MDV/Makefile.in brltty-5.5/Drivers/Braille/MDV/Makefile.in --- brltty-5.4/Drivers/Braille/MDV/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MDV/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Metec/braille.c brltty-5.5/Drivers/Braille/Metec/braille.c --- brltty-5.4/Drivers/Braille/Metec/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Metec/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -53,13 +53,6 @@ KEY_NAME_ENTRY(MT_KEY_RightDown, "RightDown"), END_KEY_NAME_TABLE -BEGIN_KEY_NAME_TABLE(front) - KEY_NAME_ENTRY(MT_KEY_CursorLeft, "CursorLeft"), - KEY_NAME_ENTRY(MT_KEY_CursorUp, "CursorUp"), - KEY_NAME_ENTRY(MT_KEY_CursorRight, "CursorRight"), - KEY_NAME_ENTRY(MT_KEY_CursorDown, "CursorDown"), -END_KEY_NAME_TABLE - BEGIN_KEY_NAME_TABLE(routing1) KEY_GROUP_ENTRY(MT_GRP_RoutingKeys1, "RoutingKey"), END_KEY_NAME_TABLE @@ -68,6 +61,14 @@ KEY_GROUP_ENTRY(MT_GRP_StatusKeys1, "StatusKey"), END_KEY_NAME_TABLE +/* +BEGIN_KEY_NAME_TABLE(front) + KEY_NAME_ENTRY(MT_KEY_CursorLeft, "CursorLeft"), + KEY_NAME_ENTRY(MT_KEY_CursorUp, "CursorUp"), + KEY_NAME_ENTRY(MT_KEY_CursorRight, "CursorRight"), + KEY_NAME_ENTRY(MT_KEY_CursorDown, "CursorDown"), +END_KEY_NAME_TABLE + BEGIN_KEY_NAME_TABLE(routing2) KEY_GROUP_ENTRY(MT_GRP_RoutingKeys2, "RoutingKey2"), END_KEY_NAME_TABLE @@ -75,6 +76,7 @@ BEGIN_KEY_NAME_TABLE(status2) KEY_GROUP_ENTRY(MT_GRP_StatusKeys2, "StatusKey2"), END_KEY_NAME_TABLE +*/ BEGIN_KEY_NAME_TABLES(bd1_3) KEY_NAME_TABLE(3keys), diff -Nru brltty-5.4/Drivers/Braille/Metec/brldefs-mt.h brltty-5.5/Drivers/Braille/Metec/brldefs-mt.h --- brltty-5.4/Drivers/Braille/Metec/brldefs-mt.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Metec/brldefs-mt.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Metec/Makefile.in brltty-5.5/Drivers/Braille/Metec/Makefile.in --- brltty-5.4/Drivers/Braille/Metec/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Metec/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/MiniBraille/braille.c brltty-5.5/Drivers/Braille/MiniBraille/braille.c --- brltty-5.4/Drivers/Braille/MiniBraille/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MiniBraille/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/MiniBraille/Makefile.in brltty-5.5/Drivers/Braille/MiniBraille/Makefile.in --- brltty-5.4/Drivers/Braille/MiniBraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MiniBraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/MultiBraille/braille.c brltty-5.5/Drivers/Braille/MultiBraille/braille.c --- brltty-5.4/Drivers/Braille/MultiBraille/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MultiBraille/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/MultiBraille/braille.h brltty-5.5/Drivers/Braille/MultiBraille/braille.h --- brltty-5.4/Drivers/Braille/MultiBraille/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MultiBraille/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/MultiBraille/Makefile.in brltty-5.5/Drivers/Braille/MultiBraille/Makefile.in --- brltty-5.4/Drivers/Braille/MultiBraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MultiBraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/MultiBraille/tables.h brltty-5.5/Drivers/Braille/MultiBraille/tables.h --- brltty-5.4/Drivers/Braille/MultiBraille/tables.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/MultiBraille/tables.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/NinePoint/braille.c brltty-5.5/Drivers/Braille/NinePoint/braille.c --- brltty-5.4/Drivers/Braille/NinePoint/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/NinePoint/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/NinePoint/brldefs-np.h brltty-5.5/Drivers/Braille/NinePoint/brldefs-np.h --- brltty-5.4/Drivers/Braille/NinePoint/brldefs-np.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/NinePoint/brldefs-np.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/NinePoint/Makefile.in brltty-5.5/Drivers/Braille/NinePoint/Makefile.in --- brltty-5.4/Drivers/Braille/NinePoint/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/NinePoint/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Papenmeier/braille.c brltty-5.5/Drivers/Braille/Papenmeier/braille.c --- brltty-5.4/Drivers/Braille/Papenmeier/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Papenmeier/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Papenmeier/brldefs-pm.h brltty-5.5/Drivers/Braille/Papenmeier/brldefs-pm.h --- brltty-5.4/Drivers/Braille/Papenmeier/brldefs-pm.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Papenmeier/brldefs-pm.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Papenmeier/Makefile.in brltty-5.5/Drivers/Braille/Papenmeier/Makefile.in --- brltty-5.4/Drivers/Braille/Papenmeier/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Papenmeier/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Papenmeier/models.h brltty-5.5/Drivers/Braille/Papenmeier/models.h --- brltty-5.4/Drivers/Braille/Papenmeier/models.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Papenmeier/models.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Pegasus/braille.c brltty-5.5/Drivers/Braille/Pegasus/braille.c --- brltty-5.4/Drivers/Braille/Pegasus/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Pegasus/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Pegasus/brldefs-pg.h brltty-5.5/Drivers/Braille/Pegasus/brldefs-pg.h --- brltty-5.4/Drivers/Braille/Pegasus/brldefs-pg.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Pegasus/brldefs-pg.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Pegasus/Makefile.in brltty-5.5/Drivers/Braille/Pegasus/Makefile.in --- brltty-5.4/Drivers/Braille/Pegasus/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Pegasus/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Seika/braille.c brltty-5.5/Drivers/Braille/Seika/braille.c --- brltty-5.4/Drivers/Braille/Seika/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Seika/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -676,9 +676,18 @@ .baud = 9600 }; + BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA60) + "Silicon Labs", + END_USB_STRING_LIST + + BEGIN_USB_STRING_LIST(usbManufacturers_10C4_EA80) + "Silicon Laboratories", + END_USB_STRING_LIST + BEGIN_USB_CHANNEL_DEFINITIONS { /* Braille Display */ .vendor=0X10C4, .product=0XEA60, + .manufacturers = usbManufacturers_10C4_EA60, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .outputEndpoint=1, .serial=&serialParameters @@ -686,6 +695,7 @@ { /* Note Taker */ .vendor=0X10C4, .product=0XEA80, + .manufacturers = usbManufacturers_10C4_EA80, .configuration=1, .interface=0, .alternative=0, .inputEndpoint=1, .serial=&serialParameters @@ -737,7 +747,7 @@ setBrailleKeyTable(brl, protocol->keyTableDefinition); makeOutputTable(dotsTable_ISO11548_1); - forceRewrite = 1;; + forceRewrite = 1; return 1; } } diff -Nru brltty-5.4/Drivers/Braille/Seika/brldefs-sk.h brltty-5.5/Drivers/Braille/Seika/brldefs-sk.h --- brltty-5.4/Drivers/Braille/Seika/brldefs-sk.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Seika/brldefs-sk.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Seika/Makefile.in brltty-5.5/Drivers/Braille/Seika/Makefile.in --- brltty-5.4/Drivers/Braille/Seika/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Seika/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Skeleton/braille.c brltty-5.5/Drivers/Braille/Skeleton/braille.c --- brltty-5.4/Drivers/Braille/Skeleton/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Skeleton/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Skeleton/brldefs-xx.h brltty-5.5/Drivers/Braille/Skeleton/brldefs-xx.h --- brltty-5.4/Drivers/Braille/Skeleton/brldefs-xx.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Skeleton/brldefs-xx.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Skeleton/Makefile.in brltty-5.5/Drivers/Braille/Skeleton/Makefile.in --- brltty-5.4/Drivers/Braille/Skeleton/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Skeleton/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/TechniBraille/braille.c brltty-5.5/Drivers/Braille/TechniBraille/braille.c --- brltty-5.4/Drivers/Braille/TechniBraille/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TechniBraille/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/TechniBraille/Makefile.in brltty-5.5/Drivers/Braille/TechniBraille/Makefile.in --- brltty-5.4/Drivers/Braille/TechniBraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TechniBraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/TSI/braille.c brltty-5.5/Drivers/Braille/TSI/braille.c --- brltty-5.4/Drivers/Braille/TSI/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TSI/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -866,7 +866,7 @@ } case IPT_BATTERY: - message(NULL, gettext("battery low"), MSG_WAITKEY); + message(NULL, gettext("battery low"), 0); return 1; default: diff -Nru brltty-5.4/Drivers/Braille/TSI/braille.h brltty-5.5/Drivers/Braille/TSI/braille.h --- brltty-5.4/Drivers/Braille/TSI/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TSI/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/TSI/brldefs-ts.h brltty-5.5/Drivers/Braille/TSI/brldefs-ts.h --- brltty-5.4/Drivers/Braille/TSI/brldefs-ts.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TSI/brldefs-ts.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/TSI/Makefile.in brltty-5.5/Drivers/Braille/TSI/Makefile.in --- brltty-5.4/Drivers/Braille/TSI/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TSI/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/TTY/braille.c brltty-5.5/Drivers/Braille/TTY/braille.c --- brltty-5.4/Drivers/Braille/TTY/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TTY/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -36,12 +36,16 @@ #include "log.h" #include "parse.h" #include "charset.h" +#include "unicode.h" #include "get_curses.h" -#ifndef GOT_CURSES +#ifdef GOT_CURSES +#define newLine() addch('\n') +#else /* GOT_CURSES */ #define addstr(string) serialWriteData(ttyDevice, string, strlen(string)) #define addch(character) do { unsigned char __c = (character); serialWriteData(ttyDevice, &__c, 1); } while(0) -#define getch() my_getch() +#define getch() getch_noCurses() +#define newLine() addstr("\r\n") #endif /* GOT_CURSES */ #ifdef GOT_CURSES @@ -91,7 +95,7 @@ static SCREEN *ttyScreen = NULL; #else /* GOT_CURSES */ static inline int -my_getch (void) { +getch_noCurses (void) { unsigned char c; if (serialReadData(ttyDevice, &c, 1, 0, 0) == 1) return c; return EOF; @@ -116,19 +120,23 @@ { unsigned int baud = ttyBaud; - if (serialValidateBaud(&baud, "TTY baud", parameters[PARM_BAUD], NULL)) + + if (serialValidateBaud(&baud, "TTY baud", parameters[PARM_BAUD], NULL)) { ttyBaud = baud; + } } #ifdef GOT_CURSES - if (*parameters[PARM_TERM]) + if (*parameters[PARM_TERM]) { ttyType = parameters[PARM_TERM]; + } #endif /* GOT_CURSES */ { static const int minimum = 1; static const int maximum = MAX_WINDOW_LINES; int lines = windowLines; + if (validateInteger(&lines, parameters[PARM_LINES], &minimum, &maximum)) { windowLines = lines; } else { @@ -140,6 +148,7 @@ static const int minimum = 1; static const int maximum = MAX_WINDOW_COLUMNS; int columns = windowColumns; + if (validateInteger(&columns, parameters[PARM_COLUMNS], &minimum, &maximum)) { windowColumns = columns; } else { @@ -148,12 +157,14 @@ } #ifdef HAVE_ICONV_H - if (*parameters[PARM_CHARSET]) + if (*parameters[PARM_CHARSET]) { characterSet = parameters[PARM_CHARSET]; + } #endif /* HAVE_ICONV_H */ - if (*parameters[PARM_LOCALE]) + if (*parameters[PARM_LOCALE]) { classificationLocale = parameters[PARM_LOCALE]; + } #ifdef HAVE_ICONV_H if ((conversionDescriptor = iconv_open(characterSet, "WCHAR_T")) != (iconv_t)-1) { @@ -200,6 +211,7 @@ } else { logSystemError("iconv_open"); } + conversionDescriptor = NULL; #endif /* HAVE_ICONV_H */ @@ -211,9 +223,11 @@ #ifdef GOT_CURSES if (ttyScreen) { endwin(); + #ifndef __MINGW32__ delscreen(ttyScreen); #endif /* __MINGW32__ */ + ttyScreen = NULL; } #endif /* GOT_CURSES */ @@ -237,18 +251,22 @@ int column; for (column=0; column= 0) { + + if (iconv(conversionDescriptor, &pc, &sc, &pd, &sd) != (size_t)-1) { *pd = 0; addstr(d); } else #endif /* HAVE_ICONV_H */ + { addch(c); + } } } @@ -275,15 +293,36 @@ #ifdef GOT_CURSES clear(); #else /* GOT_CURSES */ - addstr("\r\n"); + newLine(); #endif /* GOT_CURSES */ { - int row; - for (row=0; rowtextRows; row++) { - writeText(&text[row*brl->textColumns], brl->textColumns); - if (row < brl->textRows-1) - addstr("\r\n"); + wchar_t braille[brl->textColumns]; + + for (unsigned int row=0; rowtextRows; row++) { + unsigned int offset = row * brl->textColumns; + writeText(&text[offset], brl->textColumns); + + for (unsigned int column=0; columntextColumns; column+=1) { + unsigned char c = brl->buffer[offset + column]; + braille[column] = UNICODE_BRAILLE_ROW + | (!!(c & BRL_DOT1) << 0) + | (!!(c & BRL_DOT2) << 1) + | (!!(c & BRL_DOT3) << 2) + | (!!(c & BRL_DOT4) << 3) + | (!!(c & BRL_DOT5) << 4) + | (!!(c & BRL_DOT6) << 5) + | (!!(c & BRL_DOT7) << 6) + | (!!(c & BRL_DOT8) << 7) + ; + } + + newLine(); + writeText(braille, brl->textColumns); + + if (row < (brl->textRows - 1)) { + newLine(); + } } } @@ -300,7 +339,7 @@ addch('\r'); writeText(text, brl->cursor); } else { - addstr("\r\n"); + newLine(); } #endif /* GOT_CURSES */ @@ -310,56 +349,54 @@ int brl_keyToCommand (BrailleDisplay *brl, KeyTableCommandContext context, int key) { -#define KEY(key,cmd) case (key): return (cmd) switch (key) { - KEY(EOF, EOF); + case EOF: return EOF; + default: - if (key <= 0XFF) return BRL_CMD_BLK(PASSCHAR)|key; - logMessage(LOG_WARNING, "Unknown key: %d", key); + if (key <= 0XFF) return BRL_CMD_CHAR(key); + logMessage(LOG_WARNING, "unrecognized curses key: %d", key); return BRL_CMD_NOOP; #ifdef GOT_CURSES - KEY(KEY_LEFT, BRL_CMD_FWINLT); - KEY(KEY_RIGHT, BRL_CMD_FWINRT); - KEY(KEY_UP, BRL_CMD_LNUP); - KEY(KEY_DOWN, BRL_CMD_LNDN); - - KEY(KEY_HOME, BRL_CMD_TOP_LEFT); - KEY(KEY_A1, BRL_CMD_TOP_LEFT); - KEY(KEY_END, BRL_CMD_BOT_LEFT); - KEY(KEY_C1, BRL_CMD_BOT_LEFT); - KEY(KEY_IC, BRL_CMD_HOME); - KEY(KEY_B2, BRL_CMD_HOME); - KEY(KEY_DC, BRL_CMD_CSRTRK); - KEY(KEY_PPAGE, BRL_CMD_TOP); - KEY(KEY_A3, BRL_CMD_TOP); - KEY(KEY_NPAGE, BRL_CMD_BOT); - KEY(KEY_C3, BRL_CMD_BOT); - - KEY(KEY_F(1), BRL_CMD_HELP); - KEY(KEY_F(2), BRL_CMD_LEARN); - KEY(KEY_F(3), BRL_CMD_INFO); - KEY(KEY_F(4), BRL_CMD_PREFMENU); - - KEY(KEY_F(5), BRL_CMD_PRDIFLN); - KEY(KEY_F(6), BRL_CMD_NXDIFLN); - KEY(KEY_F(7), BRL_CMD_ATTRUP); - KEY(KEY_F(8), BRL_CMD_ATTRDN); - - KEY(KEY_F(9), BRL_CMD_LNBEG); - KEY(KEY_F(10), BRL_CMD_CHRLT); - KEY(KEY_F(11), BRL_CMD_CHRRT); - KEY(KEY_F(12), BRL_CMD_LNEND); - - KEY(KEY_F(17), BRL_CMD_PRPROMPT); - KEY(KEY_F(18), BRL_CMD_NXPROMPT); - KEY(KEY_F(19), BRL_CMD_PRPGRPH); - KEY(KEY_F(20), BRL_CMD_NXPGRPH); +#define MAP(key,cmd) case KEY_##key: return BRL_CMD_##cmd + MAP(BACKSPACE, KEY(BACKSPACE)); - KEY(KEY_BACKSPACE, BRL_CMD_BLK(PASSKEY)|BRL_KEY_BACKSPACE); + MAP(LEFT, FWINLT); + MAP(RIGHT, FWINRT); + MAP(UP, LNUP); + MAP(DOWN, LNDN); + + MAP(PPAGE, PRDIFLN); + MAP(NPAGE, NXDIFLN); + MAP(A3, PRDIFLN); + MAP(C3, NXDIFLN); + + MAP(HOME, TOP); + MAP(END, BOT); + MAP(A1, TOP); + MAP(C1, BOT); + + MAP(IC, ATTRUP); + MAP(DC, ATTRDN); + MAP(B2, HOME); + + MAP(F(1), HELP); + MAP(F(2), LEARN); + MAP(F(3), INFO); + MAP(F(4), PREFMENU); + + MAP(F(5), PRPROMPT); + MAP(F(6), NXPROMPT); + MAP(F(7), PRPGRPH); + MAP(F(8), NXPGRPH); + + MAP(F(9), LNBEG); + MAP(F(10), CHRLT); + MAP(F(11), CHRRT); + MAP(F(12), LNEND); +#undef MAP #endif /* GOT_CURSES */ } -#undef KEY } static int @@ -370,13 +407,20 @@ if (key == ERR) return EOF; #endif /* GOT_CURSES */ - logMessage(LOG_DEBUG, "key %d", key); + if (key != EOF) { + logMessage(LOG_CATEGORY(BRAILLE_DRIVER), "curses key: %d", key); + } + return key; } static int brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) { int command = brl_keyToCommand(brl, context, brl_readKey(brl)); - if (command != EOF) logMessage(LOG_DEBUG, "cmd %04X", command); + + if (command != EOF) { + logMessage(LOG_CATEGORY(BRAILLE_DRIVER), "command: 0X%04X", command); + } + return command; } diff -Nru brltty-5.4/Drivers/Braille/TTY/braille.h brltty-5.5/Drivers/Braille/TTY/braille.h --- brltty-5.4/Drivers/Braille/TTY/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TTY/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/TTY/Makefile.in brltty-5.5/Drivers/Braille/TTY/Makefile.in --- brltty-5.4/Drivers/Braille/TTY/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TTY/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/TTY/reldeps.mk brltty-5.5/Drivers/Braille/TTY/reldeps.mk --- brltty-5.4/Drivers/Braille/TTY/reldeps.mk 2016-06-28 11:21:49.000000000 +0000 +++ brltty-5.5/Drivers/Braille/TTY/reldeps.mk 2017-04-18 22:38:33.000000000 +0000 @@ -7,6 +7,7 @@ braille.$O: $(SRC_TOP)Headers/parse.h braille.$O: $(SRC_TOP)Headers/charset.h braille.$O: $(SRC_TOP)Headers/lock.h +braille.$O: $(SRC_TOP)Headers/unicode.h braille.$O: $(SRC_TOP)Headers/get_curses.h braille.$O: $(SRC_TOP)Headers/api_types.h braille.$O: $(SRC_TOP)Headers/async.h diff -Nru brltty-5.4/Drivers/Braille/VideoBraille/braille.c brltty-5.5/Drivers/Braille/VideoBraille/braille.c --- brltty-5.4/Drivers/Braille/VideoBraille/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VideoBraille/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/VideoBraille/braille.h brltty-5.5/Drivers/Braille/VideoBraille/braille.h --- brltty-5.4/Drivers/Braille/VideoBraille/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VideoBraille/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/VideoBraille/Makefile.in brltty-5.5/Drivers/Braille/VideoBraille/Makefile.in --- brltty-5.4/Drivers/Braille/VideoBraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VideoBraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/Virtual/braille.c brltty-5.5/Drivers/Braille/Virtual/braille.c --- brltty-5.4/Drivers/Braille/Virtual/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Virtual/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -753,14 +753,6 @@ return 0; } -static size_t -getCommandCount (void) { - size_t count = 0; - const CommandEntry *entry = commandTable; - while (entry++->name) ++count; - return count; -} - static void sortCommands (int (*compareCommands) (const void *item1, const void *item2)) { qsort(commandDescriptors, commandCount, commandSize, compareCommands); @@ -1103,6 +1095,7 @@ case WC_C('"'): case WC_C('\\'): writeCharacter(WC_C('\\')); + /* fall through */ default: writeCharacter(character); break; diff -Nru brltty-5.4/Drivers/Braille/Virtual/braille.h brltty-5.5/Drivers/Braille/Virtual/braille.h --- brltty-5.4/Drivers/Braille/Virtual/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Virtual/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Virtual/Makefile.in brltty-5.5/Drivers/Braille/Virtual/Makefile.in --- brltty-5.4/Drivers/Braille/Virtual/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Virtual/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/VisioBraille/braille.c brltty-5.5/Drivers/Braille/VisioBraille/braille.c --- brltty-5.4/Drivers/Braille/VisioBraille/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VisioBraille/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -59,8 +59,6 @@ } terminfo; #endif /* SendIdReq */ -static int printcode = 0; - /* Function : brl_writePacket */ /* Sends a packet of size bytes, stored at address p to the braille terminal */ /* Returns 0 if everything is right, -1 if an error occured while sending */ @@ -344,7 +342,6 @@ case BRL_VSKEY_D3: return BRL_CMD_KEY(INSERT); case BRL_VSKEY_C5: return BRL_CMD_PASTE; case BRL_VSKEY_D5: descchar = 1; return EOF; - case BRL_VSKEY_B4: printcode = 1; return EOF; default: return EOF; } } else if (type==BRL_VSMSK_OTHER) { @@ -403,13 +400,6 @@ return EOF; } ch = packet[1]; - if (printcode) { - char buf [100]; - snprintf(buf,sizeof(buf),"Keycode: 0x%x",ch); - printcode = 0; /* MUST BE DONE BEFORE THE CALL TO MESSAGE */ - message(NULL,buf,MSG_WAITKEY | MSG_NODELAY); - return EOF; - } if (routing) { routing=0; if (ch>=0xc0) return (packet[1]-0xc0) | BRL_VSMSK_ROUTING; diff -Nru brltty-5.4/Drivers/Braille/VisioBraille/braille.h brltty-5.5/Drivers/Braille/VisioBraille/braille.h --- brltty-5.4/Drivers/Braille/VisioBraille/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VisioBraille/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/VisioBraille/brldefs-vs.h brltty-5.5/Drivers/Braille/VisioBraille/brldefs-vs.h --- brltty-5.4/Drivers/Braille/VisioBraille/brldefs-vs.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VisioBraille/brldefs-vs.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/VisioBraille/brl-out.h brltty-5.5/Drivers/Braille/VisioBraille/brl-out.h --- brltty-5.4/Drivers/Braille/VisioBraille/brl-out.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VisioBraille/brl-out.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/VisioBraille/Makefile.in brltty-5.5/Drivers/Braille/VisioBraille/Makefile.in --- brltty-5.4/Drivers/Braille/VisioBraille/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VisioBraille/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/VisioBraille/vstp.h brltty-5.5/Drivers/Braille/VisioBraille/vstp.h --- brltty-5.4/Drivers/Braille/VisioBraille/vstp.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VisioBraille/vstp.h 2017-04-18 22:35:13.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016 S&S + * Copyright (C) 2006-2017 S&S * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Drivers/Braille/VisioBraille/vstp_main.c brltty-5.5/Drivers/Braille/VisioBraille/vstp_main.c --- brltty-5.4/Drivers/Braille/VisioBraille/vstp_main.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VisioBraille/vstp_main.c 2017-04-18 22:35:13.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016 S&S + * Copyright (C) 2006-2017 S&S * Samuel Thibault * Sébastien Hinderer * @@ -99,7 +99,7 @@ } else if (!strcmp(s,"vbs_ext")) { visiobases_ext = (char *) malloc(5); strncpy(visiobases_ext,c,4); - visiobases_ext[5]=0; + visiobases_ext[4]=0; } else if (!strcmp(s,"vbs_dir")) { visiobases_dir = (char *) malloc(strlen(c)+1); strcpy(visiobases_dir,c); diff -Nru brltty-5.4/Drivers/Braille/VisioBraille/vstp_transfer.c brltty-5.5/Drivers/Braille/VisioBraille/vstp_transfer.c --- brltty-5.4/Drivers/Braille/VisioBraille/vstp_transfer.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/VisioBraille/vstp_transfer.c 2017-04-18 22:35:13.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2016 S&S + * Copyright (C) 2006-2017 S&S * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Drivers/Braille/Voyager/braille.c brltty-5.5/Drivers/Braille/Voyager/braille.c --- brltty-5.4/Drivers/Braille/Voyager/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Voyager/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Voyager/brldefs-vo.h brltty-5.5/Drivers/Braille/Voyager/brldefs-vo.h --- brltty-5.4/Drivers/Braille/Voyager/brldefs-vo.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Voyager/brldefs-vo.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/Voyager/Makefile.in brltty-5.5/Drivers/Braille/Voyager/Makefile.in --- brltty-5.4/Drivers/Braille/Voyager/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/Voyager/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Braille/XWindow/braille.c brltty-5.5/Drivers/Braille/XWindow/braille.c --- brltty-5.4/Drivers/Braille/XWindow/braille.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/XWindow/braille.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/XWindow/braille.h brltty-5.5/Drivers/Braille/XWindow/braille.h --- brltty-5.4/Drivers/Braille/XWindow/braille.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/XWindow/braille.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Braille/XWindow/Makefile.in brltty-5.5/Drivers/Braille/XWindow/Makefile.in --- brltty-5.4/Drivers/Braille/XWindow/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Braille/XWindow/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -25,5 +25,5 @@ include $(SRC_TOP)braille.mk braille.$O: - $(CC) $(BRL_CFLAGS) $(XSV_INCLUDES) -c $(SRC_DIR)/braille.c + $(CC) $(BRL_CFLAGS) $(X11_INCLUDES) -c $(SRC_DIR)/braille.c diff -Nru brltty-5.4/Drivers/BrlAPI/WindowEyes/Makefile.in brltty-5.5/Drivers/BrlAPI/WindowEyes/Makefile.in --- brltty-5.4/Drivers/BrlAPI/WindowEyes/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/BrlAPI/WindowEyes/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/BrlAPI/WindowEyes/test.c brltty-5.5/Drivers/BrlAPI/WindowEyes/test.c --- brltty-5.4/Drivers/BrlAPI/WindowEyes/test.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/BrlAPI/WindowEyes/test.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 2009-2016 by The BRLTTY Developers. + * Copyright (C) 2009-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/BrlAPI/WindowEyes/webrloem.c brltty-5.5/Drivers/BrlAPI/WindowEyes/webrloem.c --- brltty-5.4/Drivers/BrlAPI/WindowEyes/webrloem.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/BrlAPI/WindowEyes/webrloem.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/BrlAPI/WindowEyes/webrloem.h brltty-5.5/Drivers/BrlAPI/WindowEyes/webrloem.h --- brltty-5.4/Drivers/BrlAPI/WindowEyes/webrloem.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/BrlAPI/WindowEyes/webrloem.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Screen/Android/Makefile.in brltty-5.5/Drivers/Screen/Android/Makefile.in --- brltty-5.4/Drivers/Screen/Android/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Screen/Android/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Screen/Android/reldeps.mk brltty-5.5/Drivers/Screen/Android/reldeps.mk --- brltty-5.4/Drivers/Screen/Android/reldeps.mk 2016-06-28 11:21:49.000000000 +0000 +++ brltty-5.5/Drivers/Screen/Android/reldeps.mk 2017-04-18 22:38:33.000000000 +0000 @@ -6,6 +6,7 @@ screen.$O: $(SRC_TOP)Headers/log.h screen.$O: $(SRC_TOP)Headers/brl_cmds.h screen.$O: $(SRC_TOP)Headers/brl_dots.h +screen.$O: $(SRC_TOP)Headers/unicode.h screen.$O: $(SRC_TOP)Headers/driver.h screen.$O: $(SRC_TOP)Headers/ktb_types.h screen.$O: $(SRC_TOP)Headers/scr_base.h diff -Nru brltty-5.4/Drivers/Screen/Android/screen.c brltty-5.5/Drivers/Screen/Android/screen.c --- brltty-5.4/Drivers/Screen/Android/screen.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Screen/Android/screen.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -22,6 +22,7 @@ #include "log.h" #include "brl_cmds.h" +#include "unicode.h" #include "scr_driver.h" #include "system_java.h" @@ -290,28 +291,35 @@ } } } else if (character < SCR_KEY_FUNCTION) { -#define KEY(key,method) [key] = method - static const char *const methodNames[SCR_KEY_FUNCTION] = { - KEY(SCR_KEY_ENTER, "inputKeyEnter"), - KEY(SCR_KEY_TAB, "inputKeyTab"), - KEY(SCR_KEY_BACKSPACE, "inputKeyBackspace"), - KEY(SCR_KEY_ESCAPE, "inputKeyEscape"), - KEY(SCR_KEY_CURSOR_LEFT, "inputKeyCursorLeft"), - KEY(SCR_KEY_CURSOR_RIGHT, "inputKeyCursorRight"), - KEY(SCR_KEY_CURSOR_UP, "inputKeyCursorUp"), - KEY(SCR_KEY_CURSOR_DOWN, "inputKeyCursorDown"), - KEY(SCR_KEY_PAGE_UP, "inputKeyPageUp"), - KEY(SCR_KEY_PAGE_DOWN, "inputKeyPageDown"), - KEY(SCR_KEY_HOME, "inputKeyHome"), - KEY(SCR_KEY_END, "inputKeyEnd"), - KEY(SCR_KEY_INSERT, "inputKeyInsert"), - KEY(SCR_KEY_DELETE, "inputKeyDelete"), +#define SIZE UNICODE_CELL_NUMBER(SCR_KEY_FUNCTION) +#define KEY(key,method) [UNICODE_CELL_NUMBER(SCR_KEY_##key)] = method + + static const char *const methodNames[SIZE] = { + KEY(ENTER, "inputKeyEnter"), + KEY(TAB, "inputKeyTab"), + KEY(BACKSPACE, "inputKeyBackspace"), + KEY(ESCAPE, "inputKeyEscape"), + KEY(CURSOR_LEFT, "inputKeyCursorLeft"), + KEY(CURSOR_RIGHT, "inputKeyCursorRight"), + KEY(CURSOR_UP, "inputKeyCursorUp"), + KEY(CURSOR_DOWN, "inputKeyCursorDown"), + KEY(PAGE_UP, "inputKeyPageUp"), + KEY(PAGE_DOWN, "inputKeyPageDown"), + KEY(HOME, "inputKeyHome"), + KEY(END, "inputKeyEnd"), + KEY(INSERT, "inputKeyInsert"), + KEY(DELETE, "inputKeyDelete"), }; - const char *methodName = methodNames[character]; -#undef KEY - static jmethodID methodIdentifiers[SCR_KEY_FUNCTION]; - jmethodID *methodIdentifier = &methodIdentifiers[character]; + const unsigned int key = UNICODE_CELL_NUMBER(character); + const char *methodName = methodNames[key]; + if (!methodName) return 0; + + static jmethodID methodIdentifiers[SIZE]; + jmethodID *methodIdentifier = &methodIdentifiers[key]; + +#undef SIZE +#undef KEY if (findJavaStaticMethod(env, methodIdentifier, inputServiceClass, methodName, JAVA_SIG_METHOD(JAVA_SIG_BOOLEAN, diff -Nru brltty-5.4/Drivers/Screen/AtSpi/Makefile.in brltty-5.5/Drivers/Screen/AtSpi/Makefile.in --- brltty-5.4/Drivers/Screen/AtSpi/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Screen/AtSpi/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Screen/AtSpi/screen.c brltty-5.5/Drivers/Screen/AtSpi/screen.c --- brltty-5.4/Drivers/Screen/AtSpi/screen.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Screen/AtSpi/screen.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Drivers/Screen/AtSpi2/Makefile.in brltty-5.5/Drivers/Screen/AtSpi2/Makefile.in --- brltty-5.4/Drivers/Screen/AtSpi2/Makefile.in 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Screen/AtSpi2/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Drivers/Screen/AtSpi2/screen.c brltty-5.5/Drivers/Screen/AtSpi2/screen.c --- brltty-5.4/Drivers/Screen/AtSpi2/screen.c 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Drivers/Screen/AtSpi2/screen.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -216,7 +216,7 @@ size_t eaten; memset(&ps,0,sizeof(ps)); while(n) { - if ((eaten = my_mbrlen(s,n,&ps))<0) + if ((ssize_t)(eaten = my_mbrlen(s,n,&ps))<0) return eaten; if (!(eaten)) return ret; s+=eaten; @@ -653,7 +653,12 @@ dbus_message_iter_get_basic (&iter_struct, &path); states = getState(sender, path); - res = (states[0] & (1<. + */ + +#ifndef BRLTTY_INCLUDED_LOG_HISTORY +#define BRLTTY_INCLUDED_LOG_HISTORY + +#include "thread.h" +#include "timing.h" + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +typedef enum { + LPO_NOLOG = 0X01, + LPO_SQUASH = 0X02, +} LogEntryPushOptions; + +typedef struct LogEntryStruct LogEntry; +extern const LogEntry *getPreviousLogEntry (const LogEntry *entry); +extern const char *getLogEntryText (const LogEntry *entry); +extern const TimeValue *getLogEntryTime (const LogEntry *entry); +extern unsigned int getLogEntryCount (const LogEntry *entry); + +extern int pushLogEntry (LogEntry **head, const char *text, LogEntryPushOptions options); +extern int popLogEntry (LogEntry **head); + +extern const LogEntry *getNewestLogMessage (int freeze); +extern void pushLogMessage (const char *message); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* BRLTTY_INCLUDED_LOG_HISTORY */ diff -Nru brltty-5.4/Headers/menu.h brltty-5.5/Headers/menu.h --- brltty-5.4/Headers/menu.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/menu.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/message.h brltty-5.5/Headers/message.h --- brltty-5.4/Headers/message.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/message.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -25,7 +25,7 @@ typedef enum { MSG_SILENT = 0X1, /* don't speak the message */ - MSG_WAITKEY = 0X2, /* wait for a key press before scrolling or dismissing the message */ + MSG_LOG = 0X2, /* add the message to the log's message stack */ MSG_NODELAY = 0X4, /* don't wait */ MSG_SYNC = 0X8 /* run synchronously */ } MessageOptions; diff -Nru brltty-5.4/Headers/midi.h brltty-5.5/Headers/midi.h --- brltty-5.4/Headers/midi.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/midi.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/mntfs.h brltty-5.5/Headers/mntfs.h --- brltty-5.4/Headers/mntfs.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/mntfs.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/mntpt.h brltty-5.5/Headers/mntpt.h --- brltty-5.4/Headers/mntpt.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/mntpt.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/notes.h brltty-5.5/Headers/notes.h --- brltty-5.4/Headers/notes.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/notes.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/note_types.h brltty-5.5/Headers/note_types.h --- brltty-5.4/Headers/note_types.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/note_types.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/options.h brltty-5.5/Headers/options.h --- brltty-5.4/Headers/options.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/options.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/params.h brltty-5.5/Headers/params.h --- brltty-5.4/Headers/params.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/params.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/parse.h brltty-5.5/Headers/parse.h --- brltty-5.4/Headers/parse.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/parse.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -39,7 +39,44 @@ extern int validateInteger (int *value, const char *string, const int *minimum, const int *maximum); extern int validateChoice (unsigned int *value, const char *string, const char *const *choices); -extern int validateFlag (unsigned int *value, const char *string, const char *on, const char *off); + +typedef struct { + const char *true; + const char *false; +} FlagKeywordPair; + +static inline const char * +getFlagKeyword (const FlagKeywordPair *fkp, int state) { + return state? fkp->true: fkp->false; +} + +extern FlagKeywordPair fkpOnOff; +extern FlagKeywordPair fkpTrueFalse; +extern FlagKeywordPair fkpYesNo; +extern FlagKeywordPair fkp10; + +static inline const char * +getFlagKeywordOnOff (int state) { + return getFlagKeyword(&fkpOnOff, state); +} + +static inline const char * +getFlagKeywordTrueFalse (int state) { + return getFlagKeyword(&fkpTrueFalse, state); +} + +static inline const char * +getFlagKeywordYesNo (int state) { + return getFlagKeyword(&fkpYesNo, state); +} + +static inline const char * +getFlagKeyword10 (int state) { + return getFlagKeyword(&fkp10, state); +} + +extern int validateFlagKeyword (unsigned int *value, const char *string); +extern int validateFlag (unsigned int *value, const char *string, const FlagKeywordPair *fkp); extern int validateOnOff (unsigned int *value, const char *string); extern int validateYesNo (unsigned int *value, const char *string); diff -Nru brltty-5.4/Headers/pcm.h brltty-5.5/Headers/pcm.h --- brltty-5.4/Headers/pcm.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/pcm.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/pgmpath.h brltty-5.5/Headers/pgmpath.h --- brltty-5.4/Headers/pgmpath.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/pgmpath.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/pid.h brltty-5.5/Headers/pid.h --- brltty-5.4/Headers/pid.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/pid.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/ports.h brltty-5.5/Headers/ports.h --- brltty-5.4/Headers/ports.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/ports.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/prefs.h brltty-5.5/Headers/prefs.h --- brltty-5.4/Headers/prefs.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/prefs.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -221,6 +221,7 @@ #define PREFERENCES_TIME(time) ((time) * 10) extern void resetPreferences (void); +extern int setPreference (char *string); extern void setStatusFields (const unsigned char *fields); extern char *makePreferencesFilePath (const char *name); @@ -228,7 +229,7 @@ extern int savePreferencesFile (const char *path); typedef struct PreferenceEntryStruct PreferenceEntry; -extern const PreferenceEntry *findPreference (const char *name); +extern const PreferenceEntry *findPreferenceEntry (const char *name); #ifdef __cplusplus } diff -Nru brltty-5.4/Headers/program.h brltty-5.5/Headers/program.h --- brltty-5.4/Headers/program.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/program.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/prologue.h brltty-5.5/Headers/prologue.h --- brltty-5.4/Headers/prologue.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/prologue.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -23,7 +23,7 @@ extern "C" { #endif /* __cplusplus */ -#define PACKAGE_COPYRIGHT "Copyright (C) 1995-2016 by The BRLTTY Developers." +#define PACKAGE_COPYRIGHT "Copyright (C) 1995-2017 by The BRLTTY Developers." #undef HAVE_BUILTIN_POPCOUNT @@ -133,7 +133,7 @@ extern int gettimeofday (struct timeval *tvp, void *tzp); #endif /* gettimeofday */ -#if (__MINGW32_MAJOR_VERSION < 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15)) +#if !defined(__MINGW64_VERSION_MAJOR) && ((__MINGW32_MAJOR_VERSION < 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15))) extern void usleep (int usec); #endif /* usleep */ #endif /* __MINGW32__ */ diff -Nru brltty-5.4/Headers/queue.h brltty-5.5/Headers/queue.h --- brltty-5.4/Headers/queue.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/queue.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/report.h brltty-5.5/Headers/report.h --- brltty-5.4/Headers/report.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/report.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/revision.h brltty-5.5/Headers/revision.h --- brltty-5.4/Headers/revision.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/revision.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/scr_base.h brltty-5.5/Headers/scr_base.h --- brltty-5.4/Headers/scr_base.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/scr_base.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/scr_driver.h brltty-5.5/Headers/scr_driver.h --- brltty-5.4/Headers/scr_driver.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/scr_driver.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/scr_gpm.h brltty-5.5/Headers/scr_gpm.h --- brltty-5.4/Headers/scr_gpm.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/scr_gpm.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/scr_main.h brltty-5.5/Headers/scr_main.h --- brltty-5.4/Headers/scr_main.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/scr_main.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/scr_real.h brltty-5.5/Headers/scr_real.h --- brltty-5.4/Headers/scr_real.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/scr_real.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/scr_types.h brltty-5.5/Headers/scr_types.h --- brltty-5.4/Headers/scr_types.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/scr_types.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/scr_utils.h brltty-5.5/Headers/scr_utils.h --- brltty-5.4/Headers/scr_utils.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/scr_utils.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/serial_types.h brltty-5.5/Headers/serial_types.h --- brltty-5.4/Headers/serial_types.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/serial_types.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/service.h brltty-5.5/Headers/service.h --- brltty-5.4/Headers/service.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/service.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/spk_base.h brltty-5.5/Headers/spk_base.h --- brltty-5.4/Headers/spk_base.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/spk_base.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/spk_driver.h brltty-5.5/Headers/spk_driver.h --- brltty-5.4/Headers/spk_driver.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/spk_driver.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/spk.h brltty-5.5/Headers/spk.h --- brltty-5.4/Headers/spk.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/spk.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/spk_types.h brltty-5.5/Headers/spk_types.h --- brltty-5.4/Headers/spk_types.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/spk_types.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/status_types.h brltty-5.5/Headers/status_types.h --- brltty-5.4/Headers/status_types.h 2016-06-24 03:41:55.000000000 +0000 +++ brltty-5.5/Headers/status_types.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/stdiox.h brltty-5.5/Headers/stdiox.h --- brltty-5.4/Headers/stdiox.h 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Headers/stdiox.h 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,49 @@ +/* + * BRLTTY - A background process providing access to the console screen (when in + * text mode) for a blind person using a refreshable braille display. + * + * Copyright (C) 1995-2017 by The BRLTTY Developers. + * + * BRLTTY comes with ABSOLUTELY NO WARRANTY. + * + * This is free software, placed under the terms of the + * GNU General Public License, as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any + * later version. Please see the file LICENSE-GPL for details. + * + * Web Page: http://brltty.com/ + * + * This software is maintained by Dave Mielke . + */ + +#ifndef BRLTTY_INCLUDED_STDIOX +#define BRLTTY_INCLUDED_STDIOX + +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +static inline void +flushStream (FILE *stream) { + fflush(stream); + +#ifdef __MSDOS__ + fsync(fileno(stream)); +#endif /* __MSDOS__ */ +} + +#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(__MINGW32__) +#define lockStream(stream) flockfile((stream)) +#define unlockStream(stream) funlockfile((stream)) +#else /* _POSIX_THREAD_SAFE_FUNCTIONS */ +#define lockStream(stream) +#define unlockStream(stream) +#endif /* _POSIX_THREAD_SAFE_FUNCTIONS */ + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* BRLTTY_INCLUDED_STDIOX */ diff -Nru brltty-5.4/Headers/strfmt.h brltty-5.5/Headers/strfmt.h --- brltty-5.4/Headers/strfmt.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/strfmt.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -41,6 +41,8 @@ #define STR_LEFT (size_t)(strEnd - strNext) +#define STR_POP() ((strNext > strStart)? --strNext: NULL) + #define STR_ADJUST(length) \ do { if ((strNext += (length)) > strEnd) strNext = strEnd; } while (0) diff -Nru brltty-5.4/Headers/strfmth.h brltty-5.5/Headers/strfmth.h --- brltty-5.4/Headers/strfmth.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/strfmth.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/system_darwin.h brltty-5.5/Headers/system_darwin.h --- brltty-5.4/Headers/system_darwin.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/system_darwin.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/system.h brltty-5.5/Headers/system.h --- brltty-5.4/Headers/system.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/system.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/system_java.h brltty-5.5/Headers/system_java.h --- brltty-5.4/Headers/system_java.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/system_java.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -33,7 +33,7 @@ #define JAVA_METHOD(object, name, type, ...) \ JNIEXPORT type JNICALL Java_ ## object ## _ ## name \ - (JNIEnv *env, jclass class, ## __VA_ARGS__) + (JNIEnv *env, jclass this, ## __VA_ARGS__) extern JavaVM *getJavaInvocationInterface (void); extern JNIEnv *getJavaNativeInterface (void); diff -Nru brltty-5.4/Headers/system_linux.h brltty-5.5/Headers/system_linux.h --- brltty-5.4/Headers/system_linux.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/system_linux.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/system_msdos.h brltty-5.5/Headers/system_msdos.h --- brltty-5.4/Headers/system_msdos.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/system_msdos.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/system_windows.h brltty-5.5/Headers/system_windows.h --- brltty-5.4/Headers/system_windows.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/system_windows.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/thread.h brltty-5.5/Headers/thread.h --- brltty-5.4/Headers/thread.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/thread.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -47,6 +47,33 @@ extern size_t formatThreadName (char *buffer, size_t size); extern void setThreadName (const char *name); +#if defined(PTHREAD_MUTEX_INITIALIZER) +typedef pthread_mutex_t CriticalSectionLock; +#define CRITICAL_SECTION_LOCK_INITIALIZER PTHREAD_MUTEX_INITIALIZER + +static inline void +enterCriticalSection (CriticalSectionLock *lock) { + pthread_mutex_lock(lock); +} + +static inline void +leaveCriticalSection (CriticalSectionLock *lock) { + pthread_mutex_unlock(lock); +} + +#else /* critical section lock */ +typedef unsigned char CriticalSectionLock; +#define CRITICAL_SECTION_LOCK_INITIALIZER 0 + +static inline void +enterCriticalSection (CriticalSectionLock *lock) { +} + +static inline void +leaveCriticalSection (CriticalSectionLock *lock) { +} +#endif /* critical section lock */ + #define THREAD_SPECIFIC_DATA_NEW(name) void *name##_new (void) typedef THREAD_SPECIFIC_DATA_NEW(ThreadSpecificData); diff -Nru brltty-5.4/Headers/timing.h brltty-5.5/Headers/timing.h --- brltty-5.4/Headers/timing.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/timing.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/ttb.h brltty-5.5/Headers/ttb.h --- brltty-5.4/Headers/ttb.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/ttb.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/tune_build.h brltty-5.5/Headers/tune_build.h --- brltty-5.4/Headers/tune_build.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/tune_build.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/tune.h brltty-5.5/Headers/tune.h --- brltty-5.4/Headers/tune.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/tune.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/tune_types.h brltty-5.5/Headers/tune_types.h --- brltty-5.4/Headers/tune_types.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/tune_types.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/tune_utils.h brltty-5.5/Headers/tune_utils.h --- brltty-5.4/Headers/tune_utils.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/tune_utils.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/unicode.h brltty-5.5/Headers/unicode.h --- brltty-5.4/Headers/unicode.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/unicode.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/usb_types.h brltty-5.5/Headers/usb_types.h --- brltty-5.4/Headers/usb_types.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/usb_types.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -300,7 +300,15 @@ #define USB_HID_ITEM_LENGTH(item) ((item) & ~UsbHidItemType_Mask) #define USB_HID_ITEM_BIT(type) (UINT64_C(1) << ((type) >> 2)) +#define BEGIN_USB_STRING_LIST(name) static const char *const name[] = { +#define END_USB_STRING_LIST NULL}; + typedef struct { + const void *data; + const SerialParameters *serial; + const char *const *manufacturers; + const char *const *products; + uint16_t vendor; uint16_t product; uint16_t version; @@ -314,9 +322,6 @@ unsigned disableAutosuspend:1; unsigned disableEndpointReset:1; unsigned verifyInterface:1; - - const SerialParameters *serial; - const void *data; } UsbChannelDefinition; #define BEGIN_USB_CHANNEL_DEFINITIONS static const UsbChannelDefinition usbChannelDefinitions[] = { diff -Nru brltty-5.4/Headers/variables.h brltty-5.5/Headers/variables.h --- brltty-5.4/Headers/variables.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/variables.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/win_errno.h brltty-5.5/Headers/win_errno.h --- brltty-5.4/Headers/win_errno.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/win_errno.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Headers/win_pthread.h brltty-5.5/Headers/win_pthread.h --- brltty-5.4/Headers/win_pthread.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Headers/win_pthread.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -271,12 +271,12 @@ } pthread_cond_t; #define PTHREAD_COND_INITIALIZER { NULL, 0} -#ifndef __struct_timespec_defined +#if !defined(__struct_timespec_defined) && !defined(__MINGW64_VERSION_MAJOR) struct timespec { time_t tv_sec; /* Seconds */ long tv_nsec; /* Nanoseconds */ }; -#endif /* __struct_timespec_defined */ +#endif /* struct timespec */ typedef unsigned pthread_condattr_t; diff -Nru brltty-5.4/Makefile.in brltty-5.5/Makefile.in --- brltty-5.4/Makefile.in 2016-06-28 09:59:14.000000000 +0000 +++ brltty-5.5/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -25,6 +25,9 @@ install-systemd uninstall-systemd: cd Autostart/Systemd && $(MAKE) $(@:-systemd=) +install-udev uninstall-udev: + cd Autostart/Udev && $(MAKE) $(@:-udev=) + ARCHIVE_NAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION) TAR_EXTENSION = tar GZIP_EXTENSION = gz @@ -90,6 +93,7 @@ $(PGM_DIR) \ $(MSG_DIR) \ Autostart/Systemd \ + Autostart/Udev \ Android/Application \ ; do (cd $$directory && $(MAKE) $@); done diff -Nru brltty-5.4/Messages/brltty.pot brltty-5.5/Messages/brltty.pot --- brltty-5.4/Messages/brltty.pot 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Messages/brltty.pot 2017-04-18 22:35:13.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: brltty 5.2\n" +"Project-Id-Version: brltty 5.4\n" "Report-Msgid-Bugs-To: brltty@mielke.cc\n" -"POT-Creation-Date: 2015-12-12 20:06+0100\n" +"POT-Creation-Date: 2017-04-08 00:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,51 +23,77 @@ msgid "\"%s\" started as \"%s\"\n" msgstr "" -#: Programs/menu_prefs.c:433 -#: Programs/menu_prefs.c:434 -#: Programs/menu_prefs.c:436 -#: Programs/menu_prefs.c:437 -#: Programs/menu_prefs.c:440 -#: Programs/menu_prefs.c:441 -#: Programs/menu_prefs.c:442 -#: Programs/menu_prefs.c:444 -#: Programs/menu_prefs.c:445 +#: Programs/menu_prefs.c:442 Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:445 Programs/menu_prefs.c:446 +#: Programs/menu_prefs.c:449 Programs/menu_prefs.c:450 +#: Programs/menu_prefs.c:451 Programs/menu_prefs.c:453 +#: Programs/menu_prefs.c:454 msgid "1 cell" msgstr "" -#: Programs/menu_prefs.c:1035 +#: Programs/menu_prefs.c:762 +msgid "1 second" +msgstr "" + +#: Programs/menu_prefs.c:790 +msgid "10 seconds" +msgstr "" + +#: Programs/menu_prefs.c:1111 msgid "12 Hour" msgstr "" -#: Programs/menu_prefs.c:432 -#: Programs/menu_prefs.c:435 -#: Programs/menu_prefs.c:438 -#: Programs/menu_prefs.c:439 -#: Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:441 Programs/menu_prefs.c:444 +#: Programs/menu_prefs.c:447 Programs/menu_prefs.c:448 +#: Programs/menu_prefs.c:452 msgid "2 cells" msgstr "" -#: Programs/menu_prefs.c:1034 +#: Programs/menu_prefs.c:763 +msgid "2 seconds" +msgstr "" + +#: Programs/menu_prefs.c:791 +msgid "20 seconds" +msgstr "" + +#: Programs/menu_prefs.c:1110 msgid "24 Hour" msgstr "" -#: Programs/menu_prefs.c:551 +#: Programs/menu_prefs.c:760 +msgid "250 milliseconds" +msgstr "" + +#: Programs/menu_prefs.c:792 +msgid "40 seconds" +msgstr "" + +#: Programs/menu_prefs.c:789 +msgid "5 seconds" +msgstr "" + +#: Programs/menu_prefs.c:761 +msgid "500 milliseconds" +msgstr "" + +#: Programs/menu_prefs.c:600 msgid "6-Dot Computer Braille" msgstr "" -#: Programs/menu_prefs.c:549 +#: Programs/menu_prefs.c:598 msgid "8-Dot Computer Braille" msgstr "" -#: Programs/brltty-ttb.c:178 +#: Programs/brltty-ttb.c:179 msgid "8-bit character set to use." msgstr "" -#: Programs/scr_menu.c:93 +#: Programs/scr_menu.c:101 msgid "" msgstr "" -#: Programs/config.c:2646 +#: Programs/config.c:1291 msgid "API Parameter" msgstr "" @@ -98,7 +124,7 @@ msgid "Acoustic Guitar (steel)" msgstr "" -#: Programs/menu_prefs.c:1061 +#: Programs/menu_prefs.c:1137 msgid "After Time" msgstr "" @@ -106,32 +132,31 @@ msgid "Agogo" msgstr "" -#: Programs/menu_prefs.c:1251 +#: Programs/menu_prefs.c:1327 msgid "Alert" msgstr "" -#: Programs/menu_prefs.c:876 +#: Programs/menu_prefs.c:952 msgid "Alert Dots" msgstr "" -#: Programs/menu_prefs.c:881 +#: Programs/menu_prefs.c:957 msgid "Alert Messages" msgstr "" -#: Programs/menu_prefs.c:822 +#: Programs/menu_prefs.c:898 msgid "Alert Tunes" msgstr "" -#: Programs/menu_prefs.c:682 -#: Programs/menu_prefs.c:915 +#: Programs/menu_prefs.c:731 Programs/menu_prefs.c:991 msgid "All" msgstr "" -#: Programs/menu_prefs.c:444 +#: Programs/menu_prefs.c:453 msgid "Alphabetic Braille Window Coordinates" msgstr "" -#: Programs/menu_prefs.c:445 +#: Programs/menu_prefs.c:454 msgid "Alphabetic Screen Cursor Coordinates" msgstr "" @@ -143,48 +168,55 @@ msgid "Applause" msgstr "" -#: Programs/cmd_miscellaneous.c:61 +#: Programs/cmd_miscellaneous.c:60 msgid "April" msgstr "" -#: Programs/log.c:113 +#: Programs/log.c:115 msgid "Async Events" msgstr "" -#: Programs/menu_prefs.c:644 +#: Programs/menu_prefs.c:693 msgid "Attributes Invisible Time" msgstr "" -#: Programs/config.c:2611 -#: Programs/menu_prefs.c:1157 +#: Programs/config.c:2666 Programs/menu_prefs.c:1233 msgid "Attributes Table" msgstr "" -#: Programs/menu_prefs.c:638 +#: Programs/menu_prefs.c:687 msgid "Attributes Visible Time" msgstr "" -#: Programs/cmd_miscellaneous.c:65 +#: Programs/cmd_miscellaneous.c:64 msgid "August" msgstr "" -#: Programs/menu_prefs.c:731 +#: Programs/alert.c:168 +msgid "Autorelease" +msgstr "" + +#: Programs/menu_prefs.c:795 +msgid "Autorelease Time" +msgstr "" + +#: Programs/menu_prefs.c:807 msgid "Autorepeat" msgstr "" -#: Programs/menu_prefs.c:743 +#: Programs/menu_prefs.c:819 msgid "Autorepeat Interval" msgstr "" -#: Programs/menu_prefs.c:737 +#: Programs/menu_prefs.c:813 msgid "Autorepeat Panning" msgstr "" -#: Programs/menu_prefs.c:958 +#: Programs/menu_prefs.c:1034 msgid "Autospeak" msgstr "" -#: Programs/config.c:1589 +#: Programs/config.c:1656 msgid "BRLTTY stopped" msgstr "" @@ -208,11 +240,11 @@ msgid "Bassoon" msgstr "" -#: Programs/menu_prefs.c:828 +#: Programs/menu_prefs.c:904 msgid "Beeper" msgstr "" -#: Programs/menu_prefs.c:1060 +#: Programs/menu_prefs.c:1136 msgid "Before Time" msgstr "" @@ -220,24 +252,23 @@ msgid "Bird Tweet" msgstr "" -#: Programs/menu_prefs.c:632 +#: Programs/menu_prefs.c:681 msgid "Blinking Attributes" msgstr "" -#: Programs/menu_prefs.c:650 +#: Programs/menu_prefs.c:699 msgid "Blinking Capitals" msgstr "" -#: Programs/menu_prefs.c:609 +#: Programs/menu_prefs.c:658 msgid "Blinking Screen Cursor" msgstr "" -#: Programs/menu_prefs.c:1010 +#: Programs/menu_prefs.c:1086 msgid "Blinking Speech Cursor" msgstr "" -#: Programs/menu_prefs.c:512 -#: Programs/menu_prefs.c:1120 +#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1196 msgid "Block" msgstr "" @@ -245,71 +276,71 @@ msgid "Blown Bottle" msgstr "" -#: Programs/log.c:137 +#: Programs/log.c:139 msgid "Bluetooth I/O" msgstr "" -#: Programs/config.c:1394 +#: Programs/config.c:1458 msgid "Braille Device" msgstr "" -#: Programs/menu_prefs.c:791 +#: Programs/menu_prefs.c:867 msgid "Braille Display Orientation" msgstr "" -#: Programs/config.c:1390 +#: Programs/config.c:1454 msgid "Braille Driver" msgstr "" -#: Programs/log.c:143 +#: Programs/log.c:145 msgid "Braille Driver Events" msgstr "" -#: Programs/menu_prefs.c:587 +#: Programs/menu_prefs.c:636 msgid "Braille Firmness" msgstr "" -#: Programs/menu_prefs.c:781 +#: Programs/menu_prefs.c:857 msgid "Braille Input Mode" msgstr "" -#: Programs/log.c:77 +#: Programs/log.c:79 msgid "Braille Key Events" msgstr "" -#: Programs/menu_prefs.c:771 +#: Programs/menu_prefs.c:847 msgid "Braille Keyboard Enabled" msgstr "" -#: Programs/config.c:1393 +#: Programs/config.c:1457 msgid "Braille Parameter" msgstr "" -#: Programs/menu_prefs.c:545 +#: Programs/menu_prefs.c:594 msgid "Braille Presentation" msgstr "" -#: Programs/menu_prefs.c:1147 +#: Programs/menu_prefs.c:1223 msgid "Braille Tables" msgstr "" -#: Programs/menu_prefs.c:433 +#: Programs/menu_prefs.c:442 msgid "Braille Window Column" msgstr "" -#: Programs/menu_prefs.c:432 +#: Programs/menu_prefs.c:441 msgid "Braille Window Coordinates" msgstr "" -#: Programs/menu_prefs.c:703 +#: Programs/menu_prefs.c:752 msgid "Braille Window Overlap" msgstr "" -#: Programs/menu_prefs.c:434 +#: Programs/menu_prefs.c:443 msgid "Braille Window Row" msgstr "" -#: Programs/config.c:384 +#: Programs/config.c:394 #, c-format msgid "Braille driver code (%s, %s, or one of {%s})." msgstr "" @@ -330,35 +361,35 @@ msgid "Bright Acoustic Piano" msgstr "" -#: Programs/xbrlapi.c:90 +#: Programs/xbrlapi.c:92 msgid "BrlAPI authorization/authentication string" msgstr "" -#: Programs/xbrlapi.c:83 +#: Programs/xbrlapi.c:85 msgid "BrlAPI host and/or port to connect to" msgstr "" -#: Programs/menu_prefs.c:1203 +#: Programs/menu_prefs.c:1279 msgid "Bug Reports" msgstr "" -#: Programs/menu_prefs.c:1184 +#: Programs/menu_prefs.c:1260 msgid "Build Information" msgstr "" -#: Programs/menu_prefs.c:572 +#: Programs/menu_prefs.c:621 msgid "Capitalization Mode" msgstr "" -#: Programs/menu_prefs.c:661 +#: Programs/menu_prefs.c:710 msgid "Capitals Invisible Time" msgstr "" -#: Programs/menu_prefs.c:655 +#: Programs/menu_prefs.c:704 msgid "Capitals Visible Time" msgstr "" -#: Programs/menu_prefs.c:1274 +#: Programs/menu_prefs.c:1350 msgid "Category Log Level" msgstr "" @@ -391,28 +422,27 @@ msgid "Clavi" msgstr "" -#: Programs/menu.c:811 +#: Programs/menu.c:822 msgid "Close" msgstr "" -#: Programs/menu_prefs.c:1044 +#: Programs/menu_prefs.c:1120 msgid "Colon" msgstr "" -#: Programs/menu_prefs.c:1208 +#: Programs/menu_prefs.c:1284 msgid "Configuration Directory" msgstr "" -#: Programs/config.c:2565 -#: Programs/menu_prefs.c:1213 +#: Programs/config.c:2620 Programs/menu_prefs.c:1289 msgid "Configuration File" msgstr "" -#: Programs/alert.c:412 +#: Programs/alert.c:163 msgid "Console Bell" msgstr "" -#: Programs/menu_prefs.c:808 +#: Programs/menu_prefs.c:884 msgid "Console Bell Alert" msgstr "" @@ -420,78 +450,71 @@ msgid "Contrabass" msgstr "" -#: Programs/menu_prefs.c:550 +#: Programs/menu_prefs.c:599 msgid "Contracted Braille" msgstr "" -#: Programs/config.c:2618 -#: Programs/menu_prefs.c:1165 +#: Programs/config.c:2673 Programs/menu_prefs.c:1241 msgid "Contraction Table" msgstr "" -#: Programs/brltty-ctb.c:66 +#: Programs/brltty-ctb.c:62 msgid "Contraction table." msgstr "" -#: Programs/brltty-ctb.c:80 +#: Programs/brltty-ctb.c:76 msgid "Contraction verification table." msgstr "" -#: Programs/xbrlapi.c:754 -#, c-format -msgid "Couldn't find modifiers to apply to %d for getting keysym %08X\n" -msgstr "" - -#: Programs/xbrlapi.c:730 -#, c-format -msgid "Couldn't translate keysym %08X to keycode.\n" -msgstr "" - -#: Programs/menu_prefs.c:1252 +#: Programs/menu_prefs.c:1328 msgid "Critical" msgstr "" -#: Programs/log.c:95 +#: Programs/log.c:97 msgid "Cursor Routing" msgstr "" -#: Programs/log.c:89 +#: Programs/log.c:91 msgid "Cursor Tracking" msgstr "" -#: Programs/menu_prefs.c:1082 +#: Programs/menu_prefs.c:766 +msgid "Cursor Tracking Delay" +msgstr "" + +#: Programs/menu_prefs.c:1158 msgid "Dash" msgstr "" -#: Programs/menu_prefs.c:1075 +#: Programs/menu_prefs.c:1151 msgid "Date Format" msgstr "" -#: Programs/menu_prefs.c:1064 +#: Programs/menu_prefs.c:1140 msgid "Date Position" msgstr "" -#: Programs/menu_prefs.c:1087 +#: Programs/menu_prefs.c:1163 msgid "Date Separator" msgstr "" -#: Programs/menu_prefs.c:1072 +#: Programs/menu_prefs.c:1148 msgid "Day Month Year" msgstr "" -#: Programs/menu_prefs.c:1257 +#: Programs/menu_prefs.c:1333 msgid "Debug" msgstr "" -#: Programs/cmd_miscellaneous.c:69 +#: Programs/cmd_miscellaneous.c:68 msgid "December" msgstr "" -#: Programs/config.c:405 +#: Programs/config.c:415 msgid "Device for accessing braille display." msgstr "" -#: Programs/config.c:364 +#: Programs/config.c:374 msgid "Disable the application programming interface." msgstr "" @@ -499,24 +522,28 @@ msgid "Distortion Guitar" msgstr "" -#: Programs/config.c:506 +#: Programs/config.c:517 msgid "Do not autospeak when braille is not being used." msgstr "" -#: Programs/xbrlapi.c:103 +#: Programs/xbrlapi.c:105 msgid "Do not write any text to the braille device" msgstr "" -#: Programs/alert.c:301 +#: Programs/brltty-trtxt.c:83 +msgid "Don't fall back to the Unicode base character." +msgstr "" + +#: Programs/alert.c:52 msgid "Done" msgstr "" -#: Programs/menu_prefs.c:1045 -#: Programs/menu_prefs.c:1084 +#: Programs/menu_prefs.c:1121 +#: Programs/menu_prefs.c:1160 msgid "Dot" msgstr "" -#: Programs/menu_prefs.c:778 +#: Programs/menu_prefs.c:854 msgid "Dots via Unicode Braille" msgstr "" @@ -525,8 +552,7 @@ msgid "Drawbar Organ" msgstr "" -#: Programs/config.c:2569 -#: Programs/menu_prefs.c:1233 +#: Programs/config.c:2626 Programs/menu_prefs.c:1309 msgid "Drivers Directory" msgstr "" @@ -534,11 +560,11 @@ msgid "Dulcimer" msgstr "" -#: Programs/menu_prefs.c:697 +#: Programs/menu_prefs.c:746 msgid "Eager Sliding Braille Window" msgstr "" -#: Programs/brltty-ttb.c:157 +#: Programs/brltty-ttb.c:158 msgid "Edit table." msgstr "" @@ -574,15 +600,15 @@ msgid "Electric Piano 2" msgstr "" -#: Programs/menu_prefs.c:1250 +#: Programs/menu_prefs.c:1326 msgid "Emergency" msgstr "" -#: Programs/menu_prefs.c:431 +#: Programs/menu_prefs.c:440 msgid "End" msgstr "" -#: Programs/menu_prefs.c:683 +#: Programs/menu_prefs.c:732 msgid "End of Line" msgstr "" @@ -590,7 +616,7 @@ msgid "English Horn" msgstr "" -#: Programs/menu_prefs.c:950 +#: Programs/menu_prefs.c:1026 msgid "Enqueue" msgstr "" @@ -598,7 +624,7 @@ msgid "Ensemble" msgstr "" -#: Programs/menu_prefs.c:1253 +#: Programs/menu_prefs.c:1329 msgid "Error" msgstr "" @@ -606,19 +632,23 @@ msgid "Ethnic Instruments" msgstr "" -#: Programs/menu_prefs.c:805 +#: Programs/menu_prefs.c:881 msgid "Event Alerts" msgstr "" -#: Programs/menu_prefs.c:560 +#: Programs/menu_prefs.c:609 msgid "Expand Current Word" msgstr "" -#: Programs/menu_prefs.c:831 +#: Programs/config.c:336 +msgid "Explicit preference settings." +msgstr "" + +#: Programs/menu_prefs.c:907 msgid "FM" msgstr "" -#: Programs/menu_prefs.c:869 +#: Programs/menu_prefs.c:945 msgid "FM Volume" msgstr "" @@ -655,7 +685,7 @@ msgid "FX 8 (sci-fi)" msgstr "" -#: Programs/cmd_miscellaneous.c:59 +#: Programs/cmd_miscellaneous.c:58 msgid "February" msgstr "" @@ -667,15 +697,15 @@ msgid "Flute" msgstr "" -#: Programs/brltty-ctb.c:100 +#: Programs/brltty-ctb.c:96 msgid "Force immediate output." msgstr "" -#: Programs/brltty-ttb.c:164 +#: Programs/brltty-ttb.c:165 msgid "Format of input file." msgstr "" -#: Programs/brltty-ttb.c:171 +#: Programs/brltty-ttb.c:172 msgid "Format of output file." msgstr "" @@ -687,15 +717,15 @@ msgid "Fretless Bass" msgstr "" -#: Programs/alert.c:346 +#: Programs/alert.c:97 msgid "Frozen" msgstr "" -#: Programs/menu_prefs.c:446 +#: Programs/menu_prefs.c:455 msgid "Generic" msgstr "" -#: Programs/log.c:59 +#: Programs/log.c:61 msgid "Generic Input" msgstr "" @@ -732,16 +762,15 @@ msgid "Helicopter" msgstr "" -#: Programs/scr_help.c:217 +#: Programs/scr_help.c:215 msgid "Help Screen" msgstr "" -#: Programs/menu_prefs.c:583 -#: Programs/menu_prefs.c:760 +#: Programs/menu_prefs.c:632 Programs/menu_prefs.c:836 msgid "High" msgstr "" -#: Programs/menu_prefs.c:716 +#: Programs/menu_prefs.c:778 msgid "Highlight Braille Window Location" msgstr "" @@ -749,48 +778,48 @@ msgid "Honkytonk Piano" msgstr "" -#: Programs/menu_prefs.c:949 +#: Programs/menu_prefs.c:1025 msgid "Immediate" msgstr "" -#: Programs/xbrlapi.c:536 +#: Programs/xbrlapi.c:600 msgid "Incompatible XKB library\n" msgstr "" -#: Programs/xbrlapi.c:538 +#: Programs/xbrlapi.c:602 msgid "Incompatible XKB server support\n" msgstr "" -#: Programs/menu_prefs.c:1256 +#: Programs/menu_prefs.c:1332 msgid "Information" msgstr "" -#: Programs/menu_prefs.c:722 +#: Programs/menu_prefs.c:784 msgid "Input Options" msgstr "" -#: Programs/log.c:65 +#: Programs/log.c:67 msgid "Input Packets" msgstr "" -#: Programs/config.c:290 +#: Programs/config.c:283 #, c-format msgid "Install the %s service, and then exit." msgstr "" -#: Programs/menu_prefs.c:1260 +#: Programs/menu_prefs.c:1336 msgid "Internal Parameters" msgstr "" -#: Programs/cmd_miscellaneous.c:58 +#: Programs/cmd_miscellaneous.c:57 msgid "January" msgstr "" -#: Programs/cmd_miscellaneous.c:64 +#: Programs/cmd_miscellaneous.c:63 msgid "July" msgstr "" -#: Programs/cmd_miscellaneous.c:63 +#: Programs/cmd_miscellaneous.c:62 msgid "June" msgstr "" @@ -798,29 +827,27 @@ msgid "Kalimba" msgstr "" -#: Programs/config.c:1317 +#: Programs/config.c:1382 msgid "Key Bindings" msgstr "" -#: Programs/config.c:980 +#: Programs/config.c:982 msgid "Key Help" msgstr "" -#: Programs/config.c:1322 -#: Programs/ktb_list.c:668 +#: Programs/config.c:1387 Programs/ktb_list.c:689 msgid "Key Table" msgstr "" -#: Programs/log.c:83 +#: Programs/log.c:85 msgid "Keyboard Key Events" msgstr "" -#: Programs/menu_prefs.c:815 +#: Programs/menu_prefs.c:891 msgid "Keyboard LED Alerts" msgstr "" -#: Programs/config.c:2625 -#: Programs/menu_prefs.c:797 +#: Programs/config.c:2680 Programs/menu_prefs.c:873 msgid "Keyboard Table" msgstr "" @@ -828,7 +855,7 @@ msgid "Koto" msgstr "" -#: Programs/config.c:2777 +#: Programs/config.c:2810 msgid "Language" msgstr "" @@ -865,85 +892,88 @@ msgid "Lead 8 (bass + lead)" msgstr "" -#: Programs/learn.c:94 +#: Programs/learn.c:101 msgid "Learn Mode" msgstr "" -#: Programs/menu_prefs.c:1099 +#: Programs/menu_prefs.c:1175 msgid "Left" msgstr "" -#: Programs/brltty-ktb.c:45 +#: Programs/brltty-ktb.c:53 msgid "List key names." msgstr "" -#: Programs/brltty-ktb.c:52 +#: Programs/brltty-ktb.c:60 msgid "List key table in help screen format." msgstr "" -#: Programs/brltty-ktb.c:59 +#: Programs/brltty-ktb.c:67 msgid "List key table in reStructuredText format." msgstr "" -#: Programs/menu_prefs.c:1243 +#: Programs/menu_prefs.c:1319 msgid "Locale Directory" msgstr "" -#: Programs/menu_prefs.c:1279 +#: Programs/menu_prefs.c:1355 msgid "Log Categories" msgstr "" -#: Programs/config.c:739 +#: Programs/config.c:741 msgid "Log Level" msgstr "" -#: Programs/config.c:605 +#: Programs/menu_prefs.c:1416 +msgid "Log Messages" +msgstr "" + +#: Programs/config.c:607 msgid "Log the versions of the core, API, and built-in drivers, and then exit." msgstr "" -#: Programs/config.c:561 +#: Programs/config.c:572 msgid "Log to standard error rather than to the system log." msgstr "" -#: Programs/config.c:575 +#: Programs/config.c:586 #, c-format msgid "Logging level (%s or one of {%s}) and/or log categories to enable (any combination of {%s}, each optionally prefixed by %s to disable)" msgstr "" -#: Programs/menu_prefs.c:725 +#: Programs/menu_prefs.c:801 msgid "Long Press Time" msgstr "" -#: Programs/menu_prefs.c:581 -#: Programs/menu_prefs.c:758 +#: Programs/menu_prefs.c:630 Programs/menu_prefs.c:834 msgid "Low" msgstr "" -#: Programs/menu_prefs.c:513 +#: Programs/menu_prefs.c:562 msgid "Lower Left Dot" msgstr "" -#: Programs/menu_prefs.c:514 +#: Programs/menu_prefs.c:563 msgid "Lower Right Dot" msgstr "" -#: Programs/menu_prefs.c:830 +#: Programs/menu_prefs.c:906 msgid "MIDI" msgstr "" -#: Programs/config.c:545 +#: Programs/config.c:556 msgid "MIDI (Musical Instrument Digital Interface) device specifier." msgstr "" -#: Programs/menu_prefs.c:860 +#: Programs/menu_prefs.c:936 msgid "MIDI Instrument" msgstr "" -#: Programs/menu_prefs.c:850 +#: Programs/menu_prefs.c:926 msgid "MIDI Volume" msgstr "" -#: Programs/cmd_miscellaneous.c:60 +#: Programs/cmd_miscellaneous.c:59 msgid "March" msgstr "" @@ -951,21 +981,19 @@ msgid "Marimba" msgstr "" -#: Programs/menu_prefs.c:584 -#: Programs/menu_prefs.c:761 +#: Programs/menu_prefs.c:633 Programs/menu_prefs.c:837 msgid "Maximum" msgstr "" -#: Programs/brltty-ctb.c:94 +#: Programs/brltty-ctb.c:90 msgid "Maximum length of an output line." msgstr "" -#: Programs/cmd_miscellaneous.c:62 +#: Programs/cmd_miscellaneous.c:61 msgid "May" msgstr "" -#: Programs/menu_prefs.c:582 -#: Programs/menu_prefs.c:759 +#: Programs/menu_prefs.c:631 Programs/menu_prefs.c:835 msgid "Medium" msgstr "" @@ -973,20 +1001,19 @@ msgid "Melodic Tom" msgstr "" -#: Programs/menu_prefs.c:526 +#: Programs/menu_prefs.c:575 msgid "Menu Options" msgstr "" -#: Programs/config.c:554 +#: Programs/config.c:565 msgid "Message hold timeout (in 10ms units)." msgstr "" -#: Programs/menu_prefs.c:580 -#: Programs/menu_prefs.c:757 +#: Programs/menu_prefs.c:629 Programs/menu_prefs.c:833 msgid "Minimum" msgstr "" -#: Programs/menu_prefs.c:1071 +#: Programs/menu_prefs.c:1147 msgid "Month Day Year" msgstr "" @@ -994,7 +1021,7 @@ msgid "Music Box" msgstr "" -#: Programs/menu_prefs.c:830 +#: Programs/menu_prefs.c:906 msgid "Musical Instrument Digital Interface" msgstr "" @@ -1002,61 +1029,61 @@ msgid "Muted Trumpet" msgstr "" -#: Programs/config.c:446 +#: Programs/config.c:456 msgid "Name of or path to attributes table." msgstr "" -#: Programs/config.c:455 +#: Programs/config.c:465 msgid "Name of or path to contraction table." msgstr "" -#: Programs/config.c:336 +#: Programs/config.c:328 msgid "Name of or path to default preferences file." msgstr "" -#: Programs/config.c:464 +#: Programs/config.c:474 msgid "Name of or path to keyboard table." msgstr "" -#: Programs/config.c:500 +#: Programs/config.c:510 msgid "Name of or path to speech input object." msgstr "" -#: Programs/config.c:437 +#: Programs/config.c:447 #, c-format msgid "Name of or path to text table (or %s)." msgstr "" -#: Programs/menu_prefs.c:668 +#: Programs/menu_prefs.c:717 msgid "Navigation Options" msgstr "" -#: Programs/menu.c:443 +#: Programs/menu.c:449 msgid "No" msgstr "" -#: Programs/menu_prefs.c:567 +#: Programs/menu_prefs.c:616 msgid "No Capitalization" msgstr "" -#: Programs/menu_prefs.c:913 -#: Programs/menu_prefs.c:926 -#: Programs/menu_prefs.c:939 -#: Programs/menu_prefs.c:1059 -#: Programs/menu_prefs.c:1098 -#: Programs/menu_prefs.c:1118 +#: Programs/menu_prefs.c:759 Programs/menu_prefs.c:989 +#: Programs/menu_prefs.c:1002 +#: Programs/menu_prefs.c:1015 +#: Programs/menu_prefs.c:1135 +#: Programs/menu_prefs.c:1174 +#: Programs/menu_prefs.c:1194 msgid "None" msgstr "" -#: Programs/menu_prefs.c:787 +#: Programs/menu_prefs.c:863 msgid "Normal" msgstr "" -#: Programs/menu_prefs.c:1255 +#: Programs/menu_prefs.c:1331 msgid "Notice" msgstr "" -#: Programs/cmd_miscellaneous.c:68 +#: Programs/cmd_miscellaneous.c:67 msgid "November" msgstr "" @@ -1068,11 +1095,15 @@ msgid "Ocarina" msgstr "" -#: Programs/cmd_miscellaneous.c:67 +#: Programs/cmd_miscellaneous.c:66 msgid "October" msgstr "" -#: Programs/config.c:1407 +#: Programs/menu_prefs.c:788 +msgid "Off" +msgstr "" + +#: Programs/config.c:1471 msgid "Old Preferences File" msgstr "" @@ -1088,7 +1119,7 @@ msgid "Organ" msgstr "" -#: Programs/log.c:71 +#: Programs/log.c:73 msgid "Output Packets" msgstr "" @@ -1100,15 +1131,15 @@ msgid "PC mode" msgstr "" -#: Programs/menu_prefs.c:829 +#: Programs/menu_prefs.c:905 msgid "PCM" msgstr "" -#: Programs/config.c:535 +#: Programs/config.c:546 msgid "PCM (soundcard digital audio) device specifier." msgstr "" -#: Programs/menu_prefs.c:842 +#: Programs/menu_prefs.c:918 msgid "PCM Volume" msgstr "" @@ -1116,11 +1147,11 @@ msgid "PS/2 (set 3) keyboard scan code" msgstr "" -#: Programs/menu_prefs.c:1193 +#: Programs/menu_prefs.c:1269 msgid "Package Revision" msgstr "" -#: Programs/menu_prefs.c:1188 +#: Programs/menu_prefs.c:1264 msgid "Package Version" msgstr "" @@ -1161,71 +1192,69 @@ msgid "Pan Flute" msgstr "" -#: Programs/config.c:373 +#: Programs/config.c:383 msgid "Parameters for the application programming interface." msgstr "" -#: Programs/config.c:395 +#: Programs/config.c:405 msgid "Parameters for the braille driver." msgstr "" -#: Programs/config.c:526 +#: Programs/config.c:537 msgid "Parameters for the screen driver." msgstr "" -#: Programs/config.c:492 +#: Programs/config.c:502 msgid "Parameters for the speech driver." msgstr "" -#: Programs/config.c:317 +#: Programs/config.c:319 msgid "Path to default settings file." msgstr "" -#: Programs/config.c:356 +#: Programs/config.c:366 msgid "Path to directory containing drivers." msgstr "" -#: Programs/brltest.c:72 -#: Programs/brltty-atb.c:36 -#: Programs/brltty-ctb.c:58 -#: Programs/brltty-ktb.c:79 -#: Programs/config.c:427 +#: Programs/brltest.c:68 Programs/brltty-atb.c:36 +#: Programs/brltty-ctb.c:54 Programs/brltty-ktb.c:77 +#: Programs/config.c:437 msgid "Path to directory containing tables." msgstr "" -#: Programs/brltty-ttb.c:151 +#: Programs/brltty-ttb.c:152 msgid "Path to directory containing text tables." msgstr "" -#: Programs/brltty-ktb.c:69 +#: Programs/brltty-ktb.c:87 msgid "Path to directory for loading drivers." msgstr "" -#: Programs/brltty-trtxt.c:50 +#: Programs/brltty-trtxt.c:51 msgid "Path to directory for text tables." msgstr "" -#: Programs/brltest.c:82 /tmp/src/brltty/Programs/config.c:346 +#: Programs/brltest.c:78 Programs/config.c:356 msgid "Path to directory which can be written to." msgstr "" -#: Programs/config.c:327 +#: Programs/config.c:346 msgid "Path to directory which contains files that can be updated." msgstr "" -#: Programs/brltty-trtxt.c:59 +#: Programs/brltty-trtxt.c:60 msgid "Path to input text table." msgstr "" -#: Programs/config.c:584 +#: Programs/config.c:595 msgid "Path to log file." msgstr "" -#: Programs/brltty-trtxt.c:68 +#: Programs/brltty-trtxt.c:69 msgid "Path to output text table." msgstr "" -#: Programs/config.c:593 +#: Programs/config.c:309 msgid "Path to process identifier file." msgstr "" @@ -1254,40 +1283,39 @@ msgid "Pizzicato Strings" msgstr "" -#: Drivers/Braille/Baum/braille.c:1075 +#: Drivers/Braille/Baum/braille.c:1076 msgid "Powerdown" msgstr "" -#: Programs/config.c:2567 -#: Programs/menu_prefs.c:1223 +#: Programs/config.c:2621 Programs/menu_prefs.c:1299 msgid "Preferences File" msgstr "" -#: Programs/scr_menu.c:264 +#: Programs/scr_menu.c:268 msgid "Preferences Menu" msgstr "" -#: Headers/options.h:74 +#: Headers/options.h:75 msgid "Print a usage summary (all options), and then exit." msgstr "" -#: Headers/options.h:69 +#: Headers/options.h:70 msgid "Print a usage summary (commonly used options only), and then exit." msgstr "" -#: Programs/menu_prefs.c:1174 +#: Programs/menu_prefs.c:1250 msgid "Profiles" msgstr "" -#: Programs/config.c:472 +#: Programs/config.c:482 msgid "Properties of eligible keyboards." msgstr "" -#: Programs/menu_prefs.c:930 +#: Programs/menu_prefs.c:1006 msgid "Raise Pitch" msgstr "" -#: Programs/config.c:276 +#: Programs/config.c:269 msgid "Recognize environment variables." msgstr "" @@ -1303,44 +1331,48 @@ msgid "Reed Organ" msgstr "" -#: Programs/brltty-ctb.c:86 +#: Programs/brltty-ctb.c:82 msgid "Reformat input." msgstr "" -#: Programs/config.c:417 +#: Programs/config.c:427 msgid "Release braille device when screen or window is unreadable." msgstr "" -#: Programs/config.c:283 +#: Programs/config.c:276 msgid "Remain a foreground process." msgstr "" -#: Programs/brltty-trtxt.c:75 +#: Programs/brltty-trtxt.c:76 msgid "Remove dots seven and eight." msgstr "" -#: Programs/config.c:298 +#: Programs/config.c:291 #, c-format msgid "Remove the %s service, and then exit." msgstr "" -#: Programs/brltty-ttb.c:185 +#: Programs/brltty-ktb.c:46 +msgid "Report problems with the key table." +msgstr "" + +#: Programs/brltty-ttb.c:186 msgid "Report the characters within the current screen font that aren't defined within the text table." msgstr "" -#: Programs/menu_prefs.c:684 +#: Programs/menu_prefs.c:733 msgid "Rest of Line" msgstr "" -#: Programs/menu_prefs.c:1322 +#: Programs/menu_prefs.c:1398 msgid "Restart Braille Driver" msgstr "" -#: Programs/menu_prefs.c:1334 +#: Programs/menu_prefs.c:1410 msgid "Restart Screen Driver" msgstr "" -#: Programs/menu_prefs.c:1328 +#: Programs/menu_prefs.c:1404 msgid "Restart Speech Driver" msgstr "" @@ -1348,7 +1380,7 @@ msgid "Reverse Cymbal" msgstr "" -#: Programs/menu_prefs.c:1100 +#: Programs/menu_prefs.c:1176 msgid "Right" msgstr "" @@ -1356,77 +1388,77 @@ msgid "Rock Organ" msgstr "" -#: Programs/menu_prefs.c:788 +#: Programs/menu_prefs.c:864 msgid "Rotated" msgstr "" -#: Programs/menu_prefs.c:521 +#: Programs/menu_prefs.c:570 msgid "Save on Exit" msgstr "" #. "cap" here, used during speech output, is short for "capital". #. It is spoken just before an uppercase letter, e.g. "cap A". -#: Programs/menu_prefs.c:929 +#: Programs/menu_prefs.c:1005 msgid "Say Cap" msgstr "" -#: Programs/menu_prefs.c:953 +#: Programs/menu_prefs.c:1029 msgid "Say Line Mode" msgstr "" -#: Programs/menu_prefs.c:940 +#: Programs/menu_prefs.c:1016 msgid "Say Space" msgstr "" -#: Programs/menu_prefs.c:436 +#: Programs/menu_prefs.c:445 msgid "Screen Cursor Column" msgstr "" -#: Programs/menu_prefs.c:435 +#: Programs/menu_prefs.c:444 msgid "Screen Cursor Coordinates" msgstr "" -#: Programs/menu_prefs.c:621 +#: Programs/menu_prefs.c:670 msgid "Screen Cursor Invisible Time" msgstr "" -#: Programs/menu_prefs.c:437 +#: Programs/menu_prefs.c:446 msgid "Screen Cursor Row" msgstr "" -#: Programs/menu_prefs.c:603 +#: Programs/menu_prefs.c:652 msgid "Screen Cursor Style" msgstr "" -#: Programs/menu_prefs.c:615 +#: Programs/menu_prefs.c:664 msgid "Screen Cursor Visible Time" msgstr "" -#: Programs/menu_prefs.c:438 +#: Programs/menu_prefs.c:447 msgid "Screen Cursor and Braille Window Column" msgstr "" -#: Programs/menu_prefs.c:439 +#: Programs/menu_prefs.c:448 msgid "Screen Cursor and Braille Window Row" msgstr "" -#: Programs/config.c:2057 +#: Programs/config.c:2112 msgid "Screen Driver" msgstr "" -#: Programs/log.c:155 +#: Programs/log.c:157 msgid "Screen Driver Events" msgstr "" -#: Programs/menu_prefs.c:440 +#: Programs/menu_prefs.c:449 msgid "Screen Number" msgstr "" -#: Programs/config.c:2063 +#: Programs/config.c:2118 msgid "Screen Parameter" msgstr "" -#: Programs/config.c:516 +#: Programs/config.c:527 #, c-format msgid "Screen driver code (%s, %s, or one of {%s})." msgstr "" @@ -1435,15 +1467,15 @@ msgid "Seashore" msgstr "" -#: Programs/cmd_miscellaneous.c:66 +#: Programs/cmd_miscellaneous.c:65 msgid "September" msgstr "" -#: Programs/log.c:125 +#: Programs/log.c:127 msgid "Serial I/O" msgstr "" -#: Programs/log.c:119 +#: Programs/log.c:121 msgid "Server Events" msgstr "" @@ -1459,31 +1491,31 @@ msgid "Shanai" msgstr "" -#: Programs/menu_prefs.c:534 +#: Programs/menu_prefs.c:583 msgid "Show Advanced Submenus" msgstr "" -#: Programs/menu_prefs.c:539 +#: Programs/menu_prefs.c:588 msgid "Show All Items" msgstr "" -#: Programs/menu_prefs.c:627 +#: Programs/menu_prefs.c:676 msgid "Show Attributes" msgstr "" -#: Programs/menu_prefs.c:598 +#: Programs/menu_prefs.c:647 msgid "Show Screen Cursor" msgstr "" -#: Programs/menu_prefs.c:1053 +#: Programs/menu_prefs.c:1129 msgid "Show Seconds" msgstr "" -#: Programs/menu_prefs.c:999 +#: Programs/menu_prefs.c:1075 msgid "Show Speech Cursor" msgstr "" -#: Programs/menu_prefs.c:529 +#: Programs/menu_prefs.c:578 msgid "Show Submenu Sizes" msgstr "" @@ -1492,15 +1524,15 @@ msgid "Sitar" msgstr "" -#: Programs/menu_prefs.c:676 +#: Programs/menu_prefs.c:725 msgid "Skip Blank Braille Windows" msgstr "" -#: Programs/menu_prefs.c:671 +#: Programs/menu_prefs.c:720 msgid "Skip Identical Lines" msgstr "" -#: Programs/menu_prefs.c:687 +#: Programs/menu_prefs.c:736 msgid "Skip Which Blank Braille Windows" msgstr "" @@ -1512,15 +1544,15 @@ msgid "Slap Bass 2" msgstr "" -#: Programs/menu_prefs.c:1083 +#: Programs/menu_prefs.c:1159 msgid "Slash" msgstr "" -#: Programs/menu_prefs.c:692 +#: Programs/menu_prefs.c:741 msgid "Sliding Braille Window" msgstr "" -#: Programs/menu_prefs.c:914 +#: Programs/menu_prefs.c:990 msgid "Some" msgstr "" @@ -1533,133 +1565,133 @@ msgid "Sound Effects" msgstr "" -#: Programs/menu_prefs.c:1119 +#: Programs/menu_prefs.c:1195 msgid "Space" msgstr "" -#: Programs/menu_prefs.c:993 +#: Programs/menu_prefs.c:1069 msgid "Speak Completed Words" msgstr "" -#: Programs/menu_prefs.c:981 +#: Programs/menu_prefs.c:1057 msgid "Speak Deleted Characters" msgstr "" -#: Programs/menu_prefs.c:975 +#: Programs/menu_prefs.c:1051 msgid "Speak Inserted Characters" msgstr "" -#: Programs/menu_prefs.c:987 +#: Programs/menu_prefs.c:1063 msgid "Speak Replaced Characters" msgstr "" -#: Programs/menu_prefs.c:969 +#: Programs/menu_prefs.c:1045 msgid "Speak Selected Character" msgstr "" -#: Programs/menu_prefs.c:963 +#: Programs/menu_prefs.c:1039 msgid "Speak Selected Line" msgstr "" -#: Programs/menu_prefs.c:1022 +#: Programs/menu_prefs.c:1098 msgid "Speech Cursor Invisible Time" msgstr "" -#: Programs/menu_prefs.c:1004 +#: Programs/menu_prefs.c:1080 msgid "Speech Cursor Style" msgstr "" -#: Programs/menu_prefs.c:1016 +#: Programs/menu_prefs.c:1092 msgid "Speech Cursor Visible Time" msgstr "" -#: Programs/config.c:1825 +#: Programs/config.c:1880 msgid "Speech Driver" msgstr "" -#: Programs/log.c:149 +#: Programs/log.c:151 msgid "Speech Driver Events" msgstr "" -#: Programs/log.c:107 +#: Programs/log.c:109 msgid "Speech Events" msgstr "" #. Create the file system object for speech input. -#: Programs/config.c:2687 +#: Programs/config.c:2720 msgid "Speech Input" msgstr "" -#: Programs/menu_prefs.c:888 +#: Programs/menu_prefs.c:964 msgid "Speech Options" msgstr "" -#: Programs/config.c:1828 +#: Programs/config.c:1883 msgid "Speech Parameter" msgstr "" -#: Programs/menu_prefs.c:905 +#: Programs/menu_prefs.c:981 msgid "Speech Pitch" msgstr "" -#: Programs/menu_prefs.c:918 +#: Programs/menu_prefs.c:994 msgid "Speech Punctuation" msgstr "" -#: Programs/menu_prefs.c:898 +#: Programs/menu_prefs.c:974 msgid "Speech Rate" msgstr "" -#: Programs/menu_prefs.c:933 +#: Programs/menu_prefs.c:1009 msgid "Speech Uppercase Indicator" msgstr "" -#: Programs/menu_prefs.c:891 +#: Programs/menu_prefs.c:967 msgid "Speech Volume" msgstr "" -#: Programs/menu_prefs.c:943 +#: Programs/menu_prefs.c:1019 msgid "Speech Whitespace Indicator" msgstr "" -#: Programs/config.c:482 +#: Programs/config.c:492 #, c-format msgid "Speech driver code (%s, %s, or one of {%s})." msgstr "" -#: Programs/menu_prefs.c:1269 +#: Programs/menu_prefs.c:1345 msgid "Standard Error Log Level" msgstr "" -#: Programs/menu_prefs.c:441 +#: Programs/menu_prefs.c:450 msgid "State Dots" msgstr "" -#: Programs/menu_prefs.c:442 +#: Programs/menu_prefs.c:451 msgid "State Letter" msgstr "" -#: Programs/menu_prefs.c:1094 +#: Programs/menu_prefs.c:1170 msgid "Status Cells" msgstr "" -#: Programs/menu_prefs.c:1110 +#: Programs/menu_prefs.c:1186 msgid "Status Count" msgstr "" -#: Programs/menu_prefs.c:450 +#: Programs/menu_prefs.c:459 msgid "Status Field" msgstr "" -#: Programs/menu_prefs.c:1103 +#: Programs/menu_prefs.c:1179 msgid "Status Position" msgstr "" -#: Programs/menu_prefs.c:1125 +#: Programs/menu_prefs.c:1201 msgid "Status Separator" msgstr "" -#: Programs/menu_prefs.c:1121 +#: Programs/menu_prefs.c:1197 msgid "Status Side" msgstr "" @@ -1667,7 +1699,7 @@ msgid "Steel Drums" msgstr "" -#: Programs/config.c:306 +#: Programs/config.c:299 #, c-format msgid "Stop an existing instance of %s, and then exit." msgstr "" @@ -1685,11 +1717,11 @@ msgid "Strings" msgstr "" -#: Programs/menu_prefs.c:569 +#: Programs/menu_prefs.c:618 msgid "Superimpose Dot 7" msgstr "" -#: Programs/config.c:567 +#: Programs/config.c:578 msgid "Suppress start-up messages." msgstr "" @@ -1737,12 +1769,11 @@ msgid "SynthStrings 2" msgstr "" -#: Programs/menu_prefs.c:1264 +#: Programs/menu_prefs.c:1340 msgid "System Log Level" msgstr "" -#: Programs/config.c:2570 -#: Programs/menu_prefs.c:1238 +#: Programs/config.c:2627 Programs/menu_prefs.c:1314 msgid "Tables Directory" msgstr "" @@ -1762,40 +1793,39 @@ msgid "Tenor Sax" msgstr "" -#: Programs/menu_prefs.c:595 +#: Programs/menu_prefs.c:644 msgid "Text Indicators" msgstr "" -#: Programs/menu_prefs.c:1122 +#: Programs/menu_prefs.c:1198 msgid "Text Side" msgstr "" -#: Programs/menu_prefs.c:554 +#: Programs/menu_prefs.c:603 msgid "Text Style" msgstr "" -#: Programs/config.c:2597 -#: Programs/menu_prefs.c:1150 +#: Programs/config.c:2652 Programs/menu_prefs.c:1226 msgid "Text Table" msgstr "" -#: Programs/brltty-ctb.c:73 +#: Programs/brltty-ctb.c:69 msgid "Text table." msgstr "" -#: Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:452 msgid "Time" msgstr "" -#: Programs/menu_prefs.c:1038 +#: Programs/menu_prefs.c:1114 msgid "Time Format" msgstr "" -#: Programs/menu_prefs.c:1030 +#: Programs/menu_prefs.c:1106 msgid "Time Presentation" msgstr "" -#: Programs/menu_prefs.c:1048 +#: Programs/menu_prefs.c:1124 msgid "Time Separator" msgstr "" @@ -1808,23 +1838,23 @@ msgid "Tinkle Bell" msgstr "" -#: Programs/menu_prefs.c:1318 +#: Programs/menu_prefs.c:1394 msgid "Tools" msgstr "" -#: Programs/menu_prefs.c:750 +#: Programs/menu_prefs.c:826 msgid "Touch Navigation" msgstr "" -#: Programs/menu_prefs.c:764 +#: Programs/menu_prefs.c:840 msgid "Touch Sensitivity" msgstr "" -#: Programs/menu_prefs.c:710 +#: Programs/menu_prefs.c:772 msgid "Track Screen Pointer" msgstr "" -#: Programs/menu_prefs.c:777 +#: Programs/menu_prefs.c:853 msgid "Translated via Text Table" msgstr "" @@ -1849,36 +1879,35 @@ msgid "Tubular Bells" msgstr "" -#: Programs/menu_prefs.c:834 +#: Programs/menu_prefs.c:910 msgid "Tune Device" msgstr "" -#: Programs/log.c:131 +#: Programs/log.c:133 msgid "USB I/O" msgstr "" -#: Programs/menu_prefs.c:511 +#: Programs/menu_prefs.c:560 msgid "Underline" msgstr "" -#: Programs/alert.c:351 +#: Programs/alert.c:102 msgid "Unfrozen" msgstr "" -#: Programs/config.c:2566 -#: Programs/menu_prefs.c:1218 +#: Programs/config.c:2624 Programs/menu_prefs.c:1294 msgid "Updatable Directory" msgstr "" -#: Programs/log.c:101 +#: Programs/log.c:103 msgid "Update Events" msgstr "" -#: Programs/options.c:136 +#: Programs/options.c:135 msgid "Usage" msgstr "" -#: Programs/menu_prefs.c:568 +#: Programs/menu_prefs.c:617 msgid "Use Capital Sign" msgstr "" @@ -1899,11 +1928,11 @@ msgid "Voice Oohs" msgstr "" -#: Programs/menu_prefs.c:1254 +#: Programs/menu_prefs.c:1330 msgid "Warning" msgstr "" -#: Programs/menu_prefs.c:1198 +#: Programs/menu_prefs.c:1274 msgid "Web Site" msgstr "" @@ -1915,29 +1944,23 @@ msgid "Woodblock" msgstr "" -#: Programs/config.c:2558 +#: Programs/config.c:2613 msgid "Working Directory" msgstr "" -#: Programs/config.c:2568 -#: Programs/menu_prefs.c:1228 +#: Programs/config.c:2625 Programs/menu_prefs.c:1304 msgid "Writable Directory" msgstr "" -#: Programs/config.c:599 +#: Programs/config.c:601 msgid "Write the start-up logs, and then exit." msgstr "" -#: Programs/xbrlapi.c:312 -#, c-format -msgid "X Error %d, %s on display %s\n" -msgstr "" - -#: Programs/xbrlapi.c:97 +#: Programs/xbrlapi.c:99 msgid "X display to connect to" msgstr "" -#: Programs/xbrlapi.c:644 +#: Programs/xbrlapi.c:713 msgid "XFree(wm_name) for change" msgstr "" @@ -1949,23 +1972,23 @@ msgid "Xylophone" msgstr "" -#: Programs/menu_prefs.c:1070 +#: Programs/menu_prefs.c:1146 msgid "Year Month Day" msgstr "" -#: Programs/menu.c:444 +#: Programs/menu.c:450 msgid "Yes" msgstr "" -#: Programs/xbrlapi.c:81 +#: Programs/xbrlapi.c:83 msgid "[host][:port]" msgstr "" -#: Programs/menu_prefs.c:512 +#: Programs/menu_prefs.c:561 msgid "all dots" msgstr "" -#: Programs/cmd_miscellaneous.c:132 +#: Programs/cmd_miscellaneous.c:121 msgid "and" msgstr "" @@ -1977,7 +2000,7 @@ msgid "append to clipboard from character" msgstr "" -#: Programs/cmd.c:296 +#: Programs/cmd.c:290 msgid "at cursor" msgstr "" @@ -1985,17 +2008,7 @@ msgid "backspace key" msgstr "" -#: Programs/xbrlapi.c:354 -#, c-format -msgid "bad format for VT number\n" -msgstr "" - -#: Programs/xbrlapi.c:357 -#, c-format -msgid "bad type for VT number\n" -msgstr "" - -#: Drivers/Braille/Baum/braille.c:1065 +#: Drivers/Braille/Baum/braille.c:1067 #: Drivers/Braille/TSI/braille.c:869 msgid "battery low" msgstr "" @@ -2013,20 +2026,20 @@ msgstr "" #. -#: Programs/cmd_utils.c:96 +#: Programs/cmd_utils.c:109 msgid "black" msgstr "" -#: Programs/cmd_utils.c:120 +#: Programs/cmd_utils.c:133 msgid "blink" msgstr "" #. B -#: Programs/cmd_utils.c:97 +#: Programs/cmd_utils.c:110 msgid "blue" msgstr "" -#: Programs/config.c:2659 +#: Programs/config.c:2692 #, c-format msgid "braille device not specified" msgstr "" @@ -2035,15 +2048,15 @@ msgid "braille display temporarily unavailable" msgstr "" -#: Programs/config.c:1347 +#: Programs/config.c:1412 msgid "braille driver initialization failed" msgstr "" -#: Programs/config.c:1421 +#: Programs/config.c:1488 msgid "braille driver not loadable" msgstr "" -#: Programs/cmd_miscellaneous.c:194 +#: Programs/cmd_miscellaneous.c:178 msgid "braille stopped" msgstr "" @@ -2060,7 +2073,7 @@ msgstr "" #. RG -#: Programs/cmd_utils.c:102 +#: Programs/cmd_utils.c:115 msgid "brown" msgstr "" @@ -2068,33 +2081,38 @@ msgid "cannot compile attributes table" msgstr "" -#: Programs/config.c:784 +#: Programs/config.c:786 msgid "cannot compile contraction table" msgstr "" -#: Programs/config.c:1328 +#: Programs/config.c:1393 msgid "cannot compile key table" msgstr "" -#: Programs/config.c:1025 +#: Programs/config.c:1027 msgid "cannot compile keyboard table" msgstr "" -#: Programs/ttb_translate.c:216 +#: Programs/ttb_translate.c:223 msgid "cannot compile text table" msgstr "" -#: Programs/xbrlapi.c:178 +#. This is the first attempt to connect to BRLTTY, and it failed. +#. * Return the error immediately to the user, to provide feedback to users +#. * running xbrlapi by hand, but not fill logs, eat battery, spam +#. * 127.0.0.1 with reconnection attempts. +#. +#: Programs/xbrlapi.c:187 #, c-format -msgid "cannot connect to brltty at %s\n" +msgid "cannot connect to braille devices daemon brltty at %s\n" msgstr "" -#: Programs/xbrlapi.c:524 +#: Programs/xbrlapi.c:588 #, c-format msgid "cannot connect to display %s\n" msgstr "" -#: Programs/file.c:333 +#: Programs/file.c:334 msgid "cannot create directory" msgstr "" @@ -2103,7 +2121,7 @@ msgid "cannot determine program directory" msgstr "" -#: Programs/config.c:2561 /tmp/src/brltty/Programs/menu.c:538 +#: Programs/config.c:2616 Programs/menu.c:544 msgid "cannot determine working directory" msgstr "" @@ -2115,30 +2133,25 @@ msgid "cannot fix install path" msgstr "" -#: Programs/xbrlapi.c:336 -#, c-format -msgid "cannot get root window XFree86_VT property\n" -msgstr "" - -#: Programs/xbrlapi.c:196 +#: Programs/xbrlapi.c:219 msgid "cannot get tty\n" msgstr "" -#: Programs/xbrlapi.c:199 +#: Programs/xbrlapi.c:225 #, c-format msgid "cannot get tty %d\n" msgstr "" -#: Programs/file.c:456 +#: Programs/file.c:457 msgid "cannot get working directory" msgstr "" -#: Programs/xbrlapi.c:568 +#: Programs/xbrlapi.c:631 #, c-format msgid "cannot grab windows on screen %d\n" msgstr "" -#: Programs/xbrlapi.c:203 +#: Programs/xbrlapi.c:232 msgid "cannot ignore keys\n" msgstr "" @@ -2150,11 +2163,11 @@ msgid "cannot load library" msgstr "" -#: Programs/ttb_translate.c:233 +#: Programs/ttb_translate.c:240 msgid "cannot load text table" msgstr "" -#: Programs/config.c:982 +#: Programs/config.c:984 msgid "cannot open key help" msgstr "" @@ -2162,44 +2175,38 @@ msgid "cannot open process identifier file" msgstr "" -#: Programs/menu.c:536 +#: Programs/menu.c:542 msgid "cannot open working directory" msgstr "" -#: Programs/prefs.c:326 +#: Programs/prefs.c:351 msgid "cannot read preferences file" msgstr "" -#: Programs/xbrlapi.c:243 +#: Programs/xbrlapi.c:297 #, c-format msgid "cannot set focus to %#010x\n" msgstr "" -#: Programs/file.c:470 /tmp/src/brltty/Programs/menu.c:525 +#: Programs/file.c:471 Programs/menu.c:531 msgid "cannot set working directory" msgstr "" -#: Programs/prefs.c:501 +#: Programs/prefs.c:526 msgid "cannot write to preferences file" msgstr "" -#: Programs/xbrlapi.c:236 -#, c-format -msgid "cannot write window name %s\n" -msgstr "" - #. "cap" here, used during speech output, is short for "capital". #. It is spoken just before an uppercase letter, e.g. "cap A". -#: Programs/core.c:827 +#: Programs/core.c:888 msgid "cap" msgstr "" -#: Programs/menu_prefs.c:704 -#: Programs/menu_prefs.c:1111 +#: Programs/menu_prefs.c:753 Programs/menu_prefs.c:1187 msgid "cells" msgstr "" -#: Programs/cmd_preferences.c:80 +#: Programs/cmd_preferences.c:81 msgid "changes discarded" msgstr "" @@ -2207,7 +2214,7 @@ msgid "clear all sticky input modifiers" msgstr "" -#: Programs/cmd_speech.c:465 +#: Programs/cmd_speech.c:456 msgid "column" msgstr "" @@ -2216,15 +2223,15 @@ msgid "config" msgstr "" -#: Programs/options.c:751 +#: Programs/options.c:756 msgid "configuration directive specified more than once" msgstr "" -#: Drivers/Screen/Linux/screen.c:1280 +#: Drivers/Screen/Linux/screen.c:1281 msgid "console not in use" msgstr "" -#: Programs/menu_prefs.c:828 +#: Programs/menu_prefs.c:904 msgid "console tone generator" msgstr "" @@ -2232,8 +2239,7 @@ msgid "copy characters to clipboard" msgstr "" -#: Programs/config.c:552 -#: Programs/menu_prefs.c:479 +#: Programs/config.c:563 Programs/menu_prefs.c:488 msgid "csecs" msgstr "" @@ -2258,7 +2264,7 @@ msgstr "" #. GB -#: Programs/cmd_utils.c:99 +#: Programs/cmd_utils.c:112 msgid "cyan" msgstr "" @@ -2287,7 +2293,7 @@ msgstr "" #. L -#: Programs/cmd_utils.c:104 +#: Programs/cmd_utils.c:117 msgid "dark grey" msgstr "" @@ -2311,37 +2317,20 @@ msgid "describe current character" msgstr "" -#: Programs/config.c:533 /tmp/src/brltty/Programs/config.c:543 +#: Programs/config.c:544 Programs/config.c:554 msgid "device" msgstr "" -#: Programs/xbrlapi.c:622 -#, c-format -msgid "didn't grab parent of %#010lx\n" -msgstr "" - -#: Programs/xbrlapi.c:640 -#, c-format -msgid "didn't grab window %#010lx\n" -msgstr "" - -#: Programs/xbrlapi.c:479 -#, c-format -msgid "didn't grab window %#010lx but got focus\n" -msgstr "" - -#: Programs/brltest.c:68 /tmp/src/brltty/Programs/brltest.c:78 -#: Programs/brltty-atb.c:32 -#: Programs/brltty-ctb.c:54 -#: Programs/brltty-ktb.c:65 -#: Programs/brltty-ktb.c:75 -#: Programs/brltty-trtxt.c:46 -#: Programs/config.c:323 /tmp/src/brltty/Programs/config.c:342 -#: Programs/config.c:352 /tmp/src/brltty/Programs/config.c:423 +#: Programs/brltest.c:64 Programs/brltest.c:74 +#: Programs/brltty-atb.c:32 Programs/brltty-ctb.c:50 +#: Programs/brltty-ktb.c:73 Programs/brltty-ktb.c:83 +#: Programs/brltty-trtxt.c:47 Programs/config.c:342 +#: Programs/config.c:352 Programs/config.c:362 +#: Programs/config.c:433 msgid "directory" msgstr "" -#: Programs/xbrlapi.c:95 +#: Programs/xbrlapi.c:97 msgid "display" msgstr "" @@ -2349,28 +2338,28 @@ msgid "do nothing" msgstr "" -#: Programs/learn.c:101 +#: Programs/learn.c:108 msgid "done" msgstr "" -#: Programs/menu_prefs.c:513 +#: Programs/menu_prefs.c:562 msgid "dot 7" msgstr "" -#: Programs/menu_prefs.c:514 +#: Programs/menu_prefs.c:563 msgid "dot 8" msgstr "" -#: Programs/menu_prefs.c:511 +#: Programs/menu_prefs.c:560 msgid "dots 7 and 8" msgstr "" -#: Drivers/Braille/Baum/braille.c:1062 +#: Drivers/Braille/Baum/braille.c:1064 msgid "driver request" msgstr "" -#: Programs/config.c:381 /tmp/src/brltty/Programs/config.c:479 -#: Programs/config.c:513 +#: Programs/config.c:391 Programs/config.c:489 +#: Programs/config.c:524 msgid "driver,..." msgstr "" @@ -2406,11 +2395,11 @@ msgid "eurobraille" msgstr "" -#: Programs/cmd_miscellaneous.c:129 +#: Programs/cmd_miscellaneous.c:118 msgid "exactly" msgstr "" -#: Programs/config.c:723 +#: Programs/config.c:725 msgid "excess argument" msgstr "" @@ -2426,21 +2415,21 @@ msgid "execution of \"%s\" failed: %s\n" msgstr "" -#: Programs/xbrlapi.c:575 +#: Programs/xbrlapi.c:638 msgid "failed to get first focus\n" msgstr "" -#: Programs/brltty-trtxt.c:56 -#: Programs/brltty-trtxt.c:65 -#: Programs/config.c:313 /tmp/src/brltty/Programs/config.c:333 -#: Programs/config.c:434 /tmp/src/brltty/Programs/config.c:444 -#: Programs/config.c:453 /tmp/src/brltty/Programs/config.c:462 -#: Programs/config.c:498 /tmp/src/brltty/Programs/config.c:582 -#: Programs/config.c:590 /tmp/src/brltty/Programs/xbrlapi.c:88 +#: Programs/brltty-trtxt.c:57 +#: Programs/brltty-trtxt.c:66 Programs/config.c:306 +#: Programs/config.c:315 Programs/config.c:325 +#: Programs/config.c:444 Programs/config.c:454 +#: Programs/config.c:463 Programs/config.c:472 +#: Programs/config.c:508 Programs/config.c:593 +#: Programs/xbrlapi.c:90 msgid "file" msgstr "" -#: Programs/options.c:929 +#: Programs/options.c:942 #, c-format msgid "file '%s' processing error." msgstr "" @@ -2668,15 +2657,15 @@ msgstr "" #. G -#: Programs/cmd_utils.c:98 +#: Programs/cmd_utils.c:111 msgid "green" msgstr "" -#: Programs/cmd_miscellaneous.c:246 +#: Programs/cmd_miscellaneous.c:230 msgid "help not available" msgstr "" -#: Programs/scr_help.c:234 +#: Programs/scr_help.c:229 msgid "help screen not readable" msgstr "" @@ -2684,11 +2673,11 @@ msgid "home key" msgstr "" -#: Programs/config.c:402 +#: Programs/config.c:412 msgid "identifier,..." msgstr "" -#: Drivers/Braille/Baum/braille.c:1064 +#: Drivers/Braille/Baum/braille.c:1066 msgid "idle timeout" msgstr "" @@ -2720,7 +2709,7 @@ msgid "invalid counter setting" msgstr "" -#: Programs/datafile.c:434 +#: Programs/datafile.c:318 msgid "invalid escape sequence" msgstr "" @@ -2728,11 +2717,11 @@ msgid "invalid flag setting" msgstr "" -#: Programs/config.c:2459 +#: Programs/config.c:2528 msgid "invalid message hold timeout" msgstr "" -#: Programs/brlapi_server.c:3062 +#: Programs/brlapi_server.c:3129 msgid "invalid thread stack size" msgstr "" @@ -2746,36 +2735,36 @@ msgstr "" #. L B -#: Programs/cmd_utils.c:105 +#: Programs/cmd_utils.c:118 msgid "light blue" msgstr "" #. L GB -#: Programs/cmd_utils.c:107 +#: Programs/cmd_utils.c:120 msgid "light cyan" msgstr "" #. L G -#: Programs/cmd_utils.c:106 +#: Programs/cmd_utils.c:119 msgid "light green" msgstr "" #. RGB -#: Programs/cmd_utils.c:103 +#: Programs/cmd_utils.c:116 msgid "light grey" msgstr "" #. LR B -#: Programs/cmd_utils.c:109 +#: Programs/cmd_utils.c:122 msgid "light magenta" msgstr "" #. LR -#: Programs/cmd_utils.c:108 +#: Programs/cmd_utils.c:121 msgid "light red" msgstr "" -#: Programs/cmd_speech.c:464 +#: Programs/cmd_speech.c:455 msgid "line" msgstr "" @@ -2783,17 +2772,17 @@ msgid "linear copy to character" msgstr "" -#: Programs/config.c:573 +#: Programs/config.c:584 msgid "lvl|cat,..." msgstr "" #. R B -#: Programs/cmd_utils.c:101 +#: Programs/cmd_utils.c:114 msgid "magenta" msgstr "" #. An invalid option has been specified. -#: Programs/options.c:533 +#: Programs/options.c:542 msgid "missing operand" msgstr "" @@ -2809,14 +2798,9 @@ msgid "missing parameter value" msgstr "" -#: Programs/xbrlapi.c:345 -#, c-format -msgid "more than one item for VT number\n" -msgstr "" - -#: Programs/config.c:370 /tmp/src/brltty/Programs/config.c:392 -#: Programs/config.c:470 /tmp/src/brltty/Programs/config.c:489 -#: Programs/config.c:523 +#: Programs/config.c:334 Programs/config.c:380 +#: Programs/config.c:402 Programs/config.c:480 +#: Programs/config.c:499 Programs/config.c:534 msgid "name=value,..." msgstr "" @@ -2824,17 +2808,7 @@ msgid "native" msgstr "" -#: Programs/xbrlapi.c:330 -#, c-format -msgid "no XFree86_VT atom\n" -msgstr "" - -#: Programs/xbrlapi.c:341 -#, c-format -msgid "no items for VT number\n" -msgstr "" - -#: Programs/config.c:993 +#: Programs/config.c:995 msgid "no key bindings" msgstr "" @@ -2842,15 +2816,15 @@ msgid "no screen" msgstr "" -#: Programs/config.c:634 +#: Programs/config.c:636 msgid "none" msgstr "" -#: Programs/config.c:1234 +#: Programs/config.c:1261 msgid "not saved" msgstr "" -#: Programs/options.c:140 +#: Programs/options.c:139 msgid "option" msgstr "" @@ -2862,11 +2836,11 @@ msgid "page-up key" msgstr "" -#: Programs/menu_prefs.c:485 +#: Programs/menu_prefs.c:494 msgid "percentage" msgstr "" -#: Programs/config.c:2432 +#: Programs/config.c:2501 msgid "pid file not specified" msgstr "" @@ -2882,7 +2856,7 @@ msgid "place left end of braille window at character" msgstr "" -#: Drivers/Braille/Baum/braille.c:1063 +#: Drivers/Braille/Baum/braille.c:1065 msgid "power switch" msgstr "" @@ -2895,21 +2869,21 @@ msgstr "" #. R -#: Programs/cmd_utils.c:100 +#: Programs/cmd_utils.c:113 msgid "red" msgstr "" -#: Programs/config.c:1634 +#: Programs/config.c:1701 #, c-format msgid "reinitializing braille driver" msgstr "" -#: Programs/config.c:2194 +#: Programs/config.c:2249 #, c-format msgid "reinitializing screen driver" msgstr "" -#: Programs/config.c:1975 +#: Programs/config.c:2030 #, c-format msgid "reinitializing speech driver" msgstr "" @@ -2929,11 +2903,6 @@ msgid "repeat count" msgstr "" -#: Programs/xbrlapi.c:313 -#, c-format -msgid "resource %#010lx, req %u:%u\n" -msgstr "" - #: Programs/cmds.auto.h:532 msgid "restart braille driver" msgstr "" @@ -2958,11 +2927,11 @@ msgid "save preferences to disk" msgstr "" -#: Programs/config.c:2074 +#: Programs/config.c:2129 msgid "screen driver not loadable" msgstr "" -#: Drivers/Screen/Linux/screen.c:1303 +#: Drivers/Screen/Linux/screen.c:1304 msgid "screen not in text mode" msgstr "" @@ -2974,7 +2943,7 @@ msgid "search forward for clipboard text" msgstr "" -#: Programs/cmd_miscellaneous.c:133 +#: Programs/cmd_miscellaneous.c:122 msgid "second" msgid_plural "seconds" msgstr[0] "" @@ -3120,15 +3089,15 @@ msgid "show current date and time" msgstr "" -#: Programs/menu_prefs.c:829 +#: Programs/menu_prefs.c:905 msgid "soundcard digital audio" msgstr "" -#: Programs/menu_prefs.c:831 +#: Programs/menu_prefs.c:907 msgid "soundcard synthesizer" msgstr "" -#: Programs/cmd.c:283 /tmp/src/brltty/Programs/core.c:808 +#: Programs/cmd.c:277 Programs/core.c:869 msgid "space" msgstr "" @@ -3136,8 +3105,7 @@ msgid "speak current character" msgstr "" -#: Programs/cmds.auto.h:465 -#: Programs/cmds.auto.h:669 +#: Programs/cmds.auto.h:465 Programs/cmds.auto.h:669 msgid "speak current line" msgstr "" @@ -3157,7 +3125,7 @@ msgid "speak speech cursor location" msgstr "" -#: Programs/config.c:1839 +#: Programs/config.c:1894 msgid "speech driver not loadable" msgstr "" @@ -3197,7 +3165,7 @@ msgid "stop the speech driver" msgstr "" -#: Programs/xbrlapi.c:526 +#: Programs/xbrlapi.c:590 msgid "strange old error handler\n" msgstr "" @@ -3229,11 +3197,11 @@ msgid "type unicode character" msgstr "" -#: Programs/xbrlapi.c:771 +#: Programs/xbrlapi.c:841 msgid "unexpected block type" msgstr "" -#: Programs/xbrlapi.c:721 +#: Programs/xbrlapi.c:791 msgid "unexpected cmd" msgstr "" @@ -3241,25 +3209,19 @@ msgid "unhandled command" msgstr "" -#. "shouldn't happen" events -#: Programs/xbrlapi.c:669 -#, c-format -msgid "unhandled event type: %d\n" -msgstr "" - -#: Programs/cmd.c:204 +#: Programs/cmd.c:198 msgid "unknown command" msgstr "" -#: Programs/options.c:767 +#: Programs/options.c:772 msgid "unknown configuration directive" msgstr "" -#: Programs/config.c:654 +#: Programs/config.c:656 msgid "unknown log level or category" msgstr "" -#: Programs/options.c:528 +#: Programs/options.c:529 msgid "unknown option" msgstr "" @@ -3272,16 +3234,92 @@ msgstr "" #. LRGB -#: Programs/cmd_utils.c:111 +#: Programs/cmd_utils.c:124 msgid "white" msgstr "" -#: Programs/xbrlapi.c:648 +#: Programs/xbrlapi.c:824 #, c-format -msgid "window %#010lx changed to NULL name\n" +msgid "xbrlapi: Couldn't find modifiers to apply to %d for getting keysym %08X\n" +msgstr "" + +#: Programs/xbrlapi.c:800 +#, c-format +msgid "xbrlapi: Couldn't translate keysym %08X to keycode.\n" +msgstr "" + +#: Programs/xbrlapi.c:373 +#, c-format +msgid "xbrlapi: X Error %d, %s on display %s\n" +msgstr "" + +#: Programs/xbrlapi.c:415 +#, c-format +msgid "xbrlapi: bad format for VT number\n" +msgstr "" + +#: Programs/xbrlapi.c:418 +#, c-format +msgid "xbrlapi: bad type for VT number\n" +msgstr "" + +#: Programs/xbrlapi.c:397 +#, c-format +msgid "xbrlapi: cannot get root window XFree86_VT property\n" +msgstr "" + +#: Programs/xbrlapi.c:276 +#, c-format +msgid "xbrlapi: cannot write window name %s\n" +msgstr "" + +#: Programs/xbrlapi.c:691 +#, c-format +msgid "xbrlapi: didn't grab parent of %#010lx\n" +msgstr "" + +#: Programs/xbrlapi.c:709 +#, c-format +msgid "xbrlapi: didn't grab window %#010lx\n" +msgstr "" + +#: Programs/xbrlapi.c:540 +#, c-format +msgid "xbrlapi: didn't grab window %#010lx but got focus\n" +msgstr "" + +#: Programs/xbrlapi.c:406 +#, c-format +msgid "xbrlapi: more than one item for VT number\n" +msgstr "" + +#: Programs/xbrlapi.c:391 +#, c-format +msgid "xbrlapi: no XFree86_VT atom\n" +msgstr "" + +#: Programs/xbrlapi.c:402 +#, c-format +msgid "xbrlapi: no items for VT number\n" +msgstr "" + +#: Programs/xbrlapi.c:374 +#, c-format +msgid "xbrlapi: resource %#010lx, req %u:%u\n" +msgstr "" + +#. "shouldn't happen" events +#: Programs/xbrlapi.c:738 +#, c-format +msgid "xbrlapi: unhandled event type: %d\n" +msgstr "" + +#: Programs/xbrlapi.c:717 +#, c-format +msgid "xbrlapi: window %#010lx changed to NULL name\n" msgstr "" #. LRG -#: Programs/cmd_utils.c:110 +#: Programs/cmd_utils.c:123 msgid "yellow" msgstr "" diff -Nru brltty-5.4/Messages/de.po brltty-5.5/Messages/de.po --- brltty-5.4/Messages/de.po 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Messages/de.po 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: brltty 4.5\n" "Report-Msgid-Bugs-To: brltty@mielke.cc\n" -"POT-Creation-Date: 2015-12-12 20:06+0100\n" -"PO-Revision-Date: 2015-12-13 15:11+0100\n" +"POT-Creation-Date: 2017-04-08 00:22+0200\n" +"PO-Revision-Date: 2017-04-08 00:38+0200\n" "Last-Translator: Angela Engel \n" "Language-Team: LANGUAGE \n" "Language: de\n" @@ -31,45 +31,77 @@ msgid "\"%s\" started as \"%s\"\n" msgstr "\"%s\" gestartet als \"%s\"\n" -#: Programs/menu_prefs.c:433 Programs/menu_prefs.c:434 -#: Programs/menu_prefs.c:436 Programs/menu_prefs.c:437 -#: Programs/menu_prefs.c:440 Programs/menu_prefs.c:441 -#: Programs/menu_prefs.c:442 Programs/menu_prefs.c:444 -#: Programs/menu_prefs.c:445 +#: Programs/menu_prefs.c:442 Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:445 Programs/menu_prefs.c:446 +#: Programs/menu_prefs.c:449 Programs/menu_prefs.c:450 +#: Programs/menu_prefs.c:451 Programs/menu_prefs.c:453 +#: Programs/menu_prefs.c:454 msgid "1 cell" msgstr "1 Zelle" -#: Programs/menu_prefs.c:1035 +#: Programs/menu_prefs.c:762 +msgid "1 second" +msgstr "1 Sekunde" + +#: Programs/menu_prefs.c:790 +msgid "10 seconds" +msgstr "10 Sekunden" + +#: Programs/menu_prefs.c:1111 msgid "12 Hour" msgstr "12 Stunden" -#: Programs/menu_prefs.c:432 Programs/menu_prefs.c:435 -#: Programs/menu_prefs.c:438 Programs/menu_prefs.c:439 -#: Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:441 Programs/menu_prefs.c:444 +#: Programs/menu_prefs.c:447 Programs/menu_prefs.c:448 +#: Programs/menu_prefs.c:452 msgid "2 cells" msgstr "2 Zellen" -#: Programs/menu_prefs.c:1034 +#: Programs/menu_prefs.c:763 +msgid "2 seconds" +msgstr "2 Sekunden" + +#: Programs/menu_prefs.c:791 +msgid "20 seconds" +msgstr "20 Sekunden" + +#: Programs/menu_prefs.c:1110 msgid "24 Hour" msgstr "24 Stunden" -#: Programs/menu_prefs.c:551 +#: Programs/menu_prefs.c:760 +msgid "250 milliseconds" +msgstr "250 Millisekunden" + +#: Programs/menu_prefs.c:792 +msgid "40 seconds" +msgstr "40 Sekunden" + +#: Programs/menu_prefs.c:789 +msgid "5 seconds" +msgstr "5 Sekunden" + +#: Programs/menu_prefs.c:761 +msgid "500 milliseconds" +msgstr "500 Millisekunden" + +#: Programs/menu_prefs.c:600 msgid "6-Dot Computer Braille" msgstr "6-Punkt Computerbraille" -#: Programs/menu_prefs.c:549 +#: Programs/menu_prefs.c:598 msgid "8-Dot Computer Braille" msgstr "8-Punkt Computerbraille" -#: Programs/brltty-ttb.c:178 +#: Programs/brltty-ttb.c:179 msgid "8-bit character set to use." msgstr "8-bit Zeichensatz der verwendet werden soll." -#: Programs/scr_menu.c:93 +#: Programs/scr_menu.c:101 msgid "" msgstr "" -#: Programs/config.c:2646 +#: Programs/config.c:1291 msgid "API Parameter" msgstr "API Parameter" @@ -100,7 +132,7 @@ msgid "Acoustic Guitar (steel)" msgstr "Akustische Gitarre (Stahlsaiten)" -#: Programs/menu_prefs.c:1061 +#: Programs/menu_prefs.c:1137 msgid "After Time" msgstr "Nach Uhrzeit" @@ -108,31 +140,31 @@ msgid "Agogo" msgstr "Agogo" -#: Programs/menu_prefs.c:1251 +#: Programs/menu_prefs.c:1327 msgid "Alert" msgstr "Alarm" -#: Programs/menu_prefs.c:876 +#: Programs/menu_prefs.c:952 msgid "Alert Dots" msgstr "Warnpunkte" -#: Programs/menu_prefs.c:881 +#: Programs/menu_prefs.c:957 msgid "Alert Messages" msgstr "Warnmeldungen" -#: Programs/menu_prefs.c:822 +#: Programs/menu_prefs.c:898 msgid "Alert Tunes" msgstr "Warntöne" -#: Programs/menu_prefs.c:682 Programs/menu_prefs.c:915 +#: Programs/menu_prefs.c:731 Programs/menu_prefs.c:991 msgid "All" msgstr "Alle" -#: Programs/menu_prefs.c:444 +#: Programs/menu_prefs.c:453 msgid "Alphabetic Braille Window Coordinates" msgstr "Alphabetische Braillezeilenkoordinaten" -#: Programs/menu_prefs.c:445 +#: Programs/menu_prefs.c:454 msgid "Alphabetic Screen Cursor Coordinates" msgstr "Alphabetische Bildschirm Cursor Koordinaten" @@ -144,47 +176,57 @@ msgid "Applause" msgstr "Applaus" -#: Programs/cmd_miscellaneous.c:61 +#: Programs/cmd_miscellaneous.c:60 msgid "April" msgstr "April" -#: Programs/log.c:113 +#: Programs/log.c:115 msgid "Async Events" msgstr "Asynchrone Ereignisse" -#: Programs/menu_prefs.c:644 +#: Programs/menu_prefs.c:693 msgid "Attributes Invisible Time" msgstr "Attribute sind unsichtbar für" -#: Programs/config.c:2611 Programs/menu_prefs.c:1157 +#: Programs/config.c:2666 Programs/menu_prefs.c:1233 msgid "Attributes Table" msgstr "Attributtabelle" -#: Programs/menu_prefs.c:638 +#: Programs/menu_prefs.c:687 msgid "Attributes Visible Time" msgstr "Attribute sind sichtbar für" -#: Programs/cmd_miscellaneous.c:65 +#: Programs/cmd_miscellaneous.c:64 msgid "August" msgstr "August" -#: Programs/menu_prefs.c:731 +#: Programs/alert.c:168 +#, fuzzy +msgid "Autorelease" +msgstr "Automatische Wiederholung" + +#: Programs/menu_prefs.c:795 +#, fuzzy +msgid "Autorelease Time" +msgstr "Automatische Wiederholung" + +#: Programs/menu_prefs.c:807 msgid "Autorepeat" msgstr "Automatische Wiederholung" -#: Programs/menu_prefs.c:743 +#: Programs/menu_prefs.c:819 msgid "Autorepeat Interval" msgstr "Wiederholungsintervall" -#: Programs/menu_prefs.c:737 +#: Programs/menu_prefs.c:813 msgid "Autorepeat Panning" msgstr "Automatische Wiederholung für Seitwertsbewegungen" -#: Programs/menu_prefs.c:958 +#: Programs/menu_prefs.c:1034 msgid "Autospeak" msgstr "Automatisches Sprechen" -#: Programs/config.c:1589 +#: Programs/config.c:1656 msgid "BRLTTY stopped" msgstr "BRLTTY gestoppt" @@ -208,11 +250,11 @@ msgid "Bassoon" msgstr "Fagott" -#: Programs/menu_prefs.c:828 +#: Programs/menu_prefs.c:904 msgid "Beeper" msgstr "PC-Piepser" -#: Programs/menu_prefs.c:1060 +#: Programs/menu_prefs.c:1136 msgid "Before Time" msgstr "Vor Uhrzeit" @@ -220,23 +262,23 @@ msgid "Bird Tweet" msgstr "Vogelzwitschern" -#: Programs/menu_prefs.c:632 +#: Programs/menu_prefs.c:681 msgid "Blinking Attributes" msgstr "Blinkende Attribute" -#: Programs/menu_prefs.c:650 +#: Programs/menu_prefs.c:699 msgid "Blinking Capitals" msgstr "Blinkende Großbuchstaben" -#: Programs/menu_prefs.c:609 +#: Programs/menu_prefs.c:658 msgid "Blinking Screen Cursor" msgstr "Blinkender Bildschirmcursor" -#: Programs/menu_prefs.c:1010 +#: Programs/menu_prefs.c:1086 msgid "Blinking Speech Cursor" msgstr "Blinkender Sprachcursor" -#: Programs/menu_prefs.c:512 Programs/menu_prefs.c:1120 +#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1196 msgid "Block" msgstr "Block" @@ -244,71 +286,71 @@ msgid "Blown Bottle" msgstr "Geblasene Flasche" -#: Programs/log.c:137 +#: Programs/log.c:139 msgid "Bluetooth I/O" msgstr "Bluetooth E/A" -#: Programs/config.c:1394 +#: Programs/config.c:1458 msgid "Braille Device" msgstr "Braillegerät" -#: Programs/menu_prefs.c:791 +#: Programs/menu_prefs.c:867 msgid "Braille Display Orientation" msgstr "Braillezeilenausrichtung" -#: Programs/config.c:1390 +#: Programs/config.c:1454 msgid "Braille Driver" msgstr "Brailletreiber" -#: Programs/log.c:143 +#: Programs/log.c:145 msgid "Braille Driver Events" msgstr "Brailletreiberereignisse" -#: Programs/menu_prefs.c:587 +#: Programs/menu_prefs.c:636 msgid "Braille Firmness" msgstr "Braille-Stärke" -#: Programs/menu_prefs.c:781 +#: Programs/menu_prefs.c:857 msgid "Braille Input Mode" msgstr "Brailleeingabe-Modus" -#: Programs/log.c:77 +#: Programs/log.c:79 msgid "Braille Key Events" msgstr "Tastenereignisse der Braillezeile" -#: Programs/menu_prefs.c:771 +#: Programs/menu_prefs.c:847 msgid "Braille Keyboard Enabled" msgstr "Brailletastatur aktiviert" -#: Programs/config.c:1393 +#: Programs/config.c:1457 msgid "Braille Parameter" msgstr "Braille-Parameter" -#: Programs/menu_prefs.c:545 +#: Programs/menu_prefs.c:594 msgid "Braille Presentation" msgstr "Brailledarstellung" -#: Programs/menu_prefs.c:1147 +#: Programs/menu_prefs.c:1223 msgid "Braille Tables" msgstr "Brailletabellen" -#: Programs/menu_prefs.c:433 +#: Programs/menu_prefs.c:442 msgid "Braille Window Column" msgstr "Braillezeilenspalte" -#: Programs/menu_prefs.c:432 +#: Programs/menu_prefs.c:441 msgid "Braille Window Coordinates" msgstr "Braillezeilenkoordinaten" -#: Programs/menu_prefs.c:703 +#: Programs/menu_prefs.c:752 msgid "Braille Window Overlap" msgstr "Braillezeilenüberlappung" -#: Programs/menu_prefs.c:434 +#: Programs/menu_prefs.c:443 msgid "Braille Window Row" msgstr "Braillezeilenzeile" -#: Programs/config.c:384 +#: Programs/config.c:394 #, c-format msgid "Braille driver code (%s, %s, or one of {%s})." msgstr "Brailletreiber-Code: (%s, %s, oder einer von {%s})." @@ -329,36 +371,36 @@ msgid "Bright Acoustic Piano" msgstr "Akustisches helles Klavier" -#: Programs/xbrlapi.c:90 +#: Programs/xbrlapi.c:92 msgid "BrlAPI authorization/authentication string" msgstr "BrlAPI Authorisierungs-/Berechtigungs-Zeichenkette" -#: Programs/xbrlapi.c:83 +#: Programs/xbrlapi.c:85 msgid "BrlAPI host and/or port to connect to" msgstr "BrlAPI Host und/oder Port mit dem verbunden werden soll" -#: Programs/menu_prefs.c:1203 +#: Programs/menu_prefs.c:1279 msgid "Bug Reports" msgstr "Fehlerberichte" -#: Programs/menu_prefs.c:1184 +#: Programs/menu_prefs.c:1260 #, fuzzy msgid "Build Information" msgstr "Information" -#: Programs/menu_prefs.c:572 +#: Programs/menu_prefs.c:621 msgid "Capitalization Mode" msgstr "Großbuchstabenmodus" -#: Programs/menu_prefs.c:661 +#: Programs/menu_prefs.c:710 msgid "Capitals Invisible Time" msgstr "Großbuchstaben sind unsichtbar für" -#: Programs/menu_prefs.c:655 +#: Programs/menu_prefs.c:704 msgid "Capitals Visible Time" msgstr "Großbuchstaben sind sichtbar für" -#: Programs/menu_prefs.c:1274 +#: Programs/menu_prefs.c:1350 msgid "Category Log Level" msgstr "" @@ -391,27 +433,27 @@ msgid "Clavi" msgstr "Clave" -#: Programs/menu.c:811 +#: Programs/menu.c:822 msgid "Close" msgstr "Schließen" -#: Programs/menu_prefs.c:1044 +#: Programs/menu_prefs.c:1120 msgid "Colon" msgstr "Doppelpunkt" -#: Programs/menu_prefs.c:1208 +#: Programs/menu_prefs.c:1284 msgid "Configuration Directory" msgstr "Konfigurationsverzeichnis" -#: Programs/config.c:2565 Programs/menu_prefs.c:1213 +#: Programs/config.c:2620 Programs/menu_prefs.c:1289 msgid "Configuration File" msgstr "Konfigurationsdatei" -#: Programs/alert.c:412 +#: Programs/alert.c:163 msgid "Console Bell" msgstr "Konsolenglöckchen" -#: Programs/menu_prefs.c:808 +#: Programs/menu_prefs.c:884 #, fuzzy msgid "Console Bell Alert" msgstr "Konsolen-Tongenerator" @@ -420,77 +462,72 @@ msgid "Contrabass" msgstr "Kontrabass" -#: Programs/menu_prefs.c:550 +#: Programs/menu_prefs.c:599 msgid "Contracted Braille" msgstr "Braille-Kurzschrift" -#: Programs/config.c:2618 Programs/menu_prefs.c:1165 +#: Programs/config.c:2673 Programs/menu_prefs.c:1241 msgid "Contraction Table" msgstr "Kurzschrifttabelle" -#: Programs/brltty-ctb.c:66 +#: Programs/brltty-ctb.c:62 msgid "Contraction table." msgstr "Kurzschrifttabelle." -#: Programs/brltty-ctb.c:80 +#: Programs/brltty-ctb.c:76 msgid "Contraction verification table." msgstr "Kurzschriftverifikationstabelle" -#: Programs/xbrlapi.c:754 -#, c-format -msgid "Couldn't find modifiers to apply to %d for getting keysym %08X\n" -msgstr "" - -#: Programs/xbrlapi.c:730 -#, c-format -msgid "Couldn't translate keysym %08X to keycode.\n" -msgstr "" - -#: Programs/menu_prefs.c:1252 +#: Programs/menu_prefs.c:1328 msgid "Critical" msgstr "Kritisch" -#: Programs/log.c:95 +#: Programs/log.c:97 msgid "Cursor Routing" msgstr "Cursorrouting" -#: Programs/log.c:89 +#: Programs/log.c:91 msgid "Cursor Tracking" msgstr "Cursorverfolgung" -#: Programs/menu_prefs.c:1082 +#: Programs/menu_prefs.c:766 +#, fuzzy +msgid "Cursor Tracking Delay" +msgstr "Cursorverfolgung" + +#: Programs/menu_prefs.c:1158 msgid "Dash" msgstr "Bindestrich" -#: Programs/menu_prefs.c:1075 +#: Programs/menu_prefs.c:1151 msgid "Date Format" msgstr "Format des Datums" -#: Programs/menu_prefs.c:1064 +#: Programs/menu_prefs.c:1140 msgid "Date Position" msgstr "Position des Datums" -#: Programs/menu_prefs.c:1087 +#: Programs/menu_prefs.c:1163 msgid "Date Separator" msgstr "Datum Trennzeichen" -#: Programs/menu_prefs.c:1072 +#: Programs/menu_prefs.c:1148 msgid "Day Month Year" msgstr "Tag Monat Jahr" -#: Programs/menu_prefs.c:1257 +#: Programs/menu_prefs.c:1333 msgid "Debug" msgstr "Debug" -#: Programs/cmd_miscellaneous.c:69 +#: Programs/cmd_miscellaneous.c:68 msgid "December" msgstr "Dezember" -#: Programs/config.c:405 +#: Programs/config.c:415 msgid "Device for accessing braille display." msgstr "Pfad zur Schnittstelle für den Zugriff auf die Braillezeile." -#: Programs/config.c:364 +#: Programs/config.c:374 msgid "Disable the application programming interface." msgstr "Deaktiviere die Programmierschnittstelle." @@ -498,23 +535,27 @@ msgid "Distortion Guitar" msgstr "Verzerrte Gitarre" -#: Programs/config.c:506 +#: Programs/config.c:517 msgid "Do not autospeak when braille is not being used." msgstr "Nicht automatisch sprechen wenn keine Braillezeile in Verwendung ist." -#: Programs/xbrlapi.c:103 +#: Programs/xbrlapi.c:105 msgid "Do not write any text to the braille device" msgstr "Schreibe keinen Text auf die Braillezeile" -#: Programs/alert.c:301 +#: Programs/brltty-trtxt.c:83 +msgid "Don't fall back to the Unicode base character." +msgstr "" + +#: Programs/alert.c:52 msgid "Done" msgstr "Fertig" -#: Programs/menu_prefs.c:1045 Programs/menu_prefs.c:1084 +#: Programs/menu_prefs.c:1121 Programs/menu_prefs.c:1160 msgid "Dot" msgstr "Punkt" -#: Programs/menu_prefs.c:778 +#: Programs/menu_prefs.c:854 msgid "Dots via Unicode Braille" msgstr "Punkte via Unicode Braille" @@ -523,7 +564,7 @@ msgid "Drawbar Organ" msgstr "Orgel mit Zugstange" -#: Programs/config.c:2569 Programs/menu_prefs.c:1233 +#: Programs/config.c:2626 Programs/menu_prefs.c:1309 msgid "Drivers Directory" msgstr "Treiber-Verzeichnis" @@ -531,12 +572,12 @@ msgid "Dulcimer" msgstr "Dulcimer" -#: Programs/menu_prefs.c:697 +#: Programs/menu_prefs.c:746 #, fuzzy msgid "Eager Sliding Braille Window" msgstr "Erweiterte Braillezeilenverschiebung" -#: Programs/brltty-ttb.c:157 +#: Programs/brltty-ttb.c:158 msgid "Edit table." msgstr "Tabelle editieren." @@ -573,15 +614,15 @@ msgid "Electric Piano 2" msgstr "Elektrisches Klavier 2" -#: Programs/menu_prefs.c:1250 +#: Programs/menu_prefs.c:1326 msgid "Emergency" msgstr "Notfall" -#: Programs/menu_prefs.c:431 +#: Programs/menu_prefs.c:440 msgid "End" msgstr "Ende" -#: Programs/menu_prefs.c:683 +#: Programs/menu_prefs.c:732 msgid "End of Line" msgstr "Ende der Zeile" @@ -589,7 +630,7 @@ msgid "English Horn" msgstr "Englisches Horn" -#: Programs/menu_prefs.c:950 +#: Programs/menu_prefs.c:1026 msgid "Enqueue" msgstr "Anhängen" @@ -597,7 +638,7 @@ msgid "Ensemble" msgstr "Ensemble" -#: Programs/menu_prefs.c:1253 +#: Programs/menu_prefs.c:1329 msgid "Error" msgstr "Fehler" @@ -605,19 +646,23 @@ msgid "Ethnic Instruments" msgstr "Ethnische Instrumente" -#: Programs/menu_prefs.c:805 +#: Programs/menu_prefs.c:881 msgid "Event Alerts" msgstr "Warnungen bei Ereignissen" -#: Programs/menu_prefs.c:560 +#: Programs/menu_prefs.c:609 msgid "Expand Current Word" msgstr "Aktuelles Wort ausschreiben" -#: Programs/menu_prefs.c:831 +#: Programs/config.c:336 +msgid "Explicit preference settings." +msgstr "" + +#: Programs/menu_prefs.c:907 msgid "FM" msgstr "FM" -#: Programs/menu_prefs.c:869 +#: Programs/menu_prefs.c:945 msgid "FM Volume" msgstr "FM Lautstärke" @@ -654,7 +699,7 @@ msgid "FX 8 (sci-fi)" msgstr "FX 8 (Sci-Fi)" -#: Programs/cmd_miscellaneous.c:59 +#: Programs/cmd_miscellaneous.c:58 msgid "February" msgstr "Februar" @@ -666,15 +711,15 @@ msgid "Flute" msgstr "Flöte" -#: Programs/brltty-ctb.c:100 +#: Programs/brltty-ctb.c:96 msgid "Force immediate output." msgstr "Sofortige Ausgabe erzwingen." -#: Programs/brltty-ttb.c:164 +#: Programs/brltty-ttb.c:165 msgid "Format of input file." msgstr "Format der Eingabedatei." -#: Programs/brltty-ttb.c:171 +#: Programs/brltty-ttb.c:172 msgid "Format of output file." msgstr "Format der Ausgabedatei." @@ -686,15 +731,15 @@ msgid "Fretless Bass" msgstr "bundloser Bass" -#: Programs/alert.c:346 +#: Programs/alert.c:97 msgid "Frozen" msgstr "Eingefroren" -#: Programs/menu_prefs.c:446 +#: Programs/menu_prefs.c:455 msgid "Generic" msgstr "Allgemein" -#: Programs/log.c:59 +#: Programs/log.c:61 msgid "Generic Input" msgstr "allgemeine Eingaben" @@ -731,15 +776,15 @@ msgid "Helicopter" msgstr "Helikopter" -#: Programs/scr_help.c:217 +#: Programs/scr_help.c:215 msgid "Help Screen" msgstr "Hilfe-Schirm" -#: Programs/menu_prefs.c:583 Programs/menu_prefs.c:760 +#: Programs/menu_prefs.c:632 Programs/menu_prefs.c:836 msgid "High" msgstr "Hoch" -#: Programs/menu_prefs.c:716 +#: Programs/menu_prefs.c:778 msgid "Highlight Braille Window Location" msgstr "Hebe Braillezeilen Position hervor" @@ -747,48 +792,48 @@ msgid "Honkytonk Piano" msgstr "Honky-tonk Klavier" -#: Programs/menu_prefs.c:949 +#: Programs/menu_prefs.c:1025 msgid "Immediate" msgstr "Sofort" -#: Programs/xbrlapi.c:536 +#: Programs/xbrlapi.c:600 msgid "Incompatible XKB library\n" msgstr "Inkompatible XKB Bibliothek\n" -#: Programs/xbrlapi.c:538 +#: Programs/xbrlapi.c:602 msgid "Incompatible XKB server support\n" msgstr "Inkompatible XKB Serverunterstützung\n" -#: Programs/menu_prefs.c:1256 +#: Programs/menu_prefs.c:1332 msgid "Information" msgstr "Information" -#: Programs/menu_prefs.c:722 +#: Programs/menu_prefs.c:784 msgid "Input Options" msgstr "Eingabeoptionen" -#: Programs/log.c:65 +#: Programs/log.c:67 msgid "Input Packets" msgstr "eingehende Datenpakete" -#: Programs/config.c:290 +#: Programs/config.c:283 #, c-format msgid "Install the %s service, and then exit." msgstr "Installiere das Service %s und beende dann." -#: Programs/menu_prefs.c:1260 +#: Programs/menu_prefs.c:1336 msgid "Internal Parameters" msgstr "Interne Parameter" -#: Programs/cmd_miscellaneous.c:58 +#: Programs/cmd_miscellaneous.c:57 msgid "January" msgstr "Januar" -#: Programs/cmd_miscellaneous.c:64 +#: Programs/cmd_miscellaneous.c:63 msgid "July" msgstr "Juli" -#: Programs/cmd_miscellaneous.c:63 +#: Programs/cmd_miscellaneous.c:62 msgid "June" msgstr "Juni" @@ -796,27 +841,27 @@ msgid "Kalimba" msgstr "Kalimba" -#: Programs/config.c:1317 +#: Programs/config.c:1382 msgid "Key Bindings" msgstr "Tastenbelegungen" -#: Programs/config.c:980 +#: Programs/config.c:982 msgid "Key Help" msgstr "Tastenhilfe" -#: Programs/config.c:1322 Programs/ktb_list.c:668 +#: Programs/config.c:1387 Programs/ktb_list.c:689 msgid "Key Table" msgstr "Tastentabelle" -#: Programs/log.c:83 +#: Programs/log.c:85 msgid "Keyboard Key Events" msgstr "Tastaturereignisse" -#: Programs/menu_prefs.c:815 +#: Programs/menu_prefs.c:891 msgid "Keyboard LED Alerts" msgstr "Tastaturer-LED Warnungen" -#: Programs/config.c:2625 Programs/menu_prefs.c:797 +#: Programs/config.c:2680 Programs/menu_prefs.c:873 msgid "Keyboard Table" msgstr "Tastaturtabelle" @@ -824,7 +869,7 @@ msgid "Koto" msgstr "Koto" -#: Programs/config.c:2777 +#: Programs/config.c:2810 msgid "Language" msgstr "Sprache" @@ -861,85 +906,90 @@ msgid "Lead 8 (bass + lead)" msgstr "Hauptstimme 8 (Bass und Führung)" -#: Programs/learn.c:94 +#: Programs/learn.c:101 msgid "Learn Mode" msgstr "Lernmodus" -#: Programs/menu_prefs.c:1099 +#: Programs/menu_prefs.c:1175 msgid "Left" msgstr "Links" -#: Programs/brltty-ktb.c:45 +#: Programs/brltty-ktb.c:53 msgid "List key names." msgstr "Tastennamen auflisten." -#: Programs/brltty-ktb.c:52 +#: Programs/brltty-ktb.c:60 msgid "List key table in help screen format." msgstr "Tastentabelle im Hilfe-Schirm Format auflisten." -#: Programs/brltty-ktb.c:59 +#: Programs/brltty-ktb.c:67 msgid "List key table in reStructuredText format." msgstr "Tastentabelle im reStructuredText-Format auflisten." -#: Programs/menu_prefs.c:1243 +#: Programs/menu_prefs.c:1319 #, fuzzy msgid "Locale Directory" msgstr "Tabellenverzeichnis" -#: Programs/menu_prefs.c:1279 +#: Programs/menu_prefs.c:1355 msgid "Log Categories" msgstr "Protokollierungskategorien" -#: Programs/config.c:739 +#: Programs/config.c:741 msgid "Log Level" msgstr "Protokollierungsausführlichkeit" -#: Programs/config.c:605 +#: Programs/menu_prefs.c:1416 +#, fuzzy +msgid "Log Messages" +msgstr "Warnmeldungen" + +#: Programs/config.c:607 msgid "Log the versions of the core, API, and built-in drivers, and then exit." msgstr "Protokolliere die Version des Kerns, der API, der integrierten Treiber und beende dann." -#: Programs/config.c:561 +#: Programs/config.c:572 msgid "Log to standard error rather than to the system log." msgstr "Protokolliere via Standardfehlerausgabe anstatt System Log." -#: Programs/config.c:575 +#: Programs/config.c:586 #, c-format msgid "Logging level (%s or one of {%s}) and/or log categories to enable (any combination of {%s}, each optionally prefixed by %s to disable)" msgstr "" -#: Programs/menu_prefs.c:725 +#: Programs/menu_prefs.c:801 msgid "Long Press Time" msgstr "Zeit für einen langen Tastendruck" -#: Programs/menu_prefs.c:581 Programs/menu_prefs.c:758 +#: Programs/menu_prefs.c:630 Programs/menu_prefs.c:834 msgid "Low" msgstr "Niedrig" -#: Programs/menu_prefs.c:513 +#: Programs/menu_prefs.c:562 msgid "Lower Left Dot" msgstr "Unterer linker Punkt" -#: Programs/menu_prefs.c:514 +#: Programs/menu_prefs.c:563 msgid "Lower Right Dot" msgstr "Unterer rechter Punkt" -#: Programs/menu_prefs.c:830 +#: Programs/menu_prefs.c:906 msgid "MIDI" msgstr "MIDI" -#: Programs/config.c:545 +#: Programs/config.c:556 msgid "MIDI (Musical Instrument Digital Interface) device specifier." msgstr "MIDI (Musical Instrument Digital Interface) Geräts-Angabe." -#: Programs/menu_prefs.c:860 +#: Programs/menu_prefs.c:936 msgid "MIDI Instrument" msgstr "MIDI Instrument" -#: Programs/menu_prefs.c:850 +#: Programs/menu_prefs.c:926 msgid "MIDI Volume" msgstr "MIDI Lautstärke" -#: Programs/cmd_miscellaneous.c:60 +#: Programs/cmd_miscellaneous.c:59 msgid "March" msgstr "März" @@ -947,19 +997,19 @@ msgid "Marimba" msgstr "Marimba" -#: Programs/menu_prefs.c:584 Programs/menu_prefs.c:761 +#: Programs/menu_prefs.c:633 Programs/menu_prefs.c:837 msgid "Maximum" msgstr "Maximal" -#: Programs/brltty-ctb.c:94 +#: Programs/brltty-ctb.c:90 msgid "Maximum length of an output line." msgstr "Maximale Länge einer Ausgabezeile." -#: Programs/cmd_miscellaneous.c:62 +#: Programs/cmd_miscellaneous.c:61 msgid "May" msgstr "Mai" -#: Programs/menu_prefs.c:582 Programs/menu_prefs.c:759 +#: Programs/menu_prefs.c:631 Programs/menu_prefs.c:835 msgid "Medium" msgstr "Mittel" @@ -967,19 +1017,19 @@ msgid "Melodic Tom" msgstr "Melodische Trommel" -#: Programs/menu_prefs.c:526 +#: Programs/menu_prefs.c:575 msgid "Menu Options" msgstr "Menüoptionen" -#: Programs/config.c:554 +#: Programs/config.c:565 msgid "Message hold timeout (in 10ms units)." msgstr "Meldungsanzeigedauer (in 10ms Einheiten)." -#: Programs/menu_prefs.c:580 Programs/menu_prefs.c:757 +#: Programs/menu_prefs.c:629 Programs/menu_prefs.c:833 msgid "Minimum" msgstr "Minimal" -#: Programs/menu_prefs.c:1071 +#: Programs/menu_prefs.c:1147 msgid "Month Day Year" msgstr "Monat Tag Jahr" @@ -987,7 +1037,7 @@ msgid "Music Box" msgstr "Musikbox" -#: Programs/menu_prefs.c:830 +#: Programs/menu_prefs.c:906 msgid "Musical Instrument Digital Interface" msgstr "Musical Instrument Digital Interface" @@ -995,58 +1045,59 @@ msgid "Muted Trumpet" msgstr "Gedämpfte Trompete" -#: Programs/config.c:446 +#: Programs/config.c:456 msgid "Name of or path to attributes table." msgstr "Name der oder Pfad zur Attributtabelle." -#: Programs/config.c:455 +#: Programs/config.c:465 msgid "Name of or path to contraction table." msgstr "Name der oder Pfad zur Kurzschrifttabelle." -#: Programs/config.c:336 +#: Programs/config.c:328 msgid "Name of or path to default preferences file." msgstr "Name der oder Pfad zur Standardeinstellungsdatei." -#: Programs/config.c:464 +#: Programs/config.c:474 msgid "Name of or path to keyboard table." msgstr "Name der oder Pfad zur Tastentabelle." -#: Programs/config.c:500 +#: Programs/config.c:510 msgid "Name of or path to speech input object." msgstr "" -#: Programs/config.c:437 +#: Programs/config.c:447 #, c-format msgid "Name of or path to text table (or %s)." msgstr "Name der oder Pfad zur Texttabelle (oder %s)." -#: Programs/menu_prefs.c:668 +#: Programs/menu_prefs.c:717 msgid "Navigation Options" msgstr "Navigationsoptionen" -#: Programs/menu.c:443 +#: Programs/menu.c:449 msgid "No" msgstr "Nein" -#: Programs/menu_prefs.c:567 +#: Programs/menu_prefs.c:616 msgid "No Capitalization" msgstr "Keine Großschreibung" -#: Programs/menu_prefs.c:913 Programs/menu_prefs.c:926 -#: Programs/menu_prefs.c:939 Programs/menu_prefs.c:1059 -#: Programs/menu_prefs.c:1098 Programs/menu_prefs.c:1118 +#: Programs/menu_prefs.c:759 Programs/menu_prefs.c:989 +#: Programs/menu_prefs.c:1002 Programs/menu_prefs.c:1015 +#: Programs/menu_prefs.c:1135 Programs/menu_prefs.c:1174 +#: Programs/menu_prefs.c:1194 msgid "None" msgstr "Keine" -#: Programs/menu_prefs.c:787 +#: Programs/menu_prefs.c:863 msgid "Normal" msgstr "Normal" -#: Programs/menu_prefs.c:1255 +#: Programs/menu_prefs.c:1331 msgid "Notice" msgstr "Hinweis" -#: Programs/cmd_miscellaneous.c:68 +#: Programs/cmd_miscellaneous.c:67 msgid "November" msgstr "November" @@ -1058,11 +1109,15 @@ msgid "Ocarina" msgstr "Okarina" -#: Programs/cmd_miscellaneous.c:67 +#: Programs/cmd_miscellaneous.c:66 msgid "October" msgstr "Oktober" -#: Programs/config.c:1407 +#: Programs/menu_prefs.c:788 +msgid "Off" +msgstr "Aus" + +#: Programs/config.c:1471 msgid "Old Preferences File" msgstr "Alte Einstellungsdatei" @@ -1078,7 +1133,7 @@ msgid "Organ" msgstr "Orgel" -#: Programs/log.c:71 +#: Programs/log.c:73 msgid "Output Packets" msgstr "ausgehende Datenpakete" @@ -1090,15 +1145,15 @@ msgid "PC mode" msgstr "PC-Modus" -#: Programs/menu_prefs.c:829 +#: Programs/menu_prefs.c:905 msgid "PCM" msgstr "PCM" -#: Programs/config.c:535 +#: Programs/config.c:546 msgid "PCM (soundcard digital audio) device specifier." msgstr "" -#: Programs/menu_prefs.c:842 +#: Programs/menu_prefs.c:918 msgid "PCM Volume" msgstr "PCM Lautstärke" @@ -1106,11 +1161,11 @@ msgid "PS/2 (set 3) keyboard scan code" msgstr "PS/2 (set 3) Tastatur-Scancode" -#: Programs/menu_prefs.c:1193 +#: Programs/menu_prefs.c:1269 msgid "Package Revision" msgstr "" -#: Programs/menu_prefs.c:1188 +#: Programs/menu_prefs.c:1264 msgid "Package Version" msgstr "Paket Version" @@ -1151,68 +1206,68 @@ msgid "Pan Flute" msgstr "Panflöte" -#: Programs/config.c:373 +#: Programs/config.c:383 msgid "Parameters for the application programming interface." msgstr "Parameter für die Programmierschnittstelle." -#: Programs/config.c:395 +#: Programs/config.c:405 msgid "Parameters for the braille driver." msgstr "Parameter für den Brailletreiber." -#: Programs/config.c:526 +#: Programs/config.c:537 msgid "Parameters for the screen driver." msgstr "Parameter für den Bildschirmtreiber." -#: Programs/config.c:492 +#: Programs/config.c:502 msgid "Parameters for the speech driver." msgstr "Parameter für den Sprachausgabentreiber." -#: Programs/config.c:317 +#: Programs/config.c:319 msgid "Path to default settings file." msgstr "Pfad zur Standardkonfigurationsdatei." -#: Programs/config.c:356 +#: Programs/config.c:366 msgid "Path to directory containing drivers." msgstr "Pfad zum Verzeichnis das Treiber enthält." -#: Programs/brltest.c:72 Programs/brltty-atb.c:36 Programs/brltty-ctb.c:58 -#: Programs/brltty-ktb.c:79 Programs/config.c:427 +#: Programs/brltest.c:68 Programs/brltty-atb.c:36 Programs/brltty-ctb.c:54 +#: Programs/brltty-ktb.c:77 Programs/config.c:437 msgid "Path to directory containing tables." msgstr "Pfad zum Tabellen-Verzeichnis." -#: Programs/brltty-ttb.c:151 +#: Programs/brltty-ttb.c:152 msgid "Path to directory containing text tables." msgstr "Pfad zum einem Verzeichnis das Texttabellen enthält." -#: Programs/brltty-ktb.c:69 +#: Programs/brltty-ktb.c:87 msgid "Path to directory for loading drivers." msgstr "Pfad zum Verzeichnis aus dem Treiber geladen werden." -#: Programs/brltty-trtxt.c:50 +#: Programs/brltty-trtxt.c:51 msgid "Path to directory for text tables." msgstr "Pfad zum Verzeichnis für Texttabellen." -#: Programs/brltest.c:82 /tmp/src/brltty/Programs/config.c:346 +#: Programs/brltest.c:78 Programs/config.c:356 msgid "Path to directory which can be written to." msgstr "Pfad zum Verzeichnis in dem Dateien erstellt werden können." -#: Programs/config.c:327 +#: Programs/config.c:346 msgid "Path to directory which contains files that can be updated." msgstr "Pfad zum Verzeichnis in dem Dateien modifiziert werden können." -#: Programs/brltty-trtxt.c:59 +#: Programs/brltty-trtxt.c:60 msgid "Path to input text table." msgstr "Pfad der Brailletabelle für den Eingabetext." -#: Programs/config.c:584 +#: Programs/config.c:595 msgid "Path to log file." msgstr "Pfad zur Protokolldatei." -#: Programs/brltty-trtxt.c:68 +#: Programs/brltty-trtxt.c:69 msgid "Path to output text table." msgstr "Pfad der Brailletabelle für den Ausgabetext." -#: Programs/config.c:593 +#: Programs/config.c:309 msgid "Path to process identifier file." msgstr "Pfad zur Prozessidentifikationsdatei." @@ -1241,39 +1296,39 @@ msgid "Pizzicato Strings" msgstr "Pizzikato-Saiten" -#: Drivers/Braille/Baum/braille.c:1075 +#: Drivers/Braille/Baum/braille.c:1076 msgid "Powerdown" msgstr "" -#: Programs/config.c:2567 Programs/menu_prefs.c:1223 +#: Programs/config.c:2621 Programs/menu_prefs.c:1299 msgid "Preferences File" msgstr "Einstellungsdatei" -#: Programs/scr_menu.c:264 +#: Programs/scr_menu.c:268 msgid "Preferences Menu" msgstr "Einstellungsmenü" -#: Headers/options.h:74 +#: Headers/options.h:75 msgid "Print a usage summary (all options), and then exit." msgstr "Zeige eine Benutzungszusammenfassung (alle Optionen) und beende dann." -#: Headers/options.h:69 +#: Headers/options.h:70 msgid "Print a usage summary (commonly used options only), and then exit." msgstr "Zeige eine Benutzungszusammenfassung (nur häufig verwendete Optionen) und beende dann." -#: Programs/menu_prefs.c:1174 +#: Programs/menu_prefs.c:1250 msgid "Profiles" msgstr "Profile" -#: Programs/config.c:472 +#: Programs/config.c:482 msgid "Properties of eligible keyboards." msgstr "Eigenschaften von geeigneten Tastaturen." -#: Programs/menu_prefs.c:930 +#: Programs/menu_prefs.c:1006 msgid "Raise Pitch" msgstr "Erhöhe Tonhöhe" -#: Programs/config.c:276 +#: Programs/config.c:269 msgid "Recognize environment variables." msgstr "Verwende Umgebungsvariablen." @@ -1289,44 +1344,48 @@ msgid "Reed Organ" msgstr "Harmonium" -#: Programs/brltty-ctb.c:86 +#: Programs/brltty-ctb.c:82 msgid "Reformat input." msgstr "Eingabe neu formatieren." -#: Programs/config.c:417 +#: Programs/config.c:427 msgid "Release braille device when screen or window is unreadable." msgstr "Gib die Braillezeile frei wenn der Bildschirm oder das Fenster nicht lesbar ist." -#: Programs/config.c:283 +#: Programs/config.c:276 msgid "Remain a foreground process." msgstr "Verbleibe als Fordergrundprozess." -#: Programs/brltty-trtxt.c:75 +#: Programs/brltty-trtxt.c:76 msgid "Remove dots seven and eight." msgstr "Entferne Punkt sieben und acht." -#: Programs/config.c:298 +#: Programs/config.c:291 #, c-format msgid "Remove the %s service, and then exit." msgstr "Entferne das Service %s und beende dann." -#: Programs/brltty-ttb.c:185 +#: Programs/brltty-ktb.c:46 +msgid "Report problems with the key table." +msgstr "" + +#: Programs/brltty-ttb.c:186 msgid "Report the characters within the current screen font that aren't defined within the text table." msgstr "" -#: Programs/menu_prefs.c:684 +#: Programs/menu_prefs.c:733 msgid "Rest of Line" msgstr "Rest der Zeile" -#: Programs/menu_prefs.c:1322 +#: Programs/menu_prefs.c:1398 msgid "Restart Braille Driver" msgstr "Brailletreiber neu starten" -#: Programs/menu_prefs.c:1334 +#: Programs/menu_prefs.c:1410 msgid "Restart Screen Driver" msgstr "Bildschirmtreiber neu starten" -#: Programs/menu_prefs.c:1328 +#: Programs/menu_prefs.c:1404 msgid "Restart Speech Driver" msgstr "Sprachausgabentreiber neu starten" @@ -1334,7 +1393,7 @@ msgid "Reverse Cymbal" msgstr "Becken Rückseite" -#: Programs/menu_prefs.c:1100 +#: Programs/menu_prefs.c:1176 msgid "Right" msgstr "Rechts" @@ -1342,80 +1401,80 @@ msgid "Rock Organ" msgstr "Rock-Orgel" -#: Programs/menu_prefs.c:788 +#: Programs/menu_prefs.c:864 msgid "Rotated" msgstr "gedreht" -#: Programs/menu_prefs.c:521 +#: Programs/menu_prefs.c:570 msgid "Save on Exit" msgstr "Beim Verlassen speichern" #. "cap" here, used during speech output, is short for "capital". #. It is spoken just before an uppercase letter, e.g. "cap A". -#: Programs/menu_prefs.c:929 +#: Programs/menu_prefs.c:1005 msgid "Say Cap" msgstr "Sprich Groß" -#: Programs/menu_prefs.c:953 +#: Programs/menu_prefs.c:1029 msgid "Say Line Mode" msgstr "Zeilen-Vorlesemodus" -#: Programs/menu_prefs.c:940 +#: Programs/menu_prefs.c:1016 msgid "Say Space" msgstr "Sprich Leerzeichen" -#: Programs/menu_prefs.c:436 +#: Programs/menu_prefs.c:445 msgid "Screen Cursor Column" msgstr "Bildschirmcursorspalte" -#: Programs/menu_prefs.c:435 +#: Programs/menu_prefs.c:444 msgid "Screen Cursor Coordinates" msgstr "Bildschirmcursorkoordinaten" -#: Programs/menu_prefs.c:621 +#: Programs/menu_prefs.c:670 #, fuzzy msgid "Screen Cursor Invisible Time" msgstr "Sprachcursor ist unsichtbar für" -#: Programs/menu_prefs.c:437 +#: Programs/menu_prefs.c:446 msgid "Screen Cursor Row" msgstr "Bildschirmcursorzeile" -#: Programs/menu_prefs.c:603 +#: Programs/menu_prefs.c:652 msgid "Screen Cursor Style" msgstr "Bildschirmcursordarstellung" -#: Programs/menu_prefs.c:615 +#: Programs/menu_prefs.c:664 #, fuzzy msgid "Screen Cursor Visible Time" msgstr "Sprachcursor ist sichtbar für" -#: Programs/menu_prefs.c:438 +#: Programs/menu_prefs.c:447 #, fuzzy msgid "Screen Cursor and Braille Window Column" msgstr "Cursor- und Braillezeilenspalte" -#: Programs/menu_prefs.c:439 +#: Programs/menu_prefs.c:448 msgid "Screen Cursor and Braille Window Row" msgstr "Bildschirmcursor- und Braillezeilenszeile" -#: Programs/config.c:2057 +#: Programs/config.c:2112 msgid "Screen Driver" msgstr "Bildschirmtreiber" -#: Programs/log.c:155 +#: Programs/log.c:157 msgid "Screen Driver Events" msgstr "Bildschirmtreiberereignisse" -#: Programs/menu_prefs.c:440 +#: Programs/menu_prefs.c:449 msgid "Screen Number" msgstr "Bildschirmnummer" -#: Programs/config.c:2063 +#: Programs/config.c:2118 msgid "Screen Parameter" msgstr "Bildschirm-Parameter" -#: Programs/config.c:516 +#: Programs/config.c:527 #, fuzzy, c-format msgid "Screen driver code (%s, %s, or one of {%s})." msgstr "Bildschirmtreiber: einer von [%s]" @@ -1424,15 +1483,15 @@ msgid "Seashore" msgstr "Brandung" -#: Programs/cmd_miscellaneous.c:66 +#: Programs/cmd_miscellaneous.c:65 msgid "September" msgstr "September" -#: Programs/log.c:125 +#: Programs/log.c:127 msgid "Serial I/O" msgstr "Serielle E/A" -#: Programs/log.c:119 +#: Programs/log.c:121 msgid "Server Events" msgstr "Server Ereignisse" @@ -1448,31 +1507,31 @@ msgid "Shanai" msgstr "Shanai" -#: Programs/menu_prefs.c:534 +#: Programs/menu_prefs.c:583 msgid "Show Advanced Submenus" msgstr "Zeige erweiterte Untermenüs" -#: Programs/menu_prefs.c:539 +#: Programs/menu_prefs.c:588 msgid "Show All Items" msgstr "Zeige alle Elemente" -#: Programs/menu_prefs.c:627 +#: Programs/menu_prefs.c:676 msgid "Show Attributes" msgstr "Zeige Attribute" -#: Programs/menu_prefs.c:598 +#: Programs/menu_prefs.c:647 msgid "Show Screen Cursor" msgstr "Zeige Bildschirmcursor" -#: Programs/menu_prefs.c:1053 +#: Programs/menu_prefs.c:1129 msgid "Show Seconds" msgstr "Sekunden anzeigen" -#: Programs/menu_prefs.c:999 +#: Programs/menu_prefs.c:1075 msgid "Show Speech Cursor" msgstr "Zeige Sprachcursor" -#: Programs/menu_prefs.c:529 +#: Programs/menu_prefs.c:578 msgid "Show Submenu Sizes" msgstr "Zeige Größen von Untermenüs" @@ -1481,15 +1540,15 @@ msgid "Sitar" msgstr "Sitar" -#: Programs/menu_prefs.c:676 +#: Programs/menu_prefs.c:725 msgid "Skip Blank Braille Windows" msgstr "Leere Braillezeileninhalte überspringen" -#: Programs/menu_prefs.c:671 +#: Programs/menu_prefs.c:720 msgid "Skip Identical Lines" msgstr "Identische Zeilen überspringen" -#: Programs/menu_prefs.c:687 +#: Programs/menu_prefs.c:736 #, fuzzy msgid "Skip Which Blank Braille Windows" msgstr "Art der leeren Braillezeileninhalte" @@ -1502,16 +1561,16 @@ msgid "Slap Bass 2" msgstr "Geschlagener Bass 2" -#: Programs/menu_prefs.c:1083 +#: Programs/menu_prefs.c:1159 msgid "Slash" msgstr "Schrägstrich" -#: Programs/menu_prefs.c:692 +#: Programs/menu_prefs.c:741 #, fuzzy msgid "Sliding Braille Window" msgstr "Braillezeilenverschibung" -#: Programs/menu_prefs.c:914 +#: Programs/menu_prefs.c:990 msgid "Some" msgstr "Einige" @@ -1524,135 +1583,135 @@ msgid "Sound Effects" msgstr "Soundeffekte" -#: Programs/menu_prefs.c:1119 +#: Programs/menu_prefs.c:1195 msgid "Space" msgstr "Leer" -#: Programs/menu_prefs.c:993 +#: Programs/menu_prefs.c:1069 msgid "Speak Completed Words" msgstr "Sprich vervollständigte Wörter" -#: Programs/menu_prefs.c:981 +#: Programs/menu_prefs.c:1057 msgid "Speak Deleted Characters" msgstr "Sprich gelöschte Zeichen" -#: Programs/menu_prefs.c:975 +#: Programs/menu_prefs.c:1051 msgid "Speak Inserted Characters" msgstr "Sprich eingefügte Zeichen" -#: Programs/menu_prefs.c:987 +#: Programs/menu_prefs.c:1063 msgid "Speak Replaced Characters" msgstr "Sprich ersetzte Zeichen" -#: Programs/menu_prefs.c:969 +#: Programs/menu_prefs.c:1045 msgid "Speak Selected Character" msgstr "Sprich hervorgehobenes Zeichen" -#: Programs/menu_prefs.c:963 +#: Programs/menu_prefs.c:1039 msgid "Speak Selected Line" msgstr "Sprich hervorgehobene Zeile" -#: Programs/menu_prefs.c:1022 +#: Programs/menu_prefs.c:1098 msgid "Speech Cursor Invisible Time" msgstr "Sprachcursor ist unsichtbar für" -#: Programs/menu_prefs.c:1004 +#: Programs/menu_prefs.c:1080 msgid "Speech Cursor Style" msgstr "Sprachcursordarstellung" -#: Programs/menu_prefs.c:1016 +#: Programs/menu_prefs.c:1092 msgid "Speech Cursor Visible Time" msgstr "Sprachcursor ist sichtbar für" -#: Programs/config.c:1825 +#: Programs/config.c:1880 msgid "Speech Driver" msgstr "Sprachausgabentreiber" -#: Programs/log.c:149 +#: Programs/log.c:151 msgid "Speech Driver Events" msgstr "Ereignisse des Sprachausgabentreibers" -#: Programs/log.c:107 +#: Programs/log.c:109 msgid "Speech Events" msgstr "Sprachausgabenereignisse" #. Create the file system object for speech input. -#: Programs/config.c:2687 +#: Programs/config.c:2720 msgid "Speech Input" msgstr "" -#: Programs/menu_prefs.c:888 +#: Programs/menu_prefs.c:964 msgid "Speech Options" msgstr "Sprachausgabenoptionen" -#: Programs/config.c:1828 +#: Programs/config.c:1883 msgid "Speech Parameter" msgstr "Sprachausgaben-Parameter" -#: Programs/menu_prefs.c:905 +#: Programs/menu_prefs.c:981 msgid "Speech Pitch" msgstr "Tonhöhe der Sprache" -#: Programs/menu_prefs.c:918 +#: Programs/menu_prefs.c:994 msgid "Speech Punctuation" msgstr "Satzzeichenansage" -#: Programs/menu_prefs.c:898 +#: Programs/menu_prefs.c:974 msgid "Speech Rate" msgstr "Sprechgeschwindigkeit" -#: Programs/menu_prefs.c:933 +#: Programs/menu_prefs.c:1009 #, fuzzy msgid "Speech Uppercase Indicator" msgstr "Großbuchstabenanzeige" -#: Programs/menu_prefs.c:891 +#: Programs/menu_prefs.c:967 msgid "Speech Volume" msgstr "Sprachlautstärke" -#: Programs/menu_prefs.c:943 +#: Programs/menu_prefs.c:1019 #, fuzzy msgid "Speech Whitespace Indicator" msgstr "Leerzeichenansage" -#: Programs/config.c:482 +#: Programs/config.c:492 #, fuzzy, c-format msgid "Speech driver code (%s, %s, or one of {%s})." msgstr "Sprachausgabentreiber: einer von {%s}" -#: Programs/menu_prefs.c:1269 +#: Programs/menu_prefs.c:1345 msgid "Standard Error Log Level" msgstr "Protokollierungsausführlichkeit für die Standard-Fehlerausgabe" -#: Programs/menu_prefs.c:441 +#: Programs/menu_prefs.c:450 msgid "State Dots" msgstr "Statuspunkte" -#: Programs/menu_prefs.c:442 +#: Programs/menu_prefs.c:451 msgid "State Letter" msgstr "Statusbuchstabe" -#: Programs/menu_prefs.c:1094 +#: Programs/menu_prefs.c:1170 msgid "Status Cells" msgstr "Statuszellen" -#: Programs/menu_prefs.c:1110 +#: Programs/menu_prefs.c:1186 msgid "Status Count" msgstr "Gesamtanzahl der Statuszellen" -#: Programs/menu_prefs.c:450 +#: Programs/menu_prefs.c:459 msgid "Status Field" msgstr "Statusfeld" -#: Programs/menu_prefs.c:1103 +#: Programs/menu_prefs.c:1179 msgid "Status Position" msgstr "Position der Statuszellen" -#: Programs/menu_prefs.c:1125 +#: Programs/menu_prefs.c:1201 msgid "Status Separator" msgstr "Status-Trennzeichen" -#: Programs/menu_prefs.c:1121 +#: Programs/menu_prefs.c:1197 msgid "Status Side" msgstr "Statusseitig" @@ -1660,7 +1719,7 @@ msgid "Steel Drums" msgstr "Steel Drums" -#: Programs/config.c:306 +#: Programs/config.c:299 #, c-format msgid "Stop an existing instance of %s, and then exit." msgstr "Stoppe eine laufende Instanz von %s und beende dann." @@ -1678,11 +1737,11 @@ msgid "Strings" msgstr "Saiteninstrumente" -#: Programs/menu_prefs.c:569 +#: Programs/menu_prefs.c:618 msgid "Superimpose Dot 7" msgstr "Punkt 7 hinzufügen" -#: Programs/config.c:567 +#: Programs/config.c:578 msgid "Suppress start-up messages." msgstr "Unterdrücke Meldungen zum Startvorgang." @@ -1730,11 +1789,11 @@ msgid "SynthStrings 2" msgstr "Synth Saiteninstrumente 2" -#: Programs/menu_prefs.c:1264 +#: Programs/menu_prefs.c:1340 msgid "System Log Level" msgstr "System-Protokollierungsausführlichkeit" -#: Programs/config.c:2570 Programs/menu_prefs.c:1238 +#: Programs/config.c:2627 Programs/menu_prefs.c:1314 msgid "Tables Directory" msgstr "Tabellenverzeichnis" @@ -1754,39 +1813,39 @@ msgid "Tenor Sax" msgstr "Tenorsaxophon" -#: Programs/menu_prefs.c:595 +#: Programs/menu_prefs.c:644 msgid "Text Indicators" msgstr "Indikatoren" -#: Programs/menu_prefs.c:1122 +#: Programs/menu_prefs.c:1198 msgid "Text Side" msgstr "Textseitig" -#: Programs/menu_prefs.c:554 +#: Programs/menu_prefs.c:603 msgid "Text Style" msgstr "Textdarstellung" -#: Programs/config.c:2597 Programs/menu_prefs.c:1150 +#: Programs/config.c:2652 Programs/menu_prefs.c:1226 msgid "Text Table" msgstr "Texttabelle" -#: Programs/brltty-ctb.c:73 +#: Programs/brltty-ctb.c:69 msgid "Text table." msgstr "Texttabelle." -#: Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:452 msgid "Time" msgstr "Uhrzeit" -#: Programs/menu_prefs.c:1038 +#: Programs/menu_prefs.c:1114 msgid "Time Format" msgstr "Format der Uhrzeit" -#: Programs/menu_prefs.c:1030 +#: Programs/menu_prefs.c:1106 msgid "Time Presentation" msgstr "Darstellung der Uhrzeit und des Datums" -#: Programs/menu_prefs.c:1048 +#: Programs/menu_prefs.c:1124 msgid "Time Separator" msgstr "Uhrzeit-Trennzeichen" @@ -1799,24 +1858,24 @@ msgid "Tinkle Bell" msgstr "Glöckchen" -#: Programs/menu_prefs.c:1318 +#: Programs/menu_prefs.c:1394 msgid "Tools" msgstr "Werkzeuge" -#: Programs/menu_prefs.c:750 +#: Programs/menu_prefs.c:826 msgid "Touch Navigation" msgstr "Berührungsbasierte Navigation" -#: Programs/menu_prefs.c:764 +#: Programs/menu_prefs.c:840 msgid "Touch Sensitivity" msgstr "Berührungsempfindlichkeit" -#: Programs/menu_prefs.c:710 +#: Programs/menu_prefs.c:772 #, fuzzy msgid "Track Screen Pointer" msgstr "Bildschirm-Parameter" -#: Programs/menu_prefs.c:777 +#: Programs/menu_prefs.c:853 msgid "Translated via Text Table" msgstr "Durch Texttabelle übersetzt" @@ -1841,35 +1900,35 @@ msgid "Tubular Bells" msgstr "Röhrenglocken" -#: Programs/menu_prefs.c:834 +#: Programs/menu_prefs.c:910 msgid "Tune Device" msgstr "Tongeber" -#: Programs/log.c:131 +#: Programs/log.c:133 msgid "USB I/O" msgstr "USB E/A" -#: Programs/menu_prefs.c:511 +#: Programs/menu_prefs.c:560 msgid "Underline" msgstr "Unterlegung" -#: Programs/alert.c:351 +#: Programs/alert.c:102 msgid "Unfrozen" msgstr "Aufgetaut" -#: Programs/config.c:2566 Programs/menu_prefs.c:1218 +#: Programs/config.c:2624 Programs/menu_prefs.c:1294 msgid "Updatable Directory" msgstr "Modifizierbares Verzeichnis" -#: Programs/log.c:101 +#: Programs/log.c:103 msgid "Update Events" msgstr "Update Ereignisse" -#: Programs/options.c:136 +#: Programs/options.c:135 msgid "Usage" msgstr "Benutzung" -#: Programs/menu_prefs.c:568 +#: Programs/menu_prefs.c:617 msgid "Use Capital Sign" msgstr "Verwende Großschreibungszeichen" @@ -1890,11 +1949,11 @@ msgid "Voice Oohs" msgstr "Stimme (Ooh)" -#: Programs/menu_prefs.c:1254 +#: Programs/menu_prefs.c:1330 msgid "Warning" msgstr "Warnung" -#: Programs/menu_prefs.c:1198 +#: Programs/menu_prefs.c:1274 msgid "Web Site" msgstr "Webseite" @@ -1906,28 +1965,23 @@ msgid "Woodblock" msgstr "Holzblock" -#: Programs/config.c:2558 +#: Programs/config.c:2613 msgid "Working Directory" msgstr "Arbeitsverzeichnis" -#: Programs/config.c:2568 Programs/menu_prefs.c:1228 +#: Programs/config.c:2625 Programs/menu_prefs.c:1304 msgid "Writable Directory" msgstr "Verzeichnis mit Schreibzugriff" -#: Programs/config.c:599 +#: Programs/config.c:601 msgid "Write the start-up logs, and then exit." msgstr "Schreibe das Startprotokoll und beende dann." -#: Programs/xbrlapi.c:312 -#, c-format -msgid "X Error %d, %s on display %s\n" -msgstr "" - -#: Programs/xbrlapi.c:97 +#: Programs/xbrlapi.c:99 msgid "X display to connect to" msgstr "X Display mit dem Verbindung aufgenommen werden soll" -#: Programs/xbrlapi.c:644 +#: Programs/xbrlapi.c:713 msgid "XFree(wm_name) for change" msgstr "" @@ -1939,23 +1993,23 @@ msgid "Xylophone" msgstr "Xylophon" -#: Programs/menu_prefs.c:1070 +#: Programs/menu_prefs.c:1146 msgid "Year Month Day" msgstr "Jahr Monat Tag" -#: Programs/menu.c:444 +#: Programs/menu.c:450 msgid "Yes" msgstr "Ja" -#: Programs/xbrlapi.c:81 +#: Programs/xbrlapi.c:83 msgid "[host][:port]" msgstr "[Host][:Port]" -#: Programs/menu_prefs.c:512 +#: Programs/menu_prefs.c:561 msgid "all dots" msgstr "Alle Punkte" -#: Programs/cmd_miscellaneous.c:132 +#: Programs/cmd_miscellaneous.c:121 msgid "and" msgstr "und" @@ -1967,7 +2021,7 @@ msgid "append to clipboard from character" msgstr "hänge ab Zeichen an die Zwischenablage an" -#: Programs/cmd.c:296 +#: Programs/cmd.c:290 msgid "at cursor" msgstr "beim Cursor" @@ -1975,17 +2029,7 @@ msgid "backspace key" msgstr "Rücktaste" -#: Programs/xbrlapi.c:354 -#, c-format -msgid "bad format for VT number\n" -msgstr "ungültiges Format für VT Nummer\n" - -#: Programs/xbrlapi.c:357 -#, c-format -msgid "bad type for VT number\n" -msgstr "ungültiger Typ für VT Nummer\n" - -#: Drivers/Braille/Baum/braille.c:1065 Drivers/Braille/TSI/braille.c:869 +#: Drivers/Braille/Baum/braille.c:1067 Drivers/Braille/TSI/braille.c:869 msgid "battery low" msgstr "Akku schwach" @@ -2005,20 +2049,20 @@ msgstr "wechsle zum vorherigen virtuellen Terminal" #. -#: Programs/cmd_utils.c:96 +#: Programs/cmd_utils.c:109 msgid "black" msgstr "Schwarz" -#: Programs/cmd_utils.c:120 +#: Programs/cmd_utils.c:133 msgid "blink" msgstr "blinken" #. B -#: Programs/cmd_utils.c:97 +#: Programs/cmd_utils.c:110 msgid "blue" msgstr "Blau" -#: Programs/config.c:2659 +#: Programs/config.c:2692 #, c-format msgid "braille device not specified" msgstr "Braillegerät nicht spezifiziert" @@ -2027,18 +2071,17 @@ msgid "braille display temporarily unavailable" msgstr "Braillezeile vorübergehend nicht verfügbar" -#: Programs/config.c:1347 +#: Programs/config.c:1412 msgid "braille driver initialization failed" msgstr "Initialisierung des Brailletreibers fehlgeschlagen" -#: Programs/config.c:1421 +#: Programs/config.c:1488 msgid "braille driver not loadable" msgstr "Brailletreiber kann nicht geladen werden" -#: Programs/cmd_miscellaneous.c:194 -#, fuzzy +#: Programs/cmd_miscellaneous.c:178 msgid "braille stopped" -msgstr "Brailleeingabe-Modus" +msgstr "Braille gestoppt" #: Programs/cmds.auto.h:866 msgid "bring screen cursor to character" @@ -2053,7 +2096,7 @@ msgstr "Bewege Bildschirmcursor zur Sprachcursorposition" #. RG -#: Programs/cmd_utils.c:102 +#: Programs/cmd_utils.c:115 msgid "brown" msgstr "Braun" @@ -2061,33 +2104,38 @@ msgid "cannot compile attributes table" msgstr "kann Attributtabelle nicht kompilieren" -#: Programs/config.c:784 +#: Programs/config.c:786 msgid "cannot compile contraction table" msgstr "kann Kurzschrifttabelle nicht kompilieren" -#: Programs/config.c:1328 +#: Programs/config.c:1393 msgid "cannot compile key table" msgstr "kann Tastentabelle nicht kompilieren" -#: Programs/config.c:1025 +#: Programs/config.c:1027 msgid "cannot compile keyboard table" msgstr "kann Tastentabelle nicht kompilieren" -#: Programs/ttb_translate.c:216 +#: Programs/ttb_translate.c:223 msgid "cannot compile text table" msgstr "kann Texttabelle nicht kompilieren" -#: Programs/xbrlapi.c:178 -#, c-format -msgid "cannot connect to brltty at %s\n" +#. This is the first attempt to connect to BRLTTY, and it failed. +#. * Return the error immediately to the user, to provide feedback to users +#. * running xbrlapi by hand, but not fill logs, eat battery, spam +#. * 127.0.0.1 with reconnection attempts. +#. +#: Programs/xbrlapi.c:187 +#, fuzzy, c-format +msgid "cannot connect to braille devices daemon brltty at %s\n" msgstr "kann auf %s nicht mit BRLTTY verbinden\n" -#: Programs/xbrlapi.c:524 +#: Programs/xbrlapi.c:588 #, c-format msgid "cannot connect to display %s\n" msgstr "kann mit Braillezeile %s nicht verbinden\n" -#: Programs/file.c:333 +#: Programs/file.c:334 msgid "cannot create directory" msgstr "kann Verzeichnis nicht erstellen" @@ -2096,7 +2144,7 @@ msgid "cannot determine program directory" msgstr "kann Programmverzeichnis nicht bestimmen" -#: Programs/config.c:2561 /tmp/src/brltty/Programs/menu.c:538 +#: Programs/config.c:2616 Programs/menu.c:544 msgid "cannot determine working directory" msgstr "kann Arbeitsverzeichnis nicht bestimmen" @@ -2108,30 +2156,25 @@ msgid "cannot fix install path" msgstr "kann Installationspfad nicht beheben" -#: Programs/xbrlapi.c:336 -#, c-format -msgid "cannot get root window XFree86_VT property\n" -msgstr "" - -#: Programs/xbrlapi.c:196 +#: Programs/xbrlapi.c:219 msgid "cannot get tty\n" msgstr "" -#: Programs/xbrlapi.c:199 +#: Programs/xbrlapi.c:225 #, c-format msgid "cannot get tty %d\n" msgstr "" -#: Programs/file.c:456 +#: Programs/file.c:457 msgid "cannot get working directory" msgstr "kann Arbeitsverzeichnis nicht erfragen" -#: Programs/xbrlapi.c:568 +#: Programs/xbrlapi.c:631 #, c-format msgid "cannot grab windows on screen %d\n" msgstr "" -#: Programs/xbrlapi.c:203 +#: Programs/xbrlapi.c:232 msgid "cannot ignore keys\n" msgstr "kann tasten nicht ignorieren\n" @@ -2143,11 +2186,11 @@ msgid "cannot load library" msgstr "kann Programmbibliothek nicht laden" -#: Programs/ttb_translate.c:233 +#: Programs/ttb_translate.c:240 msgid "cannot load text table" msgstr "kann Texttabelle nicht laden" -#: Programs/config.c:982 +#: Programs/config.c:984 msgid "cannot open key help" msgstr "kann Tastenhilfe nicht öffnen" @@ -2155,43 +2198,38 @@ msgid "cannot open process identifier file" msgstr "kann Prozessidentifikationsdatei nicht öffnen" -#: Programs/menu.c:536 +#: Programs/menu.c:542 msgid "cannot open working directory" msgstr "kann Arbeitsverzeichnis nicht öffnen" -#: Programs/prefs.c:326 +#: Programs/prefs.c:351 msgid "cannot read preferences file" msgstr "kann Einstellungsdatei nicht lesen" -#: Programs/xbrlapi.c:243 +#: Programs/xbrlapi.c:297 #, c-format msgid "cannot set focus to %#010x\n" msgstr "kann Fokus nicht auf %#010x setzen\n" -#: Programs/file.c:470 /tmp/src/brltty/Programs/menu.c:525 +#: Programs/file.c:471 Programs/menu.c:531 msgid "cannot set working directory" msgstr "kann Arbeitsverzeichnis nicht wechseln" -#: Programs/prefs.c:501 +#: Programs/prefs.c:526 msgid "cannot write to preferences file" msgstr "kann Einstellungsdatei nicht schreiben" -#: Programs/xbrlapi.c:236 -#, c-format -msgid "cannot write window name %s\n" -msgstr "" - #. "cap" here, used during speech output, is short for "capital". #. It is spoken just before an uppercase letter, e.g. "cap A". -#: Programs/core.c:827 +#: Programs/core.c:888 msgid "cap" msgstr "Groß" -#: Programs/menu_prefs.c:704 Programs/menu_prefs.c:1111 +#: Programs/menu_prefs.c:753 Programs/menu_prefs.c:1187 msgid "cells" msgstr "Zellen" -#: Programs/cmd_preferences.c:80 +#: Programs/cmd_preferences.c:81 msgid "changes discarded" msgstr "Änderungen verworfen" @@ -2199,7 +2237,7 @@ msgid "clear all sticky input modifiers" msgstr "" -#: Programs/cmd_speech.c:465 +#: Programs/cmd_speech.c:456 msgid "column" msgstr "Spalte" @@ -2208,15 +2246,15 @@ msgid "config" msgstr "" -#: Programs/options.c:751 +#: Programs/options.c:756 msgid "configuration directive specified more than once" msgstr "Konfigurationsdirektive mehrfach angegeben" -#: Drivers/Screen/Linux/screen.c:1280 +#: Drivers/Screen/Linux/screen.c:1281 msgid "console not in use" msgstr "Konsole nicht in Verwendung" -#: Programs/menu_prefs.c:828 +#: Programs/menu_prefs.c:904 msgid "console tone generator" msgstr "Konsolen-Tongenerator" @@ -2224,7 +2262,7 @@ msgid "copy characters to clipboard" msgstr "kopiere Zeichenkette in die Zwischenablage" -#: Programs/config.c:552 Programs/menu_prefs.c:479 +#: Programs/config.c:563 Programs/menu_prefs.c:488 msgid "csecs" msgstr "" @@ -2249,7 +2287,7 @@ msgstr "Pfeil-Rauf-Taste" #. GB -#: Programs/cmd_utils.c:99 +#: Programs/cmd_utils.c:112 msgid "cyan" msgstr "Zyan" @@ -2278,7 +2316,7 @@ msgstr "" #. L -#: Programs/cmd_utils.c:104 +#: Programs/cmd_utils.c:117 msgid "dark grey" msgstr "Dunkelgrau" @@ -2302,34 +2340,18 @@ msgid "describe current character" msgstr "beschreibe aktuelles Zeichen" -#: Programs/config.c:533 /tmp/src/brltty/Programs/config.c:543 +#: Programs/config.c:544 Programs/config.c:554 msgid "device" msgstr "Gerät" -#: Programs/xbrlapi.c:622 -#, c-format -msgid "didn't grab parent of %#010lx\n" -msgstr "" - -#: Programs/xbrlapi.c:640 -#, c-format -msgid "didn't grab window %#010lx\n" -msgstr "" - -#: Programs/xbrlapi.c:479 -#, c-format -msgid "didn't grab window %#010lx but got focus\n" -msgstr "" - -#: Programs/brltest.c:68 /tmp/src/brltty/Programs/brltest.c:78 -#: Programs/brltty-atb.c:32 Programs/brltty-ctb.c:54 Programs/brltty-ktb.c:65 -#: Programs/brltty-ktb.c:75 Programs/brltty-trtxt.c:46 Programs/config.c:323 -#: /tmp/src/brltty/Programs/config.c:342 Programs/config.c:352 -#: /tmp/src/brltty/Programs/config.c:423 +#: Programs/brltest.c:64 Programs/brltest.c:74 Programs/brltty-atb.c:32 +#: Programs/brltty-ctb.c:50 Programs/brltty-ktb.c:73 Programs/brltty-ktb.c:83 +#: Programs/brltty-trtxt.c:47 Programs/config.c:342 Programs/config.c:352 +#: Programs/config.c:362 Programs/config.c:433 msgid "directory" msgstr "Verzeichnis" -#: Programs/xbrlapi.c:95 +#: Programs/xbrlapi.c:97 msgid "display" msgstr "" @@ -2337,28 +2359,27 @@ msgid "do nothing" msgstr "nichts unternehmen" -#: Programs/learn.c:101 +#: Programs/learn.c:108 msgid "done" msgstr "Fertig" -#: Programs/menu_prefs.c:513 +#: Programs/menu_prefs.c:562 msgid "dot 7" msgstr "Punkt 7" -#: Programs/menu_prefs.c:514 +#: Programs/menu_prefs.c:563 msgid "dot 8" msgstr "Punkt 8" -#: Programs/menu_prefs.c:511 +#: Programs/menu_prefs.c:560 msgid "dots 7 and 8" msgstr "Punkte 7 und 8" -#: Drivers/Braille/Baum/braille.c:1062 +#: Drivers/Braille/Baum/braille.c:1064 msgid "driver request" msgstr "Treiberanfrage" -#: Programs/config.c:381 /tmp/src/brltty/Programs/config.c:479 -#: Programs/config.c:513 +#: Programs/config.c:391 Programs/config.c:489 Programs/config.c:524 msgid "driver,..." msgstr "Treiber,..." @@ -2394,11 +2415,11 @@ msgid "eurobraille" msgstr "Eurobraille" -#: Programs/cmd_miscellaneous.c:129 +#: Programs/cmd_miscellaneous.c:118 msgid "exactly" msgstr "genau" -#: Programs/config.c:723 +#: Programs/config.c:725 msgid "excess argument" msgstr "überschüssiges Argument" @@ -2414,20 +2435,18 @@ msgid "execution of \"%s\" failed: %s\n" msgstr "Ausführen von \"%s\" fehlgeschlagen: %s\n" -#: Programs/xbrlapi.c:575 +#: Programs/xbrlapi.c:638 msgid "failed to get first focus\n" msgstr "" -#: Programs/brltty-trtxt.c:56 Programs/brltty-trtxt.c:65 Programs/config.c:313 -#: /tmp/src/brltty/Programs/config.c:333 Programs/config.c:434 -#: /tmp/src/brltty/Programs/config.c:444 Programs/config.c:453 -#: /tmp/src/brltty/Programs/config.c:462 Programs/config.c:498 -#: /tmp/src/brltty/Programs/config.c:582 Programs/config.c:590 -#: /tmp/src/brltty/Programs/xbrlapi.c:88 +#: Programs/brltty-trtxt.c:57 Programs/brltty-trtxt.c:66 Programs/config.c:306 +#: Programs/config.c:315 Programs/config.c:325 Programs/config.c:444 +#: Programs/config.c:454 Programs/config.c:463 Programs/config.c:472 +#: Programs/config.c:508 Programs/config.c:593 Programs/xbrlapi.c:90 msgid "file" msgstr "Datei" -#: Programs/options.c:929 +#: Programs/options.c:942 #, c-format msgid "file '%s' processing error." msgstr "Verarbeitungsfehler in Datei '%s'." @@ -2473,9 +2492,8 @@ msgstr "Gehe zur ersten Zeile des nächsten Absatzes" #: Programs/cmds.auto.h:418 -#, fuzzy msgid "go down to last item" -msgstr "Gehe zum letzten Element" +msgstr "Gehe nach unten zum letzten Element" #: Programs/cmds.auto.h:975 msgid "go down to nearest line with different character" @@ -2498,9 +2516,8 @@ msgstr "Gehe zum nächsten Kommandoprompt" #: Programs/cmds.auto.h:434 -#, fuzzy msgid "go down to next item" -msgstr "Gehe zum nächsten Element" +msgstr "Gehe nach unten zum nächsten Element" #: Programs/cmds.auto.h:194 msgid "go forward one braille window" @@ -2629,9 +2646,8 @@ msgstr "Gehe mehrere Zeilen nach oben" #: Programs/cmds.auto.h:410 -#, fuzzy msgid "go up to first item" -msgstr "Gehe zum ersten Element" +msgstr "Gehe nach oben zum ersten Element" #: Programs/cmds.auto.h:110 msgid "go up to first line of paragraph" @@ -2658,20 +2674,19 @@ msgstr "Gehe zum vorherigen Kommandoprompt" #: Programs/cmds.auto.h:426 -#, fuzzy msgid "go up to previous item" -msgstr "Gehe zum vorherigen Element" +msgstr "Gehe nach oben zum vorherigen Element" #. G -#: Programs/cmd_utils.c:98 +#: Programs/cmd_utils.c:111 msgid "green" msgstr "Grün" -#: Programs/cmd_miscellaneous.c:246 +#: Programs/cmd_miscellaneous.c:230 msgid "help not available" msgstr "Hilfe nicht verfügbar" -#: Programs/scr_help.c:234 +#: Programs/scr_help.c:229 msgid "help screen not readable" msgstr "Hilfe nicht lesbar" @@ -2679,11 +2694,11 @@ msgid "home key" msgstr "Pos1-Taste" -#: Programs/config.c:402 +#: Programs/config.c:412 msgid "identifier,..." msgstr "" -#: Drivers/Braille/Baum/braille.c:1064 +#: Drivers/Braille/Baum/braille.c:1066 msgid "idle timeout" msgstr "Inaktivitätszeitüberschreitung" @@ -2696,9 +2711,8 @@ msgstr "Lauter sprechen" #: Programs/cmds.auto.h:996 -#, fuzzy msgid "insert clipboard history entry after screen cursor" -msgstr "Text der Zwischenablage an Cursorposition einfügen" +msgstr "Text der Zwischenablagenhistorie nach Bildschirmcursor einfügen" #: Programs/cmds.auto.h:526 msgid "insert clipboard text after screen cursor" @@ -2716,7 +2730,7 @@ msgid "invalid counter setting" msgstr "ungültige Zähler-Einstellung" -#: Programs/datafile.c:434 +#: Programs/datafile.c:318 msgid "invalid escape sequence" msgstr "ungültige Escape-Sequenz" @@ -2724,11 +2738,11 @@ msgid "invalid flag setting" msgstr "ungültige Schalter-Einstellung" -#: Programs/config.c:2459 +#: Programs/config.c:2528 msgid "invalid message hold timeout" msgstr "ungültige Meldungsanzeigedauer" -#: Programs/brlapi_server.c:3062 +#: Programs/brlapi_server.c:3129 msgid "invalid thread stack size" msgstr "ungültige Threadstapelgröße" @@ -2742,36 +2756,36 @@ msgstr "Tastaturemulation ein" #. L B -#: Programs/cmd_utils.c:105 +#: Programs/cmd_utils.c:118 msgid "light blue" msgstr "Hellblau" #. L GB -#: Programs/cmd_utils.c:107 +#: Programs/cmd_utils.c:120 msgid "light cyan" msgstr "Hellzyan" #. L G -#: Programs/cmd_utils.c:106 +#: Programs/cmd_utils.c:119 msgid "light green" msgstr "Hellgrün" #. RGB -#: Programs/cmd_utils.c:103 +#: Programs/cmd_utils.c:116 msgid "light grey" msgstr "Hellgrau" #. LR B -#: Programs/cmd_utils.c:109 +#: Programs/cmd_utils.c:122 msgid "light magenta" msgstr "Hellmagenta" #. LR -#: Programs/cmd_utils.c:108 +#: Programs/cmd_utils.c:121 msgid "light red" msgstr "Hellrot" -#: Programs/cmd_speech.c:464 +#: Programs/cmd_speech.c:455 msgid "line" msgstr "Zeile" @@ -2779,17 +2793,17 @@ msgid "linear copy to character" msgstr "kopiere ohne Zeilenumbrüche bis Zeichen" -#: Programs/config.c:573 +#: Programs/config.c:584 msgid "lvl|cat,..." msgstr "lvl|kat,..." #. R B -#: Programs/cmd_utils.c:101 +#: Programs/cmd_utils.c:114 msgid "magenta" msgstr "Magenta" #. An invalid option has been specified. -#: Programs/options.c:533 +#: Programs/options.c:542 msgid "missing operand" msgstr "fehlender Operand" @@ -2805,14 +2819,8 @@ msgid "missing parameter value" msgstr "fehlender Parameterwert" -#: Programs/xbrlapi.c:345 -#, c-format -msgid "more than one item for VT number\n" -msgstr "" - -#: Programs/config.c:370 /tmp/src/brltty/Programs/config.c:392 -#: Programs/config.c:470 /tmp/src/brltty/Programs/config.c:489 -#: Programs/config.c:523 +#: Programs/config.c:334 Programs/config.c:380 Programs/config.c:402 +#: Programs/config.c:480 Programs/config.c:499 Programs/config.c:534 msgid "name=value,..." msgstr "Name=Wert,..." @@ -2820,17 +2828,7 @@ msgid "native" msgstr "eigenes" -#: Programs/xbrlapi.c:330 -#, c-format -msgid "no XFree86_VT atom\n" -msgstr "" - -#: Programs/xbrlapi.c:341 -#, c-format -msgid "no items for VT number\n" -msgstr "" - -#: Programs/config.c:993 +#: Programs/config.c:995 msgid "no key bindings" msgstr "Keine Tastenbelegungen" @@ -2838,15 +2836,15 @@ msgid "no screen" msgstr "Kein Bildschirm" -#: Programs/config.c:634 +#: Programs/config.c:636 msgid "none" msgstr "keine" -#: Programs/config.c:1234 +#: Programs/config.c:1261 msgid "not saved" msgstr "nicht gespeichert" -#: Programs/options.c:140 +#: Programs/options.c:139 msgid "option" msgstr "Option" @@ -2858,11 +2856,11 @@ msgid "page-up key" msgstr "Seite-Rauf Taste" -#: Programs/menu_prefs.c:485 +#: Programs/menu_prefs.c:494 msgid "percentage" msgstr "prozent" -#: Programs/config.c:2432 +#: Programs/config.c:2501 msgid "pid file not specified" msgstr "PID-Datei nicht spezifiziert" @@ -2878,7 +2876,7 @@ msgid "place left end of braille window at character" msgstr "Positioniere linken Rand der Braillezeile bei Zeichen" -#: Drivers/Braille/Baum/braille.c:1063 +#: Drivers/Braille/Baum/braille.c:1065 msgid "power switch" msgstr "" @@ -2891,21 +2889,21 @@ msgstr "kopiere mit Zeilenumbrüchen bis Zeichen" #. R -#: Programs/cmd_utils.c:100 +#: Programs/cmd_utils.c:113 msgid "red" msgstr "Rot" -#: Programs/config.c:1634 +#: Programs/config.c:1701 #, c-format msgid "reinitializing braille driver" msgstr "reinitialisiere Brailletreiber" -#: Programs/config.c:2194 +#: Programs/config.c:2249 #, c-format msgid "reinitializing screen driver" msgstr "reinitialisiere Bildschirmtreiber" -#: Programs/config.c:1975 +#: Programs/config.c:2030 #, c-format msgid "reinitializing speech driver" msgstr "reinitialisiere Sprachausgabentreiber" @@ -2925,11 +2923,6 @@ msgid "repeat count" msgstr "Wiederholungsanzahl" -#: Programs/xbrlapi.c:313 -#, c-format -msgid "resource %#010lx, req %u:%u\n" -msgstr "" - #: Programs/cmds.auto.h:532 msgid "restart braille driver" msgstr "Brailletreiber neu starten" @@ -2954,11 +2947,11 @@ msgid "save preferences to disk" msgstr "Einstellungen speichern" -#: Programs/config.c:2074 +#: Programs/config.c:2129 msgid "screen driver not loadable" msgstr "Bildschirmtreiber kann nicht geladen werden" -#: Drivers/Screen/Linux/screen.c:1303 +#: Drivers/Screen/Linux/screen.c:1304 msgid "screen not in text mode" msgstr "Bildschirm nicht im Textmodus" @@ -2970,7 +2963,7 @@ msgid "search forward for clipboard text" msgstr "Suche vorwärts nach Inhalt der Zwischenablage" -#: Programs/cmd_miscellaneous.c:133 +#: Programs/cmd_miscellaneous.c:122 msgid "second" msgid_plural "seconds" msgstr[0] "Sekunde" @@ -3118,15 +3111,15 @@ msgid "show current date and time" msgstr "Aktuelles Datum und Uhrzeit anzeigen" -#: Programs/menu_prefs.c:829 +#: Programs/menu_prefs.c:905 msgid "soundcard digital audio" msgstr "Digital Audio Soundkarte" -#: Programs/menu_prefs.c:831 +#: Programs/menu_prefs.c:907 msgid "soundcard synthesizer" msgstr "Synthesizer der Soundkarte" -#: Programs/cmd.c:283 /tmp/src/brltty/Programs/core.c:808 +#: Programs/cmd.c:277 Programs/core.c:869 msgid "space" msgstr "leer" @@ -3154,7 +3147,7 @@ msgid "speak speech cursor location" msgstr "Sprich Sprachcursorposition" -#: Programs/config.c:1839 +#: Programs/config.c:1894 msgid "speech driver not loadable" msgstr "Sprachausgabentreiber kann nicht geladen werden" @@ -3167,9 +3160,8 @@ msgstr "beginne neue Auswahl bei Zeichen" #: Programs/cmds.auto.h:799 -#, fuzzy msgid "start the braille driver" -msgstr "Brailletreiber neu starten" +msgstr "Brailletreiber starten" #: Programs/cmds.auto.h:823 #, fuzzy @@ -3177,18 +3169,16 @@ msgstr "Bildschirmtreiber neu starten" #: Programs/cmds.auto.h:811 -#, fuzzy msgid "start the speech driver" -msgstr "Sprachausgabentreiber neu starten" +msgstr "Sprachausgabentreiber starten" #: Programs/cmds.auto.h:452 msgid "stop speaking" msgstr "Sprechen stoppen" #: Programs/cmds.auto.h:793 -#, fuzzy msgid "stop the braille driver" -msgstr "Brailletreiber neu starten" +msgstr "Brailletreiber stoppen" #: Programs/cmds.auto.h:817 #, fuzzy @@ -3196,32 +3186,28 @@ msgstr "Parameter für den Bildschirmtreiber." #: Programs/cmds.auto.h:805 -#, fuzzy msgid "stop the speech driver" -msgstr "Sprachausgabentreiber neu starten" +msgstr "Sprachausgabentreiber stoppen" -#: Programs/xbrlapi.c:526 +#: Programs/xbrlapi.c:590 msgid "strange old error handler\n" msgstr "befremdlicher alter Fehlerbehandler\n" #: Programs/cmds.auto.h:901 -#, fuzzy msgid "switch to a specific virtual terminal" -msgstr "wechsle zum vorherigen virtuellen Terminal" +msgstr "Wechsle zu einem spezifischen virtuellen Terminal" #: Programs/cmds.auto.h:1089 msgid "switch to command context" msgstr "wechsle in den Kommandokontext" #: Programs/cmds.auto.h:513 -#, fuzzy msgid "switch to the next virtual terminal" -msgstr "wechsle zum nächsten virtuellen Terminal" +msgstr "Wechsle zum nächsten virtuellen Terminal" #: Programs/cmds.auto.h:507 -#, fuzzy msgid "switch to the previous virtual terminal" -msgstr "wechsle zum vorherigen virtuellen Terminal" +msgstr "Wechsle zum vorherigen virtuellen Terminal" #: Programs/cmds.auto.h:1110 msgid "tab key" @@ -3235,11 +3221,11 @@ msgid "type unicode character" msgstr "Unicode-Zeichen eingeben" -#: Programs/xbrlapi.c:771 +#: Programs/xbrlapi.c:841 msgid "unexpected block type" msgstr "unerwarteter Blocktyp" -#: Programs/xbrlapi.c:721 +#: Programs/xbrlapi.c:791 msgid "unexpected cmd" msgstr "unerwartetes Kommando" @@ -3247,25 +3233,19 @@ msgid "unhandled command" msgstr "nicht erkanntes Kommando" -#. "shouldn't happen" events -#: Programs/xbrlapi.c:669 -#, c-format -msgid "unhandled event type: %d\n" -msgstr "unbehandelter Ereignistyp: %d\n" - -#: Programs/cmd.c:204 +#: Programs/cmd.c:198 msgid "unknown command" msgstr "unbekanntes Kommando" -#: Programs/options.c:767 +#: Programs/options.c:772 msgid "unknown configuration directive" msgstr "unbekannte Konfigurationsdirektive" -#: Programs/config.c:654 +#: Programs/config.c:656 msgid "unknown log level or category" msgstr "unbekannte Protokollierungsausführlichkeit oder Kategorie" -#: Programs/options.c:528 +#: Programs/options.c:529 msgid "unknown option" msgstr "unbekannte Option" @@ -3278,16 +3258,92 @@ msgstr "Lautstärke" #. LRGB -#: Programs/cmd_utils.c:111 +#: Programs/cmd_utils.c:124 msgid "white" msgstr "Weiß" -#: Programs/xbrlapi.c:648 +#: Programs/xbrlapi.c:824 #, c-format -msgid "window %#010lx changed to NULL name\n" +msgid "xbrlapi: Couldn't find modifiers to apply to %d for getting keysym %08X\n" +msgstr "" + +#: Programs/xbrlapi.c:800 +#, c-format +msgid "xbrlapi: Couldn't translate keysym %08X to keycode.\n" +msgstr "" + +#: Programs/xbrlapi.c:373 +#, c-format +msgid "xbrlapi: X Error %d, %s on display %s\n" +msgstr "" + +#: Programs/xbrlapi.c:415 +#, fuzzy, c-format +msgid "xbrlapi: bad format for VT number\n" +msgstr "ungültiges Format für VT Nummer\n" + +#: Programs/xbrlapi.c:418 +#, fuzzy, c-format +msgid "xbrlapi: bad type for VT number\n" +msgstr "ungültiger Typ für VT Nummer\n" + +#: Programs/xbrlapi.c:397 +#, c-format +msgid "xbrlapi: cannot get root window XFree86_VT property\n" +msgstr "" + +#: Programs/xbrlapi.c:276 +#, c-format +msgid "xbrlapi: cannot write window name %s\n" +msgstr "" + +#: Programs/xbrlapi.c:691 +#, c-format +msgid "xbrlapi: didn't grab parent of %#010lx\n" +msgstr "" + +#: Programs/xbrlapi.c:709 +#, c-format +msgid "xbrlapi: didn't grab window %#010lx\n" +msgstr "" + +#: Programs/xbrlapi.c:540 +#, c-format +msgid "xbrlapi: didn't grab window %#010lx but got focus\n" +msgstr "" + +#: Programs/xbrlapi.c:406 +#, fuzzy, c-format +msgid "xbrlapi: more than one item for VT number\n" +msgstr "ungültiges Format für VT Nummer\n" + +#: Programs/xbrlapi.c:391 +#, c-format +msgid "xbrlapi: no XFree86_VT atom\n" +msgstr "" + +#: Programs/xbrlapi.c:402 +#, fuzzy, c-format +msgid "xbrlapi: no items for VT number\n" +msgstr "ungültiger Typ für VT Nummer\n" + +#: Programs/xbrlapi.c:374 +#, c-format +msgid "xbrlapi: resource %#010lx, req %u:%u\n" +msgstr "" + +#. "shouldn't happen" events +#: Programs/xbrlapi.c:738 +#, fuzzy, c-format +msgid "xbrlapi: unhandled event type: %d\n" +msgstr "unbehandelter Ereignistyp: %d\n" + +#: Programs/xbrlapi.c:717 +#, c-format +msgid "xbrlapi: window %#010lx changed to NULL name\n" msgstr "" #. LRG -#: Programs/cmd_utils.c:110 +#: Programs/cmd_utils.c:123 msgid "yellow" msgstr "Gelb" diff -Nru brltty-5.4/Messages/fr.po brltty-5.5/Messages/fr.po --- brltty-5.4/Messages/fr.po 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Messages/fr.po 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: brltty 4.3\n" "Report-Msgid-Bugs-To: brltty@mielke.cc\n" -"POT-Creation-Date: 2015-12-12 20:06+0100\n" -"PO-Revision-Date: 2015-12-02 01:58+0100\n" +"POT-Creation-Date: 2017-04-08 00:22+0200\n" +"PO-Revision-Date: 2017-04-13 16:20+0200\n" "Last-Translator: Jean-Philippe MENGUAL (de Traduc.org) \n" "Language-Team: LANGUAGE \n" "Language: fr\n" @@ -31,45 +31,77 @@ msgid "\"%s\" started as \"%s\"\n" msgstr "\"%s\" démarré par \"%s\"\n" -#: Programs/menu_prefs.c:433 Programs/menu_prefs.c:434 -#: Programs/menu_prefs.c:436 Programs/menu_prefs.c:437 -#: Programs/menu_prefs.c:440 Programs/menu_prefs.c:441 -#: Programs/menu_prefs.c:442 Programs/menu_prefs.c:444 -#: Programs/menu_prefs.c:445 +#: Programs/menu_prefs.c:442 Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:445 Programs/menu_prefs.c:446 +#: Programs/menu_prefs.c:449 Programs/menu_prefs.c:450 +#: Programs/menu_prefs.c:451 Programs/menu_prefs.c:453 +#: Programs/menu_prefs.c:454 msgid "1 cell" msgstr "1 cellule" -#: Programs/menu_prefs.c:1035 +#: Programs/menu_prefs.c:762 +msgid "1 second" +msgstr "1 seconde" + +#: Programs/menu_prefs.c:790 +msgid "10 seconds" +msgstr "10 secondes" + +#: Programs/menu_prefs.c:1111 msgid "12 Hour" msgstr "12 heures" -#: Programs/menu_prefs.c:432 Programs/menu_prefs.c:435 -#: Programs/menu_prefs.c:438 Programs/menu_prefs.c:439 -#: Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:441 Programs/menu_prefs.c:444 +#: Programs/menu_prefs.c:447 Programs/menu_prefs.c:448 +#: Programs/menu_prefs.c:452 msgid "2 cells" msgstr "2 cellules" -#: Programs/menu_prefs.c:1034 +#: Programs/menu_prefs.c:763 +msgid "2 seconds" +msgstr "2 secondes" + +#: Programs/menu_prefs.c:791 +msgid "20 seconds" +msgstr "20 secondes" + +#: Programs/menu_prefs.c:1110 msgid "24 Hour" msgstr "24 heures" -#: Programs/menu_prefs.c:551 +#: Programs/menu_prefs.c:760 +msgid "250 milliseconds" +msgstr "250 millisecondes" + +#: Programs/menu_prefs.c:792 +msgid "40 seconds" +msgstr "40 secondes" + +#: Programs/menu_prefs.c:789 +msgid "5 seconds" +msgstr "5 secondes" + +#: Programs/menu_prefs.c:761 +msgid "500 milliseconds" +msgstr "500 millisecondes" + +#: Programs/menu_prefs.c:600 msgid "6-Dot Computer Braille" msgstr "Braille informatique 6 points" -#: Programs/menu_prefs.c:549 +#: Programs/menu_prefs.c:598 msgid "8-Dot Computer Braille" msgstr "Braille informatique 8 points" -#: Programs/brltty-ttb.c:178 +#: Programs/brltty-ttb.c:179 msgid "8-bit character set to use." msgstr "Utilisation de caractères 8 bits" -#: Programs/scr_menu.c:93 +#: Programs/scr_menu.c:101 msgid "" msgstr "" -#: Programs/config.c:2646 +#: Programs/config.c:1291 msgid "API Parameter" msgstr "Paramètre de l'API" @@ -100,7 +132,7 @@ msgid "Acoustic Guitar (steel)" msgstr "Guitare accoustique (métal)" -#: Programs/menu_prefs.c:1061 +#: Programs/menu_prefs.c:1137 msgid "After Time" msgstr "Après l'heure" @@ -108,31 +140,31 @@ msgid "Agogo" msgstr "Agogo" -#: Programs/menu_prefs.c:1251 +#: Programs/menu_prefs.c:1327 msgid "Alert" msgstr "Alerte" -#: Programs/menu_prefs.c:876 +#: Programs/menu_prefs.c:952 msgid "Alert Dots" msgstr "Points d'avertissement" -#: Programs/menu_prefs.c:881 +#: Programs/menu_prefs.c:957 msgid "Alert Messages" msgstr "Messages d'avertissement" -#: Programs/menu_prefs.c:822 +#: Programs/menu_prefs.c:898 msgid "Alert Tunes" msgstr "Sons d'avertissement" -#: Programs/menu_prefs.c:682 Programs/menu_prefs.c:915 +#: Programs/menu_prefs.c:731 Programs/menu_prefs.c:991 msgid "All" msgstr "Toutes" -#: Programs/menu_prefs.c:444 +#: Programs/menu_prefs.c:453 msgid "Alphabetic Braille Window Coordinates" msgstr "Coordonnées alphabétiques de la fenêtre braille" -#: Programs/menu_prefs.c:445 +#: Programs/menu_prefs.c:454 msgid "Alphabetic Screen Cursor Coordinates" msgstr "Coordonnées alphabétiques du curseur à l'écran" @@ -144,47 +176,55 @@ msgid "Applause" msgstr "Applaudissements" -#: Programs/cmd_miscellaneous.c:61 +#: Programs/cmd_miscellaneous.c:60 msgid "April" msgstr "Avril" -#: Programs/log.c:113 +#: Programs/log.c:115 msgid "Async Events" msgstr "Événements désynchronisés" -#: Programs/menu_prefs.c:644 +#: Programs/menu_prefs.c:693 msgid "Attributes Invisible Time" msgstr "Durée de l'invisibilité des attributs" -#: Programs/config.c:2611 Programs/menu_prefs.c:1157 +#: Programs/config.c:2666 Programs/menu_prefs.c:1233 msgid "Attributes Table" msgstr "Table d'attributs" -#: Programs/menu_prefs.c:638 +#: Programs/menu_prefs.c:687 msgid "Attributes Visible Time" msgstr "Durée de visibilité des attributs" -#: Programs/cmd_miscellaneous.c:65 +#: Programs/cmd_miscellaneous.c:64 msgid "August" msgstr "Août" -#: Programs/menu_prefs.c:731 +#: Programs/alert.c:168 +msgid "Autorelease" +msgstr "Relâchement automatique" + +#: Programs/menu_prefs.c:795 +msgid "Autorelease Time" +msgstr "Délai avant le relâchement automatique" + +#: Programs/menu_prefs.c:807 msgid "Autorepeat" msgstr "Répétition automatique" -#: Programs/menu_prefs.c:743 +#: Programs/menu_prefs.c:819 msgid "Autorepeat Interval" msgstr "Intervalle de la répétition automatique" -#: Programs/menu_prefs.c:737 +#: Programs/menu_prefs.c:813 msgid "Autorepeat Panning" msgstr "Répétition automatique du défilement" -#: Programs/menu_prefs.c:958 +#: Programs/menu_prefs.c:1034 msgid "Autospeak" msgstr "Parole automatique" -#: Programs/config.c:1589 +#: Programs/config.c:1656 msgid "BRLTTY stopped" msgstr "Arrêt de BRLTTY" @@ -208,11 +248,11 @@ msgid "Bassoon" msgstr "Basson" -#: Programs/menu_prefs.c:828 +#: Programs/menu_prefs.c:904 msgid "Beeper" msgstr "Beepeur" -#: Programs/menu_prefs.c:1060 +#: Programs/menu_prefs.c:1136 msgid "Before Time" msgstr "Avant l'heure" @@ -220,23 +260,23 @@ msgid "Bird Tweet" msgstr "Gazouillement d'oiseaux" -#: Programs/menu_prefs.c:632 +#: Programs/menu_prefs.c:681 msgid "Blinking Attributes" msgstr "Clignotement des attributs" -#: Programs/menu_prefs.c:650 +#: Programs/menu_prefs.c:699 msgid "Blinking Capitals" msgstr "Clignotement des majuscules" -#: Programs/menu_prefs.c:609 +#: Programs/menu_prefs.c:658 msgid "Blinking Screen Cursor" msgstr "Clignotement du curseur de l'écran" -#: Programs/menu_prefs.c:1010 +#: Programs/menu_prefs.c:1086 msgid "Blinking Speech Cursor" msgstr "Clignotement du curseur de la synthèse" -#: Programs/menu_prefs.c:512 Programs/menu_prefs.c:1120 +#: Programs/menu_prefs.c:561 Programs/menu_prefs.c:1196 msgid "Block" msgstr "Pavé" @@ -244,71 +284,71 @@ msgid "Blown Bottle" msgstr "Bouteille cassée" -#: Programs/log.c:137 +#: Programs/log.c:139 msgid "Bluetooth I/O" msgstr "E/S Bluetooth" -#: Programs/config.c:1394 +#: Programs/config.c:1458 msgid "Braille Device" msgstr "Périphérique braille" -#: Programs/menu_prefs.c:791 +#: Programs/menu_prefs.c:867 msgid "Braille Display Orientation" msgstr "Orientation de l'affichage braille" -#: Programs/config.c:1390 +#: Programs/config.c:1454 msgid "Braille Driver" msgstr "Pilote braille" -#: Programs/log.c:143 +#: Programs/log.c:145 msgid "Braille Driver Events" msgstr "Événements liés au pilote braille" -#: Programs/menu_prefs.c:587 +#: Programs/menu_prefs.c:636 msgid "Braille Firmness" msgstr "Rugosité du braille" -#: Programs/menu_prefs.c:781 +#: Programs/menu_prefs.c:857 msgid "Braille Input Mode" msgstr "Mode de saisie braille" -#: Programs/log.c:77 +#: Programs/log.c:79 msgid "Braille Key Events" msgstr "Événements liés au clavier braille" -#: Programs/menu_prefs.c:771 +#: Programs/menu_prefs.c:847 msgid "Braille Keyboard Enabled" msgstr "Clavier braille activé" -#: Programs/config.c:1393 +#: Programs/config.c:1457 msgid "Braille Parameter" msgstr "Paramètre braille" -#: Programs/menu_prefs.c:545 +#: Programs/menu_prefs.c:594 msgid "Braille Presentation" msgstr "Affichage braille" -#: Programs/menu_prefs.c:1147 +#: Programs/menu_prefs.c:1223 msgid "Braille Tables" msgstr "Tables braille" -#: Programs/menu_prefs.c:433 +#: Programs/menu_prefs.c:442 msgid "Braille Window Column" msgstr "Colonne de la fenêtre braille" -#: Programs/menu_prefs.c:432 +#: Programs/menu_prefs.c:441 msgid "Braille Window Coordinates" msgstr "Coordonnées de la fenêtre braille" -#: Programs/menu_prefs.c:703 +#: Programs/menu_prefs.c:752 msgid "Braille Window Overlap" msgstr "Chevauchement de fenêtre braille" -#: Programs/menu_prefs.c:434 +#: Programs/menu_prefs.c:443 msgid "Braille Window Row" msgstr "Ligne de la fenêtre braille" -#: Programs/config.c:384 +#: Programs/config.c:394 #, c-format msgid "Braille driver code (%s, %s, or one of {%s})." msgstr "Code du pilote braille : (%s, %s, ou un parmi {%s})." @@ -329,35 +369,35 @@ msgid "Bright Acoustic Piano" msgstr "Piano accoustique brillaq" -#: Programs/xbrlapi.c:90 +#: Programs/xbrlapi.c:92 msgid "BrlAPI authorization/authentication string" msgstr "Chaîne d'autorisation/authentification de BrlAPI" -#: Programs/xbrlapi.c:83 +#: Programs/xbrlapi.c:85 msgid "BrlAPI host and/or port to connect to" msgstr "Hôte de BrlAPI et port auquel se connecter" -#: Programs/menu_prefs.c:1203 +#: Programs/menu_prefs.c:1279 msgid "Bug Reports" msgstr "Rapports de bug" -#: Programs/menu_prefs.c:1184 +#: Programs/menu_prefs.c:1260 msgid "Build Information" msgstr "Informations de construction" -#: Programs/menu_prefs.c:572 +#: Programs/menu_prefs.c:621 msgid "Capitalization Mode" msgstr "Mode de majuscules" -#: Programs/menu_prefs.c:661 +#: Programs/menu_prefs.c:710 msgid "Capitals Invisible Time" msgstr "Durée d'invisibilité des majuscules" -#: Programs/menu_prefs.c:655 +#: Programs/menu_prefs.c:704 msgid "Capitals Visible Time" msgstr "Durée de visibilité des majuscules" -#: Programs/menu_prefs.c:1274 +#: Programs/menu_prefs.c:1350 msgid "Category Log Level" msgstr "Niveau de journalisation par catégorie" @@ -390,27 +430,27 @@ msgid "Clavi" msgstr "Claviers" -#: Programs/menu.c:811 +#: Programs/menu.c:822 msgid "Close" msgstr "Fermer" -#: Programs/menu_prefs.c:1044 +#: Programs/menu_prefs.c:1120 msgid "Colon" msgstr "Deux-points" -#: Programs/menu_prefs.c:1208 +#: Programs/menu_prefs.c:1284 msgid "Configuration Directory" msgstr "Répertoire de configuration" -#: Programs/config.c:2565 Programs/menu_prefs.c:1213 +#: Programs/config.c:2620 Programs/menu_prefs.c:1289 msgid "Configuration File" msgstr "Fichier de configuration" -#: Programs/alert.c:412 +#: Programs/alert.c:163 msgid "Console Bell" msgstr "Beep de la console" -#: Programs/menu_prefs.c:808 +#: Programs/menu_prefs.c:884 msgid "Console Bell Alert" msgstr "Beep de la console" @@ -418,77 +458,71 @@ msgid "Contrabass" msgstr "Contrebasse" -#: Programs/menu_prefs.c:550 +#: Programs/menu_prefs.c:599 msgid "Contracted Braille" msgstr "Braille abrégé" -#: Programs/config.c:2618 Programs/menu_prefs.c:1165 +#: Programs/config.c:2673 Programs/menu_prefs.c:1241 msgid "Contraction Table" msgstr "Table de braille abrégé" -#: Programs/brltty-ctb.c:66 +#: Programs/brltty-ctb.c:62 msgid "Contraction table." msgstr "Table de braille abrégé." -#: Programs/brltty-ctb.c:80 +#: Programs/brltty-ctb.c:76 msgid "Contraction verification table." msgstr "Table de vérification du braille abrégé." -#: Programs/xbrlapi.c:754 -#, c-format -msgid "Couldn't find modifiers to apply to %d for getting keysym %08X\n" -msgstr "N'a pas pu trouver de modificateur applicable à %d pour obtenir le keysym %08X\n" - -#: Programs/xbrlapi.c:730 -#, c-format -msgid "Couldn't translate keysym %08X to keycode.\n" -msgstr "N'a pas pu traduire le keysum %08X en keycode \n" - -#: Programs/menu_prefs.c:1252 +#: Programs/menu_prefs.c:1328 msgid "Critical" msgstr "Critique" -#: Programs/log.c:95 +#: Programs/log.c:97 msgid "Cursor Routing" msgstr "Déplacement du curseur" -#: Programs/log.c:89 +#: Programs/log.c:91 msgid "Cursor Tracking" msgstr "Poursuite du curseur" -#: Programs/menu_prefs.c:1082 +#: Programs/menu_prefs.c:766 +msgid "Cursor Tracking Delay" +msgstr "Durée de la poursuite du curseur" + +#: Programs/menu_prefs.c:1158 msgid "Dash" msgstr "Tiret" -#: Programs/menu_prefs.c:1075 +#: Programs/menu_prefs.c:1151 msgid "Date Format" msgstr "Format de la date" -#: Programs/menu_prefs.c:1064 +#: Programs/menu_prefs.c:1140 msgid "Date Position" msgstr "Position de la date" -#: Programs/menu_prefs.c:1087 +#: Programs/menu_prefs.c:1163 msgid "Date Separator" msgstr "Séparateur de la date" -#: Programs/menu_prefs.c:1072 +#: Programs/menu_prefs.c:1148 msgid "Day Month Year" msgstr "Jour Mois Année" -#: Programs/menu_prefs.c:1257 +#: Programs/menu_prefs.c:1333 msgid "Debug" msgstr "Débogage" -#: Programs/cmd_miscellaneous.c:69 +#: Programs/cmd_miscellaneous.c:68 msgid "December" msgstr "Décembre" -#: Programs/config.c:405 +#: Programs/config.c:415 msgid "Device for accessing braille display." msgstr "Périphérique d'accès à l'afficheur braille." -#: Programs/config.c:364 +#: Programs/config.c:374 msgid "Disable the application programming interface." msgstr "Désactiver l'interface de programmation de l'application (API)." @@ -496,23 +530,27 @@ msgid "Distortion Guitar" msgstr "Guitare avec distortion" -#: Programs/config.c:506 +#: Programs/config.c:517 msgid "Do not autospeak when braille is not being used." msgstr "Pas de parole automatique quand le braille ne sera pas utilisé" -#: Programs/xbrlapi.c:103 +#: Programs/xbrlapi.c:105 msgid "Do not write any text to the braille device" msgstr "Ne pas écrire de texte sur le périphérique braille" -#: Programs/alert.c:301 +#: Programs/brltty-trtxt.c:83 +msgid "Don't fall back to the Unicode base character." +msgstr "Ne se rabat pas sur des caractères en unicode" + +#: Programs/alert.c:52 msgid "Done" msgstr "Fait" -#: Programs/menu_prefs.c:1045 Programs/menu_prefs.c:1084 +#: Programs/menu_prefs.c:1121 Programs/menu_prefs.c:1160 msgid "Dot" msgstr "Point" -#: Programs/menu_prefs.c:778 +#: Programs/menu_prefs.c:854 msgid "Dots via Unicode Braille" msgstr "Points en braille unicode" @@ -521,7 +559,7 @@ msgid "Drawbar Organ" msgstr "Orgue drawbar" -#: Programs/config.c:2569 Programs/menu_prefs.c:1233 +#: Programs/config.c:2626 Programs/menu_prefs.c:1309 msgid "Drivers Directory" msgstr "Répertoire des pilotes" @@ -529,11 +567,11 @@ msgid "Dulcimer" msgstr "Dulcimer" -#: Programs/menu_prefs.c:697 +#: Programs/menu_prefs.c:746 msgid "Eager Sliding Braille Window" msgstr "Défilement dynamique de la fenêtre braille" -#: Programs/brltty-ttb.c:157 +#: Programs/brltty-ttb.c:158 msgid "Edit table." msgstr "Éditer la table" @@ -569,15 +607,15 @@ msgid "Electric Piano 2" msgstr "Piano électrique 2" -#: Programs/menu_prefs.c:1250 +#: Programs/menu_prefs.c:1326 msgid "Emergency" msgstr "Urgence" -#: Programs/menu_prefs.c:431 +#: Programs/menu_prefs.c:440 msgid "End" msgstr "Fin" -#: Programs/menu_prefs.c:683 +#: Programs/menu_prefs.c:732 msgid "End of Line" msgstr "Fin de la ligne" @@ -585,7 +623,7 @@ msgid "English Horn" msgstr "Corne anglaise" -#: Programs/menu_prefs.c:950 +#: Programs/menu_prefs.c:1026 msgid "Enqueue" msgstr "Dans la file" @@ -593,7 +631,7 @@ msgid "Ensemble" msgstr "Ensemble" -#: Programs/menu_prefs.c:1253 +#: Programs/menu_prefs.c:1329 msgid "Error" msgstr "Erreur" @@ -601,19 +639,23 @@ msgid "Ethnic Instruments" msgstr "Instruments folkloriques" -#: Programs/menu_prefs.c:805 +#: Programs/menu_prefs.c:881 msgid "Event Alerts" msgstr "Signaux d'événements" -#: Programs/menu_prefs.c:560 +#: Programs/menu_prefs.c:609 msgid "Expand Current Word" msgstr "Extension du mot actuel" -#: Programs/menu_prefs.c:831 +#: Programs/config.c:336 +msgid "Explicit preference settings." +msgstr "Paramètres explicites d'une préférence." + +#: Programs/menu_prefs.c:907 msgid "FM" msgstr "FM" -#: Programs/menu_prefs.c:869 +#: Programs/menu_prefs.c:945 msgid "FM Volume" msgstr "Volume FM" @@ -650,7 +692,7 @@ msgid "FX 8 (sci-fi)" msgstr "FX 8 (SF)" -#: Programs/cmd_miscellaneous.c:59 +#: Programs/cmd_miscellaneous.c:58 msgid "February" msgstr "Février" @@ -662,15 +704,15 @@ msgid "Flute" msgstr "flûte" -#: Programs/brltty-ctb.c:100 +#: Programs/brltty-ctb.c:96 msgid "Force immediate output." msgstr "Forcer une sortie immédiate." -#: Programs/brltty-ttb.c:164 +#: Programs/brltty-ttb.c:165 msgid "Format of input file." msgstr "Format du fichier d'entrée." -#: Programs/brltty-ttb.c:171 +#: Programs/brltty-ttb.c:172 msgid "Format of output file." msgstr "Format du fichier de sortie." @@ -682,15 +724,15 @@ msgid "Fretless Bass" msgstr "Basse glissée" -#: Programs/alert.c:346 +#: Programs/alert.c:97 msgid "Frozen" msgstr "Gelé" -#: Programs/menu_prefs.c:446 +#: Programs/menu_prefs.c:455 msgid "Generic" msgstr "Générique" -#: Programs/log.c:59 +#: Programs/log.c:61 msgid "Generic Input" msgstr "Entrée générique" @@ -727,15 +769,15 @@ msgid "Helicopter" msgstr "Hélicoptère" -#: Programs/scr_help.c:217 +#: Programs/scr_help.c:215 msgid "Help Screen" msgstr "Écran d'aide" -#: Programs/menu_prefs.c:583 Programs/menu_prefs.c:760 +#: Programs/menu_prefs.c:632 Programs/menu_prefs.c:836 msgid "High" msgstr "Forte" -#: Programs/menu_prefs.c:716 +#: Programs/menu_prefs.c:778 msgid "Highlight Braille Window Location" msgstr "Surlignement de l'emplacement de la fenêtre braille" @@ -743,48 +785,48 @@ msgid "Honkytonk Piano" msgstr "Piano bastringue" -#: Programs/menu_prefs.c:949 +#: Programs/menu_prefs.c:1025 msgid "Immediate" msgstr "Immédiat" -#: Programs/xbrlapi.c:536 +#: Programs/xbrlapi.c:600 msgid "Incompatible XKB library\n" msgstr "Bibliothèque XKB incompatible\n" -#: Programs/xbrlapi.c:538 +#: Programs/xbrlapi.c:602 msgid "Incompatible XKB server support\n" msgstr "Support du serveur XKB incompatible\n" -#: Programs/menu_prefs.c:1256 +#: Programs/menu_prefs.c:1332 msgid "Information" msgstr "Informations" -#: Programs/menu_prefs.c:722 +#: Programs/menu_prefs.c:784 msgid "Input Options" msgstr "Options d'entrée" -#: Programs/log.c:65 +#: Programs/log.c:67 msgid "Input Packets" msgstr "Paquets entrants" -#: Programs/config.c:290 +#: Programs/config.c:283 #, c-format msgid "Install the %s service, and then exit." msgstr "Installe le service %s et quittez." -#: Programs/menu_prefs.c:1260 +#: Programs/menu_prefs.c:1336 msgid "Internal Parameters" msgstr "Paramètres internes" -#: Programs/cmd_miscellaneous.c:58 +#: Programs/cmd_miscellaneous.c:57 msgid "January" msgstr "Janvier" -#: Programs/cmd_miscellaneous.c:64 +#: Programs/cmd_miscellaneous.c:63 msgid "July" msgstr "Juillet" -#: Programs/cmd_miscellaneous.c:63 +#: Programs/cmd_miscellaneous.c:62 msgid "June" msgstr "Juin" @@ -792,27 +834,27 @@ msgid "Kalimba" msgstr "Kalimba" -#: Programs/config.c:1317 +#: Programs/config.c:1382 msgid "Key Bindings" msgstr "Associations de touches" -#: Programs/config.c:980 +#: Programs/config.c:982 msgid "Key Help" msgstr "Touche Aide" -#: Programs/config.c:1322 Programs/ktb_list.c:668 +#: Programs/config.c:1387 Programs/ktb_list.c:689 msgid "Key Table" msgstr "Table de touches" -#: Programs/log.c:83 +#: Programs/log.c:85 msgid "Keyboard Key Events" msgstr "Événements liés aux touches du clavier" -#: Programs/menu_prefs.c:815 +#: Programs/menu_prefs.c:891 msgid "Keyboard LED Alerts" msgstr "Alertes lumineuses du clavier" -#: Programs/config.c:2625 Programs/menu_prefs.c:797 +#: Programs/config.c:2680 Programs/menu_prefs.c:873 msgid "Keyboard Table" msgstr "Tables des touches du clavier" @@ -820,7 +862,7 @@ msgid "Koto" msgstr "Koto" -#: Programs/config.c:2777 +#: Programs/config.c:2810 msgid "Language" msgstr "Langue" @@ -857,84 +899,88 @@ msgid "Lead 8 (bass + lead)" msgstr "Position 8 (basse + position)" -#: Programs/learn.c:94 +#: Programs/learn.c:101 msgid "Learn Mode" msgstr "mode d'apprentissage" -#: Programs/menu_prefs.c:1099 +#: Programs/menu_prefs.c:1175 msgid "Left" msgstr "Gauche" -#: Programs/brltty-ktb.c:45 +#: Programs/brltty-ktb.c:53 msgid "List key names." msgstr "Liste les noms des touches" -#: Programs/brltty-ktb.c:52 +#: Programs/brltty-ktb.c:60 msgid "List key table in help screen format." msgstr "Liste la table de touches au format écran d'aide" -#: Programs/brltty-ktb.c:59 +#: Programs/brltty-ktb.c:67 msgid "List key table in reStructuredText format." msgstr "Liste la table de touches au format reStructuredText" -#: Programs/menu_prefs.c:1243 +#: Programs/menu_prefs.c:1319 msgid "Locale Directory" msgstr "Répertoire de la locale" -#: Programs/menu_prefs.c:1279 +#: Programs/menu_prefs.c:1355 msgid "Log Categories" msgstr "Catégories de journal" -#: Programs/config.c:739 +#: Programs/config.c:741 msgid "Log Level" msgstr "Niveau de journalisation" -#: Programs/config.c:605 +#: Programs/menu_prefs.c:1416 +msgid "Log Messages" +msgstr "Messages du journal" + +#: Programs/config.c:607 msgid "Log the versions of the core, API, and built-in drivers, and then exit." msgstr "Enregistre les versions de l'application principale, de l'API, des pilotes intégrés puis quitter" -#: Programs/config.c:561 +#: Programs/config.c:572 msgid "Log to standard error rather than to the system log." msgstr "Enregistre sur l'erreur standard plutôt que sur le journal du système." -#: Programs/config.c:575 +#: Programs/config.c:586 #, c-format msgid "Logging level (%s or one of {%s}) and/or log categories to enable (any combination of {%s}, each optionally prefixed by %s to disable)" msgstr "Niveau de journalisation (%s ou un parmi {%s}) et/ou catégories de journal à activer (n'importe quelle combinaison de {%s}, chacune précédée éventuellement de %s pour la désactiver)" -#: Programs/menu_prefs.c:725 +#: Programs/menu_prefs.c:801 msgid "Long Press Time" msgstr "Durée d'appui prolongée" -#: Programs/menu_prefs.c:581 Programs/menu_prefs.c:758 +#: Programs/menu_prefs.c:630 Programs/menu_prefs.c:834 msgid "Low" msgstr "Faible" -#: Programs/menu_prefs.c:513 +#: Programs/menu_prefs.c:562 msgid "Lower Left Dot" msgstr "Point en bas à gauche" -#: Programs/menu_prefs.c:514 +#: Programs/menu_prefs.c:563 msgid "Lower Right Dot" msgstr "Point en bas à droite" -#: Programs/menu_prefs.c:830 +#: Programs/menu_prefs.c:906 msgid "MIDI" msgstr "MIDI" -#: Programs/config.c:545 +#: Programs/config.c:556 msgid "MIDI (Musical Instrument Digital Interface) device specifier." msgstr "Identifiant du périphérique MIDI (Musical Instrument Digital Interface)." -#: Programs/menu_prefs.c:860 +#: Programs/menu_prefs.c:936 msgid "MIDI Instrument" msgstr "Instrument MIDI" -#: Programs/menu_prefs.c:850 +#: Programs/menu_prefs.c:926 msgid "MIDI Volume" msgstr "Volume MIDI" -#: Programs/cmd_miscellaneous.c:60 +#: Programs/cmd_miscellaneous.c:59 msgid "March" msgstr "Mars" @@ -942,19 +988,19 @@ msgid "Marimba" msgstr "Marimba" -#: Programs/menu_prefs.c:584 Programs/menu_prefs.c:761 +#: Programs/menu_prefs.c:633 Programs/menu_prefs.c:837 msgid "Maximum" msgstr "Maximum" -#: Programs/brltty-ctb.c:94 +#: Programs/brltty-ctb.c:90 msgid "Maximum length of an output line." msgstr "Longueur maximale d'une ligne d'affichage" -#: Programs/cmd_miscellaneous.c:62 +#: Programs/cmd_miscellaneous.c:61 msgid "May" msgstr "Mai" -#: Programs/menu_prefs.c:582 Programs/menu_prefs.c:759 +#: Programs/menu_prefs.c:631 Programs/menu_prefs.c:835 msgid "Medium" msgstr "Moyenne" @@ -962,19 +1008,19 @@ msgid "Melodic Tom" msgstr "tom mélodique" -#: Programs/menu_prefs.c:526 +#: Programs/menu_prefs.c:575 msgid "Menu Options" msgstr "Options du menu" -#: Programs/config.c:554 +#: Programs/config.c:565 msgid "Message hold timeout (in 10ms units)." msgstr "Durée d'apparition du message (par unités de 10ms)." -#: Programs/menu_prefs.c:580 Programs/menu_prefs.c:757 +#: Programs/menu_prefs.c:629 Programs/menu_prefs.c:833 msgid "Minimum" msgstr "Minimum" -#: Programs/menu_prefs.c:1071 +#: Programs/menu_prefs.c:1147 msgid "Month Day Year" msgstr "Mois Jour Année" @@ -982,7 +1028,7 @@ msgid "Music Box" msgstr "Boîte à musique" -#: Programs/menu_prefs.c:830 +#: Programs/menu_prefs.c:906 msgid "Musical Instrument Digital Interface" msgstr "Interface numérique d'instrument de musique" @@ -990,58 +1036,59 @@ msgid "Muted Trumpet" msgstr "Trompette bouchée" -#: Programs/config.c:446 +#: Programs/config.c:456 msgid "Name of or path to attributes table." msgstr "Nom ou chemin vers la table d'attributs." -#: Programs/config.c:455 +#: Programs/config.c:465 msgid "Name of or path to contraction table." msgstr "Nom ou chemin vers la table de braille abrégé." -#: Programs/config.c:336 +#: Programs/config.c:328 msgid "Name of or path to default preferences file." msgstr "Nom ou chemin vers le fichier des préférences par défaut." -#: Programs/config.c:464 +#: Programs/config.c:474 msgid "Name of or path to keyboard table." msgstr "Nom ou chemin vers le fichier de la table de touches." -#: Programs/config.c:500 +#: Programs/config.c:510 msgid "Name of or path to speech input object." msgstr "Nom ou chemin vers l'objet d'entrée de la synthèse." -#: Programs/config.c:437 +#: Programs/config.c:447 #, c-format msgid "Name of or path to text table (or %s)." msgstr "Nom ou chemin vers la table de caractères" -#: Programs/menu_prefs.c:668 +#: Programs/menu_prefs.c:717 msgid "Navigation Options" msgstr "Options de navigation" -#: Programs/menu.c:443 +#: Programs/menu.c:449 msgid "No" msgstr "Non" -#: Programs/menu_prefs.c:567 +#: Programs/menu_prefs.c:616 msgid "No Capitalization" msgstr "Pas de mise en majuscule" -#: Programs/menu_prefs.c:913 Programs/menu_prefs.c:926 -#: Programs/menu_prefs.c:939 Programs/menu_prefs.c:1059 -#: Programs/menu_prefs.c:1098 Programs/menu_prefs.c:1118 +#: Programs/menu_prefs.c:759 Programs/menu_prefs.c:989 +#: Programs/menu_prefs.c:1002 Programs/menu_prefs.c:1015 +#: Programs/menu_prefs.c:1135 Programs/menu_prefs.c:1174 +#: Programs/menu_prefs.c:1194 msgid "None" msgstr "Aucune" -#: Programs/menu_prefs.c:787 +#: Programs/menu_prefs.c:863 msgid "Normal" msgstr "Normal" -#: Programs/menu_prefs.c:1255 +#: Programs/menu_prefs.c:1331 msgid "Notice" msgstr "Remarque" -#: Programs/cmd_miscellaneous.c:68 +#: Programs/cmd_miscellaneous.c:67 msgid "November" msgstr "Novembre" @@ -1053,11 +1100,15 @@ msgid "Ocarina" msgstr "Ocarina" -#: Programs/cmd_miscellaneous.c:67 +#: Programs/cmd_miscellaneous.c:66 msgid "October" msgstr "Octobre" -#: Programs/config.c:1407 +#: Programs/menu_prefs.c:788 +msgid "Off" +msgstr "Inactif" + +#: Programs/config.c:1471 msgid "Old Preferences File" msgstr "Ancien fichier des préférences" @@ -1073,7 +1124,7 @@ msgid "Organ" msgstr "Orgue" -#: Programs/log.c:71 +#: Programs/log.c:73 msgid "Output Packets" msgstr "Paquets sortants" @@ -1085,15 +1136,15 @@ msgid "PC mode" msgstr "Mode PC" -#: Programs/menu_prefs.c:829 +#: Programs/menu_prefs.c:905 msgid "PCM" msgstr "PCM" -#: Programs/config.c:535 +#: Programs/config.c:546 msgid "PCM (soundcard digital audio) device specifier." msgstr "Identifiant du périphérique PCM (carte son numérique)" -#: Programs/menu_prefs.c:842 +#: Programs/menu_prefs.c:918 msgid "PCM Volume" msgstr "Volume PCM" @@ -1101,11 +1152,11 @@ msgid "PS/2 (set 3) keyboard scan code" msgstr "Scancode de clavier PS/2 (réglé à 3)" -#: Programs/menu_prefs.c:1193 +#: Programs/menu_prefs.c:1269 msgid "Package Revision" msgstr "Révision du paquet" -#: Programs/menu_prefs.c:1188 +#: Programs/menu_prefs.c:1264 msgid "Package Version" msgstr "Version du paquet" @@ -1146,68 +1197,68 @@ msgid "Pan Flute" msgstr "Flûte de pan" -#: Programs/config.c:373 +#: Programs/config.c:383 msgid "Parameters for the application programming interface." msgstr "Paramètres pour l'interface de programmation de l'application." -#: Programs/config.c:395 +#: Programs/config.c:405 msgid "Parameters for the braille driver." msgstr "Paramètres pour le pilote braille." -#: Programs/config.c:526 +#: Programs/config.c:537 msgid "Parameters for the screen driver." msgstr "Paramètres pour le pilote de l'écran." -#: Programs/config.c:492 +#: Programs/config.c:502 msgid "Parameters for the speech driver." msgstr "Paramètres pour le pilote de synthèse vocale." -#: Programs/config.c:317 +#: Programs/config.c:319 msgid "Path to default settings file." msgstr "Chemin du fichier des paramètres par défaut." -#: Programs/config.c:356 +#: Programs/config.c:366 msgid "Path to directory containing drivers." msgstr "Chemin vers le répertoire contenant les pilotes." -#: Programs/brltest.c:72 Programs/brltty-atb.c:36 Programs/brltty-ctb.c:58 -#: Programs/brltty-ktb.c:79 Programs/config.c:427 +#: Programs/brltest.c:68 Programs/brltty-atb.c:36 Programs/brltty-ctb.c:54 +#: Programs/brltty-ktb.c:77 Programs/config.c:437 msgid "Path to directory containing tables." msgstr "Chemin du répertoire contenant les tables." -#: Programs/brltty-ttb.c:151 +#: Programs/brltty-ttb.c:152 msgid "Path to directory containing text tables." msgstr "Chemin du répertoire contenant les tables de caractères." -#: Programs/brltty-ktb.c:69 +#: Programs/brltty-ktb.c:87 msgid "Path to directory for loading drivers." msgstr "Chemin du répertoire de chargement des pilotes." -#: Programs/brltty-trtxt.c:50 +#: Programs/brltty-trtxt.c:51 msgid "Path to directory for text tables." msgstr "Chemin du répertoire des tables de texte" -#: Programs/brltest.c:82 /tmp/src/brltty/Programs/config.c:346 +#: Programs/brltest.c:78 Programs/config.c:356 msgid "Path to directory which can be written to." msgstr "Chemin du répertoire où il est possible d'écrire." -#: Programs/config.c:327 +#: Programs/config.c:346 msgid "Path to directory which contains files that can be updated." msgstr "Chemin du répertoire où des fichiers peuvent être mis à jour." -#: Programs/brltty-trtxt.c:59 +#: Programs/brltty-trtxt.c:60 msgid "Path to input text table." msgstr "Chemin de la table de saisie de texte." -#: Programs/config.c:584 +#: Programs/config.c:595 msgid "Path to log file." msgstr "Chemin du fichier journal." -#: Programs/brltty-trtxt.c:68 +#: Programs/brltty-trtxt.c:69 msgid "Path to output text table." msgstr "Chemin de la table de texte affiché" -#: Programs/config.c:593 +#: Programs/config.c:309 msgid "Path to process identifier file." msgstr "Chemin du fichier d'identifiants de processus." @@ -1236,39 +1287,39 @@ msgid "Pizzicato Strings" msgstr "Pizzicati" -#: Drivers/Braille/Baum/braille.c:1075 +#: Drivers/Braille/Baum/braille.c:1076 msgid "Powerdown" msgstr "Extinction" -#: Programs/config.c:2567 Programs/menu_prefs.c:1223 +#: Programs/config.c:2621 Programs/menu_prefs.c:1299 msgid "Preferences File" msgstr "Fichier des préférences" -#: Programs/scr_menu.c:264 +#: Programs/scr_menu.c:268 msgid "Preferences Menu" msgstr "Menu des préférences" -#: Headers/options.h:74 +#: Headers/options.h:75 msgid "Print a usage summary (all options), and then exit." msgstr "Afficher un résumé de l'utilisation (toutes les options) et quitter." -#: Headers/options.h:69 +#: Headers/options.h:70 msgid "Print a usage summary (commonly used options only), and then exit." msgstr "Affiche un résumé de l'utilisation (seulement les options couramment utilisées), puis quitte." -#: Programs/menu_prefs.c:1174 +#: Programs/menu_prefs.c:1250 msgid "Profiles" msgstr "Profils" -#: Programs/config.c:472 +#: Programs/config.c:482 msgid "Properties of eligible keyboards." msgstr "Propriétés des claviers éligibles." -#: Programs/menu_prefs.c:930 +#: Programs/menu_prefs.c:1006 msgid "Raise Pitch" msgstr "Augmenter le ton" -#: Programs/config.c:276 +#: Programs/config.c:269 msgid "Recognize environment variables." msgstr "Reconnaît les variables d'environnement." @@ -1284,44 +1335,48 @@ msgid "Reed Organ" msgstr "Orgue à hanche" -#: Programs/brltty-ctb.c:86 +#: Programs/brltty-ctb.c:82 msgid "Reformat input." msgstr "Entrée de reformatage." -#: Programs/config.c:417 +#: Programs/config.c:427 msgid "Release braille device when screen or window is unreadable." msgstr "Abandonne le périphérique braille quand il n'est pas possible de lire l'écran ou la fenêtre." -#: Programs/config.c:283 +#: Programs/config.c:276 msgid "Remain a foreground process." msgstr "Rappelle un processus en tâche de fond." -#: Programs/brltty-trtxt.c:75 +#: Programs/brltty-trtxt.c:76 msgid "Remove dots seven and eight." msgstr "Supprime les points sept et huit" -#: Programs/config.c:298 +#: Programs/config.c:291 #, c-format msgid "Remove the %s service, and then exit." msgstr "Supprime le service %s et quitte." -#: Programs/brltty-ttb.c:185 +#: Programs/brltty-ktb.c:46 +msgid "Report problems with the key table." +msgstr "Signaler des problèmes avec la table de touches." + +#: Programs/brltty-ttb.c:186 msgid "Report the characters within the current screen font that aren't defined within the text table." -msgstr "" +msgstr "Signale les caractères dans une police à l'écran n'ayant pas été définis dans la table de caractères" -#: Programs/menu_prefs.c:684 +#: Programs/menu_prefs.c:733 msgid "Rest of Line" msgstr "Reste de la ligne" -#: Programs/menu_prefs.c:1322 +#: Programs/menu_prefs.c:1398 msgid "Restart Braille Driver" msgstr "Redémarre le pilote braille" -#: Programs/menu_prefs.c:1334 +#: Programs/menu_prefs.c:1410 msgid "Restart Screen Driver" msgstr "Redémarre le pilote de l'écran" -#: Programs/menu_prefs.c:1328 +#: Programs/menu_prefs.c:1404 msgid "Restart Speech Driver" msgstr "Redémarre le pilote de synthèse vocale" @@ -1329,7 +1384,7 @@ msgid "Reverse Cymbal" msgstr "Cymballes renversées" -#: Programs/menu_prefs.c:1100 +#: Programs/menu_prefs.c:1176 msgid "Right" msgstr "Droite" @@ -1337,77 +1392,77 @@ msgid "Rock Organ" msgstr "Orgue de rock" -#: Programs/menu_prefs.c:788 +#: Programs/menu_prefs.c:864 msgid "Rotated" msgstr "Cyclique" -#: Programs/menu_prefs.c:521 +#: Programs/menu_prefs.c:570 msgid "Save on Exit" msgstr "Enregistrer en quittant" #. "cap" here, used during speech output, is short for "capital". #. It is spoken just before an uppercase letter, e.g. "cap A". -#: Programs/menu_prefs.c:929 +#: Programs/menu_prefs.c:1005 msgid "Say Cap" msgstr "Dire l'état du verrouillage majuscule" -#: Programs/menu_prefs.c:953 +#: Programs/menu_prefs.c:1029 msgid "Say Line Mode" msgstr "Mode Dire la ligne" -#: Programs/menu_prefs.c:940 +#: Programs/menu_prefs.c:1016 msgid "Say Space" msgstr "Dire les espaces" -#: Programs/menu_prefs.c:436 +#: Programs/menu_prefs.c:445 msgid "Screen Cursor Column" msgstr "Colonne du curseur de l'écran" -#: Programs/menu_prefs.c:435 +#: Programs/menu_prefs.c:444 msgid "Screen Cursor Coordinates" msgstr "Coordonnées du curseur de l'écran" -#: Programs/menu_prefs.c:621 +#: Programs/menu_prefs.c:670 msgid "Screen Cursor Invisible Time" msgstr "Durée d'invisibilité du curseur d'écran" -#: Programs/menu_prefs.c:437 +#: Programs/menu_prefs.c:446 msgid "Screen Cursor Row" msgstr "Ligne du curseur de l'écran" -#: Programs/menu_prefs.c:603 +#: Programs/menu_prefs.c:652 msgid "Screen Cursor Style" msgstr "Apparence du curseur de l'écran" -#: Programs/menu_prefs.c:615 +#: Programs/menu_prefs.c:664 msgid "Screen Cursor Visible Time" msgstr "Durée de visibilité du curseur de l'écran" -#: Programs/menu_prefs.c:438 +#: Programs/menu_prefs.c:447 msgid "Screen Cursor and Braille Window Column" msgstr "Colonne du curseur de l'écran et de la fenêtre braille" -#: Programs/menu_prefs.c:439 +#: Programs/menu_prefs.c:448 msgid "Screen Cursor and Braille Window Row" msgstr "Ligne du curseur de l'écran et de la fenêtre braille" -#: Programs/config.c:2057 +#: Programs/config.c:2112 msgid "Screen Driver" msgstr "Pilote de l'écran" -#: Programs/log.c:155 +#: Programs/log.c:157 msgid "Screen Driver Events" msgstr "Événements du pilote de l'écran" -#: Programs/menu_prefs.c:440 +#: Programs/menu_prefs.c:449 msgid "Screen Number" msgstr "Numéro de l'écran" -#: Programs/config.c:2063 +#: Programs/config.c:2118 msgid "Screen Parameter" msgstr "Paramètre de l'écran" -#: Programs/config.c:516 +#: Programs/config.c:527 #, c-format msgid "Screen driver code (%s, %s, or one of {%s})." msgstr "Code du pilote de l'écran : (%s, %s, ou un parmi {%s})." @@ -1416,15 +1471,15 @@ msgid "Seashore" msgstr "Bord de mer" -#: Programs/cmd_miscellaneous.c:66 +#: Programs/cmd_miscellaneous.c:65 msgid "September" msgstr "Septembre" -#: Programs/log.c:125 +#: Programs/log.c:127 msgid "Serial I/O" msgstr "E/S sçrie" -#: Programs/log.c:119 +#: Programs/log.c:121 msgid "Server Events" msgstr "Événements du serveur" @@ -1440,31 +1495,31 @@ msgid "Shanai" msgstr "Shanai" -#: Programs/menu_prefs.c:534 +#: Programs/menu_prefs.c:583 msgid "Show Advanced Submenus" msgstr "Afficher les sous-menus avancés" -#: Programs/menu_prefs.c:539 +#: Programs/menu_prefs.c:588 msgid "Show All Items" msgstr "Afficher tous les éléments" -#: Programs/menu_prefs.c:627 +#: Programs/menu_prefs.c:676 msgid "Show Attributes" msgstr "Afficher les attributs" -#: Programs/menu_prefs.c:598 +#: Programs/menu_prefs.c:647 msgid "Show Screen Cursor" msgstr "Afficher le curseur de l'écran" -#: Programs/menu_prefs.c:1053 +#: Programs/menu_prefs.c:1129 msgid "Show Seconds" msgstr "Afficher les secondes" -#: Programs/menu_prefs.c:999 +#: Programs/menu_prefs.c:1075 msgid "Show Speech Cursor" msgstr "Afficher le curseur de la synthèse" -#: Programs/menu_prefs.c:529 +#: Programs/menu_prefs.c:578 msgid "Show Submenu Sizes" msgstr "Afficher la taille des sous-menus" @@ -1473,15 +1528,15 @@ msgid "Sitar" msgstr "Cithare" -#: Programs/menu_prefs.c:676 +#: Programs/menu_prefs.c:725 msgid "Skip Blank Braille Windows" msgstr "Passer les fenêtres braille vierges" -#: Programs/menu_prefs.c:671 +#: Programs/menu_prefs.c:720 msgid "Skip Identical Lines" msgstr "Passer les lignes identiques" -#: Programs/menu_prefs.c:687 +#: Programs/menu_prefs.c:736 msgid "Skip Which Blank Braille Windows" msgstr "Quelles fenêtres braille vierges sauter." @@ -1493,15 +1548,15 @@ msgid "Slap Bass 2" msgstr "Basse frappée 2" -#: Programs/menu_prefs.c:1083 +#: Programs/menu_prefs.c:1159 msgid "Slash" msgstr "Barre oblique" -#: Programs/menu_prefs.c:692 +#: Programs/menu_prefs.c:741 msgid "Sliding Braille Window" msgstr "Faire défiler la fenêtre" -#: Programs/menu_prefs.c:914 +#: Programs/menu_prefs.c:990 msgid "Some" msgstr "Quelques" @@ -1514,133 +1569,133 @@ msgid "Sound Effects" msgstr "Effets sonore" -#: Programs/menu_prefs.c:1119 +#: Programs/menu_prefs.c:1195 msgid "Space" msgstr "Espace" -#: Programs/menu_prefs.c:993 +#: Programs/menu_prefs.c:1069 msgid "Speak Completed Words" msgstr "Dire les mots complétés" -#: Programs/menu_prefs.c:981 +#: Programs/menu_prefs.c:1057 msgid "Speak Deleted Characters" msgstr "Dire les caractères effacés" -#: Programs/menu_prefs.c:975 +#: Programs/menu_prefs.c:1051 msgid "Speak Inserted Characters" msgstr "Dire les caractères insérés" -#: Programs/menu_prefs.c:987 +#: Programs/menu_prefs.c:1063 msgid "Speak Replaced Characters" msgstr "Dire les caractères remplacés" -#: Programs/menu_prefs.c:969 +#: Programs/menu_prefs.c:1045 msgid "Speak Selected Character" msgstr "Dire le caractère sélectionné" -#: Programs/menu_prefs.c:963 +#: Programs/menu_prefs.c:1039 msgid "Speak Selected Line" msgstr "Lire la ligne sélectionnée" -#: Programs/menu_prefs.c:1022 +#: Programs/menu_prefs.c:1098 msgid "Speech Cursor Invisible Time" msgstr "Durée d'invisibilité du curseur" -#: Programs/menu_prefs.c:1004 +#: Programs/menu_prefs.c:1080 msgid "Speech Cursor Style" msgstr "Apparence du curseur de la synthèse" -#: Programs/menu_prefs.c:1016 +#: Programs/menu_prefs.c:1092 msgid "Speech Cursor Visible Time" msgstr "Durée de visibilité du curseur de la synthèse" -#: Programs/config.c:1825 +#: Programs/config.c:1880 msgid "Speech Driver" msgstr "Pilote de synthèse vocale" -#: Programs/log.c:149 +#: Programs/log.c:151 msgid "Speech Driver Events" msgstr "Événements du pilote de synthèse vocale" -#: Programs/log.c:107 +#: Programs/log.c:109 msgid "Speech Events" msgstr "Événements liés à la parole" #. Create the file system object for speech input. -#: Programs/config.c:2687 +#: Programs/config.c:2720 msgid "Speech Input" msgstr "Entrée de la parole" -#: Programs/menu_prefs.c:888 +#: Programs/menu_prefs.c:964 msgid "Speech Options" msgstr "Options de la synthèse" -#: Programs/config.c:1828 +#: Programs/config.c:1883 msgid "Speech Parameter" msgstr "Paramètre de synthèse vocale" -#: Programs/menu_prefs.c:905 +#: Programs/menu_prefs.c:981 msgid "Speech Pitch" msgstr "Ton de la voix" -#: Programs/menu_prefs.c:918 +#: Programs/menu_prefs.c:994 msgid "Speech Punctuation" msgstr "Ponctuation pour la synthèse" -#: Programs/menu_prefs.c:898 +#: Programs/menu_prefs.c:974 msgid "Speech Rate" msgstr "Vitesse de la synthèse" -#: Programs/menu_prefs.c:933 +#: Programs/menu_prefs.c:1009 msgid "Speech Uppercase Indicator" msgstr "Indicateur vocal de majuscules" -#: Programs/menu_prefs.c:891 +#: Programs/menu_prefs.c:967 msgid "Speech Volume" msgstr "Volume de la synthèse" -#: Programs/menu_prefs.c:943 +#: Programs/menu_prefs.c:1019 msgid "Speech Whitespace Indicator" msgstr "Indicateur vocal d'espace insécable" -#: Programs/config.c:482 +#: Programs/config.c:492 #, c-format msgid "Speech driver code (%s, %s, or one of {%s})." msgstr "Code du pilote de synthèse : (%s, %s, ou un parmi {%s})." -#: Programs/menu_prefs.c:1269 +#: Programs/menu_prefs.c:1345 msgid "Standard Error Log Level" msgstr "Niveau standard de journalisation des erreurs" -#: Programs/menu_prefs.c:441 +#: Programs/menu_prefs.c:450 msgid "State Dots" msgstr "Points d'état" -#: Programs/menu_prefs.c:442 +#: Programs/menu_prefs.c:451 msgid "State Letter" msgstr "Lettre d'état" -#: Programs/menu_prefs.c:1094 +#: Programs/menu_prefs.c:1170 msgid "Status Cells" msgstr "Cellules d'état" -#: Programs/menu_prefs.c:1110 +#: Programs/menu_prefs.c:1186 msgid "Status Count" msgstr "Nombre d'états" -#: Programs/menu_prefs.c:450 +#: Programs/menu_prefs.c:459 msgid "Status Field" msgstr "Champ de l'état" -#: Programs/menu_prefs.c:1103 +#: Programs/menu_prefs.c:1179 msgid "Status Position" msgstr "Position de l'état" -#: Programs/menu_prefs.c:1125 +#: Programs/menu_prefs.c:1201 msgid "Status Separator" msgstr "Séparateur de l'état" -#: Programs/menu_prefs.c:1121 +#: Programs/menu_prefs.c:1197 msgid "Status Side" msgstr "Limite de l'état" @@ -1648,7 +1703,7 @@ msgid "Steel Drums" msgstr "Batterie métal" -#: Programs/config.c:306 +#: Programs/config.c:299 #, c-format msgid "Stop an existing instance of %s, and then exit." msgstr "Arrêter une session de %s en cours et quitter." @@ -1666,11 +1721,11 @@ msgid "Strings" msgstr "Cordes" -#: Programs/menu_prefs.c:569 +#: Programs/menu_prefs.c:618 msgid "Superimpose Dot 7" msgstr "Point 7 superposé" -#: Programs/config.c:567 +#: Programs/config.c:578 msgid "Suppress start-up messages." msgstr "Supprime les messages au démarrage." @@ -1718,11 +1773,11 @@ msgid "SynthStrings 2" msgstr "Cordes synthétiques 2" -#: Programs/menu_prefs.c:1264 +#: Programs/menu_prefs.c:1340 msgid "System Log Level" msgstr "Niveau de journalisation du système" -#: Programs/config.c:2570 Programs/menu_prefs.c:1238 +#: Programs/config.c:2627 Programs/menu_prefs.c:1314 msgid "Tables Directory" msgstr "Répertoire des tables" @@ -1742,39 +1797,39 @@ msgid "Tenor Sax" msgstr "Saxo tenor" -#: Programs/menu_prefs.c:595 +#: Programs/menu_prefs.c:644 msgid "Text Indicators" msgstr "Indicateurs de texte" -#: Programs/menu_prefs.c:1122 +#: Programs/menu_prefs.c:1198 msgid "Text Side" msgstr "Limite du texte" -#: Programs/menu_prefs.c:554 +#: Programs/menu_prefs.c:603 msgid "Text Style" msgstr "Apparence du texte" -#: Programs/config.c:2597 Programs/menu_prefs.c:1150 +#: Programs/config.c:2652 Programs/menu_prefs.c:1226 msgid "Text Table" msgstr "Table de texte" -#: Programs/brltty-ctb.c:73 +#: Programs/brltty-ctb.c:69 msgid "Text table." msgstr "Table de caractères." -#: Programs/menu_prefs.c:443 +#: Programs/menu_prefs.c:452 msgid "Time" msgstr "Heure" -#: Programs/menu_prefs.c:1038 +#: Programs/menu_prefs.c:1114 msgid "Time Format" msgstr "Format de l'heure" -#: Programs/menu_prefs.c:1030 +#: Programs/menu_prefs.c:1106 msgid "Time Presentation" msgstr "Présentation de l'heure" -#: Programs/menu_prefs.c:1048 +#: Programs/menu_prefs.c:1124 msgid "Time Separator" msgstr "Séparateur de l'heure" @@ -1787,23 +1842,23 @@ msgid "Tinkle Bell" msgstr "Tintement de cloches" -#: Programs/menu_prefs.c:1318 +#: Programs/menu_prefs.c:1394 msgid "Tools" msgstr "Outils" -#: Programs/menu_prefs.c:750 +#: Programs/menu_prefs.c:826 msgid "Touch Navigation" msgstr "Navigation tactile" -#: Programs/menu_prefs.c:764 +#: Programs/menu_prefs.c:840 msgid "Touch Sensitivity" msgstr "Sensibilité du tactile" -#: Programs/menu_prefs.c:710 +#: Programs/menu_prefs.c:772 msgid "Track Screen Pointer" msgstr "Poursuivre le pointeur de l'écran" -#: Programs/menu_prefs.c:777 +#: Programs/menu_prefs.c:853 msgid "Translated via Text Table" msgstr "Traduit via la table de caractères" @@ -1828,35 +1883,35 @@ msgid "Tubular Bells" msgstr "Cloches tubulaires" -#: Programs/menu_prefs.c:834 +#: Programs/menu_prefs.c:910 msgid "Tune Device" msgstr "Périphérique pour les sons" -#: Programs/log.c:131 +#: Programs/log.c:133 msgid "USB I/O" msgstr "E/S USB" -#: Programs/menu_prefs.c:511 +#: Programs/menu_prefs.c:560 msgid "Underline" msgstr "Souligné" -#: Programs/alert.c:351 +#: Programs/alert.c:102 msgid "Unfrozen" msgstr "Dégelé" -#: Programs/config.c:2566 Programs/menu_prefs.c:1218 +#: Programs/config.c:2624 Programs/menu_prefs.c:1294 msgid "Updatable Directory" msgstr "Répertoire qu'on peut mettre à jour" -#: Programs/log.c:101 +#: Programs/log.c:103 msgid "Update Events" msgstr "Événements de mise à jour" -#: Programs/options.c:136 +#: Programs/options.c:135 msgid "Usage" msgstr "Utilisation" -#: Programs/menu_prefs.c:568 +#: Programs/menu_prefs.c:617 msgid "Use Capital Sign" msgstr "Utilisation du signe majuscule" @@ -1877,11 +1932,11 @@ msgid "Voice Oohs" msgstr "Hoos vocaux" -#: Programs/menu_prefs.c:1254 +#: Programs/menu_prefs.c:1330 msgid "Warning" msgstr "Attention" -#: Programs/menu_prefs.c:1198 +#: Programs/menu_prefs.c:1274 msgid "Web Site" msgstr "Site Öeb" @@ -1893,28 +1948,23 @@ msgid "Woodblock" msgstr "bloc de boip" -#: Programs/config.c:2558 +#: Programs/config.c:2613 msgid "Working Directory" msgstr "Répertoire de travail" -#: Programs/config.c:2568 Programs/menu_prefs.c:1228 +#: Programs/config.c:2625 Programs/menu_prefs.c:1304 msgid "Writable Directory" msgstr "Répertoire accessible en écriture" -#: Programs/config.c:599 +#: Programs/config.c:601 msgid "Write the start-up logs, and then exit." msgstr "Écrit les journaux de démarrage et quitte." -#: Programs/xbrlapi.c:312 -#, c-format -msgid "X Error %d, %s on display %s\n" -msgstr "Erreur X %d, %s sur l'afficheur %s\n" - -#: Programs/xbrlapi.c:97 +#: Programs/xbrlapi.c:99 msgid "X display to connect to" msgstr "Afficheur X auquel se connecter" -#: Programs/xbrlapi.c:644 +#: Programs/xbrlapi.c:713 msgid "XFree(wm_name) for change" msgstr "Pour changer XFree(wm_name)" @@ -1926,23 +1976,23 @@ msgid "Xylophone" msgstr "Xylophone" -#: Programs/menu_prefs.c:1070 +#: Programs/menu_prefs.c:1146 msgid "Year Month Day" msgstr "Année Mois Jour" -#: Programs/menu.c:444 +#: Programs/menu.c:450 msgid "Yes" msgstr "Oui" -#: Programs/xbrlapi.c:81 +#: Programs/xbrlapi.c:83 msgid "[host][:port]" msgstr "[hôte][:port]" -#: Programs/menu_prefs.c:512 +#: Programs/menu_prefs.c:561 msgid "all dots" msgstr "Tous les points" -#: Programs/cmd_miscellaneous.c:132 +#: Programs/cmd_miscellaneous.c:121 msgid "and" msgstr "et" @@ -1954,7 +2004,7 @@ msgid "append to clipboard from character" msgstr "ajoute le caractère au presse-papier" -#: Programs/cmd.c:296 +#: Programs/cmd.c:290 msgid "at cursor" msgstr "au curseur" @@ -1962,17 +2012,7 @@ msgid "backspace key" msgstr "Touche retour arrière" -#: Programs/xbrlapi.c:354 -#, c-format -msgid "bad format for VT number\n" -msgstr "Mauvais format de numéro de terminal virtuel\n" - -#: Programs/xbrlapi.c:357 -#, c-format -msgid "bad type for VT number\n" -msgstr "Mauvais type de numéro de terminal virtuel\n" - -#: Drivers/Braille/Baum/braille.c:1065 Drivers/Braille/TSI/braille.c:869 +#: Drivers/Braille/Baum/braille.c:1067 Drivers/Braille/TSI/braille.c:869 msgid "battery low" msgstr "Batterie faible" @@ -1989,20 +2029,20 @@ msgstr "Envoie au terminal virtuel précédent" #. -#: Programs/cmd_utils.c:96 +#: Programs/cmd_utils.c:109 msgid "black" msgstr "noir" -#: Programs/cmd_utils.c:120 +#: Programs/cmd_utils.c:133 msgid "blink" msgstr "clignotant" #. B -#: Programs/cmd_utils.c:97 +#: Programs/cmd_utils.c:110 msgid "blue" msgstr "bleu" -#: Programs/config.c:2659 +#: Programs/config.c:2692 #, c-format msgid "braille device not specified" msgstr "Périphérique braille non spécifié" @@ -2011,15 +2051,15 @@ msgid "braille display temporarily unavailable" msgstr "Afficheur braille temporairement non disponible" -#: Programs/config.c:1347 +#: Programs/config.c:1412 msgid "braille driver initialization failed" msgstr "Échec de l'initialisation du pilote braille" -#: Programs/config.c:1421 +#: Programs/config.c:1488 msgid "braille driver not loadable" msgstr "Impossible de charger le pilote braille" -#: Programs/cmd_miscellaneous.c:194 +#: Programs/cmd_miscellaneous.c:178 msgid "braille stopped" msgstr "Braille arrêté" @@ -2036,7 +2076,7 @@ msgstr "Amène le curseur de l'écran au curseur de synthèse" #. RG -#: Programs/cmd_utils.c:102 +#: Programs/cmd_utils.c:115 msgid "brown" msgstr "marron" @@ -2044,33 +2084,38 @@ msgid "cannot compile attributes table" msgstr "Ne peut pas compiler la table des attributs" -#: Programs/config.c:784 +#: Programs/config.c:786 msgid "cannot compile contraction table" msgstr "Ne peut pas compiler la table de braille abrégé" -#: Programs/config.c:1328 +#: Programs/config.c:1393 msgid "cannot compile key table" msgstr "Ne peut pas compiler la table des touches" -#: Programs/config.c:1025 +#: Programs/config.c:1027 msgid "cannot compile keyboard table" msgstr "Ne peut pas compiler la table des touches" -#: Programs/ttb_translate.c:216 +#: Programs/ttb_translate.c:223 msgid "cannot compile text table" msgstr "Ne peut pas compiler la table des texte" -#: Programs/xbrlapi.c:178 +#. This is the first attempt to connect to BRLTTY, and it failed. +#. * Return the error immediately to the user, to provide feedback to users +#. * running xbrlapi by hand, but not fill logs, eat battery, spam +#. * 127.0.0.1 with reconnection attempts. +#. +#: Programs/xbrlapi.c:187 #, c-format -msgid "cannot connect to brltty at %s\n" -msgstr "Ne peut pas se connecter à brltty sur %s\n" +msgid "cannot connect to braille devices daemon brltty at %s\n" +msgstr "Ne peut pas se connecter au démon des périphériques braille de brltty sur %s\n" -#: Programs/xbrlapi.c:524 +#: Programs/xbrlapi.c:588 #, c-format msgid "cannot connect to display %s\n" msgstr "Ne peut pas se connecter à l'afficheur %s\n" -#: Programs/file.c:333 +#: Programs/file.c:334 msgid "cannot create directory" msgstr "Ne peut pas créer de répertoire" @@ -2079,7 +2124,7 @@ msgid "cannot determine program directory" msgstr "Ne peut pas déterminer le répertoire du programme" -#: Programs/config.c:2561 /tmp/src/brltty/Programs/menu.c:538 +#: Programs/config.c:2616 Programs/menu.c:544 msgid "cannot determine working directory" msgstr "Ne peut pas déterminer le répertoire de travail" @@ -2091,30 +2136,25 @@ msgid "cannot fix install path" msgstr "Ne peut pas corriger le chemin d'installation" -#: Programs/xbrlapi.c:336 -#, c-format -msgid "cannot get root window XFree86_VT property\n" -msgstr "Ne peut pas trouver la propriété de la fenêtre racine XFree86_VT\n" - -#: Programs/xbrlapi.c:196 +#: Programs/xbrlapi.c:219 msgid "cannot get tty\n" msgstr "Ne peut pas récupérer de tty\n" -#: Programs/xbrlapi.c:199 +#: Programs/xbrlapi.c:225 #, c-format msgid "cannot get tty %d\n" msgstr "Ne peut pas récupérer le tty %d\n" -#: Programs/file.c:456 +#: Programs/file.c:457 msgid "cannot get working directory" msgstr "Ne peut pas obtenir de répertoire de travail" -#: Programs/xbrlapi.c:568 +#: Programs/xbrlapi.c:631 #, c-format msgid "cannot grab windows on screen %d\n" msgstr "Ne peut pas extraire de fenêtres sur l'écran %d\n" -#: Programs/xbrlapi.c:203 +#: Programs/xbrlapi.c:232 msgid "cannot ignore keys\n" msgstr "Ne peut pas ignorer des touches\n" @@ -2126,11 +2166,11 @@ msgid "cannot load library" msgstr "Ne peut pas charger la bibliothèque" -#: Programs/ttb_translate.c:233 +#: Programs/ttb_translate.c:240 msgid "cannot load text table" msgstr "Ne peut pas charger la table de texte" -#: Programs/config.c:982 +#: Programs/config.c:984 msgid "cannot open key help" msgstr "Ne peut pas ouvrir l'aide de la touche" @@ -2138,43 +2178,38 @@ msgid "cannot open process identifier file" msgstr "Ne peut pas ouvrir le fichier d'identifiants de processus" -#: Programs/menu.c:536 +#: Programs/menu.c:542 msgid "cannot open working directory" msgstr "Ne peut pas ouvrir le répertoire de travail" -#: Programs/prefs.c:326 +#: Programs/prefs.c:351 msgid "cannot read preferences file" msgstr "Ne peut pas lire le fichier des préférences" -#: Programs/xbrlapi.c:243 +#: Programs/xbrlapi.c:297 #, c-format msgid "cannot set focus to %#010x\n" msgstr "Ne peut pas paramétrer le focus sur %#010x\n" -#: Programs/file.c:470 /tmp/src/brltty/Programs/menu.c:525 +#: Programs/file.c:471 Programs/menu.c:531 msgid "cannot set working directory" msgstr "Ne peut pas paramétrer le répertoire de travail" -#: Programs/prefs.c:501 +#: Programs/prefs.c:526 msgid "cannot write to preferences file" msgstr "Ne peut pas écrire dans le fichier des préférences" -#: Programs/xbrlapi.c:236 -#, c-format -msgid "cannot write window name %s\n" -msgstr "Ne peut pas écrire le nom de la fenêtre %s\n" - #. "cap" here, used during speech output, is short for "capital". #. It is spoken just before an uppercase letter, e.g. "cap A". -#: Programs/core.c:827 +#: Programs/core.c:888 msgid "cap" msgstr "Verr.maj" -#: Programs/menu_prefs.c:704 Programs/menu_prefs.c:1111 +#: Programs/menu_prefs.c:753 Programs/menu_prefs.c:1187 msgid "cells" msgstr "cellules" -#: Programs/cmd_preferences.c:80 +#: Programs/cmd_preferences.c:81 msgid "changes discarded" msgstr "Changements annulés" @@ -2182,7 +2217,7 @@ msgid "clear all sticky input modifiers" msgstr "Vider les modificateurs d'entrée polluants" -#: Programs/cmd_speech.c:465 +#: Programs/cmd_speech.c:456 msgid "column" msgstr "colonne" @@ -2191,16 +2226,15 @@ msgid "config" msgstr "Config" -#: Programs/options.c:751 +#: Programs/options.c:756 msgid "configuration directive specified more than once" msgstr "Ligne de configuration spécifiée plus d'une fois" -#: Drivers/Screen/Linux/screen.c:1280 -#, fuzzy +#: Drivers/Screen/Linux/screen.c:1281 msgid "console not in use" msgstr "La console n'est pas utilisée" -#: Programs/menu_prefs.c:828 +#: Programs/menu_prefs.c:904 msgid "console tone generator" msgstr "Générateur de beep de console" @@ -2208,7 +2242,7 @@ msgid "copy characters to clipboard" msgstr "Copie les caractères dans le presse-papier" -#: Programs/config.c:552 Programs/menu_prefs.c:479 +#: Programs/config.c:563 Programs/menu_prefs.c:488 msgid "csecs" msgstr "csecs" @@ -2233,7 +2267,7 @@ msgstr "Touche curseur vers le haut" #. GB -#: Programs/cmd_utils.c:99 +#: Programs/cmd_utils.c:112 msgid "cyan" msgstr "cyan" @@ -2262,7 +2296,7 @@ msgstr "Change le cycle de la touche Verrmaj (Upper), (La prochaine fois, activé, désactivé)" #. L -#: Programs/cmd_utils.c:104 +#: Programs/cmd_utils.c:117 msgid "dark grey" msgstr "gris foncé" @@ -2286,34 +2320,18 @@ msgid "describe current character" msgstr "Décrire le caractère actuel" -#: Programs/config.c:533 /tmp/src/brltty/Programs/config.c:543 +#: Programs/config.c:544 Programs/config.c:554 msgid "device" msgstr "périphérique" -#: Programs/xbrlapi.c:622 -#, c-format -msgid "didn't grab parent of %#010lx\n" -msgstr "n'a pas extrait le parent de %#010lx\n" - -#: Programs/xbrlapi.c:640 -#, c-format -msgid "didn't grab window %#010lx\n" -msgstr "n'a pas extrait la fenêtre de %#010lx\n" - -#: Programs/xbrlapi.c:479 -#, c-format -msgid "didn't grab window %#010lx but got focus\n" -msgstr "n'a pas extrait la fenêtre %#010lx mais a récupéré le focus\n" - -#: Programs/brltest.c:68 /tmp/src/brltty/Programs/brltest.c:78 -#: Programs/brltty-atb.c:32 Programs/brltty-ctb.c:54 Programs/brltty-ktb.c:65 -#: Programs/brltty-ktb.c:75 Programs/brltty-trtxt.c:46 Programs/config.c:323 -#: /tmp/src/brltty/Programs/config.c:342 Programs/config.c:352 -#: /tmp/src/brltty/Programs/config.c:423 +#: Programs/brltest.c:64 Programs/brltest.c:74 Programs/brltty-atb.c:32 +#: Programs/brltty-ctb.c:50 Programs/brltty-ktb.c:73 Programs/brltty-ktb.c:83 +#: Programs/brltty-trtxt.c:47 Programs/config.c:342 Programs/config.c:352 +#: Programs/config.c:362 Programs/config.c:433 msgid "directory" msgstr "répertoire" -#: Programs/xbrlapi.c:95 +#: Programs/xbrlapi.c:97 msgid "display" msgstr "affichage" @@ -2321,28 +2339,27 @@ msgid "do nothing" msgstr "Ne fait rien" -#: Programs/learn.c:101 +#: Programs/learn.c:108 msgid "done" msgstr "Fait" -#: Programs/menu_prefs.c:513 +#: Programs/menu_prefs.c:562 msgid "dot 7" msgstr "point 7" -#: Programs/menu_prefs.c:514 +#: Programs/menu_prefs.c:563 msgid "dot 8" msgstr "point 8" -#: Programs/menu_prefs.c:511 +#: Programs/menu_prefs.c:560 msgid "dots 7 and 8" msgstr "Points 7 et 8" -#: Drivers/Braille/Baum/braille.c:1062 +#: Drivers/Braille/Baum/braille.c:1064 msgid "driver request" msgstr "Requête du pilote" -#: Programs/config.c:381 /tmp/src/brltty/Programs/config.c:479 -#: Programs/config.c:513 +#: Programs/config.c:391 Programs/config.c:489 Programs/config.c:524 msgid "driver,..." msgstr "pilote,..." @@ -2378,11 +2395,11 @@ msgid "eurobraille" msgstr "Eurobraille" -#: Programs/cmd_miscellaneous.c:129 +#: Programs/cmd_miscellaneous.c:118 msgid "exactly" msgstr "exactement" -#: Programs/config.c:723 +#: Programs/config.c:725 msgid "excess argument" msgstr "Trop d'arguments" @@ -2398,20 +2415,18 @@ msgid "execution of \"%s\" failed: %s\n" msgstr "Échec de l'exécution de \"%s\" : %s\n" -#: Programs/xbrlapi.c:575 +#: Programs/xbrlapi.c:638 msgid "failed to get first focus\n" msgstr "échec de la récupçration du premier focus\n" -#: Programs/brltty-trtxt.c:56 Programs/brltty-trtxt.c:65 Programs/config.c:313 -#: /tmp/src/brltty/Programs/config.c:333 Programs/config.c:434 -#: /tmp/src/brltty/Programs/config.c:444 Programs/config.c:453 -#: /tmp/src/brltty/Programs/config.c:462 Programs/config.c:498 -#: /tmp/src/brltty/Programs/config.c:582 Programs/config.c:590 -#: /tmp/src/brltty/Programs/xbrlapi.c:88 +#: Programs/brltty-trtxt.c:57 Programs/brltty-trtxt.c:66 Programs/config.c:306 +#: Programs/config.c:315 Programs/config.c:325 Programs/config.c:444 +#: Programs/config.c:454 Programs/config.c:463 Programs/config.c:472 +#: Programs/config.c:508 Programs/config.c:593 Programs/xbrlapi.c:90 msgid "file" msgstr "fichier" -#: Programs/options.c:929 +#: Programs/options.c:942 #, c-format msgid "file '%s' processing error." msgstr "Erreur de traitement du fichier '%s'" @@ -2455,9 +2470,8 @@ msgstr "Descend à la première ligne du paragraphe suivant" #: Programs/cmds.auto.h:418 -#, fuzzy msgid "go down to last item" -msgstr "Va au dernier élément" +msgstr "Descend au dernier élément" #: Programs/cmds.auto.h:975 msgid "go down to nearest line with different character" @@ -2480,9 +2494,8 @@ msgstr "Descend à l'invite de commande suivant" #: Programs/cmds.auto.h:434 -#, fuzzy msgid "go down to next item" -msgstr "Va à l'élément suivant" +msgstr "Descend à l'élément suivant" #: Programs/cmds.auto.h:194 msgid "go forward one braille window" @@ -2609,9 +2622,8 @@ msgstr "Remonte de plusieurs ligne" #: Programs/cmds.auto.h:410 -#, fuzzy msgid "go up to first item" -msgstr "Va au premier élément" +msgstr "Remonte au premier élément" #: Programs/cmds.auto.h:110 msgid "go up to first line of paragraph" @@ -2638,20 +2650,19 @@ msgstr "Remonte à l'invite de commande précédent" #: Programs/cmds.auto.h:426 -#, fuzzy msgid "go up to previous item" -msgstr "Va à l'élément précédent" +msgstr "Remonte à l'élément précédent" #. G -#: Programs/cmd_utils.c:98 +#: Programs/cmd_utils.c:111 msgid "green" msgstr "vert" -#: Programs/cmd_miscellaneous.c:246 +#: Programs/cmd_miscellaneous.c:230 msgid "help not available" msgstr "Aide non disponible" -#: Programs/scr_help.c:234 +#: Programs/scr_help.c:229 msgid "help screen not readable" msgstr "Écran d'aide illisible" @@ -2659,11 +2670,11 @@ msgid "home key" msgstr "Touche origine" -#: Programs/config.c:402 +#: Programs/config.c:412 msgid "identifier,..." msgstr "identifiant,..." -#: Drivers/Braille/Baum/braille.c:1064 +#: Drivers/Braille/Baum/braille.c:1066 msgid "idle timeout" msgstr "Délai d'inactivité" @@ -2695,7 +2706,7 @@ msgid "invalid counter setting" msgstr "Paramètre de compteur invalide" -#: Programs/datafile.c:434 +#: Programs/datafile.c:318 msgid "invalid escape sequence" msgstr "Séquence d'échappement non valide" @@ -2703,11 +2714,11 @@ msgid "invalid flag setting" msgstr "Paramètre du drapeau invalide" -#: Programs/config.c:2459 +#: Programs/config.c:2528 msgid "invalid message hold timeout" msgstr "Délai d'apparition du message non valide" -#: Programs/brlapi_server.c:3062 +#: Programs/brlapi_server.c:3129 msgid "invalid thread stack size" msgstr "Taille de la pile du thread invalide" @@ -2721,36 +2732,36 @@ msgstr "Émulation du clavier activée" #. L B -#: Programs/cmd_utils.c:105 +#: Programs/cmd_utils.c:118 msgid "light blue" msgstr "bleu clair" #. L GB -#: Programs/cmd_utils.c:107 +#: Programs/cmd_utils.c:120 msgid "light cyan" msgstr "cyan clair" #. L G -#: Programs/cmd_utils.c:106 +#: Programs/cmd_utils.c:119 msgid "light green" msgstr "vert clair" #. RGB -#: Programs/cmd_utils.c:103 +#: Programs/cmd_utils.c:116 msgid "light grey" msgstr "gris clair" #. LR B -#: Programs/cmd_utils.c:109 +#: Programs/cmd_utils.c:122 msgid "light magenta" msgstr "magenta clair" #. LR -#: Programs/cmd_utils.c:108 +#: Programs/cmd_utils.c:121 msgid "light red" msgstr "rouge clair" -#: Programs/cmd_speech.c:464 +#: Programs/cmd_speech.c:455 msgid "line" msgstr "ligne" @@ -2758,17 +2769,17 @@ msgid "linear copy to character" msgstr "copie linéaire jusqu'au caractère" -#: Programs/config.c:573 +#: Programs/config.c:584 msgid "lvl|cat,..." msgstr "lvl|cat,..." #. R B -#: Programs/cmd_utils.c:101 +#: Programs/cmd_utils.c:114 msgid "magenta" msgstr "magenta" #. An invalid option has been specified. -#: Programs/options.c:533 +#: Programs/options.c:542 msgid "missing operand" msgstr "Opérande manquant" @@ -2784,14 +2795,8 @@ msgid "missing parameter value" msgstr "Valeur du paramètre manquante" -#: Programs/xbrlapi.c:345 -#, c-format -msgid "more than one item for VT number\n" -msgstr "Plus d'un élément pour le terminal virtuel numéro\n" - -#: Programs/config.c:370 /tmp/src/brltty/Programs/config.c:392 -#: Programs/config.c:470 /tmp/src/brltty/Programs/config.c:489 -#: Programs/config.c:523 +#: Programs/config.c:334 Programs/config.c:380 Programs/config.c:402 +#: Programs/config.c:480 Programs/config.c:499 Programs/config.c:534 msgid "name=value,..." msgstr "nom=valeur,..." @@ -2799,17 +2804,7 @@ msgid "native" msgstr "natif" -#: Programs/xbrlapi.c:330 -#, c-format -msgid "no XFree86_VT atom\n" -msgstr "Pas d'atome XFree86_VT\n" - -#: Programs/xbrlapi.c:341 -#, c-format -msgid "no items for VT number\n" -msgstr "Pas d'éléments pour le terminal virtuel numéro\n" - -#: Programs/config.c:993 +#: Programs/config.c:995 msgid "no key bindings" msgstr "Pas de raccourci clavier" @@ -2817,15 +2812,15 @@ msgid "no screen" msgstr "pas d'écran" -#: Programs/config.c:634 +#: Programs/config.c:636 msgid "none" msgstr "Aucun" -#: Programs/config.c:1234 +#: Programs/config.c:1261 msgid "not saved" msgstr "Non enregistré" -#: Programs/options.c:140 +#: Programs/options.c:139 msgid "option" msgstr "option" @@ -2837,11 +2832,11 @@ msgid "page-up key" msgstr "touche page précédente" -#: Programs/menu_prefs.c:485 +#: Programs/menu_prefs.c:494 msgid "percentage" msgstr "Pourcentage" -#: Programs/config.c:2432 +#: Programs/config.c:2501 msgid "pid file not specified" msgstr "Fichier pid non spécifié" @@ -2857,7 +2852,7 @@ msgid "place left end of braille window at character" msgstr "met le coin gauche de la fenêtre braille sur le caractère" -#: Drivers/Braille/Baum/braille.c:1063 +#: Drivers/Braille/Baum/braille.c:1065 msgid "power switch" msgstr "Changement d'état d'alimentation" @@ -2870,21 +2865,21 @@ msgstr "copie rectangulaire jusqu'au caractère" #. R -#: Programs/cmd_utils.c:100 +#: Programs/cmd_utils.c:113 msgid "red" msgstr "rouge" -#: Programs/config.c:1634 +#: Programs/config.c:1701 #, c-format msgid "reinitializing braille driver" msgstr "Réinitialisation du pilote braille" -#: Programs/config.c:2194 +#: Programs/config.c:2249 #, c-format msgid "reinitializing screen driver" msgstr "Réinitialisation du pilote de l'écran" -#: Programs/config.c:1975 +#: Programs/config.c:2030 #, c-format msgid "reinitializing speech driver" msgstr "Réinitialisation de la synthèse vocale" @@ -2895,7 +2890,7 @@ #: Programs/cmds.auto.h:1045 msgid "render an alert" -msgstr "" +msgstr "Émettre une alerte" #: Drivers/Braille/BrailleLite/braille.c:601 #: Drivers/Braille/BrailleLite/braille.c:780 @@ -2904,11 +2899,6 @@ msgid "repeat count" msgstr "Répétition du comptage" -#: Programs/xbrlapi.c:313 -#, c-format -msgid "resource %#010lx, req %u:%u\n" -msgstr "ressource %#010lx, req %u:%u\n" - #: Programs/cmds.auto.h:532 msgid "restart braille driver" msgstr "Redémarre le pilote braille" @@ -2933,11 +2923,11 @@ msgid "save preferences to disk" msgstr "Enregistre les préférences sur le disque" -#: Programs/config.c:2074 +#: Programs/config.c:2129 msgid "screen driver not loadable" msgstr "Pilote d'écran non chargeable" -#: Drivers/Screen/Linux/screen.c:1303 +#: Drivers/Screen/Linux/screen.c:1304 msgid "screen not in text mode" msgstr "L'écran n'est pas en mode texte" @@ -2949,7 +2939,7 @@ msgid "search forward for clipboard text" msgstr "Recherche en avant du texte dans le presse papier" -#: Programs/cmd_miscellaneous.c:133 +#: Programs/cmd_miscellaneous.c:122 msgid "second" msgid_plural "seconds" msgstr[0] "secondes" @@ -3095,15 +3085,15 @@ msgid "show current date and time" msgstr "Affiche la date et l'heure actuelles" -#: Programs/menu_prefs.c:829 +#: Programs/menu_prefs.c:905 msgid "soundcard digital audio" msgstr "Son numérique de la carte son" -#: Programs/menu_prefs.c:831 +#: Programs/menu_prefs.c:907 msgid "soundcard synthesizer" msgstr "Synthétiseur de la carte son" -#: Programs/cmd.c:283 /tmp/src/brltty/Programs/core.c:808 +#: Programs/cmd.c:277 Programs/core.c:869 msgid "space" msgstr "Espace" @@ -3131,7 +3121,7 @@ msgid "speak speech cursor location" msgstr "Lit là où est le curseur de synthèse" -#: Programs/config.c:1839 +#: Programs/config.c:1894 msgid "speech driver not loadable" msgstr "Pilote de synthèse vocale non chargeable" @@ -3171,7 +3161,7 @@ msgid "stop the speech driver" msgstr "Arrête le pilote de synthèse vocale" -#: Programs/xbrlapi.c:526 +#: Programs/xbrlapi.c:590 msgid "strange old error handler\n" msgstr "Gestionnaire d'étranges erreurs anciennes\n" @@ -3203,11 +3193,11 @@ msgid "type unicode character" msgstr "Caractère de type unicode" -#: Programs/xbrlapi.c:771 +#: Programs/xbrlapi.c:841 msgid "unexpected block type" msgstr "Type de bloc inattendu" -#: Programs/xbrlapi.c:721 +#: Programs/xbrlapi.c:791 msgid "unexpected cmd" msgstr "Cmd imprévue" @@ -3215,25 +3205,19 @@ msgid "unhandled command" msgstr "Commande non prise en charge" -#. "shouldn't happen" events -#: Programs/xbrlapi.c:669 -#, c-format -msgid "unhandled event type: %d\n" -msgstr "Type d'événement non pris en charge: %d\n" - -#: Programs/cmd.c:204 +#: Programs/cmd.c:198 msgid "unknown command" msgstr "Commande inconnue" -#: Programs/options.c:767 +#: Programs/options.c:772 msgid "unknown configuration directive" msgstr "Ligne de configuration non reconnue" -#: Programs/config.c:654 +#: Programs/config.c:656 msgid "unknown log level or category" msgstr "Niveau ou catégorie de journalisation inconnu" -#: Programs/options.c:528 +#: Programs/options.c:529 msgid "unknown option" msgstr "Option non reconnue" @@ -3246,17 +3230,94 @@ msgstr "Volume" #. LRGB -#: Programs/cmd_utils.c:111 +#: Programs/cmd_utils.c:124 msgid "white" msgstr "blanc" -#: Programs/xbrlapi.c:648 +#: Programs/xbrlapi.c:824 +#, c-format +msgid "xbrlapi: Couldn't find modifiers to apply to %d for getting keysym %08X\n" +msgstr "xbrlapi : N'a pas pu trouver de modificateur applicable à %d pour obtenir le symbole de touche %08X\n" + +#: Programs/xbrlapi.c:800 +#, c-format +msgid "xbrlapi: Couldn't translate keysym %08X to keycode.\n" +msgstr "xbrlapi : N'a pas pu traduire le symbole de touche %08X en code de touche.\n" + +#: Programs/xbrlapi.c:373 +#, c-format +msgid "xbrlapi: X Error %d, %s on display %s\n" +msgstr "xbrlapi: Erreur X %d, %s sur l'écran %s\n" + +#: Programs/xbrlapi.c:415 +#, c-format +msgid "xbrlapi: bad format for VT number\n" +msgstr "xbrlapi : Mauvais format de numéro de terminal virtuel\n" + +#: Programs/xbrlapi.c:418 +#, c-format +msgid "xbrlapi: bad type for VT number\n" +msgstr "xbrlapi : Mauvais type de numéro de terminal virtuel\n" + +#: Programs/xbrlapi.c:397 +#, c-format +msgid "xbrlapi: cannot get root window XFree86_VT property\n" +msgstr "xbrlapi : Ne peut pas trouver la propriété de la fenêtre racine XFree86_VT\n" + +# +#: Programs/xbrlapi.c:276 +#, c-format +msgid "xbrlapi: cannot write window name %s\n" +msgstr "xbrlapi : Ne peut pas écrire le nom de la fenêtre %s\n" + +#: Programs/xbrlapi.c:691 +#, c-format +msgid "xbrlapi: didn't grab parent of %#010lx\n" +msgstr "n'a pas extrait le parent de %#010lx\n" + +#: Programs/xbrlapi.c:709 #, c-format -msgid "window %#010lx changed to NULL name\n" -msgstr "Le nom de la fenêtre %#010lx est devenu NULL\n" +msgid "xbrlapi: didn't grab window %#010lx\n" +msgstr "xbrlapi : n'a pas extrait la fenêtre de %#010lx\n" + +#: Programs/xbrlapi.c:540 +#, c-format +msgid "xbrlapi: didn't grab window %#010lx but got focus\n" +msgstr "xbrlapi : n'a pas extrait la fenêtre %#010lx mais a récupéré le focus\n" + +#: Programs/xbrlapi.c:406 +#, c-format +msgid "xbrlapi: more than one item for VT number\n" +msgstr "xbrlapi : Plus d'un élément pour le terminal virtuel numéro\n" + +#: Programs/xbrlapi.c:391 +#, c-format +msgid "xbrlapi: no XFree86_VT atom\n" +msgstr "xbrlapi : Pas d'atome XFree86_VT\n" + +#: Programs/xbrlapi.c:402 +#, c-format +msgid "xbrlapi: no items for VT number\n" +msgstr "xbrlapi : Pas d'éléments pour le terminal virtuel numéro\n" + +#: Programs/xbrlapi.c:374 +#, c-format +msgid "xbrlapi: resource %#010lx, req %u:%u\n" +msgstr "xbrlapi : ressource %#010lx, req %u:%u\n" + +#. "shouldn't happen" events +#: Programs/xbrlapi.c:738 +#, c-format +msgid "xbrlapi: unhandled event type: %d\n" +msgstr "xbrlapi : Type d'événement non pris en charge: %d\n" + +#: Programs/xbrlapi.c:717 +#, c-format +msgid "xbrlapi: window %#010lx changed to NULL name\n" +msgstr "xbrlapi : Le nom de la fenêtre %#010lx est devenu NULL\n" #. LRG -#: Programs/cmd_utils.c:110 +#: Programs/cmd_utils.c:123 msgid "yellow" msgstr "jaune" diff -Nru brltty-5.4/Messages/Makefile.in brltty-5.5/Messages/Makefile.in --- brltty-5.4/Messages/Makefile.in 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Messages/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Messages/zh.po brltty-5.5/Messages/zh.po --- brltty-5.4/Messages/zh.po 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Messages/zh.po 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/mk4build brltty-5.5/mk4build --- brltty-5.4/mk4build 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/mk4build 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/mkdocktb brltty-5.5/mkdocktb --- brltty-5.4/mkdocktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/mkdocktb 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/mkdocs brltty-5.5/mkdocs --- brltty-5.4/mkdocs 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/mkdocs 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/mkpot brltty-5.5/mkpot --- brltty-5.4/mkpot 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/mkpot 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -55,8 +55,8 @@ s/PACKAGE/${packageName}/ /^#: /{ - s% ${sourceRoot}/*% % - s% ${buildRoot}/*% % + s% ${sourceRoot}/*% %g + s% ${buildRoot}/*% %g } " exit "${?}" diff -Nru brltty-5.4/mkrpm brltty-5.5/mkrpm --- brltty-5.4/mkrpm 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/mkrpm 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/mktar brltty-5.5/mktar --- brltty-5.4/mktar 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/mktar 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/mkzip brltty-5.5/mkzip --- brltty-5.4/mkzip 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/mkzip 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Programs/activity.c brltty-5.5/Programs/activity.c --- brltty-5.4/Programs/activity.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/activity.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/activity.h brltty-5.5/Programs/activity.h --- brltty-5.4/Programs/activity.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/activity.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/addresses.c brltty-5.5/Programs/addresses.c --- brltty-5.4/Programs/addresses.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/addresses.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/alert.c brltty-5.5/Programs/alert.c --- brltty-5.4/Programs/alert.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/alert.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/api_control.c brltty-5.5/Programs/api_control.c --- brltty-5.4/Programs/api_control.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/api_control.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/api_control.h brltty-5.5/Programs/api_control.h --- brltty-5.4/Programs/api_control.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/api_control.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/api.h brltty-5.5/Programs/api.h --- brltty-5.4/Programs/api.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/api.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/api_server.h brltty-5.5/Programs/api_server.h --- brltty-5.4/Programs/api_server.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/api_server.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/apitest.c brltty-5.5/Programs/apitest.c --- brltty-5.4/Programs/apitest.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/apitest.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_alarm.c brltty-5.5/Programs/async_alarm.c --- brltty-5.4/Programs/async_alarm.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_alarm.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_data.c brltty-5.5/Programs/async_data.c --- brltty-5.4/Programs/async_data.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_data.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_event.c brltty-5.5/Programs/async_event.c --- brltty-5.4/Programs/async_event.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_event.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_handle.c brltty-5.5/Programs/async_handle.c --- brltty-5.4/Programs/async_handle.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_handle.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_internal.h brltty-5.5/Programs/async_internal.h --- brltty-5.4/Programs/async_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_io.c brltty-5.5/Programs/async_io.c --- brltty-5.4/Programs/async_io.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_io.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_signal.c brltty-5.5/Programs/async_signal.c --- brltty-5.4/Programs/async_signal.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_signal.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_task.c brltty-5.5/Programs/async_task.c --- brltty-5.4/Programs/async_task.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_task.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/async_wait.c brltty-5.5/Programs/async_wait.c --- brltty-5.4/Programs/async_wait.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/async_wait.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/atb_compile.c brltty-5.5/Programs/atb_compile.c --- brltty-5.4/Programs/atb_compile.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/atb_compile.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/atb_internal.h brltty-5.5/Programs/atb_internal.h --- brltty-5.4/Programs/atb_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/atb_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/atb_translate.c brltty-5.5/Programs/atb_translate.c --- brltty-5.4/Programs/atb_translate.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/atb_translate.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/auth.c brltty-5.5/Programs/auth.c --- brltty-5.4/Programs/auth.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/auth.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -54,6 +54,7 @@ #include "strfmt.h" #include "parse.h" #include "auth.h" +#include "async_wait.h" /* peer credentials */ #undef CAN_CHECK_CREDENTIALS @@ -452,15 +453,39 @@ if ((polkit = malloc(sizeof(*polkit)))) { memset(polkit, 0, sizeof(*polkit)); - GError *error_local = NULL; - polkit->authority = polkit_authority_get_sync(NULL, &error_local); + while (1) { + GError *error = NULL; + polkit->authority = polkit_authority_get_sync(NULL, &error); + if (polkit->authority) return polkit; - if (polkit->authority) { - return polkit; - } else { - g_error_free(error_local); - g_free(polkit); + int wait = 0; + char message[0X100]; + + STR_BEGIN(message, sizeof(message)); + STR_PRINTF("unable to connect to polkit"); + + if (error) { + GQuark domain = error->domain; + gint code = error->code; + + STR_PRINTF(": %s (%d) %s (%d)", + g_quark_to_string(domain), (int)domain, + error->message, code); + + g_error_free(error); + error = NULL; + + if ((domain == G_IO_ERROR) || (code == G_IO_ERROR_NOT_FOUND)) wait = 1; + } + + STR_END; + logMessage(LOG_WARNING, "%s", message); + + if (!wait) break; + asyncWait(1000); } + + g_free(polkit); } else { logMallocError(); } @@ -492,7 +517,7 @@ PolkitAuthorizationResult *result = polkit_authority_check_authorization_sync( polkit->authority, /* authority */ subject, /* PolkitSubject for client */ - "org.brltty.write-display", /* name of polkit action */ + "org.a11y.brlapi.write-display", /* name of polkit action */ NULL, /* details */ POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, /* disallow interaction */ NULL, /* GCancellable */ diff -Nru brltty-5.4/Programs/beep.c brltty-5.5/Programs/beep.c --- brltty-5.4/Programs/beep.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/beep.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/beep_linux.c brltty-5.5/Programs/beep_linux.c --- brltty-5.4/Programs/beep_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/beep_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -18,19 +18,24 @@ #include "prologue.h" +#include +#include +#include #include #include #include "log.h" -#include "device.h" #include "beep.h" #include "system_linux.h" -#define BEEP_DIVIDEND 1193180 +#define BEEP_DEVICE_PATH "/dev/tty0" +#define TICKS_PER_SECOND 1193180 + +static int beepDevice = INVALID_FILE_DESCRIPTOR; static inline BeepFrequency -getWaveLength (BeepFrequency frequency) { - return frequency? (BEEP_DIVIDEND / frequency): 0; +getTicksPerWave (BeepFrequency frequency) { + return frequency? (TICKS_PER_SECOND / frequency): 0; } static void @@ -42,8 +47,20 @@ int canBeep (void) { - enableBeeps(); - return !!getConsole(); + if (beepDevice == INVALID_FILE_DESCRIPTOR) { + const char *path = BEEP_DEVICE_PATH; + int device = open(path, O_WRONLY); + + if (device == -1) { + logMessage(LOG_WARNING, "can't open beep device: %s: %s", path, strerror(errno)); + return 0; + } + + beepDevice = device; + enableBeeps(); + } + + return 1; } int @@ -53,10 +70,8 @@ int asynchronousBeep (BeepFrequency frequency, BeepDuration duration) { - FILE *console = getConsole(); - - if (console) { - if (ioctl(fileno(console), KDMKTONE, ((duration << 0X10) | getWaveLength(frequency))) != -1) return 1; + if (beepDevice != INVALID_FILE_DESCRIPTOR) { + if (ioctl(beepDevice, KDMKTONE, ((duration << 0X10) | getTicksPerWave(frequency))) != -1) return 1; logSystemError("ioctl[KDMKTONE]"); } @@ -65,10 +80,8 @@ int startBeep (BeepFrequency frequency) { - FILE *console = getConsole(); - - if (console) { - if (ioctl(fileno(console), KIOCSOUND, getWaveLength(frequency)) != -1) return 1; + if (beepDevice != INVALID_FILE_DESCRIPTOR) { + if (ioctl(beepDevice, KIOCSOUND, getTicksPerWave(frequency)) != -1) return 1; logSystemError("ioctl[KIOCSOUND]"); } @@ -82,4 +95,8 @@ void endBeep (void) { + if (beepDevice != INVALID_FILE_DESCRIPTOR) { + close(beepDevice); + beepDevice = INVALID_FILE_DESCRIPTOR; + } } diff -Nru brltty-5.4/Programs/beep_msdos.c brltty-5.5/Programs/beep_msdos.c --- brltty-5.4/Programs/beep_msdos.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/beep_msdos.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/beep_none.c brltty-5.5/Programs/beep_none.c --- brltty-5.4/Programs/beep_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/beep_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/beep_solaris.c brltty-5.5/Programs/beep_solaris.c --- brltty-5.4/Programs/beep_solaris.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/beep_solaris.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -18,9 +18,11 @@ #include "prologue.h" +#include #include #include +#include "log.h" #include "beep.h" static int diff -Nru brltty-5.4/Programs/beep_spkr.c brltty-5.5/Programs/beep_spkr.c --- brltty-5.4/Programs/beep_spkr.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/beep_spkr.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/beep_windows.c brltty-5.5/Programs/beep_windows.c --- brltty-5.4/Programs/beep_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/beep_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/beep_wskbd.c brltty-5.5/Programs/beep_wskbd.c --- brltty-5.4/Programs/beep_wskbd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/beep_wskbd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/bell.c brltty-5.5/Programs/bell.c --- brltty-5.4/Programs/bell.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bell.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/bell_linux.c brltty-5.5/Programs/bell_linux.c --- brltty-5.4/Programs/bell_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bell_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/bell_none.c brltty-5.5/Programs/bell_none.c --- brltty-5.4/Programs/bell_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bell_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/blink.c brltty-5.5/Programs/blink.c --- brltty-5.4/Programs/blink.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/blink.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/blink.h brltty-5.5/Programs/blink.h --- brltty-5.4/Programs/blink.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/blink.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/bluetooth_android.c brltty-5.5/Programs/bluetooth_android.c --- brltty-5.4/Programs/bluetooth_android.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bluetooth_android.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -27,25 +27,68 @@ #include "thread.h" #include "system_java.h" +static jclass connectionClass = NULL; +static jmethodID connectionConstructor = 0; +static jmethodID openMethod = 0; +static jmethodID closeMethod = 0; +static jmethodID writeMethod = 0; + +static int +bthGetConnectionClass (JNIEnv *env) { + return findJavaClass( + env, &connectionClass, "org/a11y/brltty/android/BluetoothConnection" + ); +} + +static int +bthGetConnectionConstructor (JNIEnv *env) { + return findJavaConstructor( + env, &connectionConstructor, connectionClass, + JAVA_SIG_CONSTRUCTOR( + JAVA_SIG_LONG // deviceAddress + ) + ); +} + +static int +bthGetOpenMethod (JNIEnv *env) { + return findJavaInstanceMethod( + env, &openMethod, connectionClass, "open", + JAVA_SIG_METHOD(JAVA_SIG_BOOLEAN, + JAVA_SIG_INT // inputPipe + JAVA_SIG_INT // channel + JAVA_SIG_BOOLEAN // secure + ) + ); +} + +static int +bthGetCloseMethod (JNIEnv *env) { + return findJavaInstanceMethod( + env, &closeMethod, connectionClass, "close", + JAVA_SIG_METHOD(JAVA_SIG_VOID, + ) + ); +} + +static int +bthGetWriteMethod (JNIEnv *env) { + return (findJavaInstanceMethod( + env, &writeMethod, connectionClass, "write", + JAVA_SIG_METHOD(JAVA_SIG_BOOLEAN, + JAVA_SIG_ARRAY(JAVA_SIG_BYTE)) // bytes + ) + ); +} + struct BluetoothConnectionExtensionStruct { JNIEnv *env; - jclass connectionClass; - jmethodID connectionConstructor; - jmethodID openMethod; - jmethodID closeMethod; - jmethodID writeMethod; - jobject connection; AsyncHandle inputMonitor; int inputPipe[2]; }; -static void -releaseConnectionClass (BluetoothConnectionExtension *bcx) { - (*bcx->env)->DeleteGlobalRef(bcx->env, bcx->connectionClass); -} - BluetoothConnectionExtension * bthNewConnectionExtension (uint64_t bda) { BluetoothConnectionExtension *bcx; @@ -53,22 +96,13 @@ if ((bcx = malloc(sizeof(*bcx)))) { memset(bcx, 0, sizeof(*bcx)); - bcx->connectionClass = NULL; - bcx->connectionConstructor = 0; - bcx->openMethod = 0; - bcx->closeMethod = 0; - bcx->writeMethod = 0; - bcx->inputPipe[0] = INVALID_FILE_DESCRIPTOR; bcx->inputPipe[1] = INVALID_FILE_DESCRIPTOR; if ((bcx->env = getJavaNativeInterface())) { - if (findJavaClass(bcx->env, &bcx->connectionClass, "org/a11y/brltty/android/BluetoothConnection")) { - if (findJavaConstructor(bcx->env, &bcx->connectionConstructor, bcx->connectionClass, - JAVA_SIG_CONSTRUCTOR( - JAVA_SIG_LONG // deviceAddress - ))) { - jobject localReference = (*bcx->env)->NewObject(bcx->env, bcx->connectionClass, bcx->connectionConstructor, bda); + if (bthGetConnectionClass(bcx->env)) { + if (bthGetConnectionConstructor(bcx->env)) { + jobject localReference = (*bcx->env)->NewObject(bcx->env, connectionClass, connectionConstructor, bda); if (!clearJavaException(bcx->env, 1)) { jobject globalReference = (*bcx->env)->NewGlobalRef(bcx->env, localReference); @@ -85,8 +119,6 @@ } } } - - releaseConnectionClass(bcx); } } @@ -111,13 +143,11 @@ bthCancelInputMonitor(bcx); if (bcx->connection) { - if (findJavaInstanceMethod(bcx->env, &bcx->closeMethod, bcx->connectionClass, "close", - JAVA_SIG_METHOD(JAVA_SIG_VOID, ))) { - (*bcx->env)->CallVoidMethod(bcx->env, bcx->connection, bcx->closeMethod); + if (bthGetCloseMethod(bcx->env)) { + (*bcx->env)->CallVoidMethod(bcx->env, bcx->connection, closeMethod); } (*bcx->env)->DeleteGlobalRef(bcx->env, bcx->connection); - releaseConnectionClass(bcx); clearJavaException(bcx->env, 1); } @@ -142,13 +172,8 @@ if ((env = getJavaNativeInterface())) { if (pipe(obc->bcx->inputPipe) != -1) { if (setBlockingIo(obc->bcx->inputPipe[0], 0)) { - if (findJavaInstanceMethod(env, &obc->bcx->openMethod, obc->bcx->connectionClass, "open", - JAVA_SIG_METHOD(JAVA_SIG_BOOLEAN, - JAVA_SIG_INT // inputPipe - JAVA_SIG_INT // channel - JAVA_SIG_BOOLEAN // secure - ))) { - jboolean result = (*env)->CallBooleanMethod(env, obc->bcx->connection, obc->bcx->openMethod, + if (bthGetOpenMethod(env)) { + jboolean result = (*env)->CallBooleanMethod(env, obc->bcx->connection, openMethod, obc->bcx->inputPipe[1], obc->channel, JNI_FALSE); if (!clearJavaException(env, 1)) { @@ -227,17 +252,14 @@ ssize_t bthPutData (BluetoothConnectionExtension *bcx, const void *buffer, size_t size) { - if (findJavaInstanceMethod(bcx->env, &bcx->writeMethod, bcx->connectionClass, "write", - JAVA_SIG_METHOD(JAVA_SIG_BOOLEAN, - JAVA_SIG_ARRAY(JAVA_SIG_BYTE)) // bytes - )) { + if (bthGetWriteMethod(bcx->env)) { jbyteArray bytes = (*bcx->env)->NewByteArray(bcx->env, size); if (bytes) { jboolean result; (*bcx->env)->SetByteArrayRegion(bcx->env, bytes, 0, size, buffer); - result = (*bcx->env)->CallBooleanMethod(bcx->env, bcx->connection, bcx->writeMethod, bytes); + result = (*bcx->env)->CallBooleanMethod(bcx->env, bcx->connection, writeMethod, bytes); (*bcx->env)->DeleteLocalRef(bcx->env, bytes); if (!clearJavaException(bcx->env, 1)) { @@ -264,16 +286,14 @@ JNIEnv *env = getJavaNativeInterface(); if (env) { - static jclass class = NULL; - - if (findJavaClass(env, &class, "org/a11y/brltty/android/BluetoothConnection")) { + if (bthGetConnectionClass(env)) { static jmethodID method = 0; - if (findJavaStaticMethod(env, &method, class, "getName", + if (findJavaStaticMethod(env, &method, connectionClass, "getName", JAVA_SIG_METHOD(JAVA_SIG_OBJECT(java/lang/String), JAVA_SIG_LONG // deviceAddress ))) { - jstring jName = (*env)->CallStaticObjectMethod(env, class, method, bda); + jstring jName = (*env)->CallStaticObjectMethod(env, connectionClass, method, bda); if (jName) { const char *cName = (*env)->GetStringUTFChars(env, jName, NULL); @@ -297,3 +317,94 @@ return name; } + +static jmethodID getPairedDeviceCountMethod = 0; +static jmethodID getPairedDeviceAddressMethod = 0; +static jmethodID getPairedDeviceNameMethod = 0; + +static int +bthGetPairedDeviceCountMethod (JNIEnv *env) { + return findJavaStaticMethod( + env, &getPairedDeviceCountMethod, connectionClass, "getPairedDeviceCount", + JAVA_SIG_METHOD(JAVA_SIG_INT, + ) + ); +} + +static int +bthGetPairedDeviceAddressMethod (JNIEnv *env) { + return findJavaStaticMethod( + env, &getPairedDeviceAddressMethod, connectionClass, "getPairedDeviceAddress", + JAVA_SIG_METHOD(JAVA_SIG_OBJECT(java/lang/String), + JAVA_SIG_INT // index + ) + ); +} + +static int +bthGetPairedDeviceNameMethod (JNIEnv *env) { + return findJavaStaticMethod( + env, &getPairedDeviceNameMethod, connectionClass, "getPairedDeviceName", + JAVA_SIG_METHOD(JAVA_SIG_OBJECT(java/lang/String), + JAVA_SIG_INT // index + ) + ); +} + +static JNIEnv * +bthGetPairedDeviceMethods (void) { + JNIEnv *env = getJavaNativeInterface(); + + if (env) { + if (bthGetConnectionClass(env)) { + if (bthGetPairedDeviceCountMethod(env)) { + if (bthGetPairedDeviceAddressMethod(env)) { + if (bthGetPairedDeviceNameMethod(env)) { + return env; + } + } + } + } + } + + return NULL; +} + +void +bthProcessDiscoveredDevices ( + DiscoveredBluetoothDeviceTester *testDevice, void *data +) { + JNIEnv *env = bthGetPairedDeviceMethods(); + + if (env) { + jint count = (*env)->CallStaticIntMethod(env, connectionClass, getPairedDeviceCountMethod); + + for (jint index=0; indexCallStaticObjectMethod(env, connectionClass, getPairedDeviceAddressMethod, index); + + if (jAddress) { + const char *cAddress = (*env)->GetStringUTFChars(env, jAddress, NULL); + + if (cAddress) { + uint64_t address; + + if (bthParseAddress(&address, cAddress)) { + jstring jName = (*env)->CallStaticObjectMethod(env, connectionClass, getPairedDeviceNameMethod, index); + const char *cName = jName? (*env)->GetStringUTFChars(env, jName, NULL): NULL; + + DiscoveredBluetoothDevice device = { + .address = address, + .name = cName, + .paired = 1 + }; + + int found = testDevice(&device, data); + if (cName) (*env)->ReleaseStringUTFChars(env, jName, cName); + (*env)->ReleaseStringUTFChars(env, jAddress, cAddress); + if (found) break; + } + } + } + } + } +} diff -Nru brltty-5.4/Programs/bluetooth.c brltty-5.5/Programs/bluetooth.c --- brltty-5.4/Programs/bluetooth.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bluetooth.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -61,17 +61,18 @@ } typedef struct { - uint64_t bda; - int connectError; - char *deviceName; + uint64_t address; + char *name; + int error; + unsigned paired:1; } BluetoothDeviceEntry; static void bthDeallocateDeviceEntry (void *item, void *data) { - BluetoothDeviceEntry *entry = item; + BluetoothDeviceEntry *device = item; - if (entry->deviceName) free(entry->deviceName); - free(entry); + if (device->name) free(device->name); + free(device); } static Queue * @@ -88,29 +89,30 @@ } static int -bthTestDeviceEntry (const void *item, void *data) { - const BluetoothDeviceEntry *entry = item; - const uint64_t *bda = data; +bthTestDeviceAddress (const void *item, void *data) { + const BluetoothDeviceEntry *device = item; + const uint64_t *address = data; - return entry->bda == *bda; + return device->address == *address; } static BluetoothDeviceEntry * -bthGetDeviceEntry (uint64_t bda, int add) { +bthGetDeviceEntry (uint64_t address, int add) { Queue *devices = bthGetDeviceQueue(add); if (devices) { - BluetoothDeviceEntry *entry = findItem(devices, bthTestDeviceEntry, &bda); - if (entry) return entry; + BluetoothDeviceEntry *device = findItem(devices, bthTestDeviceAddress, &address); + if (device) return device; if (add) { - if ((entry = malloc(sizeof(*entry)))) { - entry->bda = bda; - entry->connectError = 0; - entry->deviceName = NULL; + if ((device = malloc(sizeof(*device)))) { + device->address = address; + device->name = NULL; + device->error = 0; + device->paired = 0; - if (enqueueItem(devices, entry)) return entry; - free(entry); + if (enqueueItem(devices, device)) return device; + free(device); } else { logMallocError(); } @@ -120,75 +122,126 @@ return NULL; } +static int +bthSetDeviceName (BluetoothDeviceEntry *device, const char *name) { + if (name && *name) { + char *copy = strdup(name); + + if (copy) { + if (device->name) free(device->name); + device->name = copy; + return 1; + } else { + logMallocError(); + } + } + + return 0; +} + +static inline const char * +bthGetPairedKeyword (int state) { + return getFlagKeywordYesNo(state); +} + +static int +bthRememberDiscoveredDevice (const DiscoveredBluetoothDevice *device, void *data) { + logMessage(LOG_CATEGORY(BLUETOOTH_IO), + "remember discovered device: " + "Addr:%012" PRIX64 " Paired:%s Name:%s", + device->address, bthGetPairedKeyword(device->paired), device->name); + + BluetoothDeviceEntry *entry = bthGetDeviceEntry(device->address, 1); + + if (entry) { + bthSetDeviceName(entry, device->name); + entry->paired = device->paired; + } + + return 0; +} + +static int bluetoothDevicesDiscovered = 0; + +static void +bthDiscoverDevices (void) { + if (!bluetoothDevicesDiscovered) { + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "begin device discovery"); + bthProcessDiscoveredDevices(bthRememberDiscoveredDevice, NULL); + bluetoothDevicesDiscovered = 1; + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "end device discovery"); + } +} + void bthForgetDevices (void) { Queue *devices = bthGetDeviceQueue(0); if (devices) deleteElements(devices); + bluetoothDevicesDiscovered = 0; } static int -bthRememberConnectError (uint64_t bda, int value) { - BluetoothDeviceEntry *entry = bthGetDeviceEntry(bda, 1); - if (!entry) return 0; +bthRememberConnectError (uint64_t address, int value) { + BluetoothDeviceEntry *device = bthGetDeviceEntry(address, 1); + if (!device) return 0; - entry->connectError = value; + device->error = value; return 1; } static int -bthRecallConnectError (uint64_t bda, int *value) { - BluetoothDeviceEntry *entry = bthGetDeviceEntry(bda, 0); - if (!entry) return 0; - if (!entry->connectError) return 0; +bthRecallConnectError (uint64_t address, int *value) { + BluetoothDeviceEntry *device = bthGetDeviceEntry(address, 0); + if (!device) return 0; + if (!device->error) return 0; - *value = entry->connectError; + *value = device->error; return 1; } static BluetoothConnection * -bthNewConnection (const char *address, uint8_t channel, int discover, int timeout) { +bthNewConnection (uint64_t address, uint8_t channel, int discover, int timeout) { BluetoothConnection *connection; if ((connection = malloc(sizeof(*connection)))) { memset(connection, 0, sizeof(*connection)); + connection->address = address; connection->channel = channel; - if (bthParseAddress(&connection->address, address)) { - if ((connection->extension = bthNewConnectionExtension(connection->address))) { - int alreadyTried = 0; - - if (discover) bthDiscoverSerialPortChannel(&connection->channel, connection->extension, timeout); - bthLogChannel(connection->channel); - - { - int value; - - if (bthRecallConnectError(connection->address, &value)) { - errno = value; - alreadyTried = 1; - } + if ((connection->extension = bthNewConnectionExtension(connection->address))) { + int alreadyTried = 0; + + if (discover) bthDiscoverSerialPortChannel(&connection->channel, connection->extension, timeout); + bthLogChannel(connection->channel); + + { + int value; + + if (bthRecallConnectError(connection->address, &value)) { + errno = value; + alreadyTried = 1; } + } - if (!alreadyTried) { - TimePeriod period; - startTimePeriod(&period, BLUETOOTH_CHANNEL_BUSY_RETRY_TIMEOUT); - - while (1) { - if (bthOpenChannel(connection->extension, connection->channel, timeout)) { - return connection; - } - - if (afterTimePeriod(&period, NULL)) break; - if (errno != EBUSY) break; - asyncWait(BLUETOOTH_CHANNEL_BUSY_RETRY_INTERVAL); + if (!alreadyTried) { + TimePeriod period; + startTimePeriod(&period, BLUETOOTH_CHANNEL_BUSY_RETRY_TIMEOUT); + + while (1) { + if (bthOpenChannel(connection->extension, connection->channel, timeout)) { + return connection; } - bthRememberConnectError(connection->address, errno); + if (afterTimePeriod(&period, NULL)) break; + if (errno != EBUSY) break; + asyncWait(BLUETOOTH_CHANNEL_BUSY_RETRY_INTERVAL); } - bthReleaseConnectionExtension(connection->extension); + bthRememberConnectError(connection->address, errno); } + + bthReleaseConnectionExtension(connection->extension); } free(connection); @@ -202,12 +255,36 @@ void bthInitializeConnectionRequest (BluetoothConnectionRequest *request) { memset(request, 0, sizeof(*request)); + request->driver = NULL; request->identifier = NULL; request->timeout = BLUETOOTH_CHANNEL_CONNECT_TIMEOUT; request->channel = 0; request->discover = 0; } +typedef enum { + BTH_CONN_ADDRESS, + BTH_CONN_NAME, + BTH_CONN_CHANNEL, + BTH_CONN_DISCOVER, + BTH_CONN_TIMEOUT +} BluetoothConnectionParameter; + +static char ** +bthGetConnectionParameters (const char *identifier) { + static const char *const names[] = { + "address", + "name", + "channel", + "discover", + "timeout", + NULL + }; + + if (!identifier) identifier = ""; + return getDeviceParameters(names, identifier); +} + int bthParseAddress (uint64_t *address, const char *string) { const char *character = string; @@ -270,6 +347,131 @@ return 0; } +static const BluetoothNameEntry * +bthGetNameEntry (const char *name) { + if (name && *name) { + const BluetoothNameEntry *entry = bluetoothNameTable; + + while (entry->namePrefix) { + if (strncmp(name, entry->namePrefix, strlen(entry->namePrefix)) == 0) { + return entry; + } + + entry += 1; + } + } + + return NULL; +} + +typedef struct { + struct { + const char *address; + size_t length; + } name; + + struct { + const char *address; + size_t length; + } driver; +} GetDeviceAddressData; + +static int +bthTestDeviceName (const void *item, void *data) { + const BluetoothDeviceEntry *device = item; + const GetDeviceAddressData *gda = data; + + logMessage(LOG_CATEGORY(BLUETOOTH_IO), + "testing device: Addr:%012" PRIX64 " Paired:%s Name:%s", + device->address, bthGetPairedKeyword(device->paired), device->name + ); + + if (!device->paired) { + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "not paired"); + return 0; + } + + if (gda->name.length) { + if (strncmp(device->name, gda->name.address, gda->name.length) != 0) { + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "ineligible name"); + return 0; + } + } + + const BluetoothNameEntry *name = bthGetNameEntry(device->name); + if (!name) { + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "unrecognized name"); + return 0; + } + + if (gda->driver.length) { + const char *const *code = name->driverCodes; + int found = 0; + + while (*code) { + if (strncmp(*code, gda->driver.address, gda->driver.length) == 0) { + found = 1; + break; + } + + code += 1; + } + + if (!found) { + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "ineligible driver"); + return 0; + } + } + + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "found"); + return 1; +} + +static int +bthGetDeviceAddress (uint64_t *address, char **parameters, const char *driver) { + { + const char *parameter = parameters[BTH_CONN_ADDRESS]; + + if (parameter && *parameter) { + return bthParseAddress(address, parameter); + } + } + + { + bthDiscoverDevices(); + Queue *devices = bthGetDeviceQueue(0); + + if (devices) { + const char *name = parameters[BTH_CONN_NAME]; + + GetDeviceAddressData gda = { + .name = { + .address = name, + .length = name? strlen(name): 0 + }, + + .driver = { + .address = driver, + .length = driver? strlen(driver): 0 + } + }; + + if (gda.driver.length) { + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "begin device search"); + const BluetoothDeviceEntry *device = findItem(devices, bthTestDeviceName, &gda); + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "end device search"); + + if (device) { + *address = device->address; + return 1; + } + } + } + } + + return 0; +} + static int bthProcessTimeoutParameter (BluetoothConnectionRequest *request, const char *parameter) { int seconds; @@ -320,27 +522,6 @@ return 0; } -typedef enum { - BTH_CONN_ADDRESS, - BTH_CONN_TIMEOUT, - BTH_CONN_CHANNEL, - BTH_CONN_DISCOVER -} BluetoothConnectionParameter; - -static char ** -bthGetConnectionParameters (const char *identifier) { - static const char *const names[] = { - "address", - "timeout", - "channel", - "discover", - NULL - }; - - if (!identifier) identifier = ""; - return getDeviceParameters(names, identifier); -} - BluetoothConnection * bthOpenConnection (const BluetoothConnectionRequest *request) { BluetoothConnection *connection = NULL; @@ -352,11 +533,14 @@ int ok = 1; if (!req.channel) req.discover = 1; - if (!bthProcessTimeoutParameter(&req, parameters[BTH_CONN_TIMEOUT])) ok = 0; if (!bthProcessChannelParameter(&req, parameters[BTH_CONN_CHANNEL])) ok = 0; if (!bthProcessDiscoverParameter(&req, parameters[BTH_CONN_DISCOVER])) ok = 0; + if (!bthProcessTimeoutParameter(&req, parameters[BTH_CONN_TIMEOUT])) ok = 0; + + uint64_t address; + if (!bthGetDeviceAddress(&address, parameters, req.driver)) ok = 0; - if (ok) connection = bthNewConnection(parameters[BTH_CONN_ADDRESS], req.channel, req.discover, req.timeout); + if (ok) connection = bthNewConnection(address, req.channel, req.discover, req.timeout); } deallocateStrings(parameters); @@ -394,21 +578,22 @@ } static char * -bthGetDeviceName (uint64_t bda, int timeout) { - BluetoothDeviceEntry *entry = bthGetDeviceEntry(bda, 1); +bthGetDeviceName (uint64_t address, int timeout) { + bthDiscoverDevices(); + BluetoothDeviceEntry *device = bthGetDeviceEntry(address, 1); - if (entry) { - if (!entry->deviceName) { + if (device) { + if (!device->name) { logMessage(LOG_CATEGORY(BLUETOOTH_IO), "obtaining device name"); - if ((entry->deviceName = bthObtainDeviceName(bda, timeout))) { - logMessage(LOG_CATEGORY(BLUETOOTH_IO), "device name: %s", entry->deviceName); + if ((device->name = bthObtainDeviceName(address, timeout))) { + logMessage(LOG_CATEGORY(BLUETOOTH_IO), "device name: %s", device->name); } else { logMessage(LOG_CATEGORY(BLUETOOTH_IO), "device name not obtained"); } } - return entry->deviceName; + return device->name; } return NULL; @@ -436,19 +621,12 @@ char **parameters = bthGetConnectionParameters(identifier); if (parameters) { - const char *name = bthGetNameAtAddress(parameters[BTH_CONN_ADDRESS], timeout); - - if (name) { - const BluetoothNameEntry *entry = bluetoothNameTable; + uint64_t address; - while (entry->namePrefix) { - if (strncmp(name, entry->namePrefix, strlen(entry->namePrefix)) == 0) { - codes = entry->driverCodes; - break; - } - - entry += 1; - } + if (bthGetDeviceAddress(&address, parameters, NULL)) { + const char *name = bthGetDeviceName(address, timeout); + const BluetoothNameEntry *entry = bthGetNameEntry(name); + if (entry) codes = entry->driverCodes; } deallocateStrings(parameters); diff -Nru brltty-5.4/Programs/bluetooth_darwin.c brltty-5.5/Programs/bluetooth_darwin.c --- brltty-5.4/Programs/bluetooth_darwin.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bluetooth_darwin.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -365,3 +365,9 @@ return result; } @end + +void +bthProcessDiscoveredDevices ( + DiscoveredBluetoothDeviceTester *testDevice, void *data +) { +} diff -Nru brltty-5.4/Programs/bluetooth_internal.h brltty-5.5/Programs/bluetooth_internal.h --- brltty-5.4/Programs/bluetooth_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bluetooth_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -62,6 +62,20 @@ extern const BluetoothNameEntry bluetoothNameTable[]; +typedef struct { + const char *name; + uint64_t address; + unsigned paired:1; +} DiscoveredBluetoothDevice; + +typedef int DiscoveredBluetoothDeviceTester ( + const DiscoveredBluetoothDevice *device, void *data +); + +extern void bthProcessDiscoveredDevices ( + DiscoveredBluetoothDeviceTester *testDevice, void *data +); + #ifdef __cplusplus } #endif /* __cplusplus */ diff -Nru brltty-5.4/Programs/bluetooth_linux.c brltty-5.5/Programs/bluetooth_linux.c --- brltty-5.4/Programs/bluetooth_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bluetooth_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -606,3 +606,170 @@ return name; } + +#ifdef HAVE_PKG_DBUS +#include + +static void +logDBusError (const char *action, const DBusError *error) { + const char *message = error->message; + int length = strlen(message); + + while (length > 0) { + char character = message[--length]; + if (character != '\n') break; + } + + logMessage(LOG_ERR, + "DBus error: %s: %s: %.*s", + action, error->name, length, message); +} +#endif /* HAVE_PKG_DBUS */ + +void +bthProcessDiscoveredDevices ( + DiscoveredBluetoothDeviceTester *testDevice, void *data +) { + int found = 0; + +#ifdef HAVE_PKG_DBUS + DBusError error; + DBusConnection *bus; + + dbus_error_init(&error); + bus = dbus_bus_get(DBUS_BUS_SYSTEM, &error); + + if (dbus_error_is_set(&error)) { + logDBusError("get bus", &error); + dbus_error_free(&error); + } else if (!bus) { + logMallocError(); + } else { + DBusMessage *getManagedObjects = dbus_message_new_method_call( + "org.bluez", "/", + "org.freedesktop.DBus.ObjectManager", + "GetManagedObjects" + ); + + if (!getManagedObjects) { + logMallocError(); + } else { + DBusMessage *managedObjects = dbus_connection_send_with_reply_and_block( + bus, getManagedObjects, -1, &error + ); + + dbus_message_unref(getManagedObjects); + getManagedObjects = NULL; + + if (dbus_error_is_set(&error)) { + logDBusError("send message", &error); + dbus_error_free(&error); + } else if (!managedObjects) { + logMallocError(); + } else { + DBusMessageIter args; + + if (dbus_message_iter_init(managedObjects, &args) == FALSE) { + logMessage(LOG_ERR, "reply has no arguments"); + } else if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_ARRAY) { + logMessage(LOG_ERR, "expecting an array"); + } else { + DBusMessageIter objects; + dbus_message_iter_recurse(&args, &objects); + + while (dbus_message_iter_get_arg_type(&objects) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter object; + dbus_message_iter_recurse(&objects, &object); + + if (dbus_message_iter_get_arg_type(&object) == DBUS_TYPE_OBJECT_PATH) { + // DBus path to talk to this object + dbus_message_iter_next(&object); + + if (dbus_message_iter_get_arg_type(&object) == DBUS_TYPE_ARRAY) { + DBusMessageIter interfaces; + dbus_message_iter_recurse(&object, &interfaces); + + while (dbus_message_iter_get_arg_type(&interfaces) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter interface; + dbus_message_iter_recurse(&interfaces, &interface); + + if (dbus_message_iter_get_arg_type(&interface) == DBUS_TYPE_STRING) { + const char *interfaceName; + dbus_message_iter_get_basic(&interface, &interfaceName); + + if (strcmp(interfaceName, "org.bluez.Device1") == 0) { + dbus_message_iter_next(&interface); + + if (dbus_message_iter_get_arg_type(&interface) == DBUS_TYPE_ARRAY) { + DiscoveredBluetoothDevice device; + memset(&device, 0, sizeof(device)); + + DBusMessageIter properties; + dbus_message_iter_recurse(&interface, &properties); + + while (DBUS_TYPE_DICT_ENTRY == dbus_message_iter_get_arg_type(&properties)) { + DBusMessageIter property; + dbus_message_iter_recurse(&properties, &property); + + if (dbus_message_iter_get_arg_type(&property) == DBUS_TYPE_STRING) { + const char *propertyName; + + dbus_message_iter_get_basic(&property, &propertyName); + dbus_message_iter_next(&property); + + if (dbus_message_iter_get_arg_type(&property) == DBUS_TYPE_VARIANT) { + DBusMessageIter variant; + dbus_message_iter_recurse(&property, &variant); + + if ((strcmp(propertyName, "Address") == 0) && + (dbus_message_iter_get_arg_type(&variant) == DBUS_TYPE_STRING)) { + const char *address; + dbus_message_iter_get_basic(&variant, &address); + bthParseAddress(&device.address, address); + } else if ((strcmp(propertyName, "Name") == 0) && + (dbus_message_iter_get_arg_type(&variant) == DBUS_TYPE_STRING)) { + const char *name; + dbus_message_iter_get_basic(&variant, &name); + device.name = name; + } else if ((strcmp(propertyName, "Paired") == 0) && + (dbus_message_iter_get_arg_type(&variant) == DBUS_TYPE_BOOLEAN)) { + dbus_bool_t paired; + dbus_message_iter_get_basic(&variant, &paired); + device.paired = paired == TRUE; + } + } + } + + dbus_message_iter_next(&properties); + } + + if (device.address) { + if (testDevice(&device, data)) { + found = 1; + } + } + } + } + } + + if (found) break; + dbus_message_iter_next(&interfaces); + } + } + } + + if (found) break; + dbus_message_iter_next(&objects); + } + } + + dbus_message_unref(managedObjects); + managedObjects = NULL; + } + } + + dbus_connection_unref(bus); + bus = NULL; + } +#endif /* HAVE_PKG_DBUS */ +} diff -Nru brltty-5.4/Programs/bluetooth_names.c brltty-5.5/Programs/bluetooth_names.c --- brltty-5.4/Programs/bluetooth_names.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bluetooth_names.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -21,8 +21,11 @@ #include "bluetooth_internal.h" #define BLUETOOTH_NAME_DRIVERS(name, ...) static const char *const bluetoothNameDrivers_##name[] = {__VA_ARGS__, NULL} +BLUETOOTH_NAME_DRIVERS(Actilino, "ht"); BLUETOOTH_NAME_DRIVERS(ActiveBraille, "ht"); +BLUETOOTH_NAME_DRIVERS(ActiveStar, "ht"); BLUETOOTH_NAME_DRIVERS(AlvaBC, "al"); +BLUETOOTH_NAME_DRIVERS(Apex, "bn"); BLUETOOTH_NAME_DRIVERS(BasicBraille, "ht"); BLUETOOTH_NAME_DRIVERS(BaumConny, "bm"); BLUETOOTH_NAME_DRIVERS(BaumPocketVario, "bm"); @@ -33,17 +36,20 @@ BLUETOOTH_NAME_DRIVERS(BrailleMemoPocket, "mm"); BLUETOOTH_NAME_DRIVERS(BrailleMemoSmart, "mm"); BLUETOOTH_NAME_DRIVERS(BrailleMemo32, "mm"); +BLUETOOTH_NAME_DRIVERS(BrailleNoteTouch, "hw"); BLUETOOTH_NAME_DRIVERS(BrailleSense, "hm"); BLUETOOTH_NAME_DRIVERS(BrailleStar, "ht"); BLUETOOTH_NAME_DRIVERS(Braillex, "pm"); BLUETOOTH_NAME_DRIVERS(BrailliantBI, "hw"); BLUETOOTH_NAME_DRIVERS(Brailliant80, "hw"); +BLUETOOTH_NAME_DRIVERS(Braillino, "ht"); BLUETOOTH_NAME_DRIVERS(B2G, "bm"); BLUETOOTH_NAME_DRIVERS(Conny, "bm"); BLUETOOTH_NAME_DRIVERS(EL12, "al", "vo"); BLUETOOTH_NAME_DRIVERS(Focus, "fs"); BLUETOOTH_NAME_DRIVERS(HWGBrailliant, "bm"); BLUETOOTH_NAME_DRIVERS(MB248, "md"); +BLUETOOTH_NAME_DRIVERS(OrbitReader, "bm"); BLUETOOTH_NAME_DRIVERS(Pronto, "bm"); BLUETOOTH_NAME_DRIVERS(Refreshabraille, "bm"); BLUETOOTH_NAME_DRIVERS(SuperVario, "bm"); @@ -52,15 +58,27 @@ BLUETOOTH_NAME_DRIVERS(VarioUltra, "bm"); const BluetoothNameEntry bluetoothNameTable[] = { - { .namePrefix = "Active Braille", + { .namePrefix = "Actilino ALO", + .driverCodes = bluetoothNameDrivers_Actilino + }, + + { .namePrefix = "Active Braille AB", .driverCodes = bluetoothNameDrivers_ActiveBraille }, + { .namePrefix = "Active Star AS", + .driverCodes = bluetoothNameDrivers_ActiveStar + }, + { .namePrefix = "ALVA BC", .driverCodes = bluetoothNameDrivers_AlvaBC }, - { .namePrefix = "Basic Braille", + { .namePrefix = "Apex", + .driverCodes = bluetoothNameDrivers_Apex + }, + + { .namePrefix = "Basic Braille BB", .driverCodes = bluetoothNameDrivers_BasicBraille }, @@ -100,6 +118,10 @@ .driverCodes = bluetoothNameDrivers_BrailleMemo32 }, + { .namePrefix = "BrailleNote Touch", + .driverCodes = bluetoothNameDrivers_BrailleNoteTouch + }, + { .namePrefix = "BrailleSense", .driverCodes = bluetoothNameDrivers_BrailleSense }, @@ -120,6 +142,10 @@ .driverCodes = bluetoothNameDrivers_Brailliant80 }, + { .namePrefix = "Braillino BL", + .driverCodes = bluetoothNameDrivers_Braillino + }, + { .namePrefix = "B2G", .driverCodes = bluetoothNameDrivers_B2G }, @@ -144,6 +170,10 @@ .driverCodes = bluetoothNameDrivers_MB248 }, + { .namePrefix = "Orbit Reader", + .driverCodes = bluetoothNameDrivers_OrbitReader + }, + { .namePrefix = "Pronto!", .driverCodes = bluetoothNameDrivers_Pronto }, diff -Nru brltty-5.4/Programs/bluetooth_none.c brltty-5.5/Programs/bluetooth_none.c --- brltty-5.4/Programs/bluetooth_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bluetooth_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -91,3 +91,9 @@ errno = ENOSYS; return NULL; } + +void +bthProcessDiscoveredDevices ( + DiscoveredBluetoothDeviceTester *testDevice, void *data +) { +} diff -Nru brltty-5.4/Programs/bluetooth_windows.c brltty-5.5/Programs/bluetooth_windows.c --- brltty-5.4/Programs/bluetooth_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/bluetooth_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -175,8 +175,9 @@ } typedef union { + double ensureCorrectAlignment; + unsigned char ensureAdequateSize[0X1000]; WSAQUERYSET querySet; - unsigned char bytes[0X1000]; } BluetoothServiceLookupResult; static int @@ -226,13 +227,13 @@ found = 1; } else { static const DWORD exceptions[] = { - #ifdef WSA_E_NO_MORE +#ifdef WSA_E_NO_MORE WSA_E_NO_MORE, - #endif /* WSA_E_NO_MORE */ +#endif /* WSA_E_NO_MORE */ - #ifdef WSAENOMORE +#ifdef WSAENOMORE WSAENOMORE, - #endif /* WSAENOMORE */ +#endif /* WSAENOMORE */ NO_ERROR }; @@ -397,3 +398,71 @@ return NULL; } + +void +bthProcessDiscoveredDevices ( + DiscoveredBluetoothDeviceTester *testDevice, void *data +) { + if (bthStartSockets()) { + HANDLE handle; + + WSAQUERYSET restrictions = { + .dwNameSpace = NS_BTH, + .dwSize = sizeof(restrictions) + }; + + if (WSALookupServiceBegin(&restrictions, LUP_CONTAINERS, &handle) != SOCKET_ERROR) { + while (1) { + BluetoothServiceLookupResult result; + DWORD resultLength = sizeof(result); + + if (WSALookupServiceNext(handle, + (LUP_RETURN_ADDR | LUP_RETURN_NAME | LUP_RETURN_BLOB), + &resultLength, &result.querySet) == SOCKET_ERROR) { + static const DWORD exceptions[] = { +#ifdef WSA_E_NO_MORE + WSA_E_NO_MORE, +#endif /* WSA_E_NO_MORE */ + +#ifdef WSAENOMORE + WSAENOMORE, +#endif /* WSAENOMORE */ + + NO_ERROR + }; + + bthSocketError("WSALookupServiceNext", exceptions); + break; + } + + if (result.querySet.dwNumberOfCsAddrs == 1) { + DiscoveredBluetoothDevice device; + memset(&device, 0, sizeof(device)); + + { + BTH_ADDR address = ((SOCKADDR_BTH *)result.querySet.lpcsaBuffer->RemoteAddr.lpSockaddr)->btAddr; + device.address = ((uint64_t)GET_NAP(address) << 0X20) | (uint64_t)GET_SAP(address); + } + + { + char *name = result.querySet.lpszServiceInstanceName; + if (name && *name) device.name = name; + } + + { + BTH_DEVICE_INFO *info = (BTH_DEVICE_INFO *)result.querySet.lpBlob->pBlobData; + device.paired = !!(info->flags & BDIF_PAIRED); + } + + if (testDevice(&device, data)) break; + } + } + + if (WSALookupServiceEnd(handle) == SOCKET_ERROR) { + bthSocketError("WSALookupServiceEnd", NULL); + } + } else { + bthSocketError("WSALookupServiceBegin", NULL); + } + } +} diff -Nru brltty-5.4/Programs/brlapi.awk brltty-5.5/Programs/brlapi.awk --- brltty-5.4/Programs/brlapi.awk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi.awk 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Programs/brlapi_brldefs.awk brltty-5.5/Programs/brlapi_brldefs.awk --- brltty-5.4/Programs/brlapi_brldefs.awk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_brldefs.awk 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Programs/brlapi_client.c brltty-5.5/Programs/brlapi_client.c --- brltty-5.4/Programs/brlapi_client.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_client.c 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2016 by + * Copyright (C) 2002-2017 by * Samuel Thibault * Sébastien Hinderer * @@ -371,18 +371,21 @@ sem_t sem; again: pthread_mutex_lock(&handle->read_mutex); - if (!handle->reading) doread = handle->reading = 1; - else { + if (!handle->reading) { + doread = handle->reading = 1; + } else { if ( #ifndef WINDOWS !sem_init || !sem_post || !sem_wait || !sem_destroy || #endif /* WINDOWS */ handle->altSem) { /* This can't happen without threads */ + pthread_mutex_unlock(&handle->read_mutex); syslog(LOG_ERR,"third call to brlapi_waitForPacket !"); brlapi_errno = BRLAPI_ERROR_ILLEGAL_INSTRUCTION; return -1; } + handle->altExpectedPacketType = expectedPacketType; handle->altPacket = packet; handle->altSize = size; @@ -724,7 +727,12 @@ case BRLAPI_AUTH_KEY: { size_t authKeyLength; int res; - if (brlapi_loadAuthKey(settings.auth, &authKeyLength, (void *) &auth->key) < 0) + char *keyfile = brlapi_getKeyFile(settings.auth); + if (!keyfile) + continue; + res = brlapi_loadAuthKey(keyfile, &authKeyLength, (void *) &auth->key); + free(keyfile); + if (res < 0) continue; res = brlapi_writePacket(handle->fileDescriptor, BRLAPI_PACKET_AUTH, auth, sizeof(auth->type)+authKeyLength); @@ -954,7 +962,7 @@ uint32_t displaySize[2]; ssize_t res; - if (handle->brlx*handle->brly) { *x = handle->brlx; *y = handle->brly; return 0; } + if (handle->brlx&&handle->brly) { *x = handle->brlx; *y = handle->brly; return 0; } res = brlapi__request(handle, BRLAPI_PACKET_GETDISPLAYSIZE, displaySize, sizeof(displaySize)); if (res==-1) { return -1; } handle->brlx = ntohl(displaySize[0]); @@ -1222,6 +1230,7 @@ switch(eaten) { case (size_t)(-2): errno = EILSEQ; + /* fall through */ case (size_t)(-1): brlapi_libcerrno = errno; brlapi_errfun = "mbrlen"; @@ -1531,7 +1540,7 @@ pthread_mutex_unlock(&handle->key_mutex); if (res == -3) { if (!block) return 0; - brlapi_libcerrno = block?EINTR:EAGAIN; + brlapi_libcerrno = EINTR; brlapi_errno = BRLAPI_ERROR_LIBCERR; brlapi_errfun = "waitForPacket"; return -1; diff -Nru brltty-5.4/Programs/brlapi_common.h brltty-5.5/Programs/brlapi_common.h --- brltty-5.4/Programs/brlapi_common.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_common.h 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2016 by + * Copyright (C) 2002-2017 by * Samuel Thibault * Sébastien Hinderer * @@ -325,10 +325,12 @@ } brlapi_packetTypeEntry_t; static const brlapi_packetTypeEntry_t brlapi_packetTypeTable[] = { + { BRLAPI_PACKET_VERSION, "Version" }, { BRLAPI_PACKET_AUTH, "Auth" }, { BRLAPI_PACKET_GETDRIVERNAME, "GetDriverName" }, { BRLAPI_PACKET_GETDISPLAYSIZE, "GetDisplaySize" }, { BRLAPI_PACKET_ENTERTTYMODE, "EnterTtyMode" }, + { BRLAPI_PACKET_SETFOCUS, "SetFocus" }, { BRLAPI_PACKET_LEAVETTYMODE, "LeaveTtyMode" }, { BRLAPI_PACKET_KEY, "Key" }, { BRLAPI_PACKET_IGNOREKEYRANGES, "IgnoreKeyRanges" }, @@ -415,3 +417,23 @@ brlapi_errno = BRLAPI_ERROR_INVALID_PARAMETER; return -1; } + +static char * +BRLAPI(getKeyFile)(const char *auth) +{ + const char *path; + char *ret, *delim; + if (!strncmp(auth,"keyfile:",8)) + path=auth+8; + else { + path=strstr(auth,"+keyfile:"); + if (path) path+=9; + else path=auth; + } + ret=strdup(path); + delim=strchr(ret,'+'); + if (delim) + *delim = 0; + return ret; +} + diff -Nru brltty-5.4/Programs/brlapi_constants.awk brltty-5.5/Programs/brlapi_constants.awk --- brltty-5.4/Programs/brlapi_constants.awk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_constants.awk 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Programs/brlapi.h.in brltty-5.5/Programs/brlapi.h.in --- brltty-5.4/Programs/brlapi.h.in 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi.h.in 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2016 by + * Copyright (C) 2002-2017 by * Samuel Thibault * Sébastien Hinderer * @@ -138,7 +138,7 @@ /* No authentication by default on Windows */ #define BRLAPI_DEFAUTH "none" #else -#define BRLAPI_DEFAUTH BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE +#define BRLAPI_DEFAUTH "polkit+keyfile:" BRLAPI_ETCDIR "/" BRLAPI_AUTHKEYFILE #endif /* BRLAPI_WIN32 */ #ifdef __MINGW32__ diff -Nru brltty-5.4/Programs/brlapi_keycodes.h brltty-5.5/Programs/brlapi_keycodes.h --- brltty-5.4/Programs/brlapi_keycodes.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_keycodes.h 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2016 by + * Copyright (C) 2002-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Programs/brlapi_keyranges.c brltty-5.5/Programs/brlapi_keyranges.c --- brltty-5.4/Programs/brlapi_keyranges.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_keyranges.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/brlapi_keyranges.h brltty-5.5/Programs/brlapi_keyranges.h --- brltty-5.4/Programs/brlapi_keyranges.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_keyranges.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/brlapi_keytab.awk brltty-5.5/Programs/brlapi_keytab.awk --- brltty-5.4/Programs/brlapi_keytab.awk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_keytab.awk 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Programs/brlapi_protocol.h brltty-5.5/Programs/brlapi_protocol.h --- brltty-5.4/Programs/brlapi_protocol.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_protocol.h 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * libbrlapi - A library providing access to braille terminals for applications. * - * Copyright (C) 2002-2016 by + * Copyright (C) 2002-2017 by * Samuel Thibault * Sébastien Hinderer * diff -Nru brltty-5.4/Programs/brlapi_server.c brltty-5.5/Programs/brlapi_server.c --- brltty-5.4/Programs/brlapi_server.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brlapi_server.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -18,6 +18,20 @@ /* api_server.c : Main file for BrlApi server */ +#define SERVER_SOCKET_LIMIT 4 +#define SERVER_SELECT_TIMEOUT 1 +#define UNAUTH_LIMIT 5 +#define UNAUTH_TIMEOUT 30 +#define OUR_STACK_MIN 0X10000 + +#ifndef PTHREAD_STACK_MIN +#define PTHREAD_STACK_MIN OUR_STACK_MIN +#endif /* PTHREAD_STACK_MIN */ + +#define RELEASE "BrlAPI Server: release " BRLAPI_RELEASE +#define COPYRIGHT " Copyright (C) 2002-2017 by Sébastien Hinderer , \ +Samuel Thibault " + #include "prologue.h" #include @@ -97,14 +111,6 @@ #undef PF_LOCAL #endif /* __CYGWIN__ */ -#define UNAUTH_MAX 5 -#define UNAUTH_DELAY 30 - -#define OUR_STACK_MIN 0X10000 -#ifndef PTHREAD_STACK_MIN -#define PTHREAD_STACK_MIN OUR_STACK_MIN -#endif /* PTHREAD_STACK_MIN */ - typedef enum { PARM_AUTH, PARM_HOST, @@ -116,10 +122,6 @@ static size_t stackSize; static AsyncEvent *flushEvent; -#define RELEASE "BrlAPI Server: release " BRLAPI_RELEASE -#define COPYRIGHT " Copyright (C) 2002-2016 by Sébastien Hinderer , \ -Samuel Thibault " - #define WERR(x, y, ...) do { \ logMessage(LOG_ERR, "writing error %d to %"PRIfd, y, x); \ logMessage(LOG_ERR, __VA_ARGS__); \ @@ -221,11 +223,9 @@ struct Tty *subttys; /* children */ } Tty; -#define MAXSOCKETS 4 /* who knows what users want to do... */ - /* Pointer to the connection accepter thread */ static pthread_t serverThread; /* server */ -static pthread_t socketThreads[MAXSOCKETS]; /* socket binding threads */ +static pthread_t socketThreads[SERVER_SOCKET_LIMIT]; /* socket binding threads */ static int running; /* should threads be running? */ static char **socketHosts = NULL; /* socket local hosts */ static struct socketInfo { @@ -236,8 +236,11 @@ #ifdef __MINGW32__ OVERLAPPED overl; #endif /* __MINGW32__ */ -} socketInfo[MAXSOCKETS]; /* information for cleaning sockets */ -static int numSockets; /* number of sockets */ +} socketInfo[SERVER_SOCKET_LIMIT]; /* information for cleaning sockets */ + +static int serverSocketCount; /* number of sockets */ +static int serverSocketsPending; /* number of sockets not opened yet */ +pthread_mutex_t serverSocketsMutex; /* Protects from connection addition / remove from the server thread */ pthread_mutex_t apiConnectionsMutex; @@ -250,8 +253,12 @@ static Connection *rawConnection = NULL; static Connection *suspendConnection = NULL; -/* mutex lock order is apiConnectionsMutex first, then apiRawMutex, then (acceptedKeysMutex - * or brailleWindowMutex) then apiDriverMutex */ +/* mutex lock order is as follows: + * 1. apiConnectionsMutex + * 2. apiRawMutex + * 3. acceptedKeysMutex or brailleWindowMutex + * 4. apiDriverMutex +*/ static Tty notty; static Tty ttys; @@ -303,6 +310,7 @@ static int coreActive; /* Whether core is active */ static int offline; /* Whether device is offline */ static int driverConstructed; /* Whether device is really opened, protected by apiDriverMutex */ +static int driverConstructing; /* Whether device being constructed, protected by apiDriverMutex */ static wchar_t *coreWindowText; /* Last text written by the core */ static unsigned char *coreWindowDots; /* Last dots written by the core */ static int coreWindowCursor; /* Last cursor position set by the core */ @@ -362,6 +370,7 @@ /* Re-open driver */ static int resumeDriver(BrailleDisplay *brl) { if (trueBraille == &noBraille) return 0; /* core unlinked api */ + driverConstructing = 1; lockMutex(&apiSuspendMutex); driverConstructed = constructBrailleDriver(); if (driverConstructed) { @@ -369,6 +378,7 @@ brlResize(brl); } unlockMutex(&apiSuspendMutex); + driverConstructing = 0; return driverConstructed; } @@ -412,7 +422,7 @@ uint32_t buf[2]; buf[0] = htonl(key >> 32); buf[1] = htonl(key & 0xffffffff); - logMessage(LOG_CATEGORY(SERVER_EVENTS), "writing key %08"PRIx32" %08"PRIx32,buf[0],buf[1]); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "writing key %08"PRIx32" %08"PRIx32" to fd %"PRIfd,buf[0],buf[1],fd); brlapiserver_writePacket(fd,BRLAPI_PACKET_KEY,&buf,sizeof(buf)); } @@ -662,8 +672,10 @@ outmalloc: free(c); out: - writeError(fd,BRLAPI_ERROR_NOMEM); - closeFileDescriptor(fd); + if (fd != INVALID_FILE_DESCRIPTOR) { + writeError(fd,BRLAPI_ERROR_NOMEM); + closeFileDescriptor(fd); + } return NULL; } @@ -913,7 +925,7 @@ __addConnection(c,tty->connections); unlockMutex(&apiConnectionsMutex); writeAck(c->fd); - logMessage(LOG_CATEGORY(SERVER_EVENTS), "taking control of tty %#010x (how=%d)",tty->number,how); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "fd %"PRIfd" taking control of tty %#010x (how=%d)",c->fd,tty->number,how); return 0; } @@ -923,7 +935,8 @@ CHECKEXC(!c->raw,BRLAPI_ERROR_ILLEGAL_INSTRUCTION,"not allowed in raw mode"); CHECKEXC(c->tty,BRLAPI_ERROR_ILLEGAL_INSTRUCTION,"not allowed out of tty mode"); c->tty->focus = ntohl(ints[0]); - logMessage(LOG_CATEGORY(SERVER_EVENTS), "focus on window %#010x",c->tty->focus); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "focus on window %#010x from fd%"PRIfd,c->tty->focus,c->fd); + asyncSignalEvent(flushEvent, NULL); return 0; } @@ -932,7 +945,7 @@ static void doLeaveTty(Connection *c) { Tty *tty = c->tty; - logMessage(LOG_CATEGORY(SERVER_EVENTS), "releasing tty %#010x",tty->number); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "fd %"PRIfd"releasing tty %#010x",c->fd,tty->number); c->tty = NULL; lockMutex(&apiConnectionsMutex); __removeConnection(c); @@ -959,12 +972,12 @@ unsigned int i; CHECKERR(!c->raw,BRLAPI_ERROR_ILLEGAL_INSTRUCTION,"not allowed in raw mode"); CHECKERR(c->tty,BRLAPI_ERROR_ILLEGAL_INSTRUCTION,"not allowed out of tty mode"); - CHECKERR(!(size%2*sizeof(brlapi_keyCode_t)),BRLAPI_ERROR_INVALID_PACKET,"wrong packet size"); + CHECKERR(!(size%(2*sizeof(brlapi_keyCode_t))),BRLAPI_ERROR_INVALID_PACKET,"wrong packet size"); lockMutex(&c->acceptedKeysMutex); for (i=0; ifd,x,y); if (type==BRLAPI_PACKET_IGNOREKEYRANGES) res = removeKeyrange(x,y,&c->acceptedKeys); else res = addKeyrange(x,y,&c->acceptedKeys); if (res==-1) { @@ -1023,7 +1036,7 @@ BRLAPI_ERROR_INVALID_PARAMETER, "invalid region" ); } else { - logMessage(LOG_CATEGORY(SERVER_EVENTS), "warning: client uses deprecated regionBegin=0 and regionSize = 0"); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "warning: fd %"PRIfd" uses deprecated regionBegin=0 and regionSize = 0",c->fd); rbeg = 1; rsiz = displaySize; } @@ -1083,7 +1096,7 @@ wchar_t textBuf[rsiz]; char *in = (char *) text, *out = (char *) textBuf; size_t sin = textLen, sout = sizeof(textBuf), res; - logMessage(LOG_CATEGORY(SERVER_EVENTS), "charset %s", charset); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "fd %"PRIfd" charset %s",c->fd,charset); CHECKEXC((conv = iconv_open(getWcharCharset(),charset)) != (iconv_t)(-1), BRLAPI_ERROR_INVALID_PACKET, "invalid charset"); res = iconv(conv,&in,&sin,&out,&sout); iconv_close(conv); @@ -1141,7 +1154,7 @@ return 0; } lockMutex(&apiDriverMutex); - if (!driverConstructed && (!disp || !resumeDriver(disp))) { + if (!driverConstructed && !driverConstructing && (!disp || !resumeDriver(disp))) { WERR(c->fd, BRLAPI_ERROR_DRIVERERROR,"driver resume error"); unlockMutex(&apiDriverMutex); unlockMutex(&apiRawMutex); @@ -1158,7 +1171,7 @@ static int handleLeaveRawMode(Connection *c, brlapi_packetType_t type, brlapi_packet_t *packet, size_t size) { CHECKERR(c->raw,BRLAPI_ERROR_ILLEGAL_INSTRUCTION,"not allowed out of raw mode"); - logMessage(LOG_CATEGORY(SERVER_EVENTS), "going out of raw mode"); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "fd %"PRIfd" going out of raw mode",c->fd); lockMutex(&apiRawMutex); c->raw = 0; rawConnection = NULL; @@ -1204,7 +1217,7 @@ suspendConnection = NULL; unlockMutex(&apiRawMutex); lockMutex(&apiDriverMutex); - if (!driverConstructed) resumeDriver(disp); + if (!driverConstructed && !driverConstructing) resumeDriver(disp); unlockMutex(&apiDriverMutex); writeAck(c->fd); return 0; @@ -1214,7 +1227,8 @@ handleGetDriverName, handleGetDisplaySize, handleEnterTtyMode, handleSetFocus, handleLeaveTtyMode, handleKeyRanges, handleKeyRanges, handleWrite, - handleEnterRawMode, handleLeaveRawMode, handlePacket, handleSuspendDriver, handleResumeDriver + handleEnterRawMode, handleLeaveRawMode, handlePacket, + handleSuspendDriver, handleResumeDriver, }; static void handleNewConnection(Connection *c) @@ -1225,6 +1239,18 @@ brlapiserver_writePacket(c->fd,BRLAPI_PACKET_VERSION,&versionPacket.data,sizeof(versionPacket.version)); } +static int +hasKeyFile(const char *auth) +{ + if (isAbsolutePath(auth)) + return 1; + if (!strncmp(auth,"keyfile:", 8)) + return 1; + if (strstr(auth,"+keyfile:")) + return 1; + return 0; +} + /* Function : handleUnauthorizedConnection */ /* Returns 1 if connection has to be removed */ static int handleUnauthorizedConnection(Connection *c, brlapi_packetType_t type, brlapi_packet_t *packet, size_t size) @@ -1252,7 +1278,7 @@ unauthConnections--; c->auth = 1; } else { - if (isAbsolutePath(auth)) + if (hasKeyFile(auth)) authPacket->type[nbmethods++] = htonl(BRLAPI_AUTH_KEY); c->auth = 0; } @@ -1288,15 +1314,19 @@ if (authDescriptor) authCorrect = authPerform(authDescriptor, c->fd); break; case BRLAPI_AUTH_KEY: - if (isAbsolutePath(auth)) { - if (brlapiserver_loadAuthKey(auth,&authKeyLength,&authKey)==-1) { - logMessage(LOG_WARNING,"Unable to load API authorization key from %s: %s in %s. You may use parameter auth=none if you don't want any authorization (dangerous)", auth, strerror(brlapi_libcerrno), brlapi_errfun); + if (hasKeyFile(auth)) { + char *path = brlapiserver_getKeyFile(auth); + int ret = brlapiserver_loadAuthKey(path,&authKeyLength,&authKey); + if (ret==-1) { + logMessage(LOG_WARNING,"Unable to load API authorization key from %s: %s in %s. You may use parameter auth=none if you don't want any authorization (dangerous)", path, strerror(brlapi_libcerrno), brlapi_errfun); + free(path); break; } + free(path); logMessage(LOG_CATEGORY(SERVER_EVENTS), "authorization key loaded"); authCorrect = (remaining==authKeyLength) && (!memcmp(&authPacket->key, &authKey, authKeyLength)); memset(&authKey, 0, authKeyLength); - memset(&authPacket->key, 0, authKeyLength); + memset(&authPacket->key, 0, remaining); } break; default: @@ -1356,7 +1386,7 @@ suspendConnection = NULL; logMessage(LOG_WARNING,"Client on fd %"PRIfd" did not give up suspended mode properly",c->fd); lockMutex(&apiDriverMutex); - if (!driverConstructed && (!disp || !resumeDriver(disp))) + if (!driverConstructed && !driverConstructing && (!disp || !resumeDriver(disp))) logMessage(LOG_WARNING,"Couldn't resume braille driver"); if (driverConstructed && trueBraille->reset) { logMessage(LOG_CATEGORY(SERVER_EVENTS), "trying to reset braille terminal"); @@ -1694,6 +1724,7 @@ int n; FileDescriptor fd; fd = open(path, O_RDONLY); + if (fd == -1) return 0; n = read(fd, pids, sizeof(pids)-1); closeFileDescriptor(fd); if (n == -1) return 0; @@ -1864,7 +1895,7 @@ if (res == -1) { if (errno != ENOSPC) { logSystemError("writing pid in local socket lock"); - goto outtmp; + goto outlockfd; } approximateDelay(1000); @@ -1934,6 +1965,8 @@ unlink(lockpath); outtmp: unlink(tmppath); +outlockfd: + closeFileDescriptor(lock); #endif /* __MINGW32__ */ outfd: closeFileDescriptor(fd); @@ -1970,7 +2003,7 @@ int i; struct socketInfo *info; - for (i=0;iconnections->next; - while (c!=tty->connections) { + + while (c != tty->connections) { int remove = 0; next = c->next; + #ifdef __MINGW32__ - if (WaitForSingleObject(c->packet.overl.hEvent,0) == WAIT_OBJECT_0) + if (WaitForSingleObject(c->packet.overl.hEvent, 0) == WAIT_OBJECT_0) #else /* __MINGW32__ */ if (FD_ISSET(c->fd, fds)) #endif /* __MINGW32__ */ + { remove = processRequest(c, &packetHandlers); - else remove = c->auth!=1 && currentTime-(c->upTime) > UNAUTH_DELAY; + } else { + remove = (c->auth != 1) && ((currentTime - c->upTime) > UNAUTH_TIMEOUT); + } + #ifndef __MINGW32__ FD_CLR(c->fd,fds); #endif /* __MINGW32__ */ + if (remove) removeFreeConnection(c); c = next; } } + { Tty *t,*next; for (t = tty->subttys; t; t = next) { @@ -2136,11 +2177,15 @@ createSocket(num); } + lockMutex(&serverSocketsMutex); + serverSocketsPending -= 1; + unlockMutex(&serverSocketsMutex); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "socket creation finished: %"PRIdPTR, num); return NULL; } -/* Function : server */ +/* Function : runServer */ /* The server thread */ /* Returns NULL in any case */ THREAD_FUNCTION(runServer) { @@ -2161,31 +2206,37 @@ int nbHandles = 0; #else /* __MINGW32__ */ int fdmax; - struct timeval tv; - int n; #endif /* __MINGW32__ */ logMessage(LOG_CATEGORY(SERVER_EVENTS), "server thread started"); if (!prepareThread()) goto finished; - socketHosts = splitString(hosts,'+',&numSockets); - if (numSockets>MAXSOCKETS) { - logMessage(LOG_ERR,"too many hosts specified (%d, max %d)",numSockets,MAXSOCKETS); + if (auth && !isAbsolutePath(auth)) { + if (!(authDescriptor = authBeginServer(auth))) { + logMessage(LOG_WARNING, "Unable to start auth server"); + goto finished; + } + } + + socketHosts = splitString(hosts,'+',&serverSocketCount); + if (serverSocketCount > SERVER_SOCKET_LIMIT) { + logMessage(LOG_ERR, "too many hosts specified: %d > %d)", + serverSocketCount, SERVER_SOCKET_LIMIT); goto finished; } - if (numSockets == 0) { + if (serverSocketCount == 0) { logMessage(LOG_INFO,"no hosts specified"); goto finished; } #ifdef __MINGW32__ - nbAlloc = numSockets; + nbAlloc = serverSocketCount; #endif /* __MINGW32__ */ pthread_attr_init(&attr); /* don't care if it fails */ pthread_attr_setstacksize(&attr,stackSize); - for (i=0;i=0) { FD_SET(socketInfo[i].fd, &sockset); @@ -2295,19 +2353,30 @@ addTtyFds(&sockset, &fdmax, &ttys); unlockMutex(&apiConnectionsMutex); - tv.tv_sec = 1; - tv.tv_usec = 0; + { + struct timeval tv, *timeout; - if ((n=select(fdmax+1, &sockset, NULL, NULL, &tv))<0) { - if (fdmax==0) continue; /* still no server socket */ - logMessage(LOG_WARNING,"select: %s",strerror(errno)); - break; + lockMutex(&serverSocketsMutex); + if (unauthConnections || serverSocketsPending) { + memset(&tv, 0, sizeof(tv)); + tv.tv_sec = SERVER_SELECT_TIMEOUT; + timeout = &tv; + } else { + timeout = NULL; + } + unlockMutex(&serverSocketsMutex); + + if (select(fdmax+1, &sockset, NULL, NULL, timeout) < 0) { + if (fdmax==0) continue; /* still no server socket */ + logMessage(LOG_WARNING,"select: %s",strerror(errno)); + break; + } } #endif /* __MINGW32__ */ time(¤tTime); - for (i=0;i=UNAUTH_MAX) { + if (unauthConnections >= UNAUTH_LIMIT) { writeError(resfd, BRLAPI_ERROR_CONNREFUSED); closeFileDescriptor(resfd); @@ -2706,7 +2775,7 @@ } /* somebody gets the raw code */ if ((c = whoGetsKey(&ttys,clientCode,BRL_KEYCODES))) { - logMessage(LOG_CATEGORY(SERVER_EVENTS), "transmitting accepted key %016"BRLAPI_PRIxKEYCODE, clientCode); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "transmitting accepted key %016"BRLAPI_PRIxKEYCODE" to fd %"PRIfd,clientCode,c->fd); writeKey(c->fd,clientCode); return 1; } @@ -2766,7 +2835,7 @@ } if (c) { - logMessage(LOG_CATEGORY(SERVER_EVENTS), "transmitting accepted command %lx as client code %016"BRLAPI_PRIxKEYCODE,(unsigned long)command, code); + logMessage(LOG_CATEGORY(SERVER_EVENTS), "transmitting accepted command %lx as client code %016"BRLAPI_PRIxKEYCODE" to fd %"PRIfd,(unsigned long)command,code,c->fd); writeKey(c->fd, code); return 1; } @@ -2830,6 +2899,7 @@ */ int api_flush(BrailleDisplay *brl) { Connection *c; + static Connection *displayed_last; int ok = 1; int drain = 0; int update = 0; @@ -2845,7 +2915,7 @@ if (!offline && c) { lockMutex(&c->brailleWindowMutex); lockMutex(&apiDriverMutex); - if (!driverConstructed) { + if (!driverConstructed && !driverConstructing) { if (!resumeDriver(brl)) { unlockMutex(&apiDriverMutex); unlockMutex(&c->brailleWindowMutex); @@ -2863,7 +2933,7 @@ } } - if (c->brlbufstate==TODISPLAY || update) { + if (c != displayed_last || c->brlbufstate==TODISPLAY || update) { unsigned char *oldbuf = disp->buffer, buf[displaySize]; disp->buffer = buf; getDots(&c->brailleWindow, buf); @@ -2871,6 +2941,7 @@ ok = trueBraille->writeWindow(brl, c->brailleWindow.text); drain = 1; disp->buffer = oldbuf; + displayed_last = c; } unlockMutex(&apiDriverMutex); unlockMutex(&c->brailleWindowMutex); @@ -2883,9 +2954,7 @@ unsigned char *oldbuf = disp->buffer; disp->buffer = coreWindowDots; brl->cursor = coreWindowCursor; - lockMutex(&apiDriverMutex); trueBraille->writeWindow(brl, coreWindowText); - unlockMutex(&apiDriverMutex); disp->buffer = oldbuf; suspendDriver(brl); } @@ -2928,10 +2997,11 @@ /* try to get access to device. If suspended, returns 0 */ int api_claimDriver (BrailleDisplay *brl) { + int ret; lockMutex(&apiSuspendMutex); - if (driverConstructed) return 1; + ret = driverConstructed; unlockMutex(&apiSuspendMutex); - return 0; + return ret; } void api_releaseDriver(BrailleDisplay *brl) @@ -3071,10 +3141,6 @@ if (*operand) auth = operand; } - if (auth && !isAbsolutePath(auth)) - if (!(authDescriptor = authBeginServer(auth))) - return 0; - pthread_attr_t attr; pthread_mutexattr_t mattr; @@ -3118,7 +3184,7 @@ logMessage(LOG_WARNING,"pthread_create: %s",strerror(res)); running = 0; - for (i=0;i #include #include +#include +#include #include #include "embed.h" @@ -440,6 +442,28 @@ return changeStringValue(env, changeScreenParameters_p, parameters); } +JAVA_METHOD ( + org_a11y_brltty_core_CoreWrapper, setEnvironmentVariable, jboolean, + jstring jName, jstring jValue +) { + jboolean isCopy; + const char *cName = (*env)->GetStringUTFChars(env, jName, &isCopy); + const char *cValue = (*env)->GetStringUTFChars(env, jValue, &isCopy); + + int cResult = setenv(cName, cValue, 1) != -1; + jboolean jResult = cResult? JNI_TRUE: JNI_FALSE; + + if (cResult) { + LOG("environment variable set: %s: %s", cName, cValue); + } else { + LOG("environment variable not set: %s: %s", cName, strerror(errno)); + } + + (*env)->ReleaseStringUTFChars(env, jName, cName); + (*env)->ReleaseStringUTFChars(env, jValue, cValue); + return jResult; +} + JNIEXPORT jint JNI_OnLoad (JavaVM *vm, void *reserved) { JNIEnv *env; Binary files /tmp/tmphsLAQ2/bjNvgeUlmj/brltty-5.4/Programs/brltty-ktb and /tmp/tmphsLAQ2/HrDfrhBctY/brltty-5.5/Programs/brltty-ktb differ diff -Nru brltty-5.4/Programs/brltty-ktb.c brltty-5.5/Programs/brltty-ktb.c --- brltty-5.4/Programs/brltty-ktb.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brltty-ktb.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/brltty-trtxt.c brltty-5.5/Programs/brltty-trtxt.c --- brltty-5.4/Programs/brltty-trtxt.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brltty-trtxt.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -130,17 +130,18 @@ static int processStream (FILE *inputStream, const char *inputName) { mbstate_t inputState; - mbstate_t outputState; - memset(&inputState, 0, sizeof(inputState)); + + mbstate_t outputState; memset(&outputState, 0, sizeof(outputState)); while (!feof(inputStream)) { char inputBuffer[0X1000]; - size_t inputCount = fread(inputBuffer, 1, sizeof(inputBuffer), inputStream); + size_t inputCount = fread(inputBuffer, 1, sizeof(inputBuffer)-1, inputStream); if (ferror(inputStream)) goto inputError; if (!inputCount) break; + inputBuffer[inputCount] = 0; { char *byte = inputBuffer; diff -Nru brltty-5.4/Programs/brltty-ttb.c brltty-5.5/Programs/brltty-ttb.c --- brltty-5.4/Programs/brltty-ttb.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brltty-ttb.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -901,6 +901,11 @@ .read = readTable_libLouis, .write = writeTable_libLouis, }, + + { .name = "utb", + .read = readTable_libLouis, + .write = writeTable_libLouis, + }, { .name = "XCompose", .write = writeTable_XCompose, diff -Nru brltty-5.4/Programs/brltty-tune.c brltty-5.5/Programs/brltty-tune.c --- brltty-5.4/Programs/brltty-tune.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brltty-tune.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/brl_utils.c brltty-5.5/Programs/brl_utils.c --- brltty-5.4/Programs/brl_utils.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/brl_utils.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/charset.c brltty-5.5/Programs/charset.c --- brltty-5.4/Programs/charset.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/charset.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/charset_grub.c brltty-5.5/Programs/charset_grub.c --- brltty-5.4/Programs/charset_grub.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/charset_grub.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/charset_iconv.c brltty-5.5/Programs/charset_iconv.c --- brltty-5.4/Programs/charset_iconv.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/charset_iconv.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/charset_internal.h brltty-5.5/Programs/charset_internal.h --- brltty-5.4/Programs/charset_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/charset_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/charset_msdos.c brltty-5.5/Programs/charset_msdos.c --- brltty-5.4/Programs/charset_msdos.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/charset_msdos.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/charset_none.c brltty-5.5/Programs/charset_none.c --- brltty-5.4/Programs/charset_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/charset_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/charset_windows.c brltty-5.5/Programs/charset_windows.c --- brltty-5.4/Programs/charset_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/charset_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_brlapi.c brltty-5.5/Programs/cmd_brlapi.c --- brltty-5.4/Programs/cmd_brlapi.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_brlapi.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -42,11 +42,7 @@ break; case BRL_CMD_BLK(PASSDOTS): - if (retainDots) { - if (arg == (BRLAPI_DOTC >> BRLAPI_KEY_CMD_ARG_SHIFT)) arg = 0; - goto doDefault; - } - + if (retainDots) goto doDefault; *code = cmdWCharToBrlapi(convertDotsToCharacter(textTable, arg)); break; diff -Nru brltty-5.4/Programs/cmd_brlapi.h brltty-5.5/Programs/cmd_brlapi.h --- brltty-5.4/Programs/cmd_brlapi.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_brlapi.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd.c brltty-5.5/Programs/cmd.c --- brltty-5.4/Programs/cmd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -98,45 +98,47 @@ return 0; } +int +getCommandCount (void) { + static int commandCount = -1; + + if (commandCount < 0) { + const CommandEntry *cmd = commandTable; + while (cmd->name) cmd += 1; + commandCount = cmd - commandTable; + } + + return commandCount; +} + const CommandEntry * findCommandEntry (int code) { static const CommandEntry **commandEntries = NULL; - static int commandCount; + int count = getCommandCount(); + code &= BRL_MSK_CMD; if (!commandEntries) { - { - const CommandEntry *cmd = commandTable; + const CommandEntry **entries = malloc(ARRAY_SIZE(entries, count)); - while (cmd->name) cmd += 1; - commandCount = cmd - commandTable; + if (!entries) { + logMallocError(); + return NULL; } { - const CommandEntry **entries = malloc(ARRAY_SIZE(entries, commandCount)); - - if (!entries) { - logMallocError(); - return NULL; - } - - { - const CommandEntry *cmd = commandTable; - const CommandEntry **entry = entries; - - while (cmd->name) *entry++ = cmd++; - } - - qsort(entries, commandCount, sizeof(*entries), compareCommandCodes); - commandEntries = entries; + const CommandEntry *cmd = commandTable; + const CommandEntry **entry = entries; + while (cmd->name) *entry++ = cmd++; } + qsort(entries, count, sizeof(*entries), compareCommandCodes); + commandEntries = entries; registerProgramMemory("sorted-command-table", &commandEntries); } - code &= BRL_MSK_CMD; { int first = 0; - int last = commandCount - 1; + int last = count - 1; while (first <= last) { int current = (first + last) / 2; @@ -158,12 +160,13 @@ if (arg == (code & BRL_MSK_ARG)) return cmd; if (blk) { - return cmd; int next = last + 1; - if (next < commandCount) - if (blk != (commandEntries[next]->code & BRL_MSK_BLK)) + if (next < count) { + if (blk != (commandEntries[next]->code & BRL_MSK_BLK)) { return cmd; + } + } } } } diff -Nru brltty-5.4/Programs/cmd_clipboard.c brltty-5.5/Programs/cmd_clipboard.c --- brltty-5.4/Programs/cmd_clipboard.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_clipboard.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_clipboard.h brltty-5.5/Programs/cmd_clipboard.h --- brltty-5.4/Programs/cmd_clipboard.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_clipboard.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_custom.c brltty-5.5/Programs/cmd_custom.c --- brltty-5.4/Programs/cmd_custom.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_custom.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_custom.h brltty-5.5/Programs/cmd_custom.h --- brltty-5.4/Programs/cmd_custom.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_custom.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_input.c brltty-5.5/Programs/cmd_input.c --- brltty-5.4/Programs/cmd_input.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_input.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_input.h brltty-5.5/Programs/cmd_input.h --- brltty-5.4/Programs/cmd_input.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_input.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_keycodes.c brltty-5.5/Programs/cmd_keycodes.c --- brltty-5.4/Programs/cmd_keycodes.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_keycodes.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_keycodes.h brltty-5.5/Programs/cmd_keycodes.h --- brltty-5.4/Programs/cmd_keycodes.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_keycodes.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_learn.c brltty-5.5/Programs/cmd_learn.c --- brltty-5.4/Programs/cmd_learn.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_learn.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_learn.h brltty-5.5/Programs/cmd_learn.h --- brltty-5.4/Programs/cmd_learn.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_learn.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_miscellaneous.c brltty-5.5/Programs/cmd_miscellaneous.c --- brltty-5.4/Programs/cmd_miscellaneous.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_miscellaneous.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_miscellaneous.h brltty-5.5/Programs/cmd_miscellaneous.h --- brltty-5.4/Programs/cmd_miscellaneous.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_miscellaneous.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_navigation.c brltty-5.5/Programs/cmd_navigation.c --- brltty-5.4/Programs/cmd_navigation.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_navigation.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_navigation.h brltty-5.5/Programs/cmd_navigation.h --- brltty-5.4/Programs/cmd_navigation.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_navigation.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_preferences.c brltty-5.5/Programs/cmd_preferences.c --- brltty-5.4/Programs/cmd_preferences.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_preferences.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -49,6 +49,7 @@ deactivateSpecialScreen(SCR_MENU); ok = 1; } else if (activateSpecialScreen(SCR_MENU)) { + updateLogMessagesSubmenu(); updateSessionAttributes(); savedPreferences = prefs; ok = 1; diff -Nru brltty-5.4/Programs/cmd_preferences.h brltty-5.5/Programs/cmd_preferences.h --- brltty-5.4/Programs/cmd_preferences.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_preferences.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_queue.c brltty-5.5/Programs/cmd_queue.c --- brltty-5.4/Programs/cmd_queue.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_queue.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_queue.h brltty-5.5/Programs/cmd_queue.h --- brltty-5.4/Programs/cmd_queue.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_queue.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmds.awk brltty-5.5/Programs/cmds.awk --- brltty-5.4/Programs/cmds.awk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmds.awk 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Programs/cmd_speech.c brltty-5.5/Programs/cmd_speech.c --- brltty-5.4/Programs/cmd_speech.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_speech.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_speech.h brltty-5.5/Programs/cmd_speech.h --- brltty-5.4/Programs/cmd_speech.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_speech.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_toggle.c brltty-5.5/Programs/cmd_toggle.c --- brltty-5.4/Programs/cmd_toggle.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_toggle.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_toggle.h brltty-5.5/Programs/cmd_toggle.h --- brltty-5.4/Programs/cmd_toggle.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_toggle.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_touch.c brltty-5.5/Programs/cmd_touch.c --- brltty-5.4/Programs/cmd_touch.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_touch.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_touch.h brltty-5.5/Programs/cmd_touch.h --- brltty-5.4/Programs/cmd_touch.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_touch.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_utils.c brltty-5.5/Programs/cmd_utils.c --- brltty-5.4/Programs/cmd_utils.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_utils.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/cmd_utils.h brltty-5.5/Programs/cmd_utils.h --- brltty-5.4/Programs/cmd_utils.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/cmd_utils.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/config.c brltty-5.5/Programs/config.c --- brltty-5.4/Programs/config.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/config.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -162,9 +162,11 @@ NULL }; +static char *opt_pidFile; static char *opt_configurationFile; static char *opt_preferencesFile; -static char *opt_pidFile; +static char *opt_preferenceOverrides; + static char *opt_updatableDirectory; static char *opt_writableDirectory; static char *opt_driversDirectory; @@ -298,6 +300,15 @@ .strings.array = optionStrings_CancelExecution }, + { .letter = 'P', + .word = "pid-file", + .flags = OPT_Hidden | OPT_Config | OPT_Environ, + .argument = strtext("file"), + .setting.string = &opt_pidFile, + .internal.adjust = fixInstallPath, + .description = strtext("Path to process identifier file.") + }, + { .letter = 'f', .word = "configuration-file", .flags = OPT_Environ, @@ -308,6 +319,23 @@ .description = strtext("Path to default settings file.") }, + { .letter = 'F', + .word = "preferences-file", + .flags = OPT_Hidden | OPT_Config | OPT_Environ, + .argument = strtext("file"), + .setting.string = &opt_preferencesFile, + .internal.setting = PREFERENCES_FILE, + .description = strtext("Name of or path to default preferences file.") + }, + + { .letter = 'o', + .word = "override-preference", + .flags = OPT_Extend | OPT_Config | OPT_Environ, + .argument = strtext("name=value,..."), + .setting.string = &opt_preferenceOverrides, + .description = strtext("Explicit preference settings.") + }, + { .letter = 'U', .word = "updatable-directory", .flags = OPT_Hidden | OPT_Config | OPT_Environ, @@ -318,15 +346,6 @@ .description = strtext("Path to directory which contains files that can be updated.") }, - { .letter = 'F', - .word = "preferences-file", - .flags = OPT_Hidden | OPT_Config | OPT_Environ, - .argument = strtext("file"), - .setting.string = &opt_preferencesFile, - .internal.setting = PREFERENCES_FILE, - .description = strtext("Name of or path to default preferences file.") - }, - { .letter = 'W', .word = "writable-directory", .flags = OPT_Hidden | OPT_Config | OPT_Environ, @@ -493,6 +512,7 @@ { .letter = 'Q', .word = "quiet-if-no-braille", + .flags = OPT_Hidden | OPT_Config | OPT_Environ, .setting.flag = &opt_quietIfNoBraille, .description = strtext("Do not autospeak when braille is not being used.") }, @@ -575,15 +595,6 @@ .description = strtext("Path to log file.") }, - { .letter = 'P', - .word = "pid-file", - .flags = OPT_Hidden | OPT_Config | OPT_Environ, - .argument = strtext("file"), - .setting.string = &opt_pidFile, - .internal.adjust = fixInstallPath, - .description = strtext("Path to process identifier file.") - }, - { .letter = 'v', .word = "verify", .setting.flag = &opt_verify, @@ -598,8 +609,8 @@ END_OPTION_TABLE static void -makeProgramBanner (char *buffer, size_t size) { - const char *revision = getRevisionIdentifier(); +makeProgramBanner (char *buffer, size_t size, int includeRevision) { + const char *revision = includeRevision? getRevisionIdentifier(): ""; snprintf(buffer, size, "%s %s%s%s", PACKAGE_NAME, PACKAGE_VERSION, (*revision? " rev ": ""), revision); @@ -608,10 +619,10 @@ static void logProgramBanner (void) { char banner[0X100]; - makeProgramBanner(banner, sizeof(banner)); + makeProgramBanner(banner, sizeof(banner), 1); { - int pushed = pushLogPrefix(NULL); + int pushed = pushLogPrefix(""); logMessage(LOG_NOTICE, "%s [%s]", banner, PACKAGE_URL); if (pushed) popLogPrefix(); } @@ -1188,6 +1199,24 @@ setStatusFields(fields); } +static void +setPreferenceOverrides (void) { + int count; + char **settings = splitString(opt_preferenceOverrides, PARAMETER_SEPARATOR_CHARACTER, &count); + + if (settings) { + char **setting = settings; + char **end = setting + count; + + while (setting < end) { + setPreference(*setting); + setting += 1; + } + + deallocateStrings(settings); + } +} + int loadPreferences (void) { int ok = 0; @@ -1210,6 +1239,7 @@ } if (!ok) resetPreferences(); + setPreferenceOverrides(); applyAllPreferences(); return ok; } @@ -1232,6 +1262,44 @@ return ok; } +#ifdef ENABLE_API +static void +exitApiServer (void *data) { + if (api.isLinked()) api.unlink(); + if (api.isStarted()) api.stop(); + + if (apiParameters) { + deallocateStrings(apiParameters); + apiParameters = NULL; + } +} +#endif /* ENABLE_API */ + +static void +startApiServer (void) { +#ifdef ENABLE_API + if (!(opt_noApi || api.isStarted())) { + const char *const *parameters = api.getParameters(); + + apiParameters = getParameters(parameters, + NULL, + opt_apiParameters); + + if (apiParameters) { + api.identify(0); + logParameters(parameters, apiParameters, + gettext("API Parameter")); + + if (!opt_verify) { + if (api.start(apiParameters)) { + onProgramExit("api-server", exitApiServer, NULL); + } + } + } + } +#endif /* ENABLE_API */ +} + typedef struct { const char *driverType; const char *const *requestedDrivers; @@ -1376,7 +1444,6 @@ braille->definition.code, brailleDevice); if (constructBrailleDriver()) { - api.link(); brailleDriver = braille; constructed = 1; } @@ -1403,6 +1470,9 @@ if (oldPreferencesFile) { logMessage(LOG_INFO, "%s: %s", gettext("Old Preferences File"), oldPreferencesFile); + startApiServer(); + api.link(); + return 1; } else { logMallocError(); @@ -1446,7 +1516,7 @@ autodetectableDrivers = serialDrivers; } else if (isUsbDevice(&dev)) { static const char *const usbDrivers[] = { - "al", "bm", "eu", "fs", "hd", "hm", "ht", "hw", "mt", "pg", "pm", "sk", "vo", + "al", "bm", "bn", "eu", "fs", "hd", "hm", "ht", "hw", "mt", "pg", "pm", "sk", "vo", NULL }; autodetectableDrivers = usbDrivers; @@ -1534,7 +1604,7 @@ { char banner[0X100]; - makeProgramBanner(banner, sizeof(banner)); + makeProgramBanner(banner, sizeof(banner), 0); if (message(NULL, banner, MSG_SILENT)) return 1; } } @@ -1698,18 +1768,6 @@ return 0; } -#ifdef ENABLE_API -static void -exitApiServer (void *data) { - api.stop(); - - if (apiParameters) { - deallocateStrings(apiParameters); - apiParameters = NULL; - } -} -#endif /* ENABLE_API */ - #ifdef ENABLE_SPEECH_SUPPORT static AsyncHandle autospeakDelayAlarm = NULL; @@ -1883,7 +1941,7 @@ if (!opt_quiet && spk.sayBanner) { char banner[0X100]; - makeProgramBanner(banner, sizeof(banner)); + makeProgramBanner(banner, sizeof(banner), 0); sayString(&spk, banner, SAY_OPT_MUTE_FIRST); beginAutospeakDelay(SPEECH_DRIVER_START_AUTOSPEAK_DELAY); } else if (isAutospeakActive()) { @@ -2419,6 +2477,20 @@ } } +static void +detachStream (FILE *stream, const char *name, int output) { + const char *nullDevice = "/dev/null"; + + if (!freopen(nullDevice, (output? "a": "r"), stream)) { + if (errno != ENOENT) { + char action[0X40]; + + snprintf(action, sizeof(action), "freopen[%s]", name); + logSystemError(action); + } + } +} + ProgramExitStatus brlttyStart (void) { if (opt_cancelExecution) { @@ -2496,23 +2568,9 @@ #if defined(GRUB_RUNTIME) #else /* redirect stdio streams to /dev/null */ - { - const char *nullDevice = "/dev/null"; - - if (!freopen(nullDevice, "r", stdin)) { - logSystemError("freopen[stdin]"); - } - - if (!freopen(nullDevice, "a", stdout)) { - logSystemError("freopen[stdout]"); - } - - if (!opt_standardError) { - if (!freopen(nullDevice, "a", stderr)) { - logSystemError("freopen[stderr]"); - } - } - } + detachStream(stdin, "stdin", 0); + detachStream(stdout, "stdout", 1); + if (!opt_standardError) detachStream(stderr, "stderr", 1); #endif /* redirect stdio streams to /dev/null */ #ifdef __MINGW32__ @@ -2560,14 +2618,14 @@ } logProperty(opt_configurationFile, "configurationFile", gettext("Configuration File")); - logProperty(opt_updatableDirectory, "updatableDirectory", gettext("Updatable Directory")); logProperty(opt_preferencesFile, "preferencesFile", gettext("Preferences File")); + loadPreferences(); + + logProperty(opt_updatableDirectory, "updatableDirectory", gettext("Updatable Directory")); logProperty(opt_writableDirectory, "writableDirectory", gettext("Writable Directory")); logProperty(opt_driversDirectory, "driversDirectory", gettext("Drivers Directory")); logProperty(opt_tablesDirectory, "tablesDirectory", gettext("Tables Directory")); - loadPreferences(); - /* handle text table option */ if (*opt_textTable) { if (strcmp(opt_textTable, optionOperand_autodetect) == 0) { @@ -2629,28 +2687,6 @@ enableScreenDriver(); } -#ifdef ENABLE_API - if (!opt_noApi) { - const char *const *parameters = api.getParameters(); - - apiParameters = getParameters(parameters, - NULL, - opt_apiParameters); - - if (apiParameters) { - api.identify(0); - logParameters(parameters, apiParameters, - gettext("API Parameter")); - - if (!opt_verify) { - if (api.start(apiParameters)) { - onProgramExit("api-server", exitApiServer, NULL); - } - } - } - } -#endif /* ENABLE_API */ - /* The device(s) the braille display might be connected to. */ if (!*opt_brailleDevice) { logMessage(LOG_ERR, gettext("braille device not specified")); diff -Nru brltty-5.4/Programs/core.c brltty-5.5/Programs/core.c --- brltty-5.4/Programs/core.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/core.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -829,8 +829,8 @@ isAutospeakActive (void) { if (speech->definition.code == noSpeech.definition.code) return 0; if (prefs.autospeak) return 1; - if (opt_quietIfNoBraille) return 0; - return braille->definition.code == noBraille.definition.code; + if (braille->definition.code != noBraille.definition.code) return 0; + return !opt_quietIfNoBraille; } void @@ -1164,6 +1164,8 @@ static void exitSessions (void *data) { + cancelDelayedCursorTrackingAlarm(); + if (ses) { popCommandEnvironment(); ses = NULL; @@ -1186,6 +1188,11 @@ programTerminationRequestTime = now; } + +#ifdef SIGCHLD +ASYNC_SIGNAL_HANDLER(handleChildDeath) { +} +#endif /* SIGCHLD */ #endif /* ASYNC_CAN_HANDLE_SIGNALS */ ProgramExitStatus @@ -1225,6 +1232,10 @@ #ifdef SIGINT asyncHandleSignal(SIGINT, handleProgramTerminationRequest, NULL); #endif /* SIGINT */ + +#ifdef SIGCHLD + asyncHandleSignal(SIGCHLD, handleChildDeath, NULL); +#endif /* SIGCHLD */ #endif /* ASYNC_CAN_HANDLE_SIGNALS */ interruptEnabledCount = 0; diff -Nru brltty-5.4/Programs/core.h brltty-5.5/Programs/core.h --- brltty-5.4/Programs/core.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/core.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ctb_compile.c brltty-5.5/Programs/ctb_compile.c --- brltty-5.4/Programs/ctb_compile.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ctb_compile.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ctb_internal.h brltty-5.5/Programs/ctb_internal.h --- brltty-5.4/Programs/ctb_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ctb_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ctb_translate.c brltty-5.5/Programs/ctb_translate.c --- brltty-5.4/Programs/ctb_translate.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ctb_translate.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/dataarea.c brltty-5.5/Programs/dataarea.c --- brltty-5.4/Programs/dataarea.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/dataarea.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/datafile.c brltty-5.5/Programs/datafile.c --- brltty-5.4/Programs/datafile.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/datafile.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/defaults.h brltty-5.5/Programs/defaults.h --- brltty-5.4/Programs/defaults.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/defaults.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/device.c brltty-5.5/Programs/device.c --- brltty-5.4/Programs/device.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/device.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/driver.c brltty-5.5/Programs/driver.c --- brltty-5.4/Programs/driver.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/driver.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/drivers.c brltty-5.5/Programs/drivers.c --- brltty-5.4/Programs/drivers.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/drivers.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/dynld_dlfcn.c brltty-5.5/Programs/dynld_dlfcn.c --- brltty-5.4/Programs/dynld_dlfcn.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/dynld_dlfcn.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/dynld_dyld.c brltty-5.5/Programs/dynld_dyld.c --- brltty-5.4/Programs/dynld_dyld.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/dynld_dyld.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/dynld_grub.c brltty-5.5/Programs/dynld_grub.c --- brltty-5.4/Programs/dynld_grub.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/dynld_grub.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/dynld_none.c brltty-5.5/Programs/dynld_none.c --- brltty-5.4/Programs/dynld_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/dynld_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/dynld_shl.c brltty-5.5/Programs/dynld_shl.c --- brltty-5.4/Programs/dynld_shl.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/dynld_shl.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/dynld_windows.c brltty-5.5/Programs/dynld_windows.c --- brltty-5.4/Programs/dynld_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/dynld_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/file.c brltty-5.5/Programs/file.c --- brltty-5.4/Programs/file.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/file.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -845,15 +845,6 @@ onProgramExit(name, exitProgramStream, stream); } -void -flushStream (FILE *stream) { - fflush(stream); - -#ifdef __MSDOS__ - fsync(fileno(stream)); -#endif /* __MSDOS__ */ -} - FILE * openFile (const char *path, const char *mode, int optional) { FILE *file = fopen(path, mode); diff -Nru brltty-5.4/Programs/fm_adlib.c brltty-5.5/Programs/fm_adlib.c --- brltty-5.4/Programs/fm_adlib.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/fm_adlib.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/fm_none.c brltty-5.5/Programs/fm_none.c --- brltty-5.4/Programs/fm_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/fm_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/gio_bluetooth.c brltty-5.5/Programs/gio_bluetooth.c --- brltty-5.4/Programs/gio_bluetooth.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/gio_bluetooth.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -24,6 +24,7 @@ #include "io_generic.h" #include "gio_internal.h" #include "io_bluetooth.h" +#include "brl.h" struct GioHandleStruct { BluetoothConnection *connection; @@ -115,6 +116,7 @@ BluetoothConnectionRequest request; bthInitializeConnectionRequest(&request); + request.driver = braille->definition.code; request.identifier = identifier; request.channel = descriptor->bluetooth.channelNumber; request.discover = descriptor->bluetooth.discoverChannel; diff -Nru brltty-5.4/Programs/gio.c brltty-5.5/Programs/gio.c --- brltty-5.4/Programs/gio.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/gio.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -228,8 +228,20 @@ return -1; } - return method(endpoint->handle, data, size, - endpoint->options.outputTimeout); + ssize_t result = method(endpoint->handle, data, size, + endpoint->options.outputTimeout); + + if (endpoint->options.ignoreWriteTimeouts) { + if (result == -1) { + if ((errno == EAGAIN) +#ifdef ETIMEDOUT + || (errno == ETIMEDOUT) +#endif /* ETIMEDOUT */ + ) result = size; + } + } + + return result; } int diff -Nru brltty-5.4/Programs/gio_internal.h brltty-5.5/Programs/gio_internal.h --- brltty-5.4/Programs/gio_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/gio_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/gio_null.c brltty-5.5/Programs/gio_null.c --- brltty-5.4/Programs/gio_null.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/gio_null.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/gio_serial.c brltty-5.5/Programs/gio_serial.c --- brltty-5.4/Programs/gio_serial.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/gio_serial.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/gio_usb.c brltty-5.5/Programs/gio_usb.c --- brltty-5.4/Programs/gio_usb.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/gio_usb.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hidkeys.c brltty-5.5/Programs/hidkeys.c --- brltty-5.4/Programs/hidkeys.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hidkeys.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hidkeys.h brltty-5.5/Programs/hidkeys.h --- brltty-5.4/Programs/hidkeys.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hidkeys.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hostcmd.c brltty-5.5/Programs/hostcmd.c --- brltty-5.4/Programs/hostcmd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hostcmd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hostcmd_internal.h brltty-5.5/Programs/hostcmd_internal.h --- brltty-5.4/Programs/hostcmd_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hostcmd_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hostcmd_none.c brltty-5.5/Programs/hostcmd_none.c --- brltty-5.4/Programs/hostcmd_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hostcmd_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hostcmd_none.h brltty-5.5/Programs/hostcmd_none.h --- brltty-5.4/Programs/hostcmd_none.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hostcmd_none.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hostcmd_unix.c brltty-5.5/Programs/hostcmd_unix.c --- brltty-5.4/Programs/hostcmd_unix.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hostcmd_unix.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hostcmd_unix.h brltty-5.5/Programs/hostcmd_unix.h --- brltty-5.4/Programs/hostcmd_unix.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hostcmd_unix.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hostcmd_windows.c brltty-5.5/Programs/hostcmd_windows.c --- brltty-5.4/Programs/hostcmd_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hostcmd_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/hostcmd_windows.h brltty-5.5/Programs/hostcmd_windows.h --- brltty-5.4/Programs/hostcmd_windows.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/hostcmd_windows.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/io_misc.c brltty-5.5/Programs/io_misc.c --- brltty-5.4/Programs/io_misc.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/io_misc.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/kbd_android.c brltty-5.5/Programs/kbd_android.c --- brltty-5.4/Programs/kbd_android.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/kbd_android.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -337,7 +337,7 @@ struct KeyboardInstanceExtensionStruct { JNIEnv *env; - jclass class; + jobject object; jclass inputService; jmethodID forwardKeyEvent; @@ -358,7 +358,7 @@ memset(*kix, 0, sizeof(**kix)); (*kix)->env = NULL; - (*kix)->class = NULL; + (*kix)->object = NULL; (*kix)->inputService = NULL; (*kix)->forwardKeyEvent = 0; @@ -388,7 +388,7 @@ JAVA_SIG_BOOLEAN // press ))) { (*kix->env)->CallVoidMethod( - kix->env, kix->class, kix->forwardKeyEvent, + kix->env, kix->object, kix->forwardKeyEvent, code, (press? JNI_TRUE: JNI_FALSE) ); @@ -411,7 +411,7 @@ KeyboardInstanceExtension *kix = kio->kix; kix->env = env; - kix->class = class; + kix->object = this; handleKeyEvent(kio, code, (press != JNI_FALSE)); return JNI_TRUE; diff -Nru brltty-5.4/Programs/kbd_android.h brltty-5.5/Programs/kbd_android.h --- brltty-5.4/Programs/kbd_android.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/kbd_android.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/kbd.c brltty-5.5/Programs/kbd.c --- brltty-5.4/Programs/kbd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/kbd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/kbd.h brltty-5.5/Programs/kbd.h --- brltty-5.4/Programs/kbd.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/kbd.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/kbd_internal.h brltty-5.5/Programs/kbd_internal.h --- brltty-5.4/Programs/kbd_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/kbd_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/kbd_keycodes.c brltty-5.5/Programs/kbd_keycodes.c --- brltty-5.4/Programs/kbd_keycodes.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/kbd_keycodes.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/kbd_linux.c brltty-5.5/Programs/kbd_linux.c --- brltty-5.4/Programs/kbd_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/kbd_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/kbd_none.c brltty-5.5/Programs/kbd_none.c --- brltty-5.4/Programs/kbd_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/kbd_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ktb_audit.c brltty-5.5/Programs/ktb_audit.c --- brltty-5.4/Programs/ktb_audit.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_audit.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ktb_cmds.c brltty-5.5/Programs/ktb_cmds.c --- brltty-5.4/Programs/ktb_cmds.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_cmds.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ktb_compile.c brltty-5.5/Programs/ktb_compile.c --- brltty-5.4/Programs/ktb_compile.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_compile.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -1191,8 +1191,6 @@ void resetLongPressData (KeyTable *table) { - table->release.command = BRL_CMD_NOOP; - if (table->longPress.alarm) { asyncCancelRequest(table->longPress.alarm); table->longPress.alarm = NULL; @@ -1210,8 +1208,9 @@ void resetKeyTable (KeyTable *table) { resetLongPressData(table); - table->context.current = table->context.next = table->context.persistent = KTB_CTX_DEFAULT; + table->release.command = BRL_CMD_NOOP; table->pressedKeys.count = 0; + table->context.current = table->context.next = table->context.persistent = KTB_CTX_DEFAULT; } static int diff -Nru brltty-5.4/Programs/ktb_inspect.h brltty-5.5/Programs/ktb_inspect.h --- brltty-5.4/Programs/ktb_inspect.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_inspect.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ktb_internal.h brltty-5.5/Programs/ktb_internal.h --- brltty-5.4/Programs/ktb_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -163,7 +163,7 @@ struct { AsyncHandle alarm; - unsigned char time; + int time; } autorelease; struct { diff -Nru brltty-5.4/Programs/ktb_keyboard.c brltty-5.5/Programs/ktb_keyboard.c --- brltty-5.4/Programs/ktb_keyboard.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_keyboard.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ktb_keyboard.h brltty-5.5/Programs/ktb_keyboard.h --- brltty-5.4/Programs/ktb_keyboard.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_keyboard.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ktb_list.c brltty-5.5/Programs/ktb_list.c --- brltty-5.4/Programs/ktb_list.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_list.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -212,36 +212,66 @@ static int putKeyName (ListGenerationData *lgd, const KeyValue *value) { - char name[0X100]; - formatKeyName(name, sizeof(name), lgd->keyTable, value); - return putUtf8String(lgd, name); + char string[0X100]; + formatKeyName(string, sizeof(string), lgd->keyTable, value); + return putUtf8String(lgd, string); } -static int -putKeyCombination (ListGenerationData *lgd, const KeyCombination *combination) { - wchar_t delimiter = 0; +static +STR_BEGIN_FORMATTER(formatKeyCombination, KeyTable *table, const KeyCombination *combination) + char keyDelimiter = 0; + unsigned char dotCount = 0; + + const char *dotPrefix = "dot"; + const size_t dotPrefixLength = strlen(dotPrefix); + const size_t dotNameLength = dotPrefixLength + 1; for (unsigned char index=0; indexmodifierCount; index+=1) { - if (!delimiter) { - delimiter = WC_C('+'); - } else if (!putCharacter(lgd, delimiter)) { - return 0; + char keyName[0X100]; + formatKeyName(keyName, sizeof(keyName), table, + &combination->modifierKeys[combination->modifierPositions[index]]); + + if (strlen(keyName) == dotNameLength) { + if (strncasecmp(keyName, dotPrefix, dotPrefixLength) == 0) { + char dotNumber = keyName[dotPrefixLength]; + + if ((dotNumber >= '1') && (dotNumber <= '8')) { + if (++dotCount == 1) goto FIRST_DOT; + + if (dotCount == 2) { + char firstDot = *STR_POP(); + STR_PRINTF("s%c", firstDot); + } + + STR_PRINTF("%c", dotNumber); + continue; + } + } } - if (!putKeyName(lgd, &combination->modifierKeys[combination->modifierPositions[index]])) return 0; - } + dotCount = 0; + FIRST_DOT: - if (combination->flags & KCF_IMMEDIATE_KEY) { - if (delimiter) { - if (!putCharacter(lgd, delimiter)) { - return 0; - } + if (keyDelimiter) { + STR_PRINTF("%c", keyDelimiter); + } else { + keyDelimiter = '+'; } - if (!putKeyName(lgd, &combination->immediateKey)) return 0; + STR_PRINTF("%s", keyName); } - return 1; + if (combination->flags & KCF_IMMEDIATE_KEY) { + if (keyDelimiter) STR_PRINTF("%c", keyDelimiter); + STR_FORMAT(formatKeyName, table, &combination->immediateKey); + } +STR_END_FORMATTER + +static int +putKeyCombination (ListGenerationData *lgd, const KeyCombination *combination) { + char string[0X100]; + formatKeyCombination(string, sizeof(string), lgd->keyTable, combination); + return putUtf8String(lgd, string); } static int diff -Nru brltty-5.4/Programs/ktb_list.h brltty-5.5/Programs/ktb_list.h --- brltty-5.4/Programs/ktb_list.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_list.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ktb_translate.c brltty-5.5/Programs/ktb_translate.c --- brltty-5.4/Programs/ktb_translate.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ktb_translate.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -33,6 +33,9 @@ #include "cmd_enqueue.h" #include "async_alarm.h" +#define RETAIN_CHORD_KEY 0 +#define ON_FIRST_RELEASE 1 + #define BRL_CMD_ALERT(alert) BRL_CMD_ARG(ALERT, ALERT_##alert) ASYNC_ALARM_CALLBACK(handleKeyAutoreleaseAlarm) { @@ -68,22 +71,19 @@ static void setAutoreleaseAlarm (KeyTable *table) { - if (!prefs.autoreleaseTime || !table->pressedKeys.count) { + if (!table->autorelease.time || !table->pressedKeys.count) { cancelAutoreleaseAlarm(table); + } else if (table->autorelease.alarm) { + asyncResetAlarmIn(table->autorelease.alarm, table->autorelease.time); } else { - int time = 5000 << (prefs.autoreleaseTime - 1); - - if (table->autorelease.alarm) { - asyncResetAlarmIn(table->autorelease.alarm, time); - } else { - asyncSetAlarmIn(&table->autorelease.alarm, time, handleKeyAutoreleaseAlarm, table); - } + asyncSetAlarmIn(&table->autorelease.alarm, table->autorelease.time, + handleKeyAutoreleaseAlarm, table); } } void -setKeyAutoreleaseTime (KeyTable *table, unsigned char seconds) { - table->autorelease.time = seconds; +setKeyAutoreleaseTime (KeyTable *table, unsigned char setting) { + table->autorelease.time = setting? (5000 << (setting - 1)): 0; setAutoreleaseAlarm(table); } @@ -202,30 +202,35 @@ } static int -makeKeyboardCommand (KeyTable *table, unsigned char context) { +makeKeyboardCommand (KeyTable *table, unsigned char context, int allowChords) { const KeyContext *ctx; if ((ctx = getKeyContext(table, context))) { - int keyboardCommand = BRL_CMD_BLK(PASSDOTS); + int bits = 0; for (unsigned int pressedIndex=0; pressedIndexpressedKeys.count; pressedIndex+=1) { const KeyValue *keyValue = &table->pressedKeys.table[pressedIndex]; const MappedKeyEntry *map = findMappedKeyEntry(ctx, keyValue); if (!map) return EOF; - keyboardCommand |= map->keyboardFunction->bit; + bits |= map->keyboardFunction->bit; } { - int dotPressed = !!(keyboardCommand & (BRL_DOT1 | BRL_DOT2 | BRL_DOT3 | BRL_DOT4 | BRL_DOT5 | BRL_DOT6 | BRL_DOT7 | BRL_DOT8)); - int spacePressed = !!(keyboardCommand & BRL_DOTC); - - if (dotPressed == spacePressed) return EOF; - if (dotPressed) keyboardCommand |= ctx->mappedKeys.superimpose; - keyboardCommand &= ~BRL_DOTC; + int space = bits & BRL_DOTC; + int dots = bits & ( + BRL_DOT1 | BRL_DOT2 | BRL_DOT3 | BRL_DOT4 | + BRL_DOT5 | BRL_DOT6 | BRL_DOT7 | BRL_DOT8 + ); + + if (!(allowChords && ((space | dots) == bits))) { + if (!space == !dots) return EOF; + if (dots) bits |= ctx->mappedKeys.superimpose; + bits &= ~BRL_DOTC; + } } - return keyboardCommand; + return BRL_CMD_BLK(PASSDOTS) | bits; } return EOF; @@ -471,14 +476,10 @@ } if (hotkey) { - state = KTS_HOTKEY; - resetLongPressData(table); - - { - const BoundCommand *cmd = press? &hotkey->pressCommand: &hotkey->releaseCommand; + const BoundCommand *cmd = press? &hotkey->pressCommand: &hotkey->releaseCommand; - if (cmd->value != BRL_CMD_NOOP) processCommand(table, (command = cmd->value)); - } + if (cmd->value != BRL_CMD_NOOP) processCommand(table, (command = cmd->value)); + state = KTS_HOTKEY; } else { int isImmediate = 1; unsigned int keyPosition; @@ -491,12 +492,15 @@ const KeyBinding *binding = findKeyBinding(table, context, &keyValue, &isIncomplete); int inserted = insertPressedKey(table, &keyValue, keyPosition); - if (binding) { + if (RETAIN_CHORD_KEY && ((command = makeKeyboardCommand(table, context, 1)) != EOF)) { + binding = NULL; + isImmediate = 0; + } else if (binding) { command = binding->primaryCommand.value; } else if ((binding = findKeyBinding(table, context, NULL, &isIncomplete))) { command = binding->primaryCommand.value; isImmediate = 0; - } else if ((command = makeKeyboardCommand(table, context)) != EOF) { + } else if ((command = makeKeyboardCommand(table, context, 0)) != EOF) { isImmediate = 0; } else if (context == KTB_CTX_DEFAULT) { command = EOF; @@ -528,6 +532,7 @@ int secondaryCommand = BRL_CMD_NOOP; resetLongPressData(table); + table->release.command = BRL_CMD_NOOP; if (binding) { addCommandArguments(table, &command, binding->primaryCommand.entry, binding); @@ -567,14 +572,16 @@ processCommand(table, command); } } else { - int *cmd = &table->release.command; + resetLongPressData(table); - if (*cmd != BRL_CMD_NOOP) { - processCommand(table, (command = *cmd)); - *cmd = BRL_CMD_NOOP; - } + if (ON_FIRST_RELEASE || (table->pressedKeys.count == 0)) { + int *cmd = &table->release.command; - resetLongPressData(table); + if (*cmd != BRL_CMD_NOOP) { + processCommand(table, (command = *cmd)); + *cmd = BRL_CMD_NOOP; + } + } } setAutoreleaseAlarm(table); diff -Nru brltty-5.4/Programs/learn.c brltty-5.5/Programs/learn.c --- brltty-5.4/Programs/learn.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/learn.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/learn.h brltty-5.5/Programs/learn.h --- brltty-5.4/Programs/learn.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/learn.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/leds.c brltty-5.5/Programs/leds.c --- brltty-5.4/Programs/leds.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/leds.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/leds_linux.c brltty-5.5/Programs/leds_linux.c --- brltty-5.4/Programs/leds_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/leds_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/leds_none.c brltty-5.5/Programs/leds_none.c --- brltty-5.4/Programs/leds_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/leds_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/lock.c brltty-5.5/Programs/lock.c --- brltty-5.4/Programs/lock.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/lock.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -174,7 +174,9 @@ if ((lock = malloc(sizeof(*lock)))) { memset(lock, 0, sizeof(*lock)); if (constructLockDescriptor(lock)) return lock; + free(lock); + lock = NULL; } else { logMallocError(); } diff -Nru brltty-5.4/Programs/log.c brltty-5.5/Programs/log.c --- brltty-5.4/Programs/log.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/log.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -30,10 +30,12 @@ #endif /* __ANDROID__ */ #include "log.h" +#include "log_history.h" #include "strfmt.h" +#include "file.h" #include "timing.h" #include "addresses.h" -#include "file.h" +#include "stdiox.h" #include "thread.h" const char logCategoryName_all[] = "all"; @@ -193,15 +195,9 @@ static int syslogOpened = 0; #endif /* system log internal definitions */ -typedef struct LogPrefixEntryStruct LogPrefixEntry; -static LogPrefixEntry *logPrefixStack = NULL; +static LogEntry *logPrefixStack = NULL; static FILE *logFile = NULL; -struct LogPrefixEntryStruct { - LogPrefixEntry *previous; - char *prefix; -}; - static inline const LogCategoryEntry * getLogCategoryEntry (LogCategoryIndex index) { return (index < LOG_CATEGORY_COUNT)? &logCategoryTable[index]: NULL; @@ -263,38 +259,13 @@ int pushLogPrefix (const char *prefix) { - LogPrefixEntry *entry; - - if ((entry = malloc(sizeof(*entry)))) { - memset(entry, 0, sizeof(*entry)); - if (!prefix) prefix = ""; - - if ((entry->prefix = strdup(prefix))) { - entry->previous = logPrefixStack; - logPrefixStack = entry; - return 1; - } - - free(entry); - } - - return 0; + if (!prefix) prefix = ""; + return pushLogEntry(&logPrefixStack, prefix, 0); } int popLogPrefix (void) { - if (logPrefixStack) { - LogPrefixEntry *entry = logPrefixStack; - logPrefixStack = entry->previous; - entry->previous = NULL; - - free(entry->prefix); - free(entry); - - return 1; - } - - return 0; + return popLogEntry(&logPrefixStack); } void @@ -394,25 +365,24 @@ void logData (int level, LogDataFormatter *formatLogData, const void *data) { const char *prefix = NULL; + int push = 0; if (level & LOG_FLG_CATEGORY) { int category = level & LOG_MSK_CATEGORY; - if (!logCategoryFlags[category]) return; - level = categoryLogLevel; + const LogCategoryEntry *ctg = &logCategoryTable[category]; - { - const LogCategoryEntry *ctg = &logCategoryTable[category]; - - prefix = ctg->prefix; - } + prefix = ctg->prefix; + level = categoryLogLevel; + } else { + push = level <= LOG_WARNING; } { int write = level <= systemLogLevel; int print = level <= stderrLogLevel; - if (write || print) { + if (write || print || push) { int oldErrno = errno; char record[0X1000]; @@ -427,14 +397,19 @@ #if defined(WINDOWS) if (windowsEventLog != INVALID_HANDLE_VALUE) { const char *strings[] = {record}; - ReportEvent(windowsEventLog, toWindowsEventType(level), 0, 0, NULL, - ARRAY_COUNT(strings), 0, strings, NULL); + + ReportEvent( + windowsEventLog, toWindowsEventType(level), 0, 0, NULL, + ARRAY_COUNT(strings), 0, strings, NULL + ); } #elif defined(__MSDOS__) #elif defined(__ANDROID__) - __android_log_write(toAndroidLogPriority(level), PACKAGE_TARNAME, record); + __android_log_write( + toAndroidLogPriority(level), PACKAGE_TARNAME, record + ); #elif defined(HAVE_SYSLOG_H) if (syslogOpened) syslog(level, "%s", record); @@ -446,7 +421,7 @@ lockStream(stream); if (logPrefixStack) { - const char *prefix = logPrefixStack->prefix; + const char *prefix = getLogEntryText(logPrefixStack); if (*prefix) { fputs(prefix, stream); @@ -461,6 +436,7 @@ unlockStream(stream); } + if (push) pushLogMessage(record); errno = oldErrno; } } diff -Nru brltty-5.4/Programs/log_history.c brltty-5.5/Programs/log_history.c --- brltty-5.4/Programs/log_history.c 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Programs/log_history.c 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,127 @@ +/* + * BRLTTY - A background process providing access to the console screen (when in + * text mode) for a blind person using a refreshable braille display. + * + * Copyright (C) 1995-2017 by The BRLTTY Developers. + * + * BRLTTY comes with ABSOLUTELY NO WARRANTY. + * + * This is free software, placed under the terms of the + * GNU General Public License, as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any + * later version. Please see the file LICENSE-GPL for details. + * + * Web Page: http://brltty.com/ + * + * This software is maintained by Dave Mielke . + */ + +#include "prologue.h" + +#include + +#include "log.h" +#include "log_history.h" +#include "timing.h" + +struct LogEntryStruct { + struct LogEntryStruct *previous; + TimeValue time; + unsigned int count; + unsigned noSquash:1; + char text[0]; +}; + +const LogEntry * +getPreviousLogEntry (const LogEntry *entry) { + return entry->previous; +} + +const char * +getLogEntryText (const LogEntry *entry) { + return entry->text; +} + +const TimeValue * +getLogEntryTime (const LogEntry *entry) { + return &entry->time; +} + +unsigned int +getLogEntryCount (const LogEntry *entry) { + return entry->count; +} + +int +pushLogEntry (LogEntry **head, const char *text, LogEntryPushOptions options) { + int log = !(options & LPO_NOLOG); + LogEntry *entry = NULL; + + if (options & LPO_SQUASH) { + if ((entry = *head)) { + if (!entry->noSquash && (strcmp(entry->text, text) == 0)) { + entry->count += 1; + } else { + entry = NULL; + } + } + } + + if (!entry) { + const size_t size = sizeof(*entry) + strlen(text) + 1; + + if (!(entry = malloc(size))) { + if (log) logMallocError(); + return 0; + } + + memset(entry, 0, sizeof(*entry)); + entry->count = 1; + strcpy(entry->text, text); + + entry->previous = *head; + *head = entry; + } + + getCurrentTime(&entry->time); + return 1; +} + +int +popLogEntry (LogEntry **head) { + if (!*head) return 0; + LogEntry *entry = *head; + *head = entry->previous; + free(entry); + return 1; +} + +static CriticalSectionLock logMessageLock = CRITICAL_SECTION_LOCK_INITIALIZER; + +static void +lockLogMessages (void) { + enterCriticalSection(&logMessageLock); +} + +static void +unlockLogMessages (void) { + leaveCriticalSection(&logMessageLock); +} + +static LogEntry *logMessageStack = NULL; + +const LogEntry * +getNewestLogMessage (int freeze) { + lockLogMessages(); + LogEntry *message = logMessageStack; + if (freeze && message) message->noSquash = 1; + unlockLogMessages(); + return message; +} + +void +pushLogMessage (const char *message) { + lockLogMessages(); + pushLogEntry(&logMessageStack, message, (LPO_NOLOG | LPO_SQUASH)); + unlockLogMessages(); +} diff -Nru brltty-5.4/Programs/Makefile.in brltty-5.5/Programs/Makefile.in --- brltty-5.4/Programs/Makefile.in 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/Makefile.in 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -264,6 +264,9 @@ log.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/log.c +log_history.$O: + $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/log_history.c + addresses.$O: $(CC) $(LIBCFLAGS) -c $(SRC_DIR)/addresses.c @@ -638,7 +641,7 @@ ############################################################################### -CORE_OBJECTS = core.$O $(PROGRAM_OBJECTS) revision.$O report.$O config.$O activity.$O $(PREFS_OBJECTS) profile.$O menu.$O menu_prefs.$O ses.$O status.$O update.$O blink.$O dataarea.$O $(CMD_OBJECTS) pipe.$O $(TTB_OBJECTS) $(ATB_OBJECTS) $(CTB_OBJECTS) $(KTB_OBJECTS) ktb_keyboard.$O $(KBD_OBJECTS) kbd_keycodes.$O $(BELL_OBJECTS) $(LEDS_OBJECTS) $(ALERT_OBJECTS) hidkeys.$O drivers.$O driver.$O $(SCREEN_OBJECTS) $(SPECIAL_SCREEN_OBJECTS) $(BRAILLE_OBJECTS) $(SPEECH_OBJECTS) spk_input.$O api_control.$O $(API_SERVER_OBJECTS) +CORE_OBJECTS = core.$O $(PROGRAM_OBJECTS) revision.$O report.$O config.$O $(SERVICE_OBJECTS) activity.$O $(PREFS_OBJECTS) profile.$O menu.$O menu_prefs.$O ses.$O status.$O update.$O blink.$O dataarea.$O $(CMD_OBJECTS) pipe.$O $(TTB_OBJECTS) $(ATB_OBJECTS) $(CTB_OBJECTS) $(KTB_OBJECTS) ktb_keyboard.$O $(KBD_OBJECTS) kbd_keycodes.$O $(BELL_OBJECTS) $(LEDS_OBJECTS) $(ALERT_OBJECTS) hidkeys.$O drivers.$O driver.$O $(SCREEN_OBJECTS) $(SPECIAL_SCREEN_OBJECTS) $(BRAILLE_OBJECTS) $(SPEECH_OBJECTS) spk_input.$O api_control.$O $(API_SERVER_OBJECTS) CORE_NAME = brltty brltty-core: $(CORE_OBJECTS) @@ -737,7 +740,7 @@ ############################################################################### BRLTTY_OBJECTS = brltty.$O $(CORE_OBJECTS) -BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(PCM_LIBS) $(MIDI_LIBS) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) +BRLTTY_LIBRARIES = $(BRAILLE_DRIVER_LIBRARIES) $(SPEECH_DRIVER_LIBRARIES) $(SCREEN_DRIVER_LIBRARIES) $(SERVICE_LIBS) $(PCM_LIBS) $(MIDI_LIBS) $(USB_LIBS) $(BLUETOOTH_LIBS) $(LDLIBS) brltty$X: $(BRLTTY_OBJECTS) $(CC) $(LDFLAGS) -o $@ $(BRLTTY_OBJECTS) $(BRLTTY_LIBRARIES) @@ -887,10 +890,10 @@ XBRLAPI_OBJECTS = xbrlapi.$O $(PROGRAM_OBJECTS) xbrlapi$X: $(XBRLAPI_OBJECTS) api - $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(XSV_LIBS) $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $(XBRLAPI_OBJECTS) $(API_LIBS) $(XKB_LIBS) $(X11_LIBS) $(LDLIBS) xbrlapi.$O: - $(CC) $(CFLAGS) $(XSV_INCLUDES) -c $(SRC_DIR)/xbrlapi.c + $(CC) $(CFLAGS) $(X11_INCLUDES) -c $(SRC_DIR)/xbrlapi.c ############################################################################### @@ -927,9 +930,9 @@ ############################################################################### -install:: install-programs install-tables $(INSTALL_DRIVERS) install-core-headers $(INSTALL_MESSAGES) install-manpages $(INSTALL_API) +install:: install-programs install-tables $(INSTALL_DRIVERS) install-core-headers $(INSTALL_MESSAGES) install-manpages install-metainfo $(INSTALL_API) -install-programs: brltty$X brltty-trtxt$X brltty-ttb$X brltty-atb$X brltty-ctb$X install-program-directory install-writable-directory +install-programs: brltty$X brltty-trtxt$X brltty-ttb$X brltty-atb$X brltty-ctb$X brltty-ktb$X brltty-tune$X install-program-directory install-writable-directory $(INSTALL_PROGRAM) brltty$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_PROGRAM) brltty-trtxt$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_PROGRAM) brltty-ttb$X $(INSTALL_PROGRAM_DIRECTORY) @@ -939,9 +942,13 @@ $(INSTALL_PROGRAM) brltty-tune$X $(INSTALL_PROGRAM_DIRECTORY) $(INSTALL_DATA) $(BLD_TOP)config.sh $(INSTALL_PROGRAM_DIRECTORY)/brltty-config -install-xbrlapi: xbrlapi$X install-program-directory install-gdm-autostart-directory +XBRLAPI_X11_AUTOSTART_FILE = 60xbrlapi +XBRLAPI_GDM_AUTOSTART_FILE = xbrlapi.desktop + +install-xbrlapi: xbrlapi$X install-program-directory install-x11-autostart-directory install-gdm-autostart-directory $(INSTALL_PROGRAM) xbrlapi$X $(INSTALL_PROGRAM_DIRECTORY) - $(INSTALL_DATA) $(SRC_TOP)Autostart/gdm/xbrlapi.desktop $(INSTALL_GDM_AUTOSTART_DIRECTORY) + $(INSTALL_DATA) $(SRC_TOP)Autostart/X11/$(XBRLAPI_X11_AUTOSTART_FILE) $(INSTALL_X11_AUTOSTART_DIRECTORY) + $(INSTALL_DATA) $(SRC_TOP)Autostart/gdm/$(XBRLAPI_GDM_AUTOSTART_FILE) $(INSTALL_GDM_AUTOSTART_DIRECTORY) install-tables: $(INSTALL_TEXT_TABLES) $(INSTALL_ATTRIBUTES_TABLES) $(INSTALL_CONTRACTION_TABLES) install-keyboard-tables install-input-tables @@ -955,6 +962,9 @@ install-contraction-tables: install-contraction-tables-directory $(INSTALL_DATA) $(SRC_TOP)$(TBL_DIR)/$(CONTRACTION_TABLES_SUBDIRECTORY)/*$(CONTRACTION_TABLE_EXTENSION) $(INSTALL_CONTRACTION_TABLES_DIRECTORY) + for table in latex-access; do \ + $(INSTALL_SCRIPT) $(SRC_TOP)$(TBL_DIR)/$(CONTRACTION_TABLES_SUBDIRECTORY)/$$table$(CONTRACTION_TABLE_EXTENSION) $(INSTALL_CONTRACTION_TABLES_DIRECTORY); \ + done $(INSTALL_DATA) $(SRC_TOP)$(TBL_DIR)/$(CONTRACTION_TABLES_SUBDIRECTORY)/*$(CONTRACTION_SUBTABLE_EXTENSION) $(INSTALL_CONTRACTION_TABLES_DIRECTORY) install-keyboard-tables: install-keyboard-tables-directory @@ -989,7 +999,11 @@ cd $(BLD_TOP)$(DOC_DIR) && $(MAKE) all $(SRC_TOP)mkdocs -o $(INSTALL_DOCUMENT_DIRECTORY) -s $(SRC_TOP) -b $(BLD_TOP) -d $(DOC_DIR) -t $(TBL_DIR) -install-api: $(INSTALL_API_LIBRARIES) install-api-headers install-api-manpages install-api-key $(INSTALL_XBRLAPI) $(INSTALL_API_BINDINGS) +METAINFO_FILE = org.a11y.brltty.metainfo.xml +install-metainfo: install-metainfo-directory + $(INSTALL_DATA) $(SRC_TOP)Autostart/AppStream/$(METAINFO_FILE) $(INSTALL_METAINFO_DIRECTORY) + +install-api: $(INSTALL_API_LIBRARIES) install-api-headers install-api-manpages install-api-key install-api-policy $(INSTALL_XBRLAPI) $(INSTALL_API_BINDINGS) install-api-libraries: $(API_LIB) $(API_ARC) install-apilib-directory install-apisoc-directory $(INSTALL_PROGRAM) $(API_LIB) $(INSTALL_APILIB_DIRECTORY)/$(API_LIB).$(API_RELEASE) @@ -1024,15 +1038,20 @@ if test ! -f $$file -a -w $(sysconfdir) -a -z "$(INSTALL_ROOT)"; \ then umask 077 && $(SRC_DIR)/brltty-genkey $$file; fi +API_POLICY_FILE = org.a11y.brlapi.policy +install-api-policy: install-apipol-directory + $(INSTALL_DATA) $(SRC_TOP)Authorization/Polkit/$(API_POLICY_FILE) $(INSTALL_APIPOL_DIRECTORY) + ############################################################################### -uninstall:: uninstall-programs uninstall-tables uninstall-drivers uninstall-messages uninstall-manpages uninstall-documents uninstall-headers uninstall-api-bindings +uninstall:: uninstall-programs uninstall-tables uninstall-drivers uninstall-messages uninstall-manpages uninstall-documents uninstall-headers uninstall-metainfo uninstall-api-bindings uninstall-api-files uninstall-programs: -rm -f $(INSTALL_PROGRAM_DIRECTORY)/brltty$X -rm -f $(INSTALL_PROGRAM_DIRECTORY)/brltty-* -rm -f $(INSTALL_PROGRAM_DIRECTORY)/xbrlapi$X - -rm -f $(INSTALL_GDM_AUTOSTART_DIRECTORY)/xbrlapi.desktop + -rm -f $(INSTALL_X11_AUTOSTART_DIRECTORY)/$(XBRLAPI_X11_AUTOSTART_FILE) + -rm -f $(INSTALL_GDM_AUTOSTART_DIRECTORY)/$(XBRLAPI_GDM_AUTOSTART_FILE) uninstall-tables: -rm -f -r $(INSTALL_TEXT_TABLES_DIRECTORY) @@ -1050,6 +1069,21 @@ uninstall-messages: cd $(BLD_TOP)$(MSG_DIR) && $(MAKE) uninstall +uninstall-manpages: + -rm -f $(INSTALL_ROOT)$(MANPAGE_DIRECTORY)/man1/brltty.1 + -rm -f $(INSTALL_MAN3_DIRECTORY)/brlapi_*.3 + +uninstall-documents: + -rm -r -f $(INSTALL_DOCUMENT_DIRECTORY) + +uninstall-headers: + -rm -f $(INSTALL_APIHDR_DIRECTORY)/brlapi.h + -rm -f $(INSTALL_APIHDR_DIRECTORY)/brlapi_*.h + -[ ! -d $(INSTALL_INCLUDE_DIRECTORY) ] || rm -f -r $(INSTALL_INCLUDE_DIRECTORY) + +uninstall-metainfo: + -rm -f $(INSTALL_METAINFO_DIRECTORY)/$(METAINFO_FILE) + uninstall-api-libraries: -rm -f $(INSTALL_APILIB_DIRECTORY)/$(API_LIB) -rm -f $(INSTALL_APILIB_DIRECTORY)/$(API_LIB).$(API_VERSION) @@ -1065,17 +1099,8 @@ -rm -f $(INSTALL_APILIB_DIRECTORY)/$(API_DEF) -rm -f $(INSTALL_PROGRAM_DIRECTORY)/$(API_DLL) -uninstall-manpages: - -rm -f $(INSTALL_ROOT)$(MANPAGE_DIRECTORY)/man1/brltty.1 - -rm -f $(INSTALL_MAN3_DIRECTORY)/brlapi_*.3 - -uninstall-documents: - -rm -r -f $(INSTALL_DOCUMENT_DIRECTORY) - -uninstall-headers: - -rm -f $(INSTALL_APIHDR_DIRECTORY)/brlapi.h - -rm -f $(INSTALL_APIHDR_DIRECTORY)/brlapi_*.h - -[ ! -d $(INSTALL_INCLUDE_DIRECTORY) ] || rm -f -r $(INSTALL_INCLUDE_DIRECTORY) +uninstall-api-files: + -rm -f $(INSTALL_APIPOL_DIRECTORY)/$(API_POLICY_FILE) ############################################################################### diff -Nru brltty-5.4/Programs/menu.c brltty-5.5/Programs/menu.c --- brltty-5.4/Programs/menu.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/menu.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -91,6 +91,7 @@ }; typedef struct { + int (*testItem) (const MenuItem *item); int (*beginItem) (MenuItem *item); void (*endItem) (MenuItem *item, int deallocating); void (*activateItem) (MenuItem *item); @@ -126,7 +127,7 @@ struct { MenuToolFunction *function; - }tool; + } tool; } data; }; @@ -232,8 +233,8 @@ testMenuItem (const MenuItem *item, int all) { if (!item) return 0; if (all) return 1; - if (!item->test) return 1; - return item->test(); + if (item->methods->testItem && !item->methods->testItem(item)) return 0; + return !item->test || item->test(); } int @@ -317,8 +318,13 @@ item->menu = menu; item->setting = setting; - item->title = name->label; - item->subtitle = name->comment; + if (name) { + item->title = name->label; + item->subtitle = name->comment; + } else { + item->title = NULL; + item->subtitle = NULL; + } item->methods = NULL; item->test = NULL; @@ -737,15 +743,19 @@ } static int +testItem_submenu (const MenuItem *item) { + return getMenuSize(item->data.submenu->menu) > 1; +} + +static int beginItem_submenu (MenuItem *item) { item->data.submenu->visible = 0; { Menu *menu = item->data.submenu->menu; unsigned int size = getMenuSize(menu); - unsigned int index; - for (index=1; indexdata.submenu->visible += 1; } @@ -792,6 +802,7 @@ } static const MenuItemMethods menuItemMethods_submenu = { + .testItem = testItem_submenu, .beginItem = beginItem_submenu, .endItem = endItem_submenu, .activateItem = activateItem_submenu, diff -Nru brltty-5.4/Programs/menu_prefs.c brltty-5.5/Programs/menu_prefs.c --- brltty-5.4/Programs/menu_prefs.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/menu_prefs.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -22,6 +22,7 @@ #include #include "log.h" +#include "log_history.h" #include "embed.h" #include "revision.h" #include "menu.h" @@ -29,6 +30,7 @@ #include "prefs.h" #include "profile.h" #include "status_types.h" +#include "timing.h" #include "ttb.h" #include "atb.h" #include "ctb.h" @@ -51,7 +53,7 @@ #define NAME(name) static const MenuString itemName = {.label=name} #define ITEM(new) MenuItem *item = (new); if (!item) goto noItem #define TEST(property) setMenuItemTester(item, test##property) -#define CHANGED(setting) setMenuItemChanged(item, changed##setting) +#define CHANGED(property) setMenuItemChanged(item, changed##property) #define SET(name) PREFS_MENU_ITEM_VARIABLE(name) = item #define SUBMENU(variable, parent, name) \ @@ -512,6 +514,46 @@ } #endif /* HAVE_MIDI_SUPPORT */ +static Menu *logMessagesMenu = NULL; +static const LogEntry *newestLogMessage = NULL; + +static int +addNewLogMessages (const LogEntry *message) { + if (message == newestLogMessage) return 1; + if (!addNewLogMessages(getPreviousLogEntry(message))) return 0; + + MenuString name; + const TimeValue *time = getLogEntryTime(message); + unsigned int count = getLogEntryCount(message); + + if (time) { + char buffer[0X20]; + formatSeconds(buffer, sizeof(buffer), "%Y-%m-%d@%H:%M:%S", time->seconds); + name.label = strdup(buffer); + } else { + name.label = NULL; + } + + if (count > 1) { + char buffer[0X10]; + snprintf(buffer, sizeof(buffer), "(%u)", count); + name.comment = strdup(buffer); + } else { + name.comment = NULL; + } + + MenuItem *item = newTextMenuItem(logMessagesMenu, &name, getLogEntryText(message)); + if (!item) return 0; + + newestLogMessage = message; + return 1; +} + +int +updateLogMessagesSubmenu (void) { + return addNewLogMessages(getNewestLogMessage(1)); +} + static Menu * makePreferencesMenu (void) { static const MenuString cursorStyles[] = { @@ -1370,6 +1412,11 @@ } } + { + NAME(strtext("Log Messages")); + logMessagesMenu = newSubmenuMenuItem(rootMenu, &itemName); + } + return rootMenu; noItem: diff -Nru brltty-5.4/Programs/menu_prefs.h brltty-5.5/Programs/menu_prefs.h --- brltty-5.4/Programs/menu_prefs.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/menu_prefs.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -26,6 +26,7 @@ #endif /* __cplusplus */ extern Menu *getPreferencesMenu (void); +extern int updateLogMessagesSubmenu (void); #define PREFS_MENU_ITEM_APPLY(apply) \ apply(textTable) \ diff -Nru brltty-5.4/Programs/message.c brltty-5.5/Programs/message.c --- brltty-5.4/Programs/message.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/message.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -20,6 +20,8 @@ #include +#include "log.h" +#include "log_history.h" #include "message.h" #include "defaults.h" #include "async_wait.h" @@ -37,14 +39,35 @@ int messageHoldTimeout = DEFAULT_MESSAGE_HOLD_TIMEOUT; typedef struct { - unsigned touch:1; + const char *mode; + MessageOptions options; + unsigned presented:1; + unsigned deallocate:1; + char text[0]; +} MessageParameters; + +typedef struct { + const wchar_t *start; + size_t length; +} MessageSegment; + +typedef struct { + const MessageParameters *parameters; + + struct { + const MessageSegment *first; + const MessageSegment *current; + const MessageSegment *last; + } segments; int timeout; unsigned endWait:1; + unsigned hold:1; + unsigned touch:1; } MessageData; ASYNC_CONDITION_TESTER(testEndMessageWait) { - MessageData *mgd = data; + const MessageData *mgd = data; return mgd->endWait; } @@ -53,17 +76,44 @@ MessageData *mgd = data; switch (command & BRL_MSK_CMD) { + case BRL_CMD_NOOP: + return 1; + + case BRL_CMD_LNUP: + case BRL_CMD_PRDIFLN: + case BRL_CMD_FWINLTSKIP: + case BRL_CMD_FWINLT: { + if (mgd->segments.current > mgd->segments.first) { + mgd->segments.current -= 1; + mgd->endWait = 1; + } + + mgd->hold = 1; + return 1; + } + + case BRL_CMD_LNDN: + case BRL_CMD_NXDIFLN: + case BRL_CMD_FWINRTSKIP: + case BRL_CMD_FWINRT: { + if ((mgd->hold = mgd->segments.current < mgd->segments.last)) { + mgd->segments.current += 1; + } + + break; + } + default: { int arg = command & BRL_MSK_ARG; switch (command & BRL_MSK_BLK) { case BRL_CMD_BLK(TOUCH_AT): - mgd->touch = arg != BRL_MSK_ARG; + if ((mgd->touch = arg != BRL_MSK_ARG)) return 1; mgd->timeout = 1000; break; default: - mgd->timeout = -1; + mgd->hold = 0; break; } @@ -71,18 +121,10 @@ } } - if (!mgd->touch) mgd->endWait = 1; + mgd->endWait = 1; return 1; } -typedef struct { - const char *mode; - MessageOptions options; - unsigned presented:1; - unsigned deallocate:1; - char text[0]; -} MessageParameters; - ASYNC_TASK_CALLBACK(presentMessage) { MessageParameters *mgp = data; @@ -96,75 +138,91 @@ if (canBraille()) { MessageData mgd = { - .touch = 0 + .hold = 0, + .touch = 0, + .parameters = mgp }; - size_t size = textCount * brl.textRows; - wchar_t buffer[size]; + const size_t characterCount = getTextLength(mgp->text); + MessageSegment messageSegments[characterCount]; + wchar_t characters[characterCount + 1]; + convertTextToWchars(characters, mgp->text, ARRAY_COUNT(characters)); + + const size_t brailleSize = textCount * brl.textRows; + wchar_t brailleBuffer[brailleSize]; + + { + const wchar_t *character = characters; + const wchar_t *const end = character + characterCount; - size_t length = getTextLength(mgp->text); - wchar_t characters[length + 1]; - const wchar_t *character = characters; + MessageSegment *segment = messageSegments; + mgd.segments.current = mgd.segments.first = segment; + + while (*character) { + /* strip leading spaces */ + while ((character < end) && iswspace(*character)) character += 1; + + const size_t charactersLeft = end - character; + if (!charactersLeft) break; + + segment->start = character; + segment->length = MIN(charactersLeft, brailleSize); + + character += segment->length; + segment += 1; + } + + mgd.segments.last = segment - 1; + } int wasLinked = api.isLinked(); if (wasLinked) api.unlink(); - convertTextToWchars(characters, mgp->text, ARRAY_COUNT(characters)); suspendUpdates(); pushCommandEnvironment("message", NULL, NULL); pushCommandHandler("message", KTB_CTX_WAITING, handleMessageCommands, NULL, &mgd); - while (length) { - size_t count; - - /* strip leading spaces */ - while (iswspace(*character)) { - character += 1; - length -= 1; - } - - if (length <= size) { - count = length; /* the whole message fits in the braille window */ - } else { - /* split the message across multiple braille windows on space characters */ - for (count=size-2; count>0 && iswspace(characters[count]); count-=1); - count = count? count+1: size-1; - } - - wmemcpy(buffer, character, count); - character += count; - - if (length -= count) { - while (count < size) buffer[count++] = WC_C('-'); - buffer[count - 1] = WC_C('>'); - } + while (1) { + const MessageSegment *segment = mgd.segments.current; + size_t cellCount = segment->length; + int lastSegment = segment == mgd.segments.last; + wmemcpy(brailleBuffer, segment->start, cellCount); brl.cursor = BRL_NO_CURSOR; - if (!writeBrailleCharacters(mgp->mode, buffer, count)) { + + if (!writeBrailleCharacters(mgp->mode, brailleBuffer, cellCount)) { mgp->presented = 0; break; } mgd.timeout = messageHoldTimeout - brl.writeDelay; drainBrailleOutput(&brl, 0); + if (!mgd.hold && lastSegment && (mgp->options & MSG_NODELAY)) break; + mgd.timeout = MAX(mgd.timeout, 0); - if (length || !(mgp->options & MSG_NODELAY)) { - mgd.timeout = MAX(mgd.timeout, 0); - - while (1) { - mgd.endWait = 0; - - if (asyncAwaitCondition(mgd.timeout, testEndMessageWait, &mgd)) { - if (mgd.timeout < 0) break; - } else { - if (!(mgd.touch || (mgp->options & MSG_WAITKEY))) break; - mgd.timeout = messageHoldTimeout; - } + while (1) { + int timeout = mgd.timeout; + mgd.timeout = -1; + + mgd.endWait = 0; + int timedOut = !asyncAwaitCondition(timeout, testEndMessageWait, &mgd); + if (mgd.segments.current != segment) break; + + if (mgd.hold || mgd.touch) { + mgd.timeout = 1000000; + } else if (timedOut) { + if (lastSegment) goto DONE; + mgd.segments.current += 1; + mgd.timeout = messageHoldTimeout; + break; + } else if (mgd.timeout < 0) { + goto DONE; } } } + DONE: popCommandEnvironment(); resumeUpdates(1); if (wasLinked) api.link(); @@ -175,9 +233,11 @@ int message (const char *mode, const char *text, MessageOptions options) { + if (options & MSG_LOG) pushLogMessage(text); + int presented = 0; MessageParameters *mgp; - size_t size = sizeof(*mgp) + strlen(text); + size_t size = sizeof(*mgp) + strlen(text) + 1; if ((mgp = malloc(size))) { memset(mgp, 0, size); diff -Nru brltty-5.4/Programs/midi_alsa.c brltty-5.5/Programs/midi_alsa.c --- brltty-5.4/Programs/midi_alsa.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/midi_alsa.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/midi.c brltty-5.5/Programs/midi.c --- brltty-5.4/Programs/midi.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/midi.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/midi_darwin.c brltty-5.5/Programs/midi_darwin.c --- brltty-5.4/Programs/midi_darwin.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/midi_darwin.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/midi_none.c brltty-5.5/Programs/midi_none.c --- brltty-5.4/Programs/midi_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/midi_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/midi_oss.c brltty-5.5/Programs/midi_oss.c --- brltty-5.4/Programs/midi_oss.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/midi_oss.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/midi_windows.c brltty-5.5/Programs/midi_windows.c --- brltty-5.4/Programs/midi_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/midi_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mkdrvtab brltty-5.5/Programs/mkdrvtab --- brltty-5.4/Programs/mkdrvtab 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mkdrvtab 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Programs/mntfs_linux.c brltty-5.5/Programs/mntfs_linux.c --- brltty-5.4/Programs/mntfs_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntfs_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntfs_none.c brltty-5.5/Programs/mntfs_none.c --- brltty-5.4/Programs/mntfs_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntfs_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntpt.c brltty-5.5/Programs/mntpt.c --- brltty-5.4/Programs/mntpt.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntpt.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntpt_internal.h brltty-5.5/Programs/mntpt_internal.h --- brltty-5.4/Programs/mntpt_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntpt_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntpt_mntent.c brltty-5.5/Programs/mntpt_mntent.c --- brltty-5.4/Programs/mntpt_mntent.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntpt_mntent.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntpt_mntent.h brltty-5.5/Programs/mntpt_mntent.h --- brltty-5.4/Programs/mntpt_mntent.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntpt_mntent.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntpt_mnttab.c brltty-5.5/Programs/mntpt_mnttab.c --- brltty-5.4/Programs/mntpt_mnttab.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntpt_mnttab.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntpt_mnttab.h brltty-5.5/Programs/mntpt_mnttab.h --- brltty-5.4/Programs/mntpt_mnttab.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntpt_mnttab.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntpt_none.c brltty-5.5/Programs/mntpt_none.c --- brltty-5.4/Programs/mntpt_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntpt_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/mntpt_none.h brltty-5.5/Programs/mntpt_none.h --- brltty-5.4/Programs/mntpt_none.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/mntpt_none.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/notes_beep.c brltty-5.5/Programs/notes_beep.c --- brltty-5.4/Programs/notes_beep.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/notes_beep.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/notes.c brltty-5.5/Programs/notes.c --- brltty-5.4/Programs/notes.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/notes.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/notes_fm.c brltty-5.5/Programs/notes_fm.c --- brltty-5.4/Programs/notes_fm.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/notes_fm.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/notes_midi.c brltty-5.5/Programs/notes_midi.c --- brltty-5.4/Programs/notes_midi.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/notes_midi.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/notes_pcm.c brltty-5.5/Programs/notes_pcm.c --- brltty-5.4/Programs/notes_pcm.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/notes_pcm.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/options.c brltty-5.5/Programs/options.c --- brltty-5.4/Programs/options.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/options.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -525,10 +525,18 @@ break; } - case '?': - logMessage(LOG_ERR, "%s: %c%c", gettext("unknown option"), prefix, optopt); + case '?': { + const char *message = gettext("unknown option"); + + if (optopt) { + logMessage(LOG_ERR, "%s: %c%c", message, prefix, optopt); + } else { + logMessage(LOG_ERR, "%s: %s", message, (*argumentVector)[optind-1]); + } + info->syntaxError = 1; break; + } case ':': /* An invalid option has been specified. */ logMessage(LOG_ERR, "%s: %c%c", gettext("missing operand"), prefix, optopt); diff -Nru brltty-5.4/Programs/parameters.h brltty-5.5/Programs/parameters.h --- brltty-5.4/Programs/parameters.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/parameters.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/params_linux.c brltty-5.5/Programs/params_linux.c --- brltty-5.4/Programs/params_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/params_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/params_none.c brltty-5.5/Programs/params_none.c --- brltty-5.4/Programs/params_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/params_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/parse.c brltty-5.5/Programs/parse.c --- brltty-5.4/Programs/parse.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/parse.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -254,21 +254,60 @@ return 0; } +FlagKeywordPair fkpOnOff = {.true="on" , .false="off" }; +FlagKeywordPair fkpTrueFalse = {.true="true", .false="false"}; +FlagKeywordPair fkpYesNo = {.true="yes" , .false="no" }; +FlagKeywordPair fkp10 = {.true="1" , .false="0" }; + +const FlagKeywordPair *const flagKeywordPairs[] = { + &fkpOnOff, &fkpTrueFalse, &fkpYesNo, &fkp10 +}; + int -validateFlag (unsigned int *value, const char *string, const char *on, const char *off) { - const char *choices[] = {off, on, NULL}; +validateFlagKeyword (unsigned int *value, const char *string) { + static const char **choices = NULL; + + if (!choices) { + unsigned int count = ARRAY_COUNT(flagKeywordPairs); + size_t size = ARRAY_SIZE(choices, ((count * 2) + 1)); + + if (!(choices = malloc(size))) { + logMallocError(); + return 0; + } + + const FlagKeywordPair *const *fkp = flagKeywordPairs; + const FlagKeywordPair *const *end = fkp + count; + const char **choice = choices; + + while (fkp < end) { + *choice++ = (*fkp)->false; + *choice++ = (*fkp)->true; + fkp += 1; + } + + *choice = NULL; + } + if (!validateChoice(value, string, choices)) return 0; + *value %= 2; + return 1; +} + +int +validateFlag (unsigned int *value, const char *string, const FlagKeywordPair *fkp) { + const char *choices[] = {fkp->false, fkp->true, NULL}; return validateChoice(value, string, choices); } int validateOnOff (unsigned int *value, const char *string) { - return validateFlag(value, string, "on", "off"); + return validateFlag(value, string, &fkpOnOff); } int validateYesNo (unsigned int *value, const char *string) { - return validateFlag(value, string, "yes", "no"); + return validateFlag(value, string, &fkpYesNo); } #ifndef NO_FLOAT diff -Nru brltty-5.4/Programs/pcm_alsa.c brltty-5.5/Programs/pcm_alsa.c --- brltty-5.4/Programs/pcm_alsa.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm_alsa.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pcm_android.c brltty-5.5/Programs/pcm_android.c --- brltty-5.4/Programs/pcm_android.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm_android.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pcm_audio.c brltty-5.5/Programs/pcm_audio.c --- brltty-5.4/Programs/pcm_audio.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm_audio.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -18,6 +18,9 @@ #include "prologue.h" +#include +#include +#include #include #include diff -Nru brltty-5.4/Programs/pcm.c brltty-5.5/Programs/pcm.c --- brltty-5.4/Programs/pcm.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pcm_hpux.c brltty-5.5/Programs/pcm_hpux.c --- brltty-5.4/Programs/pcm_hpux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm_hpux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pcm_none.c brltty-5.5/Programs/pcm_none.c --- brltty-5.4/Programs/pcm_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pcm_oss.c brltty-5.5/Programs/pcm_oss.c --- brltty-5.4/Programs/pcm_oss.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm_oss.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pcm_qsa.c brltty-5.5/Programs/pcm_qsa.c --- brltty-5.4/Programs/pcm_qsa.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm_qsa.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pcm_windows.c brltty-5.5/Programs/pcm_windows.c --- brltty-5.4/Programs/pcm_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pcm_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pgmpath_linux.c brltty-5.5/Programs/pgmpath_linux.c --- brltty-5.4/Programs/pgmpath_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pgmpath_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pgmpath_none.c brltty-5.5/Programs/pgmpath_none.c --- brltty-5.4/Programs/pgmpath_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pgmpath_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pgmpath_solaris.c brltty-5.5/Programs/pgmpath_solaris.c --- brltty-5.4/Programs/pgmpath_solaris.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pgmpath_solaris.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pgmpath_windows.c brltty-5.5/Programs/pgmpath_windows.c --- brltty-5.4/Programs/pgmpath_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pgmpath_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pid.c brltty-5.5/Programs/pid.c --- brltty-5.4/Programs/pid.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pid.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pipe.c brltty-5.5/Programs/pipe.c --- brltty-5.4/Programs/pipe.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pipe.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/pipe.h brltty-5.5/Programs/pipe.h --- brltty-5.4/Programs/pipe.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/pipe.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ports_glibc.c brltty-5.5/Programs/ports_glibc.c --- brltty-5.4/Programs/ports_glibc.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ports_glibc.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ports_grub.c brltty-5.5/Programs/ports_grub.c --- brltty-5.4/Programs/ports_grub.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ports_grub.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ports_kfreebsd.c brltty-5.5/Programs/ports_kfreebsd.c --- brltty-5.4/Programs/ports_kfreebsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ports_kfreebsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ports_msdos.c brltty-5.5/Programs/ports_msdos.c --- brltty-5.4/Programs/ports_msdos.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ports_msdos.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ports_none.c brltty-5.5/Programs/ports_none.c --- brltty-5.4/Programs/ports_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ports_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ports_windows.c brltty-5.5/Programs/ports_windows.c --- brltty-5.4/Programs/ports_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ports_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ports_x86.h brltty-5.5/Programs/ports_x86.h --- brltty-5.4/Programs/ports_x86.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ports_x86.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/prefs.c brltty-5.5/Programs/prefs.c --- brltty-5.4/Programs/prefs.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/prefs.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -21,6 +21,7 @@ #include #include #include +#include #include "prefs.h" #include "prefs_internal.h" @@ -55,6 +56,52 @@ } static void +setStatusStyle (unsigned char style) { + static const unsigned char styleNone[] = { + sfEnd + }; + + static const unsigned char styleAlva[] = { + sfAlphabeticCursorCoordinates, sfAlphabeticWindowCoordinates, sfStateLetter, sfEnd + }; + + static const unsigned char styleTieman[] = { + sfCursorAndWindowColumn, sfCursorAndWindowRow, sfStateDots, sfEnd + }; + + static const unsigned char stylePB80[] = { + sfWindowRow, sfEnd + }; + + static const unsigned char styleConfigurable[] = { + sfGeneric, sfEnd + }; + + static const unsigned char styleMDV[] = { + sfWindowCoordinates, sfEnd + }; + + static const unsigned char styleVoyager[] = { + sfWindowRow, sfCursorRow, sfCursorColumn, sfEnd + }; + + static const unsigned char styleTime[] = { + sfTime, sfEnd + }; + + static const unsigned char *const styleTable[] = { + styleNone, styleAlva, styleTieman, stylePB80, + styleConfigurable, styleMDV, styleVoyager, styleTime + }; + static const unsigned char styleCount = ARRAY_COUNT(styleTable); + + if (style < styleCount) { + const unsigned char *fields = styleTable[style]; + if (*fields != sfEnd) setStatusFields(fields); + } +} + +static void resetPreference (const PreferenceEntry *pref) { if (pref->settingCount) { memset(pref->setting, pref->defaultValue, pref->settingCount); @@ -192,7 +239,7 @@ } const PreferenceEntry * -findPreference (const char *name) { +findPreferenceEntry (const char *name) { const PreferenceEntry *pref; if ((pref = findPreferenceByName(name))) return pref; @@ -201,7 +248,7 @@ } static int -getPreferenceSetting ( +changePreferenceSetting ( const char *name, const char *operand, unsigned char *setting, const PreferenceStringTable *names ) { @@ -231,26 +278,34 @@ return 0; } -static int -processPreferenceLine (char *line, void *data) { - static const char delimiters[] = " \t"; - const char *name = strtok(line, delimiters); +int +setPreference (char *string) { + const char *name; - if (name && (*name != PREFS_COMMENT_CHARACTER)) { - const PreferenceEntry *pref = findPreference(name); + { + static const char delimiters[] = { + ' ', '\t', PARAMETER_ASSIGNMENT_CHARACTER, 0 + }; - if (pref) { - const char *operand; + name = strtok(string, delimiters); + } + + if (name) { + const PreferenceEntry *pref = findPreferenceEntry(name); + if (pref) { if (pref->encountered) *pref->encountered = 1; + static const char delimiters[] = " \t"; + const char *operand; + if (pref->settingCount) { unsigned char count = pref->settingCount; unsigned char *setting = pref->setting; while (count) { if ((operand = strtok(NULL, delimiters))) { - if (getPreferenceSetting(name, operand, setting, pref->settingNames)) { + if (changePreferenceSetting(name, operand, setting, pref->settingNames)) { setting += 1; count -= 1; continue; @@ -262,60 +317,24 @@ } } else if (!(operand = strtok(NULL, delimiters))) { logMessage(LOG_WARNING, "missing preference setting: %s", name); - } else if (!getPreferenceSetting(name, operand, pref->setting, pref->settingNames)) { + } else if (!changePreferenceSetting(name, operand, pref->setting, pref->settingNames)) { } } else { logMessage(LOG_WARNING, "unknown preference: %s", name); } + } else { + logMessage(LOG_WARNING, "missing preference name"); } return 1; } -static void -setStatusStyle (unsigned char style) { - static const unsigned char styleNone[] = { - sfEnd - }; - - static const unsigned char styleAlva[] = { - sfAlphabeticCursorCoordinates, sfAlphabeticWindowCoordinates, sfStateLetter, sfEnd - }; - - static const unsigned char styleTieman[] = { - sfCursorAndWindowColumn, sfCursorAndWindowRow, sfStateDots, sfEnd - }; - - static const unsigned char stylePB80[] = { - sfWindowRow, sfEnd - }; - - static const unsigned char styleConfigurable[] = { - sfGeneric, sfEnd - }; - - static const unsigned char styleMDV[] = { - sfWindowCoordinates, sfEnd - }; - - static const unsigned char styleVoyager[] = { - sfWindowRow, sfCursorRow, sfCursorColumn, sfEnd - }; - - static const unsigned char styleTime[] = { - sfTime, sfEnd - }; - - static const unsigned char *const styleTable[] = { - styleNone, styleAlva, styleTieman, stylePB80, - styleConfigurable, styleMDV, styleVoyager, styleTime - }; - static const unsigned char styleCount = ARRAY_COUNT(styleTable); - - if (style < styleCount) { - const unsigned char *fields = styleTable[style]; - if (*fields != sfEnd) setStatusFields(fields); - } +static int +processPreferenceLine (char *line, void *data) { + while (isspace(*line)) line += 1; + if (!*line) return 1; + if (*line == PREFS_COMMENT_CHARACTER) return 1; + return setPreference(line); } int diff -Nru brltty-5.4/Programs/prefs_internal.h brltty-5.5/Programs/prefs_internal.h --- brltty-5.4/Programs/prefs_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/prefs_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/prefs_table.c brltty-5.5/Programs/prefs_table.c --- brltty-5.4/Programs/prefs_table.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/prefs_table.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/profile.c brltty-5.5/Programs/profile.c --- brltty-5.4/Programs/profile.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/profile.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/profile.h brltty-5.5/Programs/profile.h --- brltty-5.4/Programs/profile.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/profile.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/profile_types.h brltty-5.5/Programs/profile_types.h --- brltty-5.4/Programs/profile_types.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/profile_types.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/program.c brltty-5.5/Programs/program.c --- brltty-5.4/Programs/program.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/program.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/queue.c brltty-5.5/Programs/queue.c --- brltty-5.4/Programs/queue.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/queue.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/reldeps.mk brltty-5.5/Programs/reldeps.mk --- brltty-5.4/Programs/reldeps.mk 2016-06-28 11:21:49.000000000 +0000 +++ brltty-5.5/Programs/reldeps.mk 2017-04-18 22:38:33.000000000 +0000 @@ -232,6 +232,8 @@ auth.$O: $(SRC_TOP)Headers/strfmth.h auth.$O: $(SRC_TOP)Headers/parse.h auth.$O: $(SRC_TOP)Headers/auth.h +auth.$O: $(SRC_TOP)Headers/async.h +auth.$O: $(SRC_TOP)Headers/async_wait.h # Dependencies for beep.$O: beep.$O: $(SRC_DIR)/beep.c @@ -248,7 +250,6 @@ beep_linux.$O: $(BLD_TOP)config.h beep_linux.$O: $(BLD_TOP)forbuild.h beep_linux.$O: $(SRC_TOP)Headers/log.h -beep_linux.$O: $(SRC_TOP)Headers/device.h beep_linux.$O: $(SRC_TOP)Headers/beep.h beep_linux.$O: $(SRC_TOP)Headers/system_linux.h @@ -271,6 +272,7 @@ beep_solaris.$O: $(SRC_TOP)Headers/prologue.h beep_solaris.$O: $(BLD_TOP)config.h beep_solaris.$O: $(BLD_TOP)forbuild.h +beep_solaris.$O: $(SRC_TOP)Headers/log.h beep_solaris.$O: $(SRC_TOP)Headers/beep.h # Dependencies for beep_spkr.$O: @@ -1857,6 +1859,12 @@ gio_bluetooth.$O: $(SRC_TOP)Headers/usb_types.h gio_bluetooth.$O: $(SRC_DIR)/gio_internal.h gio_bluetooth.$O: $(SRC_TOP)Headers/io_bluetooth.h +gio_bluetooth.$O: $(SRC_TOP)Headers/api_types.h +gio_bluetooth.$O: $(SRC_TOP)Headers/brl_types.h +gio_bluetooth.$O: $(SRC_TOP)Headers/driver.h +gio_bluetooth.$O: $(SRC_TOP)Headers/ktb_types.h +gio_bluetooth.$O: $(SRC_TOP)Headers/queue.h +gio_bluetooth.$O: $(SRC_DIR)/brl.h # Dependencies for gio_null.$O: gio_null.$O: $(SRC_DIR)/gio_null.c @@ -2226,15 +2234,29 @@ log.$O: $(BLD_TOP)config.h log.$O: $(BLD_TOP)forbuild.h log.$O: $(SRC_TOP)Headers/log.h +log.$O: $(SRC_TOP)Headers/get_pthreads.h +log.$O: $(SRC_TOP)Headers/log_history.h +log.$O: $(SRC_TOP)Headers/thread.h +log.$O: $(SRC_TOP)Headers/timing.h +log.$O: $(SRC_TOP)Headers/win_pthread.h log.$O: $(SRC_TOP)Headers/strfmt.h log.$O: $(SRC_TOP)Headers/strfmth.h -log.$O: $(SRC_TOP)Headers/timing.h -log.$O: $(SRC_TOP)Headers/addresses.h log.$O: $(SRC_TOP)Headers/file.h log.$O: $(SRC_TOP)Headers/get_sockets.h -log.$O: $(SRC_TOP)Headers/get_pthreads.h -log.$O: $(SRC_TOP)Headers/thread.h -log.$O: $(SRC_TOP)Headers/win_pthread.h +log.$O: $(SRC_TOP)Headers/addresses.h +log.$O: $(SRC_TOP)Headers/stdiox.h + +# Dependencies for log_history.$O: +log_history.$O: $(SRC_DIR)/log_history.c +log_history.$O: $(SRC_TOP)Headers/prologue.h +log_history.$O: $(BLD_TOP)config.h +log_history.$O: $(BLD_TOP)forbuild.h +log_history.$O: $(SRC_TOP)Headers/log.h +log_history.$O: $(SRC_TOP)Headers/get_pthreads.h +log_history.$O: $(SRC_TOP)Headers/log_history.h +log_history.$O: $(SRC_TOP)Headers/thread.h +log_history.$O: $(SRC_TOP)Headers/timing.h +log_history.$O: $(SRC_TOP)Headers/win_pthread.h # Dependencies for menu.$O: menu.$O: $(SRC_DIR)/menu.c @@ -2254,6 +2276,11 @@ menu_prefs.$O: $(BLD_TOP)config.h menu_prefs.$O: $(BLD_TOP)forbuild.h menu_prefs.$O: $(SRC_TOP)Headers/log.h +menu_prefs.$O: $(SRC_TOP)Headers/get_pthreads.h +menu_prefs.$O: $(SRC_TOP)Headers/log_history.h +menu_prefs.$O: $(SRC_TOP)Headers/thread.h +menu_prefs.$O: $(SRC_TOP)Headers/timing.h +menu_prefs.$O: $(SRC_TOP)Headers/win_pthread.h menu_prefs.$O: $(SRC_TOP)Headers/embed.h menu_prefs.$O: $(SRC_TOP)Headers/pid.h menu_prefs.$O: $(SRC_TOP)Headers/program.h @@ -2289,7 +2316,6 @@ menu_prefs.$O: $(SRC_TOP)Headers/spk.h menu_prefs.$O: $(SRC_TOP)Headers/spk_types.h menu_prefs.$O: $(SRC_TOP)Headers/strfmth.h -menu_prefs.$O: $(SRC_TOP)Headers/timing.h menu_prefs.$O: $(SRC_TOP)Headers/usb_types.h menu_prefs.$O: $(SRC_DIR)/brl.h menu_prefs.$O: $(SRC_DIR)/core.h @@ -2300,6 +2326,12 @@ message.$O: $(SRC_TOP)Headers/prologue.h message.$O: $(BLD_TOP)config.h message.$O: $(BLD_TOP)forbuild.h +message.$O: $(SRC_TOP)Headers/log.h +message.$O: $(SRC_TOP)Headers/get_pthreads.h +message.$O: $(SRC_TOP)Headers/log_history.h +message.$O: $(SRC_TOP)Headers/thread.h +message.$O: $(SRC_TOP)Headers/timing.h +message.$O: $(SRC_TOP)Headers/win_pthread.h message.$O: $(SRC_TOP)Headers/message.h message.$O: $(SRC_TOP)Headers/api_types.h message.$O: $(SRC_TOP)Headers/async.h @@ -2336,7 +2368,6 @@ message.$O: $(SRC_TOP)Headers/program.h message.$O: $(SRC_TOP)Headers/scr_types.h message.$O: $(SRC_TOP)Headers/strfmth.h -message.$O: $(SRC_TOP)Headers/timing.h message.$O: $(SRC_DIR)/brl.h message.$O: $(SRC_DIR)/core.h message.$O: $(SRC_DIR)/profile_types.h @@ -3802,6 +3833,7 @@ usb.$O: $(SRC_TOP)Headers/strfmt.h usb.$O: $(SRC_TOP)Headers/strfmth.h usb.$O: $(SRC_DIR)/parameters.h +usb.$O: $(SRC_TOP)Headers/bitmask.h usb.$O: $(SRC_TOP)Headers/parse.h usb.$O: $(SRC_TOP)Headers/file.h usb.$O: $(SRC_TOP)Headers/get_sockets.h diff -Nru brltty-5.4/Programs/report.c brltty-5.5/Programs/report.c --- brltty-5.4/Programs/report.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/report.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/revision.c brltty-5.5/Programs/revision.c --- brltty-5.4/Programs/revision.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/revision.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/revision_identifier.h brltty-5.5/Programs/revision_identifier.h --- brltty-5.4/Programs/revision_identifier.h 2016-06-28 11:19:11.000000000 +0000 +++ brltty-5.5/Programs/revision_identifier.h 2017-04-18 22:35:52.000000000 +0000 @@ -1 +1 @@ -"BRLTTY-5.4" +"BRLTTY-5.5" diff -Nru brltty-5.4/Programs/routing.c brltty-5.5/Programs/routing.c --- brltty-5.4/Programs/routing.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/routing.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/routing.h brltty-5.5/Programs/routing.h --- brltty-5.4/Programs/routing.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/routing.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_base.c brltty-5.5/Programs/scr_base.c --- brltty-5.4/Programs/scr_base.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_base.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr.c brltty-5.5/Programs/scr.c --- brltty-5.4/Programs/scr.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_driver.c brltty-5.5/Programs/scr_driver.c --- brltty-5.4/Programs/scr_driver.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_driver.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_frozen.c brltty-5.5/Programs/scr_frozen.c --- brltty-5.4/Programs/scr_frozen.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_frozen.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_frozen.h brltty-5.5/Programs/scr_frozen.h --- brltty-5.4/Programs/scr_frozen.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_frozen.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_gpm.c brltty-5.5/Programs/scr_gpm.c --- brltty-5.4/Programs/scr_gpm.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_gpm.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr.h brltty-5.5/Programs/scr.h --- brltty-5.4/Programs/scr.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_help.c brltty-5.5/Programs/scr_help.c --- brltty-5.4/Programs/scr_help.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_help.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_help.h brltty-5.5/Programs/scr_help.h --- brltty-5.4/Programs/scr_help.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_help.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_internal.h brltty-5.5/Programs/scr_internal.h --- brltty-5.4/Programs/scr_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_main.c brltty-5.5/Programs/scr_main.c --- brltty-5.4/Programs/scr_main.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_main.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_menu.c brltty-5.5/Programs/scr_menu.c --- brltty-5.4/Programs/scr_menu.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_menu.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -65,25 +65,32 @@ static RenderedMenuItem * newRenderedMenuItem (Menu *menu) { MenuItem *item = getCurrentMenuItem(menu); + char labelString[0X100]; size_t labelLength; - - char settingString[0X100]; - size_t settingLength; - { const char *title = getMenuItemTitle(item); const char *subtitle = getMenuItemSubtitle(item); STR_BEGIN(labelString, ARRAY_COUNT(labelString)); STR_PRINTF("%s", title); - if (*subtitle) STR_PRINTF(" %s", subtitle); - if (!isMenuItemAction(item)) STR_PRINTF(":"); - STR_PRINTF(" "); + + if (*subtitle) { + if (*title) STR_PRINTF(" "); + STR_PRINTF("%s", subtitle); + } + + if (labelString[0]) { + if (!isMenuItemAction(item)) STR_PRINTF(":"); + STR_PRINTF(" "); + } + labelLength = STR_LENGTH; STR_END; } + char settingString[0X100]; + size_t settingLength; { const char *text = getMenuItemText(item); const char *comment = getMenuItemComment(item); @@ -155,9 +162,8 @@ static int setScreenRow (void) { const MenuItem *item = getCurrentItem(); - unsigned int row; - for (row=0; rowitem == item) { @@ -277,13 +283,11 @@ readCharacters_MenuScreen (const ScreenBox *box, ScreenCharacter *buffer) { if (validateScreenBox(box, screenWidth, screenHeight)) { ScreenCharacter *character = buffer; - unsigned int row; - for (row=0; rowheight; row+=1) { + for (unsigned int row=0; rowheight; row+=1) { const RenderedMenuItem *rmi = screenLines[row + box->top]; - unsigned int column; - for (column=0; columnwidth; column+=1) { + for (unsigned int column=0; columnwidth; column+=1) { unsigned int index = column + box->left; character->text = (index < rmi->length)? rmi->text[index]: WC_C(' '); diff -Nru brltty-5.4/Programs/scr_menu.h brltty-5.5/Programs/scr_menu.h --- brltty-5.4/Programs/scr_menu.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_menu.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_real.c brltty-5.5/Programs/scr_real.c --- brltty-5.4/Programs/scr_real.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_real.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_special.c brltty-5.5/Programs/scr_special.c --- brltty-5.4/Programs/scr_special.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_special.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -54,8 +54,9 @@ static int menuScreen_construct (void) { Menu *menu = getPreferencesMenu(); - if (!menu) return 0; + + updateLogMessagesSubmenu(); return menuScreen.construct(menu); } diff -Nru brltty-5.4/Programs/scr_special.h brltty-5.5/Programs/scr_special.h --- brltty-5.4/Programs/scr_special.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_special.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scrtest.c brltty-5.5/Programs/scrtest.c --- brltty-5.4/Programs/scrtest.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scrtest.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/scr_utils.c brltty-5.5/Programs/scr_utils.c --- brltty-5.4/Programs/scr_utils.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/scr_utils.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial.c brltty-5.5/Programs/serial.c --- brltty-5.4/Programs/serial.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_grub.c brltty-5.5/Programs/serial_grub.c --- brltty-5.4/Programs/serial_grub.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_grub.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_grub.h brltty-5.5/Programs/serial_grub.h --- brltty-5.4/Programs/serial_grub.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_grub.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_internal.h brltty-5.5/Programs/serial_internal.h --- brltty-5.4/Programs/serial_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_msdos.c brltty-5.5/Programs/serial_msdos.c --- brltty-5.4/Programs/serial_msdos.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_msdos.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_msdos.h brltty-5.5/Programs/serial_msdos.h --- brltty-5.4/Programs/serial_msdos.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_msdos.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_none.c brltty-5.5/Programs/serial_none.c --- brltty-5.4/Programs/serial_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_none.h brltty-5.5/Programs/serial_none.h --- brltty-5.4/Programs/serial_none.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_none.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_termios.c brltty-5.5/Programs/serial_termios.c --- brltty-5.4/Programs/serial_termios.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_termios.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_termios.h brltty-5.5/Programs/serial_termios.h --- brltty-5.4/Programs/serial_termios.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_termios.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_uart.h brltty-5.5/Programs/serial_uart.h --- brltty-5.4/Programs/serial_uart.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_uart.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_windows.c brltty-5.5/Programs/serial_windows.c --- brltty-5.4/Programs/serial_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/serial_windows.h brltty-5.5/Programs/serial_windows.h --- brltty-5.4/Programs/serial_windows.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/serial_windows.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/service_libsystemd.c brltty-5.5/Programs/service_libsystemd.c --- brltty-5.4/Programs/service_libsystemd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/service_libsystemd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/service_none.c brltty-5.5/Programs/service_none.c --- brltty-5.4/Programs/service_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/service_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/service_windows.c brltty-5.5/Programs/service_windows.c --- brltty-5.4/Programs/service_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/service_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ses.c brltty-5.5/Programs/ses.c --- brltty-5.4/Programs/ses.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ses.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ses.h brltty-5.5/Programs/ses.h --- brltty-5.4/Programs/ses.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ses.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/spk_base.c brltty-5.5/Programs/spk_base.c --- brltty-5.4/Programs/spk_base.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/spk_base.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/spk.c brltty-5.5/Programs/spk.c --- brltty-5.4/Programs/spk.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/spk.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/spk_driver.c brltty-5.5/Programs/spk_driver.c --- brltty-5.4/Programs/spk_driver.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/spk_driver.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/spk_input.c brltty-5.5/Programs/spk_input.c --- brltty-5.4/Programs/spk_input.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/spk_input.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/spk_input.h brltty-5.5/Programs/spk_input.h --- brltty-5.4/Programs/spk_input.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/spk_input.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/spktest.c brltty-5.5/Programs/spktest.c --- brltty-5.4/Programs/spktest.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/spktest.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -37,7 +37,7 @@ static char *opt_textString; static char *opt_speechVolume; static char *opt_speechRate; -char *opt_pcmDevice; +static char *opt_pcmDevice; static char *opt_driversDirectory; BEGIN_OPTION_TABLE(programOptions) diff -Nru brltty-5.4/Programs/spk_thread.c brltty-5.5/Programs/spk_thread.c --- brltty-5.4/Programs/spk_thread.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/spk_thread.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -80,7 +80,6 @@ struct SpeechDriverThreadStruct { ThreadState threadState; - unsigned stopping:1; Queue *requestQueue; volatile SpeechSynthesizer *speechSynthesizer; @@ -90,6 +89,7 @@ pthread_t threadIdentifier; AsyncEvent *requestEvent; AsyncEvent *messageEvent; + unsigned isBeingDestroyed:1; #endif /* GOT_PTHREADS */ struct { @@ -248,19 +248,18 @@ static int testThreadValidity (volatile SpeechDriverThread *sdt) { - if (sdt) { - volatile SpeechSynthesizer *spk = sdt->speechSynthesizer; + if (!sdt) return 0; - if (spk) { - if (sdt == spk->driver.thread) { - if (!sdt->stopping) { - return 1; - } - } - } - } +#ifdef GOT_PTHREADS + if (sdt->isBeingDestroyed) return 0; +#endif /* GOT_PTHREADS */ - return 0; + volatile SpeechSynthesizer *spk = sdt->speechSynthesizer; + if (!spk) return 0; + if (sdt != spk->driver.thread) return 0; + + if (sdt->threadState != THD_READY) return 0; + return 1; } static void @@ -874,7 +873,6 @@ if ((sdt = malloc(sizeof(*sdt)))) { memset((void *)sdt, 0, sizeof(*sdt)); - sdt->stopping = 0; setThreadState(sdt, THD_CONSTRUCTING); setResponsePending(sdt); @@ -943,6 +941,7 @@ #ifdef GOT_PTHREADS if (enqueueSpeechRequest(sdt, NULL)) { + sdt->isBeingDestroyed = 1; awaitSpeechResponse(sdt, SPEECH_DRIVER_THREAD_STOP_TIMEOUT); setResponsePending(sdt); diff -Nru brltty-5.4/Programs/spk_thread.h brltty-5.5/Programs/spk_thread.h --- brltty-5.4/Programs/spk_thread.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/spk_thread.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/status.c brltty-5.5/Programs/status.c --- brltty-5.4/Programs/status.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/status.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/status.h brltty-5.5/Programs/status.h --- brltty-5.4/Programs/status.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/status.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/sys_darwin.c brltty-5.5/Programs/sys_darwin.c --- brltty-5.4/Programs/sys_darwin.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/sys_darwin.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/sys_freebsd.c brltty-5.5/Programs/sys_freebsd.c --- brltty-5.4/Programs/sys_freebsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/sys_freebsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/sys_kfreebsd.c brltty-5.5/Programs/sys_kfreebsd.c --- brltty-5.4/Programs/sys_kfreebsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/sys_kfreebsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/sys_netbsd.c brltty-5.5/Programs/sys_netbsd.c --- brltty-5.4/Programs/sys_netbsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/sys_netbsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/sys_openbsd.c brltty-5.5/Programs/sys_openbsd.c --- brltty-5.4/Programs/sys_openbsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/sys_openbsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/sys_solaris.c brltty-5.5/Programs/sys_solaris.c --- brltty-5.4/Programs/sys_solaris.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/sys_solaris.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/system_darwin.c brltty-5.5/Programs/system_darwin.c --- brltty-5.4/Programs/system_darwin.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/system_darwin.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/system_java.c brltty-5.5/Programs/system_java.c --- brltty-5.4/Programs/system_java.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/system_java.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/system_linux.c brltty-5.5/Programs/system_linux.c --- brltty-5.4/Programs/system_linux.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/system_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff -Nru brltty-5.4/Programs/system_msdos.c brltty-5.5/Programs/system_msdos.c --- brltty-5.4/Programs/system_msdos.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/system_msdos.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/system_none.c brltty-5.5/Programs/system_none.c --- brltty-5.4/Programs/system_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/system_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/system_windows.c brltty-5.5/Programs/system_windows.c --- brltty-5.4/Programs/system_windows.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/system_windows.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -541,7 +541,9 @@ LANGUAGE(LOWER_SORBIAN, "dsb"); LANGUAGE(LUXEMBOURGISH, "lb"); LANGUAGE(MACEDONIAN, "mk"); +#ifndef __MINGW64_VERSION_MAJOR LANGUAGE(MALAGASY, "mg"); +#endif LANGUAGE(MALAY, "ms"); LANGUAGE(MALAYALAM, "ml"); LANGUAGE(MALTESE, "mt"); @@ -633,7 +635,7 @@ } #endif /* gettimeofday() */ -#if (__MINGW32_MAJOR_VERSION < 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15)) +#if !defined(__MINGW64_VERSION_MAJOR) && ((__MINGW32_MAJOR_VERSION < 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION < 15))) void usleep (int usec) { if (usec > 0) { diff -Nru brltty-5.4/Programs/tbl2hex.c brltty-5.5/Programs/tbl2hex.c --- brltty-5.4/Programs/tbl2hex.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/tbl2hex.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/thread.c brltty-5.5/Programs/thread.c --- brltty-5.4/Programs/thread.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/thread.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/timing.c brltty-5.5/Programs/timing.c --- brltty-5.4/Programs/timing.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/timing.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -123,6 +123,24 @@ logSystemError("settimeofday"); } +#elif defined(__MINGW32__) + TimeComponents components; + expandTimeValue(now, &components); + + SYSTEMTIME time = { + .wYear = components.year, + .wMonth = components.month + 1, + .wDay = components.day + 1, + .wHour = components.hour, + .wMinute = components.minute, + .wSecond = components.second, + .wMilliseconds = now->nanoseconds / NSECS_PER_MSEC + }; + + if (!SetLocalTime(&time)) { + logWindowsSystemError("SetLocalTime"); + } + #elif defined(HAVE_STIME) const time_t seconds = now->seconds; diff -Nru brltty-5.4/Programs/ttb_compile.c brltty-5.5/Programs/ttb_compile.c --- brltty-5.4/Programs/ttb_compile.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ttb_compile.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ttb_compile.h brltty-5.5/Programs/ttb_compile.h --- brltty-5.4/Programs/ttb_compile.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ttb_compile.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ttb_gnome.c brltty-5.5/Programs/ttb_gnome.c --- brltty-5.4/Programs/ttb_gnome.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ttb_gnome.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ttb_internal.h brltty-5.5/Programs/ttb_internal.h --- brltty-5.4/Programs/ttb_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ttb_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ttb_louis.c brltty-5.5/Programs/ttb_louis.c --- brltty-5.4/Programs/ttb_louis.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ttb_louis.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ttb_native.c brltty-5.5/Programs/ttb_native.c --- brltty-5.4/Programs/ttb_native.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ttb_native.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/ttb_translate.c brltty-5.5/Programs/ttb_translate.c --- brltty-5.4/Programs/ttb_translate.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/ttb_translate.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/tune_build.c brltty-5.5/Programs/tune_build.c --- brltty-5.4/Programs/tune_build.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/tune_build.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/tune.c brltty-5.5/Programs/tune.c --- brltty-5.4/Programs/tune.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/tune.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/tune_utils.c brltty-5.5/Programs/tune_utils.c --- brltty-5.4/Programs/tune_utils.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/tune_utils.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/unicode.c brltty-5.5/Programs/unicode.c --- brltty-5.4/Programs/unicode.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/unicode.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/update.c brltty-5.5/Programs/update.c --- brltty-5.4/Programs/update.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/update.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/update.h brltty-5.5/Programs/update.h --- brltty-5.4/Programs/update.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/update.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_adapters.c brltty-5.5/Programs/usb_adapters.c --- brltty-5.4/Programs/usb_adapters.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_adapters.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_adapters.h brltty-5.5/Programs/usb_adapters.h --- brltty-5.4/Programs/usb_adapters.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_adapters.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_android.c brltty-5.5/Programs/usb_android.c --- brltty-5.4/Programs/usb_android.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_android.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -456,6 +456,7 @@ int usbSetConfiguration (UsbDevice *device, unsigned char configuration) { + logMessage(LOG_CATEGORY(USB_IO), "setting configuration: %u", configuration); if (configuration == 1) return 1; logUnsupportedFunction(); @@ -466,10 +467,15 @@ usbClaimInterface (UsbDevice *device, unsigned char interface) { UsbDeviceExtension *devx = device->extension; - if (usbSetInterface(devx, interface)) - if (usbOpenConnection(devx)) - if (usbDoClaimInterface(devx->host->env, devx->connection, devx->interface)) + logMessage(LOG_CATEGORY(USB_IO), "claiming interface: %u", interface); + + if (usbSetInterface(devx, interface)) { + if (usbOpenConnection(devx)) { + if (usbDoClaimInterface(devx->host->env, devx->connection, devx->interface)) { return 1; + } + } + } return 0; } @@ -478,10 +484,15 @@ usbReleaseInterface (UsbDevice *device, unsigned char interface) { UsbDeviceExtension *devx = device->extension; - if (usbSetInterface(devx, interface)) - if (usbOpenConnection(devx)) - if (usbDoReleaseInterface(devx->host->env, devx->connection, devx->interface)) + logMessage(LOG_CATEGORY(USB_IO), "releasing interface: %u", interface); + + if (usbSetInterface(devx, interface)) { + if (usbOpenConnection(devx)) { + if (usbDoReleaseInterface(devx->host->env, devx->connection, devx->interface)) { return 1; + } + } + } return 0; } @@ -492,6 +503,7 @@ unsigned char interface, unsigned char alternative ) { + logMessage(LOG_CATEGORY(USB_IO), "setting alternative: %u[%u]", interface, alternative); if (alternative == 0) return 1; logUnsupportedFunction(); @@ -500,6 +512,7 @@ int usbClearHalt (UsbDevice *device, unsigned char endpointAddress) { + logMessage(LOG_CATEGORY(USB_IO), "clear halt: %02X", endpointAddress); logUnsupportedFunction(); return 0; } @@ -527,6 +540,7 @@ if (bytes) { if (direction == UsbControlDirection_Output) { (*host->env)->SetByteArrayRegion(host->env, bytes, 0, length, buffer); + if (length) logBytes(LOG_CATEGORY(USB_IO), "control output", buffer, length); } result = usbDoControlTransfer(host->env, devx->connection, @@ -537,6 +551,7 @@ if (direction == UsbControlDirection_Input) { if (result > 0) { (*host->env)->GetByteArrayRegion(host->env, bytes, 0, result, buffer); + logBytes(LOG_CATEGORY(USB_IO), "control input", buffer, result); } } @@ -598,6 +613,8 @@ ssize_t result = -1; UsbEndpoint *endpoint = usbGetInputEndpoint(device, endpointNumber); + logMessage(LOG_CATEGORY(USB_IO), "reading endpoint: %u", endpointNumber); + if (endpoint) { UsbDeviceExtension *devx = device->extension; @@ -649,6 +666,8 @@ if (endpoint) { UsbDeviceExtension *devx = device->extension; + usbLogEndpointData(endpoint, "output", buffer, length); + if (usbOpenConnection(devx)) { const UsbHostDevice *host = devx->host; JNIEnv *env = host->env; diff -Nru brltty-5.4/Programs/usb_belkin.c brltty-5.5/Programs/usb_belkin.c --- brltty-5.4/Programs/usb_belkin.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_belkin.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_belkin.h brltty-5.5/Programs/usb_belkin.h --- brltty-5.4/Programs/usb_belkin.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_belkin.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_bsd.h brltty-5.5/Programs/usb_bsd.h --- brltty-5.4/Programs/usb_bsd.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_bsd.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb.c brltty-5.5/Programs/usb.c --- brltty-5.4/Programs/usb.c 2016-06-28 09:01:22.000000000 +0000 +++ brltty-5.5/Programs/usb.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -31,6 +31,7 @@ #include "log.h" #include "strfmt.h" #include "parameters.h" +#include "bitmask.h" #include "parse.h" #include "file.h" #include "charset.h" @@ -370,6 +371,34 @@ return identifier == getLittleEndian16(descriptor->idProduct); } +static int +usbVerifyStrings ( + UsbDevice *device, + const char *const *strings, + unsigned char number +) { + if (!strings) return 1; + if (!number) return 0; + + char *string = usbGetString(device, number, 1000); + int matched = 0; + + if (string) { + while (*strings) { + if (strcmp(*strings, string) == 0) { + matched = 1; + break; + } + + strings += 1; + } + + free(string); + } + + return matched; +} + const UsbDeviceDescriptor * usbDeviceDescriptor (UsbDevice *device) { return &device->descriptor; @@ -1138,6 +1167,19 @@ } } +static int +usbGetPollInterval (UsbEndpoint *endpoint) { + int interval = endpoint->descriptor->bInterval; + + if (interval > 0) { + if (getLittleEndian16(endpoint->device->descriptor.bcdUSB) >= UsbSpecificationVersion_2_0) { + interval = (1 << (interval - 1)) / 8; + } + } + + return interval; +} + int usbAwaitInput ( UsbDevice *device, @@ -1169,7 +1211,7 @@ return 0; } - retryInterval = endpoint->descriptor->bInterval; + retryInterval = usbGetPollInterval(endpoint); retryInterval = MAX(USB_INPUT_AWAIT_RETRY_INTERVAL_MINIMUM, retryInterval); if (!(endpoint->direction.input.pending.requests && getQueueSize(endpoint->direction.input.pending.requests))) { @@ -1405,6 +1447,40 @@ return 0; } +static int +usbVerifyInterface (UsbDevice *device, const UsbChannelDefinition *definition) { + const UsbInterfaceDescriptor *interface = usbInterfaceDescriptor(device, definition->interface, definition->alternative); + if (!interface) return 0; + + BITMASK(endpoints, 0X100, char); + BITMASK_ZERO(endpoints); + + { + const UsbDescriptor *descriptor = (const UsbDescriptor *)interface; + + while (usbNextDescriptor(device, &descriptor)) { + uint8_t type = descriptor->header.bDescriptorType; + if (type == UsbDescriptorType_Interface) break; + if (type != UsbDescriptorType_Endpoint) continue; + BITMASK_SET(endpoints, descriptor->endpoint.bEndpointAddress); + } + } + + if (definition->inputEndpoint) { + if (!BITMASK_TEST(endpoints, (definition->inputEndpoint | UsbEndpointDirection_Input))) { + return 0; + } + } + + if (definition->outputEndpoint) { + if (!BITMASK_TEST(endpoints, (definition->outputEndpoint | UsbEndpointDirection_Output))) { + return 0; + } + } + + return 1; +} + struct UsbChooseChannelDataStruct { const UsbChannelDefinition *definition; @@ -1437,7 +1513,6 @@ if (!data->genericDevices) { const UsbSerialAdapter *adapter = usbFindSerialAdapter(descriptor); - if (adapter && adapter->generic) goto nextDefinition; } @@ -1445,9 +1520,12 @@ if (!usbVerifyProductIdentifier(descriptor, data->productIdentifier)) goto nextDefinition; if (!usbVerifySerialNumber(device, data->serialNumber)) goto nextDefinition; + if (!usbVerifyStrings(device, definition->manufacturers, descriptor->iManufacturer)) goto nextDefinition; + if (!usbVerifyStrings(device, definition->products, descriptor->iProduct)) goto nextDefinition; + if (definition->verifyInterface) { if (!usbConfigureDevice(device, definition->configuration)) goto nextDefinition; - if (!usbInterfaceDescriptor(device, definition->interface, definition->alternative)) goto nextDefinition; + if (!usbVerifyInterface(device, definition)) goto nextDefinition; } data->definition = definition; diff -Nru brltty-5.4/Programs/usb_cdc_acm.c brltty-5.5/Programs/usb_cdc_acm.c --- brltty-5.4/Programs/usb_cdc_acm.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_cdc_acm.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_cdc_acm.h brltty-5.5/Programs/usb_cdc_acm.h --- brltty-5.4/Programs/usb_cdc_acm.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_cdc_acm.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_cp2101.c brltty-5.5/Programs/usb_cp2101.c --- brltty-5.4/Programs/usb_cp2101.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_cp2101.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_cp2101.h brltty-5.5/Programs/usb_cp2101.h --- brltty-5.4/Programs/usb_cp2101.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_cp2101.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_cp2110.c brltty-5.5/Programs/usb_cp2110.c --- brltty-5.4/Programs/usb_cp2110.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_cp2110.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_cp2110.h brltty-5.5/Programs/usb_cp2110.h --- brltty-5.4/Programs/usb_cp2110.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_cp2110.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_darwin.c brltty-5.5/Programs/usb_darwin.c --- brltty-5.4/Programs/usb_darwin.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_darwin.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_freebsd.c brltty-5.5/Programs/usb_freebsd.c --- brltty-5.4/Programs/usb_freebsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_freebsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_ftdi.c brltty-5.5/Programs/usb_ftdi.c --- brltty-5.4/Programs/usb_ftdi.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_ftdi.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_ftdi.h brltty-5.5/Programs/usb_ftdi.h --- brltty-5.4/Programs/usb_ftdi.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_ftdi.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_grub.c brltty-5.5/Programs/usb_grub.c --- brltty-5.4/Programs/usb_grub.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_grub.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_hid.c brltty-5.5/Programs/usb_hid.c --- brltty-5.4/Programs/usb_hid.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_hid.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_internal.h brltty-5.5/Programs/usb_internal.h --- brltty-5.4/Programs/usb_internal.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_internal.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_kfreebsd.c brltty-5.5/Programs/usb_kfreebsd.c --- brltty-5.4/Programs/usb_kfreebsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_kfreebsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_libusb-1.0.c brltty-5.5/Programs/usb_libusb-1.0.c --- brltty-5.4/Programs/usb_libusb-1.0.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_libusb-1.0.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_libusb.c brltty-5.5/Programs/usb_libusb.c --- brltty-5.4/Programs/usb_libusb.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_libusb.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_linux.c brltty-5.5/Programs/usb_linux.c --- brltty-5.4/Programs/usb_linux.c 2016-06-28 09:01:22.000000000 +0000 +++ brltty-5.5/Programs/usb_linux.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -194,6 +194,7 @@ static int usbDisconnectDriver (UsbDevice *device, unsigned char interface) { #ifdef USBDEVFS_DISCONNECT + logMessage(LOG_CATEGORY(USB_IO), "disconnecting kernel driver: Int:%u", interface); if (usbControlDriver(device, interface, USBDEVFS_DISCONNECT, NULL)) return 1; #else /* USBDEVFS_DISCONNECT */ errno = ENOSYS; @@ -929,7 +930,7 @@ return 0; } - return usbHandleInputResponse(endpoint, urb->buffer, urb->actual_length);; + return usbHandleInputResponse(endpoint, urb->buffer, urb->actual_length); } static void diff -Nru brltty-5.4/Programs/usb_netbsd.c brltty-5.5/Programs/usb_netbsd.c --- brltty-5.4/Programs/usb_netbsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_netbsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_none.c brltty-5.5/Programs/usb_none.c --- brltty-5.4/Programs/usb_none.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_none.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_openbsd.c brltty-5.5/Programs/usb_openbsd.c --- brltty-5.4/Programs/usb_openbsd.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_openbsd.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_serial.c brltty-5.5/Programs/usb_serial.c --- brltty-5.4/Programs/usb_serial.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_serial.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_serial.h brltty-5.5/Programs/usb_serial.h --- brltty-5.4/Programs/usb_serial.h 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_serial.h 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/usb_solaris.c brltty-5.5/Programs/usb_solaris.c --- brltty-5.4/Programs/usb_solaris.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/usb_solaris.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * diff -Nru brltty-5.4/Programs/variables.c brltty-5.5/Programs/variables.c --- brltty-5.4/Programs/variables.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/variables.c 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ * BRLTTY - A background process providing access to the console screen (when in * text mode) for a blind person using a refreshable braille display. * - * Copyright (C) 1995-2016 by The BRLTTY Developers. + * Copyright (C) 1995-2017 by The BRLTTY Developers. * * BRLTTY comes with ABSOLUTELY NO WARRANTY. * @@ -112,6 +112,8 @@ if ((vnl->previous = previous)) claimVariableNestingLevel(previous); return vnl; } + + free(vnl); } else { logMallocError(); } diff -Nru brltty-5.4/Programs/xbrlapi.c brltty-5.5/Programs/xbrlapi.c --- brltty-5.4/Programs/xbrlapi.c 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Programs/xbrlapi.c 2017-04-18 22:35:13.000000000 +0000 @@ -1,7 +1,7 @@ /* * XBrlAPI - A background process tinkering with X for proper BrlAPI behavior * - * Copyright (C) 2003-2016 by Samuel Thibault + * Copyright (C) 2003-2017 by Samuel Thibault * * XBrlAPI comes with ABSOLUTELY NO WARRANTY. * @@ -173,20 +173,25 @@ unsigned int x,y; settings.host=host; settings.auth=auth; + static int had_succeeded; if ((brlapi_fd = brlapi_openConnection(&settings,&settings))<0) { - static int tried; - if (!tried) + if (!had_succeeded) { - /* Only produce an error message the first time we try to connect, to - * provide feedback to users running xbrlapi by hand, but not fill logs - * with reconnection attempts. */ - tried = 1; + /* This is the first attempt to connect to BRLTTY, and it failed. + * Return the error immediately to the user, to provide feedback to users + * running xbrlapi by hand, but not fill logs, eat battery, spam + * 127.0.0.1 with reconnection attempts. + */ fatal_brlapi_errno("openConnection",gettext("cannot connect to braille devices daemon brltty at %s\n"),settings.host); + exit(PROG_EXIT_FATAL); } return 0; } + /* We achieved connecting to BRLTTY. If BRLTTY dies later on, we will + * silently try to reconnect to it. */ + had_succeeded = 1; if (brlapi_getDisplaySize(&x,&y)<0) { @@ -733,9 +738,9 @@ default: fprintf(stderr,gettext("xbrlapi: unhandled event type: %d\n"),ev.type); break; } } - if (brlapi_fd>=0 && FD_ISSET(brlapi_fd,&readfds)) { + if (brlapi_fd>=0) { #ifdef CAN_SIMULATE_KEY_PRESSES - if (haveXTest) { + if (haveXTest && FD_ISSET(brlapi_fd,&readfds)) { while (((res = brlapi_readKey(0, &code))==1)) { switch (code & BRLAPI_KEY_TYPE_MASK) { case BRLAPI_KEY_TYPE_CMD: diff -Nru brltty-5.4/prologue.mk brltty-5.5/prologue.mk --- brltty-5.4/prologue.mk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/prologue.mk 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/prologue.sh brltty-5.5/prologue.sh --- brltty-5.4/prologue.sh 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/prologue.sh 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/prologue.tcl brltty-5.5/prologue.tcl --- brltty-5.4/prologue.tcl 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/prologue.tcl 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/README brltty-5.5/README --- brltty-5.4/README 2016-06-28 11:02:58.000000000 +0000 +++ brltty-5.5/README 2017-04-18 22:35:13.000000000 +0000 @@ -2,9 +2,9 @@ console (when in text mode) for a blind person using a refreshable braille display. -Version 5.4, Jun 2016 +Version 5.5, Apr 2017 -Copyright (C) 1995-2016 by The BRLTTY Developers. +Copyright (C) 1995-2017 by The BRLTTY Developers. Web Page: http://brltty.com/ @@ -62,8 +62,8 @@ ============= We recommend that you contact us via BRLTTY's mailing list. You can post to the -list by sending an e-mail to . To subscribe, go to the list's -Information Page at [http://mielke.cc/mailman/listinfo/brltty]. +list by sending an e-mail to . To subscribe, go to the list's +Information Page at [http://brltty.com/mailman/listinfo/brltty]. If you have any interest in BRLTTY, please drop us a note. We're interested in knowing who BRLTTY's users are. Even if all goes well and you have no problems @@ -185,7 +185,7 @@ Braille Controller 640/680, Easy Link 12] - B2G - Baum [BrailleConnect 12/24/32/40/64/80, Brailliant 24/32/40/64/80, Conny 12, - DM80 Plus, EcoVario 24/32/40/64/80, Inka, PocketVario 24, + DM80 Plus, EcoVario 24/32/40/64/80, Inka, Orbit 20, PocketVario 24, Pronto! V3 18/40, Pronto! V4 18/40, RBT 40/80, Refreshabraille 18, SuperVario 32/40/64/80, Vario 40/80, VarioConnect 12/24/32/40/64/80, VarioPro 40/64/80, VarioUltra 20/32/40] @@ -202,7 +202,7 @@ - FreedomScientific [Focus 1 44/70/84, Focus 2 40/80, Focus Blue 14/40, PAC Mate 20/40] - HandyTech [Modular 20/40/80, Modular Evolution 64/88, Modular Connect 88, - Active Braille, Active Star 40, + Active Braille, Active Star 40, Actilino, Basic Braille 16/20/32/40/48/64/80, Braillino, Braille Wave, Easy Braille, Braille Star 40/80, Connect Braille 40, Bookworm] diff -Nru brltty-5.4/run-brltty brltty-5.5/run-brltty --- brltty-5.4/run-brltty 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/run-brltty 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/run-command brltty-5.5/run-command --- brltty-5.4/run-command 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/run-command 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/run-xbrlapi brltty-5.5/run-xbrlapi --- brltty-5.4/run-xbrlapi 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/run-xbrlapi 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/screen.mk brltty-5.5/screen.mk --- brltty-5.4/screen.mk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/screen.mk 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/speech.mk brltty-5.5/speech.mk --- brltty-5.4/speech.mk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/speech.mk 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Attributes/invleft_right.atb brltty-5.5/Tables/Attributes/invleft_right.atb --- brltty-5.4/Tables/Attributes/invleft_right.atb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Attributes/invleft_right.atb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Attributes/left_right.atb brltty-5.5/Tables/Attributes/left_right.atb --- brltty-5.4/Tables/Attributes/left_right.atb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Attributes/left_right.atb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Attributes/upper_lower.atb brltty-5.5/Tables/Attributes/upper_lower.atb --- brltty-5.4/Tables/Attributes/upper_lower.atb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Attributes/upper_lower.atb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/af.ctb brltty-5.5/Tables/Contraction/af.ctb --- brltty-5.4/Tables/Contraction/af.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/af.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/am.ctb brltty-5.5/Tables/Contraction/am.ctb --- brltty-5.4/Tables/Contraction/am.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/am.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/countries.cti brltty-5.5/Tables/Contraction/countries.cti --- brltty-5.4/Tables/Contraction/countries.cti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/countries.cti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/de-basis.ctb brltty-5.5/Tables/Contraction/de-basis.ctb --- brltty-5.4/Tables/Contraction/de-basis.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/de-basis.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/de-kurzschrift.ctb brltty-5.5/Tables/Contraction/de-kurzschrift.ctb --- brltty-5.4/Tables/Contraction/de-kurzschrift.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/de-kurzschrift.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/de-vollschrift.ctb brltty-5.5/Tables/Contraction/de-vollschrift.ctb --- brltty-5.4/Tables/Contraction/de-vollschrift.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/de-vollschrift.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/en-ueb-g2.ctb brltty-5.5/Tables/Contraction/en-ueb-g2.ctb --- brltty-5.4/Tables/Contraction/en-ueb-g2.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/en-ueb-g2.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/en-us-g2.ctb brltty-5.5/Tables/Contraction/en-us-g2.ctb --- brltty-5.4/Tables/Contraction/en-us-g2.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/en-us-g2.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/es.ctb brltty-5.5/Tables/Contraction/es.ctb --- brltty-5.4/Tables/Contraction/es.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/es.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/fr-abrege.ctb brltty-5.5/Tables/Contraction/fr-abrege.ctb --- brltty-5.4/Tables/Contraction/fr-abrege.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/fr-abrege.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/fr-integral.ctb brltty-5.5/Tables/Contraction/fr-integral.ctb --- brltty-5.4/Tables/Contraction/fr-integral.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/fr-integral.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/ha.ctb brltty-5.5/Tables/Contraction/ha.ctb --- brltty-5.4/Tables/Contraction/ha.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/ha.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/id.ctb brltty-5.5/Tables/Contraction/id.ctb --- brltty-5.4/Tables/Contraction/id.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/id.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/ipa.ctb brltty-5.5/Tables/Contraction/ipa.ctb --- brltty-5.4/Tables/Contraction/ipa.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/ipa.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/ja.ctb brltty-5.5/Tables/Contraction/ja.ctb --- brltty-5.4/Tables/Contraction/ja.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/ja.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/ko.ctb brltty-5.5/Tables/Contraction/ko.ctb --- brltty-5.4/Tables/Contraction/ko.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/ko.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/ko-g1.ctb brltty-5.5/Tables/Contraction/ko-g1.ctb --- brltty-5.4/Tables/Contraction/ko-g1.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/ko-g1.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/ko-g2.ctb brltty-5.5/Tables/Contraction/ko-g2.ctb --- brltty-5.4/Tables/Contraction/ko-g2.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/ko-g2.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/latex-access.ctb brltty-5.5/Tables/Contraction/latex-access.ctb --- brltty-5.4/Tables/Contraction/latex-access.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/latex-access.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/letters-latin.cti brltty-5.5/Tables/Contraction/letters-latin.cti --- brltty-5.4/Tables/Contraction/letters-latin.cti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/letters-latin.cti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/mg.ctb brltty-5.5/Tables/Contraction/mg.ctb --- brltty-5.4/Tables/Contraction/mg.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/mg.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/mun.ctb brltty-5.5/Tables/Contraction/mun.ctb --- brltty-5.4/Tables/Contraction/mun.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/mun.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/nabcc.cti brltty-5.5/Tables/Contraction/nabcc.cti --- brltty-5.4/Tables/Contraction/nabcc.cti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/nabcc.cti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/nl.ctb brltty-5.5/Tables/Contraction/nl.ctb --- brltty-5.4/Tables/Contraction/nl.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/nl.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/ny.ctb brltty-5.5/Tables/Contraction/ny.ctb --- brltty-5.4/Tables/Contraction/ny.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/ny.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/pt.ctb brltty-5.5/Tables/Contraction/pt.ctb --- brltty-5.4/Tables/Contraction/pt.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/pt.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/si.ctb brltty-5.5/Tables/Contraction/si.ctb --- brltty-5.4/Tables/Contraction/si.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/si.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/sw.ctb brltty-5.5/Tables/Contraction/sw.ctb --- brltty-5.4/Tables/Contraction/sw.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/sw.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/th.ctb brltty-5.5/Tables/Contraction/th.ctb --- brltty-5.4/Tables/Contraction/th.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/th.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/zh-tw.ctb brltty-5.5/Tables/Contraction/zh-tw.ctb --- brltty-5.4/Tables/Contraction/zh-tw.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/zh-tw.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/zh-tw-ucb.ctb brltty-5.5/Tables/Contraction/zh-tw-ucb.ctb --- brltty-5.4/Tables/Contraction/zh-tw-ucb.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/zh-tw-ucb.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Contraction/zu.ctb brltty-5.5/Tables/Contraction/zu.ctb --- brltty-5.4/Tables/Contraction/zu.ctb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Contraction/zu.ctb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/abt_basic.kti brltty-5.5/Tables/Input/al/abt_basic.kti --- brltty-5.4/Tables/Input/al/abt_basic.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/abt_basic.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/abt_extra.kti brltty-5.5/Tables/Input/al/abt_extra.kti --- brltty-5.4/Tables/Input/al/abt_extra.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/abt_extra.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/abt_large.ktb brltty-5.5/Tables/Input/al/abt_large.ktb --- brltty-5.4/Tables/Input/al/abt_large.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/abt_large.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/abt_small.ktb brltty-5.5/Tables/Input/al/abt_small.ktb --- brltty-5.4/Tables/Input/al/abt_small.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/abt_small.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/bc640.ktb brltty-5.5/Tables/Input/al/bc640.ktb --- brltty-5.4/Tables/Input/al/bc640.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/bc640.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/bc680.ktb brltty-5.5/Tables/Input/al/bc680.ktb --- brltty-5.4/Tables/Input/al/bc680.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/bc680.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/bc-etouch.kti brltty-5.5/Tables/Input/al/bc-etouch.kti --- brltty-5.4/Tables/Input/al/bc-etouch.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/bc-etouch.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/bc.kti brltty-5.5/Tables/Input/al/bc.kti --- brltty-5.4/Tables/Input/al/bc.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/bc.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/bc-smartpad.kti brltty-5.5/Tables/Input/al/bc-smartpad.kti --- brltty-5.4/Tables/Input/al/bc-smartpad.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/bc-smartpad.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/bc-thumb.kti brltty-5.5/Tables/Input/al/bc-thumb.kti --- brltty-5.4/Tables/Input/al/bc-thumb.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/bc-thumb.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/el.ktb brltty-5.5/Tables/Input/al/el.ktb --- brltty-5.4/Tables/Input/al/el.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/el.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/sat_basic.kti brltty-5.5/Tables/Input/al/sat_basic.kti --- brltty-5.4/Tables/Input/al/sat_basic.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/sat_basic.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/sat_extra.kti brltty-5.5/Tables/Input/al/sat_extra.kti --- brltty-5.4/Tables/Input/al/sat_extra.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/sat_extra.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/sat_large.ktb brltty-5.5/Tables/Input/al/sat_large.ktb --- brltty-5.4/Tables/Input/al/sat_large.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/sat_large.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/sat_small.ktb brltty-5.5/Tables/Input/al/sat_small.ktb --- brltty-5.4/Tables/Input/al/sat_small.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/sat_small.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/al/voyager.ktb brltty-5.5/Tables/Input/al/voyager.ktb --- brltty-5.4/Tables/Input/al/voyager.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/al/voyager.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/at/all.ktb brltty-5.5/Tables/Input/at/all.ktb --- brltty-5.4/Tables/Input/at/all.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/at/all.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bg/all.ktb brltty-5.5/Tables/Input/bg/all.ktb --- brltty-5.4/Tables/Input/bg/all.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bg/all.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/b9b10.kti brltty-5.5/Tables/Input/bm/b9b10.kti --- brltty-5.4/Tables/Input/bm/b9b10.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/b9b10.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/b9b11b10.kti brltty-5.5/Tables/Input/bm/b9b11b10.kti --- brltty-5.4/Tables/Input/bm/b9b11b10.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/b9b11b10.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/command.kti brltty-5.5/Tables/Input/bm/command.kti --- brltty-5.4/Tables/Input/bm/command.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/command.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/connect.ktb brltty-5.5/Tables/Input/bm/connect.ktb --- brltty-5.4/Tables/Input/bm/connect.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/connect.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/conny.ktb brltty-5.5/Tables/Input/bm/conny.ktb --- brltty-5.4/Tables/Input/bm/conny.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/conny.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/d6.kti brltty-5.5/Tables/Input/bm/d6.kti --- brltty-5.4/Tables/Input/bm/d6.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/d6.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/default.ktb brltty-5.5/Tables/Input/bm/default.ktb --- brltty-5.4/Tables/Input/bm/default.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/default.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/display6.kti brltty-5.5/Tables/Input/bm/display6.kti --- brltty-5.4/Tables/Input/bm/display6.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/display6.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/display7.kti brltty-5.5/Tables/Input/bm/display7.kti --- brltty-5.4/Tables/Input/bm/display7.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/display7.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/dm80p.ktb brltty-5.5/Tables/Input/bm/dm80p.ktb --- brltty-5.4/Tables/Input/bm/dm80p.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/dm80p.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/front10.kti brltty-5.5/Tables/Input/bm/front10.kti --- brltty-5.4/Tables/Input/bm/front10.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/front10.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/front6.kti brltty-5.5/Tables/Input/bm/front6.kti --- brltty-5.4/Tables/Input/bm/front6.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/front6.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/horizontal.kti brltty-5.5/Tables/Input/bm/horizontal.kti --- brltty-5.4/Tables/Input/bm/horizontal.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/horizontal.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/inka.ktb brltty-5.5/Tables/Input/bm/inka.ktb --- brltty-5.4/Tables/Input/bm/inka.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/inka.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/keyboard.kti brltty-5.5/Tables/Input/bm/keyboard.kti --- brltty-5.4/Tables/Input/bm/keyboard.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/keyboard.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -30,8 +30,6 @@ map \{space} SPACE assign chord \{space}+ include ../chords.kti -bind \{space}+RoutingKey KEY_FUNCTION -bind \{space}+RoutingKey+!RoutingKey CLIP_APPEND bind Press RETURN bind Up LNUP @@ -81,12 +79,6 @@ Bind Dot5+Dot6+Left SKPIDLNS Bind Dot5+Dot6+Right SKPBLNKWINS -bind RoutingKey+Press DESCCHAR -bind RoutingKey+Left CLIP_NEW -bind RoutingKey+Up CLIP_ADD -bind RoutingKey+Right COPY_LINE -bind RoutingKey+Down COPY_RECT - bind Dot1+Press KEY_TAB bind Dot1+Up KEY_CURSOR_UP bind Dot1+Down KEY_CURSOR_DOWN @@ -105,17 +97,32 @@ bind Dot3+Left KEY_HOME bind Dot3+Right KEY_END +ifKey B9 bind B9+Press AUTOSPEAK bind B9+Up SAY_LOUDER bind B9+Down SAY_SOFTER bind B9+Left SAY_SLOWER bind B9+Right SAY_FASTER +endIf +ifKey B10 bind B10+Press SPKHOME bind B10+Up SAY_ABOVE bind B10+Down SAY_BELOW bind B10+Left MUTE bind B10+Right SAY_LINE +endIf + +ifKey RoutingKey +bind \{space}+RoutingKey KEY_FUNCTION +bind \{space}+RoutingKey+!RoutingKey CLIP_APPEND + +bind RoutingKey+Press DESCCHAR +bind RoutingKey+Left CLIP_NEW +bind RoutingKey+Up CLIP_ADD +bind RoutingKey+Right COPY_LINE +bind RoutingKey+Down COPY_RECT +endIf ################# @@ -130,11 +137,11 @@ bind Left MENU_PREV_SETTING bind Right MENU_NEXT_SETTING -bind B9 MENU_PREV_LEVEL -bind B9+Press PREFSAVE -bind B9+Up MENU_FIRST_ITEM -bind B9+Down MENU_LAST_ITEM -bind B9+Left FWINLT -bind B9+Right FWINRT +bind \{space} MENU_PREV_LEVEL +bind \{space}+Press PREFSAVE +bind \{space}+Up MENU_FIRST_ITEM +bind \{space}+Down MENU_LAST_ITEM +bind \{space}+Left FWINLT +bind \{space}+Right FWINRT context default diff -Nru brltty-5.4/Tables/Input/bm/orbit.ktb brltty-5.5/Tables/Input/bm/orbit.ktb --- brltty-5.4/Tables/Input/bm/orbit.ktb 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/orbit.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,34 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title Orbit Reader + +note A six-dot standard braille keyboard is along the back edge of the top. +note * From left to right, its keys are: Dot3, Dot2, Dot1, Dot4, Dot5, Dot6. +note There's a five-position joystick in between Dot1 and Dot4. +note Space is the long key in the middle, just in front of the joystick. +note Dot7 and Dot8 are the keys immediately to the left and right of Space. +note The rocker to the left of the braille cells emulates the Display2 key, +note * and the one to their right emulates the Display5 key. +note Any display key combination can be emulated by pressing the joystick +note * while typing the corresponding combination of the eight dot keys. + +assign space Space +include keyboard.kti + +include d6.kti diff -Nru brltty-5.4/Tables/Input/bm/pro.ktb brltty-5.5/Tables/Input/bm/pro.ktb --- brltty-5.4/Tables/Input/bm/pro.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/pro.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/pronto.ktb brltty-5.5/Tables/Input/bm/pronto.ktb --- brltty-5.4/Tables/Input/bm/pronto.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/pronto.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/pv.ktb brltty-5.5/Tables/Input/bm/pv.ktb --- brltty-5.4/Tables/Input/bm/pv.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/pv.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/rb.ktb brltty-5.5/Tables/Input/bm/rb.ktb --- brltty-5.4/Tables/Input/bm/rb.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/rb.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/routing6.kti brltty-5.5/Tables/Input/bm/routing6.kti --- brltty-5.4/Tables/Input/bm/routing6.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/routing6.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/routing7.kti brltty-5.5/Tables/Input/bm/routing7.kti --- brltty-5.4/Tables/Input/bm/routing7.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/routing7.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/status.kti brltty-5.5/Tables/Input/bm/status.kti --- brltty-5.4/Tables/Input/bm/status.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/status.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/sv.ktb brltty-5.5/Tables/Input/bm/sv.ktb --- brltty-5.4/Tables/Input/bm/sv.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/sv.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/ultra.ktb brltty-5.5/Tables/Input/bm/ultra.ktb --- brltty-5.4/Tables/Input/bm/ultra.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/ultra.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/v40.ktb brltty-5.5/Tables/Input/bm/v40.ktb --- brltty-5.4/Tables/Input/bm/v40.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/v40.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/v80.ktb brltty-5.5/Tables/Input/bm/v80.ktb --- brltty-5.4/Tables/Input/bm/v80.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/v80.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/vertical.kti brltty-5.5/Tables/Input/bm/vertical.kti --- brltty-5.4/Tables/Input/bm/vertical.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/vertical.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/vk.ktb brltty-5.5/Tables/Input/bm/vk.ktb --- brltty-5.4/Tables/Input/bm/vk.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/vk.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bm/wheels.kti brltty-5.5/Tables/Input/bm/wheels.kti --- brltty-5.4/Tables/Input/bm/wheels.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bm/wheels.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bn/all.ktb brltty-5.5/Tables/Input/bn/all.ktb --- brltty-5.4/Tables/Input/bn/all.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bn/all.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bn/input.kti brltty-5.5/Tables/Input/bn/input.kti --- brltty-5.4/Tables/Input/bn/input.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bn/input.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/bp/all.kti brltty-5.5/Tables/Input/bp/all.kti --- brltty-5.4/Tables/Input/bp/all.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/bp/all.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/cb/all.ktb brltty-5.5/Tables/Input/cb/all.ktb --- brltty-5.4/Tables/Input/cb/all.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/cb/all.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ce/all.ktb brltty-5.5/Tables/Input/ce/all.ktb --- brltty-5.4/Tables/Input/ce/all.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ce/all.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ce/novem.ktb brltty-5.5/Tables/Input/ce/novem.ktb --- brltty-5.4/Tables/Input/ce/novem.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ce/novem.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/chords.kti brltty-5.5/Tables/Input/chords.kti --- brltty-5.4/Tables/Input/chords.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/chords.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -95,6 +95,14 @@ bind \{chord}Dot2+Dot6 KEY_ESCAPE bind \{chord}Dot3+Dot5 KEY_INSERT +bind \{chord}Dot1+Dot8 GUI +bind \{chord}Dot2+Dot8 META +bind \{chord}Dot3+Dot8 CONTROL +bind \{chord}Dot4+Dot8 SHIFT +bind \{chord}Dot5+Dot8 ALTGR +bind \{chord}Dot6+Dot8 UPPER +bind \{chord}Dot7+Dot8 UNSTICK + ifNotVar noUnchorded assignDefault commandDot7 KEY_BACKSPACE assignDefault commandDot8 KEY_ENTER diff -Nru brltty-5.4/Tables/Input/eu/braille.kti brltty-5.5/Tables/Input/eu/braille.kti --- brltty-5.4/Tables/Input/eu/braille.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/braille.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/clio.ktb brltty-5.5/Tables/Input/eu/clio.ktb --- brltty-5.4/Tables/Input/eu/clio.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/clio.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/common.kti brltty-5.5/Tables/Input/eu/common.kti --- brltty-5.4/Tables/Input/eu/common.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/common.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,11 +16,5 @@ # This software is maintained by Dave Mielke . ############################################################################### -note The cursor routing keys are the small, round buttons just behind the braille cells. -note RoutingKey1 means pressing a cursor routing key once (a single click). -note RoutingKey2 means pressing a cursor routing key twice quickly (a double click). - -bind RoutingKey1 ROUTE -bind RoutingKey2 DESCCHAR - include braille.kti +include routing.kti diff -Nru brltty-5.4/Tables/Input/eu/esys_large.ktb brltty-5.5/Tables/Input/eu/esys_large.ktb --- brltty-5.4/Tables/Input/eu/esys_large.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/esys_large.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/esys_medium.ktb brltty-5.5/Tables/Input/eu/esys_medium.ktb --- brltty-5.4/Tables/Input/eu/esys_medium.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/esys_medium.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/esys_small.ktb brltty-5.5/Tables/Input/eu/esys_small.ktb --- brltty-5.4/Tables/Input/eu/esys_small.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/esys_small.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/esytime.ktb brltty-5.5/Tables/Input/eu/esytime.ktb --- brltty-5.4/Tables/Input/eu/esytime.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/esytime.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -18,5 +18,110 @@ title EuroBraille Esytime -include common.kti -include joysticks.kti +include routing.kti + +note The four keys below the left joystick, from top to bottom, are: +note * L1, Escape, Tab, Shift. +note The four keys below the right joystick, from top to bottom, are: +note * L5, Insert, Alt, Control. +note Some key combinations have been reserved for internal use: +note + LeftJoystickDown: the Alt key +note + LeftJoystickPress: the Alt key pressed twice in a row +note + LeftJoystickDown + RightJoystick(Right/Left): enable/disable braille functions +note + LeftJoystickDown + RightJoystick(Up/Down): switch to internal/external (Esytime/PC) USB interface +note + LeftJoystickDown + L1 + Escape: switch to single-hand braille keyboard 1 +note + LeftJoystickDown + Shift + Tab: switch to single-hand braille keyboard 2 +note + LeftJoystickDown + Insert + L5: switch to standard (two-hand) braille keyboard +note + RightJoystickPress: the Enter key +note + RightJoystick(left/right/up/down): the Arrow Left/Right/Up/Down key + +bind L1+L5 HOME +bind LeftJoystickPress+RightJoystickPress BACK + +bind L1 FWINLT +bind L5 FWINRT + +bind LeftJoystickLeft LNUP +bind LeftJoystickRight LNDN +bind LeftJoystickUp CSRTRK +bind LeftJoystickDown NOOP # internal: the Alt key +bind LeftJoystickPress NOOP # internal: the Alt key pressed twice in a row + +bind RightJoystickLeft NOOP # internal: the Arrow Left key +bind RightJoystickRight NOOP # internal: the Arrow Right key +bind RightJoystickUp NOOP # internal: the Arrow Up key +bind RightJoystickDown NOOP # internal: the Arrow Down key +bind RightJoystickPress NOOP # internal: the Enter key + +bind LeftJoystickLeft+RightJoystickPress TOP +bind LeftJoystickLeft+RightJoystickLeft PRPROMPT +bind LeftJoystickLeft+RightJoystickRight PRPGRPH +bind LeftJoystickLeft+RightJoystickUp PRDIFLN +bind LeftJoystickLeft+RightJoystickDown ATTRUP + +bind LeftJoystickRight+RightJoystickPress BOT +bind LeftJoystickRight+RightJoystickLeft NXPROMPT +bind LeftJoystickRight+RightJoystickRight NXPGRPH +bind LeftJoystickRight+RightJoystickUp NXDIFLN +bind LeftJoystickRight+RightJoystickDown ATTRDN + +bind LeftJoystickUp+RightJoystickPress DISPMD +bind LeftJoystickUp+RightJoystickLeft CSRVIS +bind LeftJoystickUp+RightJoystickRight ATTRVIS +bind LeftJoystickUp+RightJoystickUp SIXDOTS+on +bind LeftJoystickUp+RightJoystickDown SIXDOTS+off + +bind LeftJoystickDown+RightJoystickPress INFO +bind LeftJoystickDown+RightJoystickLeft NOOP # internal: disable braille functions +bind LeftJoystickDown+RightJoystickRight NOOP # internal: enable braille functions +bind LeftJoystickDown+RightJoystickUp NOOP # internal: switch to internal (Esytime) USB interface +bind LeftJoystickDown+RightJoystickDown NOOP # internal: switch to external (PC) USB interface + +bind LeftJoystickPress+RightJoystickLeft NOOP +bind LeftJoystickPress+RightJoystickRight NOOP +bind LeftJoystickPress+RightJoystickUp NOOP +bind LeftJoystickPress+RightJoystickDown NOOP + +bind LeftJoystickPress+RoutingKey1 SETLEFT +bind LeftJoystickLeft+RoutingKey1 PRDIFCHAR +bind LeftJoystickRight+RoutingKey1 NXDIFCHAR +bind LeftJoystickUp+RoutingKey1 PRINDENT +bind LeftJoystickDown+RoutingKey1 NXINDENT + +bind RightJoystickPress+RoutingKey1 DESCCHAR +bind RightJoystickLeft+RoutingKey1 CLIP_NEW +bind RightJoystickUp+RoutingKey1 CLIP_ADD +bind RightJoystickRight+RoutingKey1 COPY_LINE +bind RightJoystickDown+RoutingKey1 COPY_RECT + +bind L1+LeftJoystickPress TIME +bind L1+LeftJoystickLeft CHRLT +bind L1+LeftJoystickRight CHRRT +bind L1+LeftJoystickUp PRSEARCH +bind L1+LeftJoystickDown NXSEARCH + +bind L5+LeftJoystickPress CSRJMP_VERT +bind L5+LeftJoystickLeft FWINLTSKIP +bind L5+LeftJoystickRight FWINRTSKIP +bind L5+LeftJoystickUp LNBEG +bind L5+LeftJoystickDown LNEND + +bind L1+RightJoystickPress PREFMENU +bind L1+RightJoystickLeft PREFLOAD +bind L1+RightJoystickRight PREFSAVE +bind L1+RightJoystickUp HELP +bind L1+RightJoystickDown LEARN + +bind L5+RightJoystickPress PASTE +bind L5+RightJoystickLeft CLIP_RESTORE +bind L5+RightJoystickRight CLIP_SAVE +bind L5+RightJoystickUp FREEZE +bind L5+RightJoystickDown AUTOREPEAT + +context menu +bind L5+RightJoystickUp MENU_PREV_ITEM +bind L5+RightJoystickDown MENU_NEXT_ITEM +bind L5+RightJoystickLeft MENU_PREV_SETTING +bind L5+RightJoystickRight MENU_NEXT_SETTING +bind L5+RightJoystickPress MENU_PREV_LEVEL + diff -Nru brltty-5.4/Tables/Input/eu/iris.ktb brltty-5.5/Tables/Input/eu/iris.ktb --- brltty-5.4/Tables/Input/eu/iris.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/iris.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/joysticks.kti brltty-5.5/Tables/Input/eu/joysticks.kti --- brltty-5.4/Tables/Input/eu/joysticks.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/joysticks.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/routing.kti brltty-5.5/Tables/Input/eu/routing.kti --- brltty-5.4/Tables/Input/eu/routing.kti 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/routing.kti 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,25 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +note The cursor routing keys are the small, round buttons just behind the braille cells. +note RoutingKey1 means pressing a cursor routing key once (a single click). +note RoutingKey2 means pressing a cursor routing key twice quickly (a double click). + +bind RoutingKey1 ROUTE +bind RoutingKey2 DESCCHAR + diff -Nru brltty-5.4/Tables/Input/eu/sw12.kti brltty-5.5/Tables/Input/eu/sw12.kti --- brltty-5.4/Tables/Input/eu/sw12.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/sw12.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/sw34.kti brltty-5.5/Tables/Input/eu/sw34.kti --- brltty-5.4/Tables/Input/eu/sw34.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/sw34.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/eu/sw56.kti brltty-5.5/Tables/Input/eu/sw56.kti --- brltty-5.4/Tables/Input/eu/sw56.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/eu/sw56.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/fs/bumpers.kti brltty-5.5/Tables/Input/fs/bumpers.kti --- brltty-5.4/Tables/Input/fs/bumpers.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/fs/bumpers.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/fs/common.kti brltty-5.5/Tables/Input/fs/common.kti --- brltty-5.4/Tables/Input/fs/common.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/fs/common.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/fs/focus_basic.ktb brltty-5.5/Tables/Input/fs/focus_basic.ktb --- brltty-5.4/Tables/Input/fs/focus_basic.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/fs/focus_basic.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/fs/focus_basic.kti brltty-5.5/Tables/Input/fs/focus_basic.kti --- brltty-5.4/Tables/Input/fs/focus_basic.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/fs/focus_basic.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/fs/focus_large.ktb brltty-5.5/Tables/Input/fs/focus_large.ktb --- brltty-5.4/Tables/Input/fs/focus_large.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/fs/focus_large.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/fs/focus_small.ktb brltty-5.5/Tables/Input/fs/focus_small.ktb --- brltty-5.4/Tables/Input/fs/focus_small.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/fs/focus_small.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/fs/pacmate.ktb brltty-5.5/Tables/Input/fs/pacmate.ktb --- brltty-5.4/Tables/Input/fs/pacmate.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/fs/pacmate.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/fs/rockers.kti brltty-5.5/Tables/Input/fs/rockers.kti --- brltty-5.4/Tables/Input/fs/rockers.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/fs/rockers.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hd/mbl.ktb brltty-5.5/Tables/Input/hd/mbl.ktb --- brltty-5.4/Tables/Input/hd/mbl.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hd/mbl.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hd/pfl.ktb brltty-5.5/Tables/Input/hd/pfl.ktb --- brltty-5.4/Tables/Input/hd/pfl.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hd/pfl.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/beetle.ktb brltty-5.5/Tables/Input/hm/beetle.ktb --- brltty-5.4/Tables/Input/hm/beetle.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/beetle.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/braille.kti brltty-5.5/Tables/Input/hm/braille.kti --- brltty-5.4/Tables/Input/hm/braille.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/braille.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/common.kti brltty-5.5/Tables/Input/hm/common.kti --- brltty-5.4/Tables/Input/hm/common.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/common.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/contexts.kti brltty-5.5/Tables/Input/hm/contexts.kti --- brltty-5.4/Tables/Input/hm/contexts.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/contexts.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -38,3 +38,6 @@ context DESCCHAR bind !RoutingKey DESCCHAR +context KEY_FUNCTION +bind RoutingKey KEY_FUNCTION + diff -Nru brltty-5.4/Tables/Input/hm/edge.ktb brltty-5.5/Tables/Input/hm/edge.ktb --- brltty-5.4/Tables/Input/hm/edge.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/edge.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/f14.kti brltty-5.5/Tables/Input/hm/f14.kti --- brltty-5.4/Tables/Input/hm/f14.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/f14.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -16,8 +16,8 @@ # This software is maintained by Dave Mielke . ############################################################################### -bind F4 HOME -bind F1+F4 BACK +bind F4 RETURN +bind F1+F4 CONTEXT+KEY_FUNCTION bind F2+F3 CSRJMP_VERT bind F2 LNUP diff -Nru brltty-5.4/Tables/Input/hm/f18.kti brltty-5.5/Tables/Input/hm/f18.kti --- brltty-5.4/Tables/Input/hm/f18.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/f18.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -36,9 +36,6 @@ bind Space+F7 ATTRVIS bind Space+F8 CSRVIS -context KEY_FUNCTION -bind RoutingKey KEY_FUNCTION - context SWITCHVT bind RoutingKey SWITCHVT diff -Nru brltty-5.4/Tables/Input/hm/fnkey.kti brltty-5.5/Tables/Input/hm/fnkey.kti --- brltty-5.4/Tables/Input/hm/fnkey.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/fnkey.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/left.kti brltty-5.5/Tables/Input/hm/left.kti --- brltty-5.4/Tables/Input/hm/left.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/left.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/letters.kti brltty-5.5/Tables/Input/hm/letters.kti --- brltty-5.4/Tables/Input/hm/letters.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/letters.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/pan.ktb brltty-5.5/Tables/Input/hm/pan.ktb --- brltty-5.4/Tables/Input/hm/pan.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/pan.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/pan.kti brltty-5.5/Tables/Input/hm/pan.kti --- brltty-5.4/Tables/Input/hm/pan.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/pan.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/qwerty.ktb brltty-5.5/Tables/Input/hm/qwerty.ktb --- brltty-5.4/Tables/Input/hm/qwerty.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/qwerty.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/qwerty.kti brltty-5.5/Tables/Input/hm/qwerty.kti --- brltty-5.4/Tables/Input/hm/qwerty.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/qwerty.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/right.kti brltty-5.5/Tables/Input/hm/right.kti --- brltty-5.4/Tables/Input/hm/right.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/right.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/scroll.ktb brltty-5.5/Tables/Input/hm/scroll.ktb --- brltty-5.4/Tables/Input/hm/scroll.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/scroll.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/scroll.kti brltty-5.5/Tables/Input/hm/scroll.kti --- brltty-5.4/Tables/Input/hm/scroll.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/scroll.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hm/sync.ktb brltty-5.5/Tables/Input/hm/sync.ktb --- brltty-5.4/Tables/Input/hm/sync.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hm/sync.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/ab40.ktb brltty-5.5/Tables/Input/ht/ab40.ktb --- brltty-5.4/Tables/Input/ht/ab40.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/ab40.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/alo.ktb brltty-5.5/Tables/Input/ht/alo.ktb --- brltty-5.4/Tables/Input/ht/alo.ktb 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/alo.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,24 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +title HandyTech Actilino + +bind B1+B4+SpaceLeft TOUCH_NAV + +include joystick.kti +include bs.kti diff -Nru brltty-5.4/Tables/Input/ht/as40.ktb brltty-5.5/Tables/Input/ht/as40.ktb --- brltty-5.4/Tables/Input/ht/as40.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/as40.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/bb.ktb brltty-5.5/Tables/Input/ht/bb.ktb --- brltty-5.4/Tables/Input/ht/bb.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/bb.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/bkwm.ktb brltty-5.5/Tables/Input/ht/bkwm.ktb --- brltty-5.4/Tables/Input/ht/bkwm.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/bkwm.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/brln.ktb brltty-5.5/Tables/Input/ht/brln.ktb --- brltty-5.4/Tables/Input/ht/brln.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/brln.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/bs40.ktb brltty-5.5/Tables/Input/ht/bs40.ktb --- brltty-5.4/Tables/Input/ht/bs40.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/bs40.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/bs80.ktb brltty-5.5/Tables/Input/ht/bs80.ktb --- brltty-5.4/Tables/Input/ht/bs80.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/bs80.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/bs.kti brltty-5.5/Tables/Input/ht/bs.kti --- brltty-5.4/Tables/Input/ht/bs.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/bs.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/cb40.ktb brltty-5.5/Tables/Input/ht/cb40.ktb --- brltty-5.4/Tables/Input/ht/cb40.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/cb40.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/dots.kti brltty-5.5/Tables/Input/ht/dots.kti --- brltty-5.4/Tables/Input/ht/dots.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/dots.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -29,6 +29,7 @@ bind B2+B5 NXPROMPT bind B3+B4 PRSEARCH bind B3+B5 NXSEARCH +bind B4+B5 LEARN bind B6+B4 ATTRUP bind B6+B5 ATTRDN bind B7+B4 WINUP diff -Nru brltty-5.4/Tables/Input/ht/easy.ktb brltty-5.5/Tables/Input/ht/easy.ktb --- brltty-5.4/Tables/Input/ht/easy.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/easy.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/input.kti brltty-5.5/Tables/Input/ht/input.kti --- brltty-5.4/Tables/Input/ht/input.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/input.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/joystick.kti brltty-5.5/Tables/Input/ht/joystick.kti --- brltty-5.4/Tables/Input/ht/joystick.kti 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/joystick.kti 2017-04-18 22:35:13.000000000 +0000 @@ -0,0 +1,27 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 1995-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# Key subtable for HandyTech Actilino + +bind Left KEY_CURSOR_LEFT +bind Right KEY_CURSOR_RIGHT +bind Up KEY_CURSOR_UP +bind Down KEY_CURSOR_DOWN +bind Action KEY_ENTER + + diff -Nru brltty-5.4/Tables/Input/ht/keypad.kti brltty-5.5/Tables/Input/ht/keypad.kti --- brltty-5.4/Tables/Input/ht/keypad.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/keypad.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -30,7 +30,6 @@ bind Zero SPKHOME bind B13 SWITCHVT_PREV bind B14 SWITCHVT_NEXT -bind Seven LEARN bind Eight MENU_PREV_ITEM bind Nine MENU_FIRST_ITEM bind Four MENU_PREV_SETTING diff -Nru brltty-5.4/Tables/Input/ht/mc88.ktb brltty-5.5/Tables/Input/ht/mc88.ktb --- brltty-5.4/Tables/Input/ht/mc88.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/mc88.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/mdlr.ktb brltty-5.5/Tables/Input/ht/mdlr.ktb --- brltty-5.4/Tables/Input/ht/mdlr.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/mdlr.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/me64.ktb brltty-5.5/Tables/Input/ht/me64.ktb --- brltty-5.4/Tables/Input/ht/me64.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/me64.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/me88.ktb brltty-5.5/Tables/Input/ht/me88.ktb --- brltty-5.4/Tables/Input/ht/me88.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/me88.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/me.kti brltty-5.5/Tables/Input/ht/me.kti --- brltty-5.4/Tables/Input/ht/me.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/me.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ht/rockers.kti brltty-5.5/Tables/Input/ht/rockers.kti --- brltty-5.4/Tables/Input/ht/rockers.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/rockers.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -58,3 +58,11 @@ bind RightRockerTop+RoutingKey COPY_LINE bind RightRockerTop+RightRockerBottom+RoutingKey SWITCHVT bind RightRockerBottom+RoutingKey COPY_RECT + + +context menu +bind RightRockerTop MENU_PREV_ITEM +bind RightRockerBottom MENU_NEXT_ITEM +bind LeftRockerTop MENU_PREV_SETTING +bind LeftRockerBottom MENU_NEXT_SETTING + diff -Nru brltty-5.4/Tables/Input/ht/wave.ktb brltty-5.5/Tables/Input/ht/wave.ktb --- brltty-5.4/Tables/Input/ht/wave.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ht/wave.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hw/kbd.kti brltty-5.5/Tables/Input/hw/kbd.kti --- brltty-5.4/Tables/Input/hw/kbd.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hw/kbd.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hw/mb1.ktb brltty-5.5/Tables/Input/hw/mb1.ktb --- brltty-5.4/Tables/Input/hw/mb1.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hw/mb1.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hw/mb2.ktb brltty-5.5/Tables/Input/hw/mb2.ktb --- brltty-5.4/Tables/Input/hw/mb2.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hw/mb2.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/hw/nav.kti brltty-5.5/Tables/Input/hw/nav.kti --- brltty-5.4/Tables/Input/hw/nav.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/hw/nav.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ir/all.kti brltty-5.5/Tables/Input/ir/all.kti --- brltty-5.4/Tables/Input/ir/all.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ir/all.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ir/brl.ktb brltty-5.5/Tables/Input/ir/brl.ktb --- brltty-5.4/Tables/Input/ir/brl.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ir/brl.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ir/pc.ktb brltty-5.5/Tables/Input/ir/pc.ktb --- brltty-5.4/Tables/Input/ir/pc.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ir/pc.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/md/common.kti brltty-5.5/Tables/Input/md/common.kti --- brltty-5.4/Tables/Input/md/common.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/md/common.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/md/default.ktb brltty-5.5/Tables/Input/md/default.ktb --- brltty-5.4/Tables/Input/md/default.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/md/default.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/md/fkeys.kti brltty-5.5/Tables/Input/md/fkeys.kti --- brltty-5.4/Tables/Input/md/fkeys.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/md/fkeys.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/md/fk.ktb brltty-5.5/Tables/Input/md/fk.ktb --- brltty-5.4/Tables/Input/md/fk.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/md/fk.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/md/fk_s.ktb brltty-5.5/Tables/Input/md/fk_s.ktb --- brltty-5.4/Tables/Input/md/fk_s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/md/fk_s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/md/kbd.ktb brltty-5.5/Tables/Input/md/kbd.ktb --- brltty-5.4/Tables/Input/md/kbd.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/md/kbd.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/md/keyboard.kti brltty-5.5/Tables/Input/md/keyboard.kti --- brltty-5.4/Tables/Input/md/keyboard.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/md/keyboard.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/md/status.kti brltty-5.5/Tables/Input/md/status.kti --- brltty-5.4/Tables/Input/md/status.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/md/status.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/menu.kti brltty-5.5/Tables/Input/menu.kti --- brltty-5.4/Tables/Input/menu.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/menu.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mm/common.kti brltty-5.5/Tables/Input/mm/common.kti --- brltty-5.4/Tables/Input/mm/common.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mm/common.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mm/pocket.ktb brltty-5.5/Tables/Input/mm/pocket.ktb --- brltty-5.4/Tables/Input/mm/pocket.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mm/pocket.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mm/smart.ktb brltty-5.5/Tables/Input/mm/smart.ktb --- brltty-5.4/Tables/Input/mm/smart.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mm/smart.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mt/bd1_3.ktb brltty-5.5/Tables/Input/mt/bd1_3.ktb --- brltty-5.4/Tables/Input/mt/bd1_3.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mt/bd1_3.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mt/bd1_3.kti brltty-5.5/Tables/Input/mt/bd1_3.kti --- brltty-5.4/Tables/Input/mt/bd1_3.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mt/bd1_3.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mt/bd1_3s.ktb brltty-5.5/Tables/Input/mt/bd1_3s.ktb --- brltty-5.4/Tables/Input/mt/bd1_3s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mt/bd1_3s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mt/bd1_6.ktb brltty-5.5/Tables/Input/mt/bd1_6.ktb --- brltty-5.4/Tables/Input/mt/bd1_6.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mt/bd1_6.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mt/bd1_6.kti brltty-5.5/Tables/Input/mt/bd1_6.kti --- brltty-5.4/Tables/Input/mt/bd1_6.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mt/bd1_6.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mt/bd1_6s.ktb brltty-5.5/Tables/Input/mt/bd1_6s.ktb --- brltty-5.4/Tables/Input/mt/bd1_6s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mt/bd1_6s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mt/bd2.ktb brltty-5.5/Tables/Input/mt/bd2.ktb --- brltty-5.4/Tables/Input/mt/bd2.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mt/bd2.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/mt/status.kti brltty-5.5/Tables/Input/mt/status.kti --- brltty-5.4/Tables/Input/mt/status.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/mt/status.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/np/all.ktb brltty-5.5/Tables/Input/np/all.ktb --- brltty-5.4/Tables/Input/np/all.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/np/all.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pg/all.ktb brltty-5.5/Tables/Input/pg/all.ktb --- brltty-5.4/Tables/Input/pg/all.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pg/all.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/2d_l.ktb brltty-5.5/Tables/Input/pm/2d_l.ktb --- brltty-5.4/Tables/Input/pm/2d_l.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/2d_l.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/2d_s.ktb brltty-5.5/Tables/Input/pm/2d_s.ktb --- brltty-5.4/Tables/Input/pm/2d_s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/2d_s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/bar.kti brltty-5.5/Tables/Input/pm/bar.kti --- brltty-5.4/Tables/Input/pm/bar.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/bar.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/c_486.ktb brltty-5.5/Tables/Input/pm/c_486.ktb --- brltty-5.4/Tables/Input/pm/c_486.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/c_486.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/c.ktb brltty-5.5/Tables/Input/pm/c.ktb --- brltty-5.4/Tables/Input/pm/c.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/c.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el_2d_40.ktb brltty-5.5/Tables/Input/pm/el_2d_40.ktb --- brltty-5.4/Tables/Input/pm/el_2d_40.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el_2d_40.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el_2d_66.ktb brltty-5.5/Tables/Input/pm/el_2d_66.ktb --- brltty-5.4/Tables/Input/pm/el_2d_66.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el_2d_66.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el_2d_80.ktb brltty-5.5/Tables/Input/pm/el_2d_80.ktb --- brltty-5.4/Tables/Input/pm/el_2d_80.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el_2d_80.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el2d_80s.ktb brltty-5.5/Tables/Input/pm/el2d_80s.ktb --- brltty-5.4/Tables/Input/pm/el2d_80s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el2d_80s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el40c.ktb brltty-5.5/Tables/Input/pm/el40c.ktb --- brltty-5.4/Tables/Input/pm/el40c.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el40c.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el_40_p.ktb brltty-5.5/Tables/Input/pm/el_40_p.ktb --- brltty-5.4/Tables/Input/pm/el_40_p.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el_40_p.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el40s.ktb brltty-5.5/Tables/Input/pm/el40s.ktb --- brltty-5.4/Tables/Input/pm/el40s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el40s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el60c.ktb brltty-5.5/Tables/Input/pm/el60c.ktb --- brltty-5.4/Tables/Input/pm/el60c.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el60c.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el66s.ktb brltty-5.5/Tables/Input/pm/el66s.ktb --- brltty-5.4/Tables/Input/pm/el66s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el66s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el70s.ktb brltty-5.5/Tables/Input/pm/el70s.ktb --- brltty-5.4/Tables/Input/pm/el70s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el70s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el80c.ktb brltty-5.5/Tables/Input/pm/el80c.ktb --- brltty-5.4/Tables/Input/pm/el80c.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el80c.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el80_ii.ktb brltty-5.5/Tables/Input/pm/el80_ii.ktb --- brltty-5.4/Tables/Input/pm/el80_ii.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el80_ii.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el_80.ktb brltty-5.5/Tables/Input/pm/el_80.ktb --- brltty-5.4/Tables/Input/pm/el_80.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el_80.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/el80s.ktb brltty-5.5/Tables/Input/pm/el80s.ktb --- brltty-5.4/Tables/Input/pm/el80s.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/el80s.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/elba_20.ktb brltty-5.5/Tables/Input/pm/elba_20.ktb --- brltty-5.4/Tables/Input/pm/elba_20.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/elba_20.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/elba_32.ktb brltty-5.5/Tables/Input/pm/elba_32.ktb --- brltty-5.4/Tables/Input/pm/elba_32.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/elba_32.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/elb_tr_20.ktb brltty-5.5/Tables/Input/pm/elb_tr_20.ktb --- brltty-5.4/Tables/Input/pm/elb_tr_20.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/elb_tr_20.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/elb_tr_32.ktb brltty-5.5/Tables/Input/pm/elb_tr_32.ktb --- brltty-5.4/Tables/Input/pm/elb_tr_32.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/elb_tr_32.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/front13.kti brltty-5.5/Tables/Input/pm/front13.kti --- brltty-5.4/Tables/Input/pm/front13.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/front13.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/front9.kti brltty-5.5/Tables/Input/pm/front9.kti --- brltty-5.4/Tables/Input/pm/front9.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/front9.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/ib_80.ktb brltty-5.5/Tables/Input/pm/ib_80.ktb --- brltty-5.4/Tables/Input/pm/ib_80.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/ib_80.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/keyboard.kti brltty-5.5/Tables/Input/pm/keyboard.kti --- brltty-5.4/Tables/Input/pm/keyboard.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/keyboard.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/keys.kti brltty-5.5/Tables/Input/pm/keys.kti --- brltty-5.4/Tables/Input/pm/keys.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/keys.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/live.ktb brltty-5.5/Tables/Input/pm/live.ktb --- brltty-5.4/Tables/Input/pm/live.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/live.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/routing.kti brltty-5.5/Tables/Input/pm/routing.kti --- brltty-5.4/Tables/Input/pm/routing.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/routing.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/status0.kti brltty-5.5/Tables/Input/pm/status0.kti --- brltty-5.4/Tables/Input/pm/status0.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/status0.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/status13.kti brltty-5.5/Tables/Input/pm/status13.kti --- brltty-5.4/Tables/Input/pm/status13.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/status13.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/status20.kti brltty-5.5/Tables/Input/pm/status20.kti --- brltty-5.4/Tables/Input/pm/status20.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/status20.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/status22.kti brltty-5.5/Tables/Input/pm/status22.kti --- brltty-5.4/Tables/Input/pm/status22.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/status22.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/status2.kti brltty-5.5/Tables/Input/pm/status2.kti --- brltty-5.4/Tables/Input/pm/status2.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/status2.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/status4.kti brltty-5.5/Tables/Input/pm/status4.kti --- brltty-5.4/Tables/Input/pm/status4.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/status4.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/switches.kti brltty-5.5/Tables/Input/pm/switches.kti --- brltty-5.4/Tables/Input/pm/switches.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/switches.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/pm/trio.ktb brltty-5.5/Tables/Input/pm/trio.ktb --- brltty-5.4/Tables/Input/pm/trio.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/pm/trio.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/sk/bdp.ktb brltty-5.5/Tables/Input/sk/bdp.ktb --- brltty-5.4/Tables/Input/sk/bdp.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/sk/bdp.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/sk/ntk.ktb brltty-5.5/Tables/Input/sk/ntk.ktb --- brltty-5.4/Tables/Input/sk/ntk.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/sk/ntk.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/toggle.kti brltty-5.5/Tables/Input/toggle.kti --- brltty-5.4/Tables/Input/toggle.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/toggle.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/nav20.ktb brltty-5.5/Tables/Input/ts/nav20.ktb --- brltty-5.4/Tables/Input/ts/nav20.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/nav20.ktb 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/nav40.ktb brltty-5.5/Tables/Input/ts/nav40.ktb --- brltty-5.4/Tables/Input/ts/nav40.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/nav40.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/nav80.ktb brltty-5.5/Tables/Input/ts/nav80.ktb --- brltty-5.4/Tables/Input/ts/nav80.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/nav80.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/nav.kti brltty-5.5/Tables/Input/ts/nav.kti --- brltty-5.4/Tables/Input/ts/nav.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/nav.kti 2017-04-18 22:35:13.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/nav_large.kti brltty-5.5/Tables/Input/ts/nav_large.kti --- brltty-5.4/Tables/Input/ts/nav_large.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/nav_large.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/nav_small.kti brltty-5.5/Tables/Input/ts/nav_small.kti --- brltty-5.4/Tables/Input/ts/nav_small.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/nav_small.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/pb40.ktb brltty-5.5/Tables/Input/ts/pb40.ktb --- brltty-5.4/Tables/Input/ts/pb40.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/pb40.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/pb65.ktb brltty-5.5/Tables/Input/ts/pb65.ktb --- brltty-5.4/Tables/Input/ts/pb65.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/pb65.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/pb80.ktb brltty-5.5/Tables/Input/ts/pb80.ktb --- brltty-5.4/Tables/Input/ts/pb80.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/pb80.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/pb.kti brltty-5.5/Tables/Input/ts/pb.kti --- brltty-5.4/Tables/Input/ts/pb.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/pb.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/pb_large.kti brltty-5.5/Tables/Input/ts/pb_large.kti --- brltty-5.4/Tables/Input/ts/pb_large.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/pb_large.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/pb_small.kti brltty-5.5/Tables/Input/ts/pb_small.kti --- brltty-5.4/Tables/Input/ts/pb_small.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/pb_small.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/ts/routing.kti brltty-5.5/Tables/Input/ts/routing.kti --- brltty-5.4/Tables/Input/ts/routing.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/ts/routing.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/vo/all.ktb brltty-5.5/Tables/Input/vo/all.ktb --- brltty-5.4/Tables/Input/vo/all.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/vo/all.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/vo/all.kti brltty-5.5/Tables/Input/vo/all.kti --- brltty-5.4/Tables/Input/vo/all.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/vo/all.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Input/vo/bp.ktb brltty-5.5/Tables/Input/vo/bp.ktb --- brltty-5.4/Tables/Input/vo/bp.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Input/vo/bp.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/braille.ktb brltty-5.5/Tables/Keyboard/braille.ktb --- brltty-5.4/Tables/Keyboard/braille.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/braille.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/braille.kti brltty-5.5/Tables/Keyboard/braille.kti --- brltty-5.4/Tables/Keyboard/braille.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/braille.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/desktop.ktb brltty-5.5/Tables/Keyboard/desktop.ktb --- brltty-5.4/Tables/Keyboard/desktop.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/desktop.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/desktop.kti brltty-5.5/Tables/Keyboard/desktop.kti --- brltty-5.4/Tables/Keyboard/desktop.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/desktop.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/keypad.ktb brltty-5.5/Tables/Keyboard/keypad.ktb --- brltty-5.4/Tables/Keyboard/keypad.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/keypad.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/kp_say.kti brltty-5.5/Tables/Keyboard/kp_say.kti --- brltty-5.4/Tables/Keyboard/kp_say.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/kp_say.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/kp_speak.kti brltty-5.5/Tables/Keyboard/kp_speak.kti --- brltty-5.4/Tables/Keyboard/kp_speak.kti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/kp_speak.kti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/laptop.ktb brltty-5.5/Tables/Keyboard/laptop.ktb --- brltty-5.4/Tables/Keyboard/laptop.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/laptop.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Keyboard/sun_type6.ktb brltty-5.5/Tables/Keyboard/sun_type6.ktb --- brltty-5.4/Tables/Keyboard/sun_type6.ktb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Keyboard/sun_type6.ktb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ar.ttb brltty-5.5/Tables/Text/ar.ttb --- brltty-5.4/Tables/Text/ar.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ar.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ascii-basic.tti brltty-5.5/Tables/Text/ascii-basic.tti --- brltty-5.4/Tables/Text/ascii-basic.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ascii-basic.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/as.ttb brltty-5.5/Tables/Text/as.ttb --- brltty-5.4/Tables/Text/as.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/as.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/awa.ttb brltty-5.5/Tables/Text/awa.ttb --- brltty-5.4/Tables/Text/awa.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/awa.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/bengali.tti brltty-5.5/Tables/Text/bengali.tti --- brltty-5.4/Tables/Text/bengali.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/bengali.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/bg.ttb brltty-5.5/Tables/Text/bg.ttb --- brltty-5.4/Tables/Text/bg.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/bg.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/bh.ttb brltty-5.5/Tables/Text/bh.ttb --- brltty-5.4/Tables/Text/bh.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/bh.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/blocks.tti brltty-5.5/Tables/Text/blocks.tti --- brltty-5.4/Tables/Text/blocks.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/blocks.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/bn.ttb brltty-5.5/Tables/Text/bn.ttb --- brltty-5.4/Tables/Text/bn.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/bn.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/bo.ttb brltty-5.5/Tables/Text/bo.ttb --- brltty-5.4/Tables/Text/bo.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/bo.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/boxes.tti brltty-5.5/Tables/Text/boxes.tti --- brltty-5.4/Tables/Text/boxes.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/boxes.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/bra.ttb brltty-5.5/Tables/Text/bra.ttb --- brltty-5.4/Tables/Text/bra.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/bra.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/brf.ttb brltty-5.5/Tables/Text/brf.ttb --- brltty-5.4/Tables/Text/brf.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/brf.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/common.tti brltty-5.5/Tables/Text/common.tti --- brltty-5.4/Tables/Text/common.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/common.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/cs.ttb brltty-5.5/Tables/Text/cs.ttb --- brltty-5.4/Tables/Text/cs.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/cs.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ctl-latin.tti brltty-5.5/Tables/Text/ctl-latin.tti --- brltty-5.4/Tables/Text/ctl-latin.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ctl-latin.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/cy.ttb brltty-5.5/Tables/Text/cy.ttb --- brltty-5.4/Tables/Text/cy.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/cy.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/da-1252.ttb brltty-5.5/Tables/Text/da-1252.ttb --- brltty-5.4/Tables/Text/da-1252.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/da-1252.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/da-lt.ttb brltty-5.5/Tables/Text/da-lt.ttb --- brltty-5.4/Tables/Text/da-lt.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/da-lt.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/da.ttb brltty-5.5/Tables/Text/da.ttb --- brltty-5.4/Tables/Text/da.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/da.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/de-chess.tti brltty-5.5/Tables/Text/de-chess.tti --- brltty-5.4/Tables/Text/de-chess.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/de-chess.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/de.ttb brltty-5.5/Tables/Text/de.ttb --- brltty-5.4/Tables/Text/de.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/de.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/devanagari.tti brltty-5.5/Tables/Text/devanagari.tti --- brltty-5.4/Tables/Text/devanagari.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/devanagari.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/dra.ttb brltty-5.5/Tables/Text/dra.ttb --- brltty-5.4/Tables/Text/dra.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/dra.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/el.ttb brltty-5.5/Tables/Text/el.ttb --- brltty-5.4/Tables/Text/el.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/el.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -22,235 +22,80 @@ # # Converted from liblouis table by Samuel Thibault -# generated by ttbtest: charset=iso-8859-7 -char \x09 ( ) # 09 ⠀ [CHARACTER TABULATION] -char \x0A ( ) # 0A ⠀ [LINE FEED (LF)] -char \x0D ( ) # 0D ⠀ [CARRIAGE RETURN (CR)] -char \x20 ( ) # 20 ⠀ [SPACE] -char \x21 ( 23 5 ) # 21 ⠖ ! [EXCLAMATION MARK] -char \x22 ( 23 56 ) # 22 ⠶ " [QUOTATION MARK] -char \x23 ( 3456 ) # 23 ⠼ # [NUMBER SIGN] -char \x26 (1234 6 ) # 26 ⠯ & [AMPERSAND] -char \x27 ( 3 6 ) # 27 ⠤ ' [APOSTROPHE] -char \x28 ( 23 56 ) # 28 ⠶ ( [LEFT PARENTHESIS] -char \x29 ( 23 56 ) # 29 ⠶ ) [RIGHT PARENTHESIS] -char \x2A ( 3 5 ) # 2A ⠔ * [ASTERISK] -char \x2B ( 2 6 ) # 2B ⠢ + [PLUS SIGN] -char \x2C ( 2 ) # 2C ⠂ , [COMMA] -char \x2D ( 3 6 ) # 2D ⠤ - [HYPHEN-MINUS] -char \x2E ( 2 56 ) # 2E ⠲ . [FULL STOP] -char \x2F ( 34 ) # 2F ⠌ / [SOLIDUS] -char \x30 ( 2 45 ) # 30 ⠚ 0 [DIGIT ZERO] -char \x31 (1 ) # 31 ⠁ 1 [DIGIT ONE] -char \x32 (12 ) # 32 ⠃ 2 [DIGIT TWO] -char \x33 (1 4 ) # 33 ⠉ 3 [DIGIT THREE] -char \x34 (1 45 ) # 34 ⠙ 4 [DIGIT FOUR] -char \x35 (1 5 ) # 35 ⠑ 5 [DIGIT FIVE] -char \x36 (12 4 ) # 36 ⠋ 6 [DIGIT SIX] -char \x37 (12 45 ) # 37 ⠛ 7 [DIGIT SEVEN] -char \x38 (12 5 ) # 38 ⠓ 8 [DIGIT EIGHT] -char \x39 ( 2 4 ) # 39 ⠊ 9 [DIGIT NINE] -char \x3A ( 2 5 ) # 3A ⠒ : [COLON] -char \x3B ( 2 6 ) # 3B ⠢ ; [SEMICOLON] -char \x3D ( 3 6 ) # 3D ⠤ = [EQUALS SIGN] -char \x3F ( 23 6 ) # 3F ⠦ ? [QUESTION MARK] -char \x40 ( 345 ) # 40 ⠜ @ [COMMERCIAL AT] -char \x41 (1 ) # 41 ⠁ A [LATIN CAPITAL LETTER A] -char \x42 (12 ) # 42 ⠃ B [LATIN CAPITAL LETTER B] -char \x43 (1 4 ) # 43 ⠉ C [LATIN CAPITAL LETTER C] -char \x44 (1 45 ) # 44 ⠙ D [LATIN CAPITAL LETTER D] -char \x45 (1 5 ) # 45 ⠑ E [LATIN CAPITAL LETTER E] -char \x46 (12 4 ) # 46 ⠋ F [LATIN CAPITAL LETTER F] -char \x47 (12 45 ) # 47 ⠛ G [LATIN CAPITAL LETTER G] -char \x48 (12 5 ) # 48 ⠓ H [LATIN CAPITAL LETTER H] -char \x49 ( 2 4 ) # 49 ⠊ I [LATIN CAPITAL LETTER I] -char \x4A ( 2 45 ) # 4A ⠚ J [LATIN CAPITAL LETTER J] -char \x4B (1 3 ) # 4B ⠅ K [LATIN CAPITAL LETTER K] -char \x4C (123 ) # 4C ⠇ L [LATIN CAPITAL LETTER L] -char \x4D (1 34 ) # 4D ⠍ M [LATIN CAPITAL LETTER M] -char \x4E (1 345 ) # 4E ⠝ N [LATIN CAPITAL LETTER N] -char \x4F (1 3 5 ) # 4F ⠕ O [LATIN CAPITAL LETTER O] -char \x50 (1234 ) # 50 ⠏ P [LATIN CAPITAL LETTER P] -char \x51 (12345 ) # 51 ⠟ Q [LATIN CAPITAL LETTER Q] -char \x52 (123 5 ) # 52 ⠗ R [LATIN CAPITAL LETTER R] -char \x53 ( 234 ) # 53 ⠎ S [LATIN CAPITAL LETTER S] -char \x54 ( 2345 ) # 54 ⠞ T [LATIN CAPITAL LETTER T] -char \x55 (1 3 6 ) # 55 ⠥ U [LATIN CAPITAL LETTER U] -char \x56 (123 6 ) # 56 ⠧ V [LATIN CAPITAL LETTER V] -char \x57 ( 2 456 ) # 57 ⠺ W [LATIN CAPITAL LETTER W] -char \x58 (1 34 6 ) # 58 ⠭ X [LATIN CAPITAL LETTER X] -char \x59 (1 3456 ) # 59 ⠽ Y [LATIN CAPITAL LETTER Y] -char \x5A (1 3 56 ) # 5A ⠵ Z [LATIN CAPITAL LETTER Z] -char \x5C (1 6 ) # 5C ⠡ \ [REVERSE SOLIDUS] -char \x5E ( 34 6 ) # 5E ⠬ ^ [CIRCUMFLEX ACCENT] -char \x5F ( 456 ) # 5F ⠸ _ [LOW LINE] -char \x60 ( 6 ) # 60 ⠠ ` [GRAVE ACCENT] -char \x61 (1 ) # 61 ⠁ a [LATIN SMALL LETTER A] -char \x62 (12 ) # 62 ⠃ b [LATIN SMALL LETTER B] -char \x63 (1 4 ) # 63 ⠉ c [LATIN SMALL LETTER C] -char \x64 (1 45 ) # 64 ⠙ d [LATIN SMALL LETTER D] -char \x65 (1 5 ) # 65 ⠑ e [LATIN SMALL LETTER E] -char \x66 (12 4 ) # 66 ⠋ f [LATIN SMALL LETTER F] -char \x67 (12 45 ) # 67 ⠛ g [LATIN SMALL LETTER G] -char \x68 (12 5 ) # 68 ⠓ h [LATIN SMALL LETTER H] -char \x69 ( 2 4 ) # 69 ⠊ i [LATIN SMALL LETTER I] -char \x6A ( 2 45 ) # 6A ⠚ j [LATIN SMALL LETTER J] -char \x6B (1 3 ) # 6B ⠅ k [LATIN SMALL LETTER K] -char \x6C (123 ) # 6C ⠇ l [LATIN SMALL LETTER L] -char \x6D (1 34 ) # 6D ⠍ m [LATIN SMALL LETTER M] -char \x6E (1 345 ) # 6E ⠝ n [LATIN SMALL LETTER N] -char \x6F (1 3 5 ) # 6F ⠕ o [LATIN SMALL LETTER O] -char \x70 (1234 ) # 70 ⠏ p [LATIN SMALL LETTER P] -char \x71 (12345 ) # 71 ⠟ q [LATIN SMALL LETTER Q] -char \x72 (123 5 ) # 72 ⠗ r [LATIN SMALL LETTER R] -char \x73 ( 234 ) # 73 ⠎ s [LATIN SMALL LETTER S] -char \x74 ( 2345 ) # 74 ⠞ t [LATIN SMALL LETTER T] -char \x75 (1 3 6 ) # 75 ⠥ u [LATIN SMALL LETTER U] -char \x76 (123 6 ) # 76 ⠧ v [LATIN SMALL LETTER V] -char \x77 ( 2 456 ) # 77 ⠺ w [LATIN SMALL LETTER W] -char \x78 (1 34 6 ) # 78 ⠭ x [LATIN SMALL LETTER X] -char \x79 (1 3456 ) # 79 ⠽ y [LATIN SMALL LETTER Y] -char \x7A (1 3 56 ) # 7A ⠵ z [LATIN SMALL LETTER Z] -char \x7C ( 56 ) # 7C ⠰ | [VERTICAL LINE] -char \x7E ( 34 ) # 7E ⠌ ~ [TILDE] -char \x80 (1 5 ) # 80 ⠑ [] -char \x92 ( 3 ) # 92 ⠄ [PRIVATE USE TWO] -char \xA0 ( ) # A0 ⠀   [NO-BREAK SPACE] -char \u2018 ( 3 ) # A1 ⠄ ‘ [LEFT SINGLE QUOTATION MARK] -char \u2019 ( 3 ) # A2 ⠄ ’ [RIGHT SINGLE QUOTATION MARK] -char \u20AC (1 5 ) # A4 ⠑ € [EURO SIGN] -char \xA7 ( 34 6 ) # A7 ⠬ § [SECTION SIGN] -char \xAB ( 23 6 ) # AB ⠦ « [LEFT-POINTING DOUBLE ANGLE QUOTATION MARK] -char \xB0 ( 3 56 ) # B0 ⠴ ° [DEGREE SIGN] -char \u0386 (1 ) # B6 ⠁ Ά [GREEK CAPITAL LETTER ALPHA WITH TONOS] -char \xB7 ( 23 ) # B7 ⠆ · [MIDDLE DOT] -char \u0388 (1 5 ) # B8 ⠑ Έ [GREEK CAPITAL LETTER EPSILON WITH TONOS] -char \u0389 ( 345 ) # B9 ⠜ Ή [GREEK CAPITAL LETTER ETA WITH TONOS] -char \u038A ( 2 4 ) # BA ⠊ Ί [GREEK CAPITAL LETTER IOTA WITH TONOS] -char \xBB ( 3 56 ) # BB ⠴ » [RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK] -char \u038C (1 3 5 ) # BC ⠕ Ό [GREEK CAPITAL LETTER OMICRON WITH TONOS] -char \u038E (1 3456 ) # BE ⠽ Ύ [GREEK CAPITAL LETTER UPSILON WITH TONOS] -char \u038F ( 2 45 ) # BF ⠚ Ώ [GREEK CAPITAL LETTER OMEGA WITH TONOS] -char \u0390 ( 2 4 ) # C0 ⠊ ΐ [GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS] -char \u0391 (1 ) # C1 ⠁ Α [GREEK CAPITAL LETTER ALPHA] -char \u0392 (12 ) # C2 ⠃ Β [GREEK CAPITAL LETTER BETA] -char \u0393 (12 45 ) # C3 ⠛ Γ [GREEK CAPITAL LETTER GAMMA] -char \u0394 (1 45 ) # C4 ⠙ Δ [GREEK CAPITAL LETTER DELTA] -char \u0395 (1 5 ) # C5 ⠑ Ε [GREEK CAPITAL LETTER EPSILON] -char \u0396 (1 3 56 ) # C6 ⠵ Ζ [GREEK CAPITAL LETTER ZETA] -char \u0397 ( 345 ) # C7 ⠜ Η [GREEK CAPITAL LETTER ETA] -char \u0398 (1 456 ) # C8 ⠹ Θ [GREEK CAPITAL LETTER THETA] -char \u0399 ( 2 4 ) # C9 ⠊ Ι [GREEK CAPITAL LETTER IOTA] -char \u039A (1 3 ) # CA ⠅ Κ [GREEK CAPITAL LETTER KAPPA] -char \u039B (123 ) # CB ⠇ Λ [GREEK CAPITAL LETTER LAMDA] -char \u039C (1 34 ) # CC ⠍ Μ [GREEK CAPITAL LETTER MU] -char \u039D (1 345 ) # CD ⠝ Ν [GREEK CAPITAL LETTER NU] -char \u039E (1 34 6 ) # CE ⠭ Ξ [GREEK CAPITAL LETTER XI] -char \u039F (1 3 5 ) # CF ⠕ Ο [GREEK CAPITAL LETTER OMICRON] -char \u03A0 (1234 ) # D0 ⠏ Π [GREEK CAPITAL LETTER PI] -char \u03A1 (123 5 ) # D1 ⠗ Ρ [GREEK CAPITAL LETTER RHO] -char \u03A3 ( 234 ) # D3 ⠎ Σ [GREEK CAPITAL LETTER SIGMA] -char \u03A4 ( 2345 ) # D4 ⠞ Τ [GREEK CAPITAL LETTER TAU] -char \u03A5 (1 3456 ) # D5 ⠽ Υ [GREEK CAPITAL LETTER UPSILON] -char \u03A6 (12 4 ) # D6 ⠋ Φ [GREEK CAPITAL LETTER PHI] -char \u03A7 (12 5 ) # D7 ⠓ Χ [GREEK CAPITAL LETTER CHI] -char \u03A8 (1234 6 ) # D8 ⠯ Ψ [GREEK CAPITAL LETTER PSI] -char \u03A9 ( 2 45 ) # D9 ⠚ Ω [GREEK CAPITAL LETTER OMEGA] -char \u03AC (1 ) # DC ⠁ ά [GREEK SMALL LETTER ALPHA WITH TONOS] -char \u03AD (1 5 ) # DD ⠑ έ [GREEK SMALL LETTER EPSILON WITH TONOS] -char \u03AE ( 345 ) # DE ⠜ ή [GREEK SMALL LETTER ETA WITH TONOS] -char \u03AF ( 2 4 ) # DF ⠊ ί [GREEK SMALL LETTER IOTA WITH TONOS] -char \u03B0 (1 3456 ) # E0 ⠽ ΰ [GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS] -char \u03B1 (1 ) # E1 ⠁ α [GREEK SMALL LETTER ALPHA] -char \u03B2 (12 ) # E2 ⠃ β [GREEK SMALL LETTER BETA] -char \u03B3 (12 45 ) # E3 ⠛ γ [GREEK SMALL LETTER GAMMA] -char \u03B4 (1 45 ) # E4 ⠙ δ [GREEK SMALL LETTER DELTA] -char \u03B5 (1 5 ) # E5 ⠑ ε [GREEK SMALL LETTER EPSILON] -char \u03B6 (1 3 56 ) # E6 ⠵ ζ [GREEK SMALL LETTER ZETA] -char \u03B7 ( 345 ) # E7 ⠜ η [GREEK SMALL LETTER ETA] -char \u03B8 (1 456 ) # E8 ⠹ θ [GREEK SMALL LETTER THETA] -char \u03B9 ( 2 4 ) # E9 ⠊ ι [GREEK SMALL LETTER IOTA] -char \u03BA (1 3 ) # EA ⠅ κ [GREEK SMALL LETTER KAPPA] -char \u03BB (123 ) # EB ⠇ λ [GREEK SMALL LETTER LAMDA] -char \u03BC (1 34 ) # EC ⠍ μ [GREEK SMALL LETTER MU] -char \u03BD (1 345 ) # ED ⠝ ν [GREEK SMALL LETTER NU] -char \u03BE (1 34 6 ) # EE ⠭ ξ [GREEK SMALL LETTER XI] -char \u03BF (1 3 5 ) # EF ⠕ ο [GREEK SMALL LETTER OMICRON] -char \u03C0 (1234 ) # F0 ⠏ π [GREEK SMALL LETTER PI] -char \u03C1 (123 5 ) # F1 ⠗ ρ [GREEK SMALL LETTER RHO] -char \u03C2 ( 234 ) # F2 ⠎ ς [GREEK SMALL LETTER FINAL SIGMA] -char \u03C3 ( 234 ) # F3 ⠎ σ [GREEK SMALL LETTER SIGMA] -char \u03C4 ( 2345 ) # F4 ⠞ τ [GREEK SMALL LETTER TAU] -char \u03C5 (1 3456 ) # F5 ⠽ υ [GREEK SMALL LETTER UPSILON] -char \u03C6 (12 4 ) # F6 ⠋ φ [GREEK SMALL LETTER PHI] -char \u03C7 (12 5 ) # F7 ⠓ χ [GREEK SMALL LETTER CHI] -char \u03C8 (1234 6 ) # F8 ⠯ ψ [GREEK SMALL LETTER PSI] -char \u03C9 ( 2 45 ) # F9 ⠚ ω [GREEK SMALL LETTER OMEGA] -char \u03CA ( 2 4 ) # FA ⠊ ϊ [GREEK SMALL LETTER IOTA WITH DIALYTIKA] -char \u03CB (1 3456 ) # FB ⠽ ϋ [GREEK SMALL LETTER UPSILON WITH DIALYTIKA] -char \u03CC (1 3 5 ) # FC ⠕ ό [GREEK SMALL LETTER OMICRON WITH TONOS] -char \u03CD (1 3456 ) # FD ⠽ ύ [GREEK SMALL LETTER UPSILON WITH TONOS] -char \u03CE ( 2 45 ) # FE ⠚ ώ [GREEK SMALL LETTER OMEGA WITH TONOS] -char \xA2 (1 4 ) # ⠉ ¢ [CENT SIGN] -char \xA5 (1 3456 ) # ⠽ ¥ [YEN SIGN] -char \xAA ( 4 6 ) # ⠨ ª [FEMININE ORDINAL INDICATOR] -char \xB5 (123456 ) # ⠿ µ [MICRO SIGN] -char \xB8 ( 45 ) # ⠘ ¸ [CEDILLA] -char \xBF ( 3 5 ) # ⠔ ¿ [INVERTED QUESTION MARK] -char \xC0 (123 56 ) # ⠷ À [LATIN CAPITAL LETTER A WITH GRAVE] -char \xC1 (1 ) # ⠁ Á [LATIN CAPITAL LETTER A WITH ACUTE] -char \xC2 (1 6 ) # ⠡ Â [LATIN CAPITAL LETTER A WITH CIRCUMFLEX] -char \xC3 ( 345 ) # ⠜ Ã [LATIN CAPITAL LETTER A WITH TILDE] -char \xC4 ( 345 ) # ⠜ Ä [LATIN CAPITAL LETTER A WITH DIAERESIS] -char \xC5 ( 2 4 6 ) # ⠪ Å [LATIN CAPITAL LETTER A WITH RING ABOVE] -char \xC6 ( 345 ) # ⠜ Æ [LATIN CAPITAL LETTER AE] -char \xC7 (1234 6 ) # ⠯ Ç [LATIN CAPITAL LETTER C WITH CEDILLA] -char \xC8 ( 234 6 ) # ⠮ È [LATIN CAPITAL LETTER E WITH GRAVE] -char \xC9 (123456 ) # ⠿ É [LATIN CAPITAL LETTER E WITH ACUTE] -char \xCA (12 6 ) # ⠣ Ê [LATIN CAPITAL LETTER E WITH CIRCUMFLEX] -char \xCB (12 4 6 ) # ⠫ Ë [LATIN CAPITAL LETTER E WITH DIAERESIS] -char \xD1 (12 456 ) # ⠻ Ñ [LATIN CAPITAL LETTER N WITH TILDE] -char \xD6 ( 2 4 6 ) # ⠪ Ö [LATIN CAPITAL LETTER O WITH DIAERESIS] -char \xE0 (123 56 ) # ⠷ à [LATIN SMALL LETTER A WITH GRAVE] -char \xE1 (1 ) # ⠁ á [LATIN SMALL LETTER A WITH ACUTE] -char \xE2 (1 6 ) # ⠡ â [LATIN SMALL LETTER A WITH CIRCUMFLEX] -char \xE3 ( 345 ) # ⠜ ã [LATIN SMALL LETTER A WITH TILDE] -char \xE4 ( 345 ) # ⠜ ä [LATIN SMALL LETTER A WITH DIAERESIS] -char \xE5 ( 2 4 6 ) # ⠪ å [LATIN SMALL LETTER A WITH RING ABOVE] -char \xE6 ( 345 ) # ⠜ æ [LATIN SMALL LETTER AE] -char \xE7 (1234 6 ) # ⠯ ç [LATIN SMALL LETTER C WITH CEDILLA] -char \xE8 ( 234 6 ) # ⠮ è [LATIN SMALL LETTER E WITH GRAVE] -char \xE9 (123456 ) # ⠿ é [LATIN SMALL LETTER E WITH ACUTE] -char \xEA (12 6 ) # ⠣ ê [LATIN SMALL LETTER E WITH CIRCUMFLEX] -char \xEB (12 4 6 ) # ⠫ ë [LATIN SMALL LETTER E WITH DIAERESIS] -char \xEC ( 2 4 ) # ⠊ ì [LATIN SMALL LETTER I WITH GRAVE] -char \xED ( 2 4 ) # ⠊ í [LATIN SMALL LETTER I WITH ACUTE] -char \xEE (1 4 6 ) # ⠩ î [LATIN SMALL LETTER I WITH CIRCUMFLEX] -char \xEF (12 456 ) # ⠻ ï [LATIN SMALL LETTER I WITH DIAERESIS] -char \xF1 (12 456 ) # ⠻ ñ [LATIN SMALL LETTER N WITH TILDE] -char \xF2 (1 3 5 ) # ⠕ ò [LATIN SMALL LETTER O WITH GRAVE] -char \xF3 ( 34 6 ) # ⠬ ó [LATIN SMALL LETTER O WITH ACUTE] -char \xF4 (1 456 ) # ⠹ ô [LATIN SMALL LETTER O WITH CIRCUMFLEX] -char \xF5 ( 2 4 6 ) # ⠪ õ [LATIN SMALL LETTER O WITH TILDE] -char \xF6 ( 2 4 6 ) # ⠪ ö [LATIN SMALL LETTER O WITH DIAERESIS] -char \xF9 (123 56 ) # ⠷ ù [LATIN SMALL LETTER U WITH GRAVE] -char \xFA (1 3 6 ) # ⠥ ú [LATIN SMALL LETTER U WITH ACUTE] -char \xFB (1 56 ) # ⠱ û [LATIN SMALL LETTER U WITH CIRCUMFLEX] -char \xFC (12 56 ) # ⠳ ü [LATIN SMALL LETTER U WITH DIAERESIS] -char \u0192 (12 4 ) # ⠋ ƒ [LATIN SMALL LETTER F WITH HOOK] -char \u1F00 (1 ) # ⠁ ἀ [GREEK SMALL LETTER ALPHA WITH PSILI] -char \u1F10 (1 5 ) # ⠑ ἐ [GREEK SMALL LETTER EPSILON WITH PSILI] -char \u1F20 ( 345 ) # ⠜ ἠ [GREEK SMALL LETTER ETA WITH PSILI] -char \u1F30 ( 2 4 ) # ⠊ ἰ [GREEK SMALL LETTER IOTA WITH PSILI] -char \u1F40 (1 3 5 ) # ⠕ ὀ [GREEK SMALL LETTER OMICRON WITH PSILI] -char \u1F50 (1 3456 ) # ⠽ ὐ [GREEK SMALL LETTER UPSILON WITH PSILI] -char \u1F60 ( 2 45 ) # ⠚ ὠ [GREEK SMALL LETTER OMEGA WITH PSILI] -char \u1F90 ( 3456 ) # ⠼ ᾐ [GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI] -char \u1FA0 ( 2 456 ) # ⠺ ᾠ [GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI] -char \u1FC3 ( 3456 ) # ⠼ ῃ [GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI] -char \u1FF3 ( 2 456 ) # ⠺ ῳ [GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI] -char \u2010 ( 4 6 ) # ⠨ ‐ [HYPHEN] -char \u2011 ( 4 6 ) # ⠨ ‑ [NON-BREAKING HYPHEN] -char \u2013 ( 3 6 ) # ⠤ – [EN DASH] +include greek.tti +include ltr-latin.tti + +glyph \t ( ) # 09 [CHARACTER TABULATION] +glyph \r ( ) # 0D [CARRIAGE RETURN (CR)] + +char \x2D ( 3 6 ) # ⠤ - [HYPHEN-MINUS] +glyph \u2010 ( 3 6 ) # ⠤ ‐ [HYPHEN] +glyph \u2011 ( 3 6 ) # ⠤ ‑ [NON-BREAKING HYPHEN] +glyph \u2013 ( 3 6 ) # ⠤ – [EN DASH] + +char \x27 ( 3 ) # ⠄ ' [APOSTROPHE] +char \x2C ( 2 ) # ⠂ , [COMMA] +char \x3A ( 2 5 ) # ⠒ : [COLON] +char \x2E ( 2 56 ) # ⠲ . [FULL STOP] +char \x21 ( 23 5 ) # ⠖ ! [EXCLAMATION MARK] + +char \x28 (123 56 ) # ⠷ ( [LEFT PARENTHESIS] +char \x29 ( 23456 ) # ⠾ ) [RIGHT PARENTHESIS] + +char \x5B (123 5678) ⣷ À [ [LEFT SQUARE BRACKET] +char \x5D ( 2345678) # ⣾ ] [RIGHT SQUARE BRACKET] + +char \x7B (1234 678) # ⣯ { [LEFT CURLY BRACKET] +char \x7D (1 345678) # ⣽ } [RIGHT CURLY BRACKET] + +char \x22 ( 23 56 ) # ⠶ " [QUOTATION MARK] +char \xAB ( 23 6 ) # ⠦ « [LEFT-POINTING DOUBLE ANGLE QUOTATION MARK] +char \xBB ( 3 56 ) # ⠴ » [RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK] + +char \x2F ( 34 ) # ⠌ / [SOLIDUS] +char \x5C (1 6 ) # ⠡ \ [REVERSE SOLIDUS] + +char \x60 ( 4 ) # ⠈ ` [GRAVE ACCENT] +char \x5E ( 6 ) # ⠠ ^ [CIRCUMFLEX ACCENT] +char \x7E ( 45 ) # ⠘ ~ [TILDE] +char \x5F ( 456 ) # ⠸ _ [LOW LINE] + +################################################### +# The characters below have not yet been audited. # +################################################### + +char \x23 ( 34567 ) # ⠼ # [NUMBER SIGN] +char \x26 (1234 6 ) # ⠯ & [AMPERSAND] +char \x2A ( 3 5 ) # ⠔ * [ASTERISK] +char \x2B ( 2 6 ) # ⠢ + [PLUS SIGN] +char \x3B ( 2 6 ) # ⠢ ; [SEMICOLON] +char \x3D ( 3 6 ) # ⠤ = [EQUALS SIGN] +char \x3F ( 23 6 ) # ⠦ ? [QUESTION MARK] +char \x40 ( 345 ) # ⠜ @ [COMMERCIAL AT] +char \x7C (12 56 ) # ⠳ | [VERTICAL LINE] + +char \x30 ( 2 45 ) # ⠚ 0 [DIGIT ZERO] +char \x31 (1 ) # ⠁ 1 [DIGIT ONE] +char \x32 (12 ) # ⠃ 2 [DIGIT TWO] +char \x33 (1 4 ) # ⠉ 3 [DIGIT THREE] +char \x34 (1 45 ) # ⠙ 4 [DIGIT FOUR] +char \x35 (1 5 ) # ⠑ 5 [DIGIT FIVE] +char \x36 (12 4 ) # ⠋ 6 [DIGIT SIX] +char \x37 (12 45 ) # ⠛ 7 [DIGIT SEVEN] +char \x38 (12 5 ) # ⠓ 8 [DIGIT EIGHT] +char \x39 ( 2 4 ) # ⠊ 9 [DIGIT NINE] + +char \u2018 ( 3 ) # ⠄ ‘ [LEFT SINGLE QUOTATION MARK] +char \u2019 ( 3 ) # ⠄ ’ [RIGHT SINGLE QUOTATION MARK] +char \u20AC (1 5 ) # ⠑ € [EURO SIGN] +char \xA7 ( 34 6 ) # ⠬ § [SECTION SIGN] +char \xB0 ( 3 56 ) # ⠴ ° [DEGREE SIGN] +char \xB7 ( 23 ) # ⠆ · [MIDDLE DOT] +char \xA2 (1 4 ) # ⠉ ¢ [CENT SIGN] +char \xA5 (1 3456 ) # ⠽ ¥ [YEN SIGN] +char \xAA ( 4 6 ) # ⠨ ª [FEMININE ORDINAL INDICATOR] +char \xB5 (123456 ) # ⠿ µ [MICRO SIGN] +char \xB8 ( 45 ) # ⠘ ¸ [CEDILLA] +char \xBF ( 3 5 ) # ⠔ ¿ [INVERTED QUESTION MARK] include common.tti diff -Nru brltty-5.4/Tables/Text/en_CA.ttb brltty-5.5/Tables/Text/en_CA.ttb --- brltty-5.4/Tables/Text/en_CA.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/en_CA.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/en-chess.tti brltty-5.5/Tables/Text/en-chess.tti --- brltty-5.4/Tables/Text/en-chess.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/en-chess.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/en_GB.ttb brltty-5.5/Tables/Text/en_GB.ttb --- brltty-5.4/Tables/Text/en_GB.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/en_GB.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/en-na-ascii.tti brltty-5.5/Tables/Text/en-na-ascii.tti --- brltty-5.4/Tables/Text/en-na-ascii.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/en-na-ascii.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/en-nabcc.ttb brltty-5.5/Tables/Text/en-nabcc.ttb --- brltty-5.4/Tables/Text/en-nabcc.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/en-nabcc.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/en.ttb brltty-5.5/Tables/Text/en.ttb --- brltty-5.4/Tables/Text/en.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/en.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/en_US.ttb brltty-5.5/Tables/Text/en_US.ttb --- brltty-5.4/Tables/Text/en_US.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/en_US.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/eo.ttb brltty-5.5/Tables/Text/eo.ttb --- brltty-5.4/Tables/Text/eo.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/eo.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/es.ttb brltty-5.5/Tables/Text/es.ttb --- brltty-5.4/Tables/Text/es.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/es.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/et.ttb brltty-5.5/Tables/Text/et.ttb --- brltty-5.4/Tables/Text/et.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/et.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/fi.ttb brltty-5.5/Tables/Text/fi.ttb --- brltty-5.4/Tables/Text/fi.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/fi.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/fr-2007.ttb brltty-5.5/Tables/Text/fr-2007.ttb --- brltty-5.4/Tables/Text/fr-2007.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/fr-2007.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/fr_CA.ttb brltty-5.5/Tables/Text/fr_CA.ttb --- brltty-5.4/Tables/Text/fr_CA.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/fr_CA.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/fr-cbifs.ttb brltty-5.5/Tables/Text/fr-cbifs.ttb --- brltty-5.4/Tables/Text/fr-cbifs.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/fr-cbifs.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/fr_FR.ttb brltty-5.5/Tables/Text/fr_FR.ttb --- brltty-5.4/Tables/Text/fr_FR.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/fr_FR.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/fr.ttb brltty-5.5/Tables/Text/fr.ttb --- brltty-5.4/Tables/Text/fr.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/fr.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/fr-vs.ttb brltty-5.5/Tables/Text/fr-vs.ttb --- brltty-5.4/Tables/Text/fr-vs.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/fr-vs.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ga.ttb brltty-5.5/Tables/Text/ga.ttb --- brltty-5.4/Tables/Text/ga.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ga.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/gd.ttb brltty-5.5/Tables/Text/gd.ttb --- brltty-5.4/Tables/Text/gd.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/gd.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/gon.ttb brltty-5.5/Tables/Text/gon.ttb --- brltty-5.4/Tables/Text/gon.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/gon.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/greek.tti brltty-5.5/Tables/Text/greek.tti --- brltty-5.4/Tables/Text/greek.tti 1970-01-01 00:00:00.000000000 +0000 +++ brltty-5.5/Tables/Text/greek.tti 2017-04-18 22:35:14.000000000 +0000 @@ -0,0 +1,323 @@ +############################################################################### +# BRLTTY - A background process providing access to the console screen (when in +# text mode) for a blind person using a refreshable braille display. +# +# Copyright (C) 2008-2017 by The BRLTTY Developers. +# +# BRLTTY comes with ABSOLUTELY NO WARRANTY. +# +# This is free software, placed under the terms of the +# GNU Lesser General Public License, as published by the Free Software +# Foundation; either version 2.1 of the License, or (at your option) any +# later version. Please see the file LICENSE-LGPL for details. +# +# Web Page: http://brltty.com/ +# +# This software is maintained by Dave Mielke . +############################################################################### + +# This BRLTTY text subtable defines the braille representations +# for characters that are unique to the Greek language. +# Dot 7 represents uppercase. +# Dot 8 represents the acute (tonos or oxia) accent. +# Maintained by: Dave Mielke + +char \u037E ( 2 6 ) # ⠢ ; [GREEK QUESTION MARK] +glyph \u0384 ( 5 ) # ⠐ ΄ [GREEK TONOS] +char \u0386 (1 78) # ⣁ Ά [GREEK CAPITAL LETTER ALPHA WITH TONOS] +char \u0387 ( 23 ) # ⠆ · [GREEK ANO TELEIA] +char \u0388 (1 5 78) # ⣑ Έ [GREEK CAPITAL LETTER EPSILON WITH TONOS] +char \u0389 ( 345 78) # ⣜ Ή [GREEK CAPITAL LETTER ETA WITH TONOS] +char \u038A ( 2 4 78) # ⣊ Ί [GREEK CAPITAL LETTER IOTA WITH TONOS] +char \u038C (1 3 5 78) # ⣕ Ό [GREEK CAPITAL LETTER OMICRON WITH TONOS] +char \u038E (1 345678) # ⣽ Ύ [GREEK CAPITAL LETTER UPSILON WITH TONOS] +char \u038F ( 2 45 78) # ⣚ Ώ [GREEK CAPITAL LETTER OMEGA WITH TONOS] +glyph \u0390 ( 2 4 8) # ⢊ ΐ [GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS] +char \u0391 (1 7 ) # ⡁ Α [GREEK CAPITAL LETTER ALPHA] +char \u0392 (12 7 ) # ⡃ Β [GREEK CAPITAL LETTER BETA] +char \u0393 (12 45 7 ) # ⡛ Γ [GREEK CAPITAL LETTER GAMMA] +char \u0394 (1 45 7 ) # ⡙ Δ [GREEK CAPITAL LETTER DELTA] +char \u0395 (1 5 7 ) # ⡑ Ε [GREEK CAPITAL LETTER EPSILON] +char \u0396 (1 3 567 ) # ⡵ Ζ [GREEK CAPITAL LETTER ZETA] +char \u0397 ( 345 7 ) # ⡜ Η [GREEK CAPITAL LETTER ETA] +char \u0398 (1 4567 ) # ⡹ Θ [GREEK CAPITAL LETTER THETA] +char \u0399 ( 2 4 7 ) # ⡊ Ι [GREEK CAPITAL LETTER IOTA] +char \u039A (1 3 7 ) # ⡅ Κ [GREEK CAPITAL LETTER KAPPA] +char \u039B (123 7 ) # ⡇ Λ [GREEK CAPITAL LETTER LAMDA] +char \u039C (1 34 7 ) # ⡍ Μ [GREEK CAPITAL LETTER MU] +char \u039D (1 345 7 ) # ⡝ Ν [GREEK CAPITAL LETTER NU] +char \u039E (1 34 67 ) # ⡭ Ξ [GREEK CAPITAL LETTER XI] +char \u039F (1 3 5 7 ) # ⡕ Ο [GREEK CAPITAL LETTER OMICRON] +char \u03A0 (1234 7 ) # ⡏ Π [GREEK CAPITAL LETTER PI] +char \u03A1 (123 5 7 ) # ⡗ Ρ [GREEK CAPITAL LETTER RHO] +char \u03A3 ( 234 7 ) # ⡎ Σ [GREEK CAPITAL LETTER SIGMA] +char \u03A4 ( 2345 7 ) # ⡞ Τ [GREEK CAPITAL LETTER TAU] +char \u03A5 (1 34567 ) # ⡽ Υ [GREEK CAPITAL LETTER UPSILON] +char \u03A6 (12 4 7 ) # ⡋ Φ [GREEK CAPITAL LETTER PHI] +char \u03A7 (12 5 7 ) # ⡓ Χ [GREEK CAPITAL LETTER CHI] +char \u03A8 (1234 67 ) # ⡯ Ψ [GREEK CAPITAL LETTER PSI] +char \u03A9 ( 2 45 7 ) # ⡚ Ω [GREEK CAPITAL LETTER OMEGA] +glyph \u03AA ( 2 4 7 ) # ⡊ Ϊ [GREEK CAPITAL LETTER IOTA WITH DIALYTIKA] +glyph \u03AB (1 34567 ) # ⡽ Ϋ [GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA] +char \u03AC (1 8) # ⢁ ά [GREEK SMALL LETTER ALPHA WITH TONOS] +char \u03AD (1 5 8) # ⢑ έ [GREEK SMALL LETTER EPSILON WITH TONOS] +char \u03AE ( 345 8) # ⢜ ή [GREEK SMALL LETTER ETA WITH TONOS] +char \u03AF ( 2 4 8) # ⢊ ί [GREEK SMALL LETTER IOTA WITH TONOS] +glyph \u03B0 (1 3456 8) # ⢽ ΰ [GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS] +char \u03B1 (1 ) # ⠁ α [GREEK SMALL LETTER ALPHA] +char \u03B2 (12 ) # ⠃ β [GREEK SMALL LETTER BETA] +char \u03B3 (12 45 ) # ⠛ γ [GREEK SMALL LETTER GAMMA] +char \u03B4 (1 45 ) # ⠙ δ [GREEK SMALL LETTER DELTA] +char \u03B5 (1 5 ) # ⠑ ε [GREEK SMALL LETTER EPSILON] +char \u03B6 (1 3 56 ) # ⠵ ζ [GREEK SMALL LETTER ZETA] +char \u03B7 ( 345 ) # ⠜ η [GREEK SMALL LETTER ETA] +char \u03B8 (1 456 ) # ⠹ θ [GREEK SMALL LETTER THETA] +char \u03B9 ( 2 4 ) # ⠊ ι [GREEK SMALL LETTER IOTA] +char \u03BA (1 3 ) # ⠅ κ [GREEK SMALL LETTER KAPPA] +char \u03BB (123 ) # ⠇ λ [GREEK SMALL LETTER LAMDA] +char \u03BC (1 34 ) # ⠍ μ [GREEK SMALL LETTER MU] +char \u03BD (1 345 ) # ⠝ ν [GREEK SMALL LETTER NU] +char \u03BE (1 34 6 ) # ⠭ ξ [GREEK SMALL LETTER XI] +char \u03BF (1 3 5 ) # ⠕ ο [GREEK SMALL LETTER OMICRON] +char \u03C0 (1234 ) # ⠏ π [GREEK SMALL LETTER PI] +char \u03C1 (123 5 ) # ⠗ ρ [GREEK SMALL LETTER RHO] +glyph \u03C2 ( 234 ) # ⠎ ς [GREEK SMALL LETTER FINAL SIGMA] +char \u03C3 ( 234 ) # ⠎ σ [GREEK SMALL LETTER SIGMA] +char \u03C4 ( 2345 ) # ⠞ τ [GREEK SMALL LETTER TAU] +char \u03C5 (1 3456 ) # ⠽ υ [GREEK SMALL LETTER UPSILON] +char \u03C6 (12 4 ) # ⠋ φ [GREEK SMALL LETTER PHI] +char \u03C7 (12 5 ) # ⠓ χ [GREEK SMALL LETTER CHI] +char \u03C8 (1234 6 ) # ⠯ ψ [GREEK SMALL LETTER PSI] +char \u03C9 ( 2 45 ) # ⠚ ω [GREEK SMALL LETTER OMEGA] +glyph \u03CA ( 2 4 ) # ⠊ ϊ [GREEK SMALL LETTER IOTA WITH DIALYTIKA] +glyph \u03CB (1 3456 ) # ⠽ ϋ [GREEK SMALL LETTER UPSILON WITH DIALYTIKA] +char \u03CC (1 3 5 8) # ⢕ ό [GREEK SMALL LETTER OMICRON WITH TONOS] +char \u03CD (1 3456 8) # ⢽ ύ [GREEK SMALL LETTER UPSILON WITH TONOS] +char \u03CE ( 2 45 8) # ⢚ ώ [GREEK SMALL LETTER OMEGA WITH TONOS] +glyph \u1F00 (1 ) # ⠁ ἀ [GREEK SMALL LETTER ALPHA WITH PSILI] +glyph \u1F01 (1 ) # ⠁ ἁ [GREEK SMALL LETTER ALPHA WITH DASIA] +glyph \u1F02 (1 ) # ⠁ ἂ [GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA] +glyph \u1F03 (1 ) # ⠁ ἃ [GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA] +glyph \u1F04 (1 8) # ⢁ ἄ [GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA] +glyph \u1F05 (1 8) # ⢁ ἅ [GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA] +glyph \u1F06 (1 ) # ⠁ ἆ [GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI] +glyph \u1F07 (1 ) # ⠁ ἇ [GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI] +glyph \u1F08 (1 7 ) # ⡁ Ἀ [GREEK CAPITAL LETTER ALPHA WITH PSILI] +glyph \u1F09 (1 7 ) # ⡁ Ἁ [GREEK CAPITAL LETTER ALPHA WITH DASIA] +glyph \u1F0A (1 7 ) # ⡁ Ἂ [GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA] +glyph \u1F0B (1 7 ) # ⡁ Ἃ [GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA] +glyph \u1F0C (1 78) # ⣁ Ἄ [GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA] +glyph \u1F0D (1 78) # ⣁ Ἅ [GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA] +glyph \u1F0E (1 7 ) # ⡁ Ἆ [GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI] +glyph \u1F0F (1 7 ) # ⡁ Ἇ [GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI] +glyph \u1F10 (1 5 ) # ⠑ ἐ [GREEK SMALL LETTER EPSILON WITH PSILI] +glyph \u1F11 (1 5 ) # ⠑ ἑ [GREEK SMALL LETTER EPSILON WITH DASIA] +glyph \u1F12 (1 5 ) # ⠑ ἒ [GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA] +glyph \u1F13 (1 5 ) # ⠑ ἓ [GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA] +glyph \u1F14 (1 5 8) # ⢑ ἔ [GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA] +glyph \u1F15 (1 5 8) # ⢑ ἕ [GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA] +glyph \u1F18 (1 5 7 ) # ⡑ Ἐ [GREEK CAPITAL LETTER EPSILON WITH PSILI] +glyph \u1F19 (1 5 7 ) # ⡑ Ἑ [GREEK CAPITAL LETTER EPSILON WITH DASIA] +glyph \u1F1A (1 5 7 ) # ⡑ Ἒ [GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA] +glyph \u1F1B (1 5 7 ) # ⡑ Ἓ [GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA] +glyph \u1F1C (1 5 78) # ⣑ Ἔ [GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA] +glyph \u1F1D (1 5 78) # ⣑ Ἕ [GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA] +glyph \u1F20 ( 345 ) # ⠜ ἠ [GREEK SMALL LETTER ETA WITH PSILI] +glyph \u1F21 ( 345 ) # ⠜ ἡ [GREEK SMALL LETTER ETA WITH DASIA] +glyph \u1F22 ( 345 ) # ⠜ ἢ [GREEK SMALL LETTER ETA WITH PSILI AND VARIA] +glyph \u1F23 ( 345 ) # ⠜ ἣ [GREEK SMALL LETTER ETA WITH DASIA AND VARIA] +glyph \u1F24 ( 345 8) # ⢜ ἤ [GREEK SMALL LETTER ETA WITH PSILI AND OXIA] +glyph \u1F25 ( 345 8) # ⢜ ἥ [GREEK SMALL LETTER ETA WITH DASIA AND OXIA] +glyph \u1F26 ( 345 ) # ⠜ ἦ [GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI] +glyph \u1F27 ( 345 ) # ⠜ ἧ [GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI] +glyph \u1F28 ( 345 7 ) # ⡜ Ἠ [GREEK CAPITAL LETTER ETA WITH PSILI] +glyph \u1F29 ( 345 7 ) # ⡜ Ἡ [GREEK CAPITAL LETTER ETA WITH DASIA] +glyph \u1F2A ( 345 7 ) # ⡜ Ἢ [GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA] +glyph \u1F2B ( 345 7 ) # ⡜ Ἣ [GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA] +glyph \u1F2C ( 345 78) # ⣜ Ἤ [GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA] +glyph \u1F2D ( 345 78) # ⣜ Ἥ [GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA] +glyph \u1F2E ( 345 7 ) # ⡜ Ἦ [GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI] +glyph \u1F2F ( 345 7 ) # ⡜ Ἧ [GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI] +glyph \u1F30 ( 2 4 ) # ⠊ ἰ [GREEK SMALL LETTER IOTA WITH PSILI] +glyph \u1F31 ( 2 4 ) # ⠊ ἱ [GREEK SMALL LETTER IOTA WITH DASIA] +glyph \u1F32 ( 2 4 ) # ⠊ ἲ [GREEK SMALL LETTER IOTA WITH PSILI AND VARIA] +glyph \u1F33 ( 2 4 ) # ⠊ ἳ [GREEK SMALL LETTER IOTA WITH DASIA AND VARIA] +glyph \u1F34 ( 2 4 8) # ⢊ ἴ [GREEK SMALL LETTER IOTA WITH PSILI AND OXIA] +glyph \u1F35 ( 2 4 8) # ⢊ ἵ [GREEK SMALL LETTER IOTA WITH DASIA AND OXIA] +glyph \u1F36 ( 2 4 ) # ⠊ ἶ [GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI] +glyph \u1F37 ( 2 4 ) # ⠊ ἷ [GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI] +glyph \u1F38 ( 2 4 7 ) # ⡊ Ἰ [GREEK CAPITAL LETTER IOTA WITH PSILI] +glyph \u1F39 ( 2 4 7 ) # ⡊ Ἱ [GREEK CAPITAL LETTER IOTA WITH DASIA] +glyph \u1F3A ( 2 4 7 ) # ⡊ Ἲ [GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA] +glyph \u1F3B ( 2 4 7 ) # ⡊ Ἳ [GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA] +glyph \u1F3C ( 2 4 78) # ⣊ Ἴ [GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA] +glyph \u1F3D ( 2 4 78) # ⣊ Ἵ [GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA] +glyph \u1F3E ( 2 4 7 ) # ⡊ Ἶ [GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI] +glyph \u1F3F ( 2 4 7 ) # ⡊ Ἷ [GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI] +glyph \u1F40 (1 3 5 ) # ⠕ ὀ [GREEK SMALL LETTER OMICRON WITH PSILI] +glyph \u1F41 (1 3 5 ) # ⠕ ὁ [GREEK SMALL LETTER OMICRON WITH DASIA] +glyph \u1F42 (1 3 5 ) # ⠕ ὂ [GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA] +glyph \u1F43 (1 3 5 ) # ⠕ ὃ [GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA] +glyph \u1F44 (1 3 5 8) # ⢕ ὄ [GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA] +glyph \u1F45 (1 3 5 8) # ⢕ ὅ [GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA] +glyph \u1F48 (1 3 5 7 ) # ⡕ Ὀ [GREEK CAPITAL LETTER OMICRON WITH PSILI] +glyph \u1F49 (1 3 5 7 ) # ⡕ Ὁ [GREEK CAPITAL LETTER OMICRON WITH DASIA] +glyph \u1F4A (1 3 5 7 ) # ⡕ Ὂ [GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA] +glyph \u1F4B (1 3 5 7 ) # ⡕ Ὃ [GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA] +glyph \u1F4C (1 3 5 78) # ⣕ Ὄ [GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA] +glyph \u1F4D (1 3 5 78) # ⣕ Ὅ [GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA] +glyph \u1F50 (1 3456 ) # ⠽ ὐ [GREEK SMALL LETTER UPSILON WITH PSILI] +glyph \u1F51 (1 3456 ) # ⠽ ὑ [GREEK SMALL LETTER UPSILON WITH DASIA] +glyph \u1F52 (1 3456 ) # ⠽ ὒ [GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA] +glyph \u1F53 (1 3456 ) # ⠽ ὓ [GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA] +glyph \u1F54 (1 3456 8) # ⢽ ὔ [GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA] +glyph \u1F55 (1 3456 8) # ⢽ ὕ [GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA] +glyph \u1F56 (1 3456 ) # ⠽ ὖ [GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI] +glyph \u1F57 (1 3456 ) # ⠽ ὗ [GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI] +glyph \u1F59 (1 34567 ) # ⡽ Ὑ [GREEK CAPITAL LETTER UPSILON WITH DASIA] +glyph \u1F5B (1 34567 ) # ⡽ Ὓ [GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA] +glyph \u1F5D (1 345678) # ⣽ Ὕ [GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA] +glyph \u1F5F (1 34567 ) # ⡽ Ὗ [GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI] +glyph \u1F60 ( 2 45 ) # ⠚ ὠ [GREEK SMALL LETTER OMEGA WITH PSILI] +glyph \u1F61 ( 2 45 ) # ⠚ ὡ [GREEK SMALL LETTER OMEGA WITH DASIA] +glyph \u1F62 ( 2 45 ) # ⠚ ὢ [GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA] +glyph \u1F63 ( 2 45 ) # ⠚ ὣ [GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA] +glyph \u1F64 ( 2 45 8) # ⢚ ὤ [GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA] +glyph \u1F65 ( 2 45 8) # ⢚ ὥ [GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA] +glyph \u1F66 ( 2 45 ) # ⠚ ὦ [GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI] +glyph \u1F67 ( 2 45 ) # ⠚ ὧ [GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI] +glyph \u1F68 ( 2 45 7 ) # ⡚ Ὠ [GREEK CAPITAL LETTER OMEGA WITH PSILI] +glyph \u1F69 ( 2 45 7 ) # ⡚ Ὡ [GREEK CAPITAL LETTER OMEGA WITH DASIA] +glyph \u1F6A ( 2 45 7 ) # ⡚ Ὢ [GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA] +glyph \u1F6B ( 2 45 7 ) # ⡚ Ὣ [GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA] +glyph \u1F6C ( 2 45 78) # ⣚ Ὤ [GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA] +glyph \u1F6D ( 2 45 78) # ⣚ Ὥ [GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA] +glyph \u1F6E ( 2 45 7 ) # ⡚ Ὦ [GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI] +glyph \u1F6F ( 2 45 7 ) # ⡚ Ὧ [GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI] +glyph \u1F70 (1 ) # ⠁ ὰ [GREEK SMALL LETTER ALPHA WITH VARIA] +glyph \u1F71 (1 8) # ⢁ ά [GREEK SMALL LETTER ALPHA WITH OXIA] +glyph \u1F72 (1 5 ) # ⠑ ὲ [GREEK SMALL LETTER EPSILON WITH VARIA] +glyph \u1F73 (1 5 8) # ⢑ έ [GREEK SMALL LETTER EPSILON WITH OXIA] +glyph \u1F74 ( 345 ) # ⠜ ὴ [GREEK SMALL LETTER ETA WITH VARIA] +glyph \u1F75 ( 345 8) # ⢜ ή [GREEK SMALL LETTER ETA WITH OXIA] +glyph \u1F76 ( 2 4 ) # ⠊ ὶ [GREEK SMALL LETTER IOTA WITH VARIA] +glyph \u1F77 ( 2 4 8) # ⢊ ί [GREEK SMALL LETTER IOTA WITH OXIA] +glyph \u1F78 (1 3 5 ) # ⠕ ὸ [GREEK SMALL LETTER OMICRON WITH VARIA] +glyph \u1F79 (1 3 5 8) # ⢕ ό [GREEK SMALL LETTER OMICRON WITH OXIA] +glyph \u1F7A (1 3456 ) # ⠽ ὺ [GREEK SMALL LETTER UPSILON WITH VARIA] +glyph \u1F7B (1 3456 8) # ⢽ ύ [GREEK SMALL LETTER UPSILON WITH OXIA] +glyph \u1F7C ( 2 45 ) # ⠚ ὼ [GREEK SMALL LETTER OMEGA WITH VARIA] +glyph \u1F7D ( 2 45 8) # ⢚ ώ [GREEK SMALL LETTER OMEGA WITH OXIA] +glyph \u1F80 ( 3 5 ) # ⠔ ᾀ [GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI] +glyph \u1F81 ( 3 5 ) # ⠔ ᾁ [GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI] +glyph \u1F82 ( 3 5 ) # ⠔ ᾂ [GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI] +glyph \u1F83 ( 3 5 ) # ⠔ ᾃ [GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI] +glyph \u1F84 ( 3 5 8) # ⢔ ᾄ [GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI] +glyph \u1F85 ( 3 5 8) # ⢔ ᾅ [GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI] +glyph \u1F86 ( 3 5 ) # ⠔ ᾆ +glyph \u1F87 ( 3 5 ) # ⠔ ᾇ +glyph \u1F88 ( 3 5 7 ) # ⡔ ᾈ [GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI] +glyph \u1F89 ( 3 5 7 ) # ⡔ ᾉ [GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI] +glyph \u1F8A (1 7 ) # ⡁ ᾊ +glyph \u1F8B (1 7 ) # ⡁ ᾋ +glyph \u1F8C (1 78) # ⣁ ᾌ +glyph \u1F8D (1 78) # ⣁ ᾍ +glyph \u1F8E (1 7 ) # ⡁ ᾎ +glyph \u1F8F (1 7 ) # ⡁ ᾏ +glyph \u1F90 ( 3456 ) # ⠼ ᾐ [GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI] +glyph \u1F91 ( 3456 ) # ⠼ ᾑ [GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI] +glyph \u1F92 ( 3456 ) # ⠼ ᾒ [GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI] +glyph \u1F93 ( 3456 ) # ⠼ ᾓ [GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI] +glyph \u1F94 ( 3456 8) # ⢼ ᾔ [GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI] +glyph \u1F95 ( 3456 8) # ⢼ ᾕ [GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI] +glyph \u1F96 ( 3456 ) # ⠼ ᾖ +glyph \u1F97 ( 3456 ) # ⠼ ᾗ +glyph \u1F98 ( 34567 ) # ⡼ ᾘ [GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI] +glyph \u1F99 ( 34567 ) # ⡼ ᾙ [GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI] +glyph \u1F9A ( 34567 ) # ⡼ ᾚ [GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI] +glyph \u1F9B ( 34567 ) # ⡼ ᾛ [GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI] +glyph \u1F9C ( 345678) # ⣼ ᾜ [GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI] +glyph \u1F9D ( 345678) # ⣼ ᾝ [GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI] +glyph \u1F9E ( 345 7 ) # ⡜ ᾞ +glyph \u1F9F ( 345 7 ) # ⡜ ᾟ +glyph \u1FA0 ( 2 456 ) # ⠺ ᾠ [GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI] +glyph \u1FA1 ( 2 456 ) # ⠺ ᾡ [GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI] +glyph \u1FA2 ( 2 456 ) # ⠺ ᾢ [GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI] +glyph \u1FA3 ( 2 456 ) # ⠺ ᾣ [GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI] +glyph \u1FA4 ( 2 456 8) # ⢺ ᾤ [GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI] +glyph \u1FA5 ( 2 456 8) # ⢺ ᾥ [GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI] +glyph \u1FA6 ( 2 456 ) # ⠺ ᾦ +glyph \u1FA7 ( 2 456 ) # ⠺ ᾧ +glyph \u1FA8 ( 2 4567 ) # ⡺ ᾨ [GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI] +glyph \u1FA9 ( 2 4567 ) # ⡺ ᾩ [GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI] +glyph \u1FAA ( 2 45 7 ) # ⡚ ᾪ +glyph \u1FAB ( 2 45 7 ) # ⡚ ᾫ +glyph \u1FAC ( 2 45 78) # ⣚ ᾬ +glyph \u1FAD ( 2 45 78) # ⣚ ᾭ +glyph \u1FAE ( 2 45 7 ) # ⡚ ᾮ +glyph \u1FAF ( 2 45 7 ) # ⡚ ᾯ +glyph \u1FB0 (1 ) # ⠁ ᾰ [GREEK SMALL LETTER ALPHA WITH VRACHY] +glyph \u1FB1 (1 ) # ⠁ ᾱ [GREEK SMALL LETTER ALPHA WITH MACRON] +glyph \u1FB2 ( 3 5 ) # ⠔ ᾲ [GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI] +char \u1FB3 ( 3 5 ) # ⠔ ᾳ [GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI] +glyph \u1FB4 ( 3 5 8) # ⢔ ᾴ [GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI] +glyph \u1FB6 (1 ) # ⠁ ᾶ [GREEK SMALL LETTER ALPHA WITH PERISPOMENI] +glyph \u1FB7 ( 3 5 ) # ⠔ ᾷ [GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI] +glyph \u1FB8 (1 7 ) # ⡁ Ᾰ [GREEK CAPITAL LETTER ALPHA WITH VRACHY] +glyph \u1FB9 (1 7 ) # ⡁ Ᾱ [GREEK CAPITAL LETTER ALPHA WITH MACRON] +glyph \u1FBA (1 7 ) # ⡁ Ὰ [GREEK CAPITAL LETTER ALPHA WITH VARIA] +glyph \u1FBB (1 78) # ⣁ Ά [GREEK CAPITAL LETTER ALPHA WITH OXIA] +char \u1FBC ( 3 5 7 ) # ⡔ ᾼ [GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI] +glyph \u1FC0 ( 6 ) # ⠠ ῀ [GREEK PERISPOMENI] +glyph \u1FC2 ( 3456 ) # ⠼ ῂ [GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI] +char \u1FC3 ( 3456 ) # ⠼ ῃ [GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI] +glyph \u1FC4 ( 3456 8) # ⢼ ῄ [GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI] +glyph \u1FC6 ( 345 ) # ⠜ ῆ [GREEK SMALL LETTER ETA WITH PERISPOMENI] +glyph \u1FC7 ( 3456 ) # ⠼ ῇ [GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI] +glyph \u1FC8 (1 5 7 ) # ⡑ Ὲ [GREEK CAPITAL LETTER EPSILON WITH VARIA] +glyph \u1FC9 (1 5 78) # ⣑ Έ [GREEK CAPITAL LETTER EPSILON WITH OXIA] +glyph \u1FCA ( 345 7 ) # ⡜ Ὴ [GREEK CAPITAL LETTER ETA WITH VARIA] +glyph \u1FCB ( 345 78) # ⣜ Ή [GREEK CAPITAL LETTER ETA WITH OXIA] +char \u1FCC ( 34567 ) # ⡼ ῌ [GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI] +glyph \u1FCD ( 23456 ) # ⠾ ῍ [GREEK PSILI AND VARIA] +glyph \u1FCE ( 3 56 ) # ⠴ ῎ [GREEK PSILI AND OXIA] +glyph \u1FCF ( 2 56 ) # ⠲ ῏ [GREEK PSILI AND PERISPOMENI] +glyph \u1FD0 ( 2 4 ) # ⠊ ῐ [GREEK SMALL LETTER IOTA WITH VRACHY] +glyph \u1FD1 ( 2 4 ) # ⠊ ῑ [GREEK SMALL LETTER IOTA WITH MACRON] +glyph \u1FD2 ( 2 4 ) # ⠊ ῒ [GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA] +glyph \u1FD3 ( 2 4 8) # ⢊ ΐ [GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA] +glyph \u1FD6 ( 2 4 ) # ⠊ ῖ [GREEK SMALL LETTER IOTA WITH PERISPOMENI] +glyph \u1FD7 ( 2 4 ) # ⠊ ῗ [GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI] +glyph \u1FD8 ( 2 4 7 ) # ⡊ Ῐ [GREEK CAPITAL LETTER IOTA WITH VRACHY] +glyph \u1FD9 ( 2 4 7 ) # ⡊ Ῑ [GREEK CAPITAL LETTER IOTA WITH MACRON] +glyph \u1FDA ( 2 4 7 ) # ⡊ Ὶ [GREEK CAPITAL LETTER IOTA WITH VARIA] +glyph \u1FDB ( 2 4 78) # ⣊ Ί [GREEK CAPITAL LETTER IOTA WITH OXIA] +glyph \u1FDD (123 56 ) # ⠷ ῝ [GREEK DASIA AND VARIA] +glyph \u1FDE ( 2 6 ) # ⠢ ῞ [GREEK DASIA AND OXIA] +glyph \u1FDF ( 23 5 ) # ⠖ ῟ [GREEK DASIA AND PERISPOMENI] +glyph \u1FE0 (1 3456 ) # ⠽ ῠ [GREEK SMALL LETTER UPSILON WITH VRACHY] +glyph \u1FE1 (1 3456 ) # ⠽ ῡ [GREEK SMALL LETTER UPSILON WITH MACRON] +glyph \u1FE2 (1 3456 ) # ⠽ ῢ [GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA] +glyph \u1FE3 (1 3456 8) # ⢽ ΰ [GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA] +glyph \u1FE4 (123 5 ) # ⠗ ῤ [GREEK SMALL LETTER RHO WITH PSILI] +glyph \u1FE5 (123 5 ) # ⠗ ῥ [GREEK SMALL LETTER RHO WITH DASIA] +glyph \u1FE6 (1 3456 ) # ⠽ ῦ [GREEK SMALL LETTER UPSILON WITH PERISPOMENI] +glyph \u1FE7 (1 3456 ) # ⠽ ῧ [GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI] +glyph \u1FE8 (1 34567 ) # ⡽ Ῠ [GREEK CAPITAL LETTER UPSILON WITH VRACHY] +glyph \u1FE9 (1 34567 ) # ⡽ Ῡ [GREEK CAPITAL LETTER UPSILON WITH MACRON] +glyph \u1FEA (1 34567 ) # ⡽ Ὺ [GREEK CAPITAL LETTER UPSILON WITH VARIA] +glyph \u1FEB (1 345678) # ⣽ Ύ [GREEK CAPITAL LETTER UPSILON WITH OXIA] +glyph \u1FEC (123 5 7 ) # ⡗ Ῥ [GREEK CAPITAL LETTER RHO WITH DASIA] +glyph \u1FEF ( 4 ) # ⠈ ` [GREEK VARIA] +glyph \u1FF2 ( 2 456 ) # ⠺ ῲ [GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI] +char \u1FF3 ( 2 456 ) # ⠺ ῳ [GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI] +glyph \u1FF4 ( 2 456 8) # ⢺ ῴ [GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI] +glyph \u1FF6 ( 2 45 ) # ⠚ ῶ [GREEK SMALL LETTER OMEGA WITH PERISPOMENI] +glyph \u1FF7 ( 2 456 ) # ⠺ ῷ [GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI] +glyph \u1FF8 (1 3 5 7 ) # ⡕ Ὸ [GREEK CAPITAL LETTER OMICRON WITH VARIA] +glyph \u1FF9 (1 3 5 78) # ⣕ Ό [GREEK CAPITAL LETTER OMICRON WITH OXIA] +glyph \u1FFA ( 2 45 7 ) # ⡚ Ὼ [GREEK CAPITAL LETTER OMEGA WITH VARIA] +glyph \u1FFB ( 2 45 78) # ⣚ Ώ [GREEK CAPITAL LETTER OMEGA WITH OXIA] +char \u1FFC ( 2 4567 ) # ⡺ ῼ [GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI] +glyph \u1FFD ( 5 ) # ⠐ ´ [GREEK OXIA] +glyph \u1FFE (123 6 ) # ⠧ ῾ [GREEK DASIA] diff -Nru brltty-5.4/Tables/Text/gujarati.tti brltty-5.5/Tables/Text/gujarati.tti --- brltty-5.4/Tables/Text/gujarati.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/gujarati.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/gurmukhi.tti brltty-5.5/Tables/Text/gurmukhi.tti --- brltty-5.4/Tables/Text/gurmukhi.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/gurmukhi.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/gu.ttb brltty-5.5/Tables/Text/gu.ttb --- brltty-5.4/Tables/Text/gu.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/gu.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/he.ttb brltty-5.5/Tables/Text/he.ttb --- brltty-5.4/Tables/Text/he.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/he.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/hi.ttb brltty-5.5/Tables/Text/hi.ttb --- brltty-5.4/Tables/Text/hi.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/hi.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/hr.ttb brltty-5.5/Tables/Text/hr.ttb --- brltty-5.4/Tables/Text/hr.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/hr.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/hu.ttb brltty-5.5/Tables/Text/hu.ttb --- brltty-5.4/Tables/Text/hu.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/hu.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/hy.ttb brltty-5.5/Tables/Text/hy.ttb --- brltty-5.4/Tables/Text/hy.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/hy.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/is.ttb brltty-5.5/Tables/Text/is.ttb --- brltty-5.4/Tables/Text/is.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/is.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/it.ttb brltty-5.5/Tables/Text/it.ttb --- brltty-5.4/Tables/Text/it.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/it.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/kannada.tti brltty-5.5/Tables/Text/kannada.tti --- brltty-5.4/Tables/Text/kannada.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/kannada.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/kha.ttb brltty-5.5/Tables/Text/kha.ttb --- brltty-5.4/Tables/Text/kha.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/kha.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/kn.ttb brltty-5.5/Tables/Text/kn.ttb --- brltty-5.4/Tables/Text/kn.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/kn.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/kok.ttb brltty-5.5/Tables/Text/kok.ttb --- brltty-5.4/Tables/Text/kok.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/kok.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/kru.ttb brltty-5.5/Tables/Text/kru.ttb --- brltty-5.4/Tables/Text/kru.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/kru.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ltr-alias.tti brltty-5.5/Tables/Text/ltr-alias.tti --- brltty-5.4/Tables/Text/ltr-alias.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ltr-alias.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ltr-cyrillic.tti brltty-5.5/Tables/Text/ltr-cyrillic.tti --- brltty-5.4/Tables/Text/ltr-cyrillic.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ltr-cyrillic.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ltr-dot8.tti brltty-5.5/Tables/Text/ltr-dot8.tti --- brltty-5.4/Tables/Text/ltr-dot8.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ltr-dot8.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ltr-latin.tti brltty-5.5/Tables/Text/ltr-latin.tti --- brltty-5.4/Tables/Text/ltr-latin.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ltr-latin.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ltr-tibetan.tti brltty-5.5/Tables/Text/ltr-tibetan.tti --- brltty-5.4/Tables/Text/ltr-tibetan.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ltr-tibetan.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/lt.ttb brltty-5.5/Tables/Text/lt.ttb --- brltty-5.4/Tables/Text/lt.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/lt.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/lv.ttb brltty-5.5/Tables/Text/lv.ttb --- brltty-5.4/Tables/Text/lv.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/lv.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/malayalam.tti brltty-5.5/Tables/Text/malayalam.tti --- brltty-5.4/Tables/Text/malayalam.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/malayalam.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/mg.ttb brltty-5.5/Tables/Text/mg.ttb --- brltty-5.4/Tables/Text/mg.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/mg.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/mi.ttb brltty-5.5/Tables/Text/mi.ttb --- brltty-5.4/Tables/Text/mi.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/mi.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ml.ttb brltty-5.5/Tables/Text/ml.ttb --- brltty-5.4/Tables/Text/ml.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ml.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/mni.ttb brltty-5.5/Tables/Text/mni.ttb --- brltty-5.4/Tables/Text/mni.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/mni.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/mr.ttb brltty-5.5/Tables/Text/mr.ttb --- brltty-5.4/Tables/Text/mr.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/mr.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/mt.ttb brltty-5.5/Tables/Text/mt.ttb --- brltty-5.4/Tables/Text/mt.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/mt.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/mun.ttb brltty-5.5/Tables/Text/mun.ttb --- brltty-5.4/Tables/Text/mun.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/mun.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/mwr.ttb brltty-5.5/Tables/Text/mwr.ttb --- brltty-5.4/Tables/Text/mwr.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/mwr.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ne.ttb brltty-5.5/Tables/Text/ne.ttb --- brltty-5.4/Tables/Text/ne.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ne.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/new.ttb brltty-5.5/Tables/Text/new.ttb --- brltty-5.4/Tables/Text/new.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/new.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/nl_BE.ttb brltty-5.5/Tables/Text/nl_BE.ttb --- brltty-5.4/Tables/Text/nl_BE.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/nl_BE.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/nl_NL.ttb brltty-5.5/Tables/Text/nl_NL.ttb --- brltty-5.4/Tables/Text/nl_NL.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/nl_NL.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/nl.ttb brltty-5.5/Tables/Text/nl.ttb --- brltty-5.4/Tables/Text/nl.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/nl.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/no-generic.ttb brltty-5.5/Tables/Text/no-generic.ttb --- brltty-5.4/Tables/Text/no-generic.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/no-generic.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/no-oup.ttb brltty-5.5/Tables/Text/no-oup.ttb --- brltty-5.4/Tables/Text/no-oup.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/no-oup.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/no.ttb brltty-5.5/Tables/Text/no.ttb --- brltty-5.4/Tables/Text/no.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/no.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/num-alias.tti brltty-5.5/Tables/Text/num-alias.tti --- brltty-5.4/Tables/Text/num-alias.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/num-alias.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/num-dot6.tti brltty-5.5/Tables/Text/num-dot6.tti --- brltty-5.4/Tables/Text/num-dot6.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/num-dot6.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/num-dot8.tti brltty-5.5/Tables/Text/num-dot8.tti --- brltty-5.4/Tables/Text/num-dot8.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/num-dot8.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/num-french.tti brltty-5.5/Tables/Text/num-french.tti --- brltty-5.4/Tables/Text/num-french.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/num-french.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/num-nemd8.tti brltty-5.5/Tables/Text/num-nemd8.tti --- brltty-5.4/Tables/Text/num-nemd8.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/num-nemd8.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/num-nemeth.tti brltty-5.5/Tables/Text/num-nemeth.tti --- brltty-5.4/Tables/Text/num-nemeth.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/num-nemeth.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/nwc.ttb brltty-5.5/Tables/Text/nwc.ttb --- brltty-5.4/Tables/Text/nwc.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/nwc.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/oriya.tti brltty-5.5/Tables/Text/oriya.tti --- brltty-5.4/Tables/Text/oriya.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/oriya.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/or.ttb brltty-5.5/Tables/Text/or.ttb --- brltty-5.4/Tables/Text/or.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/or.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/pa.ttb brltty-5.5/Tables/Text/pa.ttb --- brltty-5.4/Tables/Text/pa.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/pa.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/pi.ttb brltty-5.5/Tables/Text/pi.ttb --- brltty-5.4/Tables/Text/pi.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/pi.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/pl.ttb brltty-5.5/Tables/Text/pl.ttb --- brltty-5.4/Tables/Text/pl.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/pl.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/pt.ttb brltty-5.5/Tables/Text/pt.ttb --- brltty-5.4/Tables/Text/pt.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/pt.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/punc-alternate.tti brltty-5.5/Tables/Text/punc-alternate.tti --- brltty-5.4/Tables/Text/punc-alternate.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/punc-alternate.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/punc-basic.tti brltty-5.5/Tables/Text/punc-basic.tti --- brltty-5.4/Tables/Text/punc-basic.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/punc-basic.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/punc-tibetan.tti brltty-5.5/Tables/Text/punc-tibetan.tti --- brltty-5.4/Tables/Text/punc-tibetan.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/punc-tibetan.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ro.ttb brltty-5.5/Tables/Text/ro.ttb --- brltty-5.4/Tables/Text/ro.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ro.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ru.ttb brltty-5.5/Tables/Text/ru.ttb --- brltty-5.4/Tables/Text/ru.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ru.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sa.ttb brltty-5.5/Tables/Text/sa.ttb --- brltty-5.4/Tables/Text/sa.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sa.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sat.ttb brltty-5.5/Tables/Text/sat.ttb --- brltty-5.4/Tables/Text/sat.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sat.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sd.ttb brltty-5.5/Tables/Text/sd.ttb --- brltty-5.4/Tables/Text/sd.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sd.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sk.ttb brltty-5.5/Tables/Text/sk.ttb --- brltty-5.4/Tables/Text/sk.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sk.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sl.ttb brltty-5.5/Tables/Text/sl.ttb --- brltty-5.4/Tables/Text/sl.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sl.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/spaces.tti brltty-5.5/Tables/Text/spaces.tti --- brltty-5.4/Tables/Text/spaces.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/spaces.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sv-1989.ttb brltty-5.5/Tables/Text/sv-1989.ttb --- brltty-5.4/Tables/Text/sv-1989.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sv-1989.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sv-1996.ttb brltty-5.5/Tables/Text/sv-1996.ttb --- brltty-5.4/Tables/Text/sv-1996.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sv-1996.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sv.ttb brltty-5.5/Tables/Text/sv.ttb --- brltty-5.4/Tables/Text/sv.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sv.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/sw.ttb brltty-5.5/Tables/Text/sw.ttb --- brltty-5.4/Tables/Text/sw.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/sw.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/tamil.tti brltty-5.5/Tables/Text/tamil.tti --- brltty-5.4/Tables/Text/tamil.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/tamil.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/ta.ttb brltty-5.5/Tables/Text/ta.ttb --- brltty-5.4/Tables/Text/ta.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/ta.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/telugu.tti brltty-5.5/Tables/Text/telugu.tti --- brltty-5.4/Tables/Text/telugu.tti 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/telugu.tti 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/te.ttb brltty-5.5/Tables/Text/te.ttb --- brltty-5.4/Tables/Text/te.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/te.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 2008-2016 by The BRLTTY Developers. +# Copyright (C) 2008-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/tr.ttb brltty-5.5/Tables/Text/tr.ttb --- brltty-5.4/Tables/Text/tr.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/tr.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Tables/Text/vi.ttb brltty-5.5/Tables/Text/vi.ttb --- brltty-5.4/Tables/Text/vi.ttb 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Tables/Text/vi.ttb 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/updusbdevs brltty-5.5/updusbdevs --- brltty-5.4/updusbdevs 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/updusbdevs 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -315,10 +315,14 @@ } } -proc makeComment_android {comment} { +proc xmlMakeComment {comment} { return "" } +proc makeComment_android {comment} { + return [xmlMakeComment $comment] +} + proc makeLines_android {vendor product drivers descriptions exclude} { set lines [list] @@ -355,6 +359,26 @@ return $lines } +proc makeComment_metainfo {comment} { + return [xmlMakeComment $comment] +} + +proc makeLines_metainfo {vendor product drivers descriptions exclude} { + set lines [list] + + foreach description $descriptions { + lappend lines [makeComment_metainfo $description] + } + + set line [format "usb:v%04Xp%04X*" $vendor $product] + if {$exclude} { + set line [makeComment_metainfo $line] + } + lappend lines $line + + return $lines +} + proc makeComment_udev {comment} { return "# $comment" } @@ -590,7 +614,7 @@ } if {[writeFile $lines $file]} { - writeProgramMessage "file updated: $file" + logMessage warning "file updated: $file" return 1 } } @@ -643,7 +667,8 @@ if {[llength $argv] == 0} { lappend argv "android:[file join $sourceDirectory Android Application res xml usb_devices.xml]" lappend argv "hotplug:[file join $sourceDirectory Autostart Hotplug brltty.usermap]" - lappend argv "udev:[file join $sourceDirectory Autostart Udev udev.rules]" + lappend argv "metainfo:[file join $sourceDirectory Autostart AppStream org.a11y.brltty.metainfo.xml]" + lappend argv "udev:[file join $sourceDirectory Autostart Udev rules]" lappend argv "windows:[file join $sourceDirectory Autostart Windows brltty-libusb.inf]" lappend argv "windows:[file join $sourceDirectory Autostart Windows brltty-libusb-1.0.inf]" } diff -Nru brltty-5.4/Windows/brlttycnf.ahk brltty-5.5/Windows/brlttycnf.ahk --- brltty-5.4/Windows/brlttycnf.ahk 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Windows/brlttycnf.ahk 2017-04-18 22:35:14.000000000 +0000 @@ -33,8 +33,9 @@ SelectPortAndDisplay: ; Fill a listbox for port selection - ComPorts = USB:|COM1|COM2|COM3|COM4|COM5|COM6|COM7|COM8|COM9|COM10| - ComPorts = %ComPorts%COM11|COM12|COM13|COM14|COM15|COM16| + ComPorts = USB:,BLUETOOTH:|USB:|BLUETOOTH: + ComPorts = %ComPorts%|COM1|COM2|COM3|COM4|COM5|COM6|COM7|COM8|COM9 + ComPorts = %ComPorts%|COM10|COM11|COM12|COM13|COM14|COM15|COM16| ; Fill a listbox for terminal selection ; getting data from brltty.conf diff -Nru brltty-5.4/Windows/mingw.sh brltty-5.5/Windows/mingw.sh --- brltty-5.4/Windows/mingw.sh 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Windows/mingw.sh 2017-04-18 22:35:14.000000000 +0000 @@ -2,7 +2,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # diff -Nru brltty-5.4/Windows/mkwin brltty-5.5/Windows/mkwin --- brltty-5.4/Windows/mkwin 2016-06-24 03:41:56.000000000 +0000 +++ brltty-5.5/Windows/mkwin 2017-04-18 22:35:14.000000000 +0000 @@ -3,7 +3,7 @@ # BRLTTY - A background process providing access to the console screen (when in # text mode) for a blind person using a refreshable braille display. # -# Copyright (C) 1995-2016 by The BRLTTY Developers. +# Copyright (C) 1995-2017 by The BRLTTY Developers. # # BRLTTY comes with ABSOLUTELY NO WARRANTY. # @@ -445,7 +445,7 @@ then case "${extension}" in - bat | cat | conf | h | htm | html | inf | nsi | txt | [tack]t[bi]) + bat | cat | conf | h | htm | html | inf | nsi | policy | txt | xml | [tack]t[bi]) "${unix2dosPath}" -q -o "${path}" ;;